diff -Nru osgearth-2.9.0+dfsg/appveyor.yml osgearth-2.10.2+dfsg/appveyor.yml
--- osgearth-2.9.0+dfsg/appveyor.yml	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/appveyor.yml	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,36 @@
+version: 1.0.{build}
+shallow_clone: true
+os: Visual Studio 2017
+
+install:
+  #- cd C:\tools\vcpkg
+  #- vcpkg install osg:x64-windows sqlite3:x64-windows protobuf:x64-windows poco:x64-windows
+  #- vcpkg integrate install
+  - mkdir c:\temp
+  - cd c:\temp
+  - ps: Start-FileDownload 'https://s3.amazonaws.com/pelican-public/osgearth-vcpkg-deps.7z'
+  - 7z x osgearth-vcpkg-deps.7Z
+  - cd C:\projects\osgearth
+
+build_script:
+  - mkdir build
+  - cd build
+  #- cmake .. -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DWIN32_USE_MP=ON -DCMAKE_INSTALL_PREFIX=c:\projects\osgearth\install -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
+  - cmake .. -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release -DWIN32_USE_MP=ON -DCMAKE_INSTALL_PREFIX=c:\projects\osgearth\install -DCMAKE_TOOLCHAIN_FILE=c:/temp/osgearth-vcpkg-deps/scripts/buildsystems/vcpkg.cmake
+  - cmake --build . --target INSTALL --config Release
+  - cd ..\install
+  - 7z a c:\projects\osgearth\osgearth.zip .
+
+cache: c:\tools\vcpkg\installed\
+
+artifacts:
+  - path: osgearth.zip
+    name: osgearth
+
+notifications:
+  - provider: Slack
+    incoming_webhook:
+      secure: CeOwsQhxU4rvSp7EJrBWYhhfAhTFRMH/RxKYr2PBrAi3vk5hbMJBBYtvPAGtHMXp7k1E0JwbeC3rrtpVtg6wqbpplVMDSQZs+26H/LSY2so=
+
+
+
diff -Nru osgearth-2.9.0+dfsg/CMakeLists.txt osgearth-2.10.2+dfsg/CMakeLists.txt
--- osgearth-2.9.0+dfsg/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)
 
 if(COMMAND cmake_policy)
     # Works around warnings libraries linked against that don't
@@ -8,10 +8,13 @@
     # Works around warnings about escaped quotes in ADD_DEFINITIONS
     # statements.
     cmake_policy(SET CMP0005 OLD)
-    
+
     # Qt5 qt5_use_modules usage was causing "Policy CMP0043 is not set: Ignore COMPILE_DEFINITIONS_<Config> properties." warnings
     cmake_policy(SET CMP0043 NEW)
 
+    # Double colon in target name means IMPORTED (and not ALIAS or IMPORTED).
+    # Fixes a warning when cache_rocksdb links to target "RocksDB::rocksdb"
+    cmake_policy(SET CMP0028 NEW)
 endif(COMMAND cmake_policy)
 
 #
@@ -23,8 +26,8 @@
 PROJECT(OSGEARTH)
 
 SET(OSGEARTH_MAJOR_VERSION 2)
-SET(OSGEARTH_MINOR_VERSION 9)
-SET(OSGEARTH_PATCH_VERSION 0)
+SET(OSGEARTH_MINOR_VERSION 10)
+SET(OSGEARTH_PATCH_VERSION 2)
 SET(OSGEARTH_SOVERSION     0)
 
 SET(OSGEARTH_PLUGIN_PREFIX "")
@@ -50,6 +53,12 @@
 # Good place to look for the OSG 3rd party libs
 SET(THIRD_PARTY_DIR "" CACHE PATH "OSG 3rd-party dependency folder")
 
+IF(THIRD_PARTY_DIR)
+    LIST(APPEND CMAKE_INCLUDE_PATH ${THIRD_PARTY_DIR}/include)
+    LIST(APPEND CMAKE_LIBRARY_PATH ${THIRD_PARTY_DIR}/lib)
+    MESSAGE(STATUS "CMAKE_INCLUDE_PATH=${CMAKE_INCLUDE_PATH}")
+ENDIF(THIRD_PARTY_DIR)
+
 # We have some custom .cmake scripts not in the official distribution.
 # Maybe this can be used override existing behavior if needed?
 SET(CMAKE_MODULE_PATH "${OSGEARTH_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
@@ -66,22 +75,34 @@
 
 # check for iOS build
 OPTION(OSGEARTH_BUILD_PLATFORM_IPHONE "Enable IPhoneSDK Device support" OFF)
-OPTION(OSGEARTH_BUILD_PLATFORM_IPHONE_SIMULATOR "Enable IPhoneSDK Simulator support" OFF)
 
-IF(OSGEARTH_BUILD_PLATFORM_IPHONE OR OSGEARTH_BUILD_PLATFORM_IPHONE_SIMULATOR)
+IF(OSGEARTH_BUILD_PLATFORM_IPHONE)
+
     SET(OSGEARTH_USE_GLES TRUE)
-    #you need to manually set the default sdk version here
-    SET (IPHONE_SDKVER "10.2" CACHE STRING "iOS SDK-Version")
-    SET (IPHONE_VERSION_MIN "8.0" CACHE STRING "IOS minimum os version, use 7.0 or greater to get 64bit support")
-    SET (IPHONE_PLATFORMSROOT "/Applications/Xcode.app/Contents/Developer/Platforms")
-
-    IF(OSGEARTH_BUILD_PLATFORM_IPHONE)
-        SET(CMAKE_OSX_SYSROOT "${IPHONE_PLATFORMSROOT}/iPhoneOS.platform/Developer/SDKs/iPhoneOS${IPHONE_SDKVER}.sdk" CACHE STRING "System root for iOS" FORCE)
-        SET(CMAKE_OSX_ARCHITECTURES "armv7;armv7s;arm64" CACHE STRING "Build architectures for iOS" FORCE)
-    ELSE()
-        SET(CMAKE_OSX_SYSROOT "${IPHONE_PLATFORMSROOT}/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator${IPHONE_SDKVER}.sdk" CACHE STRING "System root for iOS" FORCE)
-        SET(CMAKE_OSX_ARCHITECTURES "i386" CACHE STRING "Build architectures for iOS Simulator" FORCE)
-    ENDIF()
+
+    # set sdk and min versions
+    SET (IPHONE_SDKVER "10.2" CACHE STRING "IOS SDK-Version")
+    SET (IPHONE_VERSION_MIN "7.0" CACHE STRING "IOS minimum os version, use 7.0 or greater to get 64bit support")
+
+    # get full path to sdk from requested versions
+    SET (IPHONE_DEVROOT "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer")
+    SET (IPHONE_SDKROOT "${IPHONE_DEVROOT}/SDKs/iPhoneOS${IPHONE_SDKVER}.sdk")
+
+    # optionally enable bitcode for the build
+    SET (IPHONE_ENABLE_BITCODE "NO" CACHE STRING "IOS Enable Bitcode")
+
+    # seamless toggle between device and simulator
+    SET(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator")
+
+    # set deployment target to min version
+    SET(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IPHONE_VERSION_MIN}" CACHE STRING "Deployment target for iOS" FORCE)
+
+    # Set standard architectures
+    SET(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
+
+    # set the sdk path as our sysroot
+    SET(CMAKE_OSX_SYSROOT "${IPHONE_SDKROOT}" CACHE STRING "System root for iOS" FORCE)
+
 ENDIF ()
 
 
@@ -119,16 +140,30 @@
 FIND_PACKAGE(GDAL)
 FIND_PACKAGE(GEOS)
 FIND_PACKAGE(Sqlite3)
-FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(Poco)
 
 FIND_PACKAGE(LevelDB)
-FIND_PACKAGE(RocksDB)
+
+SET (WITH_STATIC_ROCKSDB FALSE CACHE BOOL "Use static library of RocksDB")
+
+IF(MINGW)
+    FIND_PACKAGE(RocksDB CONFIG)
+    IF(RocksDB_FOUND)
+        MESSAGE(STATUS "Found RocksDB " ${RocksDB_VERSION})
+    ENDIF()
+ELSE(MINGW)
+    IF (WITH_STATIC_ROCKSDB)
+      FIND_PACKAGE(RocksDB REQUIRED COMPONENTS STATIC)
+    ELSE()
+      FIND_PACKAGE(RocksDB)
+    ENDIF()
+ENDIF(MINGW)
 
 FIND_PACKAGE(SilverLining QUIET)
 FIND_PACKAGE(Triton QUIET)
 
-FIND_PACKAGE(PROTOBUF QUIET)
+FIND_PACKAGE(Protobuf QUIET)
+SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compiled as dll")
 
 SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape")
 IF (WITH_EXTERNAL_DUKTAPE)
@@ -143,60 +178,19 @@
     FIND_PACKAGE(TinyXML)
 ENDIF (WITH_EXTERNAL_TINYXML)
 
-IF(UNIX)
+IF(UNIX AND NOT ANDROID)
     # Not sure what this will do on Cygwin and Msys
     # Also, remember OS X X11 is a user installed option so it may not exist.
     FIND_PACKAGE(X11)
     # Some Unicies need explicit linkage to the Math library or the build fails.
     FIND_LIBRARY(MATH_LIBRARY m)
-ENDIF(UNIX)
-
-
-OPTION(OSGEARTH_QT_BUILD "Enable to use Qt (build Qt-dependent libraries, plugins and examples)" OFF)
-OPTION(OSGEARTH_QT_BUILD_LEGACY_WIDGETS "Build the legacy Qt widgets" OFF)
-set(OSGEARTH_QT_VERSION 5 CACHE STRING "Qt version to use")
-
-IF(OSGEARTH_QT_BUILD)
-  # To select a specific version of QT define DESIRED_QT_VERSION
-  # via cmake -DDESIRED_QT_VERSION=5
-  # QUIET option disables messages if the package cannot be found.
-  IF  (OSGEARTH_QT_VERSION)
-      IF  (OSGEARTH_QT_VERSION MATCHES "5")
-          FIND_PACKAGE(Qt5Widgets REQUIRED)
-      ELSEIF (OSGEARTH_QT_VERSION MATCHES "4")
-          FIND_PACKAGE(Qt4 REQUIRED)
-      ENDIF()
-  ELSE()
-      FIND_PACKAGE(Qt5Widgets QUIET)
-      IF ( NOT Qt5Widgets_FOUND )
-          FIND_PACKAGE(Qt4 REQUIRED)
-      ENDIF()
-  ENDIF()
-ENDIF(OSGEARTH_QT_BUILD)
-
-IF(Qt5Widgets_FOUND)
-  message(STATUS "Qt: Using version 5")
-  FIND_PACKAGE(Qt5Core QUIET)
-  FIND_PACKAGE(Qt5Gui QUIET)
-  FIND_PACKAGE(Qt5OpenGL QUIET)
-  FIND_PACKAGE(Qt5OpenGLExtensions QUIET)
-  IF ( Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5OpenGL_FOUND AND Qt5OpenGLExtensions_FOUND )
-    SET(QT_INCLUDES ${Qt5Widgets_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS} ${Qt5OpenGLExtensions_INCLUDE_DIRS})
-  ENDIF ()
-ELSEIF(QT4_FOUND)
-  message(STATUS "Qt: Using version 4")
-  INCLUDE(${QT_USE_FILE})
-  SET(QT_INCLUDES ${QT_INCLUDES} ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}${QT_QTOPENGL_INCLUDE_DIR} )
-  SET(QT_ALL_LIBRARIES ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTOPENGL_LIBRARY})
-ENDIF ()
+ENDIF(UNIX AND NOT ANDROID)
 
 
-# Common global definitions
-#ADD_DEFINITIONS(-D)
 # Platform specific definitions
 
 
-IF(WIN32)
+IF(WIN32 AND NOT ANDROID)
   FIND_PACKAGE(GLCORE)
   IF(GLCORE_FOUND)
       INCLUDE_DIRECTORIES( ${GLCORE_INCLUDE_DIR} )
@@ -219,7 +213,7 @@
         ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
         ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
     ENDIF(MSVC)
-ENDIF(WIN32)
+ENDIF(WIN32 AND NOT ANDROID)
 
 # Common to all platforms:
 
@@ -230,6 +224,10 @@
 
 INCLUDE(OsgEarthMacroUtils)
 
+# Detect C++11 compiler support and set a variable.
+INCLUDE(CXX11)
+check_for_cxx11_compiler(CXX11_AVAILABLE)
+
 DETECT_OSG_VERSION()
 
 IF (NOT OPENSCENEGRAPH_VERSION)
@@ -242,6 +240,7 @@
 INCLUDE_DIRECTORIES(
     ${OSGEARTH_SOURCE_DIR}/src
     ${OSG_INCLUDE_DIR}
+    ${OSG_GEN_INCLUDE_DIR}
 )
 
 #FIND_PACKAGE(GDAL)
@@ -258,12 +257,12 @@
 # Installation stuff
 
 
-IF(UNIX AND NOT WIN32 AND NOT APPLE)
+IF(UNIX AND NOT WIN32 AND NOT APPLE AND NOT ANDROID)
   IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
       SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
       MARK_AS_ADVANCED(LIB_POSTFIX)
   ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8")
-ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
+ENDIF(UNIX AND NOT WIN32 AND NOT APPLE AND NOT ANDROID)
 IF(NOT DEFINED LIB_POSTFIX)
     SET(LIB_POSTFIX "")
 ENDIF(NOT DEFINED LIB_POSTFIX)
@@ -326,13 +325,17 @@
 # osgEarth Examples
 OPTION(BUILD_OSGEARTH_EXAMPLES "Enable to build osgEarth Examples" ON)
 
+# Applications and tests
+OPTION(BUILD_APPLICATIONS "Enable build of Applications" ON)
+OPTION(BUILD_TESTS "Enable build of Tests" ON)
+
 # OE Core
 ADD_SUBDIRECTORY(src)
 
 
 # Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
 # and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
-IF(APPLE)
+IF(APPLE AND NOT ANDROID)
 
     # These are just defaults/recommendations, but how we want to build
     # out of the box. But the user needs to be able to change these options.
@@ -365,7 +368,7 @@
     OPTION(OSGEARTH_BUILD_FRAMEWORKS "Compile frameworks instead of dylibs" OFF)
     SET(OSGEARTH_BUILD_FRAMEWORKS_INSTALL_NAME_DIR "@executable_path/../Frameworks" CACHE STRING "Install name dir for compiled frameworks")
 
-ENDIF(APPLE)
+ENDIF(APPLE AND NOT ANDROID)
 
 
 # This needs to be run very last so other parts of the scripts can take
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/CXX11.cmake osgearth-2.10.2+dfsg/CMakeModules/CXX11.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/CXX11.cmake	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/CXX11.cmake	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,53 @@
+# Copyright (c) 2013 Nathan Osman
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# Determines whether or not the compiler supports C++11
+
+# Adapted from:
+# https://github.com/nathan-osman/CXX11-CMake-Macros
+#
+# Pass:
+#   msvc 14+
+#   g++ 4.9.0+
+#   clang 3.4+
+#
+# Earlier versions of these compilers might support C++11 but the purposes
+# of osgEarth we are using these minimum requirements.
+
+macro(check_for_cxx11_compiler _VAR)
+    set(${_VAR})
+    if((MSVC AND NOT ${MSVC_VERSION} VERSION_LESS 1900) OR
+       (CMAKE_COMPILER_IS_GNUCXX AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.9.0) OR
+       (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 3.4))
+        set(${_VAR} 1)
+
+        message(STATUS "Checking for C++11 compiler - available")
+
+        # enable C++11 compilation if available
+        set(CMAKE_CXX_STANDARD 11)
+        add_definitions(-DOSGEARTH_CXX11)
+
+        # is GCC < 5, use the old ABI for binary compatibility
+        if (CMAKE_COMPILER_IS_GNUCXX AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 5.0)
+            add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
+        endif()
+    else()
+        message(STATUS "Checking for C++11 compiler - unavailable")
+    endif()
+endmacro()
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/FindCURL.cmake osgearth-2.10.2+dfsg/CMakeModules/FindCURL.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/FindCURL.cmake	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/FindCURL.cmake	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-FIND_PATH(CURL_INCLUDE_DIR curl.h curl/curl.h
-  $ENV{CURL_DIR}
-  NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
-
-FIND_PATH(CURL_INCLUDE_DIR curl.h curl/curl.h
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
-
-FIND_PATH(CURL_INCLUDE_DIR curl.h curl/curl.h
-  PATHS
-  ${THIRD_PARTY_DIR}/include
-  /usr/local/include/curl
-  /usr/local/include/CURL
-  /usr/local/include
-  /usr/include/curl
-  /usr/include/CURL
-  /usr/include
-  /sw/include/curl
-  /sw/include/CURL
-  /sw/include # Fink
-  /opt/local/include/curl
-  /opt/local/include/CURL
-  /opt/local/include # DarwinPorts
-  /opt/csw/include/curl
-  /opt/csw/include/CURL
-  /opt/csw/include # Blastwave
-  /opt/include/curl
-  /opt/include/CURL
-  /opt/include
-)
-
-#Find the CURL release library
-FIND_LIBRARY(CURL_LIBRARY
-  NAMES curl curllib CURL libcurl
-  PATHS
-  ${THIRD_PARTY_DIR}/lib
-  $ENV{CURL_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(CURL_LIBRARY
-  NAMES curl CURL curllib libcurl
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(CURL_LIBRARY
-  NAMES curl CURL curllib libcurl
-  PATHS
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /sw
-    /opt/local
-    /opt/csw
-    /opt
-    /usr/freeware
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;CURL_ROOT]/lib
-  PATH_SUFFIXES lib64 lib
-)
-
-#Find the CURL debug library
-FIND_LIBRARY(CURL_LIBRARY_DEBUG
-  NAMES curlD curld curllibD curllibd CURLD libcurlD libcurld
-  PATHS
-  ${THIRD_PARTY_DIR}/lib
-  $ENV{CURL_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(CURL_LIBRARY_DEBUG
-  NAMES curlD curld curllibD curllibd CURLD libcurlD libcurld
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(CURL_LIBRARY_DEBUG
-  NAMES curlD curld curllibD curllibd CURLD libcurlD libcurld
-  PATHS
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /sw
-    /opt/local
-    /opt/csw
-    /opt
-    /usr/freeware
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;CURL_ROOT]/lib
-  PATH_SUFFIXES lib64 lib
-)
-
-SET(CURL_FOUND "NO")
-IF(CURL_LIBRARY AND CURL_INCLUDE_DIR)
-  SET(CURL_FOUND "YES")
-ENDIF(CURL_LIBRARY AND CURL_INCLUDE_DIR)
-
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/FindGDAL.cmake osgearth-2.10.2+dfsg/CMakeModules/FindGDAL.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/FindGDAL.cmake	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/FindGDAL.cmake	2019-07-11 18:30:19.000000000 +0000
@@ -22,64 +22,53 @@
 SET(GDAL_DIR "" CACHE PATH "Root folder of GDAL dependency")
 
 FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+  PATHS
     ${GDAL_DIR}
     $ENV{GDAL_DIR}
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include include/gdal
-)
-
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-   ${GDAL_DIR}
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES include include/gdal
 )
 
 FIND_PATH(GDAL_INCLUDE_DIR gdal.h
   PATHS
-  ${GDAL_DIR}/include
-  ~/Library/Frameworks/gdal.framework/Headers
-  /Library/Frameworks/gdal.framework/Headers
-  /usr/local/include/gdal
-  /usr/local/include/GDAL
-  /usr/local/include
-  /usr/include/gdal
-  /usr/include/GDAL
-  /usr/include
-  /sw/include/gdal 
-  /sw/include/GDAL 
-  /sw/include # Fink
-  /opt/local/include/gdal
-  /opt/local/include/GDAL
-  /opt/local/include # DarwinPorts
-  /opt/csw/include/gdal
-  /opt/csw/include/GDAL
-  /opt/csw/include # Blastwave
-  /opt/include/gdal
-  /opt/include/GDAL
-  /opt/include
-  c:/Program Files/FWTools2.1.0/include
+    ${GDAL_DIR}/include
+    ~/Library/Frameworks/gdal.framework/Headers
+    /Library/Frameworks/gdal.framework/Headers
+    /usr/local/include/gdal
+    /usr/local/include/GDAL
+    /usr/local/include
+    /usr/include/gdal
+    /usr/include/GDAL
+    /usr/include
+    /sw/include/gdal 
+    /sw/include/GDAL 
+    /sw/include # Fink
+    /opt/local/include/gdal
+    /opt/local/include/GDAL
+    /opt/local/include # DarwinPorts
+    /opt/csw/include/gdal
+    /opt/csw/include/GDAL
+    /opt/csw/include # Blastwave
+    /opt/include/gdal
+    /opt/include/GDAL
+    /opt/include
+    c:/Program Files/FWTools2.1.0/include
 )
 
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+  NAMES
+    gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
   PATHS
-  c:/Program Files/FWTools2.1.0/lib 
-  ${GDAL_DIR}/lib
-  $ENV{GDAL_DIR}
+    c:/Program Files/FWTools2.1.0/lib 
+    ${GDAL_DIR}/lib
+    $ENV{GDAL_DIR}
   NO_DEFAULT_PATH
   PATH_SUFFIXES lib64 lib
 )
+
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    c:/Program Files/FWTools2.1.0/lib
-    ${GDAL_DIR}/lib
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+  NAMES
+    gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
   PATHS
     ${GDAL_DIR}/lib
     ~/Library/Frameworks
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/FindGEOS.cmake osgearth-2.10.2+dfsg/CMakeModules/FindGEOS.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/FindGEOS.cmake	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/FindGEOS.cmake	2019-07-11 18:30:19.000000000 +0000
@@ -8,45 +8,45 @@
 SET(GEOS_DIR "" CACHE PATH "Root directory of GEOS distribution")
 
 FIND_PATH(GEOS_INCLUDE_DIR geos/geom/Geometry.h
-  ${GEOS_DIR}
-  $ENV{GEOS_DIR}
+  PATHS
+    ${GEOS_DIR}
+    $ENV{GEOS_DIR}
   NO_DEFAULT_PATH
-    PATH_SUFFIXES include
+  PATH_SUFFIXES include
 )
 
 FIND_PATH(GEOS_INCLUDE_DIR geos/geom/Geometry.h
   PATHS
-  ${GEOS_DIR}/include
-  /usr/local/include/geos
-  /usr/local/include/GEOS
-  /usr/local/include
-  /usr/include/geos
-  /usr/include/GEOS
-  /usr/include
-  ~/Library/Frameworks/geos/Headers
-  /Library/Frameworks/geos/Headers
-  /sw/include/geos 
-  /sw/include/GEOS 
-  /sw/include # Fink
-  /opt/local/include/geos
-  /opt/local/include/GEOS
-  /opt/local/include # DarwinPorts
-  /opt/csw/include/geos
-  /opt/csw/include/GEOS
-  /opt/csw/include # Blastwave
-  /opt/include/geos
-  /opt/include/GEOS
-  /opt/include
-  e:/devel/geos-3.1.1/source/headers
+    /usr/local/include/geos
+    /usr/local/include/GEOS
+    /usr/local/include
+    /usr/include/geos
+    /usr/include/GEOS
+    /usr/include
+    ~/Library/Frameworks/geos/Headers
+    /Library/Frameworks/geos/Headers
+    /sw/include/geos 
+    /sw/include/GEOS 
+    /sw/include # Fink
+    /opt/local/include/geos
+    /opt/local/include/GEOS
+    /opt/local/include # DarwinPorts
+    /opt/csw/include/geos
+    /opt/csw/include/GEOS
+    /opt/csw/include # Blastwave
+    /opt/include/geos
+    /opt/include/GEOS
+    /opt/include
+    e:/devel/geos-3.1.1/source/headers
 )
 
 FIND_LIBRARY(GEOS_LIBRARY
   NAMES geos
-  PATHS
+  PATHS  
     ${GEOS_DIR}/lib
     $ENV{GEOS_DIR}
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES lib64 lib
 )
 
 FIND_LIBRARY(GEOS_LIBRARY
@@ -69,8 +69,8 @@
   PATHS
     ${GEOS_DIR}/lib
     $ENV{GEOS_DIR}
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES lib64 lib
 )
 
 FIND_LIBRARY(GEOS_LIBRARY_DEBUG
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/FindOSG.cmake osgearth-2.10.2+dfsg/CMakeModules/FindOSG.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/FindOSG.cmake	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/FindOSG.cmake	2019-07-11 18:30:19.000000000 +0000
@@ -20,14 +20,14 @@
 
 SET(OSG_DIR "" CACHE PATH "Set to base OpenSceneGraph install path")
 
-MACRO( FIND_OSG_INCLUDE THIS_OSG_INCLUDE_DIR THIS_OSG_INCLUDE_FILE )
-
-FIND_PATH( ${THIS_OSG_INCLUDE_DIR} ${THIS_OSG_INCLUDE_FILE}
+FIND_PATH(OSG_INCLUDE_DIR osg/Node
     PATHS
         ${OSG_DIR}
         $ENV{OSG_SOURCE_DIR}
         $ENV{OSGDIR}
         $ENV{OSG_DIR}
+        $ENV{OSG}
+        $ENV{OSG}
         /usr/local/
         /usr/
         /sw/ # Fink
@@ -38,13 +38,28 @@
         ~/Library/Frameworks
         /Library/Frameworks
     PATH_SUFFIXES
-        /include/
+        /include
 )
 
-ENDMACRO( FIND_OSG_INCLUDE THIS_OSG_INCLUDE_DIR THIS_OSG_INCLUDE_FILE )
-
-FIND_OSG_INCLUDE( OSG_GEN_INCLUDE_DIR   osg/Config )
-FIND_OSG_INCLUDE( OSG_INCLUDE_DIR       osg/Node )
+FIND_PATH(OSG_GEN_INCLUDE_DIR osg/Config
+    PATHS
+        ${OSG_DIR}
+        $ENV{OSG_SOURCE_DIR}
+        $ENV{OSGDIR}
+        $ENV{OSG_DIR}
+        $ENV{OSG}
+        /usr/local/
+        /usr/
+        /sw/ # Fink
+        /opt/local/ # DarwinPorts
+        /opt/csw/ # Blastwave
+        /opt/
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/
+        ~/Library/Frameworks
+        /Library/Frameworks
+    PATH_SUFFIXES
+        /include
+)
 
 ###### libraries ######
 
@@ -59,6 +74,7 @@
         $ENV{OSG_DIR}
         $ENV{OSGDIR}
         $ENV{OSG_ROOT}
+        $ENV{OSG}
         ~/Library/Frameworks
         /Library/Frameworks
         /usr/local
@@ -119,19 +135,6 @@
 FIND_OSG_LIBRARY( OSGPARTICLE_LIBRARY osgParticle )
 FIND_OSG_LIBRARY( OSGPARTICLE_LIBRARY_DEBUG osgParticled )
 
-IF(OPENSCENEGRAPH_VERSION VERSION_LESS "3.5.6")
-  FIND_OSG_LIBRARY( OSGQT_LIBRARY osgQt )
-  FIND_OSG_LIBRARY( OSGQT_LIBRARY_DEBUG osgQtd )
-ELSE(OPENSCENEGRAPH_VERSION VERSION_LESS "3.5.6")
-  IF(Qt5Widgets_FOUND)
-    FIND_OSG_LIBRARY( OSGQT_LIBRARY osgQt5 )
-    FIND_OSG_LIBRARY( OSGQT_LIBRARY_DEBUG osgQt5d )
-  ELSE(Qt5Widgets_FOUND)
-    FIND_OSG_LIBRARY( OSGQT_LIBRARY osgQt )
-    FIND_OSG_LIBRARY( OSGQT_LIBRARY_DEBUG osgQtd )
-  ENDIF(Qt5Widgets_FOUND)
-ENDIF(OPENSCENEGRAPH_VERSION VERSION_LESS "3.5.6")
-
 FIND_OSG_LIBRARY( OPENTHREADS_LIBRARY OpenThreads )
 FIND_OSG_LIBRARY( OPENTHREADS_LIBRARY_DEBUG OpenThreadsd )
 
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/FindPoco.cmake osgearth-2.10.2+dfsg/CMakeModules/FindPoco.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/FindPoco.cmake	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/FindPoco.cmake	2019-07-11 18:30:19.000000000 +0000
@@ -8,6 +8,7 @@
 SET(POCO_DIR "" CACHE PATH "Set to base Poco install path")
 
 FIND_PATH(POCO_INCLUDE_DIR Poco/Poco.h
+  PATHS
     ${POCO_DIR}/include
     $ENV{POCO_DIR}/include
     $ENV{POCO_DIR}/Source/lib #Windows Binary Installer
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/FindRocksDB.cmake osgearth-2.10.2+dfsg/CMakeModules/FindRocksDB.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/FindRocksDB.cmake	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/FindRocksDB.cmake	2019-07-11 18:30:19.000000000 +0000
@@ -7,36 +7,38 @@
   ${ROCKSDB_DIR}
 )
 
-find_library(ROCKSDB_LIBRARY NAMES ROCKSDBLIB rocksdb
-             PATHS
-               ${ROCKSDB_DIR}
-               ${ROCKSDB_DIR}/bin/Release
-               ${ROCKSDB_DIR}/bin64_vs2013/Release
-             PATH_SUFFIXES lib lib64
-	    )
-
-
-find_library(ROCKSDB_LIBRARY_DEBUG NAMES ROCKSDBLIB rocksdb
-             PATHS
-               ${ROCKSDB_DIR}
-               ${ROCKSDB_DIR}/bin/Debug
-               ${ROCKSDB_DIR}/bin64_vs2013/Debug
-             PATH_SUFFIXES lib lib64
-	    )
-
-if( ROCKSDB_LIBRARY )
-  MESSAGE(STATUS "FOUND ROCKSDB_LIBRARY")
+if(RocksDB_FIND_REQUIRED_STATIC)
+	set(ROCKSDB_LIB "rocksdblib")
+else()
+	set(ROCKSDB_LIB "rocksdb")
 endif()
 
-if (ROCKSDB_INCLUDE_DIR)
-  MESSAGE(STATUS "FOUND ROCKSDB_INCLUDE_DIR")
-endif()
-  
+find_library(ROCKSDB_LIBRARY NAMES ${ROCKSDB_LIB}
+			 PATHS
+			   ${ROCKSDB_DIR}
+			   ${ROCKSDB_DIR}/bin/Release
+			   ${ROCKSDB_DIR}/bin64_vs2013/Release
+			 PATH_SUFFIXES lib lib64
+		)
+
+
+find_library(ROCKSDB_LIBRARY_DEBUG NAMES ${ROCKSDB_LIB}d ${ROCKSDB_LIB}
+			 PATHS
+			   ${ROCKSDB_DIR}
+			   ${ROCKSDB_DIR}/bin/Debug
+			   ${ROCKSDB_DIR}/bin64_vs2013/Debug
+			 PATH_SUFFIXES lib lib64
+			)
+
+find_package_handle_standard_args(ROCKSDB
+    FOUND_VAR
+      ROCKSDB_FOUND
+    REQUIRED_VARS
+      ROCKSDB_LIBRARY
+      ROCKSDB_INCLUDE_DIR
+    FAIL_MESSAGE
+      "Could NOT find ROCKSDB"
+)
 
-set( ROCKSDB_FOUND "NO" )
-if( ROCKSDB_LIBRARY AND ROCKSDB_INCLUDE_DIR )
-    set( ROCKSDB_FOUND "YES" )
-    MESSAGE(STATUS "Found RocksDB library: " ${ROCKSDB_LIBRARY})
-else()
-    MESSAGE(STATUS "Could not find ROCKSDB")
-endif()
+set(ROCKSDB_INCLUDE_DIRS ${ROCKSDB_INCLUDE_DIR} )
+set(ROCKSDB_LIBRARIES ${ROCKSDB_LIBRARY})
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/FindSqlite3.cmake osgearth-2.10.2+dfsg/CMakeModules/FindSqlite3.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/FindSqlite3.cmake	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/FindSqlite3.cmake	2019-07-11 18:30:19.000000000 +0000
@@ -5,6 +5,7 @@
 # SQLITE3_INCLUDE_DIR, where to find the headers
 
 FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
+  PATHS
     ${SQLITE3_DIR}/include/sqlite
     $ENV{SQLITE3_DIR}/include/sqlite
     $ENV{SQLITE3_DIR}/Source/lib/sqlite #Windows Binary Installer
@@ -22,8 +23,9 @@
 )
 
 FIND_LIBRARY(SQLITE3_LIBRARY
-    NAMES sqlite3 libsqlite3
-    PATHS
+  NAMES
+    sqlite3 libsqlite3
+  PATHS
     ${SQLITE3_DIR}/lib
     $ENV{SQLITE3_DIR}/lib
     $ENV{SQLITE3_DIR}/bin #Windows Binary Installer
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/FindWEBP.cmake osgearth-2.10.2+dfsg/CMakeModules/FindWEBP.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/FindWEBP.cmake	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/FindWEBP.cmake	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,29 @@
+include(SelectLibraryConfigurations)
+include(FindPackageHandleStandardArgs)
+
+find_path(WEBP_INCLUDE_DIR "webp/decode.h"
+ 	      PATH_SUFFIXES include
+          )
+          
+find_library(WEBP_LIBRARY_RELEASE NAMES webp libwebp_a libwebp
+             HINTS "${WEBP_DIR}"
+             PATH_SUFFIXES "${PATH_SUFFIXES}" ${LIBRARY_PATH_SUFFIXES}
+			)
+
+
+find_library(WEBP_LIBRARY_DEBUG NAMES webp_debug libwebp libwebp_a libwebp
+             HINTS "${WEBP_DIR}"
+             PATH_SUFFIXES "${PATH_SUFFIXES}" ${LIBRARY_PATH_SUFFIXES} 
+			)
+
+select_library_configurations(WEBP)
+
+find_package_handle_standard_args(WEBP DEFAULT_MSG
+                                  WEBP_INCLUDE_DIR)
+
+mark_as_advanced(WEBP_INCLUDE_DIR)
+
+set( WEBP_FOUND "NO" )
+if( WEBP_LIBRARY AND WEBP_INCLUDE_DIR )
+    set( WEBP_FOUND "YES" )
+endif()
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/OsgEarthMacroUtils.cmake osgearth-2.10.2+dfsg/CMakeModules/OsgEarthMacroUtils.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/OsgEarthMacroUtils.cmake	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/OsgEarthMacroUtils.cmake	2019-07-11 18:30:19.000000000 +0000
@@ -85,7 +85,7 @@
 #  full path of the library name. in order to differentiate release and debug, this macro get the
 #  NAME of the variables, so the macro gets as arguments the target name and the following list of parameters
 #  is intended as a list of variable names each one containing  the path of the libraries to link to
-#  The existance of a variable name with _DEBUG appended is tested and, in case it' s value is used
+#  The existence of a variable name with _DEBUG appended is tested and, in case it's value is used
 #  for linking to when in debug mode
 #  the content of this library for linking when in debugging
 #######################################################################################################
@@ -169,12 +169,13 @@
 #    ENDFOREACH(LINKLIB)
     LINK_INTERNAL(${TARGET_TARGETNAME} ${TARGET_LIBRARIES})
 
+    IF(TARGET_LIBRARIES_VARS)
+            LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS})
+    ENDIF(TARGET_LIBRARIES_VARS)
+
     FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
             TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
     ENDFOREACH(LINKLIB)
-        IF(TARGET_LIBRARIES_VARS)
-            LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS})
-        ENDIF(TARGET_LIBRARIES_VARS)
 ENDMACRO(SETUP_LINK_LIBRARIES)
 
 ############################################################################################
@@ -231,6 +232,10 @@
 		
     ENDIF(WIN32)
 
+    IF(OSG_BUILD_PLATFORM_IPHONE)
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
+    ENDIF()
+
     # install the shader source files
     if(OSGEARTH_INSTALL_SHADERS)
         INSTALL(
@@ -317,6 +322,10 @@
             FILES ${TARGET_GLSL} 
             DESTINATION resources/shaders )
     endif(OSGEARTH_INSTALL_SHADERS)
+
+    IF(OSG_BUILD_PLATFORM_IPHONE)
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
+    ENDIF()
     
 #finally, set up the solution folder -gw
     SET_PROPERTY(TARGET ${TARGET_TARGETNAME} PROPERTY FOLDER "Extensions")    
@@ -383,6 +392,10 @@
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RELWITHDEBINFO_OUTPUT_NAME "${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}")
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES MINSIZEREL_OUTPUT_NAME "${TARGET_NAME}${CMAKE_MINSIZEREL_POSTFIX}")
 
+    IF(OSG_BUILD_PLATFORM_IPHONE)
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
+    ENDIF()
+
     SETUP_LINK_LIBRARIES()
 
 ENDMACRO(SETUP_EXE)
diff -Nru osgearth-2.9.0+dfsg/CMakeModules/UtilityMacros.cmake osgearth-2.10.2+dfsg/CMakeModules/UtilityMacros.cmake
--- osgearth-2.9.0+dfsg/CMakeModules/UtilityMacros.cmake	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/CMakeModules/UtilityMacros.cmake	2019-07-11 18:30:19.000000000 +0000
@@ -3,7 +3,7 @@
 
 
   MACRO(FILTER_OUT FILTERS INPUTS OUTPUT)
-       # Mimicks Gnu Make's $(filter-out) which removes elements 
+       # Mimics Gnu Make's $(filter-out) which removes elements 
        # from a list that match the pattern.
        # Arguments:
        #  FILTERS - list of patterns that need to be removed
diff -Nru osgearth-2.9.0+dfsg/debian/changelog osgearth-2.10.2+dfsg/debian/changelog
--- osgearth-2.9.0+dfsg/debian/changelog	2018-02-07 17:53:05.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/changelog	2020-03-08 11:00:00.000000000 +0000
@@ -1,3 +1,94 @@
+osgearth (2.10.2+dfsg-1~bionic3) bionic; urgency=medium
+  
+  * No change rebuild for GDAL 3.0.4 transition.
+
+ -- Angelos Tzotsos <gcpp.kalxas@gmail.com>  Sun, 08 Mar 2020 13:00:00 +0200
+
+osgearth (2.10.2+dfsg-1~bionic2) bionic; urgency=medium
+  
+  * No change rebuild for Bionic.
+
+ -- Angelos Tzotsos <gcpp.kalxas@gmail.com>  Sun, 27 Oct 2019 14:00:00 +0200
+
+osgearth (2.10.2+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.4.0, no changes.
+  * Refresh patches.
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 12 Jul 2019 06:59:21 +0200
+
+osgearth (2.10.1+dfsg-1) unstable; urgency=medium
+
+  * Update gbp.conf to use --source-only-changes by default.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 07 Jul 2019 09:07:32 +0200
+
+osgearth (2.10.1+dfsg-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.3.0, no changes.
+  * Update copyright file, changes:
+    - Update copyright years for Pelican Mapping
+    - Add license & copyright for gltf sources
+  * Refresh patches.
+  * Add lintian overrides for file-references-package-build-path.
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 19 Apr 2019 21:27:39 +0200
+
+osgearth (2.10.0+dfsg-1) unstable; urgency=medium
+
+  * Update symbols for other architectures.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 14 Nov 2018 18:10:26 +0100
+
+osgearth (2.10.0+dfsg-1~exp2) experimental; urgency=medium
+
+  * Disable FastDXT image compressor, FTBFS on non-amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 13 Nov 2018 12:20:23 +0100
+
+osgearth (2.10.0+dfsg-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.2.1, no changes.
+  * Update watch file to limit matches to archive path.
+  * Add Build-Depends-Package field to symbols files.
+  * Update Files-Excluded for osgEarth 2.10.
+  * Update copyright file, changes:
+    - Update copyright years for Pelican Mapping
+    - Add license & copyright for EGLview.java
+  * Refresh patches.
+  * Drop libosgearthqt5 package, osgEarthQt not longer built.
+  * Add lintian override for spelling error false positive.
+  * Remove package name from lintian overrides.
+  * Add manpages for new executables.
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 13 Nov 2018 07:31:56 +0100
+
+osgearth (2.9.0+dfsg-3) unstable; urgency=medium
+
+  * Drop autopkgtest to test installability.
+  * Add lintian override for testsuite-autopkgtest-missing.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 01 Aug 2018 08:55:54 +0200
+
+osgearth (2.9.0+dfsg-2) unstable; urgency=medium
+
+  * Update Vcs-* URLs for Salsa.
+  * Bump Standards-Version to 4.1.5, no changes.
+  * Drop obsolete get-orig-source target.
+  * Strip trailing whitespace from control & rules files.
+  * Remove documentation outside usr/share/doc.
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 20 Jul 2018 22:53:12 +0200
+
 osgearth (2.9.0+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru osgearth-2.9.0+dfsg/debian/control osgearth-2.10.2+dfsg/debian/control
--- osgearth-2.9.0+dfsg/debian/control	2018-02-07 17:53:01.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/control	2019-07-10 16:43:03.000000000 +0000
@@ -15,19 +15,17 @@
                libexpat1-dev,
                libnoise-dev,
                libprotobuf-dev,
-               libqt5opengl5-dev,
                libsqlite3-dev,
                protobuf-compiler,
-               qtbase5-dev,
                zlib1g-dev,
                pkg-kde-tools,
                docbook2x,
                docbook-xsl,
                docbook-xml,
                xsltproc
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/osgearth.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/osgearth.git
+Standards-Version: 4.4.0
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/osgearth
+Vcs-Git: https://salsa.debian.org/debian-gis-team/osgearth.git
 Homepage: http://osgearth.org/
 
 Package: osgearth
@@ -111,22 +109,6 @@
  .
  This package contains the shared library libosgEarthFeatures.
 
-Package: libosgearthqt5-5
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Suggests: openscenegraph-3.4
-Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (osgEarthQt)
- osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
- (OSG), an open source, high performance, 3D graphics toolkit. Just create a
- simple XML file, point it at your imagery, elevation, and vector data, load it
- into your favorite OSG application, and go! osgEarth supports all kinds of
- data and comes with lots of examples to help you get up and running quickly
- and easily.
- .
- This package contains the shared library libosgEarthQt.
-
 Package: libosgearthsplat5
 Architecture: any
 Section: libs
@@ -195,7 +177,6 @@
 Depends: libosgearth5 (= ${binary:Version}),
          libosgearthannotation5 (= ${binary:Version}),
          libosgearthfeatures5 (= ${binary:Version}),
-         libosgearthqt5-5 (= ${binary:Version}),
          libosgearthsplat5 (= ${binary:Version}),
          libosgearthsymbology5 (= ${binary:Version}),
          libosgearthutil5 (= ${binary:Version}),
@@ -212,4 +193,3 @@
  and easily.
  .
  This package contains the development files.
-
diff -Nru osgearth-2.9.0+dfsg/debian/copyright osgearth-2.10.2+dfsg/debian/copyright
--- osgearth-2.9.0+dfsg/debian/copyright	2018-02-07 17:48:09.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/copyright	2019-04-19 19:25:30.000000000 +0000
@@ -31,10 +31,12 @@
  data/2s19_ru_desert.tga.attr
  data/2s19_ru_dmg_desert.tga
  data/2s19_ru_tred_common.tga
+ data/airport.png
  data/arconline_nodata.png
  data/asphalt.jpg
  data/axes.osgt
  data/bank.png
+ data/bluemarble_tilepackage/*
  data/BostonBldgs.kmz
  data/boston_buildings_utm19.*
  data/boston-inset.tif
@@ -44,22 +46,18 @@
  data/boxman.osg
  data/cessna.osgb
  data/ci10nv09.*
- data/cities.dbf
- data/cities.prj
- data/cities.shp
- data/cities.shx
- data/cities_mercator.dbf
- data/cities_mercator.prj
- data/cities_mercator.shp
- data/cities_mercator.shx
+ data/cities.gpkg
+ data/cities_mercator.*
  data/cloud_combined_2048.jpg
  data/colorramps/*
  data/dcbuildings.*
  data/downarrow.png
  data/fells_loop.gpx
+ data/flag_us.png
  data/flatten_mt_rainier.*
  data/fractal.png
  data/france.*
+ data/grid2.png
  data/honolulu.mbtiles
  data/hospital.png
  data/icon.png
@@ -73,7 +71,6 @@
  data/mgrs_sqid.bin
  data/moon_1024x512.jpg
  data/ne_10m_coastline.zip
- data/ne_cities.*
  data/nodata.tif
  data/noise3.png
  data/nyc-inset-wgs84.tif
@@ -98,6 +95,7 @@
  data/tank.FLT
  data/terrain/*
  data/test_bump.png
+ data/textures/*
  data/tfs_boston.zip
  data/tree.gif
  data/tree.ive
@@ -113,14 +111,19 @@
  data/world.prj
  data/world.shp
  data/world.shx
+ data/world_countries.mbtiles
 License: LGPL-3+
 
 Files: *
-Copyright: 2008-2016, Pelican Mapping
+Copyright: 2008-2019, Pelican Mapping
                 2012, Thomas Hogarth
            2008-2010, Pelican Ventures, Inc
 License: LGPL-2+
 
+Files: src/applications/osgearth_viewer_android/src/osg/AndroidExample/EGLview.java
+Copyright: 2008, The Android Open Source Project
+License: Apache-2.0
+
 Files: src/applications/osgearth_viewerIOS/EarthMultiTouchManipulator.cpp
  src/applications/osgearth_viewerIOS/EarthMultiTouchManipulator.h
 Copyright: 1998-2010, Robert Osfield
@@ -156,6 +159,20 @@
            2007, Electronic Visualization Laboratory, University of Illinois at Chicago
 License: LGPL-2.1+
 
+Files: src/osgEarthDrivers/gltf/json.hpp
+Copyright: 2013-2017, Niels Lohmann <http://nlohmann.me>
+License: Expat
+
+Files: src/osgEarthDrivers/gltf/stb_image.h
+ src/osgEarthDrivers/gltf/stb_image_write.h
+Copyright: Disclaimed
+License: public-domain
+ no warranty implied; use at your own risk
+
+Files: src/osgEarthDrivers/gltf/tiny_gltf.h
+Copyright:  2015-2018, Syoyo Fujita, Aurélien Chatelain and many contributors.
+License: Expat
+
 Files: src/osgEarthDrivers/kml/rapidxml.hpp
  src/osgEarthDrivers/kml/rapidxml_ext.hpp
  src/osgEarthDrivers/kml/rapidxml_iterators.hpp
@@ -250,6 +267,22 @@
  Robert Wilhelm, and Werner Lemberg - the authors of the FreeType
  libray - in producing this work. See http://www.freetype.org for details.
 
+License: Apache-2.0
+ 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.
+ .
+ On Debian systems, the complete text of the Apache License can be found
+ in `/usr/share/common-licenses/Apache-2.0'.
+
 License: BSL-1.0
  Boost Software License - Version 1.0 - August 17th, 2003
  .
diff -Nru osgearth-2.9.0+dfsg/debian/gbp.conf osgearth-2.10.2+dfsg/debian/gbp.conf
--- osgearth-2.9.0+dfsg/debian/gbp.conf	2018-02-07 17:48:25.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/gbp.conf	2019-07-07 07:07:08.000000000 +0000
@@ -14,3 +14,6 @@
 
 # Always use pristine-tar.
 pristine-tar = True
+
+[buildpackage]
+pbuilder-options = --source-only-changes
diff -Nru osgearth-2.9.0+dfsg/debian/get-orig-source osgearth-2.10.2+dfsg/debian/get-orig-source
--- osgearth-2.9.0+dfsg/debian/get-orig-source	2018-01-25 06:30:06.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/get-orig-source	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-#!/bin/sh -x
-# Repack tarball because of data files with unknown license
-
-set -e
-
-# Remark: A new uscan that enables easier handling of removing files can be
-#         obtained via
-#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
-#         and then copy scripts/uscan.pl as uscan at the beginning of your PATH
-if uscan --help | grep -q -- --repack-compression ; then
-    echo "Use new enhanced uscan"
-    uscan --verbose --force-download --repack-compression xz
-    exit
-fi
-
-# Falling back to manually removing files
-
-PACKAGE=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
-VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//'`
-UVERSION=`echo $VERSION | sed 's/\.0\$//'`
-
-uscan --verbose --force-download --no-symlink
-
-mkdir -p ../tarballs
-cd ../tarballs
-
-tar -xaf ../${PACKAGE}-${UVERSION}.tar.gz
-
-# Directory in upstream tarball can contain the project name twice
-if [ -d "${PACKAGE}-${PACKAGE}-${UVERSION}" ]; then
-	mv ${PACKAGE}-${PACKAGE}-${UVERSION} ${PACKAGE}-${UVERSION}
-fi
-
-# Remove data files with unknown license
-find ${PACKAGE}-${UVERSION}/data/ -not -name world.tif -not -path "*/resources/*" -type f -delete
-
-mv ${PACKAGE}-${UVERSION} ${PACKAGE}-${VERSION}+dfsg.orig
-
-XZ_OPT="-6v" tar --owner=root --group=root --mode=a+rX -caf ../"${PACKAGE}"_"${VERSION}"+dfsg.orig.tar.xz "${PACKAGE}-${VERSION}"+dfsg.orig
-
-rm -rf "${PACKAGE}-${VERSION}"+dfsg.orig
-
diff -Nru osgearth-2.9.0+dfsg/debian/libosgearth5.lintian-overrides osgearth-2.10.2+dfsg/debian/libosgearth5.lintian-overrides
--- osgearth-2.9.0+dfsg/debian/libosgearth5.lintian-overrides	2018-01-25 06:30:06.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/libosgearth5.lintian-overrides	2018-11-13 08:35:48.000000000 +0000
@@ -1,8 +1,8 @@
 # Linking with libtinyxml is risky, because osgearth contains
 # patched version from CVS, compiled without TIXML_USE_STL.
 # libtinyxml provides only tinyxml with STL support.
-libosgearth5: embedded-library usr/lib/libosgEarth.so.*: tinyxml
+embedded-library usr/lib/libosgEarth.so.*: tinyxml
 
 # False positive, string not included in source.
-libosgearth5: spelling-error-in-binary usr/lib/libosgEarth.so.* refrenced referenced
+spelling-error-in-binary usr/lib/libosgEarth.so.* refrenced referenced
 
diff -Nru osgearth-2.9.0+dfsg/debian/libosgearth5.symbols osgearth-2.10.2+dfsg/debian/libosgearth5.symbols
--- osgearth-2.9.0+dfsg/debian/libosgearth5.symbols	2018-02-07 17:53:05.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/libosgearth5.symbols	2019-07-12 04:59:21.000000000 +0000
@@ -1,9 +1,9 @@
-# SymbolsHelper-Confirmed: 2.9.0 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64
+# SymbolsHelper-Confirmed: 2.10.2 amd64
 libosgEarth.so.5 #PACKAGE# #MINVER#
+* Build-Depends-Package: libosgearth-dev
  _Z10TiXmlFOpenPKcS0_@Base 2.4.0
+ _Z30wrapper_propfunc_osgEarth_TextPN5osgDB13ObjectWrapperE@Base 2.10.0
  _ZGVZN13DeclutterSort18sortImplementationEPN7osgUtil9RenderBinEE8s_zero_w@Base 2.5.0
- _ZN10NullStreamD0Ev@Base 2.4.0
- _ZN10NullStreamD1Ev@Base 2.4.0
  _ZN11ExecuteTaskD0Ev@Base 2.6.0
  _ZN11ExecuteTaskD1Ev@Base 2.6.0
  _ZN11ExecuteTaskD2Ev@Base 2.6.0
@@ -31,16 +31,11 @@
  _ZN14HandleTileTaskD1Ev@Base 2.6.0
  _ZN14HandleTileTaskD2Ev@Base 2.6.0
  _ZN14HandleTileTaskclEPN8osgEarth16ProgressCallbackE@Base 2.6.0
- _ZN14osgEarth_TEMP125wrapper_propfunc_LightGL3EPN5osgDB13ObjectWrapperE@Base 2.9.0
- _ZN14osgEarth_TEMP228wrapper_propfunc_MaterialGL3EPN5osgDB13ObjectWrapperE@Base 2.9.0
- (arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZN16NullStreamBuffer6xsputnEPKci@Base 2.4.0
- (arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN16NullStreamBuffer6xsputnEPKcl@Base 2.8.0
- _ZN16NullStreamBufferD0Ev@Base 2.4.0
- _ZN16NullStreamBufferD1Ev@Base 2.4.0
- _ZN16NullStreamBufferD2Ev@Base 2.4.0
+ _ZN15NotifySingletonD1Ev@Base 2.10.0
+ _ZN15NotifySingletonD2Ev@Base 2.10.0
  _ZN16TiXmlParsingData5StampEPKc13TiXmlEncoding@Base 2.4.0
- _ZN26RegisterEarthTileExtensionC1Ev@Base 2.4.0
- _ZN26RegisterEarthTileExtensionC2Ev@Base 2.4.0
+ (arch=!amd64 !arm64 !i386 !m68k !mips !mips64el !mipsel !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sparc64 !x32)_ZN26RegisterEarthTileExtensionC1Ev@Base 2.9.0
+ (arch=!amd64 !arm64 !i386 !m68k !mips !mips64el !mipsel !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sparc64 !x32)_ZN26RegisterEarthTileExtensionC2Ev@Base 2.9.0
  _ZN29osgEarthStringReaderWriterXMLD0Ev@Base 2.4.0
  _ZN29osgEarthStringReaderWriterXMLD1Ev@Base 2.4.0
  _ZN29osgEarthStringReaderWriterXMLD2Ev@Base 2.4.0
@@ -56,6 +51,7 @@
  _ZN34osgEarthScreenSpaceLayoutRenderBinD1Ev@Base 2.8~rc1
  _ZN34osgEarthScreenSpaceLayoutRenderBinD2Ev@Base 2.8~rc1
  _ZN3osg10BufferData14asPrimitiveSetEv@Base 2.7.0
+ _ZN3osg10BufferData5dirtyEv@Base 2.10.0
  _ZN3osg10BufferData7asArrayEv@Base 2.6.0
  _ZN3osg10BufferData7asImageEv@Base 2.6.0
  _ZN3osg10CullingSet14popCurrentMaskEv@Base 2.4.0
@@ -90,10 +86,9 @@
  (optional=templinst)_ZN3osg11MixinVectorIsED1Ev@Base 2.9.0
  (optional=templinst)_ZN3osg11MixinVectorIsED2Ev@Base 2.9.0
  _ZN3osg11NodeVisitor13asNodeVisitorEv@Base 2.8~rc1
- _ZN3osg11NodeVisitor15popFromNodePathEv@Base 2.7.0
+ (arch=!i386 !mips !mipsel !powerpc !powerpcspe !ppc64 !s390x)_ZN3osg11NodeVisitor15popFromNodePathEv@Base 2.10.0
  _ZN3osg11NodeVisitor16pushOntoNodePathEPNS_4NodeE@Base 2.4.0
  _ZN3osg11NodeVisitor5resetEv@Base 2.4.0
- _ZN3osg11NodeVisitor8traverseERNS_4NodeE@Base 2.9.0
  _ZN3osg11ValueObject15GetValueVisitor5applyEb@Base 2.6.0
  _ZN3osg11ValueObject15SetValueVisitor5applyERb@Base 2.6.0
  _ZN3osg11ValueObject3setERNS0_15SetValueVisitorE@Base 2.6.0
@@ -108,7 +103,8 @@
  _ZN3osg12ValueVisitor5applyERf@Base 2.8~rc1
  _ZN3osg12ValueVisitor5applyERj@Base 2.7.0
  _ZN3osg12ValueVisitor5applyERs@Base 2.9.0
- _ZN3osg13AutoTransform15asAutoTransformEv@Base 2.4.0
+ (optional=templinst)_ZN3osg12observer_ptrINS_8StateSetEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN3osg12observer_ptrINS_8StateSetEED2Ev@Base 2.10.0
  _ZN3osg13KdTreeBuilder5cloneEv@Base 2.7.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EE11resizeArrayEj@Base 2.8~rc1
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EE12reserveArrayEj@Base 2.8~rc1
@@ -154,7 +150,7 @@
  _ZN3osg17ConstValueVisitor5applyERKs@Base 2.9.0
  _ZN3osg17DrawElementsUByte10addElementEj@Base 2.8~rc1
  _ZN3osg17DrawElementsUByte10getElementEj@Base 2.6.0
- (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZN3osg18BoundingSphereImplINS_5Vec3dEE8expandByIS1_EEvRKT_@Base 2.9.0
+ (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc powerpcspe)_ZN3osg18BoundingSphereImplINS_5Vec3dEE8expandByIS1_EEvRKT_@Base 2.9.0
  (optional=templinst)_ZN3osg18BoundingSphereImplINS_5Vec3fEE8expandByERKS2_@Base 2.4.0
  _ZN3osg18DrawElementsUShort10getElementEj@Base 2.6.0
  (optional=templinst)_ZN3osg18TemplateIndexArrayIjLNS_5Array4TypeE6ELi1ELi5125EE11resizeArrayEj@Base 2.7.0
@@ -196,6 +192,7 @@
  _ZN3osg4Node9asTerrainEv@Base 2.4.0
  _ZN3osg5Array4trimEv@Base 2.7.0
  _ZN3osg5Array7asArrayEv@Base 2.7.0
+ _ZN3osg5Geode7asGeodeEv@Base 2.10.0
  _ZN3osg5Group12childRemovedEjj@Base 2.4.0
  _ZN3osg5Group13childInsertedEj@Base 2.4.0
  _ZN3osg5Group6acceptERNS_11NodeVisitorE@Base 2.4.0
@@ -206,19 +203,22 @@
  _ZN3osg5Image20setFrameLastRenderedEPKNS_10FrameStampE@Base 2.9.0
  _ZN3osg5Image6updateEPNS_11NodeVisitorE@Base 2.9.0
  _ZN3osg5Image7asImageEv@Base 2.9.0
- _ZN3osg5Plane25transformProvidingInverseERKNS_7MatrixdE@Base 2.8~rc1
+ (arch=!i386 !m68k !powerpc !powerpcspe !x32)_ZN3osg5Plane25transformProvidingInverseERKNS_7MatrixdE@Base 2.10.1
  _ZN3osg5Plane3setERKNS_5Vec3dES3_S3_@Base 2.7.0
- (arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZN3osg5Plane3setERKS0_@Base 2.6.0
+ (arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64 !x32)_ZN3osg5Plane3setERKS0_@Base 2.6.0
  _ZN3osg5Vec3d9normalizeEv@Base 2.6.0
  (optional=templinst)_ZN3osg5cloneIN5osgDB7OptionsEEEPT_PKS3_RKNS_6CopyOpE@Base 2.4.0
- (optional=templinst|arch=alpha amd64 arm64 armel armhf hppa kfreebsd-i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64)_ZN3osg5cloneIN8osgEarth14VirtualProgramEEEPT_PKS3_RKNS_6CopyOpE@Base 2.8~rc1
- (optional=templinst)_ZN3osg5cloneIN8osgEarth7HorizonEEEPT_PKS3_RKNS_6CopyOpE@Base 2.8~rc1
+ (optional=templinst)_ZN3osg5cloneIN8osgEarth14VirtualProgramEEEPT_PKS3_RKNS_6CopyOpE@Base 2.8~rc1
+ (optional=templinst)_ZN3osg5cloneINS_10RefMatrixdEEEPT_PKS2_RKNS_6CopyOpE@Base 2.10.1
+ _ZN3osg5cloneINS_13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EEEEEPT_PKS6_RKNS_6CopyOpE@Base 2.10.0
+ (optional=templinst)_ZN3osg5cloneINS_4NodeEEEPT_PKS2_RKNS_6CopyOpE@Base 2.9.0
  (optional=templinst)_ZN3osg5cloneINS_5ImageEEEPT_PKS2_RKNS_6CopyOpE@Base 2.4.0
  (optional=templinst)_ZN3osg5cloneINS_6ObjectEEEPT_PKS2_RKNS_6CopyOpE@Base 2.4.0
  (optional=templinst)_ZN3osg5cloneINS_7ProgramEEEPT_PKS2_RKNS_6CopyOpE@Base 2.4.0
  (optional=templinst)_ZN3osg5cloneINS_8StateSetEEEPT_PKS2_RKNS_6CopyOpE@Base 2.4.0
  _ZN3osg6Camera6acceptERNS_11NodeVisitorE@Base 2.6.0
  _ZN3osg6Camera8asCameraEv@Base 2.8~rc1
+ (optional=templinst)_ZN3osg6Object12setUserValueIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.9.0
  _ZN3osg6Object13asNodeVisitorEv@Base 2.8~rc1
  _ZN3osg6Object16asStateAttributeEv@Base 2.8~rc1
  _ZN3osg6Object19computeDataVarianceEv@Base 2.4.0
@@ -226,31 +226,27 @@
  _ZN3osg6Object6asNodeEv@Base 2.8~rc1
  _ZN3osg6Object7setNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN3osg6Object9asUniformEv@Base 2.8~rc1
- (arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZN3osg7Matrixd6invertERKS0_@Base 2.9.0
+ (arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc powerpcspe)_ZN3osg7Matrixd6invertERKS0_@Base 2.10.0
  _ZN3osg7MatrixdD1Ev@Base 2.4.0
  _ZN3osg7MatrixdD2Ev@Base 2.4.0
  _ZN3osg7Texture9asTextureEv@Base 2.8~rc1
- (optional=templinst|arch=!armel !armhf !hurd-i386 !i386 !m68k !mips !mipsel !powerpc)_ZN3osg7ref_ptrIKN8osgEarth16SpatialReferenceEE6assignIS3_EEvRKNS0_IT_EE@Base 2.9.0
- (optional=templinst)_ZN3osg7ref_ptrIKN8osgEarth16SpatialReferenceEEaSEPS3_@Base 2.4.0
+ (optional=templinst|arch=amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN3osg7ref_ptrIKN8osgEarth16SpatialReferenceEEaSEPS3_@Base 2.4.0
  (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth10TileSourceEEaSEPS2_@Base 2.7.0
  (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth11URLRewriterEED1Ev@Base 2.5.0
  (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth11URLRewriterEED2Ev@Base 2.5.0
- (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth12TerrainLayer16CacheBinMetadataEEaSEPS3_@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf powerpc powerpcspe)_ZN3osg7ref_ptrIN8osgEarth14ElevationLayerEEaSEPS2_@Base 2.10.0
  (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth14MetricsBackendEED1Ev@Base 2.9.0
  (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth14MetricsBackendEED2Ev@Base 2.9.0
  (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth16SpatialReferenceEEaSEPS2_@Base 2.4.0
  (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth17CurlConfigHandlerEED1Ev@Base 2.6.0
  (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth17CurlConfigHandlerEED2Ev@Base 2.6.0
- (optional=templinst|arch=mips64el ppc64el sparc64)_ZN3osg7ref_ptrIN8osgEarth8CacheBinEEaSEPS2_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 i386 mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64)_ZN3osg7ref_ptrIN8osgEarth8CacheBinEEaSEPS2_@Base 2.9.0
  (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth8RegistryEED1Ev@Base 2.4.0
  (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth8RegistryEED2Ev@Base 2.4.0
- (optional=templinst)_ZN3osg7ref_ptrINS_11HeightFieldEE6assignIS1_EEvRKNS0_IT_EE@Base 2.6.0
- (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZN3osg7ref_ptrINS_5ImageEE6assignIS1_EEvRKNS0_IT_EE@Base 2.9.0
+ (optional=templinst)_ZN3osg7ref_ptrINS_11HeightFieldEEaSEPS1_@Base 2.10.1
  (optional=templinst)_ZN3osg7ref_ptrINS_5ImageEED1Ev@Base 2.4.0
  (optional=templinst)_ZN3osg7ref_ptrINS_5ImageEED2Ev@Base 2.4.0
  (optional=templinst)_ZN3osg7ref_ptrINS_5ImageEEaSEPS1_@Base 2.9.0
- (optional=templinst)_ZN3osg7ref_ptrINS_6ShaderEE6assignIS1_EEvRKNS0_IT_EE@Base 2.8~rc1
- (optional=templinst)_ZN3osg7ref_ptrINS_7ProgramEEaSEPS1_@Base 2.5.0
  _ZN3osg8Callback3runEPNS_6ObjectES2_@Base 2.8~rc1
  _ZN3osg8CallbackD0Ev@Base 2.8~rc1
  _ZN3osg8CallbackD1Ev@Base 2.8~rc1
@@ -259,12 +255,16 @@
  _ZN3osg8Drawable12CullCallbackD0Ev@Base 2.4.0
  _ZN3osg8Drawable12CullCallbackD1Ev@Base 2.4.0
  _ZN3osg8Drawable15setDrawCallbackEPNS0_12DrawCallbackE@Base 2.8~rc1
+ _ZN3osg8Drawable26ComputeBoundingBoxCallbackD0Ev@Base 2.10.0
+ _ZN3osg8Drawable26ComputeBoundingBoxCallbackD1Ev@Base 2.10.0
+ _ZN3osg8Drawable26ComputeBoundingBoxCallbackD2Ev@Base 2.10.0
  _ZN3osg8Drawable6acceptERNS0_16AttributeFunctorE@Base 2.8~rc1
  _ZN3osg8Drawable6acceptERNS_11NodeVisitorE@Base 2.8~rc1
+ _ZN3osg8Geometry10asGeometryEv@Base 2.10.0
  _ZN3osg8PagedLOD6acceptERNS_11NodeVisitorE@Base 2.4.0
  _ZN3osg8Polytope16setToUnitFrustumEbb@Base 2.4.0
  _ZN3osg8Polytope31setAndTransformProvidingInverseERKS0_RKNS_7MatrixdE@Base 2.4.0
- _ZN3osg8Polytope9setupMaskEv@Base 2.7.0
+ (arch=!x32)_ZN3osg8Polytope9setupMaskEv@Base 2.10.0
  _ZN3osg8PolytopeC1Ev@Base 2.7.0
  _ZN3osg8PolytopeC2Ev@Base 2.7.0
  _ZN3osg8PolytopeD1Ev@Base 2.4.0
@@ -275,6 +275,8 @@
  _ZN3osg9Transform11asTransformEv@Base 2.4.0
  _ZN3osg9Transform17asMatrixTransformEv@Base 2.4.0
  _ZN3osg9Transform27asPositionAttitudeTransformEv@Base 2.4.0
+ _ZN3osg9cloneTypeINS_13TemplateArrayIfLNS_5Array4TypeE7ELi1ELi5126EEEEEPT_PKS5_@Base 2.10.0
+ _ZN4sha113process_blockEPKh@Base 2.10.0
  _ZN5osgDB11InputStream11checkStreamEv@Base 2.8~rc1
  _ZN5osgDB12ReaderWriter10ReadResultD1Ev@Base 2.4.0
  _ZN5osgDB12ReaderWriter10ReadResultD2Ev@Base 2.4.0
@@ -303,16 +305,56 @@
  (optional=templinst)_ZN5osgDB16StringSerializerIN8osgEarth12StringObjectEED0Ev@Base 2.4.0
  (optional=templinst)_ZN5osgDB16StringSerializerIN8osgEarth12StringObjectEED1Ev@Base 2.4.0
  (optional=templinst)_ZN5osgDB16StringSerializerIN8osgEarth12StringObjectEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN5osgDB19PropByRefSerializerIN8osgEarth12LineDrawableEN3osg5Vec4fEE4readERNS_11InputStreamERNS3_6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByRefSerializerIN8osgEarth12LineDrawableEN3osg5Vec4fEE5writeERNS_12OutputStreamERKNS3_6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByRefSerializerIN8osgEarth12LineDrawableEN3osg5Vec4fEED0Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByRefSerializerIN8osgEarth12LineDrawableEN3osg5Vec4fEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByRefSerializerIN8osgEarth12LineDrawableEN3osg5Vec4fEED2Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByRefSerializerIN8osgEarth13PointDrawableEN3osg5Vec4fEE4readERNS_11InputStreamERNS3_6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByRefSerializerIN8osgEarth13PointDrawableEN3osg5Vec4fEE5writeERNS_12OutputStreamERKNS3_6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByRefSerializerIN8osgEarth13PointDrawableEN3osg5Vec4fEED0Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByRefSerializerIN8osgEarth13PointDrawableEN3osg5Vec4fEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByRefSerializerIN8osgEarth13PointDrawableEN3osg5Vec4fEED2Ev@Base 2.10.0
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN3osg13TextureBufferEiE4readERNS_11InputStreamERNS1_6ObjectE@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN3osg13TextureBufferEiE5writeERNS_12OutputStreamERKNS1_6ObjectE@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN3osg13TextureBufferEiED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN3osg13TextureBufferEiED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN3osg13TextureBufferEiED2Ev@Base 2.8~rc1
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEfE4readERNS_11InputStreamERN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEfE5writeERNS_12OutputStreamERKN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEfED0Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEfED1Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEfED2Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEiE4readERNS_11InputStreamERN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEiE5writeERNS_12OutputStreamERKN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEiED0Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEiED1Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEiED2Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEjE4readERNS_11InputStreamERN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEjE5writeERNS_12OutputStreamERKN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEjED0Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEjED1Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEjED2Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEtE4readERNS_11InputStreamERN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEtE5writeERNS_12OutputStreamERKN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEtED0Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEtED1Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEtED2Ev@Base 2.10.0
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13DrapeableNodeEbE4readERNS_11InputStreamERN3osg6ObjectE@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13DrapeableNodeEbE5writeERNS_12OutputStreamERKN3osg6ObjectE@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13DrapeableNodeEbED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13DrapeableNodeEbED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13DrapeableNodeEbED2Ev@Base 2.8~rc1
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEfE4readERNS_11InputStreamERN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEfE5writeERNS_12OutputStreamERKN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEfED0Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEfED1Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEfED2Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEjE4readERNS_11InputStreamERN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEjE5writeERNS_12OutputStreamERKN3osg6ObjectE@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEjED0Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEjED1Ev@Base 2.10.0
+ (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEjED2Ev@Base 2.10.0
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth14VirtualProgramEbE4readERNS_11InputStreamERN3osg6ObjectE@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth14VirtualProgramEbE5writeERNS_12OutputStreamERKN3osg6ObjectE@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB19PropByValSerializerIN8osgEarth14VirtualProgramEbED0Ev@Base 2.8~rc1
@@ -336,9 +378,28 @@
  (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyI30osgEarthStringReaderWriterJSONEC2Ev@Base 2.4.0
  (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyI30osgEarthStringReaderWriterJSONED1Ev@Base 2.4.0
  (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyI30osgEarthStringReaderWriterJSONED2Ev@Base 2.4.0
+ (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyIN8osgEarth21AsyncNodePseudoLoaderEEC1Ev@Base 2.10.1
+ (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyIN8osgEarth21AsyncNodePseudoLoaderEEC2Ev@Base 2.10.1
+ (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyIN8osgEarth21AsyncNodePseudoLoaderEED1Ev@Base 2.10.1
+ (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyIN8osgEarth21AsyncNodePseudoLoaderEED2Ev@Base 2.10.1
  _ZN5osgDB7OptionsD0Ev@Base 2.4.0
  _ZN5osgDB7OptionsD1Ev@Base 2.4.0
  _ZN5osgDB7OptionsD2Ev@Base 2.4.0
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjE10indexCurveEPNS2_4NodeE@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjE10linkedListISt6vectorIN3osg5Vec2fESaIS6_EEEEPNS2_4NodeERKT_b@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjE11isEarHashedEPNS2_4NodeE@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjE11splitEarcutEPNS2_4NodeE@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjE12earcutLinkedEPNS2_4NodeEi@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjE12splitPolygonEPNS2_4NodeES4_@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjE14eliminateHolesISt6vectorIS4_IN3osg5Vec2fESaIS6_EESaIS8_EEEEPNS2_4NodeERKT_SC_@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjE14findHoleBridgeEPNS2_4NodeES4_@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjE22cureLocalIntersectionsEPNS2_4NodeE@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjE6zOrderEdd@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjED1Ev@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjED2Ev@Base 2.10.1
+ (optional=templinst)_ZN6mapbox6detail6EarcutIjEclISt6vectorIS4_IN3osg5Vec2fESaIS6_EESaIS8_EEEEvRKT_@Base 2.10.1
+ _ZN7osgText4Text7setFontEPNS_4FontE@Base 2.10.0
+ _ZN7osgText4Text7setFontERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZN7osgUtil10StateGraphD0Ev@Base 2.4.0
  _ZN7osgUtil10StateGraphD1Ev@Base 2.4.0
  _ZN7osgUtil10StateGraphD2Ev@Base 2.4.0
@@ -349,17 +410,27 @@
  _ZN7osgUtil18VertexCacheVisitorD0Ev@Base 2.5.0
  _ZN7osgUtil18VertexCacheVisitorD1Ev@Base 2.5.0
  _ZN7osgUtil19IntersectionVisitorD1Ev@Base 2.4.0
- _ZN7osgUtil22LineSegmentIntersector12IntersectionD1Ev@Base 2.4.0
- _ZN7osgUtil22LineSegmentIntersector12IntersectionD2Ev@Base 2.4.0
  _ZN7osgUtil22LineSegmentIntersector21containsIntersectionsEv@Base 2.4.0
  _ZN7osgUtil24VertexAccessOrderVisitorD0Ev@Base 2.5.0
  _ZN7osgUtil24VertexAccessOrderVisitorD1Ev@Base 2.5.0
+ _ZN7osgUtil9Optimizer20MergeGeometryVisitor5applyERN3osg5GeodeE@Base 2.10.0
+ _ZN7osgUtil9Optimizer20MergeGeometryVisitor5applyERN3osg9BillboardE@Base 2.10.0
+ _ZN7osgUtil9Optimizer20MergeGeometryVisitorD0Ev@Base 2.10.0
+ _ZN7osgUtil9Optimizer20MergeGeometryVisitorD1Ev@Base 2.10.0
  _ZN8osgEarth10DataExtentC1ERKNS_9GeoExtentE@Base 2.4.0
+ _ZN8osgEarth10DataExtentC1ERKNS_9GeoExtentERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZN8osgEarth10DataExtentC1ERKNS_9GeoExtentEj@Base 2.4.0
+ _ZN8osgEarth10DataExtentC1ERKNS_9GeoExtentEjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZN8osgEarth10DataExtentC1ERKNS_9GeoExtentEjj@Base 2.4.0
+ _ZN8osgEarth10DataExtentC1ERKNS_9GeoExtentEjjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ _ZN8osgEarth10DataExtentC1ERKS0_@Base 2.10.0
  _ZN8osgEarth10DataExtentC2ERKNS_9GeoExtentE@Base 2.4.0
+ _ZN8osgEarth10DataExtentC2ERKNS_9GeoExtentERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZN8osgEarth10DataExtentC2ERKNS_9GeoExtentEj@Base 2.4.0
+ _ZN8osgEarth10DataExtentC2ERKNS_9GeoExtentEjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZN8osgEarth10DataExtentC2ERKNS_9GeoExtentEjj@Base 2.4.0
+ _ZN8osgEarth10DataExtentC2ERKNS_9GeoExtentEjjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ _ZN8osgEarth10DataExtentC2ERKS0_@Base 2.10.0
  _ZN8osgEarth10DataExtentD0Ev@Base 2.4.0
  _ZN8osgEarth10DataExtentD1Ev@Base 2.4.0
  _ZN8osgEarth10DataExtentD2Ev@Base 2.4.0
@@ -403,7 +474,8 @@
  _ZN8osgEarth10HTTPClient14getURLRewriterEv@Base 2.5.0
  _ZN8osgEarth10HTTPClient14initializeImplEv@Base 2.4.0
  _ZN8osgEarth10HTTPClient14setURLRewriterEPNS_11URLRewriterE@Base 2.5.0
- _ZN8osgEarth10HTTPClient16setProxySettingsERKNS_13ProxySettingsE@Base 2.4.0
+ _ZN8osgEarth10HTTPClient16getProxySettingsEv@Base 2.10.0
+ _ZN8osgEarth10HTTPClient16setProxySettingsERKNS_8optionalINS_13ProxySettingsEEE@Base 2.10.0
  _ZN8osgEarth10HTTPClient17getConnectTimeoutEv@Base 2.5.0
  _ZN8osgEarth10HTTPClient17setConnectTimeoutEl@Base 2.5.0
  _ZN8osgEarth10HTTPClient20getCurlConfigHandlerEv@Base 2.6.0
@@ -421,13 +493,13 @@
  _ZN8osgEarth10HTTPClientD2Ev@Base 2.4.0
  _ZN8osgEarth10IOMetadata12CONTENT_TYPEB5cxx11E@Base 2.7.0
  _ZN8osgEarth10ImageLayer11createImageERKNS_7TileKeyEPNS_16ProgressCallbackE@Base 2.6.0
+ _ZN8osgEarth10ImageLayer11setAltitudeERKNS_8DistanceE@Base 2.10.0
  _ZN8osgEarth10ImageLayer12fireCallbackEMNS_18ImageLayerCallbackEFvPS0_E@Base 2.4.0
  _ZN8osgEarth10ImageLayer13assembleImageERKNS_7TileKeyEPNS_16ProgressCallbackE@Base 2.9.0
  _ZN8osgEarth10ImageLayer13createTextureERKNS_7TileKeyEPNS_16ProgressCallbackERN3osg7MatrixfE@Base 2.9.0
  _ZN8osgEarth10ImageLayer14addColorFilterEPNS_11ColorFilterE@Base 2.4.0
  _ZN8osgEarth10ImageLayer17removeColorFilterEPNS_11ColorFilterE@Base 2.4.0
- _ZN8osgEarth10ImageLayer18setMaxVisibleRangeEf@Base 2.4.0
- _ZN8osgEarth10ImageLayer18setMinVisibleRangeEf@Base 2.4.0
+ _ZN8osgEarth10ImageLayer19setUseCreateTextureEv@Base 2.10.0
  _ZN8osgEarth10ImageLayer20setTargetProfileHintEPKNS_7ProfileE@Base 2.4.0
  _ZN8osgEarth10ImageLayer21getOrCreatePreCacheOpEv@Base 2.7.0
  _ZN8osgEarth10ImageLayer23createImageInKeyProfileERKNS_7TileKeyEPNS_16ProgressCallbackE@Base 2.6.0
@@ -506,10 +578,10 @@
  _ZN8osgEarth10MaskSourceD0Ev@Base 2.4.0
  _ZN8osgEarth10MaskSourceD1Ev@Base 2.4.0
  _ZN8osgEarth10MaskSourceD2Ev@Base 2.4.0
+ _ZN8osgEarth10ModelLayer10addedToMapEPKNS_3MapE@Base 2.10.0
  _ZN8osgEarth10ModelLayer12fireCallbackEMNS_18ModelLayerCallbackEFvPS0_E@Base 2.4.0
- _ZN8osgEarth10ModelLayer15getOrCreateNodeEv@Base 2.9.0
+ _ZN8osgEarth10ModelLayer14removedFromMapEPKNS_3MapE@Base 2.10.0
  _ZN8osgEarth10ModelLayer18setLightingEnabledEb@Base 2.4.0
- _ZN8osgEarth10ModelLayer21getOrCreateSceneGraphEPKNS_3MapEPNS_16ProgressCallbackE@Base 2.7.0
  _ZN8osgEarth10ModelLayer23getOrCreateMaskBoundaryEfPKNS_16SpatialReferenceEPNS_16ProgressCallbackE@Base 2.6.0
  _ZN8osgEarth10ModelLayer24setLightingEnabledNoLockEb@Base 2.6.0
  _ZN8osgEarth10ModelLayer4initEv@Base 2.9.0
@@ -518,32 +590,42 @@
  _ZN8osgEarth10ModelLayerC1ERKNS_17ModelLayerOptionsEPNS_11ModelSourceE@Base 2.4.0
  _ZN8osgEarth10ModelLayerC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN3osg4NodeE@Base 2.7.0
  _ZN8osgEarth10ModelLayerC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_18ModelSourceOptionsE@Base 2.7.0
- _ZN8osgEarth10ModelLayerC1ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth10ModelLayerC1Ev@Base 2.9.0
  _ZN8osgEarth10ModelLayerC2ERKNS_17ModelLayerOptionsE@Base 2.4.0
  _ZN8osgEarth10ModelLayerC2ERKNS_17ModelLayerOptionsEPNS_11ModelSourceE@Base 2.4.0
  _ZN8osgEarth10ModelLayerC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN3osg4NodeE@Base 2.7.0
  _ZN8osgEarth10ModelLayerC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_18ModelSourceOptionsE@Base 2.7.0
- _ZN8osgEarth10ModelLayerC2ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth10ModelLayerC2Ev@Base 2.9.0
  _ZN8osgEarth10ModelLayerD0Ev@Base 2.4.0
  _ZN8osgEarth10ModelLayerD1Ev@Base 2.4.0
  _ZN8osgEarth10ModelLayerD2Ev@Base 2.4.0
+ _ZN8osgEarth10NullStreamD0Ev@Base 2.10.0
+ _ZN8osgEarth10NullStreamD1Ev@Base 2.10.0
  _ZN8osgEarth10PatchLayer4initEv@Base 2.9.0
  _ZN8osgEarth10PatchLayerC1EPNS_17PatchLayerOptionsE@Base 2.9.0
- _ZN8osgEarth10PatchLayerC1ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth10PatchLayerC1Ev@Base 2.9.0
  _ZN8osgEarth10PatchLayerC2EPNS_17PatchLayerOptionsE@Base 2.9.0
- _ZN8osgEarth10PatchLayerC2ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth10PatchLayerC2Ev@Base 2.9.0
  _ZN8osgEarth10PatchLayerD0Ev@Base 2.9.0
  _ZN8osgEarth10PatchLayerD1Ev@Base 2.9.0
  _ZN8osgEarth10PatchLayerD2Ev@Base 2.9.0
+ _ZN8osgEarth10PointGroup16getPointDrawableEj@Base 2.10.0
+ _ZN8osgEarth10PointGroup6acceptERN3osg11NodeVisitorE@Base 2.10.0
+ _ZN8osgEarth10PointGroup6importEPN3osg4NodeEb@Base 2.10.0
+ _ZN8osgEarth10PointGroup8optimizeEv@Base 2.10.0
+ _ZN8osgEarth10PointGroupC1ERKS0_RKN3osg6CopyOpE@Base 2.10.0
+ _ZN8osgEarth10PointGroupC1Ev@Base 2.10.0
+ _ZN8osgEarth10PointGroupC2ERKS0_RKN3osg6CopyOpE@Base 2.10.0
+ _ZN8osgEarth10PointGroupC2Ev@Base 2.10.0
+ _ZN8osgEarth10PointGroupD0Ev@Base 2.10.0
+ _ZN8osgEarth10PointGroupD1Ev@Base 2.10.0
+ _ZN8osgEarth10PointGroupD2Ev@Base 2.10.0
  _ZN8osgEarth10PoisonPillD0Ev@Base 2.6.0
  _ZN8osgEarth10PoisonPillD1Ev@Base 2.6.0
  _ZN8osgEarth10PoisonPillD2Ev@Base 2.6.0
  _ZN8osgEarth10PoisonPillclEPNS_16ProgressCallbackE@Base 2.6.0
  _ZN8osgEarth10PolyShader11setLocationENS_10ShaderComp16FunctionLocationE@Base 2.8~rc1
+ _ZN8osgEarth10PolyShader12lookUpShaderERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_NS_10ShaderComp16FunctionLocationE@Base 2.10.0
  _ZN8osgEarth10PolyShader15setShaderSourceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8~rc1
  _ZN8osgEarth10PolyShader21resizeGLObjectBuffersEj@Base 2.8~rc1
  _ZN8osgEarth10PolyShader7prepareEv@Base 2.8~rc1
@@ -555,9 +637,11 @@
  _ZN8osgEarth10PolyShaderD1Ev@Base 2.8~rc1
  _ZN8osgEarth10PolyShaderD2Ev@Base 2.8~rc1
  _ZN8osgEarth10ReadResultC1ENS0_4CodeE@Base 2.4.0
- _ZN8osgEarth10ReadResultC1EPN3osg6ObjectE@Base 2.4.0
+ _ZN8osgEarth10ReadResultC1EPN3osg6ObjectE@Base 2.10.0
+ _ZN8osgEarth10ReadResultC1ERKS0_@Base 2.10.0
  _ZN8osgEarth10ReadResultC2ENS0_4CodeE@Base 2.4.0
- _ZN8osgEarth10ReadResultC2EPN3osg6ObjectE@Base 2.4.0
+ _ZN8osgEarth10ReadResultC2EPN3osg6ObjectE@Base 2.10.0
+ _ZN8osgEarth10ReadResultC2ERKS0_@Base 2.10.0
  _ZN8osgEarth10ReadResultD0Ev@Base 2.4.0
  _ZN8osgEarth10ReadResultD1Ev@Base 2.4.0
  _ZN8osgEarth10ReadResultD2Ev@Base 2.4.0
@@ -575,7 +659,6 @@
  _ZN8osgEarth10TaskThreadD1Ev@Base 2.4.0
  _ZN8osgEarth10TaskThreadD2Ev@Base 2.4.0
  _ZN8osgEarth10TileSource10MODE_WRITEE@Base 2.6.0
- _ZN8osgEarth10TileSource10initializeEPKN5osgDB7OptionsEPKNS_7ProfileE@Base 2.4.0
  _ZN8osgEarth10TileSource10setProfileEPKNS_7ProfileE@Base 2.4.0
  _ZN8osgEarth10TileSource10storeImageERKNS_7TileKeyEPN3osg5ImageEPNS_16ProgressCallbackE@Base 2.6.0
  _ZN8osgEarth10TileSource11MODE_CREATEE@Base 2.6.0
@@ -584,7 +667,7 @@
  _ZN8osgEarth10TileSource12getBlacklistEv@Base 2.4.0
  _ZN8osgEarth10TileSource14INTERFACE_NAMEE@Base 2.6.0
  _ZN8osgEarth10TileSource16setPixelsPerTileEj@Base 2.9.0
- _ZN8osgEarth10TileSource16storeHeightFieldERKNS_7TileKeyEPN3osg11HeightFieldEPNS_16ProgressCallbackE@Base 2.6.0
+ _ZN8osgEarth10TileSource16storeHeightFieldERKNS_7TileKeyEPKN3osg11HeightFieldEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth10TileSource17createHeightFieldERKNS_7TileKeyEPNS0_20HeightFieldOperationEPNS_16ProgressCallbackE@Base 2.4.0
  _ZN8osgEarth10TileSource17createHeightFieldERKNS_7TileKeyEPNS_16ProgressCallbackE@Base 2.4.0
  _ZN8osgEarth10TileSource21setDefaultL2CacheSizeEi@Base 2.9.0
@@ -595,13 +678,22 @@
  _ZN8osgEarth10TileSourceD0Ev@Base 2.4.0
  _ZN8osgEarth10TileSourceD1Ev@Base 2.4.0
  _ZN8osgEarth10TileSourceD2Ev@Base 2.4.0
+ _ZN8osgEarth10URIContext10getHeadersB5cxx11Ev@Base 2.10.0
  _ZN8osgEarth10URIContext5storeEPN5osgDB7OptionsE@Base 2.8~rc1
+ _ZN8osgEarth10URIContext9addHeaderERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.10.0
  _ZN8osgEarth10URIContextC1EPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth10URIContextC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ _ZN8osgEarth10URIContextC1ERKS0_@Base 2.10.0
+ _ZN8osgEarth10URIContextC1Ev@Base 2.10.0
  _ZN8osgEarth10URIContextC2EPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth10URIContextC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ _ZN8osgEarth10URIContextC2ERKS0_@Base 2.10.0
+ _ZN8osgEarth10URIContextC2Ev@Base 2.10.0
  _ZN8osgEarth10URIContextD0Ev@Base 2.4.0
  _ZN8osgEarth10URIContextD1Ev@Base 2.4.0
  _ZN8osgEarth10URIContextD2Ev@Base 2.4.0
  _ZN8osgEarth10VideoLayer13createTextureERKNS_7TileKeyEPNS_16ProgressCallbackERN3osg7MatrixfE@Base 2.9.0
+ _ZN8osgEarth10VideoLayer4initEv@Base 2.10.0
  _ZN8osgEarth10VideoLayer4openEv@Base 2.9.0
  _ZN8osgEarth10VideoLayerC1ERKNS_17VideoLayerOptionsE@Base 2.9.0
  _ZN8osgEarth10VideoLayerC1Ev@Base 2.9.0
@@ -611,7 +703,6 @@
  _ZN8osgEarth10VideoLayerD1Ev@Base 2.9.0
  _ZN8osgEarth10VideoLayerD2Ev@Base 2.9.0
  _ZN8osgEarth10XmlElement11getChildrenEv@Base 2.4.0
- _ZN8osgEarth10XmlElement13addSubElementERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_10PropertiesES8_@Base 2.7.0
  _ZN8osgEarth10XmlElement13addSubElementERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.7.0
  _ZN8osgEarth10XmlElement7setNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth10XmlElement8getAttrsB5cxx11Ev@Base 2.7.0
@@ -627,6 +718,11 @@
  _ZN8osgEarth10hashStringERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth10startsWithERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_bRKSt6locale@Base 2.7.0
  (optional=templinst)_ZN8osgEarth10vector_mapIjNS_14VirtualProgram11ShaderEntryEE5eraseERKj@Base 2.7.0
+ _ZN8osgEarth11AsyncResultC1EPN3osg4NodeE@Base 2.10.1
+ _ZN8osgEarth11AsyncResultC2EPN3osg4NodeE@Base 2.10.1
+ _ZN8osgEarth11AsyncResultD0Ev@Base 2.10.1
+ _ZN8osgEarth11AsyncResultD1Ev@Base 2.10.1
+ _ZN8osgEarth11AsyncResultD2Ev@Base 2.10.1
  _ZN8osgEarth11CacheDriverD0Ev@Base 2.5.0
  _ZN8osgEarth11CacheDriverD1Ev@Base 2.5.0
  _ZN8osgEarth11CacheDriverD2Ev@Base 2.5.0
@@ -655,6 +751,7 @@
  _ZN8osgEarth11FadeOptionsD2Ev@Base 2.4.0
  _ZN8osgEarth11GLSLChunker5ChunkD1Ev@Base 2.8~rc1
  _ZN8osgEarth11GLSLChunker5ChunkD2Ev@Base 2.8~rc1
+ _ZN8osgEarth11HTTPRequest10getHeadersB5cxx11Ev@Base 2.10.0
  _ZN8osgEarth11HTTPRequest12addParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.7.0
  _ZN8osgEarth11HTTPRequest12addParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEd@Base 2.7.0
  _ZN8osgEarth11HTTPRequest12addParameterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEi@Base 2.7.0
@@ -680,26 +777,23 @@
  _ZN8osgEarth11ImageMosaicD0Ev@Base 2.4.0
  _ZN8osgEarth11ImageMosaicD1Ev@Base 2.4.0
  _ZN8osgEarth11ImageMosaicD2Ev@Base 2.4.0
+ _ZN8osgEarth11LayerShader7installEPNS_5LayerEPNS_16TerrainResourcesE@Base 2.10.1
+ _ZN8osgEarth11LayerShaderC1ERKNS_13ShaderOptionsE@Base 2.10.1
+ _ZN8osgEarth11LayerShaderC2ERKNS_13ShaderOptionsE@Base 2.10.1
+ _ZN8osgEarth11LayerShaderD0Ev@Base 2.10.1
+ _ZN8osgEarth11LayerShaderD1Ev@Base 2.10.1
+ _ZN8osgEarth11LayerShaderD2Ev@Base 2.10.1
  _ZN8osgEarth11MapCallback11onEndUpdateEv@Base 2.4.0
  _ZN8osgEarth11MapCallback12onLayerAddedEPNS_5LayerEj@Base 2.9.0
  _ZN8osgEarth11MapCallback12onLayerMovedEPNS_5LayerEjj@Base 2.9.0
  _ZN8osgEarth11MapCallback13onBeginUpdateEv@Base 2.4.0
+ _ZN8osgEarth11MapCallback14onLayerEnabledEPNS_5LayerE@Base 2.10.0
  _ZN8osgEarth11MapCallback14onLayerRemovedEPNS_5LayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback16onMaskLayerAddedEPNS_9MaskLayerE@Base 2.4.0
- _ZN8osgEarth11MapCallback17onImageLayerAddedEPNS_10ImageLayerEj@Base 2.4.0
- _ZN8osgEarth11MapCallback17onImageLayerMovedEPNS_10ImageLayerEjj@Base 2.4.0
+ _ZN8osgEarth11MapCallback15onLayerDisabledEPNS_5LayerE@Base 2.10.0
  _ZN8osgEarth11MapCallback17onMapModelChangedERKNS_14MapModelChangeE@Base 2.4.0
- _ZN8osgEarth11MapCallback17onModelLayerAddedEPNS_10ModelLayerEj@Base 2.4.0
- _ZN8osgEarth11MapCallback17onModelLayerMovedEPNS_10ModelLayerEjj@Base 2.4.0
  _ZN8osgEarth11MapCallback18invokeOnLayerAddedEPKNS_3MapE@Base 2.9.0
- _ZN8osgEarth11MapCallback18onMaskLayerRemovedEPNS_9MaskLayerE@Base 2.4.0
- _ZN8osgEarth11MapCallback19onImageLayerRemovedEPNS_10ImageLayerEj@Base 2.4.0
- _ZN8osgEarth11MapCallback19onModelLayerRemovedEPNS_10ModelLayerEj@Base 2.9.0
  _ZN8osgEarth11MapCallback20invokeOnLayerRemovedEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth11MapCallback20onMapInfoEstablishedERKNS_7MapInfoE@Base 2.4.0
- _ZN8osgEarth11MapCallback21onElevationLayerAddedEPNS_14ElevationLayerEj@Base 2.4.0
- _ZN8osgEarth11MapCallback21onElevationLayerMovedEPNS_14ElevationLayerEjj@Base 2.4.0
- _ZN8osgEarth11MapCallback23onElevationLayerRemovedEPNS_14ElevationLayerEj@Base 2.4.0
  _ZN8osgEarth11MapCallbackD0Ev@Base 2.4.0
  _ZN8osgEarth11MapCallbackD1Ev@Base 2.4.0
  _ZN8osgEarth11MapCallbackD2Ev@Base 2.4.0
@@ -731,15 +825,36 @@
  (optional=templinst)_ZN8osgEarth11OptionsDataIKNS_3MapEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataIKNS_3MapEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataIKNS_3MapEED2Ev@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth11OptionsDataINS_13AsyncFunctionEED0Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth11OptionsDataINS_13AsyncFunctionEED1Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth11OptionsDataINS_13AsyncFunctionEED2Ev@Base 2.10.1
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_9PagedNodeEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_9PagedNodeEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_9PagedNodeEED2Ev@Base 2.9.0
- _ZN8osgEarth11StateSetLOD11addStateSetEPN3osg8StateSetEff@Base 2.6.0
- _ZN8osgEarth11StateSetLOD8setRangeEjff@Base 2.6.0
- _ZN8osgEarth11StateSetLOD8traverseERN3osg11NodeVisitorE@Base 2.6.0
- _ZN8osgEarth11StateSetLODD0Ev@Base 2.6.0
- _ZN8osgEarth11StateSetLODD1Ev@Base 2.6.0
- _ZN8osgEarth11StateSetLODD2Ev@Base 2.6.0
+ _ZN8osgEarth11ProgramRepo21resizeGLObjectBuffersEj@Base 2.10.0
+ _ZN8osgEarth11ProgramRepo3addERKSt6vectorIPNS_10PolyShaderESaIS3_EERN3osg7ref_ptrINS8_7ProgramEEEji@Base 2.10.0
+ _ZN8osgEarth11ProgramRepo3useERKSt6vectorIPNS_10PolyShaderESaIS3_EEji@Base 2.10.0
+ _ZN8osgEarth11ProgramRepo4lockEv@Base 2.10.0
+ _ZN8osgEarth11ProgramRepo5EntryD0Ev@Base 2.10.0
+ _ZN8osgEarth11ProgramRepo5EntryD1Ev@Base 2.10.0
+ _ZN8osgEarth11ProgramRepo5EntryD2Ev@Base 2.10.0
+ _ZN8osgEarth11ProgramRepo5pruneEjPN3osg5StateE@Base 2.10.0
+ _ZN8osgEarth11ProgramRepo6unlockEv@Base 2.10.0
+ _ZN8osgEarth11ProgramRepo7releaseEiPN3osg5StateE@Base 2.10.0
+ _ZN8osgEarth11ProgramRepoD0Ev@Base 2.10.0
+ _ZN8osgEarth11ProgramRepoD1Ev@Base 2.10.0
+ _ZN8osgEarth11ProgramRepoD2Ev@Base 2.10.0
+ _ZN8osgEarth11Serializers10PointGroup27wrapper_propfunc_PointGroupEPN5osgDB13ObjectWrapperE@Base 2.10.0
+ _ZN8osgEarth11Serializers11MaterialGL328wrapper_propfunc_MaterialGL3EPN5osgDB13ObjectWrapperE@Base 2.10.0
+ _ZN8osgEarth11Serializers12LineDrawable29wrapper_propfunc_LineDrawableEPN5osgDB13ObjectWrapperE@Base 2.10.0
+ _ZN8osgEarth11Serializers12StringObject29wrapper_propfunc_StringObjectEPN5osgDB13ObjectWrapperE@Base 2.10.0
+ _ZN8osgEarth11Serializers13ClampableNode30wrapper_propfunc_ClampableNodeEPN5osgDB13ObjectWrapperE@Base 2.10.0
+ _ZN8osgEarth11Serializers13DrapeableNode30wrapper_propfunc_DrapeableNodeEPN5osgDB13ObjectWrapperE@Base 2.10.0
+ _ZN8osgEarth11Serializers13PointDrawable30wrapper_propfunc_PointDrawableEPN5osgDB13ObjectWrapperE@Base 2.10.0
+ _ZN8osgEarth11Serializers13TextureBuffer30wrapper_propfunc_TextureBufferEPN5osgDB13ObjectWrapperE@Base 2.10.0
+ _ZN8osgEarth11Serializers26InstallViewportSizeUniform43wrapper_propfunc_InstallViewportSizeUniformEPN5osgDB13ObjectWrapperE@Base 2.10.0
+ _ZN8osgEarth11Serializers8LightGL325wrapper_propfunc_LightGL3EPN5osgDB13ObjectWrapperE@Base 2.10.0
+ _ZN8osgEarth11Serializers9LineGroup26wrapper_propfunc_LineGroupEPN5osgDB13ObjectWrapperE@Base 2.10.0
  _ZN8osgEarth11TaskRequest3runEv@Base 2.4.0
  _ZN8osgEarth11TaskRequest6cancelEv@Base 2.4.0
  _ZN8osgEarth11TaskRequestC1Ef@Base 2.4.0
@@ -786,6 +901,7 @@
  _ZN8osgEarth11TileVisitorD0Ev@Base 2.6.0
  _ZN8osgEarth11TileVisitorD1Ev@Base 2.6.0
  _ZN8osgEarth11TileVisitorD2Ev@Base 2.6.0
+ _ZN8osgEarth11URIAliasMap4fromEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth11URIAliasMap6insertERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth11ViewVisitorINS_13RequestRedrawEE5applyERN3osg6CameraE@Base 2.4.0
  (optional=templinst)_ZN8osgEarth11ViewVisitorINS_13RequestRedrawEED0Ev@Base 2.4.0
@@ -881,6 +997,7 @@
  _ZN8osgEarth12HTTPResponseD2Ev@Base 2.4.0
  _ZN8osgEarth12LayerOptions10fromConfigERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth12LayerOptions11mergeConfigERKNS_6ConfigE@Base 2.9.0
+ _ZN8osgEarth12LayerOptions11setDefaultsEv@Base 2.10.0
  _ZN8osgEarth12LayerOptionsC1ERKNS_13ConfigOptionsE@Base 2.9.0
  _ZN8osgEarth12LayerOptionsC1Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsC2ERKNS_13ConfigOptionsE@Base 2.9.0
@@ -888,6 +1005,43 @@
  _ZN8osgEarth12LayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD2Ev@Base 2.9.0
+ _ZN8osgEarth12LineDrawable10initializeEv@Base 2.10.0
+ _ZN8osgEarth12LineDrawable10pushVertexERKN3osg5Vec3fE@Base 2.10.0
+ _ZN8osgEarth12LineDrawable12setLineWidthEPN3osg8StateSetEfi@Base 2.10.0
+ _ZN8osgEarth12LineDrawable12setLineWidthEf@Base 2.10.0
+ _ZN8osgEarth12LineDrawable12setupShadersEv@Base 2.10.0
+ _ZN8osgEarth12LineDrawable13s_gpuStateSetE@Base 2.10.0
+ _ZN8osgEarth12LineDrawable13setLineSmoothEb@Base 2.10.0
+ _ZN8osgEarth12LineDrawable16setStippleFactorEi@Base 2.10.0
+ _ZN8osgEarth12LineDrawable16updateFirstCountEv@Base 2.10.0
+ _ZN8osgEarth12LineDrawable17importVertexArrayEPKN3osg13TemplateArrayINS1_5Vec3fELNS1_5Array4TypeE28ELi3ELi5126EEE@Base 2.10.0
+ _ZN8osgEarth12LineDrawable17setStipplePatternEt@Base 2.10.0
+ _ZN8osgEarth12LineDrawable21resizeGLObjectBuffersEj@Base 2.10.0
+ _ZN8osgEarth12LineDrawable22NextVertexAttrLocationE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth12LineDrawable23importVertexAttribArrayIN3osg13TemplateArrayIfLNS2_5Array4TypeE7ELi1ELi5126EEEEEvjPKT_@Base 2.10.0
+ _ZN8osgEarth12LineDrawable26PreviousVertexAttrLocationE@Base 2.10.0
+ _ZN8osgEarth12LineDrawable5clearEv@Base 2.10.0
+ _ZN8osgEarth12LineDrawable5dirtyEv@Base 2.10.0
+ _ZN8osgEarth12LineDrawable6acceptERN3osg11NodeVisitorE@Base 2.10.0
+ _ZN8osgEarth12LineDrawable7reserveEj@Base 2.10.0
+ _ZN8osgEarth12LineDrawable7setModeEj@Base 2.10.0
+ _ZN8osgEarth12LineDrawable8allocateEj@Base 2.10.0
+ _ZN8osgEarth12LineDrawable8setColorERKN3osg5Vec4fE@Base 2.10.0
+ _ZN8osgEarth12LineDrawable8setColorEjRKN3osg5Vec4fE@Base 2.10.0
+ _ZN8osgEarth12LineDrawable8setCountEj@Base 2.10.0
+ _ZN8osgEarth12LineDrawable8setFirstEj@Base 2.10.0
+ _ZN8osgEarth12LineDrawable9setVertexEjRKN3osg5Vec3fE@Base 2.10.0
+ _ZN8osgEarth12LineDrawableC1ERKS0_RKN3osg6CopyOpE@Base 2.10.0
+ _ZN8osgEarth12LineDrawableC1Ej@Base 2.10.0
+ _ZN8osgEarth12LineDrawableC1Ev@Base 2.10.0
+ _ZN8osgEarth12LineDrawableC2ERKS0_RKN3osg6CopyOpE@Base 2.10.0
+ _ZN8osgEarth12LineDrawableC2Ej@Base 2.10.0
+ _ZN8osgEarth12LineDrawableC2Ev@Base 2.10.0
+ _ZN8osgEarth12LineDrawableD0Ev@Base 2.10.0
+ _ZN8osgEarth12LineDrawableD1Ev@Base 2.10.0
+ _ZN8osgEarth12LineDrawableD2Ev@Base 2.10.0
+ _ZN8osgEarth12NotifyStreamD0Ev@Base 2.10.0
+ _ZN8osgEarth12NotifyStreamD1Ev@Base 2.10.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_10ImageLayerENS_5LayerEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_10ImageLayerENS_5LayerEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_10ImageLayerENS_5LayerEED2Ev@Base 2.9.0
@@ -924,9 +1078,9 @@
  _ZN8osgEarth12ShaderLoader4loadERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_PKN5osgDB7OptionsE@Base 2.7.0
  _ZN8osgEarth12ShaderLoader5splitERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERSt6vectorIS6_SaIS6_EE@Base 2.9.0
  _ZN8osgEarth12ShaderLoader6unloadEPNS_14VirtualProgramERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_13ShaderPackageEPKN5osgDB7OptionsE@Base 2.7.0
- (optional=templinst)_ZN8osgEarth12SharedSARepoIN3osg7ProgramEE5shareERNS1_7ref_ptrIS2_EE@Base 2.6.0
- (optional=templinst)_ZN8osgEarth12SharedSARepoIN3osg7ProgramEED1Ev@Base 2.6.0
- (optional=templinst)_ZN8osgEarth12SharedSARepoIN3osg7ProgramEED2Ev@Base 2.6.0
+ _ZN8osgEarth12ShaderMerger3addEPKN3osg6ShaderE@Base 2.10.0
+ _ZN8osgEarth12ShaderMerger5mergeEPN3osg6ShaderE@Base 2.10.0
+ _ZN8osgEarth12ShaderMerger5mergeEPN3osg7ProgramE@Base 2.10.0
  _ZN8osgEarth12SimplexNoise14DefaultOctavesE@Base 2.9.0
  _ZN8osgEarth12SimplexNoise15DefaultRangeLowE@Base 2.9.0
  _ZN8osgEarth12SimplexNoise16DefaultFrequencyE@Base 2.9.0
@@ -963,8 +1117,8 @@
  _ZN8osgEarth12StringObjectD0Ev@Base 2.4.0
  _ZN8osgEarth12StringObjectD1Ev@Base 2.4.0
  _ZN8osgEarth12StringObjectD2Ev@Base 2.4.0
- _ZN8osgEarth12TerrainLayer10setOpacityEf@Base 2.9.0
  _ZN8osgEarth12TerrainLayer10setProfileEPKNS_7ProfileE@Base 2.9.0
+ _ZN8osgEarth12TerrainLayer11dataExtentsEv@Base 2.10.0
  _ZN8osgEarth12TerrainLayer11getCacheBinEPKNS_7ProfileE@Base 2.4.0
  _ZN8osgEarth12TerrainLayer14setReadOptionsEPKN5osgDB7OptionsE@Base 2.8~rc1
  _ZN8osgEarth12TerrainLayer16CacheBinMetadataC1ERKNS_6ConfigE@Base 2.4.0
@@ -1037,6 +1191,12 @@
  _ZN8osgEarth12VisibleLayer10setOpacityEf@Base 2.9.0
  _ZN8osgEarth12VisibleLayer10setVisibleEb@Base 2.9.0
  _ZN8osgEarth12VisibleLayer12fireCallbackEMNS_20VisibleLayerCallbackEFvPS0_E@Base 2.9.0
+ _ZN8osgEarth12VisibleLayer18initializeBlendingEv@Base 2.10.0
+ _ZN8osgEarth12VisibleLayer18setMaxVisibleRangeEf@Base 2.10.0
+ _ZN8osgEarth12VisibleLayer18setMinVisibleRangeEf@Base 2.10.0
+ _ZN8osgEarth12VisibleLayer19setAttenuationRangeEf@Base 2.10.0
+ _ZN8osgEarth12VisibleLayer27installDefaultOpacityShaderEv@Base 2.10.0
+ _ZN8osgEarth12VisibleLayer28initializeMinMaxRangeOpacityEv@Base 2.10.0
  _ZN8osgEarth12VisibleLayer4initEv@Base 2.9.0
  _ZN8osgEarth12VisibleLayer4openEv@Base 2.9.0
  _ZN8osgEarth12VisibleLayerC1EPNS_19VisibleLayerOptionsE@Base 2.9.0
@@ -1056,6 +1216,7 @@
  _ZN8osgEarth13CacheSettingsD0Ev@Base 2.8~rc1
  _ZN8osgEarth13CacheSettingsD1Ev@Base 2.8~rc1
  _ZN8osgEarth13CacheSettingsD2Ev@Base 2.8~rc1
+ _ZN8osgEarth13ClampableNode13isDepthCameraEPKN3osg6CameraE@Base 2.10.0
  _ZN8osgEarth13ClampableNode8traverseERN3osg11NodeVisitorE@Base 2.4.0
  _ZN8osgEarth13ClampableNodeC1Ev@Base 2.9.0
  _ZN8osgEarth13ClampableNodeC2Ev@Base 2.9.0
@@ -1066,6 +1227,7 @@
  _ZN8osgEarth13ConfigOptionsD0Ev@Base 2.4.0
  _ZN8osgEarth13ConfigOptionsD1Ev@Base 2.4.0
  _ZN8osgEarth13ConfigOptionsD2Ev@Base 2.4.0
+ (arch=amd64 i386)_ZN8osgEarth13ConfigOptionsaSERKS0_@Base 2.10.1
  _ZN8osgEarth13DateTimeRange8expandByERKNS_8DateTimeE@Base 2.8~rc1
  _ZN8osgEarth13DateTimeRange8expandByERKS0_@Base 2.8~rc1
  _ZN8osgEarth13DirtyNotifier10resetDirtyEv@Base 2.4.0
@@ -1095,10 +1257,14 @@
  _ZN8osgEarth13DrawInstanced15MatrixRefVectorD1Ev@Base 2.6.0
  _ZN8osgEarth13DrawInstanced15MatrixRefVectorD2Ev@Base 2.6.0
  _ZN8osgEarth13DrawInstanced15getMatrixVectorEPN3osg4NodeE@Base 2.6.0
+ _ZN8osgEarth13DrawInstanced20MakeTransformsStatic5applyERN3osg9TransformE@Base 2.10.1
+ _ZN8osgEarth13DrawInstanced20MakeTransformsStaticD0Ev@Base 2.10.1
+ _ZN8osgEarth13DrawInstanced20MakeTransformsStaticD1Ev@Base 2.10.1
  _ZN8osgEarth13DrawInstanced22ConvertToDrawInstanced5applyERN3osg3LODE@Base 2.6.0
- _ZN8osgEarth13DrawInstanced22ConvertToDrawInstanced5applyERN3osg5GeodeE@Base 2.4.0
- _ZN8osgEarth13DrawInstanced22ConvertToDrawInstancedC1EjRKN3osg15BoundingBoxImplINS2_5Vec3fEEEb@Base 2.4.0
- _ZN8osgEarth13DrawInstanced22ConvertToDrawInstancedC2EjRKN3osg15BoundingBoxImplINS2_5Vec3fEEEb@Base 2.4.0
+ _ZN8osgEarth13DrawInstanced22ConvertToDrawInstanced5applyERN3osg4NodeE@Base 2.10.0
+ _ZN8osgEarth13DrawInstanced22ConvertToDrawInstanced5applyERN3osg8DrawableE@Base 2.10.0
+ _ZN8osgEarth13DrawInstanced22ConvertToDrawInstancedC1EjRKN3osg15BoundingBoxImplINS2_5Vec3fEEEbPNS2_13TextureBufferEi@Base 2.10.0
+ _ZN8osgEarth13DrawInstanced22ConvertToDrawInstancedC2EjRKN3osg15BoundingBoxImplINS2_5Vec3fEEEbPNS2_13TextureBufferEi@Base 2.10.0
  _ZN8osgEarth13DrawInstanced22ConvertToDrawInstancedD0Ev@Base 2.4.0
  _ZN8osgEarth13DrawInstanced22ConvertToDrawInstancedD1Ev@Base 2.4.0
  _ZN8osgEarth13DrawInstanced30convertGraphToUseDrawInstancedEPN3osg5GroupE@Base 2.4.0
@@ -1113,7 +1279,7 @@
  _ZN8osgEarth13ElevationPool14GetElevationOpD1Ev@Base 2.9.0
  _ZN8osgEarth13ElevationPool14GetElevationOpclEPN3osg6ObjectE@Base 2.9.0
  _ZN8osgEarth13ElevationPool14createEnvelopeEPKNS_16SpatialReferenceEj@Base 2.9.0
- _ZN8osgEarth13ElevationPool16fetchTileFromMapERKNS_7TileKeyERNS_8MapFrameEPNS0_4TileE@Base 2.9.0
+ _ZN8osgEarth13ElevationPool16fetchTileFromMapERKNS_7TileKeyERKNS_20ElevationLayerVectorEPNS0_4TileE@Base 2.10.0
  _ZN8osgEarth13ElevationPool18setElevationLayersERKNS_20ElevationLayerVectorE@Base 2.9.0
  _ZN8osgEarth13ElevationPool4TileD0Ev@Base 2.9.0
  _ZN8osgEarth13ElevationPool4TileD1Ev@Base 2.9.0
@@ -1121,8 +1287,8 @@
  _ZN8osgEarth13ElevationPool5clearEv@Base 2.9.0
  _ZN8osgEarth13ElevationPool6popMRUEv@Base 2.9.0
  _ZN8osgEarth13ElevationPool6setMapEPKNS_3MapE@Base 2.9.0
- _ZN8osgEarth13ElevationPool7getTileERKNS_7TileKeyERNS_8MapFrameERN3osg7ref_ptrINS0_4TileEEE@Base 2.9.0
- _ZN8osgEarth13ElevationPool7tryTileERKNS_7TileKeyERNS_8MapFrameERN3osg7ref_ptrINS0_4TileEEE@Base 2.9.0
+ _ZN8osgEarth13ElevationPool7getTileERKNS_7TileKeyERKNS_20ElevationLayerVectorERN3osg7ref_ptrINS0_4TileEEE@Base 2.10.0
+ _ZN8osgEarth13ElevationPool7tryTileERKNS_7TileKeyERKNS_20ElevationLayerVectorERN3osg7ref_ptrINS0_4TileEEE@Base 2.10.0
  _ZN8osgEarth13ElevationPool9clearImplEv@Base 2.9.0
  _ZN8osgEarth13ElevationPoolC1Ev@Base 2.9.0
  _ZN8osgEarth13ElevationPoolC2Ev@Base 2.9.0
@@ -1135,6 +1301,7 @@
  _ZN8osgEarth13LODScaleGroupD0Ev@Base 2.5.0
  _ZN8osgEarth13LODScaleGroupD1Ev@Base 2.5.0
  _ZN8osgEarth13LODScaleGroupD2Ev@Base 2.5.0
+ _ZN8osgEarth13LayerCallback16onEnabledChangedEPNS_5LayerE@Base 2.10.0
  _ZN8osgEarth13LayerCallbackD0Ev@Base 2.9.0
  _ZN8osgEarth13LayerCallbackD1Ev@Base 2.9.0
  _ZN8osgEarth13LayerCallbackD2Ev@Base 2.9.0
@@ -1151,6 +1318,32 @@
  _ZN8osgEarth13ObserverGroupD0Ev@Base 2.4.0
  _ZN8osgEarth13ObserverGroupD1Ev@Base 2.4.0
  _ZN8osgEarth13ObserverGroupD2Ev@Base 2.4.0
+ _ZN8osgEarth13PointDrawable10initializeEv@Base 2.10.0
+ _ZN8osgEarth13PointDrawable10pushVertexERKN3osg5Vec3fE@Base 2.10.0
+ _ZN8osgEarth13PointDrawable10setupStateEv@Base 2.10.0
+ _ZN8osgEarth13PointDrawable12setPointSizeEf@Base 2.10.0
+ _ZN8osgEarth13PointDrawable14setPointSmoothEb@Base 2.10.0
+ _ZN8osgEarth13PointDrawable16s_sharedStateSetE@Base 2.10.0
+ _ZN8osgEarth13PointDrawable16updateFirstCountEv@Base 2.10.0
+ _ZN8osgEarth13PointDrawable17importVertexArrayEPKN3osg13TemplateArrayINS1_5Vec3fELNS1_5Array4TypeE28ELi3ELi5126EEE@Base 2.10.0
+ _ZN8osgEarth13PointDrawable21resizeGLObjectBuffersEj@Base 2.10.0
+ _ZN8osgEarth13PointDrawable5clearEv@Base 2.10.0
+ _ZN8osgEarth13PointDrawable5dirtyEv@Base 2.10.0
+ _ZN8osgEarth13PointDrawable6acceptERN3osg11NodeVisitorE@Base 2.10.0
+ _ZN8osgEarth13PointDrawable7reserveEj@Base 2.10.0
+ _ZN8osgEarth13PointDrawable8allocateEj@Base 2.10.0
+ _ZN8osgEarth13PointDrawable8setColorERKN3osg5Vec4fE@Base 2.10.0
+ _ZN8osgEarth13PointDrawable8setColorEjRKN3osg5Vec4fE@Base 2.10.0
+ _ZN8osgEarth13PointDrawable8setCountEj@Base 2.10.0
+ _ZN8osgEarth13PointDrawable8setFirstEj@Base 2.10.0
+ _ZN8osgEarth13PointDrawable9setVertexEjRKN3osg5Vec3fE@Base 2.10.0
+ _ZN8osgEarth13PointDrawableC1ERKS0_RKN3osg6CopyOpE@Base 2.10.0
+ _ZN8osgEarth13PointDrawableC1Ev@Base 2.10.0
+ _ZN8osgEarth13PointDrawableC2ERKS0_RKN3osg6CopyOpE@Base 2.10.0
+ _ZN8osgEarth13PointDrawableC2Ev@Base 2.10.0
+ _ZN8osgEarth13PointDrawableD0Ev@Base 2.10.0
+ _ZN8osgEarth13PointDrawableD1Ev@Base 2.10.0
+ _ZN8osgEarth13PointDrawableD2Ev@Base 2.10.0
  _ZN8osgEarth13ProxySettings11fromOptionsEPKN5osgDB7OptionsERNS_8optionalIS0_EE@Base 2.4.0
  _ZN8osgEarth13ProxySettings11mergeConfigERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth13ProxySettingsC1ERKNS_6ConfigE@Base 2.4.0
@@ -1165,6 +1358,15 @@
  _ZN8osgEarth13ShaderFactoryD0Ev@Base 2.4.0
  _ZN8osgEarth13ShaderFactoryD1Ev@Base 2.4.0
  _ZN8osgEarth13ShaderFactoryD2Ev@Base 2.4.0
+ _ZN8osgEarth13ShaderOptions10fromConfigERKNS_6ConfigE@Base 2.10.1
+ _ZN8osgEarth13ShaderOptions11mergeConfigERKNS_6ConfigE@Base 2.10.1
+ _ZN8osgEarth13ShaderOptions7SamplerD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptions7SamplerD2Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsC1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsC2Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD0Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD2Ev@Base 2.10.1
  _ZN8osgEarth13ShaderPackage6defineERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 2.7.0
  _ZN8osgEarth13ShaderPackage7replaceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.7.0
  _ZN8osgEarth13ShaderPackageD1Ev@Base 2.7.0
@@ -1261,27 +1463,21 @@
  _ZN8osgEarth14ElevationLayerD0Ev@Base 2.4.0
  _ZN8osgEarth14ElevationLayerD1Ev@Base 2.4.0
  _ZN8osgEarth14ElevationLayerD2Ev@Base 2.4.0
- _ZN8osgEarth14ElevationQuery11setMapFrameERKNS_8MapFrameE@Base 2.8~rc1
  _ZN8osgEarth14ElevationQuery12getElevationERKNS_8GeoPointEdPd@Base 2.9.0
  _ZN8osgEarth14ElevationQuery13getElevationsERKSt6vectorIN3osg5Vec3dESaIS3_EEPKNS_16SpatialReferenceERS1_IfSaIfEEd@Base 2.9.0
  _ZN8osgEarth14ElevationQuery13getElevationsERSt6vectorIN3osg5Vec3dESaIS3_EEPKNS_16SpatialReferenceEbd@Base 2.4.0
  _ZN8osgEarth14ElevationQuery16getElevationImplERKNS_8GeoPointERfdPd@Base 2.9.0
- _ZN8osgEarth14ElevationQuery17gatherPatchLayersEv@Base 2.6.0
+ _ZN8osgEarth14ElevationQuery24gatherTerrainModelLayersEPKNS_3MapE@Base 2.10.0
  _ZN8osgEarth14ElevationQuery4syncEv@Base 2.4.0
  _ZN8osgEarth14ElevationQuery5resetEv@Base 2.9.0
  _ZN8osgEarth14ElevationQuery6setMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth14ElevationQueryC1EPKNS_3MapE@Base 2.4.0
- _ZN8osgEarth14ElevationQueryC1ERKNS_8MapFrameE@Base 2.4.0
  _ZN8osgEarth14ElevationQueryC1Ev@Base 2.8~rc1
  _ZN8osgEarth14ElevationQueryC2EPKNS_3MapE@Base 2.4.0
- _ZN8osgEarth14ElevationQueryC2ERKNS_8MapFrameE@Base 2.4.0
  _ZN8osgEarth14ElevationQueryC2Ev@Base 2.8~rc1
  _ZN8osgEarth14ElevationQueryD0Ev@Base 2.4.0
  _ZN8osgEarth14ElevationQueryD1Ev@Base 2.4.0
  _ZN8osgEarth14ElevationQueryD2Ev@Base 2.4.0
- _ZN8osgEarth14GeoHeightField12getNormalMapEv@Base 2.9.0
- _ZN8osgEarth14GeoHeightField14getHeightFieldEv@Base 2.4.0
- _ZN8osgEarth14GeoHeightField15takeHeightFieldEv@Base 2.4.0
  _ZN8osgEarth14GeoHeightField4initEv@Base 2.9.0
  _ZN8osgEarth14GeoHeightField7INVALIDE@Base 2.4.0
  _ZN8osgEarth14GeoHeightFieldC1EPN3osg11HeightFieldEPNS_9NormalMapERKNS_9GeoExtentE@Base 2.9.0
@@ -1309,14 +1505,13 @@
  _ZN8osgEarth14LandCoverClassD1Ev@Base 2.9.0
  _ZN8osgEarth14LandCoverClassD2Ev@Base 2.9.0
  _ZN8osgEarth14LandCoverLayer10addedToMapEPKNS_3MapE@Base 2.9.0
+ _ZN8osgEarth14LandCoverLayer13readMetaImageERSt3mapINS_7TileKeyENS0_18MetaImageComponentESt4lessIS2_ESaISt4pairIKS2_S3_EEERS7_ddRN3osg5Vec4fEPNS_16ProgressCallbackE@Base 2.10.1
  _ZN8osgEarth14LandCoverLayer16createTileSourceEv@Base 2.9.0
  _ZN8osgEarth14LandCoverLayer25createImageImplementationERKNS_7TileKeyEPNS_16ProgressCallbackE@Base 2.9.0
  _ZN8osgEarth14LandCoverLayer4initEv@Base 2.9.0
  _ZN8osgEarth14LandCoverLayerC1ERKNS_21LandCoverLayerOptionsE@Base 2.9.0
- _ZN8osgEarth14LandCoverLayerC1ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth14LandCoverLayerC1Ev@Base 2.9.0
  _ZN8osgEarth14LandCoverLayerC2ERKNS_21LandCoverLayerOptionsE@Base 2.9.0
- _ZN8osgEarth14LandCoverLayerC2ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth14LandCoverLayerC2Ev@Base 2.9.0
  _ZN8osgEarth14LandCoverLayerD0Ev@Base 2.9.0
  _ZN8osgEarth14LandCoverLayerD1Ev@Base 2.9.0
@@ -1367,12 +1562,14 @@
  _ZN8osgEarth14TileRasterizer3JobD2Ev@Base 2.9.0
  _ZN8osgEarth14TileRasterizer4pushEPN3osg4NodeEPNS1_7TextureERKNS_9GeoExtentE@Base 2.9.0
  _ZN8osgEarth14TileRasterizer4pushEPN3osg4NodeEjRKNS_9GeoExtentE@Base 2.9.0
+ _ZN8osgEarth14TileRasterizer6acceptERN3osg11NodeVisitorE@Base 2.10.0
  _ZN8osgEarth14TileRasterizer8traverseERN3osg11NodeVisitorE@Base 2.9.0
  _ZN8osgEarth14TileRasterizerC1Ev@Base 2.9.0
  _ZN8osgEarth14TileRasterizerC2Ev@Base 2.9.0
  _ZN8osgEarth14TileRasterizerD0Ev@Base 2.9.0
  _ZN8osgEarth14TileRasterizerD1Ev@Base 2.9.0
  _ZN8osgEarth14TileRasterizerD2Ev@Base 2.9.0
+ _ZN8osgEarth14URIResultCache4fromEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth14VirtualProgram10getShadersERKN3osg5StateERSt6vectorINS1_7ref_ptrINS1_6ShaderEEESaIS8_EE@Base 2.6.0
  _ZN8osgEarth14VirtualProgram11ShaderEntryC1Ev@Base 2.6.0
  _ZN8osgEarth14VirtualProgram11ShaderEntryC2Ev@Base 2.6.0
@@ -1387,10 +1584,11 @@
  _ZN8osgEarth14VirtualProgram13cloneOrCreateEPN3osg8StateSetE@Base 2.6.0
  _ZN8osgEarth14VirtualProgram13setIsAbstractEb@Base 2.9.0
  _ZN8osgEarth14VirtualProgram14getPolyShadersERKN3osg5StateERSt6vectorINS1_7ref_ptrINS_10PolyShaderEEESaIS8_EE@Base 2.8~rc1
+ _ZN8osgEarth14VirtualProgram15AttrStackMemory4ItemD1Ev@Base 2.10.0
+ _ZN8osgEarth14VirtualProgram15AttrStackMemory4ItemD2Ev@Base 2.10.0
  _ZN8osgEarth14VirtualProgram15AttrStackMemory6recallERKN3osg5StateERKSt6vectorISt4pairIPKNS2_14StateAttributeEjESaISB_EE@Base 2.7.0
  _ZN8osgEarth14VirtualProgram15AttrStackMemory8rememberERKN3osg5StateERKSt6vectorISt4pairIPKNS2_14StateAttributeEjESaISB_EEPNS2_7ProgramE@Base 2.7.0
  _ZN8osgEarth14VirtualProgram16addGLSLExtensionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
- _ZN8osgEarth14VirtualProgram16readProgramCacheERKSt6vectorIN3osg7ref_ptrINS_10PolyShaderEEESaIS5_EEjRNS3_INS2_7ProgramEEE@Base 2.8~rc1
  _ZN8osgEarth14VirtualProgram16setShaderLoggingEb@Base 2.7.0
  _ZN8osgEarth14VirtualProgram16setShaderLoggingEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth14VirtualProgram17accumulateShadersERKN3osg5StateEjRNS_10vector_mapIjNS0_11ShaderEntryEEERSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjSt4lessISF_ESaISt4pairIKSF_jEEERS9_ISF_SF_SH_SaISI_ISJ_SF_EEERb@Base 2.7.0
@@ -1401,7 +1599,6 @@
  _ZN8osgEarth14VirtualProgram21addBindAttribLocationERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 2.7.0
  _ZN8osgEarth14VirtualProgram21resizeGLObjectBuffersEj@Base 2.5.0
  _ZN8osgEarth14VirtualProgram24removeBindAttribLocationERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
- _ZN8osgEarth14VirtualProgram30removeExpiredProgramsFromCacheERN3osg5StateEj@Base 2.6.0
  _ZN8osgEarth14VirtualProgram30setAcceptCallbacksVaryPerFrameEb@Base 2.7.0
  _ZN8osgEarth14VirtualProgram3getEPKN3osg8StateSetE@Base 2.5.0
  _ZN8osgEarth14VirtualProgram3getEPN3osg8StateSetE@Base 2.5.0
@@ -1436,8 +1633,8 @@
  _ZN8osgEarth15ElevationSampleD2Ev@Base 2.9.0
  _ZN8osgEarth15GeometryClamper5applyERN3osg8DrawableE@Base 2.9.0
  _ZN8osgEarth15GeometryClamper5applyERN3osg9TransformE@Base 2.8~rc1
- _ZN8osgEarth15GeometryClamperC1Ev@Base 2.8~rc1
- _ZN8osgEarth15GeometryClamperC2Ev@Base 2.8~rc1
+ _ZN8osgEarth15GeometryClamperC1ERSt3mapIPN3osg5ArrayENS0_12GeometryDataESt4lessIS4_ESaISt4pairIKS4_S5_EEE@Base 2.10.0
+ _ZN8osgEarth15GeometryClamperC2ERSt3mapIPN3osg5ArrayENS0_12GeometryDataESt4lessIS4_ESaISt4pairIKS4_S5_EEE@Base 2.10.0
  _ZN8osgEarth15GeometryClamperD0Ev@Base 2.8~rc1
  _ZN8osgEarth15GeometryClamperD1Ev@Base 2.8~rc1
  _ZN8osgEarth15MapNodeReplacer5applyEPNS_15MapNodeObserverE@Base 2.4.0
@@ -1526,18 +1723,14 @@
  _ZN8osgEarth15isNotifyEnabledEN3osg14NotifySeverityE@Base 2.4.0
  _ZN8osgEarth15prettyPrintSizeB5cxx11Ed@Base 2.7.0
  _ZN8osgEarth15prettyPrintTimeB5cxx11Ed@Base 2.7.0
- _ZN8osgEarth15toLegalFileNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
+ _ZN8osgEarth15toLegalFileNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 2.10.0
+ _ZN8osgEarth15trimAndCompressERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZN8osgEarth16CacheTileHandler10handleTileERKNS_7TileKeyERKNS_11TileVisitorE@Base 2.6.0
  _ZN8osgEarth16CacheTileHandlerC1EPNS_12TerrainLayerEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth16CacheTileHandlerC2EPNS_12TerrainLayerEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth16CacheTileHandlerD0Ev@Base 2.6.0
  _ZN8osgEarth16CacheTileHandlerD1Ev@Base 2.6.0
  _ZN8osgEarth16CacheTileHandlerD2Ev@Base 2.6.0
- _ZN8osgEarth16CullNodeByNormalC1ERKN3osg5Vec3dE@Base 2.4.0
- _ZN8osgEarth16CullNodeByNormalC2ERKN3osg5Vec3dE@Base 2.4.0
- _ZN8osgEarth16CullNodeByNormalD0Ev@Base 2.4.0
- _ZN8osgEarth16CullNodeByNormalD1Ev@Base 2.4.0
- _ZN8osgEarth16CullNodeByNormalclEPN3osg4NodeEPNS1_11NodeVisitorE@Base 2.4.0
  _ZN8osgEarth16DepthOffsetGroup14scheduleUpdateEv@Base 2.5.0
  _ZN8osgEarth16DepthOffsetGroup21setDepthOffsetOptionsERKNS_18DepthOffsetOptionsE@Base 2.5.0
  _ZN8osgEarth16DepthOffsetGroup8traverseERN3osg11NodeVisitorE@Base 2.4.0
@@ -1582,6 +1775,18 @@
  _ZN8osgEarth16HeightFieldUtils28createClusterCullingCallbackEPKN3osg11HeightFieldEPKNS1_14EllipsoidModelEf@Base 2.8~rc1
  _ZN8osgEarth16HeightFieldUtils29getHeightAtNormalizedLocationEPKN3osg11HeightFieldEddNS_22ElevationInterpolationE@Base 2.4.0
  _ZN8osgEarth16HeightFieldUtils29getHeightAtNormalizedLocationERKNS_23HeightFieldNeighborhoodEddRfNS_22ElevationInterpolationE@Base 2.7.0
+ _ZN8osgEarth16HorizonClipPlane13PerCameraDataD1Ev@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlane13PerCameraDataD2Ev@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlane13ResizeFunctorclERNS0_13PerCameraDataE@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlane18setClipPlaneNumberEj@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlane21resizeGLObjectBuffersEj@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlaneC1EPKN3osg14EllipsoidModelE@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlaneC1Ev@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlaneC2EPKN3osg14EllipsoidModelE@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlaneC2Ev@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlaneD0Ev@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlaneD1Ev@Base 2.10.0
+ _ZN8osgEarth16HorizonClipPlaneclEPN3osg4NodeEPNS1_11NodeVisitorE@Base 2.10.0
  _ZN8osgEarth16MaskLayerOptions10fromConfigERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth16MaskLayerOptions11mergeConfigERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth16MaskLayerOptions11setDefaultsEv@Base 2.4.0
@@ -1596,6 +1801,11 @@
  _ZN8osgEarth16MaterialCallbackD0Ev@Base 2.9.0
  _ZN8osgEarth16MaterialCallbackD1Ev@Base 2.9.0
  _ZN8osgEarth16MaterialCallbackclEPN3osg14StateAttributeEPNS1_11NodeVisitorE@Base 2.9.0
+ (arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZN8osgEarth16NullStreamBuffer6xsputnEPKci@Base 2.10.0
+ _ZN8osgEarth16NullStreamBuffer6xsputnEPKcl@Base 2.10.0
+ _ZN8osgEarth16NullStreamBufferD0Ev@Base 2.10.0
+ _ZN8osgEarth16NullStreamBufferD1Ev@Base 2.10.0
+ _ZN8osgEarth16NullStreamBufferD2Ev@Base 2.10.0
  _ZN8osgEarth16OverlayDecorator12addTechniqueEPNS_16OverlayTechniqueE@Base 2.4.0
  _ZN8osgEarth16OverlayDecorator13TechRTTParamsD1Ev@Base 2.4.0
  _ZN8osgEarth16OverlayDecorator13TechRTTParamsD2Ev@Base 2.4.0
@@ -1603,6 +1813,7 @@
  _ZN8osgEarth16OverlayDecorator14onGroupChangedEPN3osg5GroupE@Base 2.4.0
  _ZN8osgEarth16OverlayDecorator16setTerrainEngineEPNS_17TerrainEngineNodeE@Base 2.9.0
  _ZN8osgEarth16OverlayDecorator21initializePerViewDataERNS0_11PerViewDataEPN3osg6CameraE@Base 2.4.0
+ _ZN8osgEarth16OverlayDecorator21resizeGLObjectBuffersEj@Base 2.10.0
  _ZN8osgEarth16OverlayDecorator21setMaxHorizonDistanceEd@Base 2.4.0
  _ZN8osgEarth16OverlayDecorator28setOverlayGraphTraversalMaskEj@Base 2.4.0
  _ZN8osgEarth16OverlayDecorator32cullTerrainAndCalculateRTTParamsEPN7osgUtil11CullVisitorERNS0_11PerViewDataE@Base 2.4.0
@@ -1616,6 +1827,7 @@
  _ZN8osgEarth16OverlayTechnique11reestablishEPNS_17TerrainEngineNodeE@Base 2.4.0
  _ZN8osgEarth16OverlayTechnique14preCullTerrainERNS_16OverlayDecorator13TechRTTParamsEPN7osgUtil11CullVisitorE@Base 2.4.0
  _ZN8osgEarth16OverlayTechnique16cullOverlayGroupERNS_16OverlayDecorator13TechRTTParamsEPN7osgUtil11CullVisitorE@Base 2.4.0
+ _ZN8osgEarth16OverlayTechnique21resizeGLObjectBuffersEj@Base 2.10.0
  _ZN8osgEarth16OverlayTechnique9onInstallEPNS_17TerrainEngineNodeE@Base 2.4.0
  _ZN8osgEarth16OverlayTechnique9supportedEv@Base 2.4.0
  _ZN8osgEarth16OverlayTechniqueD0Ev@Base 2.4.0
@@ -1627,7 +1839,6 @@
  _ZN8osgEarth16ProgressCallback14reportProgressEddjjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth16ProgressCallback5statsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8~rc1
  _ZN8osgEarth16ProgressCallback6cancelEv@Base 2.6.0
- _ZN8osgEarth16ProgressCallback6failedEv@Base 2.8~rc1
  _ZN8osgEarth16ProgressCallback9onStartedEv@Base 2.4.0
  _ZN8osgEarth16ProgressCallbackC1Ev@Base 2.4.0
  _ZN8osgEarth16ProgressCallbackC2Ev@Base 2.4.0
@@ -1639,7 +1850,6 @@
  _ZN8osgEarth16ProxyCullVisitor34handle_cull_callbacks_and_traverseERN3osg4NodeE@Base 2.4.0
  _ZN8osgEarth16ProxyCullVisitor5applyERN3osg3LODE@Base 2.9.0
  _ZN8osgEarth16ProxyCullVisitor5applyERN3osg4NodeE@Base 2.4.0
- _ZN8osgEarth16ProxyCullVisitor5applyERN3osg5GeodeE@Base 2.4.0
  _ZN8osgEarth16ProxyCullVisitor5applyERN3osg8DrawableE@Base 2.9.0
  _ZN8osgEarth16ProxyCullVisitor5applyERN3osg9TransformE@Base 2.4.0
  _ZN8osgEarth16ProxyCullVisitor8distanceERKN3osg5Vec3fERKNS1_7MatrixdE@Base 2.4.0
@@ -1655,7 +1865,6 @@
  _ZN8osgEarth16ResourceReleaserD1Ev@Base 2.8~rc1
  _ZN8osgEarth16ResourceReleaserD2Ev@Base 2.8~rc1
  _ZN8osgEarth16SpatialReference10createCubeEv@Base 2.4.0
- (arch=!amd64)_ZN8osgEarth16SpatialReference11getSRSCacheEv@Base 2.9.0
  _ZN8osgEarth16SpatialReference13createFromWKTERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.7.0
  _ZN8osgEarth16SpatialReference14transformUnitsERKNS_8DistanceEPKS0_d@Base 2.7.0
  _ZN8osgEarth16SpatialReference15createFromPROJ4ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.7.0
@@ -1666,8 +1875,7 @@
  _ZN8osgEarth16SpatialReference4initEv@Base 2.4.0
  _ZN8osgEarth16SpatialReference5_initEv@Base 2.4.0
  _ZN8osgEarth16SpatialReference6createEPN3osg20CoordinateSystemNodeE@Base 2.4.0
- (arch=amd64)_ZN8osgEarth16SpatialReference6createERKNS0_3KeyE@Base 2.9.0
- (arch=!amd64)_ZN8osgEarth16SpatialReference6createERKNS0_3KeyEb@Base 2.9.0
+ _ZN8osgEarth16SpatialReference6createERKNS0_3KeyE@Base 2.10.0
  _ZN8osgEarth16SpatialReference6createERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.7.0
  _ZN8osgEarth16SpatialReference6fixWKTEv@Base 2.4.0
  _ZN8osgEarth16SpatialReferenceC1EPvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
@@ -1690,7 +1898,6 @@
  _ZN8osgEarth16TerrainResources23releaseTextureImageUnitEi@Base 2.9.0
  _ZN8osgEarth16TerrainResources23releaseTextureImageUnitEiPKNS_5LayerE@Base 2.9.0
  _ZN8osgEarth16TerrainResources23reserveTextureImageUnitERNS_27TextureImageUnitReservationEPKc@Base 2.9.0
- _ZN8osgEarth16TerrainResources23reserveTextureImageUnitERiPKNS_5LayerEPKc@Base 2.9.0
  _ZN8osgEarth16TerrainResources23reserveTextureImageUnitERiPKc@Base 2.9.0
  _ZN8osgEarth16TerrainResources28setTextureImageUnitOffLimitsEi@Base 2.9.0
  _ZN8osgEarth16TerrainResources31reserveTextureImageUnitForLayerERNS_27TextureImageUnitReservationEPKNS_5LayerEPKc@Base 2.9.0
@@ -1720,7 +1927,9 @@
  _ZN8osgEarth16TileSourceDriverD0Ev@Base 2.4.0
  _ZN8osgEarth16TileSourceDriverD1Ev@Base 2.4.0
  _ZN8osgEarth16TileSourceDriverD2Ev@Base 2.4.0
+ _ZN8osgEarth16getNotifyHandlerEv@Base 2.10.0
  _ZN8osgEarth16htmlColorToVec4fERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
+ _ZN8osgEarth16setNotifyHandlerEPN3osg13NotifyHandlerE@Base 2.10.0
  _ZN8osgEarth16vec4fToHtmlColorB5cxx11ERKN3osg5Vec4fE@Base 2.7.0
  _ZN8osgEarth17ClampingTechnique11onUninstallEPNS_17TerrainEngineNodeE@Base 2.4.0
  _ZN8osgEarth17ClampingTechnique11reestablishEPNS_17TerrainEngineNodeE@Base 2.4.0
@@ -1744,7 +1953,7 @@
  _ZN8osgEarth17ElevationEnvelopeD0Ev@Base 2.9.0
  _ZN8osgEarth17ElevationEnvelopeD1Ev@Base 2.9.0
  _ZN8osgEarth17ElevationEnvelopeD2Ev@Base 2.9.0
- _ZN8osgEarth17GeometryValidator5applyERN3osg5GeodeE@Base 2.6.0
+ _ZN8osgEarth17GeometryValidator5applyERN3osg5GroupE@Base 2.10.0
  _ZN8osgEarth17GeometryValidator5applyERN3osg8GeometryE@Base 2.6.0
  _ZN8osgEarth17GeometryValidatorC1Ev@Base 2.6.0
  _ZN8osgEarth17GeometryValidatorC2Ev@Base 2.6.0
@@ -1781,14 +1990,15 @@
  _ZN8osgEarth17ModelLayerOptions11setDefaultsEv@Base 2.4.0
  _ZN8osgEarth17ModelLayerOptionsC1ERKNS_13ConfigOptionsE@Base 2.4.0
  _ZN8osgEarth17ModelLayerOptionsC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_18ModelSourceOptionsE@Base 2.7.0
- _ZN8osgEarth17ModelLayerOptionsC1ERKS0_@Base 2.8~rc1
+ _ZN8osgEarth17ModelLayerOptionsC1ERKS0_@Base 2.10.1
+ _ZN8osgEarth17ModelLayerOptionsC1Ev@Base 2.10.0
  _ZN8osgEarth17ModelLayerOptionsC2ERKNS_13ConfigOptionsE@Base 2.4.0
  _ZN8osgEarth17ModelLayerOptionsC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_18ModelSourceOptionsE@Base 2.7.0
- _ZN8osgEarth17ModelLayerOptionsC2ERKS0_@Base 2.8~rc1
+ _ZN8osgEarth17ModelLayerOptionsC2ERKS0_@Base 2.10.1
+ _ZN8osgEarth17ModelLayerOptionsC2Ev@Base 2.10.0
  _ZN8osgEarth17ModelLayerOptionsD0Ev@Base 2.4.0
  _ZN8osgEarth17ModelLayerOptionsD1Ev@Base 2.4.0
  _ZN8osgEarth17ModelLayerOptionsD2Ev@Base 2.4.0
- _ZN8osgEarth17ModelLayerOptionsaSERKS0_@Base 2.8~rc1
  _ZN8osgEarth17ModelSourceDriverD0Ev@Base 2.5.0
  _ZN8osgEarth17ModelSourceDriverD1Ev@Base 2.5.0
  _ZN8osgEarth17ModelSourceDriverD2Ev@Base 2.5.0
@@ -1807,14 +2017,14 @@
  _ZN8osgEarth17TerrainEngineNode12dirtyTerrainEv@Base 2.7.0
  _ZN8osgEarth17TerrainEngineNode12removeEffectEPNS_13TerrainEffectE@Base 2.5.0
  _ZN8osgEarth17TerrainEngineNode13requestRedrawEv@Base 2.7.0
- _ZN8osgEarth17TerrainEngineNode15createTileModelERKNS_8MapFrameERKNS_7TileKeyERKNS_21CreateTileModelFilterEPNS_16ProgressCallbackE@Base 2.9.0
+ _ZN8osgEarth17TerrainEngineNode15createTileModelEPKNS_3MapERKNS_7TileKeyERKNS_21CreateTileModelFilterEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth17TerrainEngineNode16invalidateRegionERKNS_9GeoExtentEjj@Base 2.6.0
  _ZN8osgEarth17TerrainEngineNode17onMapModelChangedERKNS_14MapModelChangeE@Base 2.4.0
  _ZN8osgEarth17TerrainEngineNode18getSurfaceStateSetEv@Base 2.8~rc1
  _ZN8osgEarth17TerrainEngineNode19notifyExistingNodesEPNS_13TerrainEngine12NodeCallbackE@Base 2.8~rc1
  _ZN8osgEarth17TerrainEngineNode20ImageLayerController21onColorFiltersChangedEPNS_10ImageLayerE@Base 2.4.0
- _ZN8osgEarth17TerrainEngineNode20ImageLayerControllerC1EPKNS_3MapEPS0_@Base 2.4.0
- _ZN8osgEarth17TerrainEngineNode20ImageLayerControllerC2EPKNS_3MapEPS0_@Base 2.4.0
+ _ZN8osgEarth17TerrainEngineNode20ImageLayerControllerC1EPS0_@Base 2.10.0
+ _ZN8osgEarth17TerrainEngineNode20ImageLayerControllerC2EPS0_@Base 2.10.0
  _ZN8osgEarth17TerrainEngineNode20ImageLayerControllerD0Ev@Base 2.4.0
  _ZN8osgEarth17TerrainEngineNode20ImageLayerControllerD1Ev@Base 2.4.0
  _ZN8osgEarth17TerrainEngineNode20ImageLayerControllerD2Ev@Base 2.4.0
@@ -1827,6 +2037,9 @@
  _ZN8osgEarth17TerrainEngineNode26addCreateTileModelCallbackEPNS0_23CreateTileModelCallbackE@Base 2.8~rc1
  _ZN8osgEarth17TerrainEngineNode29removeCreateTileModelCallbackEPNS0_23CreateTileModelCallbackE@Base 2.8~rc1
  _ZN8osgEarth17TerrainEngineNode31notifyOfTerrainTileNodeCreationERKNS_7TileKeyEPN3osg4NodeE@Base 2.7.0
+ _ZN8osgEarth17TerrainEngineNode32addModifyTileBoundingBoxCallbackEPNS0_29ModifyTileBoundingBoxCallbackE@Base 2.10.1
+ _ZN8osgEarth17TerrainEngineNode34fireModifyTileBoundingBoxCallbacksERKNS_7TileKeyERN3osg15BoundingBoxImplINS4_5Vec3fEEE@Base 2.10.1
+ _ZN8osgEarth17TerrainEngineNode35removeModifyTileBoundingBoxCallbackEPNS0_29ModifyTileBoundingBoxCallbackE@Base 2.10.1
  _ZN8osgEarth17TerrainEngineNode6setMapEPKNS_3MapERKNS_14TerrainOptionsE@Base 2.9.0
  _ZN8osgEarth17TerrainEngineNode8traverseERN3osg11NodeVisitorE@Base 2.4.0
  _ZN8osgEarth17TerrainEngineNode9addEffectEPNS_13TerrainEffectE@Base 2.5.0
@@ -1880,6 +2093,7 @@
  _ZN8osgEarth18DepthOffsetOptionsC2ERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth18DepthOffsetOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth18DepthOffsetOptionsD2Ev@Base 2.9.0
+ _ZN8osgEarth18ImageLayerCallback17onAltitudeChangedEPNS_10ImageLayerE@Base 2.10.1
  _ZN8osgEarth18ImageLayerCallback21onVisibleRangeChangedEPNS_10ImageLayerE@Base 2.4.0
  _ZN8osgEarth18IntersectionPicker16setTraversalMaskEj@Base 2.7.0
  _ZN8osgEarth18IntersectionPicker8setLimitERKNS0_5LimitE@Base 2.7.0
@@ -1900,20 +2114,19 @@
  _ZN8osgEarth18ModelSourceOptionsD0Ev@Base 2.4.0
  _ZN8osgEarth18ModelSourceOptionsD1Ev@Base 2.4.0
  _ZN8osgEarth18ModelSourceOptionsD2Ev@Base 2.4.0
- _ZN8osgEarth18PixelAutoTransform5dirtyEv@Base 2.4.0
- _ZN8osgEarth18PixelAutoTransform6acceptERN3osg11NodeVisitorE@Base 2.4.0
- _ZN8osgEarth18PixelAutoTransformC1Ev@Base 2.4.0
- _ZN8osgEarth18PixelAutoTransformC2Ev@Base 2.4.0
- _ZN8osgEarth18PixelAutoTransformD0Ev@Base 2.4.0
- _ZN8osgEarth18PixelAutoTransformD1Ev@Base 2.4.0
- _ZN8osgEarth18PixelAutoTransformD2Ev@Base 2.4.0
+ _ZN8osgEarth18NotifyStreamBuffer4syncEv@Base 2.10.0
+ _ZN8osgEarth18NotifyStreamBufferD0Ev@Base 2.10.0
+ _ZN8osgEarth18NotifyStreamBufferD1Ev@Base 2.10.0
+ _ZN8osgEarth18NotifyStreamBufferD2Ev@Base 2.10.0
  _ZN8osgEarth18SceneGraphCallback12onRemoveNodeEPN3osg4NodeE@Base 2.9.0
+ _ZN8osgEarth18SceneGraphCallback12onRemoveNodeEPN3osg4NodeEPNS1_6ObjectE@Base 2.10.0
  _ZN8osgEarth18SceneGraphCallback14onPreMergeNodeEPN3osg4NodeE@Base 2.9.0
+ _ZN8osgEarth18SceneGraphCallback14onPreMergeNodeEPN3osg4NodeEPNS1_6ObjectE@Base 2.10.0
  _ZN8osgEarth18SceneGraphCallback15onPostMergeNodeEPN3osg4NodeE@Base 2.9.0
+ _ZN8osgEarth18SceneGraphCallback15onPostMergeNodeEPN3osg4NodeEPNS1_6ObjectE@Base 2.10.0
  _ZN8osgEarth18SceneGraphCallbackD0Ev@Base 2.9.0
  _ZN8osgEarth18SceneGraphCallbackD1Ev@Base 2.9.0
  _ZN8osgEarth18SceneGraphCallbackD2Ev@Base 2.9.0
- _ZN8osgEarth18ShaderPreProcessor20applySupportForNoFFPEPN3osg6ShaderE@Base 2.8~rc1
  _ZN8osgEarth18ShaderPreProcessor3runEPN3osg6ShaderE@Base 2.4.0
  _ZN8osgEarth18TaskServiceManager10reallocateEi@Base 2.4.0
  _ZN8osgEarth18TaskServiceManager13setNumThreadsEi@Base 2.4.0
@@ -1940,7 +2153,6 @@
  _ZN8osgEarth18UnifiedCubeProfileD0Ev@Base 2.4.0
  _ZN8osgEarth18UnifiedCubeProfileD1Ev@Base 2.4.0
  _ZN8osgEarth18UnifiedCubeProfileD2Ev@Base 2.4.0
- _ZN8osgEarth18removeEventHandlerEPN9osgViewer4ViewEPN5osgGA15GUIEventHandlerE@Base 2.4.0
  _ZN8osgEarth19CollectFilesVisitor10handleFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth19CollectFilesVisitorC1Ev@Base 2.5.0
  _ZN8osgEarth19CollectFilesVisitorC2Ev@Base 2.5.0
@@ -1965,6 +2177,9 @@
  _ZN8osgEarth19DriverConfigOptionsD0Ev@Base 2.4.0
  _ZN8osgEarth19DriverConfigOptionsD1Ev@Base 2.4.0
  _ZN8osgEarth19DriverConfigOptionsD2Ev@Base 2.4.0
+ _ZN8osgEarth19GL3RealizeOperationD0Ev@Base 2.10.0
+ _ZN8osgEarth19GL3RealizeOperationD1Ev@Base 2.10.0
+ _ZN8osgEarth19GL3RealizeOperationclEPN3osg6ObjectE@Base 2.10.0
  _ZN8osgEarth19HorizonCullCallback9isVisibleEPN3osg4NodeEPNS1_11NodeVisitorE@Base 2.8~rc1
  _ZN8osgEarth19HorizonCullCallbackC1Ev@Base 2.7.0
  _ZN8osgEarth19HorizonCullCallbackC2Ev@Base 2.7.0
@@ -1973,10 +2188,8 @@
  _ZN8osgEarth19HorizonCullCallbackclEPN3osg4NodeEPNS1_11NodeVisitorE@Base 2.7.0
  _ZN8osgEarth19LandCoverDictionary8addClassERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEi@Base 2.9.0
  _ZN8osgEarth19LandCoverDictionaryC1ERKNS_26LandCoverDictionaryOptionsE@Base 2.9.0
- _ZN8osgEarth19LandCoverDictionaryC1ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth19LandCoverDictionaryC1Ev@Base 2.9.0
  _ZN8osgEarth19LandCoverDictionaryC2ERKNS_26LandCoverDictionaryOptionsE@Base 2.9.0
- _ZN8osgEarth19LandCoverDictionaryC2ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth19LandCoverDictionaryC2Ev@Base 2.9.0
  _ZN8osgEarth19LandCoverDictionaryD0Ev@Base 2.9.0
  _ZN8osgEarth19LandCoverDictionaryD1Ev@Base 2.9.0
@@ -1997,6 +2210,8 @@
  _ZN8osgEarth19SceneGraphCallbacks17firePostMergeNodeEPN3osg4NodeE@Base 2.9.0
  _ZN8osgEarth19SceneGraphCallbacks3addEPNS_18SceneGraphCallbackE@Base 2.9.0
  _ZN8osgEarth19SceneGraphCallbacks6removeEPNS_18SceneGraphCallbackE@Base 2.9.0
+ _ZN8osgEarth19SceneGraphCallbacksC1EPN3osg6ObjectE@Base 2.10.0
+ _ZN8osgEarth19SceneGraphCallbacksC2EPN3osg6ObjectE@Base 2.10.0
  _ZN8osgEarth19SceneGraphCallbacksD0Ev@Base 2.9.0
  _ZN8osgEarth19SceneGraphCallbacksD1Ev@Base 2.9.0
  _ZN8osgEarth19SceneGraphCallbacksD2Ev@Base 2.9.0
@@ -2026,6 +2241,9 @@
  _ZN8osgEarth19VisibleLayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth19VisibleLayerOptionsD2Ev@Base 2.9.0
  _ZN8osgEarth19getLastModifiedTimeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
+ _ZN8osgEarth20AltitudeCullCallbackD0Ev@Base 2.10.0
+ _ZN8osgEarth20AltitudeCullCallbackD1Ev@Base 2.10.0
+ _ZN8osgEarth20AltitudeCullCallbackclEPN3osg4NodeEPNS1_11NodeVisitorE@Base 2.10.0
  _ZN8osgEarth20ChromeMetricsBackend3endERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth20ChromeMetricsBackend5beginERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth20ChromeMetricsBackend7counterERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_dS8_dS8_d@Base 2.9.0
@@ -2047,6 +2265,9 @@
  _ZN8osgEarth20ElevationLayerVectorD0Ev@Base 2.4.0
  _ZN8osgEarth20ElevationLayerVectorD1Ev@Base 2.4.0
  _ZN8osgEarth20ElevationLayerVectorD2Ev@Base 2.4.0
+ _ZN8osgEarth20EllipsoidIntersector13intersectLineERKN3osg5Vec3dES4_RS2_@Base 2.10.0
+ _ZN8osgEarth20EllipsoidIntersectorC1EPKN3osg14EllipsoidModelE@Base 2.10.0
+ _ZN8osgEarth20EllipsoidIntersectorC2EPKN3osg14EllipsoidModelE@Base 2.10.0
  _ZN8osgEarth20PrimitiveIntersector10intersectsERKN3osg18BoundingSphereImplINS1_5Vec3fEEE@Base 2.5.0
  _ZN8osgEarth20PrimitiveIntersector12IntersectionC1ERKS1_@Base 2.6.0
  _ZN8osgEarth20PrimitiveIntersector12IntersectionC2ERKS1_@Base 2.6.0
@@ -2098,7 +2319,7 @@
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_26ScreenSpaceLayoutExtensionENS_9ExtensionEEEEC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_26ScreenSpaceLayoutExtensionENS_9ExtensionEEEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_26ScreenSpaceLayoutExtensionENS_9ExtensionEEEED2Ev@Base 2.9.0
- _ZN8osgEarth20VertexCacheOptimizer5applyERN3osg5GeodeE@Base 2.5.0
+ _ZN8osgEarth20VertexCacheOptimizer5applyERN3osg8DrawableE@Base 2.10.0
  _ZN8osgEarth20VertexCacheOptimizerC1Ev@Base 2.5.0
  _ZN8osgEarth20VertexCacheOptimizerC2Ev@Base 2.5.0
  _ZN8osgEarth20VertexCacheOptimizerD0Ev@Base 2.5.0
@@ -2106,8 +2327,12 @@
  _ZN8osgEarth20VerticalDatumFactory6createERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth20VisibleLayerCallback16onOpacityChangedEPNS_12VisibleLayerE@Base 2.9.0
  _ZN8osgEarth20VisibleLayerCallback16onVisibleChangedEPNS_12VisibleLayerE@Base 2.9.0
+ _ZN8osgEarth20VisibleLayerCallback21onVisibleRangeChangedEPNS_12VisibleLayerE@Base 2.10.0
  _ZN8osgEarth20isPathToArchivedFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth20makeDirectoryForFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
+ _ZN8osgEarth21AsyncNodePseudoLoaderD0Ev@Base 2.10.1
+ _ZN8osgEarth21AsyncNodePseudoLoaderD1Ev@Base 2.10.1
+ _ZN8osgEarth21AsyncNodePseudoLoaderD2Ev@Base 2.10.1
  _ZN8osgEarth21ClusterCullingFactory16createAndInstallEPN3osg4NodeERKNS1_5Vec3dE@Base 2.4.0
  _ZN8osgEarth21ClusterCullingFactory6createEPN3osg4NodeERKNS1_5Vec3dE@Base 2.4.0
  _ZN8osgEarth21ClusterCullingFactory6createERKN3osg5Vec3fES4_ff@Base 2.4.0
@@ -2153,21 +2378,15 @@
  _ZN8osgEarth21TerrainTileLayerModelD0Ev@Base 2.8~rc1
  _ZN8osgEarth21TerrainTileLayerModelD1Ev@Base 2.8~rc1
  _ZN8osgEarth21TerrainTileLayerModelD2Ev@Base 2.8~rc1
- _ZN8osgEarth22DisableSubgraphCullingD0Ev@Base 2.4.0
- _ZN8osgEarth22DisableSubgraphCullingD1Ev@Base 2.4.0
- _ZN8osgEarth22DisableSubgraphCullingclEPN3osg4NodeEPNS1_11NodeVisitorE@Base 2.4.0
  _ZN8osgEarth22LandCoverCoverageLayerC1ERKNS_29LandCoverCoverageLayerOptionsE@Base 2.9.0
- _ZN8osgEarth22LandCoverCoverageLayerC1ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth22LandCoverCoverageLayerC1Ev@Base 2.9.0
  _ZN8osgEarth22LandCoverCoverageLayerC2ERKNS_29LandCoverCoverageLayerOptionsE@Base 2.9.0
- _ZN8osgEarth22LandCoverCoverageLayerC2ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth22LandCoverCoverageLayerC2Ev@Base 2.9.0
  _ZN8osgEarth22LandCoverCoverageLayerD0Ev@Base 2.9.0
  _ZN8osgEarth22LandCoverCoverageLayerD1Ev@Base 2.9.0
  _ZN8osgEarth22LandCoverCoverageLayerD2Ev@Base 2.9.0
  _ZN8osgEarth22MapNodeObserverVisitor5applyERN3osg4NodeE@Base 2.4.0
- _ZN8osgEarth22MapNodeObserverVisitor5applyERN3osg5GeodeE@Base 2.4.0
- _ZN8osgEarth22SetDataVarianceVisitor5applyERN3osg5GeodeE@Base 2.5.0
+ _ZN8osgEarth22SetDataVarianceVisitor5applyERN3osg8DrawableE@Base 2.10.0
  _ZN8osgEarth22SetDataVarianceVisitorC1EN3osg6Object12DataVarianceE@Base 2.5.0
  _ZN8osgEarth22SetDataVarianceVisitorC2EN3osg6Object12DataVarianceE@Base 2.5.0
  _ZN8osgEarth22SetDataVarianceVisitorD0Ev@Base 2.5.0
@@ -2180,10 +2399,8 @@
  _ZN8osgEarth22TerrainCallbackContextD1Ev@Base 2.4.0
  _ZN8osgEarth22TerrainCallbackContextD2Ev@Base 2.4.0
  _ZN8osgEarth22TextureAndImageVisitor5applyERN3osg4NodeE@Base 2.8~rc1
- _ZN8osgEarth22TextureAndImageVisitor5applyERN3osg5GeodeE@Base 2.8~rc1
  _ZN8osgEarth22TextureAndImageVisitor5applyERN3osg5ImageE@Base 2.8~rc1
  _ZN8osgEarth22TextureAndImageVisitor5applyERN3osg7TextureE@Base 2.8~rc1
- _ZN8osgEarth22TextureAndImageVisitor5applyERN3osg8DrawableE@Base 2.8~rc1
  _ZN8osgEarth22TextureAndImageVisitor5applyERN3osg8StateSetE@Base 2.8~rc1
  _ZN8osgEarth22TextureAndImageVisitorC1Ev@Base 2.8~rc1
  _ZN8osgEarth22TextureAndImageVisitorC2Ev@Base 2.8~rc1
@@ -2195,6 +2412,37 @@
  _ZN8osgEarth22TransientUserDataStore8DataPairD1Ev@Base 2.8~rc1
  _ZN8osgEarth22TransientUserDataStore8DataPairD2Ev@Base 2.8~rc1
  _ZN8osgEarth22TransientUserDataStore8unitTestEv@Base 2.8~rc1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocal10initializeEPN3osg6CameraERS0_@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocal13objectDeletedEPv@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocal16intersectTerrainERS0_RKN3osg5Vec3dES6_RS4_@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocal23constrainRttBoxToBoundsERKN3osg7MatrixdERKNS2_18BoundingSphereImplINS2_5Vec3fEEERNS2_15BoundingBoxImplINS2_5Vec3dEEE@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocal24constrainRttBoxToFrustumERKN3osg7MatrixdES5_RKNS2_14EllipsoidModelEbRNS2_15BoundingBoxImplINS2_5Vec3dEEE@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocal4dumpEPKN3osg6CameraERS0_@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocal5clearEv@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocal8traverseEPN7osgUtil11CullVisitorERS0_RKN3osg18BoundingSphereImplINS6_5Vec3fEEE@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocalD0Ev@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocalD1Ev@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator11CameraLocalD2Ev@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator13setUseMipMapsEb@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator14setTextureSizeEj@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator17setMaxNumCascadesEj@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator18setNumMultiSamplesEj@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator22setMinimumNearFarRatioEd@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator23reserveTextureImageUnitEv@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator23setUseProjectionFittingEb@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator7Cascade15expandToIncludeERKN3osg5Vec3dE@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator7Cascade17computeProjectionERKN3osg7MatrixdES5_RKNS2_14EllipsoidModelERKNS2_5PlaneEdRKNS2_15BoundingBoxImplINS2_5Vec3dEEE@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator7Cascade19computeClipCoverageERKN3osg7MatrixdES5_@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator7Cascade8makeProjEd@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator7CascadeD1Ev@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator7CascadeD2Ev@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator7getDumpEv@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecorator8traverseERN3osg11NodeVisitorE@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecoratorC1EPKNS_16SpatialReferenceEPNS_16TerrainResourcesE@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecoratorC2EPKNS_16SpatialReferenceEPNS_16TerrainResourcesE@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecoratorD0Ev@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecoratorD1Ev@Base 2.10.1
+ _ZN8osgEarth23CascadeDrapingDecoratorD2Ev@Base 2.10.1
  _ZN8osgEarth23ClipToGeocentricHorizonC1EPKNS_16SpatialReferenceEPN3osg9ClipPlaneE@Base 2.6.0
  _ZN8osgEarth23ClipToGeocentricHorizonC2EPKNS_16SpatialReferenceEPN3osg9ClipPlaneE@Base 2.6.0
  _ZN8osgEarth23ClipToGeocentricHorizonD0Ev@Base 2.6.0
@@ -2232,20 +2480,18 @@
  _ZN8osgEarth23MultiprocessTileVisitorD0Ev@Base 2.6.0
  _ZN8osgEarth23MultiprocessTileVisitorD1Ev@Base 2.6.0
  _ZN8osgEarth23MultiprocessTileVisitorD2Ev@Base 2.6.0
- _ZN8osgEarth23PrimitiveSetTypeCounter5applyERN3osg5GeodeE@Base 2.4.0
+ _ZN8osgEarth23PrimitiveSetTypeCounter5applyERN3osg8DrawableE@Base 2.10.0
  _ZN8osgEarth23PrimitiveSetTypeCounterC1Ev@Base 2.4.0
  _ZN8osgEarth23PrimitiveSetTypeCounterC2Ev@Base 2.4.0
  _ZN8osgEarth23PrimitiveSetTypeCounterD0Ev@Base 2.4.0
  _ZN8osgEarth23PrimitiveSetTypeCounterD1Ev@Base 2.4.0
  _ZN8osgEarth23TerrainTileModelFactory12HFCacheValueD1Ev@Base 2.9.0
  _ZN8osgEarth23TerrainTileModelFactory12HFCacheValueD2Ev@Base 2.9.0
- _ZN8osgEarth23TerrainTileModelFactory12addElevationEPNS_16TerrainTileModelERKNS_8MapFrameERKNS_7TileKeyERKNS_21CreateTileModelFilterEjPNS_16ProgressCallbackE@Base 2.9.0
- _ZN8osgEarth23TerrainTileModelFactory12addNormalMapEPNS_16TerrainTileModelERKNS_8MapFrameERKNS_7TileKeyEPNS_16ProgressCallbackE@Base 2.8~rc1
- _ZN8osgEarth23TerrainTileModelFactory14addColorLayersEPNS_16TerrainTileModelERKNS_8MapFrameEPKNS_25TerrainEngineRequirementsERKNS_7TileKeyERKNS_21CreateTileModelFilterEPNS_16ProgressCallbackE@Base 2.9.0
- _ZN8osgEarth23TerrainTileModelFactory14addImageLayersEPNS_16TerrainTileModelERKNS_8MapFrameEPKNS_25TerrainEngineRequirementsERKNS_7TileKeyERKNS_21CreateTileModelFilterEPNS_16ProgressCallbackE@Base 2.9.0
- _ZN8osgEarth23TerrainTileModelFactory14addPatchLayersEPNS_16TerrainTileModelERKNS_8MapFrameERKNS_7TileKeyERKNS_21CreateTileModelFilterEPNS_16ProgressCallbackE@Base 2.9.0
- _ZN8osgEarth23TerrainTileModelFactory15createTileModelERKNS_8MapFrameERKNS_7TileKeyERKNS_21CreateTileModelFilterEPKNS_25TerrainEngineRequirementsEPNS_16ProgressCallbackE@Base 2.9.0
- _ZN8osgEarth23TerrainTileModelFactory22getOrCreateHeightFieldERKNS_8MapFrameERKNS_7TileKeyENS_21ElevationSamplePolicyENS_22ElevationInterpolationEjRN3osg7ref_ptrINS9_11HeightFieldEEERNSA_INS_9NormalMapEEEPNS_16ProgressCallbackE@Base 2.9.0
+ _ZN8osgEarth23TerrainTileModelFactory12addElevationEPNS_16TerrainTileModelEPKNS_3MapERKNS_7TileKeyERKNS_21CreateTileModelFilterEjPNS_16ProgressCallbackE@Base 2.10.0
+ _ZN8osgEarth23TerrainTileModelFactory14addColorLayersEPNS_16TerrainTileModelEPKNS_3MapEPKNS_25TerrainEngineRequirementsERKNS_7TileKeyERKNS_21CreateTileModelFilterEPNS_16ProgressCallbackE@Base 2.10.0
+ _ZN8osgEarth23TerrainTileModelFactory14addPatchLayersEPNS_16TerrainTileModelEPKNS_3MapERKNS_7TileKeyERKNS_21CreateTileModelFilterEPNS_16ProgressCallbackE@Base 2.10.0
+ _ZN8osgEarth23TerrainTileModelFactory15createTileModelEPKNS_3MapERKNS_7TileKeyERKNS_21CreateTileModelFilterEPKNS_25TerrainEngineRequirementsEPNS_16ProgressCallbackE@Base 2.10.0
+ _ZN8osgEarth23TerrainTileModelFactory22getOrCreateHeightFieldEPKNS_3MapERKNS_7TileKeyENS_21ElevationSamplePolicyENS_22ElevationInterpolationEjRN3osg7ref_ptrINS9_11HeightFieldEEERNSA_INS_9NormalMapEEEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth23TerrainTileModelFactoryC1ERKNS_14TerrainOptionsE@Base 2.8~rc1
  _ZN8osgEarth23TerrainTileModelFactoryC2ERKNS_14TerrainOptionsE@Base 2.8~rc1
  _ZN8osgEarth23TerrainTileModelFactoryD0Ev@Base 2.8~rc1
@@ -2291,6 +2537,8 @@
  _ZN8osgEarth24RemoveEmptyGroupsVisitorD0Ev@Base 2.4.0
  _ZN8osgEarth24RemoveEmptyGroupsVisitorD1Ev@Base 2.4.0
  _ZN8osgEarth24ScreenSpaceLayoutOptions10fromConfigERKNS_6ConfigE@Base 2.8~rc1
+ _ZN8osgEarth24ScreenSpaceLayoutOptionsC1ERKNS_13ConfigOptionsE@Base 2.10.1
+ _ZN8osgEarth24ScreenSpaceLayoutOptionsC2ERKNS_13ConfigOptionsE@Base 2.10.1
  _ZN8osgEarth24ScreenSpaceLayoutOptionsD0Ev@Base 2.8~rc1
  _ZN8osgEarth24ScreenSpaceLayoutOptionsD1Ev@Base 2.8~rc1
  _ZN8osgEarth24ScreenSpaceLayoutOptionsD2Ev@Base 2.8~rc1
@@ -2304,8 +2552,6 @@
  _ZN8osgEarth26CompositeTileSourceOptions11mergeConfigERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth26CompositeTileSourceOptions3addERKNS_17ImageLayerOptionsE@Base 2.4.0
  _ZN8osgEarth26CompositeTileSourceOptions3addERKNS_21ElevationLayerOptionsE@Base 2.6.0
- (arch=hurd-i386 i386)_ZN8osgEarth26CompositeTileSourceOptions9ComponentC1ERKS1_@Base 2.9.0
- (arch=hurd-i386 i386)_ZN8osgEarth26CompositeTileSourceOptions9ComponentC2ERKS1_@Base 2.9.0
  _ZN8osgEarth26CompositeTileSourceOptions9ComponentD1Ev@Base 2.4.0
  _ZN8osgEarth26CompositeTileSourceOptions9ComponentD2Ev@Base 2.4.0
  _ZN8osgEarth26CompositeTileSourceOptionsC1ERKNS_17TileSourceOptionsE@Base 2.4.0
@@ -2331,9 +2577,7 @@
  _ZN8osgEarth26PagedLODWithNodeOperationsD0Ev@Base 2.4.0
  _ZN8osgEarth26PagedLODWithNodeOperationsD1Ev@Base 2.4.0
  _ZN8osgEarth26PagedLODWithNodeOperationsD2Ev@Base 2.4.0
- _ZN8osgEarth26ScreenSpaceLayoutExtensionC1ERKS0_RKN3osg6CopyOpE@Base 2.8~rc1
  _ZN8osgEarth26ScreenSpaceLayoutExtensionC1Ev@Base 2.8~rc1
- _ZN8osgEarth26ScreenSpaceLayoutExtensionC2ERKS0_RKN3osg6CopyOpE@Base 2.8~rc1
  _ZN8osgEarth26ScreenSpaceLayoutExtensionC2Ev@Base 2.8~rc1
  _ZN8osgEarth26ScreenSpaceLayoutExtensionD0Ev@Base 2.8~rc1
  _ZN8osgEarth26ScreenSpaceLayoutExtensionD1Ev@Base 2.8~rc1
@@ -2387,6 +2631,7 @@
  (optional=templinst)_ZN8osgEarth2asIiEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth2asIjEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth2asIlEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.7.0
+ _ZN8osgEarth30LightSourceGL3UniformGenerator21resizeGLBufferObjectsEj@Base 2.10.0
  _ZN8osgEarth30LightSourceGL3UniformGenerator3runEPN3osg6ObjectES3_@Base 2.9.0
  _ZN8osgEarth30LightSourceGL3UniformGeneratorD0Ev@Base 2.9.0
  _ZN8osgEarth30LightSourceGL3UniformGeneratorD1Ev@Base 2.9.0
@@ -2397,12 +2642,8 @@
  _ZN8osgEarth30TerrainEngineNodeCallbackProxyD2Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth30osgEarthRegisterRenderBinProxyI34osgEarthScreenSpaceLayoutRenderBinED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth30osgEarthRegisterRenderBinProxyI34osgEarthScreenSpaceLayoutRenderBinED2Ev@Base 2.8~rc1
- _ZN8osgEarth31DoNotComputeNearFarCullCallbackD0Ev@Base 2.4.0
- _ZN8osgEarth31DoNotComputeNearFarCullCallbackD1Ev@Base 2.4.0
- _ZN8osgEarth31DoNotComputeNearFarCullCallbackclEPN3osg4NodeEPNS1_11NodeVisitorE@Base 2.4.0
  _ZN8osgEarth31PagedLODWithSceneGraphCallbacks11insertChildEjPN3osg4NodeE@Base 2.9.0
- _ZN8osgEarth31PagedLODWithSceneGraphCallbacks11removeChildEPN3osg4NodeE@Base 2.9.0
- (arch=amd64)_ZN8osgEarth31PagedLODWithSceneGraphCallbacks12childRemovedEjj@Base 2.9.0
+ _ZN8osgEarth31PagedLODWithSceneGraphCallbacks12childRemovedEjj@Base 2.10.0
  _ZN8osgEarth31PagedLODWithSceneGraphCallbacks12replaceChildEPN3osg4NodeES3_@Base 2.9.0
  _ZN8osgEarth31PagedLODWithSceneGraphCallbacks22setSceneGraphCallbacksEPNS_19SceneGraphCallbacksE@Base 2.9.0
  _ZN8osgEarth31PagedLODWithSceneGraphCallbacks8addChildEPN3osg4NodeE@Base 2.9.0
@@ -2411,53 +2652,50 @@
  _ZN8osgEarth31PagedLODWithSceneGraphCallbacksD0Ev@Base 2.9.0
  _ZN8osgEarth31PagedLODWithSceneGraphCallbacksD1Ev@Base 2.9.0
  _ZN8osgEarth31PagedLODWithSceneGraphCallbacksD2Ev@Base 2.9.0
- _ZN8osgEarth36AllocateAndMergeBufferObjectsVisitor5applyERN3osg5GeodeE@Base 2.7.0
+ _ZN8osgEarth36AllocateAndMergeBufferObjectsVisitor5applyERN3osg8DrawableE@Base 2.10.0
  _ZN8osgEarth36AllocateAndMergeBufferObjectsVisitorC1Ev@Base 2.7.0
  _ZN8osgEarth36AllocateAndMergeBufferObjectsVisitorC2Ev@Base 2.7.0
  _ZN8osgEarth36AllocateAndMergeBufferObjectsVisitorD0Ev@Base 2.7.0
  _ZN8osgEarth36AllocateAndMergeBufferObjectsVisitorD1Ev@Base 2.7.0
+ _ZN8osgEarth3Map10closeLayerEPNS_5LayerE@Base 2.10.0
  _ZN8osgEarth3Map10setMapNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  _ZN8osgEarth3Map11beginUpdateEv@Base 2.4.0
  _ZN8osgEarth3Map11insertLayerEPNS_5LayerEj@Base 2.9.0
  _ZN8osgEarth3Map11removeLayerEPNS_5LayerE@Base 2.9.0
- _ZN8osgEarth3Map13addImageLayerEPNS_10ImageLayerE@Base 2.4.0
- _ZN8osgEarth3Map13addModelLayerEPNS_10ModelLayerE@Base 2.4.0
- _ZN8osgEarth3Map14moveImageLayerEPNS_10ImageLayerEj@Base 2.4.0
- _ZN8osgEarth3Map14moveModelLayerEPNS_10ModelLayerEj@Base 2.4.0
- _ZN8osgEarth3Map16ElevationLayerCB16onVisibleChangedEPNS_12VisibleLayerE@Base 2.9.0
- _ZN8osgEarth3Map16ElevationLayerCBC1EPS0_@Base 2.5.0
- _ZN8osgEarth3Map16ElevationLayerCBC2EPS0_@Base 2.5.0
- _ZN8osgEarth3Map16ElevationLayerCBD0Ev@Base 2.5.0
- _ZN8osgEarth3Map16ElevationLayerCBD1Ev@Base 2.5.0
- _ZN8osgEarth3Map16ElevationLayerCBD2Ev@Base 2.5.0
+ _ZN8osgEarth3Map14VisibleLayerCB16onVisibleChangedEPNS_12VisibleLayerE@Base 2.10.0
+ _ZN8osgEarth3Map14VisibleLayerCBC1EPS0_@Base 2.10.0
+ _ZN8osgEarth3Map14VisibleLayerCBC2EPS0_@Base 2.10.0
+ _ZN8osgEarth3Map14VisibleLayerCBD0Ev@Base 2.10.0
+ _ZN8osgEarth3Map14VisibleLayerCBD1Ev@Base 2.10.0
+ _ZN8osgEarth3Map14VisibleLayerCBD2Ev@Base 2.10.0
  _ZN8osgEarth3Map16calculateProfileEv@Base 2.4.0
- _ZN8osgEarth3Map16insertImageLayerEPNS_10ImageLayerEj@Base 2.4.0
- _ZN8osgEarth3Map16insertModelLayerEPNS_10ModelLayerEj@Base 2.4.0
- _ZN8osgEarth3Map16removeImageLayerEPNS_10ImageLayerE@Base 2.4.0
- _ZN8osgEarth3Map16removeModelLayerEPNS_10ModelLayerE@Base 2.4.0
  _ZN8osgEarth3Map16setGlobalOptionsEPKN5osgDB7OptionsE@Base 2.4.0
  _ZN8osgEarth3Map16setLayersFromMapEPKS0_@Base 2.4.0
- _ZN8osgEarth3Map17addElevationLayerEPNS_14ElevationLayerE@Base 2.4.0
- _ZN8osgEarth3Map18moveElevationLayerEPNS_14ElevationLayerEj@Base 2.4.0
- _ZN8osgEarth3Map19addTerrainMaskLayerEPNS_9MaskLayerE@Base 2.4.0
- _ZN8osgEarth3Map20removeElevationLayerEPNS_14ElevationLayerE@Base 2.4.0
- _ZN8osgEarth3Map22removeTerrainMaskLayerEPNS_9MaskLayerE@Base 2.4.0
- _ZN8osgEarth3Map34notifyElevationLayerVisibleChangedEPNS_12VisibleLayerE@Base 2.9.0
+ _ZN8osgEarth3Map21installLayerCallbacksEPNS_5LayerE@Base 2.10.0
+ _ZN8osgEarth3Map23uninstallLayerCallbacksEPNS_5LayerE@Base 2.10.0
+ _ZN8osgEarth3Map25notifyLayerVisibleChangedEPNS_12VisibleLayerE@Base 2.10.0
+ _ZN8osgEarth3Map27notifyOnLayerEnabledChangedEPNS_5LayerE@Base 2.10.0
  _ZN8osgEarth3Map4ctorEv@Base 2.9.0
  _ZN8osgEarth3Map5clearEv@Base 2.4.0
+ _ZN8osgEarth3Map7LayerCB16onEnabledChangedEPNS_5LayerE@Base 2.10.0
+ _ZN8osgEarth3Map7LayerCBC1EPS0_@Base 2.10.0
+ _ZN8osgEarth3Map7LayerCBC2EPS0_@Base 2.10.0
+ _ZN8osgEarth3Map7LayerCBD0Ev@Base 2.10.0
+ _ZN8osgEarth3Map7LayerCBD1Ev@Base 2.10.0
+ _ZN8osgEarth3Map7LayerCBD2Ev@Base 2.10.0
  _ZN8osgEarth3Map8addLayerEPNS_5LayerE@Base 2.9.0
  _ZN8osgEarth3Map8setCacheEPNS_5CacheE@Base 2.4.0
  _ZN8osgEarth3Map9endUpdateEv@Base 2.4.0
  _ZN8osgEarth3Map9moveLayerEPNS_5LayerEj@Base 2.9.0
+ _ZN8osgEarth3Map9openLayerEPNS_5LayerE@Base 2.10.0
  _ZN8osgEarth3MapC1ERKNS_10MapOptionsE@Base 2.4.0
- _ZN8osgEarth3MapC1ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth3MapC1Ev@Base 2.9.0
  _ZN8osgEarth3MapC2ERKNS_10MapOptionsE@Base 2.4.0
- _ZN8osgEarth3MapC2ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth3MapC2Ev@Base 2.9.0
  _ZN8osgEarth3MapD0Ev@Base 2.4.0
  _ZN8osgEarth3MapD1Ev@Base 2.4.0
  _ZN8osgEarth3MapD2Ev@Base 2.4.0
+ _ZN8osgEarth3URI11mergeConfigERKNS_6ConfigE@Base 2.10.0
  _ZN8osgEarth3URI12ctorCacheKeyEv@Base 2.8~rc1
  _ZN8osgEarth3URIC1EPKc@Base 2.4.0
  _ZN8osgEarth3URIC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
@@ -2472,7 +2710,7 @@
  _ZN8osgEarth3URID0Ev@Base 2.4.0
  _ZN8osgEarth3URID1Ev@Base 2.4.0
  _ZN8osgEarth3URID2Ev@Base 2.4.0
- _ZN8osgEarth4ECEF18createLocalToWorldERKN3osg5Vec3dE@Base 2.4.0
+ _ZN8osgEarth3URIaSERKS0_@Base 2.10.0
  _ZN8osgEarth4ECEF20transformAndLocalizeERKN3osg5Vec3dEPKNS_16SpatialReferenceERS2_S7_RKNS1_7MatrixdE@Base 2.4.0
  (optional=templinst)_ZN8osgEarth4ECEF20transformAndLocalizeERKSt6vectorIN3osg5Vec3dESaIS3_EEPKNS_16SpatialReferenceEPNS2_13TemplateArrayINS2_5Vec3fELNS2_5Array4TypeE28ELi3ELi5126EEESA_RKNS2_7MatrixdE@Base 2.4.0
  (optional=templinst)_ZN8osgEarth4ECEF20transformAndLocalizeERKSt6vectorIN3osg5Vec3dESaIS3_EEPKNS_16SpatialReferenceEPNS2_13TemplateArrayINS2_5Vec3fELNS2_5Array4TypeE28ELi3ELi5126EEESG_SA_RKNS2_7MatrixdE@Base 2.4.0
@@ -2657,7 +2895,19 @@
  _ZN8osgEarth4Json6WriterD0Ev@Base 2.4.0
  _ZN8osgEarth4Json6WriterD1Ev@Base 2.4.0
  _ZN8osgEarth4Json6WriterD2Ev@Base 2.4.0
+ _ZN8osgEarth4Text14createStateSetEv@Base 2.10.0
+ _ZN8osgEarth4Text7setFontEN3osg7ref_ptrIN7osgText4FontEEE@Base 2.10.0
+ _ZN8osgEarth4TextC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ _ZN8osgEarth4TextC1ERKS0_RKN3osg6CopyOpE@Base 2.10.0
+ _ZN8osgEarth4TextC1Ev@Base 2.10.0
+ _ZN8osgEarth4TextC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ _ZN8osgEarth4TextC2ERKS0_RKN3osg6CopyOpE@Base 2.10.0
+ _ZN8osgEarth4TextC2Ev@Base 2.10.0
+ _ZN8osgEarth4TextD0Ev@Base 2.10.0
+ _ZN8osgEarth4TextD1Ev@Base 2.10.0
+ _ZN8osgEarth4TextD2Ev@Base 2.10.0
  _ZN8osgEarth4trimERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
+ _ZN8osgEarth5Cache12makeCacheKeyERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.10.0
  _ZN8osgEarth5Cache21getOrCreateDefaultBinEv@Base 2.4.0
  _ZN8osgEarth5Cache5clearEv@Base 2.6.0
  _ZN8osgEarth5Cache6getBinERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
@@ -2680,19 +2930,23 @@
  _ZN8osgEarth5GeoidD1Ev@Base 2.4.0
  _ZN8osgEarth5GeoidD2Ev@Base 2.4.0
  _ZN8osgEarth5Layer10addedToMapEPKNS_3MapE@Base 2.9.0
+ _ZN8osgEarth5Layer10setEnabledEb@Base 2.10.0
  _ZN8osgEarth5Layer11addCallbackEPNS_13LayerCallbackE@Base 2.9.0
+ _ZN8osgEarth5Layer12fireCallbackEMNS_13LayerCallbackEFvPS0_E@Base 2.10.0
  _ZN8osgEarth5Layer14removeCallbackEPNS_13LayerCallbackE@Base 2.9.0
  _ZN8osgEarth5Layer14removedFromMapEPKNS_3MapE@Base 2.9.0
+ _ZN8osgEarth5Layer14setAttributionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZN8osgEarth5Layer14setReadOptionsEPKN5osgDB7OptionsE@Base 2.9.0
- _ZN8osgEarth5Layer15getOrCreateNodeEv@Base 2.9.0
+ _ZN8osgEarth5Layer15setCullCallbackEPNS0_17TraversalCallbackE@Base 2.10.0
  _ZN8osgEarth5Layer16getConfigOptionsEPKN5osgDB7OptionsE@Base 2.9.0
  _ZN8osgEarth5Layer18getSequenceControlEv@Base 2.4.0
  _ZN8osgEarth5Layer19getOrCreateStateSetEv@Base 2.9.0
  _ZN8osgEarth5Layer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9.0
+ _ZN8osgEarth5Layer21resizeGLObjectBuffersEj@Base 2.10.0
  _ZN8osgEarth5Layer4initEv@Base 2.9.0
  _ZN8osgEarth5Layer4openEv@Base 2.9.0
+ _ZN8osgEarth5Layer5closeEv@Base 2.10.0
  _ZN8osgEarth5Layer6createERKNS_13ConfigOptionsE@Base 2.9.0
- _ZN8osgEarth5Layer6createERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_13ConfigOptionsE@Base 2.9.0
  _ZN8osgEarth5Layer7setNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  _ZN8osgEarth5LayerC1EPNS_12LayerOptionsE@Base 2.9.0
  _ZN8osgEarth5LayerC1Ev@Base 2.4.0
@@ -2708,6 +2962,7 @@
  _ZN8osgEarth5Units11registerAllEPNS_8RegistryE@Base 2.4.0
  _ZN8osgEarth5Units12MICROSECONDSE@Base 2.4.0
  _ZN8osgEarth5Units12MILLISECONDSE@Base 2.4.0
+ _ZN8osgEarth5Units13DECIMAL_HOURSE@Base 2.10.0
  _ZN8osgEarth5Units14FEET_US_SURVEYE@Base 2.4.0
  _ZN8osgEarth5Units14MILES_PER_HOURE@Base 2.4.0
  _ZN8osgEarth5Units14NAUTICAL_MILESE@Base 2.4.0
@@ -2751,6 +3006,8 @@
  _ZN8osgEarth5UnitsD1Ev@Base 2.4.0
  _ZN8osgEarth5UnitsD2Ev@Base 2.4.0
  _ZN8osgEarth5trim2ERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8~rc1
+ _ZN8osgEarth6Bounds3setEdddd@Base 2.10.0
+ _ZN8osgEarth6Bounds3setEdddddd@Base 2.10.0
  _ZN8osgEarth6Bounds8expandByERKS0_@Base 2.4.0
  _ZN8osgEarth6Bounds8expandByEdd@Base 2.4.0
  _ZN8osgEarth6Bounds8expandByEddd@Base 2.4.0
@@ -2762,41 +3019,39 @@
  _ZN8osgEarth6BoundsD0Ev@Base 2.4.0
  _ZN8osgEarth6BoundsD1Ev@Base 2.4.0
  _ZN8osgEarth6BoundsD2Ev@Base 2.4.0
- (optional=templinst|arch=!arm64)_ZN8osgEarth6Config11addObjIfSetINS_14ProfileOptionsEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.9.0
  (optional=templinst|arch=ia64)_ZN8osgEarth6Config11addObjIfSetINS_14ProfileOptionsEEEvRKSsRKNS_8optionalIT_EE@Base 2.4.0
  _ZN8osgEarth6Config11setReferrerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
- (optional=templinst|arch=!amd64 !arm64)_ZN8osgEarth6Config11updateIfSetINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKNS_8optionalIT_EE@Base 2.9.0
- (optional=templinst)_ZN8osgEarth6Config11updateIfSetIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZN8osgEarth6Config11updateIfSetIdEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZN8osgEarth6Config11updateIfSetIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst|arch=armel armhf hppa i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZN8osgEarth6Config11updateIfSetIiEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth6Config11updateIfSetIjEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
  _ZN8osgEarth6Config13mutable_childERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
- (optional=templinst)_ZN8osgEarth6Config3addINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.7.0
- (optional=templinst)_ZN8osgEarth6Config3addIPcEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.9.0
+ (optional=templinst|arch=!arm64 !powerpc !powerpcspe !s390x !x32)_ZN8osgEarth6Config3addIPcEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.9.0
+ _ZN8osgEarth6Config3setERKS0_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setINS_8DistanceEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIdEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIjEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIlEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
  _ZN8osgEarth6Config4findERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 2.7.0
  _ZN8osgEarth6Config5mergeERKS0_@Base 2.4.0
  _ZN8osgEarth6Config6removeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
- (optional=templinst)_ZN8osgEarth6Config6updateINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.7.0
- (optional=templinst)_ZN8osgEarth6Config6updateIdEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
  _ZN8osgEarth6Config7fromXMLERSi@Base 2.4.0
- (optional=templinst)_ZN8osgEarth6Config8addIfSetINS_8DistanceEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.9.0
- (optional=templinst)_ZN8osgEarth6Config8addIfSetINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKNS_8optionalIT_EE@Base 2.8~rc1
  (optional=templinst|arch=ia64)_ZN8osgEarth6Config8addIfSetISsEEvRKSsRKNS_8optionalIT_EE@Base 2.4.0
- (optional=templinst|arch=!arm64)_ZN8osgEarth6Config8addIfSetIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst|arch=hurd-i386 i386 m68k mips mipsel)_ZN8osgEarth6Config8addIfSetIlEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.9.0
  _ZN8osgEarth6Config8fromJSONERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth6Config8readJSONERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8~rc1
+ (optional=templinst)_ZN8osgEarth6Config8setValueIdEEvRKT_@Base 2.10.1
  _ZN8osgEarth6ConfigC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8~rc1
- _ZN8osgEarth6ConfigC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.8~rc1
  _ZN8osgEarth6ConfigC1ERKS0_@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth6ConfigC1INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERKS7_RKT_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth6ConfigC1IdEERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.1
  _ZN8osgEarth6ConfigC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8~rc1
- _ZN8osgEarth6ConfigC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.8~rc1
  _ZN8osgEarth6ConfigC2ERKS0_@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth6ConfigC2INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERKS7_RKT_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth6ConfigC2IdEERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.1
  _ZN8osgEarth6ConfigD0Ev@Base 2.4.0
  _ZN8osgEarth6ConfigD1Ev@Base 2.4.0
  _ZN8osgEarth6ConfigD2Ev@Base 2.4.0
- _ZN8osgEarth6ConfigaSERKS0_@Base 2.4.0
+ _ZN8osgEarth6ConfigaSERKS0_@Base 2.10.1
  _ZN8osgEarth6Memory22getProcessPrivateUsageEv@Base 2.8~rc1
  _ZN8osgEarth6Memory23getProcessPhysicalUsageEv@Base 2.8~rc1
  _ZN8osgEarth6Memory26getProcessPeakPrivateUsageEv@Base 2.8~rc1
@@ -2814,6 +3069,8 @@
  _ZN8osgEarth6RandomD0Ev@Base 2.4.0
  _ZN8osgEarth6RandomD1Ev@Base 2.4.0
  _ZN8osgEarth6RandomD2Ev@Base 2.4.0
+ _ZN8osgEarth6StatusC1ERKS0_@Base 2.10.1
+ _ZN8osgEarth6StatusC2ERKS0_@Base 2.10.1
  _ZN8osgEarth6StatusD1Ev@Base 2.8~rc1
  _ZN8osgEarth6StatusD2Ev@Base 2.8~rc1
  _ZN8osgEarth6notifyEN3osg14NotifySeverityE@Base 2.4.0
@@ -2824,8 +3081,15 @@
  _ZN8osgEarth7FadeLODD0Ev@Base 2.4.0
  _ZN8osgEarth7FadeLODD1Ev@Base 2.4.0
  _ZN8osgEarth7FadeLODD2Ev@Base 2.4.0
+ _ZN8osgEarth7GLUtils11setLightingEPN3osg8StateSetEj@Base 2.10.0
+ _ZN8osgEarth7GLUtils12setLineWidthEPN3osg8StateSetEfj@Base 2.10.0
+ _ZN8osgEarth7GLUtils12setPointSizeEPN3osg8StateSetEfj@Base 2.10.0
+ _ZN8osgEarth7GLUtils13setLineSmoothEPN3osg8StateSetEj@Base 2.10.0
+ _ZN8osgEarth7GLUtils14setLineStippleEPN3osg8StateSetEitj@Base 2.10.0
+ _ZN8osgEarth7GLUtils14setPointSmoothEPN3osg8StateSetEj@Base 2.10.0
+ _ZN8osgEarth7GLUtils17setGlobalDefaultsEPN3osg8StateSetE@Base 2.10.0
+ _ZN8osgEarth7GLUtils6removeEPN3osg8StateSetEj@Base 2.10.0
  _ZN8osgEarth7GeoMath11destinationEddddRdS1_d@Base 2.4.0
- _ZN8osgEarth7GeoMath11interpolateEdddddRdS1_@Base 2.4.0
  _ZN8osgEarth7GeoMath12rhumbBearingEdddd@Base 2.4.0
  _ZN8osgEarth7GeoMath13rhumbDistanceERKSt6vectorIN3osg5Vec3dESaIS3_EEd@Base 2.4.0
  _ZN8osgEarth7GeoMath13rhumbDistanceEddddd@Base 2.4.0
@@ -2869,6 +3133,7 @@
  _ZN8osgEarth7MapNode12onLayerAddedEPNS_5LayerEj@Base 2.9.0
  _ZN8osgEarth7MapNode12onLayerMovedEPNS_5LayerEjj@Base 2.9.0
  _ZN8osgEarth7MapNode13openMapLayersEv@Base 2.8~rc1
+ _ZN8osgEarth7MapNode14getDrapingDumpEv@Base 2.10.1
  _ZN8osgEarth7MapNode14onLayerRemovedEPNS_5LayerEj@Base 2.9.0
  _ZN8osgEarth7MapNode15clearExtensionsEv@Base 2.7.0
  _ZN8osgEarth7MapNode15removeExtensionEPNS_9ExtensionE@Base 2.7.0
@@ -2945,8 +3210,10 @@
  _ZN8osgEarth7TileKey7INVALIDE@Base 2.4.0
  _ZN8osgEarth7TileKeyC1ERKS0_@Base 2.4.0
  _ZN8osgEarth7TileKeyC1EjjjPKNS_7ProfileE@Base 2.4.0
+ _ZN8osgEarth7TileKeyC1Ev@Base 2.10.1
  _ZN8osgEarth7TileKeyC2ERKS0_@Base 2.4.0
  _ZN8osgEarth7TileKeyC2EjjjPKNS_7ProfileE@Base 2.4.0
+ _ZN8osgEarth7TileKeyC2Ev@Base 2.10.1
  _ZN8osgEarth7TileKeyD0Ev@Base 2.4.0
  _ZN8osgEarth7TileKeyD1Ev@Base 2.4.0
  _ZN8osgEarth7TileKeyD2Ev@Base 2.4.0
@@ -2959,6 +3226,21 @@
  _ZN8osgEarth7XmlTextD1Ev@Base 2.4.0
  _ZN8osgEarth7XmlTextD2Ev@Base 2.4.0
  _ZN8osgEarth7toLowerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
+ _ZN8osgEarth8AsyncLOD3askERNS_9AsyncNodeERN3osg11NodeVisitorE@Base 2.10.1
+ _ZN8osgEarth8AsyncLOD5clearEv@Base 2.10.1
+ _ZN8osgEarth8AsyncLOD7setModeERKNS0_4ModeE@Base 2.10.1
+ _ZN8osgEarth8AsyncLOD8addChildEPN3osg4NodeE@Base 2.10.1
+ _ZN8osgEarth8AsyncLOD8addChildEPN3osg4NodeEff@Base 2.10.1
+ _ZN8osgEarth8AsyncLOD8addChildEPNS_13AsyncFunctionEff@Base 2.10.1
+ _ZN8osgEarth8AsyncLOD8traverseERN3osg11NodeVisitorE@Base 2.10.1
+ _ZN8osgEarth8AsyncLOD9setCenterERKN3osg5Vec3dE@Base 2.10.1
+ _ZN8osgEarth8AsyncLOD9setPolicyERKNS0_6PolicyE@Base 2.10.1
+ _ZN8osgEarth8AsyncLOD9setRadiusEd@Base 2.10.1
+ _ZN8osgEarth8AsyncLODC1Ev@Base 2.10.1
+ _ZN8osgEarth8AsyncLODC2Ev@Base 2.10.1
+ _ZN8osgEarth8AsyncLODD0Ev@Base 2.10.1
+ _ZN8osgEarth8AsyncLODD1Ev@Base 2.10.1
+ _ZN8osgEarth8AsyncLODD2Ev@Base 2.10.1
  _ZN8osgEarth8CacheBin12readMetadataEv@Base 2.4.0
  _ZN8osgEarth8CacheBin13writeMetadataERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth8CacheBin14getStorageSizeEv@Base 2.6.0
@@ -2984,15 +3266,17 @@
  _ZN8osgEarth8DateTimeC1ERK2tm@Base 2.5.0
  _ZN8osgEarth8DateTimeC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth8DateTimeC1ERKS0_@Base 2.5.0
+ _ZN8osgEarth8DateTimeC1Eid@Base 2.10.0
  _ZN8osgEarth8DateTimeC1Eiiid@Base 2.5.0
- _ZN8osgEarth8DateTimeC1El@Base 2.5.0
  _ZN8osgEarth8DateTimeC1Ev@Base 2.5.0
+ (subst)_ZN8osgEarth8DateTimeC1E{int64_t}@Base 2.5.0
  _ZN8osgEarth8DateTimeC2ERK2tm@Base 2.5.0
  _ZN8osgEarth8DateTimeC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth8DateTimeC2ERKS0_@Base 2.5.0
+ _ZN8osgEarth8DateTimeC2Eid@Base 2.10.0
  _ZN8osgEarth8DateTimeC2Eiiid@Base 2.5.0
- _ZN8osgEarth8DateTimeC2El@Base 2.5.0
  _ZN8osgEarth8DateTimeC2Ev@Base 2.5.0
+ (subst)_ZN8osgEarth8DateTimeC2E{int64_t}@Base 2.5.0
  _ZN8osgEarth8GeoImage14applyAlphaMaskERKNS_9GeoExtentE@Base 2.6.0
  _ZN8osgEarth8GeoImage20addTransparentBorderEbbbb@Base 2.4.0
  _ZN8osgEarth8GeoImage7INVALIDE@Base 2.4.0
@@ -3006,7 +3290,7 @@
  _ZN8osgEarth8GeoImageD0Ev@Base 2.4.0
  _ZN8osgEarth8GeoImageD1Ev@Base 2.4.0
  _ZN8osgEarth8GeoImageD2Ev@Base 2.4.0
- (arch=!armel !armhf !hurd-i386 !i386 !m68k !mips !mipsel !powerpc)_ZN8osgEarth8GeoImageaSERKS0_@Base 2.9.0
+ (arch=!armel !armhf !hurd-i386 !i386 !m68k !mips !mipsel !powerpc !powerpcspe)_ZN8osgEarth8GeoImageaSERKS0_@Base 2.9.0
  _ZN8osgEarth8GeoPoint10transformZERKNS_12AltitudeModeEPKNS_15TerrainResolverE@Base 2.6.0
  _ZN8osgEarth8GeoPoint14makeGeographicEv@Base 2.4.0
  _ZN8osgEarth8GeoPoint16transformInPlaceEPKNS_16SpatialReferenceE@Base 2.9.0
@@ -3041,11 +3325,10 @@
  (optional=templinst)_ZN8osgEarth8LRUCacheINS_23TerrainTileModelFactory10HFCacheKeyENS1_12HFCacheValueESt4lessIS2_EED2Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINS_3URIENS_10ReadResultESt4lessIS1_EE11insert_implERKS1_RKS2_@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINS_3URIENS_10ReadResultESt4lessIS1_EE3getERKS1_RNS5_6RecordE@Base 2.4.0
- (optional=templinst|arch=!powerpc)_ZN8osgEarth8LRUCacheINS_3URIENS_10ReadResultESt4lessIS1_EE6insertERKS1_RKS2_@Base 2.7.0
+ (optional=templinst)_ZN8osgEarth8LRUCacheINS_3URIENS_10ReadResultESt4lessIS1_EE6insertERKS1_RKS2_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINS_7TileKeyEbSt4lessIS1_EED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8LRUCacheINS_7TileKeyEbSt4lessIS1_EED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8LRUCacheINS_7TileKeyEbSt4lessIS1_EED2Ev@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIN3osg7ref_ptrIKNS8_6ObjectEEENS_6ConfigEESt4lessIS6_EE11insert_implERKS6_RKSE_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIN3osg7ref_ptrIKNS8_6ObjectEEENS_6ConfigEESt4lessIS6_EED0Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIN3osg7ref_ptrIKNS8_6ObjectEEENS_6ConfigEESt4lessIS6_EED1Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIN3osg7ref_ptrIKNS8_6ObjectEEENS_6ConfigEESt4lessIS6_EED2Ev@Base 2.7.0
@@ -3053,6 +3336,8 @@
  _ZN8osgEarth8LightGL3D0Ev@Base 2.9.0
  _ZN8osgEarth8LightGL3D1Ev@Base 2.9.0
  _ZN8osgEarth8LightGL3D2Ev@Base 2.9.0
+ _ZN8osgEarth8Lighting3setEPN3osg8StateSetEj@Base 2.10.0
+ _ZN8osgEarth8Lighting6removeEPN3osg8StateSetE@Base 2.10.0
  _ZN8osgEarth8MapFrame21refreshComputedValuesEv@Base 2.6.0
  _ZN8osgEarth8MapFrame4syncEv@Base 2.4.0
  _ZN8osgEarth8MapFrame6setMapEPKNS_3MapE@Base 2.7.0
@@ -3066,14 +3351,6 @@
  _ZN8osgEarth8MapFrameD0Ev@Base 2.4.0
  _ZN8osgEarth8MapFrameD1Ev@Base 2.4.0
  _ZN8osgEarth8MapFrameD2Ev@Base 2.4.0
- _ZN8osgEarth8MaskNode6acceptERN3osg11NodeVisitorE@Base 2.4.0
- _ZN8osgEarth8MaskNodeC1ERKS0_RKN3osg6CopyOpE@Base 2.4.0
- _ZN8osgEarth8MaskNodeC1Ev@Base 2.4.0
- _ZN8osgEarth8MaskNodeC2ERKS0_RKN3osg6CopyOpE@Base 2.4.0
- _ZN8osgEarth8MaskNodeC2Ev@Base 2.4.0
- _ZN8osgEarth8MaskNodeD0Ev@Base 2.4.0
- _ZN8osgEarth8MaskNodeD1Ev@Base 2.4.0
- _ZN8osgEarth8MaskNodeD2Ev@Base 2.4.0
  _ZN8osgEarth8MemCache14getOrCreateBinERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth8MemCache21getOrCreateDefaultBinEv@Base 2.4.0
  _ZN8osgEarth8MemCache6addBinERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
@@ -3083,10 +3360,6 @@
  _ZN8osgEarth8MemCacheD0Ev@Base 2.4.0
  _ZN8osgEarth8MemCacheD1Ev@Base 2.4.0
  _ZN8osgEarth8MemCacheD2Ev@Base 2.4.0
- _ZN8osgEarth8Profiler3endERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
- _ZN8osgEarth8Profiler4dumpEv@Base 2.7.0
- _ZN8osgEarth8Profiler5clearEv@Base 2.9.0
- _ZN8osgEarth8Profiler5startERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth8Registry11endActivityERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth8Registry13getActivitiesERSt3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4lessIS7_ESaIS7_EE@Base 2.7.0
  _ZN8osgEarth8Registry13isBlacklistedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
@@ -3095,7 +3368,8 @@
  _ZN8osgEarth8Registry13startActivityERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.7.0
  _ZN8osgEarth8Registry14clearBlacklistEv@Base 2.4.0
  _ZN8osgEarth8Registry14getDefaultFontEv@Base 2.4.0
- (arch=amd64)_ZN8osgEarth8Registry14getOrCreateSRSERKNS_16SpatialReference3KeyE@Base 2.9.0
+ _ZN8osgEarth8Registry14getOrCreateSRSERKNS_16SpatialReference3KeyE@Base 2.10.0
+ _ZN8osgEarth8Registry14getProgramRepoEv@Base 2.10.0
  _ZN8osgEarth8Registry14setDefaultFontEPN7osgText4FontE@Base 2.4.0
  _ZN8osgEarth8Registry15setCapabilitiesEPNS_12CapabilitiesE@Base 2.4.0
  _ZN8osgEarth8Registry15setDefaultCacheEPNS_5CacheE@Base 2.8~rc1
@@ -3106,7 +3380,6 @@
  _ZN8osgEarth8Registry18setURIReadCallbackEPNS_15URIReadCallbackE@Base 2.4.0
  _ZN8osgEarth8Registry19setDevicePixelRatioEf@Base 2.9.0
  _ZN8osgEarth8Registry20cloneOrCreateOptionsEPKN5osgDB7OptionsE@Base 2.7.0
- _ZN8osgEarth8Registry20getProgramSharedRepoEv@Base 2.6.0
  _ZN8osgEarth8Registry21setDefaultCachePolicyERKNS_11CachePolicyE@Base 2.4.0
  _ZN8osgEarth8Registry22setOverrideCachePolicyERKNS_11CachePolicyE@Base 2.4.0
  _ZN8osgEarth8Registry23getExtensionForMimeTypeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
@@ -3114,7 +3387,7 @@
  _ZN8osgEarth8Registry25setDefaultCacheDriverNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth8Registry26getNumBlacklistedFilenamesEv@Base 2.4.0
  _ZN8osgEarth8Registry28setTextureImageUnitOffLimitsEi@Base 2.8~rc1
- _ZN8osgEarth8Registry8destructEv@Base 2.4.0
+ _ZN8osgEarth8Registry7releaseEv@Base 2.10.0
  _ZN8osgEarth8Registry8instanceEb@Base 2.4.0
  _ZN8osgEarth8Registry9blacklistERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth8Registry9createUIDEv@Base 2.4.0
@@ -3133,7 +3406,7 @@
  _ZN8osgEarth8ciEqualsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_RKSt6locale@Base 2.7.0
  _ZN8osgEarth8endsWithERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_bRKSt6locale@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8fast_mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEdEixERKS6_@Base 2.7.0
- (optional=templinst)_ZN8osgEarth8fast_mapISt6vectorIN3osg7ref_ptrINS_10PolyShaderEEESaIS5_EENS_14VirtualProgram12ProgramEntryEEixERKS7_@Base 2.8~rc1
+ (optional=templinst)_ZN8osgEarth8fast_mapIPKN3osg6CameraENS_23CascadeDrapingDecorator11CameraLocalEEixERKS4_@Base 2.10.1
  (optional=templinst)_ZN8osgEarth8optionalIN3osg3LOD9RangeModeEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalIN3osg3LOD9RangeModeEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalIN3osg3LOD9RangeModeEED2Ev@Base 2.9.0
@@ -3158,6 +3431,8 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_11CachePolicyEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_11CachePolicyEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_11CachePolicyEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_12CacheOptionsEEC1ERKS2_@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_12CacheOptionsEEC2ERKS2_@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_12CacheOptionsEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_12CacheOptionsEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_12CacheOptionsEED2Ev@Base 2.4.0
@@ -3168,6 +3443,9 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_13ProxySettingsEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_13ProxySettingsEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_13ProxySettingsEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED0Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED1Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED2Ev@Base 2.10.1
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEEC1ERKS2_@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEEC1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEEC2ERKS2_@Base 2.4.0
@@ -3192,11 +3470,16 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_17TileSourceOptionsEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_17TileSourceOptionsEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_17TileSourceOptionsEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_18ModelSourceOptionsEEC1ERKS2_@Base 2.10.0
  (optional=templinst)_ZN8osgEarth8optionalINS_18ModelSourceOptionsEEC1Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_18ModelSourceOptionsEEC2ERKS2_@Base 2.10.0
  (optional=templinst)_ZN8osgEarth8optionalINS_18ModelSourceOptionsEEC2Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_18ModelSourceOptionsEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_18ModelSourceOptionsEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_18ModelSourceOptionsEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED0Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED2Ev@Base 2.10.0
  (optional=templinst)_ZN8osgEarth8optionalINS_21ElevationLayerOptionsEED0Ev@Base 2.6.0
  (optional=templinst)_ZN8osgEarth8optionalINS_21ElevationLayerOptionsEED1Ev@Base 2.6.0
  (optional=templinst)_ZN8osgEarth8optionalINS_21ElevationLayerOptionsEED2Ev@Base 2.6.0
@@ -3247,11 +3530,15 @@
  (optional=templinst)_ZN8osgEarth8optionalIlED0Ev@Base 2.5.0
  (optional=templinst)_ZN8osgEarth8optionalIlED1Ev@Base 2.5.0
  (optional=templinst)_ZN8osgEarth8optionalIlED2Ev@Base 2.5.0
- (optional=templinst|arch=alpha amd64 arm64 hppa mips64el ppc64 ppc64el s390x sparc64)_ZN8osgEarth8toStringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEES6_RKT_@Base 2.7.0
+ (optional=templinst|arch=x32)_ZN8osgEarth8optionalIxED0Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN8osgEarth8optionalIxED1Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN8osgEarth8optionalIxED2Ev@Base 2.10.0
  (optional=templinst)_ZN8osgEarth8toStringIdEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
- (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN8osgEarth8toStringIfEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8toStringIiEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
- (optional=templinst)_ZN8osgEarth8toStringIjEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
+ _ZN8osgEarth9AsyncNode6_idgenE@Base 2.10.1
+ _ZN8osgEarth9AsyncNodeD0Ev@Base 2.10.1
+ _ZN8osgEarth9AsyncNodeD1Ev@Base 2.10.1
+ _ZN8osgEarth9AsyncNodeD2Ev@Base 2.10.1
  _ZN8osgEarth9CacheSeed10setVisitorEPNS_11TileVisitorE@Base 2.6.0
  _ZN8osgEarth9CacheSeed3runEPNS_12TerrainLayerEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth9CacheSeedC1Ev@Base 2.4.0
@@ -3266,6 +3553,9 @@
  _ZN8osgEarth9Extension6createERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_13ConfigOptionsE@Base 2.7.0
  _ZN8osgEarth9ExtensionC1Ev@Base 2.8~rc1
  _ZN8osgEarth9ExtensionC2Ev@Base 2.8~rc1
+ _ZN8osgEarth9ExtensionD0Ev@Base 2.10.0
+ _ZN8osgEarth9ExtensionD1Ev@Base 2.10.0
+ _ZN8osgEarth9ExtensionD2Ev@Base 2.10.0
  _ZN8osgEarth9GeoCircle7INVALIDE@Base 2.4.0
  _ZN8osgEarth9GeoCircleC1ERKNS_8GeoPointEd@Base 2.4.0
  _ZN8osgEarth9GeoCircleC1ERKS0_@Base 2.4.0
@@ -3276,7 +3566,6 @@
  _ZN8osgEarth9GeoCircleD0Ev@Base 2.4.0
  _ZN8osgEarth9GeoCircleD1Ev@Base 2.4.0
  _ZN8osgEarth9GeoCircleD2Ev@Base 2.4.0
- _ZN8osgEarth9GeoExtent15expandToIncludeERKNS_6BoundsE@Base 2.4.0
  _ZN8osgEarth9GeoExtent15expandToIncludeERKS0_@Base 2.4.0
  _ZN8osgEarth9GeoExtent15expandToIncludeEdd@Base 2.4.0
  _ZN8osgEarth9GeoExtent16setOriginAndSizeEdddd@Base 2.9.0
@@ -3298,12 +3587,21 @@
  _ZN8osgEarth9GeoExtentD0Ev@Base 2.4.0
  _ZN8osgEarth9GeoExtentD1Ev@Base 2.4.0
  _ZN8osgEarth9GeoExtentD2Ev@Base 2.4.0
- (arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZN8osgEarth9GeoExtentaSERKS0_@Base 2.9.0
+ (arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc powerpcspe)_ZN8osgEarth9GeoExtentaSERKS0_@Base 2.10.0
+ _ZN8osgEarth9LineGroup15getLineDrawableEj@Base 2.10.0
+ _ZN8osgEarth9LineGroup6acceptERN3osg11NodeVisitorE@Base 2.10.0
+ _ZN8osgEarth9LineGroup6importEPN3osg4NodeEb@Base 2.10.0
+ _ZN8osgEarth9LineGroup8optimizeEv@Base 2.10.0
+ _ZN8osgEarth9LineGroupC1ERKS0_RKN3osg6CopyOpE@Base 2.10.0
+ _ZN8osgEarth9LineGroupC1Ev@Base 2.10.0
+ _ZN8osgEarth9LineGroupC2ERKS0_RKN3osg6CopyOpE@Base 2.10.0
+ _ZN8osgEarth9LineGroupC2Ev@Base 2.10.0
+ _ZN8osgEarth9LineGroupD0Ev@Base 2.10.0
+ _ZN8osgEarth9LineGroupD1Ev@Base 2.10.0
+ _ZN8osgEarth9LineGroupD2Ev@Base 2.10.0
  _ZN8osgEarth9MaskLayer23getOrCreateMaskBoundaryEfPKNS_16SpatialReferenceEPNS_16ProgressCallbackE@Base 2.6.0
  _ZN8osgEarth9MaskLayerC1EPNS_16MaskLayerOptionsE@Base 2.9.0
- _ZN8osgEarth9MaskLayerC1ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth9MaskLayerC2EPNS_16MaskLayerOptionsE@Base 2.9.0
- _ZN8osgEarth9MaskLayerC2ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth9MaskLayerD0Ev@Base 2.4.0
  _ZN8osgEarth9MaskLayerD1Ev@Base 2.4.0
  _ZN8osgEarth9MaskLayerD2Ev@Base 2.4.0
@@ -3412,8 +3710,8 @@
  _ZN8osgEarth9TileImageD0Ev@Base 2.4.0
  _ZN8osgEarth9TileImageD1Ev@Base 2.4.0
  _ZN8osgEarth9TileImageD2Ev@Base 2.4.0
- _ZN8osgEarth9URIStreamC1ERKNS_3URIE@Base 2.4.0
- _ZN8osgEarth9URIStreamC2ERKNS_3URIE@Base 2.4.0
+ _ZN8osgEarth9URIStreamC1ERKNS_3URIESt13_Ios_Openmode@Base 2.10.1
+ _ZN8osgEarth9URIStreamC2ERKNS_3URIESt13_Ios_Openmode@Base 2.10.1
  _ZN8osgEarth9URIStreamD0Ev@Base 2.4.0
  _ZN8osgEarth9URIStreamD1Ev@Base 2.4.0
  _ZN8osgEarth9URIStreamD2Ev@Base 2.4.0
@@ -3427,7 +3725,6 @@
  _ZN8osgEarth9ViewpointC2ERKS0_@Base 2.4.0
  _ZN8osgEarth9ViewpointC2Ev@Base 2.4.0
  _ZN8osgEarth9isArchiveERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
- _ZN8osgEarth9isZipPathERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth9replaceInERNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS5_S8_@Base 2.7.0
  _ZN8osgEarth9touchFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN9osgViewer6Viewer14getViewerStatsEv@Base 2.9.0
@@ -3503,12 +3800,6 @@
  _ZNK3osg12PrimitiveSet16getTotalDataSizeEv@Base 2.6.0
  _ZNK3osg12PrimitiveSet20supportsBufferObjectEv@Base 2.6.0
  _ZNK3osg12PrimitiveSet9classNameEv@Base 2.6.0
- _ZNK3osg13AutoTransform11libraryNameEv@Base 2.4.0
- _ZNK3osg13AutoTransform12isSameKindAsEPKNS_6ObjectE@Base 2.4.0
- _ZNK3osg13AutoTransform15asAutoTransformEv@Base 2.4.0
- _ZNK3osg13AutoTransform5cloneERKNS_6CopyOpE@Base 2.4.0
- _ZNK3osg13AutoTransform9classNameEv@Base 2.4.0
- _ZNK3osg13AutoTransform9cloneTypeEv@Base 2.4.0
  (optional=templinst)_ZNK3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EE14getDataPointerEv@Base 2.8~rc1
  (optional=templinst)_ZNK3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EE14getElementSizeEv@Base 2.8~rc1
  (optional=templinst)_ZNK3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EE14getNumElementsEv@Base 2.8~rc1
@@ -3607,18 +3898,23 @@
  _ZNK3osg4Node10asDrawableEv@Base 2.8~rc1
  _ZNK3osg4Node10asGeometryEv@Base 2.8~rc1
  _ZNK3osg4Node11asTransformEv@Base 2.4.0
+ _ZNK3osg4Node11libraryNameEv@Base 2.10.1
+ _ZNK3osg4Node12isSameKindAsEPKNS_6ObjectE@Base 2.10.1
  _ZNK3osg4Node29ComputeBoundingSphereCallback12computeBoundERKS0_@Base 2.4.0
+ _ZNK3osg4Node5cloneERKNS_6CopyOpE@Base 2.10.1
  _ZNK3osg4Node6asNodeEv@Base 2.8~rc1
  _ZNK3osg4Node7asGeodeEv@Base 2.4.0
  _ZNK3osg4Node7asGroupEv@Base 2.8~rc1
  _ZNK3osg4Node8asCameraEv@Base 2.4.0
  _ZNK3osg4Node8asSwitchEv@Base 2.4.0
- _ZNK3osg4Node8getBoundEv@Base 2.4.0
+ (arch=!arm64 !x32)_ZNK3osg4Node8getBoundEv@Base 2.10.1
  _ZNK3osg4Node9asTerrainEv@Base 2.4.0
- _ZNK3osg4QuatmlERKNS_5Vec3fE@Base 2.9.0
+ _ZNK3osg4Node9classNameEv@Base 2.10.1
+ _ZNK3osg4Node9cloneTypeEv@Base 2.10.1
  _ZNK3osg5Array11libraryNameEv@Base 2.7.0
  _ZNK3osg5Array12isSameKindAsEPKNS_6ObjectE@Base 2.7.0
  _ZNK3osg5Array7asArrayEv@Base 2.7.0
+ _ZNK3osg5Geode7asGeodeEv@Base 2.10.0
  _ZNK3osg5Group11libraryNameEv@Base 2.4.0
  _ZNK3osg5Group12isSameKindAsEPKNS_6ObjectE@Base 2.4.0
  _ZNK3osg5Group5cloneERKNS_6CopyOpE@Base 2.4.0
@@ -3637,7 +3933,6 @@
  _ZNK3osg5Light12getModeUsageERNS_14StateAttribute9ModeUsageE@Base 2.9.0
  _ZNK3osg5Light7compareERKNS_14StateAttributeE@Base 2.9.0
  _ZNK3osg5Light9getMemberEv@Base 2.9.0
- (arch=armel i386 m68k powerpc)_ZNK3osg5Vec3d6lengthEv@Base 2.9.0
  _ZNK3osg5Vec4fltERKS0_@Base 2.9.0
  _ZNK3osg6Camera11libraryNameEv@Base 2.8~rc1
  _ZNK3osg6Camera12DrawCallback11libraryNameEv@Base 2.9.0
@@ -3678,8 +3973,14 @@
  _ZNK3osg8Drawable12CullCallback9cloneTypeEv@Base 2.4.0
  _ZNK3osg8Drawable12DrawCallback18drawImplementationERNS_10RenderInfoEPKS0_@Base 2.6.0
  _ZNK3osg8Drawable12isSameKindAsEPKNS_6ObjectE@Base 2.8~rc1
+ _ZNK3osg8Drawable18drawImplementationERNS_10RenderInfoE@Base 2.10.1
  _ZNK3osg8Drawable19getGLObjectSizeHintEv@Base 2.8~rc1
+ _ZNK3osg8Drawable26ComputeBoundingBoxCallback11libraryNameEv@Base 2.10.0
  _ZNK3osg8Drawable26ComputeBoundingBoxCallback12computeBoundERKS0_@Base 2.4.0
+ _ZNK3osg8Drawable26ComputeBoundingBoxCallback12isSameKindAsEPKNS_6ObjectE@Base 2.10.0
+ _ZNK3osg8Drawable26ComputeBoundingBoxCallback5cloneERKNS_6CopyOpE@Base 2.10.0
+ _ZNK3osg8Drawable26ComputeBoundingBoxCallback9classNameEv@Base 2.10.0
+ _ZNK3osg8Drawable26ComputeBoundingBoxCallback9cloneTypeEv@Base 2.10.0
  _ZNK3osg8Drawable5cloneERKNS_6CopyOpE@Base 2.8~rc1
  _ZNK3osg8Drawable6acceptERNS0_21ConstAttributeFunctorE@Base 2.8~rc1
  _ZNK3osg8Drawable6acceptERNS_16PrimitiveFunctorE@Base 2.8~rc1
@@ -3690,6 +3991,11 @@
  _ZNK3osg8Drawable8supportsERKNS_21PrimitiveIndexFunctorE@Base 2.8~rc1
  _ZNK3osg8Drawable9classNameEv@Base 2.8~rc1
  _ZNK3osg8Drawable9cloneTypeEv@Base 2.8~rc1
+ _ZNK3osg8Geometry10asGeometryEv@Base 2.10.0
+ _ZNK3osg8Geometry8supportsERKNS_16PrimitiveFunctorE@Base 2.10.0
+ _ZNK3osg8Geometry8supportsERKNS_21PrimitiveIndexFunctorE@Base 2.10.0
+ _ZNK3osg8Geometry8supportsERKNS_8Drawable16AttributeFunctorE@Base 2.10.0
+ _ZNK3osg8Geometry8supportsERKNS_8Drawable21ConstAttributeFunctorE@Base 2.10.0
  _ZNK3osg8Material12getModeUsageERNS_14StateAttribute9ModeUsageE@Base 2.9.0
  _ZNK3osg8Material7compareERKNS_14StateAttributeE@Base 2.9.0
  _ZNK3osg8PagedLOD11libraryNameEv@Base 2.4.0
@@ -3698,7 +4004,6 @@
  _ZNK3osg8PagedLOD9classNameEv@Base 2.4.0
  _ZNK3osg8PagedLOD9cloneTypeEv@Base 2.4.0
  _ZNK3osg8StateSet5cloneERKNS_6CopyOpE@Base 2.6.0
- (arch=alpha arm64 armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64)_ZNK3osg8Viewport19computeWindowMatrixEv@Base 2.9.0
  _ZNK3osg9Texture2D11libraryNameEv@Base 2.8~rc1
  _ZNK3osg9Texture2D12getNumImagesEv@Base 2.8~rc1
  _ZNK3osg9Texture2D12isSameKindAsEPKNS_6ObjectE@Base 2.8~rc1
@@ -3749,17 +4054,23 @@
  _ZNK5osgDB12ReaderWriter9writeNodeERKN3osg4NodeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKNS_7OptionsE@Base 2.7.0
  _ZNK5osgDB12ReaderWriter9writeNodeERKN3osg4NodeERSoPKNS_7OptionsE@Base 2.4.0
  (optional=templinst)_ZNK5osgDB14UserSerializerIN8osgEarth14VirtualProgramEE7getNameB5cxx11Ev@Base 2.8~rc1
- (optional=templinst)_ZNK5osgDB18TemplateSerializerINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEE7getNameB5cxx11Ev@Base 2.8~rc1
+ (optional=templinst)_ZNK5osgDB18TemplateSerializerIN3osg5Vec4fEE7getNameB5cxx11Ev@Base 2.10.0
  (optional=templinst)_ZNK5osgDB18TemplateSerializerINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEE7getNameEv@Base 2.9.0
  (optional=templinst)_ZNK5osgDB18TemplateSerializerIPN3osg5ImageEE7getNameB5cxx11Ev@Base 2.8~rc1
  (optional=templinst)_ZNK5osgDB18TemplateSerializerIbE7getNameB5cxx11Ev@Base 2.8~rc1
+ (optional=templinst)_ZNK5osgDB18TemplateSerializerIfE7getNameB5cxx11Ev@Base 2.10.0
  (optional=templinst)_ZNK5osgDB18TemplateSerializerIiE7getNameB5cxx11Ev@Base 2.8~rc1
  (optional=templinst)_ZNK5osgDB18TemplateSerializerIjE7getNameB5cxx11Ev@Base 2.8~rc1
+ (optional=templinst)_ZNK5osgDB18TemplateSerializerItE7getNameB5cxx11Ev@Base 2.10.0
  _ZNK5osgDB7Options11libraryNameEv@Base 2.4.0
  _ZNK5osgDB7Options12isSameKindAsEPKN3osg6ObjectE@Base 2.4.0
  _ZNK5osgDB7Options5cloneERKN3osg6CopyOpE@Base 2.4.0
  _ZNK5osgDB7Options9classNameEv@Base 2.4.0
  _ZNK5osgDB7Options9cloneTypeEv@Base 2.4.0
+ _ZNK7osgText4Text8supportsERKN3osg16PrimitiveFunctorE@Base 2.10.0
+ _ZNK7osgText4Text8supportsERKN3osg8Drawable16AttributeFunctorE@Base 2.10.0
+ _ZNK7osgText4Text8supportsERKN3osg8Drawable21ConstAttributeFunctorE@Base 2.10.0
+ _ZNK7osgText4Text9classNameEv@Base 2.10.0
  _ZNK7osgUtil11CullVisitor11getEyePointEv@Base 2.6.0
  _ZNK7osgUtil11CullVisitor12getViewPointEv@Base 2.6.0
  _ZNK7osgUtil9RenderBin11libraryNameEv@Base 2.5.0
@@ -3783,11 +4094,10 @@
  _ZNK8osgEarth10HTTPClient5doGetERKNS_11HTTPRequestEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.4.0
  _ZNK8osgEarth10ImageLayer10isCoverageEv@Base 2.9.0
  _ZNK8osgEarth10ImageLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth10ImageLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth10ImageLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth10ImageLayer15getColorFiltersEv@Base 2.4.0
- _ZNK8osgEarth10ImageLayer18getMaxVisibleRangeEv@Base 2.9.0
- _ZNK8osgEarth10ImageLayer18getMinVisibleRangeEv@Base 2.9.0
- _ZNK8osgEarth10ImageLayer22createTextureSupportedEv@Base 2.9.0
+ _ZNK8osgEarth10ImageLayer21modifyTileBoundingBoxERKNS_7TileKeyERN3osg15BoundingBoxImplINS4_5Vec3fEEE@Base 2.10.0
  _ZNK8osgEarth10ImageLayer27applyTextureCompressionModeEPN3osg7TextureE@Base 2.6.0
  _ZNK8osgEarth10ImageLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth10ImageLayer8isSharedEv@Base 2.9.0
@@ -3805,19 +4115,25 @@
  _ZNK8osgEarth10MaskSource9cloneTypeEv@Base 2.4.0
  _ZNK8osgEarth10ModelLayer10getCacheIDB5cxx11Ev@Base 2.9.0
  _ZNK8osgEarth10ModelLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth10ModelLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth10ModelLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
- _ZNK8osgEarth10ModelLayer13getSceneGraphERKi@Base 2.6.0
  _ZNK8osgEarth10ModelLayer17isLightingEnabledEv@Base 2.4.0
  _ZNK8osgEarth10ModelLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth10ModelLayer7getNodeEv@Base 2.10.0
  _ZNK8osgEarth10ModelLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth10ModelLayer9cloneTypeEv@Base 2.9.0
- _ZNK8osgEarth10ModelLayer9getConfigEv@Base 2.9.0
  _ZNK8osgEarth10PatchLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth10PatchLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth10PatchLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth10PatchLayer14AcceptCallback9acceptKeyERKNS_7TileKeyE@Base 2.9.0
  _ZNK8osgEarth10PatchLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth10PatchLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth10PatchLayer9cloneTypeEv@Base 2.9.0
+ _ZNK8osgEarth10PointGroup11libraryNameEv@Base 2.10.0
+ _ZNK8osgEarth10PointGroup12isSameKindAsEPKN3osg6ObjectE@Base 2.10.0
+ _ZNK8osgEarth10PointGroup5cloneERKN3osg6CopyOpE@Base 2.10.0
+ _ZNK8osgEarth10PointGroup9classNameEv@Base 2.10.0
+ _ZNK8osgEarth10PointGroup9cloneTypeEv@Base 2.10.0
  _ZNK8osgEarth10PolyShader16releaseGLObjectsEPN3osg5StateE@Base 2.9.0
  _ZNK8osgEarth10PolyShader9getShaderEj@Base 2.8~rc1
  _ZNK8osgEarth10Revisioned10inSyncWithERKNS_8RevisionE@Base 2.4.0
@@ -3825,8 +4141,8 @@
  _ZNK8osgEarth10TileSource10getProfileEv@Base 2.4.0
  _ZNK8osgEarth10TileSource11libraryNameEv@Base 2.4.0
  _ZNK8osgEarth10TileSource12getBlacklistEv@Base 2.4.0
- _ZNK8osgEarth10TileSource12getExtensionB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth10TileSource12isSameKindAsEPKN3osg6ObjectE@Base 2.4.0
+ _ZNK8osgEarth10TileSource14getAttributionB5cxx11Ev@Base 2.10.0
  _ZNK8osgEarth10TileSource16getPixelsPerTileEv@Base 2.4.0
  _ZNK8osgEarth10TileSource18getCachePolicyHintEPKNS_7ProfileE@Base 2.5.0
  _ZNK8osgEarth10TileSource19getLastModifiedTimeEv@Base 2.5.0
@@ -3835,12 +4151,13 @@
  _ZNK8osgEarth10TileSource9classNameEv@Base 2.4.0
  _ZNK8osgEarth10TileSource9cloneTypeEv@Base 2.4.0
  _ZNK8osgEarth10TileSource9isDynamicEv@Base 2.4.0
+ _ZNK8osgEarth10URIContext10getHeadersB5cxx11Ev@Base 2.10.0
  _ZNK8osgEarth10URIContext10getOSGPathERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZNK8osgEarth10URIContext3addERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZNK8osgEarth10URIContext3addERKS0_@Base 2.4.0
  _ZNK8osgEarth10VideoLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth10VideoLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth10VideoLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
- _ZNK8osgEarth10VideoLayer22createTextureSupportedEv@Base 2.9.0
  _ZNK8osgEarth10VideoLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth10VideoLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth10VideoLayer9cloneTypeEv@Base 2.9.0
@@ -3862,7 +4179,7 @@
  _ZNK8osgEarth11CachePolicy16getMinAcceptTimeEv@Base 2.5.0
  _ZNK8osgEarth11CachePolicy5emptyEv@Base 2.8~rc1
  _ZNK8osgEarth11CachePolicy9getConfigEv@Base 2.4.0
- _ZNK8osgEarth11CachePolicy9isExpiredEl@Base 2.6.0
+ (subst)_ZNK8osgEarth11CachePolicy9isExpiredE{int64_t}@Base 2.6.0
  _ZNK8osgEarth11CachePolicyeqERKS0_@Base 2.4.0
  _ZNK8osgEarth11ColorFilter9getConfigEv@Base 2.8~rc1
  _ZNK8osgEarth11FadeOptions9getConfigEv@Base 2.4.0
@@ -3898,11 +4215,17 @@
  (optional=templinst)_ZNK8osgEarth11OptionsDataIKNS_3MapEE5cloneERKN3osg6CopyOpE@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth11OptionsDataIKNS_3MapEE9classNameEv@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth11OptionsDataIKNS_3MapEE9cloneTypeEv@Base 2.9.0
+ (optional=templinst)_ZNK8osgEarth11OptionsDataINS_13AsyncFunctionEE11libraryNameEv@Base 2.10.1
+ (optional=templinst)_ZNK8osgEarth11OptionsDataINS_13AsyncFunctionEE12isSameKindAsEPKN3osg6ObjectE@Base 2.10.1
+ (optional=templinst)_ZNK8osgEarth11OptionsDataINS_13AsyncFunctionEE5cloneERKN3osg6CopyOpE@Base 2.10.1
+ (optional=templinst)_ZNK8osgEarth11OptionsDataINS_13AsyncFunctionEE9classNameEv@Base 2.10.1
+ (optional=templinst)_ZNK8osgEarth11OptionsDataINS_13AsyncFunctionEE9cloneTypeEv@Base 2.10.1
  (optional=templinst)_ZNK8osgEarth11OptionsDataINS_9PagedNodeEE11libraryNameEv@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth11OptionsDataINS_9PagedNodeEE12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth11OptionsDataINS_9PagedNodeEE5cloneERKN3osg6CopyOpE@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth11OptionsDataINS_9PagedNodeEE9classNameEv@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth11OptionsDataINS_9PagedNodeEE9cloneTypeEv@Base 2.9.0
+ _ZNK8osgEarth11ProgramRepo16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
  _ZNK8osgEarth11TaskRequest11wasCanceledEv@Base 2.4.0
  _ZNK8osgEarth11TaskService13getNumThreadsEv@Base 2.4.0
  _ZNK8osgEarth11TaskService14getNumRequestsEv@Base 2.4.0
@@ -3947,11 +4270,30 @@
  _ZNK8osgEarth12HTTPResponse11isCancelledEv@Base 2.4.0
  _ZNK8osgEarth12HTTPResponse13getPartHeaderEjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZNK8osgEarth12HTTPResponse13getPartStreamEj@Base 2.4.0
+ _ZNK8osgEarth12HTTPResponse15getCodeCategoryEv@Base 2.10.0
  _ZNK8osgEarth12HTTPResponse15getPartAsStringB5cxx11Ej@Base 2.7.0
  _ZNK8osgEarth12HTTPResponse18getHeadersAsConfigEv@Base 2.4.0
  _ZNK8osgEarth12HTTPResponse4isOKEv@Base 2.4.0
  _ZNK8osgEarth12HTTPResponse7getCodeEv@Base 2.4.0
  _ZNK8osgEarth12LayerOptions9getConfigEv@Base 2.9.0
+ _ZNK8osgEarth12LineDrawable11getNumVertsEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable11libraryNameEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable12getLineWidthEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable12getRealIndexEj@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable12isSameKindAsEPKN3osg6ObjectE@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable15numVirtualVertsEPKN3osg5ArrayE@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable16getStippleFactorEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable17getStipplePatternEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable25actualVertsPerVirtualVertEj@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable5cloneERKN3osg6CopyOpE@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable7getModeEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable8getColorEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable8getCountEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable8getFirstEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable9classNameEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable9cloneTypeEv@Base 2.10.0
+ _ZNK8osgEarth12LineDrawable9getVertexEj@Base 2.10.0
  (optional=templinst)_ZNK8osgEarth12PluginLoaderINS_10ImageLayerENS_5LayerEE10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth12PluginLoaderINS_10ModelLayerENS_5LayerEE10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth12PluginLoaderINS_10VideoLayerENS_5LayerEE10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.9.0
@@ -3979,8 +4321,10 @@
  _ZNK8osgEarth12TerrainLayer11getTileSizeEv@Base 2.4.0
  _ZNK8osgEarth12TerrainLayer11libraryNameEv@Base 2.9.0
  _ZNK8osgEarth12TerrainLayer11mayHaveDataERKNS_7TileKeyE@Base 2.9.0
+ _ZNK8osgEarth12TerrainLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth12TerrainLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth12TerrainLayer13getTileSourceEv@Base 2.4.0
+ _ZNK8osgEarth12TerrainLayer14getAttributionB5cxx11Ev@Base 2.10.0
  _ZNK8osgEarth12TerrainLayer14getDataExtentsEv@Base 2.9.0
  _ZNK8osgEarth12TerrainLayer14getMetadataKeyB5cxx11EPKNS_7ProfileE@Base 2.8~rc1
  _ZNK8osgEarth12TerrainLayer14getNoDataValueEv@Base 2.9.0
@@ -3989,8 +4333,8 @@
  _ZNK8osgEarth12TerrainLayer16getMaxValidValueEv@Base 2.9.0
  _ZNK8osgEarth12TerrainLayer16getMinValidValueEv@Base 2.9.0
  _ZNK8osgEarth12TerrainLayer17isKeyInLegalRangeERKNS_7TileKeyE@Base 2.9.0
+ _ZNK8osgEarth12TerrainLayer18isKeyInVisualRangeERKNS_7TileKeyE@Base 2.10.1
  _ZNK8osgEarth12TerrainLayer19getDataExtentsUnionEv@Base 2.9.0
- _ZNK8osgEarth12TerrainLayer19mayHaveDataInExtentERKNS_9GeoExtentE@Base 2.9.0
  _ZNK8osgEarth12TerrainLayer23getBestAvailableTileKeyERKNS_7TileKeyE@Base 2.9.0
  _ZNK8osgEarth12TerrainLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth12TerrainLayer8isCachedERKNS_7TileKeyE@Base 2.4.0
@@ -4027,7 +4371,11 @@
  _ZNK8osgEarth12VisibleLayer10getOpacityEv@Base 2.9.0
  _ZNK8osgEarth12VisibleLayer10getVisibleEv@Base 2.9.0
  _ZNK8osgEarth12VisibleLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth12VisibleLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth12VisibleLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
+ _ZNK8osgEarth12VisibleLayer18getMaxVisibleRangeEv@Base 2.10.0
+ _ZNK8osgEarth12VisibleLayer18getMinVisibleRangeEv@Base 2.10.0
+ _ZNK8osgEarth12VisibleLayer19getAttenuationRangeEv@Base 2.10.0
  _ZNK8osgEarth12VisibleLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth12VisibleLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth12VisibleLayer9cloneTypeEv@Base 2.9.0
@@ -4053,16 +4401,33 @@
  _ZNK8osgEarth13DrawInstanced15MatrixRefVector5cloneERKN3osg6CopyOpE@Base 2.6.0
  _ZNK8osgEarth13DrawInstanced15MatrixRefVector9classNameEv@Base 2.6.0
  _ZNK8osgEarth13DrawInstanced15MatrixRefVector9cloneTypeEv@Base 2.6.0
+ _ZNK8osgEarth13PointDrawable11getNumVertsEv@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable11libraryNameEv@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable12getPointSizeEv@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable12isSameKindAsEPKN3osg6ObjectE@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable16compileGLObjectsERN3osg10RenderInfoE@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable18drawImplementationERN3osg10RenderInfoE@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable19checkSharedStateSetEPN3osg5StateE@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable5cloneERKN3osg6CopyOpE@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable8getColorEv@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable8getCountEv@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable8getFirstEv@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable9classNameEv@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable9cloneTypeEv@Base 2.10.0
+ _ZNK8osgEarth13PointDrawable9getVertexEj@Base 2.10.0
  _ZNK8osgEarth13ProxySettings5applyEPN5osgDB7OptionsE@Base 2.4.0
  _ZNK8osgEarth13ProxySettings9getConfigEv@Base 2.4.0
  _ZNK8osgEarth13ShaderFactory11createMainsERKSt3mapINS_10ShaderComp16FunctionLocationESt8multimapIfNS2_8FunctionESt4lessIfESaISt4pairIKfS5_EEES6_IS3_ESaIS8_IKS3_SC_EEERKNS_10vector_mapIjNS_14VirtualProgram11ShaderEntryEEERKSt3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ISW_ESaISW_EERSt6vectorIN3osg7ref_ptrINS13_6ShaderEEESaIS16_EE@Base 2.9.0
  _ZNK8osgEarth13ShaderFactory18createRangeUniformEv@Base 2.6.0
  _ZNK8osgEarth13ShaderFactory19getRangeUniformNameB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth13ShaderFactory36createColorFilterChainFragmentShaderERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt6vectorIN3osg7ref_ptrINS_11ColorFilterEEESaISD_EE@Base 2.7.0
+ _ZNK8osgEarth13ShaderOptions9getConfigEv@Base 2.10.1
  _ZNK8osgEarth13ShaderPackage4loadEPNS_14VirtualProgramERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.7.0
  _ZNK8osgEarth13ShaderPackage6unloadEPNS_14VirtualProgramERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.7.0
  _ZNK8osgEarth13ShaderPackage7loadAllEPNS_14VirtualProgramEPKN5osgDB7OptionsE@Base 2.7.0
  _ZNK8osgEarth13ShaderPackage9unloadAllEPNS_14VirtualProgramEPKN5osgDB7OptionsE@Base 2.7.0
+ _ZNK8osgEarth13StateSetCache16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
  _ZNK8osgEarth13StateSetCache8eligibleEPN3osg14StateAttributeE@Base 2.4.0
  _ZNK8osgEarth13StateSetCache8eligibleEPN3osg8StateSetE@Base 2.4.0
  _ZNK8osgEarth13TiXmlDocument10ToDocumentEv@Base 2.9.0
@@ -4088,6 +4453,7 @@
  _ZNK8osgEarth14CacheEstimator11getSizeInMBEv@Base 2.5.0
  _ZNK8osgEarth14CacheEstimator21getTotalTimeInSecondsEv@Base 2.5.0
  _ZNK8osgEarth14ElevationLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth14ElevationLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth14ElevationLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth14ElevationLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth14ElevationLayer8isOffsetEv@Base 2.9.0
@@ -4112,6 +4478,7 @@
  _ZNK8osgEarth14LandCoverClass9getConfigEv@Base 2.9.0
  _ZNK8osgEarth14LandCoverLayer11libraryNameEv@Base 2.9.0
  _ZNK8osgEarth14LandCoverLayer12getClassByUVERKNS_8GeoImageEdd@Base 2.9.0
+ _ZNK8osgEarth14LandCoverLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth14LandCoverLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth14LandCoverLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth14LandCoverLayer9classNameEv@Base 2.9.0
@@ -4170,9 +4537,13 @@
  _ZNK8osgEarth16DrapingTechnique22optimizeToVisibleBoundEv@Base 2.9.0
  _ZNK8osgEarth16DrapingTechnique7hasDataERNS_16OverlayDecorator13TechRTTParamsE@Base 2.4.0
  _ZNK8osgEarth16DrapingTechnique8getBoundERNS_16OverlayDecorator13TechRTTParamsE@Base 2.8~rc1
+ _ZNK8osgEarth16HorizonClipPlane14ReleaseFunctorclERKNS0_13PerCameraDataE@Base 2.10.0
+ _ZNK8osgEarth16HorizonClipPlane16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
  _ZNK8osgEarth16MaskLayerOptions9getConfigEv@Base 2.4.0
  _ZNK8osgEarth16MaskSourceDriver20getMaskSourceOptionsEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZNK8osgEarth16OverlayDecorator16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
  _ZNK8osgEarth16OverlayDecorator21getMaxHorizonDistanceEv@Base 2.4.0
+ _ZNK8osgEarth16OverlayTechnique16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
  _ZNK8osgEarth16OverlayTechnique22optimizeToVisibleBoundEv@Base 2.9.0
  _ZNK8osgEarth16OverlayTechnique7hasDataERNS_16OverlayDecorator13TechRTTParamsE@Base 2.4.0
  _ZNK8osgEarth16OverlayTechnique8getBoundERNS_16OverlayDecorator13TechRTTParamsE@Base 2.8~rc1
@@ -4181,7 +4552,7 @@
  _ZNK8osgEarth16ProxyCullVisitor21getDistanceToEyePointERKN3osg5Vec3fEb@Base 2.4.0
  _ZNK8osgEarth16ProxyCullVisitor22getDistanceToViewPointERKN3osg5Vec3fEb@Base 2.4.0
  _ZNK8osgEarth16ProxyCullVisitor23getDistanceFromEyePointERKN3osg5Vec3fEb@Base 2.4.0
- (arch=amd64)_ZNK8osgEarth16ResourceReleaser16releaseGLObjectsEPN3osg5StateE@Base 2.9.0
+ _ZNK8osgEarth16ResourceReleaser16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
  _ZNK8osgEarth16ResourceReleaser18drawImplementationERN3osg10RenderInfoE@Base 2.8~rc1
  _ZNK8osgEarth16SpatialReference10isGeodeticEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference10isMercatorEv@Base 2.4.0
@@ -4193,18 +4564,19 @@
  _ZNK8osgEarth16SpatialReference12getDatumNameB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth16SpatialReference12getEllipsoidEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference12isContiguousEv@Base 2.4.0
+ _ZNK8osgEarth16SpatialReference12isGeocentricEv@Base 2.10.0
  _ZNK8osgEarth16SpatialReference12isGeographicEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference12isNorthPolarEv@Base 2.4.0
- _ZNK8osgEarth16SpatialReference12isPlateCarreEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference12isSouthPolarEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference12preTransformERSt6vectorIN3osg5Vec3dESaIS3_EE@Base 2.4.0
- _ZNK8osgEarth16SpatialReference13createLocatorEddddb@Base 2.4.0
+ _ZNK8osgEarth16SpatialReference13createLocatorEdddd@Base 2.10.0
  _ZNK8osgEarth16SpatialReference13isUserDefinedEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference13postTransformERSt6vectorIN3osg5Vec3dESaIS3_EE@Base 2.4.0
  _ZNK8osgEarth16SpatialReference14getGeodeticSRSEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference14isEquivalentToEPKS0_@Base 2.4.0
  _ZNK8osgEarth16SpatialReference14transformUnitsEdPKS0_d@Base 2.5.0
  _ZNK8osgEarth16SpatialReference15_isEquivalentToEPKS0_b@Base 2.4.0
+ _ZNK8osgEarth16SpatialReference16getGeocentricSRSEv@Base 2.10.0
  _ZNK8osgEarth16SpatialReference16getGeographicSRSEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference16getVerticalDatumEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference16transformToWorldERKN3osg5Vec3dERS2_@Base 2.4.0
@@ -4225,12 +4597,10 @@
  _ZNK8osgEarth16SpatialReference26createCoordinateSystemNodeEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference28createTransMercFromLongitudeERKNS_5AngleE@Base 2.7.0
  _ZNK8osgEarth16SpatialReference28populateCoordinateSystemNodeEPN3osg20CoordinateSystemNodeE@Base 2.4.0
- _ZNK8osgEarth16SpatialReference3KeyltERKS1_@Base 2.9.0
  _ZNK8osgEarth16SpatialReference5isLTPEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference6getKeyEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference6getWKTB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth16SpatialReference6isCubeEv@Base 2.4.0
- _ZNK8osgEarth16SpatialReference6isECEFEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference7getECEFEv@Base 2.4.0
  _ZNK8osgEarth16SpatialReference7getNameB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth16SpatialReference8getUnitsEv@Base 2.4.0
@@ -4239,6 +4609,7 @@
  _ZNK8osgEarth16TaskRequestQueue14getNumRequestsEv@Base 2.4.0
  _ZNK8osgEarth16TaskRequestQueue6isFullEv@Base 2.7.0
  _ZNK8osgEarth16TaskRequestQueue7isEmptyEv@Base 2.7.0
+ _ZNK8osgEarth16TerrainTileModel16compileGLObjectsERN3osg5StateE@Base 2.10.0
  _ZNK8osgEarth16TerrainTileModel16getNormalTextureEv@Base 2.8~rc1
  _ZNK8osgEarth16TerrainTileModel19getElevationTextureEv@Base 2.8~rc1
  _ZNK8osgEarth16TerrainTileModel22getNormalTextureMatrixEv@Base 2.8~rc1
@@ -4288,6 +4659,7 @@
  _ZNK8osgEarth19CompositeTileSource9isDynamicEv@Base 2.4.0
  _ZNK8osgEarth19DriverConfigOptions9getConfigEv@Base 2.4.0
  _ZNK8osgEarth19LandCoverDictionary11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth19LandCoverDictionary12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth19LandCoverDictionary12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth19LandCoverDictionary14getClassByNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  _ZNK8osgEarth19LandCoverDictionary15getClassByValueEi@Base 2.9.0
@@ -4299,11 +4671,12 @@
  _ZNK8osgEarth20CubeSpatialReference11isProjectedEv@Base 2.4.0
  _ZNK8osgEarth20CubeSpatialReference12isGeographicEv@Base 2.4.0
  _ZNK8osgEarth20CubeSpatialReference12preTransformERSt6vectorIN3osg5Vec3dESaIS3_EE@Base 2.4.0
- _ZNK8osgEarth20CubeSpatialReference13createLocatorEddddb@Base 2.4.0
+ _ZNK8osgEarth20CubeSpatialReference13createLocatorEdddd@Base 2.10.0
  _ZNK8osgEarth20CubeSpatialReference13postTransformERSt6vectorIN3osg5Vec3dESaIS3_EE@Base 2.4.0
  _ZNK8osgEarth20CubeSpatialReference20transformExtentToMBREPKNS_16SpatialReferenceERdS4_S4_S4_@Base 2.4.0
  _ZNK8osgEarth20CubeSpatialReference26transformInFaceExtentToMBREPKNS_16SpatialReferenceEiRdS4_S4_S4_@Base 2.9.0
  _ZNK8osgEarth20ElevationLayerVector31populateHeightFieldAndNormalMapEPN3osg11HeightFieldEPNS_9NormalMapERKNS_7TileKeyEPKNS_7ProfileENS_22ElevationInterpolationEPNS_16ProgressCallbackE@Base 2.9.0
+ _ZNK8osgEarth21AsyncNodePseudoLoader8readNodeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.10.1
  _ZNK8osgEarth21DiscardAlphaFragments7installEPN3osg8StateSetEf@Base 2.6.0
  _ZNK8osgEarth21DiscardAlphaFragments9uninstallEPN3osg8StateSetE@Base 2.6.0
  _ZNK8osgEarth21ElevationLayerOptions9getConfigEv@Base 2.4.0
@@ -4315,6 +4688,7 @@
  _ZNK8osgEarth21LandCoverValueMapping9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth21LandCoverValueMapping9getConfigEv@Base 2.9.0
  _ZNK8osgEarth22LandCoverCoverageLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth22LandCoverCoverageLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth22LandCoverCoverageLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth22LandCoverCoverageLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth22LandCoverCoverageLayer9classNameEv@Base 2.9.0
@@ -4327,20 +4701,28 @@
  _ZNK8osgEarth23MultiprocessTileVisitor12getEarthFileB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth23MultiprocessTileVisitor15getNumProcessesEv@Base 2.6.0
  _ZNK8osgEarth23TerrainTileModelFactory18createImageTextureEPN3osg5ImageEPKNS_10ImageLayerE@Base 2.8~rc1
- _ZNK8osgEarth23TerrainTileModelFactory19createNormalTextureEPN3osg5ImageE@Base 2.8~rc1
+ _ZNK8osgEarth23TerrainTileModelFactory19createNormalTextureEPN3osg5ImageEb@Base 2.10.0
  _ZNK8osgEarth23TerrainTileModelFactory21createCoverageTextureEPN3osg5ImageEPKNS_10ImageLayerE@Base 2.8~rc1
  _ZNK8osgEarth23TerrainTileModelFactory22createElevationTextureEPN3osg5ImageE@Base 2.8~rc1
  _ZNK8osgEarth24MultithreadedTileVisitor13getNumThreadsEv@Base 2.6.0
  _ZNK8osgEarth24OcclusionCullingCallback14getMaxAltitudeEv@Base 2.5.0
  _ZNK8osgEarth24ScreenSpaceLayoutOptions9getConfigEv@Base 2.8~rc1
  _ZNK8osgEarth26CompositeTileSourceOptions9getConfigEv@Base 2.4.0
+ _ZNK8osgEarth26InstallViewportSizeUniform11libraryNameEv@Base 2.10.0
+ _ZNK8osgEarth26InstallViewportSizeUniform12isSameKindAsEPKN3osg6ObjectE@Base 2.10.0
+ _ZNK8osgEarth26InstallViewportSizeUniform5cloneERKN3osg6CopyOpE@Base 2.10.0
+ _ZNK8osgEarth26InstallViewportSizeUniform9classNameEv@Base 2.10.0
+ _ZNK8osgEarth26InstallViewportSizeUniform9cloneTypeEv@Base 2.10.0
  _ZNK8osgEarth26LandCoverDictionaryOptions9getConfigEv@Base 2.9.0
  _ZNK8osgEarth26ScreenSpaceLayoutExtension11libraryNameEv@Base 2.8~rc1
+ _ZNK8osgEarth26ScreenSpaceLayoutExtension12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth26ScreenSpaceLayoutExtension12isSameKindAsEPKN3osg6ObjectE@Base 2.8~rc1
+ _ZNK8osgEarth26ScreenSpaceLayoutExtension16getConfigOptionsEv@Base 2.10.0
  _ZNK8osgEarth26ScreenSpaceLayoutExtension5cloneERKN3osg6CopyOpE@Base 2.8~rc1
  _ZNK8osgEarth26ScreenSpaceLayoutExtension9classNameEv@Base 2.8~rc1
  _ZNK8osgEarth26ScreenSpaceLayoutExtension9cloneTypeEv@Base 2.8~rc1
  (optional=templinst)_ZNK8osgEarth27GenerateGL3LightingUniforms16alreadyInstalledINS_30LightSourceGL3UniformGeneratorEEEbPN3osg8CallbackE@Base 2.9.0
+ _ZNK8osgEarth27ImageToHeightFieldConverter13convertToR16FEPKN3osg11HeightFieldE@Base 2.10.1
  _ZNK8osgEarth27ImageToHeightFieldConverter13convertToR32FEPKN3osg11HeightFieldE@Base 2.9.0
  _ZNK8osgEarth27ImageToHeightFieldConverter9convert16EPKN3osg11HeightFieldE@Base 2.4.0
  _ZNK8osgEarth27ImageToHeightFieldConverter9convert16EPKN3osg5ImageE@Base 2.4.0
@@ -4353,6 +4735,7 @@
  _ZNK8osgEarth28TangentPlaneSpatialReference13postTransformERSt6vectorIN3osg5Vec3dESaIS3_EE@Base 2.6.0
  _ZNK8osgEarth28TangentPlaneSpatialReference15_isEquivalentToEPKNS_16SpatialReferenceE@Base 2.4.0
  _ZNK8osgEarth29LandCoverCoverageLayerOptions9getConfigEv@Base 2.9.0
+ _ZNK8osgEarth30LightSourceGL3UniformGenerator16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
  _ZNK8osgEarth31PagedLODWithSceneGraphCallbacks22getSceneGraphCallbacksEv@Base 2.9.0
  _ZNK8osgEarth3Map10getLayerAtEj@Base 2.9.0
  _ZNK8osgEarth3Map10getProfileEv@Base 2.4.0
@@ -4364,24 +4747,29 @@
  _ZNK8osgEarth3Map13getLayerByUIDEi@Base 2.9.0
  _ZNK8osgEarth3Map14addMapCallbackEPNS_11MapCallbackE@Base 2.4.0
  _ZNK8osgEarth3Map14getLayerByNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
+ _ZNK8osgEarth3Map15getAttributionsERSt3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4lessIS7_ESaIS7_EE@Base 2.10.0
  _ZNK8osgEarth3Map15getIndexOfLayerEPKNS_5LayerE@Base 2.9.0
  _ZNK8osgEarth3Map16getElevationPoolEv@Base 2.9.0
  _ZNK8osgEarth3Map16getGlobalOptionsEv@Base 2.4.0
  _ZNK8osgEarth3Map17removeMapCallbackEPNS_11MapCallbackE@Base 2.9.0
  _ZNK8osgEarth3Map20getDataModelRevisionEv@Base 2.4.0
- _ZNK8osgEarth3Map4syncERNS_8MapFrameE@Base 2.4.0
  _ZNK8osgEarth3Map5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth3Map6isFastERKNS_7TileKeyERKSt6vectorIN3osg7ref_ptrINS_5LayerEEESaIS8_EE@Base 2.10.0
  _ZNK8osgEarth3Map8getCacheEv@Base 2.4.0
  _ZNK8osgEarth3Map9classNameEv@Base 2.9.0
  _ZNK8osgEarth3Map9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth3Map9getLayersERSt6vectorIN3osg7ref_ptrINS_5LayerEEESaIS5_EE@Base 2.9.0
+ (optional=templinst)_ZNK8osgEarth3Map9getLayersINS_10ImageLayerEEENS_8RevisionERSt6vectorIN3osg7ref_ptrIT_EESaIS8_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth3Map9getLayersINS_10PatchLayerEEENS_8RevisionERSt6vectorIN3osg7ref_ptrIT_EESaIS8_EE@Base 2.10.0
  (optional=templinst)_ZNK8osgEarth3Map9getLayersINS_12TerrainLayerEEENS_8RevisionERSt6vectorIN3osg7ref_ptrIT_EESaIS8_EE@Base 2.9.0
+ (optional=templinst)_ZNK8osgEarth3Map9getLayersINS_14ElevationLayerEEENS_8RevisionERN3osg11MixinVectorINS4_7ref_ptrIT_EEEE@Base 2.10.0
  _ZNK8osgEarth3URI10readObjectEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.4.0
  _ZNK8osgEarth3URI10readStringEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.4.0
  _ZNK8osgEarth3URI6appendERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZNK8osgEarth3URI8getImageEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.7.0
  _ZNK8osgEarth3URI8isRemoteEv@Base 2.4.0
  _ZNK8osgEarth3URI8readNodeEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.4.0
+ _ZNK8osgEarth3URI9getConfigEv@Base 2.10.0
  _ZNK8osgEarth3URI9readImageEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.4.0
  _ZNK8osgEarth4Json17ValueIteratorBase10memberNameEv@Base 2.4.0
  _ZNK8osgEarth4Json17ValueIteratorBase15computeDistanceERKS1_@Base 2.4.0
@@ -4442,18 +4830,30 @@
  _ZNK8osgEarth4Json6Reader24getFormatedErrorMessagesB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth4Json6Reader24getLocationLineAndColumnB5cxx11EPKc@Base 2.7.0
  _ZNK8osgEarth4Json6Reader24getLocationLineAndColumnEPKcRiS4_@Base 2.4.0
+ _ZNK8osgEarth4Text11libraryNameEv@Base 2.10.0
+ _ZNK8osgEarth4Text12isSameKindAsEPKN3osg6ObjectE@Base 2.10.0
+ _ZNK8osgEarth4Text5cloneERKN3osg6CopyOpE@Base 2.10.0
+ _ZNK8osgEarth4Text9cloneTypeEv@Base 2.10.0
  _ZNK8osgEarth5Angle17asParseableStringB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth5Cache18getApproximateSizeEv@Base 2.6.0
  _ZNK8osgEarth5Geoid14isEquivalentToERKS0_@Base 2.4.0
  _ZNK8osgEarth5Geoid9getHeightEddRKNS_22ElevationInterpolationE@Base 2.4.0
  _ZNK8osgEarth5Layer10getCacheIDB5cxx11Ev@Base 2.9.0
  _ZNK8osgEarth5Layer10getEnabledEv@Base 2.9.0
+ _ZNK8osgEarth5Layer11getStateSetEv@Base 2.10.0
  _ZNK8osgEarth5Layer11getTypeNameEv@Base 2.9.0
  _ZNK8osgEarth5Layer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth5Layer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth5Layer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
+ _ZNK8osgEarth5Layer14getAttributionB5cxx11Ev@Base 2.10.0
+ _ZNK8osgEarth5Layer15getCullCallbackEv@Base 2.10.0
+ _ZNK8osgEarth5Layer16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
+ _ZNK8osgEarth5Layer17TraversalCallback8traverseEPN3osg4NodeEPNS2_11NodeVisitorE@Base 2.10.0
  _ZNK8osgEarth5Layer21modifyTileBoundingBoxERKNS_7TileKeyERN3osg15BoundingBoxImplINS4_5Vec3fEEE@Base 2.9.0
- _ZNK8osgEarth5Layer4cullEPKN7osgUtil11CullVisitorERSt6vectorIPKN3osg8StateSetESaIS9_EE@Base 2.9.0
+ _ZNK8osgEarth5Layer22getSceneGraphCallbacksEv@Base 2.10.0
+ _ZNK8osgEarth5Layer5applyEPN3osg4NodeEPNS1_11NodeVisitorE@Base 2.10.0
  _ZNK8osgEarth5Layer5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth5Layer7getNodeEv@Base 2.10.0
  _ZNK8osgEarth5Layer9classNameEv@Base 2.9.0
  _ZNK8osgEarth5Layer9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth5Layer9getConfigEv@Base 2.9.0
@@ -4470,34 +4870,37 @@
  _ZNK8osgEarth6Bounds8radius2dEv@Base 2.4.0
  _ZNK8osgEarth6Bounds8toStringB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth6Bounds9unionWithERKS0_@Base 2.4.0
- (optional=templinst)_ZNK8osgEarth6Config11getObjIfSetINS_14ProfileOptionsEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIN3osg7Texture10FilterModeES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIN3osg7Texture18InternalFormatModeES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_12AltitudeModeES2_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESA_RT_RKT0_@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_14ProfileOptionsEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_21ElevationNoDataPolicyES2_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESA_RNS_8optionalIT_EERKT0_@Base 2.10.1
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_3URIEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst|arch=arm64)_ZNK8osgEarth6Config3getINS_8DistanceEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEbRKS7_RNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIbEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIdEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIdEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERT_@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIfEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIjEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
  _ZNK8osgEarth6Config4findERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 2.7.0
  _ZNK8osgEarth6Config5childERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZNK8osgEarth6Config5valueERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  (optional=templinst)_ZNK8osgEarth6Config5valueIdEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES2_@Base 2.7.0
  _ZNK8osgEarth6Config6toJSONB5cxx11Eb@Base 2.7.0
- _ZNK8osgEarth6Config8childrenERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetIN3osg7Texture10FilterModeES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc1
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetIN3osg7Texture18InternalFormatModeES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc1
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetINS_12AltitudeModeES2_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESA_RT_RKT0_@Base 2.7.0
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetINS_21ElevationNoDataPolicyES2_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESA_RNS_8optionalIT_EERKT0_@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetINS_3URIEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEbRKS7_RNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIbEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIdEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIdEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERT_@Base 2.7.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIfEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIjEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
+ _ZNK8osgEarth6Config8childrenERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.1
  _ZNK8osgEarth6Config8hasValueERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8~rc1
  _ZNK8osgEarth6Config9child_ptrERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZNK8osgEarth6ConfigmiERKS0_@Base 2.4.0
  _ZNK8osgEarth6Status8toStringB5cxx11Ev@Base 2.8~rc1
  _ZNK8osgEarth7Horizon11libraryNameEv@Base 2.8~rc1
  _ZNK8osgEarth7Horizon12isSameKindAsEPKN3osg6ObjectE@Base 2.8~rc1
+ _ZNK8osgEarth7Horizon27getDistanceToVisibleHorizonEv@Base 2.10.0
  _ZNK8osgEarth7Horizon5cloneERKN3osg6CopyOpE@Base 2.8~rc1
  _ZNK8osgEarth7Horizon8getPlaneERN3osg5PlaneE@Base 2.7.0
  _ZNK8osgEarth7Horizon9classNameEv@Base 2.8~rc1
  _ZNK8osgEarth7Horizon9cloneTypeEv@Base 2.8~rc1
+ _ZNK8osgEarth7Horizon9getRadiusEv@Base 2.10.0
  _ZNK8osgEarth7Horizon9isVisibleERKN3osg5Vec3dES4_d@Base 2.8~rc1
  _ZNK8osgEarth7Horizon9isVisibleERKN3osg5Vec3dEd@Base 2.8~rc1
  _ZNK8osgEarth7MapNode10getTerrainEv@Base 2.4.0
@@ -4510,6 +4913,7 @@
  _ZNK8osgEarth7MapNode17getLayerNodeGroupEv@Base 2.9.0
  _ZNK8osgEarth7MapNode17getMapNodeOptionsEv@Base 2.4.0
  _ZNK8osgEarth7MapNode19getResourceReleaserEv@Base 2.9.0
+ _ZNK8osgEarth7MapNode26getCascadeDrapingDecoratorEv@Base 2.10.1
  _ZNK8osgEarth7MapNode6getMapEv@Base 2.4.0
  _ZNK8osgEarth7MapNode9classNameEv@Base 2.4.0
  _ZNK8osgEarth7MapNode9getConfigEv@Base 2.9.0
@@ -4536,7 +4940,6 @@
  _ZNK8osgEarth7Profile8toStringB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth7Profile9getExtentEv@Base 2.4.0
  _ZNK8osgEarth7Terrain24getWorldCoordsUnderMouseEPN3osg4ViewEffRNS1_5Vec3dE@Base 2.4.0
- _ZNK8osgEarth7Terrain24getWorldCoordsUnderMouseEPN3osg4ViewEffRNS1_5Vec3dERNS1_7ref_ptrINS1_4NodeEEE@Base 2.4.0
  _ZNK8osgEarth7Terrain9getHeightEPKNS_16SpatialReferenceEddPdS4_@Base 2.4.0
  _ZNK8osgEarth7Terrain9getHeightEPN3osg4NodeEPKNS_16SpatialReferenceEddPdS7_@Base 2.4.0
  _ZNK8osgEarth7TileKey10getProfileEv@Base 2.4.0
@@ -4551,6 +4954,11 @@
  _ZNK8osgEarth7XmlText6isTextEv@Base 2.4.0
  _ZNK8osgEarth7XmlText8getValueB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth7XmlText9isElementEv@Base 2.4.0
+ _ZNK8osgEarth8AsyncLOD12computeBoundEv@Base 2.10.1
+ _ZNK8osgEarth8AsyncLOD7getModeEv@Base 2.10.1
+ _ZNK8osgEarth8AsyncLOD9getPolicyEv@Base 2.10.1
+ _ZNK8osgEarth8AsyncLOD9isVisibleERKNS_9AsyncNodeERN3osg11NodeVisitorE@Base 2.10.1
+ _ZNK8osgEarth8DateTime12getJulianDayEv@Base 2.10.0
  _ZNK8osgEarth8DateTime16asCompactISO8601B5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth8DateTime3dayEv@Base 2.5.0
  _ZNK8osgEarth8DateTime4yearEv@Base 2.5.0
@@ -4559,6 +4967,7 @@
  _ZNK8osgEarth8DateTime6timegmEPK2tm@Base 2.6.0
  _ZNK8osgEarth8DateTime9asISO8601B5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth8DateTime9asRFC1123B5cxx11Ev@Base 2.7.0
+ _ZNK8osgEarth8DateTimeplEd@Base 2.10.0
  _ZNK8osgEarth8GeoImage16getUnitsPerPixelEv@Base 2.4.0
  _ZNK8osgEarth8GeoImage4cropERKNS_9GeoExtentEbjjb@Base 2.4.0
  _ZNK8osgEarth8GeoImage5validEv@Base 2.4.0
@@ -4568,6 +4977,7 @@
  _ZNK8osgEarth8GeoImage9reprojectEPKNS_16SpatialReferenceEPKNS_9GeoExtentEjjb@Base 2.4.0
  _ZNK8osgEarth8GeoPoint10distanceToERKS0_@Base 2.5.0
  _ZNK8osgEarth8GeoPoint10transformZERKNS_12AltitudeModeEPKNS_15TerrainResolverERd@Base 2.6.0
+ _ZNK8osgEarth8GeoPoint11interpolateERKS0_d@Base 2.10.0
  _ZNK8osgEarth8GeoPoint18createLocalToWorldERN3osg7MatrixdE@Base 2.4.0
  _ZNK8osgEarth8GeoPoint18createWorldToLocalERN3osg7MatrixdE@Base 2.4.0
  _ZNK8osgEarth8GeoPoint19createWorldUpVectorERN3osg5Vec3dE@Base 2.5.0
@@ -4586,26 +4996,19 @@
  _ZNK8osgEarth8LightGL37getTypeEv@Base 2.9.0
  _ZNK8osgEarth8LightGL39classNameEv@Base 2.9.0
  _ZNK8osgEarth8LightGL39cloneTypeEv@Base 2.9.0
- _ZNK8osgEarth8MapFrame13containsLayerEi@Base 2.9.0
  _ZNK8osgEarth8MapFrame13getMapOptionsEv@Base 2.6.0
  _ZNK8osgEarth8MapFrame16getElevationPoolEv@Base 2.9.0
  _ZNK8osgEarth8MapFrame19populateHeightFieldERN3osg7ref_ptrINS1_11HeightFieldEEERKNS_7TileKeyEbPNS_16ProgressCallbackE@Base 2.7.0
+ _ZNK8osgEarth8MapFrame20containsEnabledLayerEi@Base 2.10.0
  _ZNK8osgEarth8MapFrame31populateHeightFieldAndNormalMapERN3osg7ref_ptrINS1_11HeightFieldEEERNS2_INS_9NormalMapEEERKNS_7TileKeyEbPNS_16ProgressCallbackE@Base 2.9.0
- _ZNK8osgEarth8MapFrame6getUIDEv@Base 2.6.0
- _ZNK8osgEarth8MapFrame7isValidEv@Base 2.7.0
+ _ZNK8osgEarth8MapFrame5validEv@Base 2.10.0
  _ZNK8osgEarth8MapFrame8isCachedERKNS_7TileKeyE@Base 2.4.0
  _ZNK8osgEarth8MapFrame9needsSyncEv@Base 2.4.0
- _ZNK8osgEarth8MaskNode11libraryNameEv@Base 2.4.0
- _ZNK8osgEarth8MaskNode12isSameKindAsEPKN3osg6ObjectE@Base 2.4.0
- _ZNK8osgEarth8MaskNode5cloneERKN3osg6CopyOpE@Base 2.4.0
- _ZNK8osgEarth8MaskNode9classNameEv@Base 2.4.0
- _ZNK8osgEarth8MaskNode9cloneTypeEv@Base 2.4.0
  _ZNK8osgEarth8MemCache11libraryNameEv@Base 2.4.0
  _ZNK8osgEarth8MemCache12isSameKindAsEPKN3osg6ObjectE@Base 2.4.0
  _ZNK8osgEarth8MemCache5cloneERKN3osg6CopyOpE@Base 2.4.0
  _ZNK8osgEarth8MemCache9classNameEv@Base 2.4.0
  _ZNK8osgEarth8MemCache9cloneTypeEv@Base 2.4.0
- _ZNK8osgEarth8Registry14getCubeProfileEv@Base 2.4.0
  _ZNK8osgEarth8Registry14getObjectIndexEv@Base 2.7.0
  _ZNK8osgEarth8Registry15getCapabilitiesEv@Base 2.4.0
  _ZNK8osgEarth8Registry15getDefaultCacheEv@Base 2.8~rc1
@@ -4628,7 +5031,13 @@
  _ZNK8osgEarth8Registry8getUnitsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZNK8osgEarth8TaskList7getKeysEv@Base 2.6.0
  _ZNK8osgEarth9CacheSeed10getVisitorEv@Base 2.6.0
+ _ZNK8osgEarth9Extension11libraryNameEv@Base 2.10.0
+ _ZNK8osgEarth9Extension12getConfigKeyEv@Base 2.10.0
+ _ZNK8osgEarth9Extension12isSameKindAsEPKN3osg6ObjectE@Base 2.10.0
  _ZNK8osgEarth9Extension16getConfigOptionsEv@Base 2.8~rc1
+ _ZNK8osgEarth9Extension5cloneERKN3osg6CopyOpE@Base 2.10.0
+ _ZNK8osgEarth9Extension9classNameEv@Base 2.10.0
+ _ZNK8osgEarth9Extension9cloneTypeEv@Base 2.10.0
  _ZNK8osgEarth9GeoCircle10intersectsERKS0_@Base 2.4.0
  _ZNK8osgEarth9GeoCircle9transformEPKNS_16SpatialReferenceE@Base 2.4.0
  _ZNK8osgEarth9GeoCircle9transformEPKNS_16SpatialReferenceERS0_@Base 2.4.0
@@ -4641,6 +5050,7 @@
  _ZNK8osgEarth9GeoExtent12isGeographicEv@Base 2.9.0
  _ZNK8osgEarth9GeoExtent14createPolytopeERN3osg8PolytopeE@Base 2.7.0
  _ZNK8osgEarth9GeoExtent15createScaleBiasERKS0_RN3osg7MatrixdE@Base 2.9.0
+ _ZNK8osgEarth9GeoExtent15createScaleBiasERKS0_RN3osg7MatrixfE@Base 2.10.0
  _ZNK8osgEarth9GeoExtent19crossesAntimeridianEv@Base 2.4.0
  _ZNK8osgEarth9GeoExtent19intersectionSameSRSERKS0_@Base 2.4.0
  _ZNK8osgEarth9GeoExtent23splitAcrossAntimeridianERS0_S1_@Base 2.4.0
@@ -4659,7 +5069,13 @@
  _ZNK8osgEarth9GeoExtent9transformEPKNS_16SpatialReferenceERS0_@Base 2.6.0
  _ZNK8osgEarth9GeoExtenteqERKS0_@Base 2.4.0
  _ZNK8osgEarth9GeoExtentneERKS0_@Base 2.4.0
+ _ZNK8osgEarth9LineGroup11libraryNameEv@Base 2.10.0
+ _ZNK8osgEarth9LineGroup12isSameKindAsEPKN3osg6ObjectE@Base 2.10.0
+ _ZNK8osgEarth9LineGroup5cloneERKN3osg6CopyOpE@Base 2.10.0
+ _ZNK8osgEarth9LineGroup9classNameEv@Base 2.10.0
+ _ZNK8osgEarth9LineGroup9cloneTypeEv@Base 2.10.0
  _ZNK8osgEarth9MaskLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth9MaskLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth9MaskLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth9MaskLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth9MaskLayer9classNameEv@Base 2.9.0
@@ -4673,7 +5089,6 @@
  _ZNK8osgEarth9NormalMap9getNormalEjj@Base 2.9.0
  _ZNK8osgEarth9PagedNode13getChildBoundEv@Base 2.9.0
  _ZNK8osgEarth9PagedNode8hasChildEv@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEB5cxx11Ev@Base 2.7.0
  (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEv@Base 2.9.0
  _ZNK8osgEarth9TiXmlNode10FirstChildEPKc@Base 2.9.0
  _ZNK8osgEarth9TiXmlNode10ToDocumentEv@Base 2.9.0
@@ -4699,60 +5114,43 @@
  _ZNK8osgEarth9TiXmlText6AcceptEPNS_12TiXmlVisitorE@Base 2.9.0
  _ZNK8osgEarth9TiXmlText6CopyToEPS0_@Base 2.9.0
  _ZNK8osgEarth9TiXmlText6ToTextEv@Base 2.9.0
+ _ZNK8osgEarth9Viewpoint7getNodeEv@Base 2.10.0
  _ZNK8osgEarth9Viewpoint7isValidEv@Base 2.4.0
  _ZNK8osgEarth9Viewpoint8toStringB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth9Viewpoint9getConfigEv@Base 2.4.0
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.6.0
  (optional=templinst|subst)_ZNSt11_Deque_baseIN8osgEarth14TileRasterizer3JobESaIS2_EE17_M_initialize_mapE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt11_Deque_baseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_initialize_mapE{size_t}@Base 2.9.0
  (optional=templinst)_ZNSt13_Bvector_baseISaIbEE13_M_deallocateEv@Base 2.7.0
- (optional=templinst|arch=i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIN9__gnu_cxx17__normal_iteratorIPKN8osgEarth10vector_mapIjNS4_14VirtualProgram11ShaderEntryEE5ENTRYESt6vectorIS9_SaIS9_EEEEPS9_EET0_T_SI_SH_@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrINS4_6ShaderEEESt6vectorIS7_SaIS7_EEEES8_EET0_T_SE_SD_@Base 2.8~rc1
- (optional=templinst|arch=!armel !armhf !hurd-i386 !i386 !m68k !mips !mipsel !powerpc)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN3osg5PlaneEPS3_EET0_T_S8_S7_@Base 2.9.0
- (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN3osg7ref_ptrIN8osgEarth10PolyShaderEEEPS6_EET0_T_SB_SA_@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN3osg7ref_ptrINS2_6ShaderEEEPS5_EET0_T_SA_S9_@Base 2.8~rc1
- (optional=templinst)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN8osgEarth14GeoHeightFieldEPS3_EET0_T_S8_S7_@Base 2.9.0
- (optional=templinst|arch=hurd-i386 i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKSt4pairISt6vectorIN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS8_EENS6_14VirtualProgram12ProgramEntryEEPSD_EET0_T_SI_SH_@Base 2.9.0
  (optional=templinst|arch=hurd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN3osg7ref_ptrIN8osgEarth11ColorFilterEEES7_EET0_T_S9_S8_@Base 2.9.0
  (optional=templinst|arch=hurd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN8osgEarth10DataExtentES4_EET0_T_S6_S5_@Base 2.9.0
  (optional=templinst|arch=hurd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN8osgEarth10vector_mapIjNS2_14VirtualProgram11ShaderEntryEE5ENTRYES8_EET0_T_SA_S9_@Base 2.9.0
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN3osg7ref_ptrINS3_6ShaderEEEES7_EET0_T_SA_S9_@Base 2.8~rc1
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt27__uninitialized_default_n_1ILb0EE18__uninit_default_nIPN8osgEarth10vector_mapIjNS2_14VirtualProgram11ShaderEntryEE5ENTRYEjEET_S9_T0_@Base 2.8~rc1
- (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt27__uninitialized_default_n_1ILb0EE18__uninit_default_nIPN8osgEarth10vector_mapIjNS2_14VirtualProgram11ShaderEntryEE5ENTRYEmEET_S9_T0_@Base 2.8~rc1
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc sh4)_ZNSt27__uninitialized_default_n_1ILb0EE18__uninit_default_nIPN8osgEarth14VirtualProgram9ApplyVarsEjEET_S6_T0_@Base 2.8~rc1
- (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt27__uninitialized_default_n_1ILb0EE18__uninit_default_nIPN8osgEarth14VirtualProgram9ApplyVarsEmEET_S6_T0_@Base 2.8~rc1
- (optional=templinst|arch=!amd64)_ZNSt3mapIN8osgEarth16SpatialReference3KeyEN3osg7ref_ptrIS1_EESt4lessIS2_ESaISt4pairIKS2_S5_EEED1Ev@Base 2.6.0
- (optional=templinst|arch=!amd64)_ZNSt3mapIN8osgEarth16SpatialReference3KeyEN3osg7ref_ptrIS1_EESt4lessIS2_ESaISt4pairIKS2_S5_EEED2Ev@Base 2.6.0
+ (optional=templinst)_ZNSt27__uninitialized_default_n_1ILb0EE18__uninit_default_nIPN8osgEarth10vector_mapIjNS2_14VirtualProgram11ShaderEntryEE5ENTRYEmEET_S9_T0_@Base 2.10.1
+ (optional=templinst)_ZNSt27__uninitialized_default_n_1ILb0EE18__uninit_default_nIPN8osgEarth14VirtualProgram9ApplyVarsEmEET_S6_T0_@Base 2.10.1
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrIN8osgEarth13VerticalDatumEEESt4lessIS5_ESaISt4pairIKS5_SA_EEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrIN8osgEarth13VerticalDatumEEESt4lessIS5_ESaISt4pairIKS5_SA_EEED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St4lessIS5_ESaISt4pairIKS5_S5_EEED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St4lessIS5_ESaISt4pairIKS5_S5_EEED2Ev@Base 2.9.0
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St4lessIS5_ESaISt4pairIKS5_S5_EEEixERS9_@Base 2.7.0
- (optional=templinst|arch=!alpha !hurd-i386 !i386 !mips !mipsel !powerpc !ppc64 !s390x)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbSt4lessIS5_ESaISt4pairIKS5_bEEEixERS9_@Base 2.9.0
- (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEdSt4lessIS5_ESaISt4pairIKS5_dEEED1Ev@Base 2.7.0
- (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEdSt4lessIS5_ESaISt4pairIKS5_dEEED2Ev@Base 2.7.0
- (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjSt4lessIS5_ESaISt4pairIKS5_jEEED1Ev@Base 2.7.0
- (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjSt4lessIS5_ESaISt4pairIKS5_jEEED2Ev@Base 2.7.0
- (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEySt4lessIS5_ESaISt4pairIKS5_yEEED1Ev@Base 2.7.0
- (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEySt4lessIS5_ESaISt4pairIKS5_yEEED2Ev@Base 2.7.0
  (optional=templinst|arch=ia64)_ZNSt3mapISt6vectorIN3osg7ref_ptrINS1_6ShaderEEESaIS4_EENS2_INS1_7ProgramEEESt4lessIS6_ESaISt4pairIKS6_S8_EEED1Ev@Base 2.4.0
  (optional=templinst|arch=ia64)_ZNSt3mapISt6vectorIN3osg7ref_ptrINS1_6ShaderEEESaIS4_EENS2_INS1_7ProgramEEESt4lessIS6_ESaISt4pairIKS6_S8_EEED2Ev@Base 2.4.0
+ (optional=templinst)_ZNSt3mapISt6vectorIPN8osgEarth10PolyShaderESaIS3_EEN3osg7ref_ptrINS1_11ProgramRepo5EntryEEESt4lessIS5_ESaISt4pairIKS5_SA_EEEixERSE_@Base 2.10.0
+ (optional=templinst|arch=amd64 arm64 armel armhf m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 x32)_ZNSt3mapIjSt4pairIN3osg7ref_ptrIKNS1_7UniformEEEjESt4lessIjESaIS0_IKjS6_EEEixEOj@Base 2.9.0
  (optional=templinst)_ZNSt4pairIN3osg7ref_ptrIKNS0_6ObjectEEEN8osgEarth6ConfigEED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt4pairIN3osg7ref_ptrIKNS0_6ObjectEEEN8osgEarth6ConfigEED2Ev@Base 2.4.0
- (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS6_10ReferencedEEEED1Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS6_10ReferencedEEEED2Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_ED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_ED2Ev@Base 2.7.0
- (optional=templinst)_ZNSt4pairISt6vectorIN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS5_EENS3_14VirtualProgram12ProgramEntryEED1Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt4pairISt6vectorIN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS5_EENS3_14VirtualProgram12ProgramEntryEED2Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt5dequeIN8osgEarth14TileRasterizer3JobESaIS2_EE12emplace_backIJS2_EEEvDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt5dequeIN8osgEarth14TileRasterizer3JobESaIS2_EE16_M_push_back_auxIJRKS2_EEEvDpOT_@Base 2.9.0
  (optional=templinst|subst)_ZNSt5dequeIN8osgEarth14TileRasterizer3JobESaIS2_EE17_M_reallocate_mapE{size_t}b@Base 2.9.0
  (optional=templinst)_ZNSt5dequeIN8osgEarth14TileRasterizer3JobESaIS2_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt5dequeIN8osgEarth14TileRasterizer3JobESaIS2_EED2Ev@Base 2.9.0
- (optional=templinst|arch=!amd64 !arm64 !hppa !sh4)_ZNSt5dequeIN8osgEarth4Json6Reader9ErrorInfoESaIS3_EE16_M_push_back_auxIJRKS3_EEEvDpOT_@Base 2.9.0
- (optional=templinst|arch=!alpha !amd64 !arm64 !armel !armhf !hurd-i386 !i386 !ia64 !kfreebsd-amd64 !m68k !mips !mips64el !mipsel !powerpc !powerpcspe !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt5dequeIN8osgEarth4Json6Reader9ErrorInfoESaIS3_EE17_M_reallocate_mapEjb@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 kfreebsd-amd64)_ZNSt5dequeIN8osgEarth4Json6Reader9ErrorInfoESaIS3_EE17_M_reallocate_mapEmb@Base 2.8.0
- (optional=templinst)_ZNSt5dequeIN8osgEarth4Json6Reader9ErrorInfoESaIS3_EE19_M_destroy_data_auxESt15_Deque_iteratorIS3_RS3_PS3_ES9_@Base 2.7.0
+ (optional=templinst|arch=!hppa !sh4 !x32)_ZNSt5dequeIN8osgEarth4Json6Reader9ErrorInfoESaIS3_EE16_M_push_back_auxIJRKS3_EEEvDpOT_@Base 2.9.0
+ (optional=templinst|arch=!alpha !amd64 !arm64 !hurd-i386 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt5dequeIN8osgEarth4Json6Reader9ErrorInfoESaIS3_EE17_M_reallocate_mapEjb@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt5dequeIN8osgEarth4Json6Reader9ErrorInfoESaIS3_EE17_M_reallocate_mapEmb@Base 2.8.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt5dequeIN8osgEarth4Json6Reader9ErrorInfoESaIS3_EE23_M_new_elements_at_backEj@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt5dequeIN8osgEarth4Json6Reader9ErrorInfoESaIS3_EE23_M_new_elements_at_backEm@Base 2.4.0
  (optional=templinst)_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE13emplace_frontIJS5_EEEvDpOT_@Base 2.8~rc1
@@ -4760,39 +5158,44 @@
  (optional=templinst|subst)_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_reallocate_mapE{size_t}b@Base 2.7.0
  (optional=templinst)_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt5dequeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED2Ev@Base 2.7.0
- (optional=templinst)_ZNSt5dequeIPN8osgEarth4Json5ValueESaIS3_EE12emplace_backIJS3_EEEvDpOT_@Base 2.8~rc1
+ (optional=templinst)_ZNSt5dequeIPN8osgEarth4Json5ValueESaIS3_EE16_M_push_back_auxIJS3_EEEvDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt5dequeISt4pairIPN3osg4NodeEPNS1_11LineStippleEESaIS6_EE12emplace_backIJS6_EEEvDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt5dequeISt4pairIPN3osg4NodeEPNS1_5PointEESaIS6_EE12emplace_backIJS6_EEEvDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt5dequeISt4pairIPN3osg4NodeEPNS1_9LineWidthEESaIS6_EE12emplace_backIJS6_EEEvDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN3osg12observer_ptrIN8osgEarth13DirtyNotifier12DirtyCounterEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg12observer_ptrIN8osgEarth13DirtyNotifier12DirtyCounterEEESaIS5_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS5_S7_EE@Base 2.6.0
  (optional=templinst)_ZNSt6vectorIN3osg5PlaneESaIS1_EE12emplace_backIJS1_EEEvDpOT_@Base 2.8~rc1
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIN3osg5PlaneESaIS1_EE17_M_default_appendEj@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt6vectorIN3osg5PlaneESaIS1_EE17_M_default_appendEj@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5PlaneESaIS1_EE17_M_default_appendEm@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN3osg5PlaneESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN3osg5PlaneESaIS1_EE9push_backERKS1_@Base 2.6.0
+ (optional=templinst)_ZNSt6vectorIN3osg5PlaneESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.10.1
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64 x32)_ZNSt6vectorIN3osg5PlaneESaIS1_EE9push_backERKS1_@Base 2.6.0
  (optional=templinst)_ZNSt6vectorIN3osg5PlaneESaIS1_EEaSERKS3_@Base 2.4.0
+ (optional=templinst)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=armel armhf hurd-i386 i386 m68k powerpc)_ZNSt6vectorIN3osg5Vec3dESaIS1_EEaSERKS3_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EEaSERKS3_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE12emplace_backIJS1_EEEvDpOT_@Base 2.8~rc1
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!amd64 !arm64 !hurd-i386)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|subst|arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveE{size_t}@Base 2.4.0
- (optional=templinst|arch=alpha armel armhf hurd-i386 i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390x sh4 sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE9push_backERKS1_@Base 2.8~rc1
+ (optional=templinst|arch=!arm64 !hurd-i386 !mips64el !ppc64 !ppc64el !s390x !sparc64 !x32)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveE{size_t}@Base 2.4.0
+ (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE9push_backERKS1_@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EEaSERKS3_@Base 2.4.0
+ (optional=templinst|arch=!amd64 !arm64|subst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_assignE{size_t}RKS1_@Base 2.10.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE7reserveEj@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE7reserveEm@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7MatrixdESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!hurd-i386)_ZNSt6vectorIN3osg7MatrixdESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7MatrixfESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|subst)_ZNSt6vectorIN3osg7MatrixfESaIS1_EE7reserveE{size_t}@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN7osgUtil10RenderLeafEEESaIS4_EE12emplace_backIJS4_EEEvDpOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN7osgUtil10RenderLeafEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10ImageLayerEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10ModelLayerEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10PatchLayerEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS4_EE5clearEv@Base 2.8~rc1
- (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS4_EE7reserveEj@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS4_EED1Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS4_EED2Ev@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe x32)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS4_EE7reserveEj@Base 2.8~rc1
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS4_EE7reserveEm@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth11ColorFilterEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth11ColorFilterEEESaIS4_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth11ColorFilterEEESaIS4_EED2Ev@Base 2.4.0
@@ -4806,8 +5209,8 @@
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth13LayerCallbackEEESaIS4_EED2Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth13TerrainEffectEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth14ElevationLayerEEESaIS4_EE17_M_realloc_insertIJRKS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=hurd-i386 i386)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth14ElevationLayerEEESaIS4_EED1Ev@Base 2.9.0
- (optional=templinst|arch=hurd-i386 i386)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth14ElevationLayerEEESaIS4_EED2Ev@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth14ElevationLayerEEESaIS4_EED1Ev@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth14ElevationLayerEEESaIS4_EED2Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth14ElevationLayerEEESaIS4_EEaSERKS6_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth14LandCoverClassEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth14LandCoverClassEEESaIS4_EED1Ev@Base 2.9.0
@@ -4817,6 +5220,7 @@
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth15ShaderGenerator14AcceptCallbackEEESaIS5_EED2Ev@Base 2.5.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth16OverlayTechniqueEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth17TerrainEngineNode23CreateTileModelCallbackEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth17TerrainEngineNode29ModifyTileBoundingBoxCallbackEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth18SceneGraphCallbackEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth21LandCoverValueMappingEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth21LandCoverValueMappingEEESaIS4_EED1Ev@Base 2.9.0
@@ -4825,12 +5229,11 @@
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth26TerrainTileColorLayerModelEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth26TerrainTileImageLayerModelEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5LayerEEESaIS4_EE14_M_insert_rvalEN9__gnu_cxx17__normal_iteratorIPKS4_S6_EEOS4_@Base 2.9.0
- (optional=templinst|arch=i386)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5LayerEEESaIS4_EE17_M_realloc_insertIJRKS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5LayerEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5LayerEEESaIS4_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 armel armhf i386 m68k mips64el ppc64el sparc64 x32)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5LayerEEESaIS4_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS4_S6_EE@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5LayerEEESaIS4_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5LayerEEESaIS4_EED2Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5LayerEEESaIS4_EEaSERKS6_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth7XmlNodeEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth7XmlNodeEEESaIS4_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth7XmlNodeEEESaIS4_EED2Ev@Base 2.4.0
@@ -4840,52 +5243,64 @@
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_10RefMatrixdEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg7ref_ptrINS0_14GLBufferObjectEEESaIS3_EE17_M_default_appendE{size_t}@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_15OperationThreadEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_5ArrayEEESaIS3_EED1Ev@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_5ArrayEEESaIS3_EED2Ev@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_5GroupEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_5ImageEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_6ObjectEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt6vectorIN3osg7ref_ptrINS0_6ObjectEEESaIS3_EE7reserveEj@Base 2.8~rc1
- (optional=templinst|arch=!hurd-i386 !i386)_ZNSt6vectorIN3osg7ref_ptrINS0_6ShaderEEESaIS3_EE12emplace_backIJS3_EEEvDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_6ShaderEEESaIS3_EE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPS3_S5_EEEEvSA_T_SB_St20forward_iterator_tag@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe x32)_ZNSt6vectorIN3osg7ref_ptrINS0_6ObjectEEESaIS3_EE7reserveEj@Base 2.8~rc1
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg7ref_ptrINS0_6ObjectEEESaIS3_EE7reserveEm@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_6ShaderEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 sparc)_ZNSt6vectorIN3osg7ref_ptrINS0_6ShaderEEESaIS3_EE7reserveEj@Base 2.4.0
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 sparc x32)_ZNSt6vectorIN3osg7ref_ptrINS0_6ShaderEEESaIS3_EE7reserveEj@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg7ref_ptrINS0_6ShaderEEESaIS3_EE7reserveEm@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_6ShaderEEESaIS3_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_6ShaderEEESaIS3_EED2Ev@Base 2.4.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_7ProgramEEESaIS3_EED1Ev@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_7ProgramEEESaIS3_EED2Ev@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_8StateSetEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth10DataExtentESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth10DataExtentESaIS1_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth10DataExtentESaIS1_EED2Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth10DataExtentESaIS1_EEaSERKS3_@Base 2.8~rc1
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIN8osgEarth10vector_mapIjNS0_14VirtualProgram11ShaderEntryEE5ENTRYESaIS5_EE17_M_default_appendEj@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt6vectorIN8osgEarth10vector_mapIjNS0_14VirtualProgram11ShaderEntryEE5ENTRYESaIS5_EE17_M_default_appendEj@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN8osgEarth10vector_mapIjNS0_14VirtualProgram11ShaderEntryEE5ENTRYESaIS5_EE17_M_default_appendEm@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth10vector_mapIjNS0_14VirtualProgram11ShaderEntryEE5ENTRYESaIS5_EED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth10vector_mapIjNS0_14VirtualProgram11ShaderEntryEE5ENTRYESaIS5_EED2Ev@Base 2.7.0
  (optional=templinst|arch=!hurd-i386)_ZNSt6vectorIN8osgEarth10vector_mapIjNS0_14VirtualProgram11ShaderEntryEE5ENTRYESaIS5_EEaSERKS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 s390x x32)_ZNSt6vectorIN8osgEarth11GLSLChunker5ChunkESaIS2_EE12emplace_backIJS2_EEEvDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth11GLSLChunker5ChunkESaIS2_EE13_M_insert_auxIS2_EEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth11GLSLChunker5ChunkESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth11GLSLChunker5ChunkESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=armel armhf)_ZNSt6vectorIN8osgEarth11GLSLChunker5ChunkESaIS2_EED1Ev@Base 2.8.0
- (optional=templinst|arch=armel armhf)_ZNSt6vectorIN8osgEarth11GLSLChunker5ChunkESaIS2_EED2Ev@Base 2.8.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth11GLSLChunker5ChunkESaIS2_EED1Ev@Base 2.8.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth11GLSLChunker5ChunkESaIS2_EED2Ev@Base 2.8.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EEaSERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EEaSERKS4_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN8osgEarth14DrapingCullSet5EntryESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth14DrapingCullSet5EntryESaIS2_EED1Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth14DrapingCullSet5EntryESaIS2_EED2Ev@Base 2.8~rc1
- (optional=templinst|subst)_ZNSt6vectorIN8osgEarth14GeoHeightFieldESaIS1_EE17_M_default_appendE{size_t}@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth14GeoHeightFieldESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth14GeoHeightFieldESaIS1_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth14GeoHeightFieldESaIS1_EED2Ev@Base 2.4.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIN8osgEarth14VirtualProgram15AttrStackMemory4ItemESaIS3_EE17_M_default_appendEj@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt6vectorIN8osgEarth14VirtualProgram15AttrStackMemory4ItemESaIS3_EE17_M_default_appendEj@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN8osgEarth14VirtualProgram15AttrStackMemory4ItemESaIS3_EE17_M_default_appendEm@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth14VirtualProgram15AttrStackMemory4ItemESaIS3_EED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth14VirtualProgram15AttrStackMemory4ItemESaIS3_EED2Ev@Base 2.7.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIN8osgEarth14VirtualProgram9ApplyVarsESaIS2_EE17_M_default_appendEj@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt6vectorIN8osgEarth14VirtualProgram9ApplyVarsESaIS2_EE17_M_default_appendEj@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN8osgEarth14VirtualProgram9ApplyVarsESaIS2_EE17_M_default_appendEm@Base 2.8~rc1
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIN8osgEarth14VirtualProgram9ApplyVarsESaIS2_EE6resizeEj@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt6vectorIN8osgEarth14VirtualProgram9ApplyVarsESaIS2_EE6resizeEj@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN8osgEarth14VirtualProgram9ApplyVarsESaIS2_EE6resizeEm@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth14VirtualProgram9ApplyVarsESaIS2_EED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth14VirtualProgram9ApplyVarsESaIS2_EED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth15ClampingCullSet5EntryESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth15ClampingCullSet5EntryESaIS2_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth15ClampingCullSet5EntryESaIS2_EED2Ev@Base 2.9.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIN8osgEarth16OverlayDecorator13TechRTTParamsESaIS2_EE17_M_default_appendEj@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt6vectorIN8osgEarth16OverlayDecorator13TechRTTParamsESaIS2_EE17_M_default_appendEj@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN8osgEarth16OverlayDecorator13TechRTTParamsESaIS2_EE17_M_default_appendEm@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth16OverlayDecorator13TechRTTParamsESaIS2_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth16OverlayDecorator13TechRTTParamsESaIS2_EED2Ev@Base 2.4.0
@@ -4893,23 +5308,27 @@
  (optional=templinst)_ZNSt6vectorIN8osgEarth26CompositeTileSourceOptions9ComponentESaIS2_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS2_S4_EE@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth26CompositeTileSourceOptions9ComponentESaIS2_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth26CompositeTileSourceOptions9ComponentESaIS2_EED2Ev@Base 2.4.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth27TextureImageUnitReservationESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN8osgEarth29LandCoverCoverageLayerOptionsESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth29LandCoverCoverageLayerOptionsESaIS1_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth29LandCoverCoverageLayerOptionsESaIS1_EED2Ev@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386)_ZNSt6vectorIN8osgEarth4Json12PathArgumentESaIS2_EE12emplace_backIJS2_EEEvDpOT_@Base 2.8~rc1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth3URIESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth3URIESaIS1_EEaSERKS3_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN8osgEarth4Json12PathArgumentESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!amd64 !arm64)_ZNSt6vectorIN8osgEarth4Json12PathArgumentESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
+ (optional=templinst|arch=!arm64 !s390x !x32)_ZNSt6vectorIN8osgEarth4Json12PathArgumentESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth6ConfigESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!hurd-i386)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EED2Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EEaSERKS3_@Base 2.6.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth9AsyncNodeESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN8osgEarth9GeoExtentESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth9GeoExtentESaIS1_EED1Ev@Base 2.5.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth9GeoExtentESaIS1_EED2Ev@Base 2.5.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth9TileImageESaIS1_EE12emplace_backIJS1_EEEvDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth9TileImageESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst|arch=s390x)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE7reserveE{size_t}@Base 2.7.0
@@ -4917,53 +5336,37 @@
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEaSERKS7_@Base 2.8~rc1
+ (optional=templinst)_ZNSt6vectorIPKN3osg6ShaderESaIS3_EE17_M_realloc_insertIJRKS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIPKN8osgEarth4Json12PathArgumentESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPKN8osgEarth5UnitsESaIS3_EE17_M_realloc_insertIJRKS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!hurd-i386)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=m68k)_ZNSt6vectorIPN3osg4NodeESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EERS7_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EEaSERKS4_@Base 2.4.0
+ (optional=templinst)_ZNSt6vectorIPN6mapbox6detail6EarcutIjE4NodeESaIS5_EE17_M_realloc_insertIJRS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIPN7osgUtil10RenderLeafESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIPN7osgUtil10RenderLeafESaIS2_EE9push_backERKS2_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPN7osgUtil10StateGraphESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=alpha mips64el ppc64 s390x)_ZNSt6vectorIPN7osgUtil10StateGraphESaIS2_EE7reserveEm@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIPN7osgUtil10StateGraphESaIS2_EE7reserveE{size_t}@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPN7osgUtil9RenderBinESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIPN8osgEarth10ModelLayerESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIPN8osgEarth10PolyShaderESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIS_IN3osg5Vec2fESaIS1_EESaIS3_EE17_M_realloc_insertIJRKS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.10.1
  (optional=templinst|subst)_ZNSt6vectorIS_IiSaIiEESaIS1_EE17_M_default_appendE{size_t}@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_10ReferencedEEEESaISB_EE17_M_realloc_insertIJSB_EEEvN9__gnu_cxx17__normal_iteratorIPSB_SD_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_10ReferencedEEEESaISB_EED1Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_10ReferencedEEEESaISB_EED2Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEdESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorISt4pairIPKN3osg14StateAttributeEjESaIS5_EEaSERKS7_@Base 2.7.0
  (optional=templinst)_ZNSt6vectorISt4pairIPKN3osg4NodeENS1_15BoundingBoxImplINS1_5Vec3fEEEESaIS8_EE17_M_realloc_insertIJS8_EEEvN9__gnu_cxx17__normal_iteratorIPS8_SA_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPKN3osg6CameraEN8osgEarth14DrapingCullSetEESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPKN3osg6CameraEN8osgEarth14DrapingCullSetEESaIS7_EED1Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorISt4pairIPKN3osg6CameraEN8osgEarth14DrapingCullSetEESaIS7_EED2Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorISt4pairIPKN3osg6CameraEN8osgEarth15ClampingCullSetEESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPKN3osg6CameraEN8osgEarth15ClampingCullSetEESaIS7_EED1Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPKN3osg6CameraEN8osgEarth15ClampingCullSetEESaIS7_EED2Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPvN8osgEarth22TransientUserDataStore8DataPairEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPvN8osgEarth22TransientUserDataStore8DataPairEESaIS5_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS5_S7_EE@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPvN8osgEarth22TransientUserDataStore8DataPairEESaIS5_EED1Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorISt4pairIPvN8osgEarth22TransientUserDataStore8DataPairEESaIS5_EED2Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorISt4pairIS_IN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS5_EENS3_14VirtualProgram12ProgramEntryEESaISA_EE17_M_realloc_insertIJSA_EEEvN9__gnu_cxx17__normal_iteratorIPSA_SC_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!alpha !hurd-i386 !i386 !mips !mipsel !powerpc !ppc64 !s390x)_ZNSt6vectorISt4pairIS_IN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS5_EENS3_14VirtualProgram12ProgramEntryEESaISA_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPSA_SC_EE@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIS_IN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS5_EENS3_14VirtualProgram12ProgramEntryEESaISA_EED1Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorISt4pairIS_IN3osg7ref_ptrIN8osgEarth10PolyShaderEEESaIS5_EENS3_14VirtualProgram12ProgramEntryEESaISA_EED2Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorISt4pairIffESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIiN3osg7ref_ptrINS1_4NodeEEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIiN3osg7ref_ptrINS1_4NodeEEEESaIS5_EED1Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIiN3osg7ref_ptrINS1_4NodeEEEESaIS5_EED2Ev@Base 2.9.0
- (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZNSt6vectorIbSaIbEE14_M_fill_assignEjb@Base 2.9.0
- (optional=templinst|subst)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iterator{size_t}b@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIdSaIdEE12emplace_backIJdEEEvDpOT_@Base 2.9.0
- (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !powerpcspe !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIfSaIfEE14_M_fill_assignEjRKf@Base 2.7.0
+ (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertIJdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIdSaIdEEaSERKS1_@Base 2.9.0
+ (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIfSaIfEE14_M_fill_assignEjRKf@Base 2.7.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIfSaIfEE14_M_fill_assignEmRKf@Base 2.7.0
+ (optional=templinst|subst)_ZNSt6vectorIfSaIfEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EE{size_t}RKf@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertIJRKfEEEvN9__gnu_cxx17__normal_iteratorIPfS1_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIjSaIjEE12emplace_backIJjEEEvDpOT_@Base 2.9.0
- (optional=templinst|arch=!alpha !amd64 !arm64 !armel !armhf !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIjSaIjEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPjS1_EEjRKj@Base 2.4.0
+ (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIjSaIjEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPjS1_EEjRKj@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIjSaIjEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPjS1_EEmRKj@Base 2.4.0
+ (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_default_appendEm@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIjSaIjEE7reserveE{size_t}@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIjSaIjEEaSERKS1_@Base 2.4.0
+ (optional=templinst|subst)_ZNSt6vectorIsSaIsEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPsS1_EE{size_t}RKs@Base 2.9.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN3osg12observer_ptrINS1_8StateSetEEESaIS4_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN3osg7ref_ptrIN8osgEarth11MapCallbackEEESaIS5_EE8_M_clearEv@Base 2.9.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN8osgEarth23TerrainTileModelFactory10HFCacheKeyESaIS3_EE8_M_clearEv@Base 2.8~rc1
@@ -4971,167 +5374,206 @@
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN8osgEarth7TileKeyESaIS2_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN9osgShadow16ConvexPolyhedron4FaceESaIS3_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseINS_12basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE8_M_clearEv@Base 2.7.0
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairIPKN3osg6CameraEN8osgEarth14DrapingCullSetEESaIS8_EE8_M_clearEv@Base 2.10.0
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairIPKN3osg6CameraEN8osgEarth15ClampingCullSetEESaIS8_EE8_M_clearEv@Base 2.10.0
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairIPKN3osg6CameraEN8osgEarth23CascadeDrapingDecorator11CameraLocalEESaIS9_EE8_M_clearEv@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairIPN3osg6CameraEN8osgEarth16HorizonClipPlane13PerCameraDataEESaIS8_EE8_M_clearEv@Base 2.10.0
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairIPvN8osgEarth22TransientUserDataStore8DataPairEESaIS6_EE8_M_clearEv@Base 2.10.0
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairIiN3osg7ref_ptrINS2_4NodeEEEESaIS6_EE8_M_clearEv@Base 2.10.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE18_M_assign_dispatchISt20_List_const_iteratorIS2_EEEvT_S8_St12__false_type@Base 2.8~rc1
- (optional=templinst|arch=hppa hurd-i386)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.7.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.7.0
- (optional=templinst|arch=alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sh4 sparc64)_ZNSt7__cxx114listIN9osgShadow16ConvexPolyhedron4FaceESaIS3_EE18_M_assign_dispatchISt20_List_const_iteratorIS3_EEEvT_S9_St12__false_type@Base 2.8~rc1
- (optional=templinst)_ZNSt7__cxx114listIN9osgShadow16ConvexPolyhedron4FaceESaIS3_EE6insertISt20_List_const_iteratorIS3_EvEESt14_List_iteratorIS3_ES8_T_SB_@Base 2.8~rc1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9.0
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEaSERKS4_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN3osg6Shader4TypeES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIN3osg7ref_ptrIN8osgEarth13ElevationPool4TileEEES5_St9_IdentityIS5_ENS3_20TileSortHiResToLoResESaIS5_EE16_M_insert_uniqueIS5_EESt4pairISt17_Rb_tree_iteratorIS5_EbEOT_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 x32)_ZNSt8_Rb_treeIN3osg7ref_ptrIN8osgEarth13ElevationPool4TileEEES5_St9_IdentityIS5_ENS3_20TileSortHiResToLoResESaIS5_EE24_M_get_insert_unique_posERKS5_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN3osg7ref_ptrIN8osgEarth13ElevationPool4TileEEES5_St9_IdentityIS5_ENS3_20TileSortHiResToLoResESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN3osg7ref_ptrINS0_14StateAttributeEEES3_St9_IdentityIS3_EN8osgEarth13StateSetCache22CompareStateAttributesESaIS3_EE8_M_eraseEPSt13_Rb_tree_nodeIS3_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIN3osg7ref_ptrINS0_8StateSetEEES3_St9_IdentityIS3_EN8osgEarth13StateSetCache16CompareStateSetsESaIS3_EE8_M_eraseEPSt13_Rb_tree_nodeIS3_E@Base 2.4.0
- (optional=templinst)_ZNSt8_Rb_treeIN7osgUtil22LineSegmentIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE7_M_copyINS8_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS2_EPKSC_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
- (optional=templinst)_ZNSt8_Rb_treeIN7osgUtil22LineSegmentIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.4.0
- (optional=templinst)_ZNSt8_Rb_treeIN7osgUtil22LineSegmentIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EEaSERKS8_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth10ShaderComp16FunctionLocationESt4pairIKS2_St8multimapIfNS1_8FunctionESt4lessIfESaIS3_IKfS6_EEEESt10_Select1stISD_ES7_IS2_ESaISD_EE24_M_get_insert_unique_posERS4_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth10ShaderComp16FunctionLocationESt4pairIKS2_St8multimapIfNS1_8FunctionESt4lessIfESaIS3_IKfS6_EEEESt10_Select1stISD_ES7_IS2_ESaISD_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISD_ERS4_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth10ShaderComp16FunctionLocationESt4pairIKS2_St8multimapIfNS1_8FunctionESt4lessIfESaIS3_IKfS6_EEEESt10_Select1stISD_ES7_IS2_ESaISD_EE7_M_copyINSI_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISD_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth10ShaderComp16FunctionLocationESt4pairIKS2_St8multimapIfNS1_8FunctionESt4lessIfESaIS3_IKfS6_EEEESt10_Select1stISD_ES7_IS2_ESaISD_EE7_M_copyINSI_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeISD_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth10ShaderComp16FunctionLocationESt4pairIKS2_St8multimapIfNS1_8FunctionESt4lessIfESaIS3_IKfS6_EEEESt10_Select1stISD_ES7_IS2_ESaISD_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E@Base 2.6.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth16SpatialReference3KeyESt4pairIKS2_N3osg7ref_ptrIS1_EEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE24_M_get_insert_unique_posERS4_@Base 2.6.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIN8osgEarth16SpatialReference3KeyESt4pairIKS2_N3osg7ref_ptrIS1_EEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS4_@Base 2.8~rc1
+ (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth16SpatialReference3KeyESt4pairIKS2_N3osg7ref_ptrIS1_EEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS4_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth16SpatialReference3KeyESt4pairIKS2_N3osg7ref_ptrIS1_EEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.6.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth20PrimitiveIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE15_M_insert_equalIRKS2_EESt17_Rb_tree_iteratorIS2_EOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth20PrimitiveIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE7_M_copyINS8_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS2_EPKSC_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth20PrimitiveIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.5.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth20PrimitiveIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EEaSERKS8_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth23TerrainTileModelFactory10HFCacheKeyESt4pairIKS2_S3_INS1_12HFCacheValueESt14_List_iteratorIS2_EEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE11equal_rangeERS4_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth23TerrainTileModelFactory10HFCacheKeyESt4pairIKS2_S3_INS1_12HFCacheValueESt14_List_iteratorIS2_EEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS4_EESK_IJEEEEESt17_Rb_tree_iteratorIS9_ESt23_Rb_tree_const_iteratorIS9_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth23TerrainTileModelFactory10HFCacheKeyESt4pairIKS2_S3_INS1_12HFCacheValueESt14_List_iteratorIS2_EEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE24_M_get_insert_unique_posERS4_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIN8osgEarth23TerrainTileModelFactory10HFCacheKeyESt4pairIKS2_S3_INS1_12HFCacheValueESt14_List_iteratorIS2_EEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS4_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth23TerrainTileModelFactory10HFCacheKeyESt4pairIKS2_S3_INS1_12HFCacheValueESt14_List_iteratorIS2_EEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS4_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth23TerrainTileModelFactory10HFCacheKeyESt4pairIKS2_S3_INS1_12HFCacheValueESt14_List_iteratorIS2_EEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE5eraseERS4_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth23TerrainTileModelFactory10HFCacheKeyESt4pairIKS2_S3_INS1_12HFCacheValueESt14_List_iteratorIS2_EEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_INS0_10ReadResultESt14_List_iteratorIS1_EEESt10_Select1stIS8_ESt4lessIS1_ESaIS8_EE11equal_rangeERS3_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_INS0_10ReadResultESt14_List_iteratorIS1_EEESt10_Select1stIS8_ESt4lessIS1_ESaIS8_EE24_M_get_insert_unique_posERS3_@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_INS0_10ReadResultESt14_List_iteratorIS1_EEESt10_Select1stIS8_ESt4lessIS1_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS3_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_INS0_10ReadResultESt14_List_iteratorIS1_EEESt10_Select1stIS8_ESt4lessIS1_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS3_@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_INS0_10ReadResultESt14_List_iteratorIS1_EEESt10_Select1stIS8_ESt4lessIS1_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIN8osgEarth4Json5Value8CZStringESt4pairIKS3_S2_ESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE24_M_get_insert_unique_posERS5_@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIN8osgEarth4Json5Value8CZStringESt4pairIKS3_S2_ESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS6_ERS5_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth4Json5Value8CZStringESt4pairIKS3_S2_ESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE11equal_rangeERS5_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth4Json5Value8CZStringESt4pairIKS3_S2_ESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE22_M_emplace_hint_uniqueIJRS6_EEESt17_Rb_tree_iteratorIS6_ESt23_Rb_tree_const_iteratorIS6_EDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth4Json5Value8CZStringESt4pairIKS3_S2_ESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE24_M_get_insert_unique_posERS5_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth4Json5Value8CZStringESt4pairIKS3_S2_ESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS6_ERS5_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth4Json5Value8CZStringESt4pairIKS3_S2_ESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE7_M_copyINSC_11_Alloc_nodeEEEPSt13_Rb_tree_nodeIS6_EPKSG_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth4Json5Value8CZStringESt4pairIKS3_S2_ESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hppa sh4)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_N3osg12observer_ptrINS0_13ElevationPool4TileEEEESt10_Select1stIS9_ESt4lessIS1_ESaIS9_EE11equal_rangeERS3_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_N3osg12observer_ptrINS0_13ElevationPool4TileEEEESt10_Select1stIS9_ESt4lessIS1_ESaIS9_EE24_M_get_insert_unique_posERS3_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_N3osg12observer_ptrINS0_13ElevationPool4TileEEEESt10_Select1stIS9_ESt4lessIS1_ESaIS9_EE11equal_rangeERS3_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_N3osg12observer_ptrINS0_13ElevationPool4TileEEEESt10_Select1stIS9_ESt4lessIS1_ESaIS9_EE24_M_get_insert_unique_posERS3_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_N3osg12observer_ptrINS0_13ElevationPool4TileEEEESt10_Select1stIS9_ESt4lessIS1_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS3_@Base 2.9.0
- (optional=templinst|arch=!amd64 !arm64 !hppa !sh4)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_N3osg12observer_ptrINS0_13ElevationPool4TileEEEESt10_Select1stIS9_ESt4lessIS1_ESaIS9_EE5eraseERS3_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_N3osg12observer_ptrINS0_13ElevationPool4TileEEEESt10_Select1stIS9_ESt4lessIS1_ESaIS9_EE5eraseERS3_@Base 2.10.1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_N3osg12observer_ptrINS0_13ElevationPool4TileEEEESt10_Select1stIS9_ESt4lessIS1_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 hppa sh4)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_S2_IbSt14_List_iteratorIS1_EEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE11equal_rangeERS3_@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_NS0_14LandCoverLayer18MetaImageComponentEESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS3_EESH_IJEEEEESt17_Rb_tree_iteratorIS6_ESt23_Rb_tree_const_iteratorIS6_EDpOT_@Base 2.10.1
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_NS0_14LandCoverLayer18MetaImageComponentEESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE24_M_get_insert_unique_posERS3_@Base 2.10.1
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_NS0_14LandCoverLayer18MetaImageComponentEESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS6_ERS3_@Base 2.10.1
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_NS0_14LandCoverLayer18MetaImageComponentEESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E@Base 2.10.1
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_S2_IbSt14_List_iteratorIS1_EEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE11equal_rangeERS3_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_S2_IbSt14_List_iteratorIS1_EEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE24_M_get_insert_unique_posERS3_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_S2_IbSt14_List_iteratorIS1_EEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS7_ERS3_@Base 2.8~rc1
- (optional=templinst|arch=!amd64 !arm64 !hppa !sh4)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_S2_IbSt14_List_iteratorIS1_EEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE5eraseERS3_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_S2_IbSt14_List_iteratorIS1_EEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE4findERS3_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_S2_IbSt14_List_iteratorIS1_EEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE5eraseERS3_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyESt4pairIKS1_S2_IbSt14_List_iteratorIS1_EEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE8_M_eraseEPSt13_Rb_tree_nodeIS7_E@Base 2.8~rc1
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE11equal_rangeERKS5_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE16_M_insert_uniqueIRKS5_EESt4pairISt17_Rb_tree_iteratorIS5_EbEOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE16_M_insert_uniqueIS5_EESt4pairISt17_Rb_tree_iteratorIS5_EbEOT_@Base 2.8~rc1
- (optional=templinst|arch=!armel !armhf !hurd-i386 !i386 !mips !mipsel !powerpc)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE24_M_get_insert_unique_posERKS5_@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE24_M_get_insert_unique_posERKS5_@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE4findERKS5_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth12TerrainLayer16CacheBinMetadataEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESP_IJEEEEESt17_Rb_tree_iteratorISE_ESt23_Rb_tree_const_iteratorISE_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth12TerrainLayer16CacheBinMetadataEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE24_M_get_insert_unique_posERS7_@Base 2.8~rc1
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth12TerrainLayer16CacheBinMetadataEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.8~rc1
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth12TerrainLayer16CacheBinMetadataEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.8~rc1
  (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64el sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth12TerrainLayer16CacheBinMetadataEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE4findERS7_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth12TerrainLayer16CacheBinMetadataEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE8_M_eraseEPSt13_Rb_tree_nodeISE_E@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth13VerticalDatumEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESO_IJEEEEESt17_Rb_tree_iteratorISD_ESt23_Rb_tree_const_iteratorISD_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth13VerticalDatumEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth13VerticalDatumEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISD_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth13VerticalDatumEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISD_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth13VerticalDatumEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth8CacheBinEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESO_IJEEEEESt17_Rb_tree_iteratorISD_ESt23_Rb_tree_const_iteratorISD_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth8CacheBinEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth8CacheBinEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISD_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth8CacheBinEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISD_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 armel armhf m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth8CacheBinEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE4findERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth8CacheBinEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESN_IJEEEEESt17_Rb_tree_iteratorISC_ESt23_Rb_tree_const_iteratorISC_EDpOT_@Base 2.10.2
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE24_M_get_insert_unique_posERS7_@Base 2.10.2
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.10.2
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EEaSERKSI_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN8osgEarth18ColorFilterFactoryEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESM_IJEEEEESt17_Rb_tree_iteratorISB_ESt23_Rb_tree_const_iteratorISB_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN8osgEarth18ColorFilterFactoryEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN8osgEarth18ColorFilterFactoryEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISB_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN8osgEarth18ColorFilterFactoryEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISB_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN8osgEarth18ColorFilterFactoryEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESK_IJEEEEESt17_Rb_tree_iteratorIS9_ESt23_Rb_tree_const_iteratorIS9_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 armel armhf m68k x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE4findERS7_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE17_M_emplace_uniqueIJS6_IS5_S5_EEEES6_ISt17_Rb_tree_iteratorIS8_EbEDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_11_Alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EEaSERKSE_@Base 2.10.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IS6_IN3osg7ref_ptrIKNS8_6ObjectEEEN8osgEarth6ConfigEESt14_List_iteratorIS5_EEESt10_Select1stISJ_ESt4lessIS5_ESaISJ_EE11equal_rangeERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IS6_IN3osg7ref_ptrIKNS8_6ObjectEEEN8osgEarth6ConfigEESt14_List_iteratorIS5_EEESt10_Select1stISJ_ESt4lessIS5_ESaISJ_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESU_IJEEEEESt17_Rb_tree_iteratorISJ_ESt23_Rb_tree_const_iteratorISJ_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IS6_IN3osg7ref_ptrIKNS8_6ObjectEEEN8osgEarth6ConfigEESt14_List_iteratorIS5_EEESt10_Select1stISJ_ESt4lessIS5_ESaISJ_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IS6_IN3osg7ref_ptrIKNS8_6ObjectEEEN8osgEarth6ConfigEESt14_List_iteratorIS5_EEESt10_Select1stISJ_ESt4lessIS5_ESaISJ_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISJ_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IS6_IN3osg7ref_ptrIKNS8_6ObjectEEEN8osgEarth6ConfigEESt14_List_iteratorIS5_EEESt10_Select1stISJ_ESt4lessIS5_ESaISJ_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISJ_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IS6_IN3osg7ref_ptrIKNS8_6ObjectEEEN8osgEarth6ConfigEESt14_List_iteratorIS5_EEESt10_Select1stISJ_ESt4lessIS5_ESaISJ_EE4findERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IS6_IN3osg7ref_ptrIKNS8_6ObjectEEEN8osgEarth6ConfigEESt14_List_iteratorIS5_EEESt10_Select1stISJ_ESt4lessIS5_ESaISJ_EE5eraseERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IS6_IN3osg7ref_ptrIKNS8_6ObjectEEEN8osgEarth6ConfigEESt14_List_iteratorIS5_EEESt10_Select1stISJ_ESt4lessIS5_ESaISJ_EE8_M_eraseEPSt13_Rb_tree_nodeISJ_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIN8osgEarth6ConfigESaISA_EEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIN8osgEarth6ConfigESaISA_EEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISD_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIN8osgEarth6ConfigESaISA_EEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISD_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIN8osgEarth6ConfigESaISA_EEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_bESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESJ_IJEEEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_bESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_bESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_bESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_bESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_dESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_dESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE11equal_rangeERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE16_M_insert_uniqueISt23_Rb_tree_const_iteratorIS8_EEEvT_SI_@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESJ_IJEEEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_jESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_yESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_yESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_yESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeIPKN3osg4NodeES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE16_M_insert_uniqueIS3_EESt4pairISt17_Rb_tree_iteratorIS3_EbEOT_@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeIPKN3osg4NodeES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE16_M_insert_uniqueIRKS3_EESt4pairISt17_Rb_tree_iteratorIS3_EbEOT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIPKN3osg4NodeES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE8_M_eraseEPSt13_Rb_tree_nodeIS3_E@Base 2.5.0
+ (optional=templinst)_ZNSt8_Rb_treeIPKN3osg6ObjectESt4pairIKS3_jESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E@Base 2.10.1
  (optional=templinst)_ZNSt8_Rb_treeIPKN3osg8StateSetESt4pairIKS3_NS0_7ref_ptrIN7osgUtil10StateGraphEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE24_M_get_insert_unique_posERS5_@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIPKN3osg8StateSetESt4pairIKS3_NS0_7ref_ptrIN7osgUtil10StateGraphEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS5_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIPKN3osg8StateSetESt4pairIKS3_NS0_7ref_ptrIN7osgUtil10StateGraphEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS5_@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIPKN3osg8StateSetESt4pairIKS3_NS0_7ref_ptrIN7osgUtil10StateGraphEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE8_M_eraseEPSt13_Rb_tree_nodeISA_E@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIPKN8osgEarth5LayerESt4pairIKS3_St3setIiSt4lessIiESaIiEEESt10_Select1stISB_ES7_IS3_ESaISB_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISB_ERS5_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIPKN8osgEarth5LayerESt4pairIKS3_St3setIiSt4lessIiESaIiEEESt10_Select1stISB_ES7_IS3_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E@Base 2.9.0
- (optional=templinst)_ZNSt8_Rb_treeIPN3osg11NodeVisitorESt4pairIKS2_N8osgEarth7FadeLOD11PerViewDataEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE24_M_get_insert_unique_posERS4_@Base 2.7.0
+ (optional=templinst|arch=!amd64 !arm64 !m68k !mips64el !ppc64el !sparc64 !x32)_ZNSt8_Rb_treeIPN3osg11NodeVisitorESt4pairIKS2_N8osgEarth7FadeLOD11PerViewDataEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE24_M_get_insert_unique_posERS4_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIPN3osg11NodeVisitorESt4pairIKS2_N8osgEarth7FadeLOD11PerViewDataEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS4_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg11NodeVisitorESt4pairIKS2_N8osgEarth7FadeLOD11PerViewDataEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg12BufferObjectES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE16_M_insert_uniqueIS2_EESt4pairISt17_Rb_tree_iteratorIS2_EbEOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg12BufferObjectES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg4NodeES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE16_M_insert_uniqueIS2_EESt4pairISt17_Rb_tree_iteratorIS2_EbEOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg4NodeES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.4.0
- (optional=templinst)_ZNSt8_Rb_treeIPN3osg6CameraESt4pairIKS2_N8osgEarth16OverlayDecorator11PerViewDataEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE24_M_get_insert_unique_posERS4_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIPN3osg5ArrayESt4pairIKS2_N8osgEarth15GeometryClamper12GeometryDataEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS4_@Base 2.10.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIPN3osg6CameraESt4pairIKS2_N8osgEarth16OverlayDecorator11PerViewDataEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS4_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg6CameraESt4pairIKS2_N8osgEarth16OverlayDecorator11PerViewDataEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg8DrawableES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE16_M_insert_uniqueIRKS2_EESt4pairISt17_Rb_tree_iteratorIS2_EbEOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg8DrawableES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg8GeometryES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg8StateSetES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE16_M_insert_uniqueIRKS2_EESt4pairISt17_Rb_tree_iteratorIS2_EbEOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg8StateSetES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ES7_St9_IdentityIS7_EN8osgEarth8Registry12ActivityLessESaIS7_EE11equal_rangeERKS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ES7_St9_IdentityIS7_EN8osgEarth8Registry12ActivityLessESaIS7_EE16_M_insert_uniqueIS7_EES0_ISt17_Rb_tree_iteratorIS7_EbEOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ES7_St9_IdentityIS7_EN8osgEarth8Registry12ActivityLessESaIS7_EE5eraseERKS7_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ES7_St9_IdentityIS7_EN8osgEarth8Registry12ActivityLessESaIS7_EE8_M_eraseEPSt13_Rb_tree_nodeIS7_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeISt6vectorIPN8osgEarth10PolyShaderESaIS3_EESt4pairIKS5_N3osg7ref_ptrINS1_11ProgramRepo5EntryEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE24_M_get_insert_unique_posERS7_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeISt6vectorIPN8osgEarth10PolyShaderESaIS3_EESt4pairIKS5_N3osg7ref_ptrINS1_11ProgramRepo5EntryEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISD_ERS7_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeISt6vectorIPN8osgEarth10PolyShaderESaIS3_EESt4pairIKS5_N3osg7ref_ptrINS1_11ProgramRepo5EntryEEEESt10_Select1stISD_ESt4lessIS5_ESaISD_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIcSt4pairIKcbESt10_Select1stIS2_ESt4lessIcESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.4.0
+ (optional=templinst|arch=i386)_ZNSt8_Rb_treeIfSt4pairIKfN3osg7ref_ptrIN8osgEarth11TaskRequestEEEESt10_Select1stIS7_ESt4lessIfESaIS7_EE16_M_emplace_equalIJS0_IfPS5_EEEESt17_Rb_tree_iteratorIS7_EDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN3osg7ref_ptrIN8osgEarth11TaskRequestEEEESt10_Select1stIS7_ESt4lessIfESaIS7_EE8_M_eraseEPSt13_Rb_tree_nodeIS7_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN8osgEarth10ShaderComp8FunctionEESt10_Select1stIS5_ESt4lessIfESaIS5_EE15_M_insert_equalIRKS5_EESt17_Rb_tree_iteratorIS5_EOT_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN8osgEarth10ShaderComp8FunctionEESt10_Select1stIS5_ESt4lessIfESaIS5_EE16_M_emplace_equalIJS0_IfS4_EEEESt17_Rb_tree_iteratorIS5_EDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN8osgEarth10ShaderComp8FunctionEESt10_Select1stIS5_ESt4lessIfESaIS5_EE7_M_copyINSB_11_Alloc_nodeEEEPSt13_Rb_tree_nodeIS5_EPKSF_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN8osgEarth10ShaderComp8FunctionEESt10_Select1stIS5_ESt4lessIfESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E@Base 2.6.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIiSt4pairIKiS0_IN3osg7ref_ptrIN8osgEarth11TaskServiceEEEfEESt10_Select1stIS8_ESt4lessIiESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS1_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIiSt4pairIKiS0_IN3osg7ref_ptrIN8osgEarth11TaskServiceEEEfEESt10_Select1stIS8_ESt4lessIiESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS1_@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKiS0_IN3osg7ref_ptrIN8osgEarth11TaskServiceEEEfEESt10_Select1stIS8_ESt4lessIiESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.4.0
+ (optional=templinst)_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE16_M_insert_uniqueIRKiEESt4pairISt17_Rb_tree_iteratorIiEbEOT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE16_M_insert_uniqueISt23_Rb_tree_const_iteratorIiEEEvT_S9_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE16_M_insert_uniqueIiEESt4pairISt17_Rb_tree_iteratorIiEbEOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5eraseERKi@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE7_M_copyINS5_11_Alloc_nodeEEEPSt13_Rb_tree_nodeIiEPKS9_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE8_M_eraseEPSt13_Rb_tree_nodeIiE@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIjSt4pairIKjN3osg12observer_ptrINS2_10ReferencedEEEESt10_Select1stIS6_ESt4lessIjESaIS6_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS6_ERS1_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIjSt4pairIKjN3osg12observer_ptrINS2_10ReferencedEEEESt10_Select1stIS6_ESt4lessIjESaIS6_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS6_ERS1_@Base 2.9.0
+ (optional=templinst|arch=!amd64 !arm64 !m68k !mips64el !ppc64el !sparc64 !x32)_ZNSt8_Rb_treeIjSt4pairIKjN3osg12observer_ptrINS2_10ReferencedEEEESt10_Select1stIS6_ESt4lessIjESaIS6_EE5eraseERS1_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjN3osg12observer_ptrINS2_10ReferencedEEEESt10_Select1stIS6_ESt4lessIjESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E@Base 2.9.0
- (optional=templinst|arch=!armhf !mips !mipsel)_ZNSt8_Rb_treeIjSt4pairIKjN3osg7ref_ptrINS2_10RefMatrixdEEEESt10_Select1stIS6_ESt4lessIjESaIS6_EE24_M_get_insert_unique_posERS1_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIjSt4pairIKjN3osg7ref_ptrINS2_10RefMatrixdEEEESt10_Select1stIS6_ESt4lessIjESaIS6_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS6_ERS1_@Base 2.6.0
+ (optional=templinst|arch=!arm64 !m68k !mips64el !ppc64el !sparc64 !x32)_ZNSt8_Rb_treeIjSt4pairIKjN3osg7ref_ptrINS2_10RefMatrixdEEEESt10_Select1stIS6_ESt4lessIjESaIS6_EE24_M_get_insert_unique_posERS1_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIjSt4pairIKjN3osg7ref_ptrINS2_10RefMatrixdEEEESt10_Select1stIS6_ESt4lessIjESaIS6_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS6_ERS1_@Base 2.6.0
  (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjN3osg7ref_ptrINS2_10RefMatrixdEEEESt10_Select1stIS6_ESt4lessIjESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E@Base 2.5.0
- (optional=templinst|arch=amd64 arm64 hppa m68k sh4)_ZNSt8_Rb_treeIjSt4pairIKjN8osgEarth10HTTPClientEESt10_Select1stIS4_ESt4lessIjESaIS4_EE24_M_get_insert_unique_posERS1_@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjN8osgEarth10HTTPClientEESt10_Select1stIS4_ESt4lessIjESaIS4_EE24_M_get_insert_unique_posERS1_@Base 2.10.1
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIjSt4pairIKjN8osgEarth10HTTPClientEESt10_Select1stIS4_ESt4lessIjESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS1_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjN8osgEarth10HTTPClientEESt10_Select1stIS4_ESt4lessIjESaIS4_EE8_M_eraseEPSt13_Rb_tree_nodeIS4_E@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 mips64el ppc64el)_ZNSt8_Rb_treeIjSt4pairIKjS0_IN3osg7ref_ptrIKNS2_7UniformEEEjEESt10_Select1stIS8_ESt4lessIjESaIS8_EE24_M_get_insert_unique_posERS1_@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjPN8osgEarth9AsyncNodeEESt10_Select1stIS5_ESt4lessIjESaIS5_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS5_ERS1_@Base 2.10.1
+ (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjPN8osgEarth9AsyncNodeEESt10_Select1stIS5_ESt4lessIjESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E@Base 2.10.1
+ (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjS0_IN3osg7ref_ptrIKNS2_7UniformEEEjEESt10_Select1stIS8_ESt4lessIjESaIS8_EE24_M_get_insert_unique_posERS1_@Base 2.10.1
+ (optional=templinst|arch=amd64 arm64 x32)_ZNSt8_Rb_treeIjSt4pairIKjS0_IN3osg7ref_ptrIKNS2_7UniformEEEjEESt10_Select1stIS8_ESt4lessIjESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS1_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIjjSt9_IdentityIjESt4lessIjESaIjEE16_M_insert_uniqueIRKjEESt4pairISt17_Rb_tree_iteratorIjEbEOT_@Base 2.8~rc1
  _ZSt10noshowbaseRSt8ios_base@Base 2.8~rc1
- (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN8osgEarth14GeoHeightFieldESt6vectorIS3_SaIS3_EEEEiS3_NS0_5__ops15_Iter_comp_iterINS3_23SortByResolutionFunctorEEEEvT_T0_SE_T1_T2_@Base 2.6.0
- (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN8osgEarth14GeoHeightFieldESt6vectorIS3_SaIS3_EEEElS3_NS0_5__ops15_Iter_comp_iterINS3_23SortByResolutionFunctorEEEEvT_T0_SE_T1_T2_@Base 2.6.0
- (optional=templinst)_ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPN8osgEarth14GeoHeightFieldESt6vectorIS3_SaIS3_EEEENS0_5__ops15_Iter_comp_iterINS3_23SortByResolutionFunctorEEEEvT_SD_T0_@Base 2.6.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN8osgEarth14GeoHeightFieldESt6vectorIS3_SaIS3_EEEEiNS0_5__ops15_Iter_comp_iterINS3_23SortByResolutionFunctorEEEEvT_SD_T0_T1_@Base 2.6.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN8osgEarth14GeoHeightFieldESt6vectorIS3_SaIS3_EEEElNS0_5__ops15_Iter_comp_iterINS3_23SortByResolutionFunctorEEEEvT_SD_T0_T1_@Base 2.6.0
+ _ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN6mapbox6detail6EarcutIjE4NodeESt6vectorIS7_SaIS7_EEEElNS0_5__ops15_Iter_comp_iterIZNS5_14eliminateHolesIS9_IS9_IN3osg5Vec2fESaISH_EESaISJ_EEEES7_RKT_S7_EUlPKS6_SQ_E_EEEvSM_SM_T0_T1_@Base 2.10.1
  _ZSt3decRSt8ios_base@Base 2.8~rc1
  _ZSt3hexRSt8ios_base@Base 2.8~rc1
  (optional=templinst|arch=ia64)_ZSt4copyIN8osgEarth4Json6Reader9ErrorInfoEESt15_Deque_iteratorIT_RS5_PS5_ES4_IS5_RKS5_PS9_ESC_S8_@Base 2.4.0
- (arch=amd64 arm64 hppa sh4)_ZSt4fillSt13_Bit_iteratorS_RKb@Base 2.9.0
+ (optional=templinst)_ZSt4swapIN8osgEarth14GeoHeightFieldEENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS6_ESt18is_move_assignableIS6_EEE5valueEvE4typeERS6_SG_@Base 2.9.0
  _ZSt8showbaseRSt8ios_base@Base 2.8~rc1
- (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZSt9__find_ifIN9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEENS0_5__ops10_Iter_predIPFiiEEEET_SG_SG_T0_St26random_access_iterator_tag@Base 2.7.0
- (optional=templinst|arch=!alpha !hurd-i386 !i386 !mips !mipsel !powerpc !ppc64 !s390x)_ZSt9__find_ifIN9__gnu_cxx17__normal_iteratorIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS7_SaIS7_EEEENS0_5__ops16_Iter_equals_valIKS7_EEET_SH_SH_T0_St26random_access_iterator_tag@Base 2.9.0
- (optional=templinst)_ZSt9__find_ifIN9__gnu_cxx17__normal_iteratorIPSt4pairIPvN8osgEarth22TransientUserDataStore8DataPairEESt6vectorIS7_SaIS7_EEEENS0_5__ops10_Iter_predIPFbRKS7_EEEET_SK_SK_T0_St26random_access_iterator_tag@Base 2.8~rc1
  (optional=templinst)_ZSteqIcEN9__gnu_cxx11__enable_ifIXsrSt9__is_charIT_E7__valueEbE6__typeERKNSt7__cxx1112basic_stringIS3_St11char_traitsIS3_ESaIS3_EEESE_@Base 2.7.0
+ (optional=templinst|arch=!amd64 !arm64 !armel !armhf !i386 !sparc64 !x32)_ZStltIPN8osgEarth10PolyShaderESaIS2_EEbRKSt6vectorIT_T0_ES9_@Base 2.10.0
  (optional=templinst)_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEOS8_S9_@Base 2.8~rc1
- _ZTI10NullStream@Base 2.4.0
  _ZTI11ExecuteTask@Base 2.6.0
  _ZTI12TiXmlPrinter@Base 2.4.0
  _ZTI13DeclutterSort@Base 2.5.0
  _ZTI14HandleTileTask@Base 2.6.0
- _ZTI16NullStreamBuffer@Base 2.4.0
  _ZTI29osgEarthStringReaderWriterXML@Base 2.4.0
  _ZTI30osgEarthStringReaderWriterJSON@Base 2.4.0
  _ZTI33RemoveBlacklistedFilenamesVisitor@Base 2.4.0
@@ -5160,23 +5602,36 @@
  _ZTIN3osg18TemplateIndexArrayIsLNS_5Array4TypeE2ELi1ELi5122EEE@Base 2.9.0
  _ZTIN3osg19TemplateValueObjectIbEE@Base 2.6.0
  _ZTIN3osg20CoordinateSystemNodeE@Base 2.4.0
+ _ZTIN3osg21PrimitiveIndexFunctorE@Base 2.10.0
  _ZTIN3osg7MatrixdE@Base 2.4.0
  _ZTIN3osg7MatrixfE@Base 2.9.0
  _ZTIN3osg8CallbackE@Base 2.8~rc1
  _ZTIN3osg8Drawable12CullCallbackE@Base 2.4.0
+ _ZTIN3osg8Drawable26ComputeBoundingBoxCallbackE@Base 2.10.0
  _ZTIN3osg9OperationE@Base 2.4.0
  _ZTIN5osgDB14BaseSerializerE@Base 2.4.0
  _ZTIN5osgDB14InputExceptionE@Base 2.4.0
  _ZTIN5osgDB14UserSerializerIN8osgEarth14VirtualProgramEEE@Base 2.8~rc1
  _ZTIN5osgDB15ImageSerializerIN3osg13TextureBufferENS1_5ImageEEE@Base 2.8~rc1
  _ZTIN5osgDB16StringSerializerIN8osgEarth12StringObjectEEE@Base 2.4.0
+ _ZTIN5osgDB18TemplateSerializerIN3osg5Vec4fEEE@Base 2.10.0
  _ZTIN5osgDB18TemplateSerializerINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.7.0
  _ZTIN5osgDB18TemplateSerializerIPN3osg5ImageEEE@Base 2.8~rc1
  _ZTIN5osgDB18TemplateSerializerIbEE@Base 2.8~rc1
+ _ZTIN5osgDB18TemplateSerializerIfEE@Base 2.10.0
  _ZTIN5osgDB18TemplateSerializerIiEE@Base 2.8~rc1
  _ZTIN5osgDB18TemplateSerializerIjEE@Base 2.8~rc1
+ _ZTIN5osgDB18TemplateSerializerItEE@Base 2.10.0
+ _ZTIN5osgDB19PropByRefSerializerIN8osgEarth12LineDrawableEN3osg5Vec4fEEE@Base 2.10.0
+ _ZTIN5osgDB19PropByRefSerializerIN8osgEarth13PointDrawableEN3osg5Vec4fEEE@Base 2.10.0
  _ZTIN5osgDB19PropByValSerializerIN3osg13TextureBufferEiEE@Base 2.8~rc1
+ _ZTIN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEfEE@Base 2.10.0
+ _ZTIN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEiEE@Base 2.10.0
+ _ZTIN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEjEE@Base 2.10.0
+ _ZTIN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEtEE@Base 2.10.0
  _ZTIN5osgDB19PropByValSerializerIN8osgEarth13DrapeableNodeEbEE@Base 2.8~rc1
+ _ZTIN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEfEE@Base 2.10.0
+ _ZTIN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEjEE@Base 2.10.0
  _ZTIN5osgDB19PropByValSerializerIN8osgEarth14VirtualProgramEbEE@Base 2.8~rc1
  _ZTIN5osgDB19PropByValSerializerIN8osgEarth14VirtualProgramEjEE@Base 2.8~rc1
  _ZTIN5osgDB19PropByValSerializerIN8osgEarth8LightGL3EbEE@Base 2.9.0
@@ -5187,6 +5642,7 @@
  _ZTIN7osgUtil18VertexCacheVisitorE@Base 2.5.0
  _ZTIN7osgUtil20BaseOptimizerVisitorE@Base 2.4.0
  _ZTIN7osgUtil24VertexAccessOrderVisitorE@Base 2.5.0
+ _ZTIN7osgUtil9Optimizer20MergeGeometryVisitorE@Base 2.10.0
  _ZTIN7osgUtil9RenderBin12DrawCallbackE@Base 2.5.0
  _ZTIN7osgUtil9RenderBin12SortCallbackE@Base 2.5.0
  _ZTIN8osgEarth10Annotation12BboxDrawableE@Base 2.8~rc1
@@ -5198,7 +5654,9 @@
  _ZTIN8osgEarth10MapOptionsE@Base 2.4.0
  _ZTIN8osgEarth10MaskSourceE@Base 2.4.0
  _ZTIN8osgEarth10ModelLayerE@Base 2.4.0
+ _ZTIN8osgEarth10NullStreamE@Base 2.10.0
  _ZTIN8osgEarth10PatchLayerE@Base 2.9.0
+ _ZTIN8osgEarth10PointGroupE@Base 2.10.0
  _ZTIN8osgEarth10PoisonPillE@Base 2.6.0
  _ZTIN8osgEarth10PolyShaderE@Base 2.8~rc1
  _ZTIN8osgEarth10ReadResultE@Base 2.4.0
@@ -5210,20 +5668,24 @@
  _ZTIN8osgEarth10URIContextE@Base 2.4.0
  _ZTIN8osgEarth10VideoLayerE@Base 2.9.0
  _ZTIN8osgEarth10XmlElementE@Base 2.4.0
+ _ZTIN8osgEarth11AsyncResultE@Base 2.10.1
  _ZTIN8osgEarth11CacheDriverE@Base 2.5.0
  _ZTIN8osgEarth11CachePolicyE@Base 2.4.0
  _ZTIN8osgEarth11FadeOptionsE@Base 2.4.0
  _ZTIN8osgEarth11HTTPRequestE@Base 2.4.0
  _ZTIN8osgEarth11HorizonNodeE@Base 2.8~rc1
  _ZTIN8osgEarth11ImageMosaicE@Base 2.4.0
+ _ZTIN8osgEarth11LayerShaderE@Base 2.10.1
  _ZTIN8osgEarth11MapCallbackE@Base 2.4.0
  _ZTIN8osgEarth11MaterialGL3E@Base 2.9.0
  _ZTIN8osgEarth11MixinVectorIN3osg7MatrixfENS1_6ObjectEEE@Base 2.6.0
  _ZTIN8osgEarth11ModelSourceE@Base 2.4.0
  _ZTIN8osgEarth11ObjectIndexE@Base 2.7.0
  _ZTIN8osgEarth11OptionsDataIKNS_3MapEEE@Base 2.9.0
+ _ZTIN8osgEarth11OptionsDataINS_13AsyncFunctionEEE@Base 2.10.1
  _ZTIN8osgEarth11OptionsDataINS_9PagedNodeEEE@Base 2.9.0
- _ZTIN8osgEarth11StateSetLODE@Base 2.6.0
+ _ZTIN8osgEarth11ProgramRepo5EntryE@Base 2.10.0
+ _ZTIN8osgEarth11ProgramRepoE@Base 2.10.0
  _ZTIN8osgEarth11TaskRequestE@Base 2.4.0
  _ZTIN8osgEarth11TaskServiceE@Base 2.4.0
  _ZTIN8osgEarth11TileHandlerE@Base 2.6.0
@@ -5239,6 +5701,8 @@
  _ZTIN8osgEarth12HTTPResponse4PartE@Base 2.4.0
  _ZTIN8osgEarth12HTTPResponseE@Base 2.4.0
  _ZTIN8osgEarth12LayerOptionsE@Base 2.9.0
+ _ZTIN8osgEarth12LineDrawableE@Base 2.10.0
+ _ZTIN8osgEarth12NotifyStreamE@Base 2.10.0
  _ZTIN8osgEarth12PluginLoaderINS_10ImageLayerENS_5LayerEEE@Base 2.9.0
  _ZTIN8osgEarth12PluginLoaderINS_10ModelLayerENS_5LayerEEE@Base 2.9.0
  _ZTIN8osgEarth12PluginLoaderINS_10VideoLayerENS_5LayerEEE@Base 2.9.0
@@ -5262,6 +5726,7 @@
  _ZTIN8osgEarth13DirtyNotifierE@Base 2.4.0
  _ZTIN8osgEarth13DrapeableNodeE@Base 2.4.0
  _ZTIN8osgEarth13DrawInstanced15MatrixRefVectorE@Base 2.6.0
+ _ZTIN8osgEarth13DrawInstanced20MakeTransformsStaticE@Base 2.10.1
  _ZTIN8osgEarth13DrawInstanced22ConvertToDrawInstancedE@Base 2.4.0
  _ZTIN8osgEarth13ElevationPool14GetElevationOpE@Base 2.9.0
  _ZTIN8osgEarth13ElevationPool4TileE@Base 2.9.0
@@ -5270,9 +5735,11 @@
  _ZTIN8osgEarth13LayerCallbackE@Base 2.9.0
  _ZTIN8osgEarth13NotifierGroupINS_16OverlayDecoratorEEE@Base 2.4.0
  _ZTIN8osgEarth13ObserverGroupE@Base 2.4.0
+ _ZTIN8osgEarth13PointDrawableE@Base 2.10.0
  _ZTIN8osgEarth13ProxySettingsE@Base 2.4.0
  _ZTIN8osgEarth13RequestRedrawE@Base 2.4.0
  _ZTIN8osgEarth13ShaderFactoryE@Base 2.4.0
+ _ZTIN8osgEarth13ShaderOptionsE@Base 2.10.1
  _ZTIN8osgEarth13StateSetCacheE@Base 2.4.0
  _ZTIN8osgEarth13TerrainEngineE@Base 2.8~rc1
  _ZTIN8osgEarth13TiXmlDocumentE@Base 2.9.0
@@ -5303,15 +5770,20 @@
  _ZTIN8osgEarth15TerrainResolverE@Base 2.6.0
  _ZTIN8osgEarth15URIReadCallbackE@Base 2.4.0
  _ZTIN8osgEarth16CacheTileHandlerE@Base 2.6.0
- _ZTIN8osgEarth16CullNodeByNormalE@Base 2.4.0
  _ZTIN8osgEarth16DepthOffsetGroupE@Base 2.4.0
  _ZTIN8osgEarth16DirectoryVisitorE@Base 2.5.0
  _ZTIN8osgEarth16DrapingTechniqueE@Base 2.4.0
+ _ZTIN8osgEarth16HorizonClipPlane13ResizeFunctorE@Base 2.10.0
+ _ZTIN8osgEarth16HorizonClipPlane14ReleaseFunctorE@Base 2.10.0
+ _ZTIN8osgEarth16HorizonClipPlaneE@Base 2.10.0
  _ZTIN8osgEarth16MaskLayerOptionsE@Base 2.4.0
  _ZTIN8osgEarth16MaskSourceDriverE@Base 2.5.0
  _ZTIN8osgEarth16MaterialCallbackE@Base 2.9.0
+ _ZTIN8osgEarth16NullStreamBufferE@Base 2.10.0
  _ZTIN8osgEarth16OverlayDecoratorE@Base 2.4.0
  _ZTIN8osgEarth16OverlayTechniqueE@Base 2.4.0
+ _ZTIN8osgEarth16PerObjectFastMapIPN3osg6CameraENS_16HorizonClipPlane13PerCameraDataEE12ConstFunctorE@Base 2.10.0
+ _ZTIN8osgEarth16PerObjectFastMapIPN3osg6CameraENS_16HorizonClipPlane13PerCameraDataEE7FunctorE@Base 2.10.0
  _ZTIN8osgEarth16ProgressCallbackE@Base 2.4.0
  _ZTIN8osgEarth16ProxyCullVisitorE@Base 2.4.0
  _ZTIN8osgEarth16ResourceReleaserE@Base 2.8~rc1
@@ -5343,8 +5815,8 @@
  _ZTIN8osgEarth18ModelLayerCallbackE@Base 2.9.0
  _ZTIN8osgEarth18ModelSourceFactoryE@Base 2.5.0
  _ZTIN8osgEarth18ModelSourceOptionsE@Base 2.4.0
+ _ZTIN8osgEarth18NotifyStreamBufferE@Base 2.10.0
  _ZTIN8osgEarth18ObjectIndexBuilderIN3osg10ReferencedEEE@Base 2.7.0
- _ZTIN8osgEarth18PixelAutoTransformE@Base 2.4.0
  _ZTIN8osgEarth18SceneGraphCallbackE@Base 2.9.0
  _ZTIN8osgEarth18TaskServiceManagerE@Base 2.4.0
  _ZTIN8osgEarth18TileKeyListVisitorE@Base 2.6.0
@@ -5353,12 +5825,14 @@
  _ZTIN8osgEarth19ColorFilterRegistryE@Base 2.4.0
  _ZTIN8osgEarth19CompositeTileSourceE@Base 2.4.0
  _ZTIN8osgEarth19DriverConfigOptionsE@Base 2.4.0
+ _ZTIN8osgEarth19GL3RealizeOperationE@Base 2.10.0
  _ZTIN8osgEarth19HorizonCullCallbackE@Base 2.7.0
  _ZTIN8osgEarth19LandCoverDictionaryE@Base 2.9.0
  _ZTIN8osgEarth19PhongLightingEffectE@Base 2.6.0
  _ZTIN8osgEarth19SceneGraphCallbacksE@Base 2.9.0
  _ZTIN8osgEarth19TerrainLayerOptionsE@Base 2.4.0
  _ZTIN8osgEarth19VisibleLayerOptionsE@Base 2.9.0
+ _ZTIN8osgEarth20AltitudeCullCallbackE@Base 2.10.0
  _ZTIN8osgEarth20ChromeMetricsBackendE@Base 2.9.0
  _ZTIN8osgEarth20CubeSpatialReferenceE@Base 2.4.0
  _ZTIN8osgEarth20DeclutterSortFunctorE@Base 2.5.0
@@ -5368,18 +5842,20 @@
  _ZTIN8osgEarth20TerrainLayerCallbackE@Base 2.4.0
  _ZTIN8osgEarth20VertexCacheOptimizerE@Base 2.5.0
  _ZTIN8osgEarth20VisibleLayerCallbackE@Base 2.9.0
+ _ZTIN8osgEarth21AsyncNodePseudoLoaderE@Base 2.10.1
  _ZTIN8osgEarth21ElevationLayerOptionsE@Base 2.4.0
  _ZTIN8osgEarth21LandCoverLayerOptionsE@Base 2.9.0
  _ZTIN8osgEarth21LandCoverValueMappingE@Base 2.9.0
  _ZTIN8osgEarth21ScreenSpaceLayoutDataE@Base 2.8~rc1
  _ZTIN8osgEarth21TerrainTileLayerModelE@Base 2.8~rc1
- _ZTIN8osgEarth22DisableSubgraphCullingE@Base 2.4.0
  _ZTIN8osgEarth22LandCoverCoverageLayerE@Base 2.9.0
  _ZTIN8osgEarth22MapNodeObserverVisitorE@Base 2.4.0
  _ZTIN8osgEarth22SetDataVarianceVisitorE@Base 2.5.0
  _ZTIN8osgEarth22TerrainCallbackAdapterINS_12GeoTransformEEE@Base 2.6.0
  _ZTIN8osgEarth22TerrainCallbackContextE@Base 2.4.0
  _ZTIN8osgEarth22TextureAndImageVisitorE@Base 2.8~rc1
+ _ZTIN8osgEarth23CascadeDrapingDecorator11CameraLocalE@Base 2.10.1
+ _ZTIN8osgEarth23CascadeDrapingDecoratorE@Base 2.10.1
  _ZTIN8osgEarth23ClipToGeocentricHorizonE@Base 2.6.0
  _ZTIN8osgEarth23ConsoleProgressCallbackE@Base 2.4.0
  _ZTIN8osgEarth23GeometryClamperCallbackE@Base 2.8~rc1
@@ -5411,10 +5887,10 @@
  _ZTIN8osgEarth29LandCoverCoverageLayerOptionsE@Base 2.9.0
  _ZTIN8osgEarth30LightSourceGL3UniformGeneratorE@Base 2.9.0
  _ZTIN8osgEarth30TerrainEngineNodeCallbackProxyE@Base 2.4.0
- _ZTIN8osgEarth31DoNotComputeNearFarCullCallbackE@Base 2.4.0
  _ZTIN8osgEarth31PagedLODWithSceneGraphCallbacksE@Base 2.9.0
  _ZTIN8osgEarth36AllocateAndMergeBufferObjectsVisitorE@Base 2.7.0
- _ZTIN8osgEarth3Map16ElevationLayerCBE@Base 2.5.0
+ _ZTIN8osgEarth3Map14VisibleLayerCBE@Base 2.10.0
+ _ZTIN8osgEarth3Map7LayerCBE@Base 2.10.0
  _ZTIN8osgEarth3MapE@Base 2.4.0
  _ZTIN8osgEarth3URIE@Base 2.4.0
  _ZTIN8osgEarth4Json10FastWriterE@Base 2.4.0
@@ -5422,6 +5898,7 @@
  _ZTIN8osgEarth4Json14ValueAllocatorE@Base 2.4.0
  _ZTIN8osgEarth4Json21DefaultValueAllocatorE@Base 2.4.0
  _ZTIN8osgEarth4Json6WriterE@Base 2.4.0
+ _ZTIN8osgEarth4TextE@Base 2.10.0
  _ZTIN8osgEarth5AngleE@Base 2.7.0
  _ZTIN8osgEarth5CacheE@Base 2.4.0
  _ZTIN8osgEarth5GeoidE@Base 2.4.0
@@ -5439,6 +5916,7 @@
  _ZTIN8osgEarth7TileKeyE@Base 2.4.0
  _ZTIN8osgEarth7XmlNodeE@Base 2.4.0
  _ZTIN8osgEarth7XmlTextE@Base 2.4.0
+ _ZTIN8osgEarth8AsyncLODE@Base 2.10.1
  _ZTIN8osgEarth8CacheBinE@Base 2.4.0
  _ZTIN8osgEarth8DistanceE@Base 2.7.0
  _ZTIN8osgEarth8GeoImageE@Base 2.4.0
@@ -5448,7 +5926,6 @@
  _ZTIN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIN3osg7ref_ptrIKNS8_6ObjectEEENS_6ConfigEESt4lessIS6_EEE@Base 2.7.0
  _ZTIN8osgEarth8LightGL3E@Base 2.9.0
  _ZTIN8osgEarth8MapFrameE@Base 2.4.0
- _ZTIN8osgEarth8MaskNodeE@Base 2.4.0
  _ZTIN8osgEarth8MemCacheE@Base 2.4.0
  _ZTIN8osgEarth8RegistryE@Base 2.4.0
  _ZTIN8osgEarth8optionalIN3osg3LOD9RangeModeEEE@Base 2.9.0
@@ -5461,11 +5938,13 @@
  _ZTIN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_12CacheOptionsEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_13ProxySettingsEEE@Base 2.4.0
+ _ZTIN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTIN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_17ImageLayerOptionsEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_17MaskSourceOptionsEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_17TileSourceOptionsEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_18ModelSourceOptionsEEE@Base 2.4.0
+ _ZTIN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTIN8osgEarth8optionalINS_21ElevationLayerOptionsEEE@Base 2.6.0
  _ZTIN8osgEarth8optionalINS_21ElevationNoDataPolicyEEE@Base 2.6.0
  _ZTIN8osgEarth8optionalINS_22ElevationInterpolationEEE@Base 2.4.0
@@ -5482,9 +5961,12 @@
  _ZTIN8osgEarth8optionalIiEE@Base 2.4.0
  _ZTIN8osgEarth8optionalIjEE@Base 2.4.0
  _ZTIN8osgEarth8optionalIlEE@Base 2.5.0
+ (arch=x32)_ZTIN8osgEarth8optionalIxEE@Base 2.10.0
+ _ZTIN8osgEarth9AsyncNodeE@Base 2.10.1
  _ZTIN8osgEarth9ExtensionE@Base 2.7.0
  _ZTIN8osgEarth9GeoCircleE@Base 2.4.0
  _ZTIN8osgEarth9GeoExtentE@Base 2.4.0
+ _ZTIN8osgEarth9LineGroupE@Base 2.10.0
  _ZTIN8osgEarth9MaskLayerE@Base 2.4.0
  _ZTIN8osgEarth9NormalMapE@Base 2.9.0
  _ZTIN8osgEarth9PagedNodeE@Base 2.9.0
@@ -5497,12 +5979,10 @@
  _ZTIN8osgEarth9TiXmlTextE@Base 2.9.0
  _ZTIN8osgEarth9TileImageE@Base 2.4.0
  _ZTIN8osgEarth9URIStreamE@Base 2.4.0
- _ZTS10NullStream@Base 2.4.0
  _ZTS11ExecuteTask@Base 2.6.0
  _ZTS12TiXmlPrinter@Base 2.4.0
  _ZTS13DeclutterSort@Base 2.5.0
  _ZTS14HandleTileTask@Base 2.6.0
- _ZTS16NullStreamBuffer@Base 2.4.0
  _ZTS29osgEarthStringReaderWriterXML@Base 2.4.0
  _ZTS30osgEarthStringReaderWriterJSON@Base 2.4.0
  _ZTS33RemoveBlacklistedFilenamesVisitor@Base 2.4.0
@@ -5531,23 +6011,36 @@
  _ZTSN3osg18TemplateIndexArrayIsLNS_5Array4TypeE2ELi1ELi5122EEE@Base 2.9.0
  _ZTSN3osg19TemplateValueObjectIbEE@Base 2.6.0
  _ZTSN3osg20CoordinateSystemNodeE@Base 2.4.0
+ _ZTSN3osg21PrimitiveIndexFunctorE@Base 2.10.0
  _ZTSN3osg7MatrixdE@Base 2.4.0
  _ZTSN3osg7MatrixfE@Base 2.9.0
  _ZTSN3osg8CallbackE@Base 2.8~rc1
  _ZTSN3osg8Drawable12CullCallbackE@Base 2.4.0
+ _ZTSN3osg8Drawable26ComputeBoundingBoxCallbackE@Base 2.10.0
  _ZTSN3osg9OperationE@Base 2.4.0
  _ZTSN5osgDB14BaseSerializerE@Base 2.4.0
  _ZTSN5osgDB14InputExceptionE@Base 2.4.0
  _ZTSN5osgDB14UserSerializerIN8osgEarth14VirtualProgramEEE@Base 2.8~rc1
  _ZTSN5osgDB15ImageSerializerIN3osg13TextureBufferENS1_5ImageEEE@Base 2.8~rc1
  _ZTSN5osgDB16StringSerializerIN8osgEarth12StringObjectEEE@Base 2.4.0
+ _ZTSN5osgDB18TemplateSerializerIN3osg5Vec4fEEE@Base 2.10.0
  _ZTSN5osgDB18TemplateSerializerINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.7.0
  _ZTSN5osgDB18TemplateSerializerIPN3osg5ImageEEE@Base 2.8~rc1
  _ZTSN5osgDB18TemplateSerializerIbEE@Base 2.8~rc1
+ _ZTSN5osgDB18TemplateSerializerIfEE@Base 2.10.0
  _ZTSN5osgDB18TemplateSerializerIiEE@Base 2.8~rc1
  _ZTSN5osgDB18TemplateSerializerIjEE@Base 2.8~rc1
+ _ZTSN5osgDB18TemplateSerializerItEE@Base 2.10.0
+ _ZTSN5osgDB19PropByRefSerializerIN8osgEarth12LineDrawableEN3osg5Vec4fEEE@Base 2.10.0
+ _ZTSN5osgDB19PropByRefSerializerIN8osgEarth13PointDrawableEN3osg5Vec4fEEE@Base 2.10.0
  _ZTSN5osgDB19PropByValSerializerIN3osg13TextureBufferEiEE@Base 2.8~rc1
+ _ZTSN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEfEE@Base 2.10.0
+ _ZTSN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEiEE@Base 2.10.0
+ _ZTSN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEjEE@Base 2.10.0
+ _ZTSN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEtEE@Base 2.10.0
  _ZTSN5osgDB19PropByValSerializerIN8osgEarth13DrapeableNodeEbEE@Base 2.8~rc1
+ _ZTSN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEfEE@Base 2.10.0
+ _ZTSN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEjEE@Base 2.10.0
  _ZTSN5osgDB19PropByValSerializerIN8osgEarth14VirtualProgramEbEE@Base 2.8~rc1
  _ZTSN5osgDB19PropByValSerializerIN8osgEarth14VirtualProgramEjEE@Base 2.8~rc1
  _ZTSN5osgDB19PropByValSerializerIN8osgEarth8LightGL3EbEE@Base 2.9.0
@@ -5558,6 +6051,7 @@
  _ZTSN7osgUtil18VertexCacheVisitorE@Base 2.5.0
  _ZTSN7osgUtil20BaseOptimizerVisitorE@Base 2.4.0
  _ZTSN7osgUtil24VertexAccessOrderVisitorE@Base 2.5.0
+ _ZTSN7osgUtil9Optimizer20MergeGeometryVisitorE@Base 2.10.0
  _ZTSN7osgUtil9RenderBin12DrawCallbackE@Base 2.5.0
  _ZTSN7osgUtil9RenderBin12SortCallbackE@Base 2.5.0
  _ZTSN8osgEarth10Annotation12BboxDrawableE@Base 2.8~rc1
@@ -5569,7 +6063,9 @@
  _ZTSN8osgEarth10MapOptionsE@Base 2.4.0
  _ZTSN8osgEarth10MaskSourceE@Base 2.4.0
  _ZTSN8osgEarth10ModelLayerE@Base 2.4.0
+ _ZTSN8osgEarth10NullStreamE@Base 2.10.0
  _ZTSN8osgEarth10PatchLayerE@Base 2.9.0
+ _ZTSN8osgEarth10PointGroupE@Base 2.10.0
  _ZTSN8osgEarth10PoisonPillE@Base 2.6.0
  _ZTSN8osgEarth10PolyShaderE@Base 2.8~rc1
  _ZTSN8osgEarth10ReadResultE@Base 2.4.0
@@ -5581,20 +6077,24 @@
  _ZTSN8osgEarth10URIContextE@Base 2.4.0
  _ZTSN8osgEarth10VideoLayerE@Base 2.9.0
  _ZTSN8osgEarth10XmlElementE@Base 2.4.0
+ _ZTSN8osgEarth11AsyncResultE@Base 2.10.1
  _ZTSN8osgEarth11CacheDriverE@Base 2.5.0
  _ZTSN8osgEarth11CachePolicyE@Base 2.4.0
  _ZTSN8osgEarth11FadeOptionsE@Base 2.4.0
  _ZTSN8osgEarth11HTTPRequestE@Base 2.4.0
  _ZTSN8osgEarth11HorizonNodeE@Base 2.8~rc1
  _ZTSN8osgEarth11ImageMosaicE@Base 2.4.0
+ _ZTSN8osgEarth11LayerShaderE@Base 2.10.1
  _ZTSN8osgEarth11MapCallbackE@Base 2.4.0
  _ZTSN8osgEarth11MaterialGL3E@Base 2.9.0
  _ZTSN8osgEarth11MixinVectorIN3osg7MatrixfENS1_6ObjectEEE@Base 2.6.0
  _ZTSN8osgEarth11ModelSourceE@Base 2.4.0
  _ZTSN8osgEarth11ObjectIndexE@Base 2.7.0
  _ZTSN8osgEarth11OptionsDataIKNS_3MapEEE@Base 2.9.0
+ _ZTSN8osgEarth11OptionsDataINS_13AsyncFunctionEEE@Base 2.10.1
  _ZTSN8osgEarth11OptionsDataINS_9PagedNodeEEE@Base 2.9.0
- _ZTSN8osgEarth11StateSetLODE@Base 2.6.0
+ _ZTSN8osgEarth11ProgramRepo5EntryE@Base 2.10.0
+ _ZTSN8osgEarth11ProgramRepoE@Base 2.10.0
  _ZTSN8osgEarth11TaskRequestE@Base 2.4.0
  _ZTSN8osgEarth11TaskServiceE@Base 2.4.0
  _ZTSN8osgEarth11TileHandlerE@Base 2.6.0
@@ -5610,6 +6110,8 @@
  _ZTSN8osgEarth12HTTPResponse4PartE@Base 2.4.0
  _ZTSN8osgEarth12HTTPResponseE@Base 2.4.0
  _ZTSN8osgEarth12LayerOptionsE@Base 2.9.0
+ _ZTSN8osgEarth12LineDrawableE@Base 2.10.0
+ _ZTSN8osgEarth12NotifyStreamE@Base 2.10.0
  _ZTSN8osgEarth12PluginLoaderINS_10ImageLayerENS_5LayerEEE@Base 2.9.0
  _ZTSN8osgEarth12PluginLoaderINS_10ModelLayerENS_5LayerEEE@Base 2.9.0
  _ZTSN8osgEarth12PluginLoaderINS_10VideoLayerENS_5LayerEEE@Base 2.9.0
@@ -5633,6 +6135,7 @@
  _ZTSN8osgEarth13DirtyNotifierE@Base 2.4.0
  _ZTSN8osgEarth13DrapeableNodeE@Base 2.4.0
  _ZTSN8osgEarth13DrawInstanced15MatrixRefVectorE@Base 2.6.0
+ _ZTSN8osgEarth13DrawInstanced20MakeTransformsStaticE@Base 2.10.1
  _ZTSN8osgEarth13DrawInstanced22ConvertToDrawInstancedE@Base 2.4.0
  _ZTSN8osgEarth13ElevationPool14GetElevationOpE@Base 2.9.0
  _ZTSN8osgEarth13ElevationPool4TileE@Base 2.9.0
@@ -5641,9 +6144,11 @@
  _ZTSN8osgEarth13LayerCallbackE@Base 2.9.0
  _ZTSN8osgEarth13NotifierGroupINS_16OverlayDecoratorEEE@Base 2.4.0
  _ZTSN8osgEarth13ObserverGroupE@Base 2.4.0
+ _ZTSN8osgEarth13PointDrawableE@Base 2.10.0
  _ZTSN8osgEarth13ProxySettingsE@Base 2.4.0
  _ZTSN8osgEarth13RequestRedrawE@Base 2.4.0
  _ZTSN8osgEarth13ShaderFactoryE@Base 2.4.0
+ _ZTSN8osgEarth13ShaderOptionsE@Base 2.10.1
  _ZTSN8osgEarth13StateSetCacheE@Base 2.4.0
  _ZTSN8osgEarth13TerrainEngineE@Base 2.8~rc1
  _ZTSN8osgEarth13TiXmlDocumentE@Base 2.9.0
@@ -5674,15 +6179,20 @@
  _ZTSN8osgEarth15TerrainResolverE@Base 2.6.0
  _ZTSN8osgEarth15URIReadCallbackE@Base 2.4.0
  _ZTSN8osgEarth16CacheTileHandlerE@Base 2.6.0
- _ZTSN8osgEarth16CullNodeByNormalE@Base 2.4.0
  _ZTSN8osgEarth16DepthOffsetGroupE@Base 2.4.0
  _ZTSN8osgEarth16DirectoryVisitorE@Base 2.5.0
  _ZTSN8osgEarth16DrapingTechniqueE@Base 2.4.0
+ _ZTSN8osgEarth16HorizonClipPlane13ResizeFunctorE@Base 2.10.0
+ _ZTSN8osgEarth16HorizonClipPlane14ReleaseFunctorE@Base 2.10.0
+ _ZTSN8osgEarth16HorizonClipPlaneE@Base 2.10.0
  _ZTSN8osgEarth16MaskLayerOptionsE@Base 2.4.0
  _ZTSN8osgEarth16MaskSourceDriverE@Base 2.5.0
  _ZTSN8osgEarth16MaterialCallbackE@Base 2.9.0
+ _ZTSN8osgEarth16NullStreamBufferE@Base 2.10.0
  _ZTSN8osgEarth16OverlayDecoratorE@Base 2.4.0
  _ZTSN8osgEarth16OverlayTechniqueE@Base 2.4.0
+ _ZTSN8osgEarth16PerObjectFastMapIPN3osg6CameraENS_16HorizonClipPlane13PerCameraDataEE12ConstFunctorE@Base 2.10.0
+ _ZTSN8osgEarth16PerObjectFastMapIPN3osg6CameraENS_16HorizonClipPlane13PerCameraDataEE7FunctorE@Base 2.10.0
  _ZTSN8osgEarth16ProgressCallbackE@Base 2.4.0
  _ZTSN8osgEarth16ProxyCullVisitorE@Base 2.4.0
  _ZTSN8osgEarth16ResourceReleaserE@Base 2.8~rc1
@@ -5714,8 +6224,8 @@
  _ZTSN8osgEarth18ModelLayerCallbackE@Base 2.9.0
  _ZTSN8osgEarth18ModelSourceFactoryE@Base 2.5.0
  _ZTSN8osgEarth18ModelSourceOptionsE@Base 2.4.0
+ _ZTSN8osgEarth18NotifyStreamBufferE@Base 2.10.0
  _ZTSN8osgEarth18ObjectIndexBuilderIN3osg10ReferencedEEE@Base 2.7.0
- _ZTSN8osgEarth18PixelAutoTransformE@Base 2.4.0
  _ZTSN8osgEarth18SceneGraphCallbackE@Base 2.9.0
  _ZTSN8osgEarth18TaskServiceManagerE@Base 2.4.0
  _ZTSN8osgEarth18TileKeyListVisitorE@Base 2.6.0
@@ -5724,12 +6234,14 @@
  _ZTSN8osgEarth19ColorFilterRegistryE@Base 2.4.0
  _ZTSN8osgEarth19CompositeTileSourceE@Base 2.4.0
  _ZTSN8osgEarth19DriverConfigOptionsE@Base 2.4.0
+ _ZTSN8osgEarth19GL3RealizeOperationE@Base 2.10.0
  _ZTSN8osgEarth19HorizonCullCallbackE@Base 2.7.0
  _ZTSN8osgEarth19LandCoverDictionaryE@Base 2.9.0
  _ZTSN8osgEarth19PhongLightingEffectE@Base 2.6.0
  _ZTSN8osgEarth19SceneGraphCallbacksE@Base 2.9.0
  _ZTSN8osgEarth19TerrainLayerOptionsE@Base 2.4.0
  _ZTSN8osgEarth19VisibleLayerOptionsE@Base 2.9.0
+ _ZTSN8osgEarth20AltitudeCullCallbackE@Base 2.10.0
  _ZTSN8osgEarth20ChromeMetricsBackendE@Base 2.9.0
  _ZTSN8osgEarth20CubeSpatialReferenceE@Base 2.4.0
  _ZTSN8osgEarth20DeclutterSortFunctorE@Base 2.5.0
@@ -5739,18 +6251,20 @@
  _ZTSN8osgEarth20TerrainLayerCallbackE@Base 2.4.0
  _ZTSN8osgEarth20VertexCacheOptimizerE@Base 2.5.0
  _ZTSN8osgEarth20VisibleLayerCallbackE@Base 2.9.0
+ _ZTSN8osgEarth21AsyncNodePseudoLoaderE@Base 2.10.1
  _ZTSN8osgEarth21ElevationLayerOptionsE@Base 2.4.0
  _ZTSN8osgEarth21LandCoverLayerOptionsE@Base 2.9.0
  _ZTSN8osgEarth21LandCoverValueMappingE@Base 2.9.0
  _ZTSN8osgEarth21ScreenSpaceLayoutDataE@Base 2.8~rc1
  _ZTSN8osgEarth21TerrainTileLayerModelE@Base 2.8~rc1
- _ZTSN8osgEarth22DisableSubgraphCullingE@Base 2.4.0
  _ZTSN8osgEarth22LandCoverCoverageLayerE@Base 2.9.0
  _ZTSN8osgEarth22MapNodeObserverVisitorE@Base 2.4.0
  _ZTSN8osgEarth22SetDataVarianceVisitorE@Base 2.5.0
  _ZTSN8osgEarth22TerrainCallbackAdapterINS_12GeoTransformEEE@Base 2.6.0
  _ZTSN8osgEarth22TerrainCallbackContextE@Base 2.4.0
  _ZTSN8osgEarth22TextureAndImageVisitorE@Base 2.8~rc1
+ _ZTSN8osgEarth23CascadeDrapingDecorator11CameraLocalE@Base 2.10.1
+ _ZTSN8osgEarth23CascadeDrapingDecoratorE@Base 2.10.1
  _ZTSN8osgEarth23ClipToGeocentricHorizonE@Base 2.6.0
  _ZTSN8osgEarth23ConsoleProgressCallbackE@Base 2.4.0
  _ZTSN8osgEarth23GeometryClamperCallbackE@Base 2.8~rc1
@@ -5782,10 +6296,10 @@
  _ZTSN8osgEarth29LandCoverCoverageLayerOptionsE@Base 2.9.0
  _ZTSN8osgEarth30LightSourceGL3UniformGeneratorE@Base 2.9.0
  _ZTSN8osgEarth30TerrainEngineNodeCallbackProxyE@Base 2.4.0
- _ZTSN8osgEarth31DoNotComputeNearFarCullCallbackE@Base 2.4.0
  _ZTSN8osgEarth31PagedLODWithSceneGraphCallbacksE@Base 2.9.0
  _ZTSN8osgEarth36AllocateAndMergeBufferObjectsVisitorE@Base 2.7.0
- _ZTSN8osgEarth3Map16ElevationLayerCBE@Base 2.5.0
+ _ZTSN8osgEarth3Map14VisibleLayerCBE@Base 2.10.0
+ _ZTSN8osgEarth3Map7LayerCBE@Base 2.10.0
  _ZTSN8osgEarth3MapE@Base 2.4.0
  _ZTSN8osgEarth3URIE@Base 2.4.0
  _ZTSN8osgEarth4Json10FastWriterE@Base 2.4.0
@@ -5793,6 +6307,7 @@
  _ZTSN8osgEarth4Json14ValueAllocatorE@Base 2.4.0
  _ZTSN8osgEarth4Json21DefaultValueAllocatorE@Base 2.4.0
  _ZTSN8osgEarth4Json6WriterE@Base 2.4.0
+ _ZTSN8osgEarth4TextE@Base 2.10.0
  _ZTSN8osgEarth5AngleE@Base 2.7.0
  _ZTSN8osgEarth5CacheE@Base 2.4.0
  _ZTSN8osgEarth5GeoidE@Base 2.4.0
@@ -5810,6 +6325,7 @@
  _ZTSN8osgEarth7TileKeyE@Base 2.4.0
  _ZTSN8osgEarth7XmlNodeE@Base 2.4.0
  _ZTSN8osgEarth7XmlTextE@Base 2.4.0
+ _ZTSN8osgEarth8AsyncLODE@Base 2.10.1
  _ZTSN8osgEarth8CacheBinE@Base 2.4.0
  _ZTSN8osgEarth8DistanceE@Base 2.7.0
  _ZTSN8osgEarth8GeoImageE@Base 2.4.0
@@ -5819,7 +6335,6 @@
  _ZTSN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIN3osg7ref_ptrIKNS8_6ObjectEEENS_6ConfigEESt4lessIS6_EEE@Base 2.7.0
  _ZTSN8osgEarth8LightGL3E@Base 2.9.0
  _ZTSN8osgEarth8MapFrameE@Base 2.4.0
- _ZTSN8osgEarth8MaskNodeE@Base 2.4.0
  _ZTSN8osgEarth8MemCacheE@Base 2.4.0
  _ZTSN8osgEarth8RegistryE@Base 2.4.0
  _ZTSN8osgEarth8optionalIN3osg3LOD9RangeModeEEE@Base 2.9.0
@@ -5832,11 +6347,13 @@
  _ZTSN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_12CacheOptionsEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_13ProxySettingsEEE@Base 2.4.0
+ _ZTSN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTSN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_17ImageLayerOptionsEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_17MaskSourceOptionsEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_17TileSourceOptionsEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_18ModelSourceOptionsEEE@Base 2.4.0
+ _ZTSN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTSN8osgEarth8optionalINS_21ElevationLayerOptionsEEE@Base 2.6.0
  _ZTSN8osgEarth8optionalINS_21ElevationNoDataPolicyEEE@Base 2.6.0
  _ZTSN8osgEarth8optionalINS_22ElevationInterpolationEEE@Base 2.4.0
@@ -5853,9 +6370,12 @@
  _ZTSN8osgEarth8optionalIiEE@Base 2.4.0
  _ZTSN8osgEarth8optionalIjEE@Base 2.4.0
  _ZTSN8osgEarth8optionalIlEE@Base 2.5.0
+ (arch=x32)_ZTSN8osgEarth8optionalIxEE@Base 2.10.0
+ _ZTSN8osgEarth9AsyncNodeE@Base 2.10.1
  _ZTSN8osgEarth9ExtensionE@Base 2.7.0
  _ZTSN8osgEarth9GeoCircleE@Base 2.4.0
  _ZTSN8osgEarth9GeoExtentE@Base 2.4.0
+ _ZTSN8osgEarth9LineGroupE@Base 2.10.0
  _ZTSN8osgEarth9MaskLayerE@Base 2.4.0
  _ZTSN8osgEarth9NormalMapE@Base 2.9.0
  _ZTSN8osgEarth9PagedNodeE@Base 2.9.0
@@ -5868,27 +6388,31 @@
  _ZTSN8osgEarth9TiXmlTextE@Base 2.9.0
  _ZTSN8osgEarth9TileImageE@Base 2.4.0
  _ZTSN8osgEarth9URIStreamE@Base 2.4.0
- _ZTT10NullStream@Base 2.4.0
  _ZTT33RemoveBlacklistedFilenamesVisitor@Base 2.4.0
  _ZTTN3osg8CallbackE@Base 2.8~rc1
  _ZTTN3osg8Drawable12CullCallbackE@Base 2.4.0
  _ZTTN7osgUtil18VertexCacheVisitorE@Base 2.5.0
  _ZTTN7osgUtil24VertexAccessOrderVisitorE@Base 2.5.0
+ _ZTTN7osgUtil9Optimizer20MergeGeometryVisitorE@Base 2.10.0
+ _ZTTN8osgEarth10NullStreamE@Base 2.10.0
  _ZTTN8osgEarth10TileSourceE@Base 2.4.0
  _ZTTN8osgEarth11ViewVisitorINS_13RequestRedrawEEE@Base 2.4.0
+ _ZTTN8osgEarth12NotifyStreamE@Base 2.10.0
+ _ZTTN8osgEarth13DrawInstanced20MakeTransformsStaticE@Base 2.10.1
  _ZTTN8osgEarth13DrawInstanced22ConvertToDrawInstancedE@Base 2.4.0
  _ZTTN8osgEarth13ElevationPool14GetElevationOpE@Base 2.9.0
  _ZTTN8osgEarth15GeometryClamperE@Base 2.8~rc1
  _ZTTN8osgEarth15MapNodeReplacerE@Base 2.4.0
  _ZTTN8osgEarth15ShaderGeneratorE@Base 2.4.0
- _ZTTN8osgEarth16CullNodeByNormalE@Base 2.4.0
+ _ZTTN8osgEarth16HorizonClipPlaneE@Base 2.10.0
  _ZTTN8osgEarth16MaterialCallbackE@Base 2.9.0
  _ZTTN8osgEarth16ProxyCullVisitorE@Base 2.4.0
  _ZTTN8osgEarth17GeometryValidatorE@Base 2.6.0
  _ZTTN8osgEarth19CompositeTileSourceE@Base 2.4.0
+ _ZTTN8osgEarth19GL3RealizeOperationE@Base 2.10.0
  _ZTTN8osgEarth19HorizonCullCallbackE@Base 2.7.0
+ _ZTTN8osgEarth20AltitudeCullCallbackE@Base 2.10.0
  _ZTTN8osgEarth20VertexCacheOptimizerE@Base 2.5.0
- _ZTTN8osgEarth22DisableSubgraphCullingE@Base 2.4.0
  _ZTTN8osgEarth22SetDataVarianceVisitorE@Base 2.5.0
  _ZTTN8osgEarth22TextureAndImageVisitorE@Base 2.8~rc1
  _ZTTN8osgEarth23ClipToGeocentricHorizonE@Base 2.6.0
@@ -5902,15 +6426,12 @@
  _ZTTN8osgEarth27SuperClusterCullingCallbackE@Base 2.4.0
  _ZTTN8osgEarth28FindTopMostNodeOfTypeVisitorINS_7MapNodeEEE@Base 2.4.0
  _ZTTN8osgEarth30LightSourceGL3UniformGeneratorE@Base 2.9.0
- _ZTTN8osgEarth31DoNotComputeNearFarCullCallbackE@Base 2.4.0
  _ZTTN8osgEarth36AllocateAndMergeBufferObjectsVisitorE@Base 2.7.0
  _ZTTN8osgEarth7Terrain20OnTileAddedOperationE@Base 2.9.0
- _ZTV10NullStream@Base 2.4.0
  _ZTV11ExecuteTask@Base 2.6.0
  _ZTV12TiXmlPrinter@Base 2.4.0
  _ZTV13DeclutterSort@Base 2.5.0
  _ZTV14HandleTileTask@Base 2.6.0
- _ZTV16NullStreamBuffer@Base 2.4.0
  _ZTV29osgEarthStringReaderWriterXML@Base 2.4.0
  _ZTV30osgEarthStringReaderWriterJSON@Base 2.4.0
  _ZTV33RemoveBlacklistedFilenamesVisitor@Base 2.4.0
@@ -5937,20 +6458,33 @@
  _ZTVN3osg18TemplateIndexArrayIsLNS_5Array4TypeE2ELi1ELi5122EEE@Base 2.9.0
  _ZTVN3osg19TemplateValueObjectIbEE@Base 2.6.0
  _ZTVN3osg20CoordinateSystemNodeE@Base 2.4.0
+ _ZTVN3osg21PrimitiveIndexFunctorE@Base 2.10.0
  _ZTVN3osg8CallbackE@Base 2.8~rc1
  _ZTVN3osg8Drawable12CullCallbackE@Base 2.4.0
+ _ZTVN3osg8Drawable26ComputeBoundingBoxCallbackE@Base 2.10.0
  _ZTVN5osgDB14BaseSerializerE@Base 2.4.0
  _ZTVN5osgDB14InputExceptionE@Base 2.4.0
  _ZTVN5osgDB14UserSerializerIN8osgEarth14VirtualProgramEEE@Base 2.8~rc1
  _ZTVN5osgDB15ImageSerializerIN3osg13TextureBufferENS1_5ImageEEE@Base 2.8~rc1
  _ZTVN5osgDB16StringSerializerIN8osgEarth12StringObjectEEE@Base 2.4.0
+ _ZTVN5osgDB18TemplateSerializerIN3osg5Vec4fEEE@Base 2.10.0
  _ZTVN5osgDB18TemplateSerializerINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.7.0
  _ZTVN5osgDB18TemplateSerializerIPN3osg5ImageEEE@Base 2.8~rc1
  _ZTVN5osgDB18TemplateSerializerIbEE@Base 2.8~rc1
+ _ZTVN5osgDB18TemplateSerializerIfEE@Base 2.10.0
  _ZTVN5osgDB18TemplateSerializerIiEE@Base 2.8~rc1
  _ZTVN5osgDB18TemplateSerializerIjEE@Base 2.8~rc1
+ _ZTVN5osgDB18TemplateSerializerItEE@Base 2.10.0
+ _ZTVN5osgDB19PropByRefSerializerIN8osgEarth12LineDrawableEN3osg5Vec4fEEE@Base 2.10.0
+ _ZTVN5osgDB19PropByRefSerializerIN8osgEarth13PointDrawableEN3osg5Vec4fEEE@Base 2.10.0
  _ZTVN5osgDB19PropByValSerializerIN3osg13TextureBufferEiEE@Base 2.8~rc1
+ _ZTVN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEfEE@Base 2.10.0
+ _ZTVN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEiEE@Base 2.10.0
+ _ZTVN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEjEE@Base 2.10.0
+ _ZTVN5osgDB19PropByValSerializerIN8osgEarth12LineDrawableEtEE@Base 2.10.0
  _ZTVN5osgDB19PropByValSerializerIN8osgEarth13DrapeableNodeEbEE@Base 2.8~rc1
+ _ZTVN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEfEE@Base 2.10.0
+ _ZTVN5osgDB19PropByValSerializerIN8osgEarth13PointDrawableEjEE@Base 2.10.0
  _ZTVN5osgDB19PropByValSerializerIN8osgEarth14VirtualProgramEbEE@Base 2.8~rc1
  _ZTVN5osgDB19PropByValSerializerIN8osgEarth14VirtualProgramEjEE@Base 2.8~rc1
  _ZTVN5osgDB19PropByValSerializerIN8osgEarth8LightGL3EbEE@Base 2.9.0
@@ -5959,6 +6493,7 @@
  _ZTVN7osgUtil11IntersectorE@Base 2.4.0
  _ZTVN7osgUtil18VertexCacheVisitorE@Base 2.5.0
  _ZTVN7osgUtil24VertexAccessOrderVisitorE@Base 2.5.0
+ _ZTVN7osgUtil9Optimizer20MergeGeometryVisitorE@Base 2.10.0
  _ZTVN7osgUtil9RenderBin12DrawCallbackE@Base 2.5.0
  _ZTVN7osgUtil9RenderBin12SortCallbackE@Base 2.5.0
  _ZTVN8osgEarth10DataExtentE@Base 2.4.0
@@ -5969,7 +6504,9 @@
  _ZTVN8osgEarth10MapOptionsE@Base 2.4.0
  _ZTVN8osgEarth10MaskSourceE@Base 2.4.0
  _ZTVN8osgEarth10ModelLayerE@Base 2.4.0
+ _ZTVN8osgEarth10NullStreamE@Base 2.10.0
  _ZTVN8osgEarth10PatchLayerE@Base 2.9.0
+ _ZTVN8osgEarth10PointGroupE@Base 2.10.0
  _ZTVN8osgEarth10PoisonPillE@Base 2.6.0
  _ZTVN8osgEarth10PolyShaderE@Base 2.8~rc1
  _ZTVN8osgEarth10ReadResultE@Base 2.4.0
@@ -5981,20 +6518,24 @@
  _ZTVN8osgEarth10URIContextE@Base 2.4.0
  _ZTVN8osgEarth10VideoLayerE@Base 2.9.0
  _ZTVN8osgEarth10XmlElementE@Base 2.4.0
+ _ZTVN8osgEarth11AsyncResultE@Base 2.10.1
  _ZTVN8osgEarth11CacheDriverE@Base 2.5.0
  _ZTVN8osgEarth11CachePolicyE@Base 2.4.0
  _ZTVN8osgEarth11FadeOptionsE@Base 2.4.0
  _ZTVN8osgEarth11HTTPRequestE@Base 2.4.0
  _ZTVN8osgEarth11HorizonNodeE@Base 2.8~rc1
  _ZTVN8osgEarth11ImageMosaicE@Base 2.4.0
+ _ZTVN8osgEarth11LayerShaderE@Base 2.10.1
  _ZTVN8osgEarth11MapCallbackE@Base 2.4.0
  _ZTVN8osgEarth11MaterialGL3E@Base 2.9.0
  _ZTVN8osgEarth11MixinVectorIN3osg7MatrixfENS1_6ObjectEEE@Base 2.6.0
  _ZTVN8osgEarth11ModelSourceE@Base 2.4.0
  _ZTVN8osgEarth11ObjectIndexE@Base 2.7.0
  _ZTVN8osgEarth11OptionsDataIKNS_3MapEEE@Base 2.9.0
+ _ZTVN8osgEarth11OptionsDataINS_13AsyncFunctionEEE@Base 2.10.1
  _ZTVN8osgEarth11OptionsDataINS_9PagedNodeEEE@Base 2.9.0
- _ZTVN8osgEarth11StateSetLODE@Base 2.6.0
+ _ZTVN8osgEarth11ProgramRepo5EntryE@Base 2.10.0
+ _ZTVN8osgEarth11ProgramRepoE@Base 2.10.0
  _ZTVN8osgEarth11TaskRequestE@Base 2.4.0
  _ZTVN8osgEarth11TaskServiceE@Base 2.4.0
  _ZTVN8osgEarth11TileHandlerE@Base 2.6.0
@@ -6010,6 +6551,8 @@
  _ZTVN8osgEarth12HTTPResponse4PartE@Base 2.4.0
  _ZTVN8osgEarth12HTTPResponseE@Base 2.4.0
  _ZTVN8osgEarth12LayerOptionsE@Base 2.9.0
+ _ZTVN8osgEarth12LineDrawableE@Base 2.10.0
+ _ZTVN8osgEarth12NotifyStreamE@Base 2.10.0
  _ZTVN8osgEarth12PluginLoaderINS_10ImageLayerENS_5LayerEEE@Base 2.9.0
  _ZTVN8osgEarth12PluginLoaderINS_10ModelLayerENS_5LayerEEE@Base 2.9.0
  _ZTVN8osgEarth12PluginLoaderINS_10VideoLayerENS_5LayerEEE@Base 2.9.0
@@ -6032,6 +6575,7 @@
  _ZTVN8osgEarth13DirtyNotifierE@Base 2.4.0
  _ZTVN8osgEarth13DrapeableNodeE@Base 2.4.0
  _ZTVN8osgEarth13DrawInstanced15MatrixRefVectorE@Base 2.6.0
+ _ZTVN8osgEarth13DrawInstanced20MakeTransformsStaticE@Base 2.10.1
  _ZTVN8osgEarth13DrawInstanced22ConvertToDrawInstancedE@Base 2.4.0
  _ZTVN8osgEarth13ElevationPool14GetElevationOpE@Base 2.9.0
  _ZTVN8osgEarth13ElevationPool4TileE@Base 2.9.0
@@ -6040,8 +6584,10 @@
  _ZTVN8osgEarth13LayerCallbackE@Base 2.9.0
  _ZTVN8osgEarth13NotifierGroupINS_16OverlayDecoratorEEE@Base 2.4.0
  _ZTVN8osgEarth13ObserverGroupE@Base 2.4.0
+ _ZTVN8osgEarth13PointDrawableE@Base 2.10.0
  _ZTVN8osgEarth13ProxySettingsE@Base 2.4.0
  _ZTVN8osgEarth13ShaderFactoryE@Base 2.4.0
+ _ZTVN8osgEarth13ShaderOptionsE@Base 2.10.1
  _ZTVN8osgEarth13StateSetCacheE@Base 2.4.0
  _ZTVN8osgEarth13TiXmlDocumentE@Base 2.9.0
  _ZTVN8osgEarth13TileBlacklistE@Base 2.4.0
@@ -6068,13 +6614,16 @@
  _ZTVN8osgEarth15TerrainCallbackE@Base 2.4.0
  _ZTVN8osgEarth15URIReadCallbackE@Base 2.4.0
  _ZTVN8osgEarth16CacheTileHandlerE@Base 2.6.0
- _ZTVN8osgEarth16CullNodeByNormalE@Base 2.4.0
  _ZTVN8osgEarth16DepthOffsetGroupE@Base 2.4.0
  _ZTVN8osgEarth16DirectoryVisitorE@Base 2.5.0
  _ZTVN8osgEarth16DrapingTechniqueE@Base 2.4.0
+ _ZTVN8osgEarth16HorizonClipPlane13ResizeFunctorE@Base 2.10.0
+ _ZTVN8osgEarth16HorizonClipPlane14ReleaseFunctorE@Base 2.10.0
+ _ZTVN8osgEarth16HorizonClipPlaneE@Base 2.10.0
  _ZTVN8osgEarth16MaskLayerOptionsE@Base 2.4.0
  _ZTVN8osgEarth16MaskSourceDriverE@Base 2.5.0
  _ZTVN8osgEarth16MaterialCallbackE@Base 2.9.0
+ _ZTVN8osgEarth16NullStreamBufferE@Base 2.10.0
  _ZTVN8osgEarth16OverlayDecoratorE@Base 2.4.0
  _ZTVN8osgEarth16OverlayTechniqueE@Base 2.4.0
  _ZTVN8osgEarth16ProgressCallbackE@Base 2.4.0
@@ -6105,7 +6654,7 @@
  _ZTVN8osgEarth18IntersectionPickerE@Base 2.7.0
  _ZTVN8osgEarth18ModelSourceFactoryE@Base 2.5.0
  _ZTVN8osgEarth18ModelSourceOptionsE@Base 2.4.0
- _ZTVN8osgEarth18PixelAutoTransformE@Base 2.4.0
+ _ZTVN8osgEarth18NotifyStreamBufferE@Base 2.10.0
  _ZTVN8osgEarth18SceneGraphCallbackE@Base 2.9.0
  _ZTVN8osgEarth18TaskServiceManagerE@Base 2.4.0
  _ZTVN8osgEarth18TileKeyListVisitorE@Base 2.6.0
@@ -6114,28 +6663,32 @@
  _ZTVN8osgEarth19ColorFilterRegistryE@Base 2.4.0
  _ZTVN8osgEarth19CompositeTileSourceE@Base 2.4.0
  _ZTVN8osgEarth19DriverConfigOptionsE@Base 2.4.0
+ _ZTVN8osgEarth19GL3RealizeOperationE@Base 2.10.0
  _ZTVN8osgEarth19HorizonCullCallbackE@Base 2.7.0
  _ZTVN8osgEarth19LandCoverDictionaryE@Base 2.9.0
  _ZTVN8osgEarth19PhongLightingEffectE@Base 2.6.0
  _ZTVN8osgEarth19SceneGraphCallbacksE@Base 2.9.0
  _ZTVN8osgEarth19TerrainLayerOptionsE@Base 2.4.0
  _ZTVN8osgEarth19VisibleLayerOptionsE@Base 2.9.0
+ _ZTVN8osgEarth20AltitudeCullCallbackE@Base 2.10.0
  _ZTVN8osgEarth20ChromeMetricsBackendE@Base 2.9.0
  _ZTVN8osgEarth20CubeSpatialReferenceE@Base 2.4.0
  _ZTVN8osgEarth20DeclutterSortFunctorE@Base 2.5.0
  _ZTVN8osgEarth20ElevationLayerVectorE@Base 2.4.0
  _ZTVN8osgEarth20PrimitiveIntersectorE@Base 2.5.0
  _ZTVN8osgEarth20VertexCacheOptimizerE@Base 2.5.0
+ _ZTVN8osgEarth21AsyncNodePseudoLoaderE@Base 2.10.1
  _ZTVN8osgEarth21ElevationLayerOptionsE@Base 2.4.0
  _ZTVN8osgEarth21LandCoverLayerOptionsE@Base 2.9.0
  _ZTVN8osgEarth21LandCoverValueMappingE@Base 2.9.0
  _ZTVN8osgEarth21TerrainTileLayerModelE@Base 2.8~rc1
- _ZTVN8osgEarth22DisableSubgraphCullingE@Base 2.4.0
  _ZTVN8osgEarth22LandCoverCoverageLayerE@Base 2.9.0
  _ZTVN8osgEarth22SetDataVarianceVisitorE@Base 2.5.0
  _ZTVN8osgEarth22TerrainCallbackAdapterINS_12GeoTransformEEE@Base 2.6.0
  _ZTVN8osgEarth22TerrainCallbackContextE@Base 2.4.0
  _ZTVN8osgEarth22TextureAndImageVisitorE@Base 2.8~rc1
+ _ZTVN8osgEarth23CascadeDrapingDecorator11CameraLocalE@Base 2.10.1
+ _ZTVN8osgEarth23CascadeDrapingDecoratorE@Base 2.10.1
  _ZTVN8osgEarth23ClipToGeocentricHorizonE@Base 2.6.0
  _ZTVN8osgEarth23ConsoleProgressCallbackE@Base 2.4.0
  _ZTVN8osgEarth23GeometryClamperCallbackE@Base 2.8~rc1
@@ -6166,10 +6719,10 @@
  _ZTVN8osgEarth29LandCoverCoverageLayerOptionsE@Base 2.9.0
  _ZTVN8osgEarth30LightSourceGL3UniformGeneratorE@Base 2.9.0
  _ZTVN8osgEarth30TerrainEngineNodeCallbackProxyE@Base 2.4.0
- _ZTVN8osgEarth31DoNotComputeNearFarCullCallbackE@Base 2.4.0
  _ZTVN8osgEarth31PagedLODWithSceneGraphCallbacksE@Base 2.9.0
  _ZTVN8osgEarth36AllocateAndMergeBufferObjectsVisitorE@Base 2.7.0
- _ZTVN8osgEarth3Map16ElevationLayerCBE@Base 2.5.0
+ _ZTVN8osgEarth3Map14VisibleLayerCBE@Base 2.10.0
+ _ZTVN8osgEarth3Map7LayerCBE@Base 2.10.0
  _ZTVN8osgEarth3MapE@Base 2.4.0
  _ZTVN8osgEarth3URIE@Base 2.4.0
  _ZTVN8osgEarth4Json10FastWriterE@Base 2.4.0
@@ -6177,6 +6730,7 @@
  _ZTVN8osgEarth4Json14ValueAllocatorE@Base 2.4.0
  _ZTVN8osgEarth4Json21DefaultValueAllocatorE@Base 2.4.0
  _ZTVN8osgEarth4Json6WriterE@Base 2.4.0
+ _ZTVN8osgEarth4TextE@Base 2.10.0
  _ZTVN8osgEarth5AngleE@Base 2.7.0
  _ZTVN8osgEarth5CacheE@Base 2.4.0
  _ZTVN8osgEarth5GeoidE@Base 2.4.0
@@ -6194,6 +6748,7 @@
  _ZTVN8osgEarth7TileKeyE@Base 2.4.0
  _ZTVN8osgEarth7XmlNodeE@Base 2.4.0
  _ZTVN8osgEarth7XmlTextE@Base 2.4.0
+ _ZTVN8osgEarth8AsyncLODE@Base 2.10.1
  _ZTVN8osgEarth8CacheBinE@Base 2.4.0
  _ZTVN8osgEarth8DistanceE@Base 2.7.0
  _ZTVN8osgEarth8GeoImageE@Base 2.4.0
@@ -6203,7 +6758,6 @@
  _ZTVN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIN3osg7ref_ptrIKNS8_6ObjectEEENS_6ConfigEESt4lessIS6_EEE@Base 2.7.0
  _ZTVN8osgEarth8LightGL3E@Base 2.9.0
  _ZTVN8osgEarth8MapFrameE@Base 2.4.0
- _ZTVN8osgEarth8MaskNodeE@Base 2.4.0
  _ZTVN8osgEarth8MemCacheE@Base 2.4.0
  _ZTVN8osgEarth8RegistryE@Base 2.4.0
  _ZTVN8osgEarth8optionalIN3osg3LOD9RangeModeEEE@Base 2.9.0
@@ -6216,11 +6770,13 @@
  _ZTVN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_12CacheOptionsEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_13ProxySettingsEEE@Base 2.4.0
+ _ZTVN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTVN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_17ImageLayerOptionsEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_17MaskSourceOptionsEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_17TileSourceOptionsEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_18ModelSourceOptionsEEE@Base 2.4.0
+ _ZTVN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTVN8osgEarth8optionalINS_21ElevationLayerOptionsEEE@Base 2.6.0
  _ZTVN8osgEarth8optionalINS_21ElevationNoDataPolicyEEE@Base 2.6.0
  _ZTVN8osgEarth8optionalINS_22ElevationInterpolationEEE@Base 2.4.0
@@ -6237,9 +6793,12 @@
  _ZTVN8osgEarth8optionalIiEE@Base 2.4.0
  _ZTVN8osgEarth8optionalIjEE@Base 2.4.0
  _ZTVN8osgEarth8optionalIlEE@Base 2.5.0
+ (arch=x32)_ZTVN8osgEarth8optionalIxEE@Base 2.10.0
+ _ZTVN8osgEarth9AsyncNodeE@Base 2.10.1
  _ZTVN8osgEarth9ExtensionE@Base 2.8~rc1
  _ZTVN8osgEarth9GeoCircleE@Base 2.4.0
  _ZTVN8osgEarth9GeoExtentE@Base 2.4.0
+ _ZTVN8osgEarth9LineGroupE@Base 2.10.0
  _ZTVN8osgEarth9MaskLayerE@Base 2.4.0
  _ZTVN8osgEarth9NormalMapE@Base 2.9.0
  _ZTVN8osgEarth9PagedNodeE@Base 2.9.0
@@ -6285,7 +6844,7 @@
  (c++)"non-virtual thunk to osgEarth::Terrain::getHeight(osg::Node*, osgEarth::SpatialReference const*, double, double, double*, double*) const@Base" 2.6.0
  (c++)"non-virtual thunk to osgEarth::Terrain::getHeight(osgEarth::SpatialReference const*, double, double, double*, double*) const@Base" 2.4.0
  (c++)"non-virtual thunk to osgEarth::Terrain::~Terrain()@Base" 2.4.0
- (c++)"non-virtual thunk to osgEarth::TerrainEngineNode::createTileModel(osgEarth::MapFrame const&, osgEarth::TileKey const&, osgEarth::CreateTileModelFilter const&, osgEarth::ProgressCallback*)@Base" 2.9.0
+ (c++)"non-virtual thunk to osgEarth::TerrainEngineNode::createTileModel(osgEarth::Map const*, osgEarth::TileKey const&, osgEarth::CreateTileModelFilter const&, osgEarth::ProgressCallback*)@Base" 2.10.0
  (c++)"non-virtual thunk to osgEarth::TerrainEngineNode::elevationBorderRequired() const@Base" 2.9.0
  (c++)"non-virtual thunk to osgEarth::TerrainEngineNode::elevationTexturesRequired() const@Base" 2.7.0
  (c++)"non-virtual thunk to osgEarth::TerrainEngineNode::fullDataAtFirstLodRequired() const@Base" 2.9.0
@@ -6298,6 +6857,7 @@
  osgEarthGetSOVersion@Base 2.4.0
  osgEarthGetVersion@Base 2.4.0
  osgEarth_declutter@Base 2.5.0
+ osgdb_ASYNC_PSEUDOLOADER_EXT@Base 2.10.1
  osgdb_SHADERGEN_PL_EXTENSION@Base 2.4.0
  osgdb_elevation@Base 2.9.0
  osgdb_image@Base 2.9.0
@@ -6312,8 +6872,6 @@
  osgdb_osgearth_screen_space_layout@Base 2.8~rc1
  osgdb_video@Base 2.9.0
  osgdb_xml@Base 2.4.0
- osgearth_g_NotifyLevel@Base 2.4.0
- (c++)"virtual thunk to NullStream::~NullStream()@Base" 2.4.0
  (c++)"virtual thunk to RemoveBlacklistedFilenamesVisitor::~RemoveBlacklistedFilenamesVisitor()@Base" 2.4.0
  (c++)"virtual thunk to osg::Callback::className() const@Base" 2.8~rc1
  (c++)"virtual thunk to osg::Callback::clone(osg::CopyOp const&) const@Base" 2.8~rc1
@@ -6356,23 +6914,34 @@
  (c++)"virtual thunk to osg::StateAttributeCallback::isSameKindAs(osg::Object const*) const@Base" 2.9.0
  (c++)"virtual thunk to osg::StateAttributeCallback::libraryName() const@Base" 2.9.0
  (c++)"virtual thunk to osgEarth::AllocateAndMergeBufferObjectsVisitor::~AllocateAndMergeBufferObjectsVisitor()@Base" 2.7.0
+ (c++)"virtual thunk to osgEarth::AltitudeCullCallback::~AltitudeCullCallback()@Base" 2.10.0
  (c++)"virtual thunk to osgEarth::ClipToGeocentricHorizon::~ClipToGeocentricHorizon()@Base" 2.6.0
  (c++)"virtual thunk to osgEarth::CompositeTileSource::~CompositeTileSource()@Base" 2.4.0
- (c++)"virtual thunk to osgEarth::CullNodeByNormal::~CullNodeByNormal()@Base" 2.4.0
- (c++)"virtual thunk to osgEarth::DisableSubgraphCulling::~DisableSubgraphCulling()@Base" 2.4.0
- (c++)"virtual thunk to osgEarth::DoNotComputeNearFarCullCallback::~DoNotComputeNearFarCullCallback()@Base" 2.4.0
  (c++)"virtual thunk to osgEarth::DrawInstanced::ConvertToDrawInstanced::~ConvertToDrawInstanced()@Base" 2.4.0
+ (c++)"virtual thunk to osgEarth::DrawInstanced::MakeTransformsStatic::~MakeTransformsStatic()@Base" 2.10.1
  (c++)"virtual thunk to osgEarth::ElevationPool::GetElevationOp::~GetElevationOp()@Base" 2.9.0
  (c++)"virtual thunk to osgEarth::FindTopMostNodeOfTypeVisitor<osgEarth::MapNode>::~FindTopMostNodeOfTypeVisitor()@Base" 2.4.0
+ (c++)"virtual thunk to osgEarth::GL3RealizeOperation::~GL3RealizeOperation()@Base" 2.10.0
  (c++)"virtual thunk to osgEarth::GenerateGL3LightingUniforms::~GenerateGL3LightingUniforms()@Base" 2.9.0
  (c++)"virtual thunk to osgEarth::GeometryClamper::~GeometryClamper()@Base" 2.8~rc1
  (c++)"virtual thunk to osgEarth::GeometryValidator::~GeometryValidator()@Base" 2.6.0
+ (c++)"virtual thunk to osgEarth::HorizonClipPlane::releaseGLObjects(osg::State*) const@Base" 2.10.0
+ (c++)"virtual thunk to osgEarth::HorizonClipPlane::resizeGLObjectBuffers(unsigned int)@Base" 2.10.0
+ (c++)"virtual thunk to osgEarth::HorizonClipPlane::~HorizonClipPlane()@Base" 2.10.0
  (c++)"virtual thunk to osgEarth::HorizonCullCallback::~HorizonCullCallback()@Base" 2.7.0
+ (c++)"virtual thunk to osgEarth::InstallViewportSizeUniform::className() const@Base" 2.10.0
+ (c++)"virtual thunk to osgEarth::InstallViewportSizeUniform::clone(osg::CopyOp const&) const@Base" 2.10.0
+ (c++)"virtual thunk to osgEarth::InstallViewportSizeUniform::cloneType() const@Base" 2.10.0
+ (c++)"virtual thunk to osgEarth::InstallViewportSizeUniform::isSameKindAs(osg::Object const*) const@Base" 2.10.0
+ (c++)"virtual thunk to osgEarth::InstallViewportSizeUniform::libraryName() const@Base" 2.10.0
  (c++)"virtual thunk to osgEarth::InstallViewportSizeUniform::~InstallViewportSizeUniform()@Base" 2.9.0
+ (c++)"virtual thunk to osgEarth::LightSourceGL3UniformGenerator::releaseGLObjects(osg::State*) const@Base" 2.10.0
  (c++)"virtual thunk to osgEarth::LightSourceGL3UniformGenerator::run(osg::Object*, osg::Object*)@Base" 2.9.0
  (c++)"virtual thunk to osgEarth::LightSourceGL3UniformGenerator::~LightSourceGL3UniformGenerator()@Base" 2.9.0
  (c++)"virtual thunk to osgEarth::MapNodeReplacer::~MapNodeReplacer()@Base" 2.4.0
  (c++)"virtual thunk to osgEarth::MaterialCallback::~MaterialCallback()@Base" 2.9.0
+ (c++)"virtual thunk to osgEarth::NotifyStream::~NotifyStream()@Base" 2.10.0
+ (c++)"virtual thunk to osgEarth::NullStream::~NullStream()@Base" 2.10.0
  (c++)"virtual thunk to osgEarth::OcclusionCullingCallback::~OcclusionCullingCallback()@Base" 2.4.0
  (c++)"virtual thunk to osgEarth::PrimitiveSetTypeCounter::~PrimitiveSetTypeCounter()@Base" 2.4.0
  (c++)"virtual thunk to osgEarth::ProxyCullVisitor::~ProxyCullVisitor()@Base" 2.4.0
@@ -6393,13 +6962,20 @@
  (c++)"virtual thunk to osgEarth::VertexCacheOptimizer::~VertexCacheOptimizer()@Base" 2.5.0
  (c++)"virtual thunk to osgEarth::ViewVisitor<osgEarth::RequestRedraw>::~ViewVisitor()@Base" 2.4.0
  (c++)"virtual thunk to osgUtil::IntersectionVisitor::~IntersectionVisitor()@Base" 2.4.0
+ (c++)"virtual thunk to osgUtil::Optimizer::MergeGeometryVisitor::~MergeGeometryVisitor()@Base" 2.10.0
  (c++)"virtual thunk to osgUtil::VertexAccessOrderVisitor::~VertexAccessOrderVisitor()@Base" 2.5.0
  (c++)"virtual thunk to osgUtil::VertexCacheVisitor::~VertexCacheVisitor()@Base" 2.5.0
  wrapper_serializer_ClampableNode@Base 2.9.0
  wrapper_serializer_DrapeableNode@Base 2.8~rc1
  wrapper_serializer_DummyObject@Base 2.9.0
+ wrapper_serializer_InstallViewportSizeUniform@Base 2.10.0
  wrapper_serializer_LightGL3@Base 2.9.0
+ wrapper_serializer_LineDrawable@Base 2.10.0
+ wrapper_serializer_LineGroup@Base 2.10.0
  wrapper_serializer_MaterialGL3@Base 2.9.0
+ wrapper_serializer_PointDrawable@Base 2.10.0
+ wrapper_serializer_PointGroup@Base 2.10.0
  wrapper_serializer_StringObject@Base 2.4.0
  wrapper_serializer_TextureBuffer@Base 2.8~rc1
  wrapper_serializer_VirtualProgram@Base 2.8~rc1
+ wrapper_serializer_osgEarth_Text@Base 2.10.0
diff -Nru osgearth-2.9.0+dfsg/debian/libosgearthannotation5.symbols osgearth-2.10.2+dfsg/debian/libosgearthannotation5.symbols
--- osgearth-2.9.0+dfsg/debian/libosgearthannotation5.symbols	2018-02-07 17:53:05.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/libosgearthannotation5.symbols	2019-04-20 06:08:11.000000000 +0000
@@ -1,5 +1,6 @@
-# SymbolsHelper-Confirmed: 2.9.0 alpha arm64 armel armhf hppa hurd-i386 i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64
+# SymbolsHelper-Confirmed: 2.10.1 amd64
 libosgEarthAnnotation.so.5 #PACKAGE# #MINVER#
+* Build-Depends-Package: libosgearth-dev
  _ZN15DraggerCallback17onPositionChangedEPKN8osgEarth10Annotation7DraggerERKNS0_8GeoPointE@Base 2.7.0
  _ZN15DraggerCallbackD0Ev@Base 2.4.0
  _ZN15DraggerCallbackD1Ev@Base 2.4.0
@@ -50,6 +51,8 @@
  _ZN3osg12ValueVisitor5applyERNS_5Vec2fE@Base 2.8~rc1
  _ZN3osg12ValueVisitor5applyERNS_5Vec3fE@Base 2.8~rc1
  _ZN3osg12ValueVisitor5applyERNS_5Vec4fE@Base 2.8~rc1
+ (optional=templinst)_ZN3osg12observer_ptrINS_8StateSetEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN3osg12observer_ptrINS_8StateSetEED2Ev@Base 2.10.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EE11resizeArrayEj@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EE12reserveArrayEj@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EE4trimEv@Base 2.4.0
@@ -77,6 +80,7 @@
  _ZN3osg17ConstValueVisitor5applyERKNS_5Vec2fE@Base 2.8~rc1
  _ZN3osg17ConstValueVisitor5applyERKNS_5Vec3fE@Base 2.8~rc1
  _ZN3osg17ConstValueVisitor5applyERKNS_5Vec4fE@Base 2.6.0
+ _ZN3osg17DrawElementsUByte10addElementEj@Base 2.10.0
  (optional=templinst)_ZN3osg18BoundingSphereImplINS_5Vec3fEE8expandByERKS2_@Base 2.4.0
  _ZN3osg4Node10asDrawableEv@Base 2.8~rc1
  _ZN3osg4Node10asGeometryEv@Base 2.8~rc1
@@ -103,8 +107,8 @@
  _ZN3osg6Object6asNodeEv@Base 2.8~rc1
  _ZN3osg6Object7setNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN3osg6Object9asUniformEv@Base 2.8~rc1
- (optional=templinst)_ZN3osg7ref_ptrINS_7UniformEED1Ev@Base 2.4.0
- (optional=templinst)_ZN3osg7ref_ptrINS_7UniformEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth14VirtualProgramEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN3osg7ref_ptrIN8osgEarth14VirtualProgramEED2Ev@Base 2.10.0
  _ZN3osg8Callback20removeNestedCallbackEPS0_@Base 2.8~rc1
  _ZN3osg8Callback3runEPNS_6ObjectES2_@Base 2.8~rc1
  _ZN3osg8CallbackD0Ev@Base 2.8~rc1
@@ -114,8 +118,6 @@
  _ZN3osg8Drawable15setDrawCallbackEPNS0_12DrawCallbackE@Base 2.8~rc1
  _ZN3osg8Geometry10asGeometryEv@Base 2.8~rc1
  _ZN3osg8Geometry6acceptERNS_11NodeVisitorE@Base 2.8~rc1
- _ZN3osg8PolytopeC1Ev@Base 2.9.0
- _ZN3osg8PolytopeC2Ev@Base 2.9.0
  _ZN3osg8PolytopeD1Ev@Base 2.4.0
  _ZN3osg8PolytopeD2Ev@Base 2.4.0
  _ZN5osgDB13InputIterator11matchStringERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8~rc1
@@ -135,35 +137,37 @@
  _ZN5osgGA15GUIEventHandler6handleERKNS_15GUIEventAdapterERNS_16GUIActionAdapterEPN3osg6ObjectEPNS6_11NodeVisitorE@Base 2.4.0
  (arch=ia64)_ZN7osgUtil11CullVisitor11popStateSetEv@Base 2.4.0
  _ZN8osgEarth10Annotation10CircleNode11setArcStartERKNS_5AngleE@Base 2.7.0
- _ZN8osgEarth10Annotation10CircleNode14initCircleNodeEv@Base 2.8~rc1
+ _ZN8osgEarth10Annotation10CircleNode13buildGeometryEv@Base 2.10.0
  _ZN8osgEarth10Annotation10CircleNode14setNumSegmentsEj@Base 2.4.0
- _ZN8osgEarth10Annotation10CircleNode15rebuildGeometryEv@Base 2.8~rc1
+ _ZN8osgEarth10Annotation10CircleNode3setERKNS_8GeoPointERKNS_8DistanceERKNS_9Symbology5StyleERKNS_5AngleESE_b@Base 2.10.0
  _ZN8osgEarth10Annotation10CircleNode6acceptERN3osg11NodeVisitorE@Base 2.4.0
  _ZN8osgEarth10Annotation10CircleNode6setPieERKb@Base 2.4.0
+ _ZN8osgEarth10Annotation10CircleNode9constructEv@Base 2.10.0
  _ZN8osgEarth10Annotation10CircleNode9setArcEndERKNS_5AngleE@Base 2.7.0
  _ZN8osgEarth10Annotation10CircleNode9setRadiusERKNS_8DistanceE@Base 2.7.0
- _ZN8osgEarth10Annotation10CircleNodeC1EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation10CircleNodeC1EPNS_7MapNodeERKNS_8GeoPointERKNS_8DistanceERKNS_9Symbology5StyleERKNS_5AngleESG_b@Base 2.7.0
- _ZN8osgEarth10Annotation10CircleNodeC2EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation10CircleNodeC2EPNS_7MapNodeERKNS_8GeoPointERKNS_8DistanceERKNS_9Symbology5StyleERKNS_5AngleESG_b@Base 2.7.0
+ _ZN8osgEarth10Annotation10CircleNodeC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation10CircleNodeC1Ev@Base 2.10.0
+ _ZN8osgEarth10Annotation10CircleNodeC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation10CircleNodeC2Ev@Base 2.10.0
  _ZN8osgEarth10Annotation10CircleNodeD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation10CircleNodeD1Ev@Base 2.4.0
  _ZN8osgEarth10Annotation10CircleNodeD2Ev@Base 2.4.0
  _ZN8osgEarth10Annotation11EllipseNode11setArcStartERKNS_5AngleE@Base 2.7.0
+ _ZN8osgEarth10Annotation11EllipseNode13buildGeometryEv@Base 2.10.0
  _ZN8osgEarth10Annotation11EllipseNode14setNumSegmentsEj@Base 2.4.0
  _ZN8osgEarth10Annotation11EllipseNode14setRadiusMajorERKNS_8DistanceE@Base 2.7.0
  _ZN8osgEarth10Annotation11EllipseNode14setRadiusMinorERKNS_8DistanceE@Base 2.7.0
- _ZN8osgEarth10Annotation11EllipseNode15initEllipseNodeEv@Base 2.8~rc1
- _ZN8osgEarth10Annotation11EllipseNode15rebuildGeometryEv@Base 2.8~rc1
  _ZN8osgEarth10Annotation11EllipseNode16setRotationAngleERKNS_5AngleE@Base 2.7.0
+ _ZN8osgEarth10Annotation11EllipseNode3setERKNS_8GeoPointERKNS_8DistanceES7_RKNS_5AngleERKNS_9Symbology5StyleESA_SA_b@Base 2.10.0
  _ZN8osgEarth10Annotation11EllipseNode6acceptERN3osg11NodeVisitorE@Base 2.4.0
  _ZN8osgEarth10Annotation11EllipseNode6setPieERKb@Base 2.4.0
  _ZN8osgEarth10Annotation11EllipseNode8setRadiiERKNS_8DistanceES4_@Base 2.7.0
+ _ZN8osgEarth10Annotation11EllipseNode9constructEv@Base 2.10.0
  _ZN8osgEarth10Annotation11EllipseNode9setArcEndERKNS_5AngleE@Base 2.7.0
- _ZN8osgEarth10Annotation11EllipseNodeC1EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation11EllipseNodeC1EPNS_7MapNodeERKNS_8GeoPointERKNS_8DistanceES9_RKNS_5AngleERKNS_9Symbology5StyleESC_SC_b@Base 2.7.0
- _ZN8osgEarth10Annotation11EllipseNodeC2EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation11EllipseNodeC2EPNS_7MapNodeERKNS_8GeoPointERKNS_8DistanceES9_RKNS_5AngleERKNS_9Symbology5StyleESC_SC_b@Base 2.7.0
+ _ZN8osgEarth10Annotation11EllipseNodeC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation11EllipseNodeC1Ev@Base 2.10.0
+ _ZN8osgEarth10Annotation11EllipseNodeC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation11EllipseNodeC2Ev@Base 2.10.0
  _ZN8osgEarth10Annotation11EllipseNodeD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation11EllipseNodeD1Ev@Base 2.4.0
  _ZN8osgEarth10Annotation11EllipseNodeD2Ev@Base 2.4.0
@@ -172,25 +176,21 @@
  _ZN8osgEarth10Annotation11FeatureNode10setMapNodeEPNS_7MapNodeE@Base 2.4.0
  _ZN8osgEarth10Annotation11FeatureNode11onTileAddedERKNS_7TileKeyEPN3osg4NodeERNS_22TerrainCallbackContextE@Base 2.8~rc1
  _ZN8osgEarth10Annotation11FeatureNode13setStyleSheetEPNS_9Symbology10StyleSheetE@Base 2.8~rc1
- _ZN8osgEarth10Annotation11FeatureNode4initEv@Base 2.4.0
  _ZN8osgEarth10Annotation11FeatureNode5buildEv@Base 2.7.0
  _ZN8osgEarth10Annotation11FeatureNode5clampEPN3osg4NodeEPKNS_7TerrainE@Base 2.9.0
+ _ZN8osgEarth10Annotation11FeatureNode5dirtyEv@Base 2.10.0
  _ZN8osgEarth10Annotation11FeatureNode6acceptERN3osg11NodeVisitorE@Base 2.4.0
+ _ZN8osgEarth10Annotation11FeatureNode8getIndexEv@Base 2.10.0
+ _ZN8osgEarth10Annotation11FeatureNode8setIndexEPNS_8Features19FeatureIndexBuilderE@Base 2.10.0
  _ZN8osgEarth10Annotation11FeatureNode8setStyleERKNS_9Symbology5StyleE@Base 2.4.0
  _ZN8osgEarth10Annotation11FeatureNode8traverseERN3osg11NodeVisitorE@Base 2.9.0
- _ZN8osgEarth10Annotation11FeatureNodeC1EPNS_7MapNodeEPNS_8Features7FeatureERKNS_9Symbology5StyleERKNS4_23GeometryCompilerOptionsEPNS7_10StyleSheetE@Base 2.8~rc1
- _ZN8osgEarth10Annotation11FeatureNodeC1EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation11FeatureNodeC1EPNS_7MapNodeERKNSt7__cxx114listIN3osg7ref_ptrINS_8Features7FeatureEEESaISA_EEERKNS_9Symbology5StyleERKNS8_23GeometryCompilerOptionsEPNSF_10StyleSheetE@Base 2.9.0
  _ZN8osgEarth10Annotation11FeatureNodeC1EPNS_8Features7FeatureERKNS_9Symbology5StyleERKNS2_23GeometryCompilerOptionsEPNS5_10StyleSheetE@Base 2.9.0
+ _ZN8osgEarth10Annotation11FeatureNodeC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation11FeatureNodeC1ERKNSt7__cxx114listIN3osg7ref_ptrINS_8Features7FeatureEEESaIS8_EEERKNS_9Symbology5StyleERKNS6_23GeometryCompilerOptionsEPNSD_10StyleSheetE@Base 2.9.0
- _ZN8osgEarth10Annotation11FeatureNodeC1ERKS1_RKN3osg6CopyOpE@Base 2.8~rc1
  _ZN8osgEarth10Annotation11FeatureNodeC1Ev@Base 2.8~rc1
- _ZN8osgEarth10Annotation11FeatureNodeC2EPNS_7MapNodeEPNS_8Features7FeatureERKNS_9Symbology5StyleERKNS4_23GeometryCompilerOptionsEPNS7_10StyleSheetE@Base 2.8~rc1
- _ZN8osgEarth10Annotation11FeatureNodeC2EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation11FeatureNodeC2EPNS_7MapNodeERKNSt7__cxx114listIN3osg7ref_ptrINS_8Features7FeatureEEESaISA_EEERKNS_9Symbology5StyleERKNS8_23GeometryCompilerOptionsEPNSF_10StyleSheetE@Base 2.9.0
  _ZN8osgEarth10Annotation11FeatureNodeC2EPNS_8Features7FeatureERKNS_9Symbology5StyleERKNS2_23GeometryCompilerOptionsEPNS5_10StyleSheetE@Base 2.9.0
+ _ZN8osgEarth10Annotation11FeatureNodeC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation11FeatureNodeC2ERKNSt7__cxx114listIN3osg7ref_ptrINS_8Features7FeatureEEESaIS8_EEERKNS_9Symbology5StyleERKNS6_23GeometryCompilerOptionsEPNSD_10StyleSheetE@Base 2.9.0
- _ZN8osgEarth10Annotation11FeatureNodeC2ERKS1_RKN3osg6CopyOpE@Base 2.8~rc1
  _ZN8osgEarth10Annotation11FeatureNodeC2Ev@Base 2.8~rc1
  _ZN8osgEarth10Annotation11FeatureNodeD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation11FeatureNodeD1Ev@Base 2.4.0
@@ -204,7 +204,6 @@
  _ZN8osgEarth10Annotation12ImageOverlay10setCornersERKN3osg5Vec2dES5_S5_S5_@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay10setMapNodeEPNS_7MapNodeE@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay11addCallbackEPNS1_20ImageOverlayCallbackE@Base 2.4.0
- _ZN8osgEarth10Annotation12ImageOverlay11onTileAddedERKNS_7TileKeyEPN3osg4NodeERNS_22TerrainCallbackContextE@Base 2.8~rc1
  _ZN8osgEarth10Annotation12ImageOverlay12setLowerLeftEdd@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay12setMagFilterEN3osg7Texture10FilterModeE@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay12setMinFilterEN3osg7Texture10FilterModeE@Base 2.4.0
@@ -221,25 +220,25 @@
  _ZN8osgEarth10Annotation12ImageOverlay20ImageOverlayCallbackD1Ev@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay20ImageOverlayCallbackD2Ev@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay20setBoundsAndRotationERKNS_6BoundsERKNS_5AngleE@Base 2.7.0
- _ZN8osgEarth10Annotation12ImageOverlay4initEv@Base 2.4.0
- _ZN8osgEarth10Annotation12ImageOverlay5clampEPN3osg4NodeEPKNS_7TerrainE@Base 2.9.0
  _ZN8osgEarth10Annotation12ImageOverlay5dirtyEv@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay6acceptERN3osg11NodeVisitorE@Base 2.4.0
+ _ZN8osgEarth10Annotation12ImageOverlay7compileEv@Base 2.10.0
  _ZN8osgEarth10Annotation12ImageOverlay7setEastEd@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay7setWestEd@Base 2.4.0
- _ZN8osgEarth10Annotation12ImageOverlay8postCTOREv@Base 2.4.0
+ _ZN8osgEarth10Annotation12ImageOverlay8_programE@Base 2.10.0
  _ZN8osgEarth10Annotation12ImageOverlay8setAlphaEf@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay8setImageEPN3osg5ImageE@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay8setNorthEd@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay8setSouthEd@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay8traverseERN3osg11NodeVisitorE@Base 2.4.0
+ _ZN8osgEarth10Annotation12ImageOverlay9constructEv@Base 2.10.0
  _ZN8osgEarth10Annotation12ImageOverlay9setBoundsERKNS_6BoundsE@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay9setCenterEdd@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlay9setDrapedEb@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlayC1EPNS_7MapNodeEPN3osg5ImageE@Base 2.4.0
- _ZN8osgEarth10Annotation12ImageOverlayC1EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth10Annotation12ImageOverlayC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation12ImageOverlayC2EPNS_7MapNodeEPN3osg5ImageE@Base 2.4.0
- _ZN8osgEarth10Annotation12ImageOverlayC2EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth10Annotation12ImageOverlayC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation12ImageOverlayD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlayD1Ev@Base 2.4.0
  _ZN8osgEarth10Annotation12ImageOverlayD2Ev@Base 2.4.0
@@ -257,16 +256,19 @@
  _ZN8osgEarth10Annotation13RectangleNode13setLowerRightERKNS_8GeoPointE@Base 2.4.0
  _ZN8osgEarth10Annotation13RectangleNode13setUpperRightERKNS_8GeoPointE@Base 2.4.0
  _ZN8osgEarth10Annotation13RectangleNode6acceptERN3osg11NodeVisitorE@Base 2.4.0
- _ZN8osgEarth10Annotation13RectangleNode7rebuildEv@Base 2.4.0
+ _ZN8osgEarth10Annotation13RectangleNode7compileEv@Base 2.10.0
  _ZN8osgEarth10Annotation13RectangleNode7setSizeERKNS_8DistanceES4_@Base 2.7.0
  _ZN8osgEarth10Annotation13RectangleNode8setStyleERKNS_9Symbology5StyleE@Base 2.4.0
  _ZN8osgEarth10Annotation13RectangleNode8setWidthERKNS_8DistanceE@Base 2.7.0
+ _ZN8osgEarth10Annotation13RectangleNode9constructEv@Base 2.10.0
  _ZN8osgEarth10Annotation13RectangleNode9setCornerENS1_6CornerERKNS_8GeoPointE@Base 2.4.0
  _ZN8osgEarth10Annotation13RectangleNode9setHeightERKNS_8DistanceE@Base 2.7.0
- _ZN8osgEarth10Annotation13RectangleNodeC1EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation13RectangleNodeC1EPNS_7MapNodeERKNS_8GeoPointERKNS_8DistanceES9_RKNS_9Symbology5StyleE@Base 2.7.0
- _ZN8osgEarth10Annotation13RectangleNodeC2EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation13RectangleNodeC2EPNS_7MapNodeERKNS_8GeoPointERKNS_8DistanceES9_RKNS_9Symbology5StyleE@Base 2.7.0
+ _ZN8osgEarth10Annotation13RectangleNodeC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation13RectangleNodeC1ERKNS_8GeoPointERKNS_8DistanceES7_RKNS_9Symbology5StyleE@Base 2.10.0
+ _ZN8osgEarth10Annotation13RectangleNodeC1Ev@Base 2.10.0
+ _ZN8osgEarth10Annotation13RectangleNodeC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation13RectangleNodeC2ERKNS_8GeoPointERKNS_8DistanceES7_RKNS_9Symbology5StyleE@Base 2.10.0
+ _ZN8osgEarth10Annotation13RectangleNodeC2Ev@Base 2.10.0
  _ZN8osgEarth10Annotation13RectangleNodeD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation13RectangleNodeD1Ev@Base 2.4.0
  _ZN8osgEarth10Annotation13RectangleNodeD2Ev@Base 2.4.0
@@ -296,15 +298,16 @@
  _ZN8osgEarth10Annotation14AnnotationNode11setPriorityEf@Base 2.8~rc1
  _ZN8osgEarth10Annotation14AnnotationNode12s_emptyStyleE@Base 2.4.0
  _ZN8osgEarth10Annotation14AnnotationNode17setHorizonCullingEb@Base 2.8~rc1
+ _ZN8osgEarth10Annotation14AnnotationNode18setDefaultLightingEb@Base 2.10.0
  _ZN8osgEarth10Annotation14AnnotationNode18setDepthAdjustmentEb@Base 2.4.0
- _ZN8osgEarth10Annotation14AnnotationNode19setLightingIfNotSetEb@Base 2.4.0
  _ZN8osgEarth10Annotation14AnnotationNode20applyRenderSymbologyERKNS_9Symbology5StyleE@Base 2.8~rc1
  _ZN8osgEarth10Annotation14AnnotationNode6acceptERN3osg11NodeVisitorE@Base 2.4.0
  _ZN8osgEarth10Annotation14AnnotationNode8setStyleERKNS_9Symbology5StyleE@Base 2.4.0
  _ZN8osgEarth10Annotation14AnnotationNode8traverseERN3osg11NodeVisitorE@Base 2.9.0
- _ZN8osgEarth10Annotation14AnnotationNodeC1ERKNS_6ConfigE@Base 2.8~rc1
+ _ZN8osgEarth10Annotation14AnnotationNode9constructEv@Base 2.10.0
+ _ZN8osgEarth10Annotation14AnnotationNodeC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation14AnnotationNodeC1Ev@Base 2.8~rc1
- _ZN8osgEarth10Annotation14AnnotationNodeC2ERKNS_6ConfigE@Base 2.8~rc1
+ _ZN8osgEarth10Annotation14AnnotationNodeC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation14AnnotationNodeC2Ev@Base 2.8~rc1
  _ZN8osgEarth10Annotation14AnnotationNodeD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation14AnnotationNodeD1Ev@Base 2.4.0
@@ -317,58 +320,42 @@
  _ZN8osgEarth10Annotation15AddPointHandlerD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation15AddPointHandlerD1Ev@Base 2.4.0
  _ZN8osgEarth10Annotation15AnnotationLayer11deserializeEv@Base 2.9.0
- _ZN8osgEarth10Annotation15AnnotationLayer15getOrCreateNodeEv@Base 2.9.0
  _ZN8osgEarth10Annotation15AnnotationLayer4initEv@Base 2.9.0
+ _ZN8osgEarth10Annotation15AnnotationLayer8addChildEPNS0_14AnnotationNodeE@Base 2.10.1
  _ZN8osgEarth10Annotation15AnnotationLayerC1ERKNS0_22AnnotationLayerOptionsE@Base 2.9.0
- _ZN8osgEarth10Annotation15AnnotationLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth10Annotation15AnnotationLayerC1Ev@Base 2.9.0
  _ZN8osgEarth10Annotation15AnnotationLayerC2ERKNS0_22AnnotationLayerOptionsE@Base 2.9.0
- _ZN8osgEarth10Annotation15AnnotationLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth10Annotation15AnnotationLayerC2Ev@Base 2.9.0
  _ZN8osgEarth10Annotation15AnnotationLayerD0Ev@Base 2.9.0
  _ZN8osgEarth10Annotation15AnnotationLayerD1Ev@Base 2.9.0
  _ZN8osgEarth10Annotation15AnnotationLayerD2Ev@Base 2.9.0
- _ZN8osgEarth10Annotation15AnnotationUtils12PROGRAM_NAMEB5cxx11Ev@Base 2.7.0
- _ZN8osgEarth10Annotation15AnnotationUtils12UNIFORM_FADEB5cxx11Ev@Base 2.7.0
- _ZN8osgEarth10Annotation15AnnotationUtils12create2DQuadERKN3osg15BoundingBoxImplINS2_5Vec3fEEEfRKNS2_5Vec4fE@Base 2.4.0
  _ZN8osgEarth10Annotation15AnnotationUtils12createSphereEfRKN3osg5Vec4fEf@Base 2.4.0
- _ZN8osgEarth10Annotation15AnnotationUtils15UNIFORM_IS_TEXTB5cxx11Ev@Base 2.7.0
- _ZN8osgEarth10Annotation15AnnotationUtils15create2DOutlineERKN3osg15BoundingBoxImplINS2_5Vec3fEEEfRKNS2_5Vec4fE@Base 2.4.0
  _ZN8osgEarth10Annotation15AnnotationUtils15createEllipsoidEfffRKN3osg5Vec4fEfffff@Base 2.5.0
  _ZN8osgEarth10Annotation15AnnotationUtils16createHemisphereEfRKN3osg5Vec4fEf@Base 2.4.0
- _ZN8osgEarth10Annotation15AnnotationUtils17UNIFORM_HIGHLIGHTB5cxx11Ev@Base 2.7.0
- _ZN8osgEarth10Annotation15AnnotationUtils17createFadeUniformEv@Base 2.4.0
  _ZN8osgEarth10Annotation15AnnotationUtils17getAltitudePolicyERKNS_9Symbology5StyleERNS1_14AltitudePolicyE@Base 2.4.0
  _ZN8osgEarth10Annotation15AnnotationUtils18createTextDrawableERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKNS_9Symbology10TextSymbolERKN3osg15BoundingBoxImplINSE_5Vec3fEEE@Base 2.8~rc1
  _ZN8osgEarth10Annotation15AnnotationUtils19createImageGeometryEPN3osg5ImageERKNS2_5Vec2sEjdd@Base 2.5.0
  _ZN8osgEarth10Annotation15AnnotationUtils19installTwoPassAlphaEPN3osg4NodeE@Base 2.4.0
  _ZN8osgEarth10Annotation15AnnotationUtils20createFullScreenQuadERKN3osg5Vec4fE@Base 2.4.0
  _ZN8osgEarth10Annotation15AnnotationUtils20installOverlayParentEPN3osg4NodeERKNS_9Symbology5StyleE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15AnnotationUtils22createHighlightUniformEv@Base 2.4.0
  _ZN8osgEarth10Annotation15AnnotationUtils23createEllipsoidGeometryEfffRKN3osg5Vec4fEfffff@Base 2.5.0
  _ZN8osgEarth10Annotation15AnnotationUtils25convertTextSymbolEncodingENS_9Symbology10TextSymbol8EncodingE@Base 2.5.0
  _ZN8osgEarth10Annotation15AnnotationUtils26styleRequiresAlphaBlendingERKNS_9Symbology5StyleE@Base 2.4.0
  _ZN8osgEarth10Annotation15GeoPositionNode10applyStyleERKNS_9Symbology5StyleE@Base 2.8~rc1
  _ZN8osgEarth10Annotation15GeoPositionNode10setMapNodeEPNS_7MapNodeE@Base 2.8~rc1
  _ZN8osgEarth10Annotation15GeoPositionNode11setPositionERKNS_8GeoPointE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNode14setLocalOffsetERKN3osg5Vec3fE@Base 2.8~rc1
+ _ZN8osgEarth10Annotation15GeoPositionNode14setLocalOffsetERKN3osg5Vec3dE@Base 2.10.0
  _ZN8osgEarth10Annotation15GeoPositionNode16setLocalRotationERKN3osg4QuatE@Base 2.8~rc1
  _ZN8osgEarth10Annotation15GeoPositionNode19setOcclusionCullingEb@Base 2.8~rc1
  _ZN8osgEarth10Annotation15GeoPositionNode30setOcclusionCullingMaxAltitudeEd@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNode4initEv@Base 2.8~rc1
  _ZN8osgEarth10Annotation15GeoPositionNode5dirtyEv@Base 2.8~rc1
  _ZN8osgEarth10Annotation15GeoPositionNode6acceptERN3osg11NodeVisitorE@Base 2.8~rc1
  _ZN8osgEarth10Annotation15GeoPositionNode8setScaleERKN3osg5Vec3fE@Base 2.8~rc1
+ _ZN8osgEarth10Annotation15GeoPositionNode9constructEv@Base 2.10.0
  _ZN8osgEarth10Annotation15GeoPositionNode9setConfigERKNS_6ConfigE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNodeC1EPNS_7MapNodeE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNodeC1EPNS_7MapNodeERKNS_6ConfigE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNodeC1EPNS_7MapNodeERKNS_8GeoPointE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNodeC1ERKS1_RKN3osg6CopyOpE@Base 2.8~rc1
+ _ZN8osgEarth10Annotation15GeoPositionNodeC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation15GeoPositionNodeC1Ev@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNodeC2EPNS_7MapNodeE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNodeC2EPNS_7MapNodeERKNS_6ConfigE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNodeC2EPNS_7MapNodeERKNS_8GeoPointE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNodeC2ERKS1_RKN3osg6CopyOpE@Base 2.8~rc1
+ _ZN8osgEarth10Annotation15GeoPositionNodeC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation15GeoPositionNodeC2Ev@Base 2.8~rc1
  _ZN8osgEarth10Annotation15GeoPositionNodeD0Ev@Base 2.8~rc1
  _ZN8osgEarth10Annotation15GeoPositionNodeD1Ev@Base 2.8~rc1
@@ -395,25 +382,19 @@
  _ZN8osgEarth10Annotation17LocalGeometryNode10setMapNodeEPNS_7MapNodeE@Base 2.8~rc1
  _ZN8osgEarth10Annotation17LocalGeometryNode11onTileAddedERKNS_7TileKeyEPN3osg4NodeERNS_22TerrainCallbackContextE@Base 2.8~rc1
  _ZN8osgEarth10Annotation17LocalGeometryNode11setGeometryEPNS_9Symbology8GeometryE@Base 2.4.0
- _ZN8osgEarth10Annotation17LocalGeometryNode12initGeometryEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation17LocalGeometryNode14setLocalOffsetERKN3osg5Vec3fE@Base 2.9.0
- _ZN8osgEarth10Annotation17LocalGeometryNode22applyAltitudeSymbologyERKNS_9Symbology5StyleE@Base 2.8~rc1
- _ZN8osgEarth10Annotation17LocalGeometryNode4initEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth10Annotation17LocalGeometryNode11setPositionERKNS_8GeoPointE@Base 2.10.0
+ _ZN8osgEarth10Annotation17LocalGeometryNode15compileGeometryEv@Base 2.10.0
+ _ZN8osgEarth10Annotation17LocalGeometryNode23togglePerVertexClampingEv@Base 2.10.0
  _ZN8osgEarth10Annotation17LocalGeometryNode5clampEPN3osg4NodeEPKNS_7TerrainE@Base 2.9.0
- _ZN8osgEarth10Annotation17LocalGeometryNode5dirtyEv@Base 2.8~rc1
- _ZN8osgEarth10Annotation17LocalGeometryNode7setNodeEPN3osg4NodeE@Base 2.4.0
- _ZN8osgEarth10Annotation17LocalGeometryNode8initNodeEv@Base 2.4.0
+ _ZN8osgEarth10Annotation17LocalGeometryNode7reclampEv@Base 2.10.0
  _ZN8osgEarth10Annotation17LocalGeometryNode8setStyleERKNS_9Symbology5StyleE@Base 2.4.0
  _ZN8osgEarth10Annotation17LocalGeometryNode8traverseERN3osg11NodeVisitorE@Base 2.9.0
- _ZN8osgEarth10Annotation17LocalGeometryNodeC1EPNS_7MapNodeE@Base 2.8~rc1
- _ZN8osgEarth10Annotation17LocalGeometryNodeC1EPNS_7MapNodeEPN3osg4NodeERKNS_9Symbology5StyleE@Base 2.4.0
- _ZN8osgEarth10Annotation17LocalGeometryNodeC1EPNS_7MapNodeEPNS_9Symbology8GeometryERKNS4_5StyleE@Base 2.4.0
- _ZN8osgEarth10Annotation17LocalGeometryNodeC1EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth10Annotation17LocalGeometryNode9constructEv@Base 2.10.0
+ _ZN8osgEarth10Annotation17LocalGeometryNodeC1EPNS_9Symbology8GeometryERKNS2_5StyleE@Base 2.10.0
+ _ZN8osgEarth10Annotation17LocalGeometryNodeC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation17LocalGeometryNodeC1Ev@Base 2.8~rc1
- _ZN8osgEarth10Annotation17LocalGeometryNodeC2EPNS_7MapNodeE@Base 2.8~rc1
- _ZN8osgEarth10Annotation17LocalGeometryNodeC2EPNS_7MapNodeEPN3osg4NodeERKNS_9Symbology5StyleE@Base 2.4.0
- _ZN8osgEarth10Annotation17LocalGeometryNodeC2EPNS_7MapNodeEPNS_9Symbology8GeometryERKNS4_5StyleE@Base 2.4.0
- _ZN8osgEarth10Annotation17LocalGeometryNodeC2EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth10Annotation17LocalGeometryNodeC2EPNS_9Symbology8GeometryERKNS2_5StyleE@Base 2.10.0
+ _ZN8osgEarth10Annotation17LocalGeometryNodeC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation17LocalGeometryNodeC2Ev@Base 2.8~rc1
  _ZN8osgEarth10Annotation17LocalGeometryNodeD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation17LocalGeometryNodeD1Ev@Base 2.4.0
@@ -423,10 +404,7 @@
  _ZN8osgEarth10Annotation18AnnotationRegistryD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation18AnnotationRegistryD1Ev@Base 2.4.0
  _ZN8osgEarth10Annotation18AnnotationRegistryD2Ev@Base 2.4.0
- _ZN8osgEarth10Annotation18AnnotationSettings16_autoDepthOffsetE@Base 2.4.0
- _ZN8osgEarth10Annotation18AnnotationSettings19_continuousClampingE@Base 2.4.0
  _ZN8osgEarth10Annotation18AnnotationSettings28_occlusionCullingMaxAltitudeE@Base 2.5.0
- _ZN8osgEarth10Annotation18AnnotationSettings33_occlusionCullingHeightAdjustmentE@Base 2.5.0
  _ZN8osgEarth10Annotation18ImageOverlayEditor10addDraggerENS0_12ImageOverlay12ControlPointE@Base 2.4.0
  _ZN8osgEarth10Annotation18ImageOverlayEditor14updateDraggersEv@Base 2.4.0
  _ZN8osgEarth10Annotation18ImageOverlayEditorC1EPNS0_12ImageOverlayEb@Base 2.5.0
@@ -450,7 +428,6 @@
  _ZN8osgEarth10Annotation21GeoPositionNodeEditorD0Ev@Base 2.8~rc1
  _ZN8osgEarth10Annotation21GeoPositionNodeEditorD1Ev@Base 2.8~rc1
  _ZN8osgEarth10Annotation21GeoPositionNodeEditorD2Ev@Base 2.8~rc1
- _ZN8osgEarth10Annotation22AnnotationLayerOptions10fromConfigERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth10Annotation22AnnotationLayerOptions11mergeConfigERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth10Annotation22AnnotationLayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth10Annotation22AnnotationLayerOptionsD1Ev@Base 2.9.0
@@ -508,57 +485,56 @@
  _ZN8osgEarth10Annotation7DraggerD2Ev@Base 2.7.0
  _ZN8osgEarth10Annotation9LabelNode10setDynamicEb@Base 2.4.0
  _ZN8osgEarth10Annotation9LabelNode11setPriorityEf@Base 2.8~rc1
+ _ZN8osgEarth10Annotation9LabelNode15s_geodeStateSetE@Base 2.10.0
  _ZN8osgEarth10Annotation9LabelNode16updateLayoutDataEv@Base 2.8~rc1
- _ZN8osgEarth10Annotation9LabelNode4initERKNS_9Symbology5StyleE@Base 2.4.0
  _ZN8osgEarth10Annotation9LabelNode5dirtyEv@Base 2.8~rc1
  _ZN8osgEarth10Annotation9LabelNode6acceptERN3osg11NodeVisitorE@Base 2.4.0
+ _ZN8osgEarth10Annotation9LabelNode7compileEv@Base 2.10.0
  _ZN8osgEarth10Annotation9LabelNode7setTextERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth10Annotation9LabelNode8setStyleERKNS_9Symbology5StyleE@Base 2.4.0
- _ZN8osgEarth10Annotation9LabelNodeC1EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation9LabelNodeC1EPNS_7MapNodeERKNS_8GeoPointERKNS_9Symbology5StyleE@Base 2.4.0
- _ZN8osgEarth10Annotation9LabelNodeC1EPNS_7MapNodeERKNS_8GeoPointERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKNS_9Symbology10TextSymbolE@Base 2.7.0
- _ZN8osgEarth10Annotation9LabelNodeC1EPNS_7MapNodeERKNS_8GeoPointERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleE@Base 2.7.0
- _ZN8osgEarth10Annotation9LabelNodeC1EPNS_7MapNodeERKNS_9Symbology5StyleE@Base 2.4.0
+ _ZN8osgEarth10Annotation9LabelNode9constructEv@Base 2.10.0
+ _ZN8osgEarth10Annotation9LabelNodeC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation9LabelNodeC1ERKNS_8GeoPointERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleE@Base 2.10.0
  _ZN8osgEarth10Annotation9LabelNodeC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleE@Base 2.7.0
- _ZN8osgEarth10Annotation9LabelNodeC1ERKS1_RKN3osg6CopyOpE@Base 2.8~rc1
- _ZN8osgEarth10Annotation9LabelNodeC2EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation9LabelNodeC2EPNS_7MapNodeERKNS_8GeoPointERKNS_9Symbology5StyleE@Base 2.4.0
- _ZN8osgEarth10Annotation9LabelNodeC2EPNS_7MapNodeERKNS_8GeoPointERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKNS_9Symbology10TextSymbolE@Base 2.7.0
- _ZN8osgEarth10Annotation9LabelNodeC2EPNS_7MapNodeERKNS_8GeoPointERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleE@Base 2.7.0
- _ZN8osgEarth10Annotation9LabelNodeC2EPNS_7MapNodeERKNS_9Symbology5StyleE@Base 2.4.0
+ _ZN8osgEarth10Annotation9LabelNodeC1Ev@Base 2.10.0
+ _ZN8osgEarth10Annotation9LabelNodeC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation9LabelNodeC2ERKNS_8GeoPointERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleE@Base 2.10.0
  _ZN8osgEarth10Annotation9LabelNodeC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleE@Base 2.7.0
- _ZN8osgEarth10Annotation9LabelNodeC2ERKS1_RKN3osg6CopyOpE@Base 2.8~rc1
+ _ZN8osgEarth10Annotation9LabelNodeC2Ev@Base 2.10.0
  _ZN8osgEarth10Annotation9LabelNodeD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation9LabelNodeD1Ev@Base 2.4.0
  _ZN8osgEarth10Annotation9LabelNodeD2Ev@Base 2.4.0
- _ZN8osgEarth10Annotation9ModelNode4initEv@Base 2.4.0
+ _ZN8osgEarth10Annotation9ModelNode12compileModelEv@Base 2.10.0
  _ZN8osgEarth10Annotation9ModelNode8setStyleERKNS_9Symbology5StyleE@Base 2.4.0
- _ZN8osgEarth10Annotation9ModelNodeC1EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth10Annotation9ModelNode9constructEv@Base 2.10.0
  _ZN8osgEarth10Annotation9ModelNodeC1EPNS_7MapNodeERKNS_9Symbology5StyleEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation9ModelNodeC2EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth10Annotation9ModelNodeC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation9ModelNodeC2EPNS_7MapNodeERKNS_9Symbology5StyleEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth10Annotation9ModelNodeC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth10Annotation9ModelNodeD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation9ModelNodeD1Ev@Base 2.4.0
  _ZN8osgEarth10Annotation9ModelNodeD2Ev@Base 2.4.0
  _ZN8osgEarth10Annotation9PlaceNode10setDynamicEb@Base 2.4.0
  _ZN8osgEarth10Annotation9PlaceNode11setPriorityEf@Base 2.8~rc1
  _ZN8osgEarth10Annotation9PlaceNode12setIconImageEPN3osg5ImageE@Base 2.4.0
+ _ZN8osgEarth10Annotation9PlaceNode15s_geodeStateSetE@Base 2.10.0
+ _ZN8osgEarth10Annotation9PlaceNode15s_imageStateSetE@Base 2.10.0
  _ZN8osgEarth10Annotation9PlaceNode16updateLayoutDataEv@Base 2.8~rc1
- _ZN8osgEarth10Annotation9PlaceNode4initEv@Base 2.4.0
  _ZN8osgEarth10Annotation9PlaceNode5dirtyEv@Base 2.8~rc1
  _ZN8osgEarth10Annotation9PlaceNode6acceptERN3osg11NodeVisitorE@Base 2.4.0
+ _ZN8osgEarth10Annotation9PlaceNode7compileEv@Base 2.10.0
  _ZN8osgEarth10Annotation9PlaceNode7setTextERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth10Annotation9PlaceNode8setStyleERKNS_9Symbology5StyleE@Base 2.4.0
+ _ZN8osgEarth10Annotation9PlaceNode8setStyleERKNS_9Symbology5StyleEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation9PlaceNode9constructEv@Base 2.10.0
  _ZN8osgEarth10Annotation9PlaceNode9setConfigERKNS_6ConfigE@Base 2.8~rc1
- _ZN8osgEarth10Annotation9PlaceNodeC1EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation9PlaceNodeC1EPNS_7MapNodeERKNS_8GeoPointEPN3osg5ImageERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleE@Base 2.7.0
- _ZN8osgEarth10Annotation9PlaceNodeC1EPNS_7MapNodeERKNS_8GeoPointERKNS_9Symbology5StyleEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation9PlaceNodeC1EPNS_7MapNodeERKNS_8GeoPointERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleE@Base 2.7.0
+ _ZN8osgEarth10Annotation9PlaceNodeC1ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation9PlaceNodeC1ERKNS_8GeoPointERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleEPN3osg5ImageE@Base 2.10.0
+ _ZN8osgEarth10Annotation9PlaceNodeC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleEPN3osg5ImageE@Base 2.10.0
  _ZN8osgEarth10Annotation9PlaceNodeC1Ev@Base 2.8~rc1
- _ZN8osgEarth10Annotation9PlaceNodeC2EPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation9PlaceNodeC2EPNS_7MapNodeERKNS_8GeoPointEPN3osg5ImageERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleE@Base 2.7.0
- _ZN8osgEarth10Annotation9PlaceNodeC2EPNS_7MapNodeERKNS_8GeoPointERKNS_9Symbology5StyleEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth10Annotation9PlaceNodeC2EPNS_7MapNodeERKNS_8GeoPointERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleE@Base 2.7.0
+ _ZN8osgEarth10Annotation9PlaceNodeC2ERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ _ZN8osgEarth10Annotation9PlaceNodeC2ERKNS_8GeoPointERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleEPN3osg5ImageE@Base 2.10.0
+ _ZN8osgEarth10Annotation9PlaceNodeC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_9Symbology5StyleEPN3osg5ImageE@Base 2.10.0
  _ZN8osgEarth10Annotation9PlaceNodeC2Ev@Base 2.8~rc1
  _ZN8osgEarth10Annotation9PlaceNodeD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation9PlaceNodeD1Ev@Base 2.4.0
@@ -566,13 +542,16 @@
  _ZN8osgEarth10Annotation9TrackNode11addDrawableERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN3osg8DrawableE@Base 2.7.0
  _ZN8osgEarth10Annotation9TrackNode11setPriorityEf@Base 2.8~rc1
  _ZN8osgEarth10Annotation9TrackNode13setFieldValueERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKN7osgText6StringE@Base 2.7.0
+ _ZN8osgEarth10Annotation9TrackNode15s_geodeStateSetE@Base 2.10.0
+ _ZN8osgEarth10Annotation9TrackNode15s_imageStateSetE@Base 2.10.0
  _ZN8osgEarth10Annotation9TrackNode16updateLayoutDataEv@Base 2.8~rc1
- _ZN8osgEarth10Annotation9TrackNode4initERKNS_8fast_mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_14TrackNodeFieldEEE@Base 2.7.0
  _ZN8osgEarth10Annotation9TrackNode6acceptERN3osg11NodeVisitorE@Base 2.4.0
- _ZN8osgEarth10Annotation9TrackNodeC1EPNS_7MapNodeERKNS_8GeoPointEPN3osg5ImageERKNS_8fast_mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_14TrackNodeFieldEEE@Base 2.7.0
- _ZN8osgEarth10Annotation9TrackNodeC1EPNS_7MapNodeERKNS_8GeoPointERKNS_9Symbology5StyleERKNS_8fast_mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_14TrackNodeFieldEEE@Base 2.7.0
- _ZN8osgEarth10Annotation9TrackNodeC2EPNS_7MapNodeERKNS_8GeoPointEPN3osg5ImageERKNS_8fast_mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_14TrackNodeFieldEEE@Base 2.7.0
- _ZN8osgEarth10Annotation9TrackNodeC2EPNS_7MapNodeERKNS_8GeoPointERKNS_9Symbology5StyleERKNS_8fast_mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_14TrackNodeFieldEEE@Base 2.7.0
+ _ZN8osgEarth10Annotation9TrackNode7compileEv@Base 2.10.0
+ _ZN8osgEarth10Annotation9TrackNode9constructEv@Base 2.10.0
+ _ZN8osgEarth10Annotation9TrackNodeC1ERKNS_8GeoPointEPN3osg5ImageERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_14TrackNodeFieldESt4lessISE_ESaISt4pairIKSE_SF_EEE@Base 2.10.0
+ _ZN8osgEarth10Annotation9TrackNodeC1ERKNS_8GeoPointERKNS_9Symbology5StyleERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_14TrackNodeFieldESt4lessISF_ESaISt4pairIKSF_SG_EEE@Base 2.10.0
+ _ZN8osgEarth10Annotation9TrackNodeC2ERKNS_8GeoPointEPN3osg5ImageERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_14TrackNodeFieldESt4lessISE_ESaISt4pairIKSE_SF_EEE@Base 2.10.0
+ _ZN8osgEarth10Annotation9TrackNodeC2ERKNS_8GeoPointERKNS_9Symbology5StyleERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_14TrackNodeFieldESt4lessISF_ESaISt4pairIKSF_SG_EEE@Base 2.10.0
  _ZN8osgEarth10Annotation9TrackNodeD0Ev@Base 2.4.0
  _ZN8osgEarth10Annotation9TrackNodeD1Ev@Base 2.4.0
  _ZN8osgEarth10Annotation9TrackNodeD2Ev@Base 2.4.0
@@ -582,12 +561,18 @@
  _ZN8osgEarth10URIContextD0Ev@Base 2.4.0
  _ZN8osgEarth10URIContextD1Ev@Base 2.4.0
  _ZN8osgEarth10URIContextD2Ev@Base 2.4.0
+ _ZN8osgEarth11Serializers9PlaceNode26wrapper_propfunc_PlaceNodeEPN5osgDB13ObjectWrapperE@Base 2.10.0
  _ZN8osgEarth12LayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD2Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_10Annotation15AnnotationLayerENS_5LayerEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_10Annotation15AnnotationLayerENS_5LayerEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_10Annotation15AnnotationLayerENS_5LayerEED2Ev@Base 2.9.0
+ _ZN8osgEarth13ShaderOptions7SamplerD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptions7SamplerD2Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD0Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD2Ev@Base 2.10.1
  _ZN8osgEarth15GeometryClamperD1Ev@Base 2.8~rc1
  _ZN8osgEarth15TerrainCallback11onTileAddedERKNS_7TileKeyEPN3osg4NodeERNS_22TerrainCallbackContextE@Base 2.6.0
  _ZN8osgEarth15TerrainCallbackD0Ev@Base 2.4.0
@@ -610,10 +595,6 @@
  (optional=templinst)_ZN8osgEarth22TerrainCallbackAdapterINS_10Annotation11FeatureNodeEED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth22TerrainCallbackAdapterINS_10Annotation11FeatureNodeEED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth22TerrainCallbackAdapterINS_10Annotation11FeatureNodeEED2Ev@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth22TerrainCallbackAdapterINS_10Annotation12ImageOverlayEE11onTileAddedERKNS_7TileKeyEPN3osg4NodeERNS_22TerrainCallbackContextE@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth22TerrainCallbackAdapterINS_10Annotation12ImageOverlayEED0Ev@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth22TerrainCallbackAdapterINS_10Annotation12ImageOverlayEED1Ev@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth22TerrainCallbackAdapterINS_10Annotation12ImageOverlayEED2Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth22TerrainCallbackAdapterINS_10Annotation17LocalGeometryNodeEE11onTileAddedERKNS_7TileKeyEPN3osg4NodeERNS_22TerrainCallbackContextE@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth22TerrainCallbackAdapterINS_10Annotation17LocalGeometryNodeEED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth22TerrainCallbackAdapterINS_10Annotation17LocalGeometryNodeEED1Ev@Base 2.8~rc1
@@ -624,17 +605,12 @@
  _ZN8osgEarth5Layer10addedToMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth5Layer14removedFromMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth5Layer18getSequenceControlEv@Base 2.9.0
- _ZN8osgEarth5Layer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9.0
  _ZN8osgEarth5Units7convertERKS0_S2_dRd@Base 2.9.0
- _ZN8osgEarth5UnitsC1ERKS0_@Base 2.8~rc1
- _ZN8osgEarth5UnitsC2ERKS0_@Base 2.8~rc1
  _ZN8osgEarth5UnitsD1Ev@Base 2.4.0
  _ZN8osgEarth5UnitsD2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth6Config3addINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth6Config3addIdEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth6Config6addObjINS_8DistanceEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
- (optional=templinst)_ZN8osgEarth6Config6updateIdEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
- (optional=templinst)_ZN8osgEarth6Config8addIfSetINS_3URIEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
+ (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth6Config3setIdEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
+ _ZN8osgEarth6Config6removeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZN8osgEarth6ConfigC1ERKS0_@Base 2.4.0
  _ZN8osgEarth6ConfigC2ERKS0_@Base 2.4.0
  _ZN8osgEarth8DistanceD1Ev@Base 2.8~rc1
@@ -656,9 +632,15 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_12ShaderPolicyEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_12ShaderPolicyEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_12ShaderPolicyEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED0Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED1Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED2Ev@Base 2.10.1
  (optional=templinst)_ZN8osgEarth8optionalINS_16GeoInterpolationEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_16GeoInterpolationEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_16GeoInterpolationEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED0Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED2Ev@Base 2.10.0
  (optional=templinst)_ZN8osgEarth8optionalINS_3URIEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_3URIEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_3URIEED2Ev@Base 2.4.0
@@ -680,9 +662,6 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology16StringExpressionEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology16StringExpressionEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology16StringExpressionEED2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5StyleEED0Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5StyleEED1Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5StyleEED2Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED0Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8optionalINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED1Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8optionalINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED2Ev@Base 2.7.0
@@ -938,8 +917,11 @@
  _ZNK8osgEarth10Annotation14AnnotationNode9getConfigEv@Base 2.4.0
  _ZNK8osgEarth10Annotation15AddPointHandler14getMouseButtonEv@Base 2.4.0
  _ZNK8osgEarth10Annotation15AnnotationLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth10Annotation15AnnotationLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth10Annotation15AnnotationLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth10Annotation15AnnotationLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth10Annotation15AnnotationLayer7getNodeEv@Base 2.10.0
+ _ZNK8osgEarth10Annotation15AnnotationLayer8getGroupEv@Base 2.10.0
  _ZNK8osgEarth10Annotation15AnnotationLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth10Annotation15AnnotationLayer9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth10Annotation15GeoPositionNode11libraryNameEv@Base 2.8~rc1
@@ -957,15 +939,15 @@
  _ZNK8osgEarth10Annotation18AnnotationRegistry9getConfigEPN3osg4NodeE@Base 2.4.0
  _ZNK8osgEarth10Annotation20ControlPointCallback12computeBoundERKN3osg4NodeE@Base 2.7.0
  _ZNK8osgEarth10Annotation22AnnotationLayerOptions9getConfigEv@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_10CircleNodeEE6createEPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_11EllipseNodeEE6createEPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_11FeatureNodeEE6createEPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_12ImageOverlayEE6createEPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_13RectangleNodeEE6createEPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_17LocalGeometryNodeEE6createEPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_9LabelNodeEE6createEPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_9ModelNodeEE6createEPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
- (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_9PlaceNodeEE6createEPNS_7MapNodeERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.4.0
+ (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_10CircleNodeEE6createERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_11EllipseNodeEE6createERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_11FeatureNodeEE6createERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_12ImageOverlayEE6createERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_13RectangleNodeEE6createERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_17LocalGeometryNodeEE6createERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_9LabelNodeEE6createERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_9ModelNodeEE6createERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth10Annotation27AnnotationRegistrationProxyINS0_9PlaceNodeEE6createERKNS_6ConfigEPKN5osgDB7OptionsE@Base 2.10.0
  _ZNK8osgEarth10Annotation7Dragger10getHoveredEv@Base 2.7.0
  _ZNK8osgEarth10Annotation7Dragger11getDraggingEv@Base 2.7.0
  _ZNK8osgEarth10Annotation9LabelNode11libraryNameEv@Base 2.4.0
@@ -999,29 +981,34 @@
  (optional=templinst)_ZNK8osgEarth16qualified_doubleINS_5AngleEE17asParseableStringB5cxx11Ev@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNK8osgEarth16qualified_doubleINS_5AngleEE8asStringB5cxx11Ev@Base 2.8~rc1
  (optional=templinst)_ZNK8osgEarth16qualified_doubleINS_8DistanceEE17asParseableStringB5cxx11Ev@Base 2.8~rc1
- (optional=templinst|arch=!armel !armhf !hppa !hurd-i386 !i386 !m68k !mips !mipsel !powerpc !sh4)_ZNK8osgEarth16qualified_doubleINS_8DistanceEE8asStringB5cxx11Ev@Base 2.8~rc1
+ (optional=templinst|arch=!armel !armhf !hppa !hurd-i386 !i386 !m68k !mips !mipsel !powerpc !powerpcspe !sh4 !x32)_ZNK8osgEarth16qualified_doubleINS_8DistanceEE8asStringB5cxx11Ev@Base 2.8~rc1
  _ZNK8osgEarth5Angle17asParseableStringB5cxx11Ev@Base 2.7.0
- _ZNK8osgEarth5Layer21modifyTileBoundingBoxERKNS_7TileKeyERN3osg15BoundingBoxImplINS4_5Vec3fEEE@Base 2.9.0
- (arch=!mips !mipsel)_ZNK8osgEarth6Config5valueERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIN3osg7Texture10FilterModeES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
  (optional=templinst)_ZNK8osgEarth6Config5valueIdEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES2_@Base 2.7.0
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetIN3osg7Texture10FilterModeES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc1
- (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe)_ZNK8osgEarth6Config8getIfSetINS_3URIEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEB5cxx11Ev@Base 2.9.0
- (optional=templinst|arch=hurd-i386)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEv@Base 2.9.0
+ (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEv@Base 2.9.0
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.6.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE9push_backERKS1_@Base 2.9.0
+ (optional=templinst|arch=mips mipsel)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE9push_backERKS1_@Base 2.10.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
- (optional=templinst|arch=alpha mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
+ (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sh4 !sparc !sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveEj@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveEm@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
- (optional=templinst|arch=alpha mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
+ (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EEaSERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EEaSERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth3URIESaIS1_EEaSERKS3_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology16StringExpression2OpENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESaISB_EEaSERKSD_@Base 2.7.0
- (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN3osg8DrawableEESaISA_EE17_M_realloc_insertIJSA_EEEvN9__gnu_cxx17__normal_iteratorIPSA_SC_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjESaIS7_EEaSERKS9_@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIhSaIhEE17_M_realloc_insertIJRKhEEEvN9__gnu_cxx17__normal_iteratorIPhS1_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 2.9.0
@@ -1033,17 +1020,28 @@
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
  (optional=templinst|arch=hurd-i386)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.7.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.7.0
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEaSERKS4_@Base 2.10.1
  (optional=templinst)_ZNSt8_Rb_treeIN7osgUtil22LineSegmentIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIN8osgEarth10Annotation12ImageOverlay12ControlPointESt4pairIKS3_N3osg7ref_ptrINS1_7DraggerEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS5_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth10Annotation12ImageOverlay12ControlPointESt4pairIKS3_N3osg7ref_ptrINS1_7DraggerEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS5_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth10Annotation12ImageOverlay12ControlPointESt4pairIKS3_N3osg7ref_ptrINS1_7DraggerEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE8_M_eraseEPSt13_Rb_tree_nodeISA_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth20PrimitiveIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.10.1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EEaSERKSI_@Base 2.10.1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth10Annotation14TrackNodeFieldEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE7_M_copyINSH_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeISB_EPKSL_PSt18_Rb_tree_node_baseRT_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth10Annotation14TrackNodeFieldEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth10Annotation14TrackNodeFieldEESt10_Select1stISB_ESt4lessIS5_ESaISB_EEaSERKSH_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN8osgEarth10Annotation17AnnotationFactoryEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESN_IJEEEEESt17_Rb_tree_iteratorISC_ESt23_Rb_tree_const_iteratorISC_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN8osgEarth10Annotation17AnnotationFactoryEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN8osgEarth10Annotation17AnnotationFactoryEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN8osgEarth10Annotation17AnnotationFactoryEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN8osgEarth10Annotation17AnnotationFactoryEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_PSt18_Rb_tree_node_baseRT_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EEaSERKSE_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIPN3osg5ArrayESt4pairIKS2_N8osgEarth15GeometryClamper12GeometryDataEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.10.0
  _ZTI15DraggerCallback@Base 2.4.0
  _ZTI15OverlayCallback@Base 2.4.0
  _ZTI16SetCornerDragger@Base 2.4.0
@@ -1059,6 +1057,7 @@
  _ZTIN3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EEE@Base 2.4.0
  _ZTIN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EEE@Base 2.4.0
  _ZTIN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EEE@Base 2.4.0
+ _ZTIN3osg14StateAttributeE@Base 2.10.0
  _ZTIN3osg4Node29ComputeBoundingSphereCallbackE@Base 2.7.0
  _ZTIN3osg8CallbackE@Base 2.8~rc1
  _ZTIN5osgDB14BaseSerializerE@Base 2.8~rc1
@@ -1117,7 +1116,6 @@
  _ZTIN8osgEarth18IntersectionPickerE@Base 2.7.0
  _ZTIN8osgEarth21ScreenSpaceLayoutDataE@Base 2.8~rc1
  _ZTIN8osgEarth22TerrainCallbackAdapterINS_10Annotation11FeatureNodeEEE@Base 2.8~rc1
- _ZTIN8osgEarth22TerrainCallbackAdapterINS_10Annotation12ImageOverlayEEE@Base 2.8~rc1
  _ZTIN8osgEarth22TerrainCallbackAdapterINS_10Annotation17LocalGeometryNodeEEE@Base 2.8~rc1
  _ZTIN8osgEarth3URIE@Base 2.4.0
  _ZTIN8osgEarth5AngleE@Base 2.7.0
@@ -1127,7 +1125,9 @@
  _ZTIN8osgEarth8optionalIN3osg7Texture10FilterModeEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.9.0
  _ZTIN8osgEarth8optionalINS_12ShaderPolicyEEE@Base 2.4.0
+ _ZTIN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTIN8osgEarth8optionalINS_16GeoInterpolationEEE@Base 2.4.0
+ _ZTIN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTIN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_5AngleEEE@Base 2.7.0
  _ZTIN8osgEarth8optionalINS_8DateTimeEEE@Base 2.8~rc1
@@ -1135,7 +1135,6 @@
  _ZTIN8osgEarth8optionalINS_8Features21ResampleFilterOptions12ResampleModeEEE@Base 2.8~rc1
  _ZTIN8osgEarth8optionalINS_8GeoPointEEE@Base 2.7.0
  _ZTIN8osgEarth8optionalINS_9Symbology16StringExpressionEEE@Base 2.4.0
- _ZTIN8osgEarth8optionalINS_9Symbology5StyleEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.7.0
  _ZTIN8osgEarth8optionalIbEE@Base 2.4.0
  _ZTIN8osgEarth8optionalIdEE@Base 2.4.0
@@ -1158,6 +1157,7 @@
  _ZTSN3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EEE@Base 2.4.0
  _ZTSN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EEE@Base 2.4.0
  _ZTSN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EEE@Base 2.4.0
+ _ZTSN3osg14StateAttributeE@Base 2.10.0
  _ZTSN3osg4Node29ComputeBoundingSphereCallbackE@Base 2.7.0
  _ZTSN3osg8CallbackE@Base 2.8~rc1
  _ZTSN5osgDB14BaseSerializerE@Base 2.8~rc1
@@ -1216,7 +1216,6 @@
  _ZTSN8osgEarth18IntersectionPickerE@Base 2.7.0
  _ZTSN8osgEarth21ScreenSpaceLayoutDataE@Base 2.8~rc1
  _ZTSN8osgEarth22TerrainCallbackAdapterINS_10Annotation11FeatureNodeEEE@Base 2.8~rc1
- _ZTSN8osgEarth22TerrainCallbackAdapterINS_10Annotation12ImageOverlayEEE@Base 2.8~rc1
  _ZTSN8osgEarth22TerrainCallbackAdapterINS_10Annotation17LocalGeometryNodeEEE@Base 2.8~rc1
  _ZTSN8osgEarth3URIE@Base 2.4.0
  _ZTSN8osgEarth5AngleE@Base 2.7.0
@@ -1226,7 +1225,9 @@
  _ZTSN8osgEarth8optionalIN3osg7Texture10FilterModeEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.9.0
  _ZTSN8osgEarth8optionalINS_12ShaderPolicyEEE@Base 2.4.0
+ _ZTSN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTSN8osgEarth8optionalINS_16GeoInterpolationEEE@Base 2.4.0
+ _ZTSN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTSN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_5AngleEEE@Base 2.7.0
  _ZTSN8osgEarth8optionalINS_8DateTimeEEE@Base 2.8~rc1
@@ -1234,7 +1235,6 @@
  _ZTSN8osgEarth8optionalINS_8Features21ResampleFilterOptions12ResampleModeEEE@Base 2.8~rc1
  _ZTSN8osgEarth8optionalINS_8GeoPointEEE@Base 2.7.0
  _ZTSN8osgEarth8optionalINS_9Symbology16StringExpressionEEE@Base 2.4.0
- _ZTSN8osgEarth8optionalINS_9Symbology5StyleEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.7.0
  _ZTSN8osgEarth8optionalIbEE@Base 2.4.0
  _ZTSN8osgEarth8optionalIdEE@Base 2.4.0
@@ -1314,7 +1314,6 @@
  _ZTVN8osgEarth18IntersectionPickerE@Base 2.7.0
  _ZTVN8osgEarth21ScreenSpaceLayoutDataE@Base 2.8~rc1
  _ZTVN8osgEarth22TerrainCallbackAdapterINS_10Annotation11FeatureNodeEEE@Base 2.8~rc1
- _ZTVN8osgEarth22TerrainCallbackAdapterINS_10Annotation12ImageOverlayEEE@Base 2.8~rc1
  _ZTVN8osgEarth22TerrainCallbackAdapterINS_10Annotation17LocalGeometryNodeEEE@Base 2.8~rc1
  _ZTVN8osgEarth3URIE@Base 2.4.0
  _ZTVN8osgEarth5AngleE@Base 2.7.0
@@ -1324,7 +1323,9 @@
  _ZTVN8osgEarth8optionalIN3osg7Texture10FilterModeEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.9.0
  _ZTVN8osgEarth8optionalINS_12ShaderPolicyEEE@Base 2.4.0
+ _ZTVN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTVN8osgEarth8optionalINS_16GeoInterpolationEEE@Base 2.4.0
+ _ZTVN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTVN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_5AngleEEE@Base 2.7.0
  _ZTVN8osgEarth8optionalINS_8DateTimeEEE@Base 2.8~rc1
@@ -1332,7 +1333,6 @@
  _ZTVN8osgEarth8optionalINS_8Features21ResampleFilterOptions12ResampleModeEEE@Base 2.8~rc1
  _ZTVN8osgEarth8optionalINS_8GeoPointEEE@Base 2.7.0
  _ZTVN8osgEarth8optionalINS_9Symbology16StringExpressionEEE@Base 2.4.0
- _ZTVN8osgEarth8optionalINS_9Symbology5StyleEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.7.0
  _ZTVN8osgEarth8optionalIbEE@Base 2.4.0
  _ZTVN8osgEarth8optionalIdEE@Base 2.4.0
diff -Nru osgearth-2.9.0+dfsg/debian/libosgearthfeatures5.lintian-overrides osgearth-2.10.2+dfsg/debian/libosgearthfeatures5.lintian-overrides
--- osgearth-2.9.0+dfsg/debian/libosgearthfeatures5.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/libosgearthfeatures5.lintian-overrides	2019-04-20 05:25:43.000000000 +0000
@@ -0,0 +1,3 @@
+# Uses __FILE__ macro
+file-references-package-build-path *
+
diff -Nru osgearth-2.9.0+dfsg/debian/libosgearthfeatures5.symbols osgearth-2.10.2+dfsg/debian/libosgearthfeatures5.symbols
--- osgearth-2.9.0+dfsg/debian/libosgearthfeatures5.symbols	2018-02-07 17:53:05.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/libosgearthfeatures5.symbols	2019-04-20 06:08:11.000000000 +0000
@@ -1,6 +1,11 @@
-# SymbolsHelper-Confirmed: 2.9.0 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64
+# SymbolsHelper-Confirmed: 2.10.1 amd64
 libosgEarthFeatures.so.5 #PACKAGE# #MINVER#
+* Build-Depends-Package: libosgearth-dev
+ _Z10IsFieldSetPvi@Base 2.10.0
+ _Z10decodeLineRKN6mapnik6vector12tile_featureERKN8osgEarth7TileKeyEj@Base 2.10.0
+ _Z11decodePointRKN6mapnik6vector12tile_featureERKN8osgEarth7TileKeyEj@Base 2.10.0
  _Z12tileGeometryPN8osgEarth9Symbology8GeometryEPKNS_16SpatialReferenceEjjRSt6vectorIN3osg7ref_ptrIS1_EESaIS9_EE@Base 2.8~rc1
+ _Z13decodePolygonRKN6mapnik6vector12tile_featureERKN8osgEarth7TileKeyEj@Base 2.10.0
  _Z14zig_zag_decodei@Base 2.8~rc1
  _Z16downsizeGeometryPN8osgEarth9Symbology8GeometryEPKNS_16SpatialReferenceEjRSt6vectorIN3osg7ref_ptrIS1_EESaIS9_EE@Base 2.8~rc1
  _Z17tesselateGeometryPN3osg8GeometryE@Base 2.8~rc1
@@ -9,13 +14,16 @@
  _ZN11OpenThreads14ReentrantMutexD0Ev@Base 2.9.0
  _ZN11OpenThreads14ReentrantMutexD1Ev@Base 2.9.0
  _ZN11OpenThreads14ReentrantMutexD2Ev@Base 2.9.0
+ _ZN30protobuf_vector_5ftile_2eproto12InitDefaultsEv@Base 2.10.0
+ _ZN30protobuf_vector_5ftile_2eproto13scc_info_tileE@Base 2.10.0
+ _ZN30protobuf_vector_5ftile_2eproto19scc_info_tile_layerE@Base 2.10.0
+ _ZN30protobuf_vector_5ftile_2eproto19scc_info_tile_valueE@Base 2.10.0
+ _ZN30protobuf_vector_5ftile_2eproto21scc_info_tile_featureE@Base 2.10.0
  _ZN32osgEarthFeatureModelPseudoLoaderD0Ev@Base 2.4.0
  _ZN32osgEarthFeatureModelPseudoLoaderD1Ev@Base 2.4.0
  _ZN32osgEarthFeatureModelPseudoLoaderD2Ev@Base 2.4.0
  _ZN3osg10BufferData14asPrimitiveSetEv@Base 2.4.0
  _ZN3osg10BufferData7asImageEv@Base 2.4.0
- (arch=i386 kfreebsd-i386)_ZN3osg10BufferDataC1ERKS0_RKNS_6CopyOpE@Base 2.8~rc1
- (arch=i386 kfreebsd-i386)_ZN3osg10BufferDataC2ERKS0_RKNS_6CopyOpE@Base 2.8~rc1
  (optional=templinst)_ZN3osg11MixinVectorINS_5Vec2fEED0Ev@Base 2.4.0
  (optional=templinst)_ZN3osg11MixinVectorINS_5Vec2fEED1Ev@Base 2.4.0
  (optional=templinst)_ZN3osg11MixinVectorINS_5Vec2fEED2Ev@Base 2.4.0
@@ -72,7 +80,6 @@
  (optional=templinst)_ZN3osg13TemplateArrayIfLNS_5Array4TypeE7ELi1ELi5126EED0Ev@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayIfLNS_5Array4TypeE7ELi1ELi5126EED1Ev@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayIfLNS_5Array4TypeE7ELi1ELi5126EED2Ev@Base 2.4.0
- _ZN3osg16DrawElementsUInt10addElementEj@Base 2.7.0
  _ZN3osg17ConstValueVisitor5applyERKNS_5Vec2fE@Base 2.8~rc1
  _ZN3osg17ConstValueVisitor5applyERKNS_5Vec3fE@Base 2.8~rc1
  _ZN3osg17ConstValueVisitor5applyERKNS_5Vec4fE@Base 2.8~rc1
@@ -93,6 +100,7 @@
  _ZN3osg5Group13childInsertedEj@Base 2.4.0
  _ZN3osg5Group6acceptERNS_11NodeVisitorE@Base 2.4.0
  _ZN3osg5Group7asGroupEv@Base 2.4.0
+ (optional=templinst)_ZN3osg5cloneIN8osgEarth8Features7FeatureEEEPT_PKS4_RKNS_6CopyOpE@Base 2.9.0
  _ZN3osg6Object13asNodeVisitorEv@Base 2.8~rc1
  _ZN3osg6Object16asStateAttributeEv@Base 2.8~rc1
  _ZN3osg6Object19computeDataVarianceEv@Base 2.4.0
@@ -100,7 +108,6 @@
  _ZN3osg6Object6asNodeEv@Base 2.8~rc1
  _ZN3osg6Object7setNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN3osg6Object9asUniformEv@Base 2.8~rc1
- (optional=templinst|arch=!armel !armhf !hurd-i386 !i386 !m68k !mips !mipsel !powerpc)_ZN3osg7ref_ptrIKN8osgEarth16SpatialReferenceEE6assignIS3_EEvRKNS0_IT_EE@Base 2.9.0
  (optional=templinst)_ZN3osg7ref_ptrINS_5GroupEEaSEPS1_@Base 2.8~rc1
  _ZN3osg8Callback3runEPNS_6ObjectES2_@Base 2.8~rc1
  _ZN3osg8CallbackD0Ev@Base 2.8~rc1
@@ -121,9 +128,168 @@
  (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyI32osgEarthFeatureModelPseudoLoaderEC2Ev@Base 2.4.0
  (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyI32osgEarthFeatureModelPseudoLoaderED1Ev@Base 2.4.0
  (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyI32osgEarthFeatureModelPseudoLoaderED2Ev@Base 2.4.0
+ (optional=templinst)_ZN6google8protobuf13RepeatedFieldIjE7ReserveEi@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf13RepeatedFieldIjEC1ERKS2_@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf13RepeatedFieldIjEC2ERKS2_@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf13RepeatedFieldIjED1Ev@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf13RepeatedFieldIjED2Ev@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6mapnik6vector10tile_layerEJEEEPT_PS1_DpOT0_@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6mapnik6vector10tile_valueEJEEEPT_PS1_DpOT0_@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6mapnik6vector12tile_featureEJEEEPT_PS1_DpOT0_@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf5Arena18CreateMaybeMessageIN6mapnik6vector4tileEJEEEPT_PS1_DpOT0_@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf5Arena3OwnIN6mapnik6vector10tile_layerEEEvPT_@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf5Arena3OwnIN6mapnik6vector10tile_valueEEEvPT_@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf5Arena3OwnIN6mapnik6vector12tile_featureEEEvPT_@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf5Arena3OwnIN6mapnik6vector4tileEEEvPT_@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal18GenericTypeHandlerIN6mapnik6vector10tile_layerEE5MergeERKS5_PS5_@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal18GenericTypeHandlerIN6mapnik6vector10tile_valueEE5MergeERKS5_PS5_@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal18GenericTypeHandlerIN6mapnik6vector12tile_featureEE5MergeERKS5_PS5_@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal19arena_delete_objectIN6mapnik6vector10tile_layerEEEvPv@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal19arena_delete_objectIN6mapnik6vector10tile_valueEEEvPv@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal19arena_delete_objectIN6mapnik6vector12tile_featureEEEvPv@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal19arena_delete_objectIN6mapnik6vector4tileEEEvPv@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase18MergeFromInnerLoopINS0_16RepeatedPtrFieldIN6mapnik6vector10tile_layerEE11TypeHandlerEEEvPPvSB_ii@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase18MergeFromInnerLoopINS0_16RepeatedPtrFieldIN6mapnik6vector10tile_valueEE11TypeHandlerEEEvPPvSB_ii@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase18MergeFromInnerLoopINS0_16RepeatedPtrFieldIN6mapnik6vector12tile_featureEE11TypeHandlerEEEvPPvSB_ii@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal20RepeatedPtrFieldBase18MergeFromInnerLoopINS0_16RepeatedPtrFieldINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEE11TypeHandlerEEEvPPvSE_ii@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal21arena_destruct_objectIN6mapnik6vector10tile_layerEEEvPv@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal21arena_destruct_objectIN6mapnik6vector10tile_valueEEEvPv@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal21arena_destruct_objectIN6mapnik6vector12tile_featureEEEvPv@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal21arena_destruct_objectIN6mapnik6vector4tileEEEvPv@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal21arena_destruct_objectINS1_29InternalMetadataWithArenaBaseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_29InternalMetadataWithArenaLiteEE9ContainerEEEvPv@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal21arena_destruct_objectINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvPv@Base 2.10.0
+ _ZN6google8protobuf8internal22LiteUnknownFieldSetterD1Ev@Base 2.10.0
+ _ZN6google8protobuf8internal22LiteUnknownFieldSetterD2Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_layerEE3RunEv@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_layerEED0Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_layerEED1Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_layerEED2Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_valueEE3RunEv@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_valueEED0Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_valueEED1Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_valueEED2Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector12tile_featureEE3RunEv@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector12tile_featureEED0Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector12tile_featureEED1Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector12tile_featureEED2Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector4tileEE3RunEv@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector4tileEED0Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector4tileEED1Ev@Base 2.10.0
+ (optional=templinst|arch=x32)_ZN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector4tileEED2Ev@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal29InternalMetadataWithArenaBaseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_29InternalMetadataWithArenaLiteEE27mutable_unknown_fields_slowEv@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal29InternalMetadataWithArenaBaseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_29InternalMetadataWithArenaLiteEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN6google8protobuf8internal29InternalMetadataWithArenaBaseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_29InternalMetadataWithArenaLiteEED2Ev@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer10SharedCtorEv@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer10SharedDtorEv@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer12InternalSwapEPS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer16default_instanceEv@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer16kKeysFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer16kNameFieldNumberE@Base 2.10.0
+ (arch=x32)_ZN6mapnik6vector10tile_layer17default_instance_E@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer18kExtentFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer18kValuesFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer19kVersionFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer20kFeaturesFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer21CheckTypeAndMergeFromERKN6google8protobuf11MessageLiteE@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer21InitAsDefaultInstanceEv@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer27MergePartialFromCodedStreamEPN6google8protobuf2io16CodedInputStreamE@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer4SwapEPS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer5ClearEv@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer8CopyFromERKS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_layer9MergeFromERKS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_layerC1ERKS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_layerC1Ev@Base 2.10.0
+ _ZN6mapnik6vector10tile_layerC2ERKS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_layerC2Ev@Base 2.10.0
+ _ZN6mapnik6vector10tile_layerD0Ev@Base 2.10.0
+ _ZN6mapnik6vector10tile_layerD1Ev@Base 2.10.0
+ _ZN6mapnik6vector10tile_layerD2Ev@Base 2.10.0
+ _ZN6mapnik6vector10tile_value10SharedCtorEv@Base 2.10.0
+ _ZN6mapnik6vector10tile_value10SharedDtorEv@Base 2.10.0
+ _ZN6mapnik6vector10tile_value12InternalSwapEPS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_value16default_instanceEv@Base 2.10.0
+ (arch=x32)_ZN6mapnik6vector10tile_value17default_instance_E@Base 2.10.0
+ _ZN6mapnik6vector10tile_value20kIntValueFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_value21CheckTypeAndMergeFromERKN6google8protobuf11MessageLiteE@Base 2.10.0
+ _ZN6mapnik6vector10tile_value21InitAsDefaultInstanceEv@Base 2.10.0
+ _ZN6mapnik6vector10tile_value21kBoolValueFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_value21kSintValueFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_value21kUintValueFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_value22kFloatValueFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_value23kDoubleValueFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_value23kStringValueFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector10tile_value27MergePartialFromCodedStreamEPN6google8protobuf2io16CodedInputStreamE@Base 2.10.0
+ _ZN6mapnik6vector10tile_value4SwapEPS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_value5ClearEv@Base 2.10.0
+ _ZN6mapnik6vector10tile_value8CopyFromERKS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_value9MergeFromERKS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_valueC1ERKS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_valueC1Ev@Base 2.10.0
+ _ZN6mapnik6vector10tile_valueC2ERKS1_@Base 2.10.0
+ _ZN6mapnik6vector10tile_valueC2Ev@Base 2.10.0
+ _ZN6mapnik6vector10tile_valueD0Ev@Base 2.10.0
+ _ZN6mapnik6vector10tile_valueD1Ev@Base 2.10.0
+ _ZN6mapnik6vector10tile_valueD2Ev@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature10SharedCtorEv@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature10SharedDtorEv@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature12InternalSwapEPS1_@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature14kIdFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature16default_instanceEv@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature16kTagsFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature16kTypeFieldNumberE@Base 2.10.0
+ (arch=x32)_ZN6mapnik6vector12tile_feature17default_instance_E@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature20kGeometryFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature21CheckTypeAndMergeFromERKN6google8protobuf11MessageLiteE@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature21InitAsDefaultInstanceEv@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature27MergePartialFromCodedStreamEPN6google8protobuf2io16CodedInputStreamE@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature4SwapEPS1_@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature5ClearEv@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature8CopyFromERKS1_@Base 2.10.0
+ _ZN6mapnik6vector12tile_feature9MergeFromERKS1_@Base 2.10.0
+ _ZN6mapnik6vector12tile_featureC1ERKS1_@Base 2.10.0
+ _ZN6mapnik6vector12tile_featureC1Ev@Base 2.10.0
+ _ZN6mapnik6vector12tile_featureC2ERKS1_@Base 2.10.0
+ _ZN6mapnik6vector12tile_featureC2Ev@Base 2.10.0
+ _ZN6mapnik6vector12tile_featureD0Ev@Base 2.10.0
+ _ZN6mapnik6vector12tile_featureD1Ev@Base 2.10.0
+ _ZN6mapnik6vector12tile_featureD2Ev@Base 2.10.0
+ _ZN6mapnik6vector21tile_GeomType_IsValidEi@Base 2.10.0
+ _ZN6mapnik6vector23_tile_default_instance_E@Base 2.10.0
+ _ZN6mapnik6vector29_tile_layer_default_instance_E@Base 2.10.0
+ _ZN6mapnik6vector29_tile_value_default_instance_E@Base 2.10.0
+ _ZN6mapnik6vector31_tile_feature_default_instance_E@Base 2.10.0
+ (arch=x32)_ZN6mapnik6vector38protobuf_AddDesc_vector_5ftile_2eprotoEv@Base 2.10.0
+ (arch=x32)_ZN6mapnik6vector43protobuf_ShutdownFile_vector_5ftile_2eprotoEv@Base 2.10.0
+ _ZN6mapnik6vector4tile10LineStringE@Base 2.10.0
+ _ZN6mapnik6vector4tile10SharedCtorEv@Base 2.10.0
+ _ZN6mapnik6vector4tile10SharedDtorEv@Base 2.10.0
+ _ZN6mapnik6vector4tile12GeomType_MAXE@Base 2.10.0
+ _ZN6mapnik6vector4tile12GeomType_MINE@Base 2.10.0
+ _ZN6mapnik6vector4tile12InternalSwapEPS1_@Base 2.10.0
+ _ZN6mapnik6vector4tile16default_instanceEv@Base 2.10.0
+ (arch=x32)_ZN6mapnik6vector4tile17default_instance_E@Base 2.10.0
+ _ZN6mapnik6vector4tile18GeomType_ARRAYSIZEE@Base 2.10.0
+ _ZN6mapnik6vector4tile18kLayersFieldNumberE@Base 2.10.0
+ _ZN6mapnik6vector4tile21CheckTypeAndMergeFromERKN6google8protobuf11MessageLiteE@Base 2.10.0
+ _ZN6mapnik6vector4tile21InitAsDefaultInstanceEv@Base 2.10.0
+ _ZN6mapnik6vector4tile27MergePartialFromCodedStreamEPN6google8protobuf2io16CodedInputStreamE@Base 2.10.0
+ _ZN6mapnik6vector4tile4SwapEPS1_@Base 2.10.0
+ _ZN6mapnik6vector4tile5ClearEv@Base 2.10.0
+ _ZN6mapnik6vector4tile5PointE@Base 2.10.0
+ _ZN6mapnik6vector4tile7PolygonE@Base 2.10.0
+ _ZN6mapnik6vector4tile7UnknownE@Base 2.10.0
+ _ZN6mapnik6vector4tile8CopyFromERKS1_@Base 2.10.0
+ _ZN6mapnik6vector4tile9MergeFromERKS1_@Base 2.10.0
+ _ZN6mapnik6vector4tileC1ERKS1_@Base 2.10.0
+ _ZN6mapnik6vector4tileC1Ev@Base 2.10.0
+ _ZN6mapnik6vector4tileC2ERKS1_@Base 2.10.0
+ _ZN6mapnik6vector4tileC2Ev@Base 2.10.0
+ _ZN6mapnik6vector4tileD0Ev@Base 2.10.0
+ _ZN6mapnik6vector4tileD1Ev@Base 2.10.0
+ _ZN6mapnik6vector4tileD2Ev@Base 2.10.0
+ (arch=x32)_ZN6mapnik6vector52static_descriptor_initializer_vector_5ftile_2eproto_E@Base 2.10.0
  _ZN7osgUtil9Optimizer20MergeGeometryVisitor5applyERN3osg5GeodeE@Base 2.8~rc1
  _ZN7osgUtil9Optimizer20MergeGeometryVisitor5applyERN3osg9BillboardE@Base 2.8~rc1
- _ZN7osgUtil9Optimizer20MergeGeometryVisitorC1EPS0_@Base 2.8~rc1
  _ZN7osgUtil9Optimizer20MergeGeometryVisitorD0Ev@Base 2.8~rc1
  _ZN7osgUtil9Optimizer20MergeGeometryVisitorD1Ev@Base 2.8~rc1
  _ZN7osgUtil9OptimizerD0Ev@Base 2.5.0
@@ -137,39 +303,37 @@
  _ZN8OgrUtils14createGeometryEPv@Base 2.4.0
  _ZN8OgrUtils16getAttributeTypeE12OGRFieldType@Base 2.4.0
  _ZN8OgrUtils17createOgrGeometryEPKN8osgEarth9Symbology8GeometryE18OGRwkbGeometryType@Base 2.6.0
+ _ZN8OgrUtils18getOGRGeometryTypeEPKN8osgEarth9Symbology8GeometryE@Base 2.10.1
+ _ZN8OgrUtils18getOGRGeometryTypeERKN8osgEarth9Symbology8Geometry4TypeE@Base 2.10.1
  _ZN8OgrUtils8populateEPvPN8osgEarth9Symbology8GeometryEi@Base 2.4.0
  _ZN8osgEarth10DataExtentD0Ev@Base 2.6.0
  _ZN8osgEarth10DataExtentD1Ev@Base 2.6.0
  _ZN8osgEarth10DataExtentD2Ev@Base 2.6.0
- (arch=!alpha !armel !armhf !hppa !hurd-i386 !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZN8osgEarth10ReadResult19getResultCodeStringB5cxx11Ej@Base 2.8~rc2
+ (arch=!alpha !armel !armhf !hppa !hurd-i386 !i386 !m68k !mips !mips64el !mipsel !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZN8osgEarth10ReadResult19getResultCodeStringB5cxx11Ej@Base 2.8~rc2
  _ZN8osgEarth10ReadResultD0Ev@Base 2.8~rc1
  _ZN8osgEarth10ReadResultD1Ev@Base 2.8~rc1
  _ZN8osgEarth10ReadResultD2Ev@Base 2.8~rc1
- _ZN8osgEarth10TileSource10initializeEPKN5osgDB7OptionsEPKNS_7ProfileE@Base 2.4.0
  _ZN8osgEarth10TileSource10storeImageERKNS_7TileKeyEPN3osg5ImageEPNS_16ProgressCallbackE@Base 2.6.0
  _ZN8osgEarth10URIContextD0Ev@Base 2.4.0
  _ZN8osgEarth10URIContextD1Ev@Base 2.4.0
  _ZN8osgEarth10URIContextD2Ev@Base 2.4.0
  _ZN8osgEarth11MapCallback11onEndUpdateEv@Base 2.9.0
+ _ZN8osgEarth11MapCallback12onLayerMovedEPNS_5LayerEjj@Base 2.10.0
  _ZN8osgEarth11MapCallback13onBeginUpdateEv@Base 2.9.0
- _ZN8osgEarth11MapCallback16onMaskLayerAddedEPNS_9MaskLayerE@Base 2.9.0
- _ZN8osgEarth11MapCallback17onImageLayerAddedEPNS_10ImageLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback17onImageLayerMovedEPNS_10ImageLayerEjj@Base 2.9.0
- _ZN8osgEarth11MapCallback17onModelLayerAddedEPNS_10ModelLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback17onModelLayerMovedEPNS_10ModelLayerEjj@Base 2.9.0
- _ZN8osgEarth11MapCallback18onMaskLayerRemovedEPNS_9MaskLayerE@Base 2.9.0
- _ZN8osgEarth11MapCallback19onImageLayerRemovedEPNS_10ImageLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback19onModelLayerRemovedEPNS_10ModelLayerEj@Base 2.9.0
+ _ZN8osgEarth11MapCallback14onLayerEnabledEPNS_5LayerE@Base 2.10.0
+ _ZN8osgEarth11MapCallback15onLayerDisabledEPNS_5LayerE@Base 2.10.0
  _ZN8osgEarth11MapCallback20onMapInfoEstablishedERKNS_7MapInfoE@Base 2.9.0
- _ZN8osgEarth11MapCallback21onElevationLayerAddedEPNS_14ElevationLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback21onElevationLayerMovedEPNS_14ElevationLayerEjj@Base 2.9.0
- _ZN8osgEarth11MapCallback23onElevationLayerRemovedEPNS_14ElevationLayerEj@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_8Features17FeatureModelGraphEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_8Features17FeatureModelGraphEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_8Features17FeatureModelGraphEED2Ev@Base 2.9.0
+ _ZN8osgEarth11Serializers27FeatureSourceIndexNodeClass10readFIDMapERN5osgDB11InputStreamERNS_8Features22FeatureSourceIndexNodeE@Base 2.10.0
+ _ZN8osgEarth11Serializers27FeatureSourceIndexNodeClass11checkFIDMapERKNS_8Features22FeatureSourceIndexNodeE@Base 2.10.0
+ _ZN8osgEarth11Serializers27FeatureSourceIndexNodeClass11writeFIDMapERN5osgDB12OutputStreamERKNS_8Features22FeatureSourceIndexNodeE@Base 2.10.0
+ _ZN8osgEarth11Serializers27FeatureSourceIndexNodeClass39wrapper_propfunc_FeatureSourceIndexNodeEPN5osgDB13ObjectWrapperE@Base 2.10.0
  _ZN8osgEarth12LayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD2Ev@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth12LineDrawable16pushVertexAttribIN3osg13TemplateArrayINS2_5Vec4fELNS2_5Array4TypeE29ELi4ELi5126EEEEEvPT_RKNS8_15ElementDataTypeE@Base 2.10.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_8Features16FeatureMaskLayerENS_5LayerEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_8Features16FeatureMaskLayerENS_5LayerEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_8Features16FeatureMaskLayerENS_5LayerEED2Ev@Base 2.9.0
@@ -179,7 +343,11 @@
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_8Features18FeatureSourceLayerENS_5LayerEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_8Features18FeatureSourceLayerENS_5LayerEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_8Features18FeatureSourceLayerENS_5LayerEED2Ev@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEED0Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEED2Ev@Base 2.10.0
  _ZN8osgEarth13ConfigOptions11mergeConfigERKNS_6ConfigE@Base 2.8~rc1
+ _ZN8osgEarth13ConfigOptionsaSERKS0_@Base 2.10.0
  (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features16FeatureMaskLayerENS1_18FeatureSourceLayerEE5EntryD1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features16FeatureMaskLayerENS1_18FeatureSourceLayerEE5EntryD2Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features16FeatureMaskLayerENS1_18FeatureSourceLayerEE5clearEv@Base 2.9.0
@@ -196,8 +364,19 @@
  (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features17FeatureModelLayerENS1_18FeatureSourceLayerEE8CallbackD0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features17FeatureModelLayerENS1_18FeatureSourceLayerEE8CallbackD1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features17FeatureModelLayerENS1_18FeatureSourceLayerEE8CallbackD2Ev@Base 2.9.0
- _ZN8osgEarth13ShaderPackageD1Ev@Base 2.9.0
- _ZN8osgEarth13ShaderPackageD2Ev@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE5EntryD1Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE5EntryD2Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE5clearEv@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE8Callback12onLayerAddedEPNS_5LayerEj@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE8Callback14onLayerRemovedEPNS_5LayerEj@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE8CallbackD0Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE8CallbackD1Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE8CallbackD2Ev@Base 2.10.0
+ _ZN8osgEarth13ShaderOptions7SamplerD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptions7SamplerD2Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD0Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD2Ev@Base 2.10.1
  _ZN8osgEarth14ElevationQueryD0Ev@Base 2.4.0
  _ZN8osgEarth14ElevationQueryD1Ev@Base 2.4.0
  _ZN8osgEarth14ElevationQueryD2Ev@Base 2.4.0
@@ -210,6 +389,7 @@
  _ZN8osgEarth16MaskLayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth16MaskLayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth16MaskLayerOptionsD2Ev@Base 2.9.0
+ _ZN8osgEarth16ProgressCallback10isCanceledEv@Base 2.10.0
  _ZN8osgEarth17TileSourceOptionsD0Ev@Base 2.4.0
  _ZN8osgEarth17TileSourceOptionsD1Ev@Base 2.4.0
  _ZN8osgEarth17TileSourceOptionsD2Ev@Base 2.4.0
@@ -217,12 +397,15 @@
  _ZN8osgEarth18DepthOffsetAdapterD1Ev@Base 2.5.0
  _ZN8osgEarth18DepthOffsetAdapterD2Ev@Base 2.5.0
  _ZN8osgEarth18SceneGraphCallback12onRemoveNodeEPN3osg4NodeE@Base 2.9.0
+ _ZN8osgEarth18SceneGraphCallback12onRemoveNodeEPN3osg4NodeEPNS1_6ObjectE@Base 2.10.0
  _ZN8osgEarth18SceneGraphCallback14onPreMergeNodeEPN3osg4NodeE@Base 2.9.0
+ _ZN8osgEarth18SceneGraphCallback14onPreMergeNodeEPN3osg4NodeEPNS1_6ObjectE@Base 2.10.0
  _ZN8osgEarth18SceneGraphCallback15onPostMergeNodeEPN3osg4NodeE@Base 2.9.0
+ _ZN8osgEarth18SceneGraphCallback15onPostMergeNodeEPN3osg4NodeEPNS1_6ObjectE@Base 2.10.0
  _ZN8osgEarth18SceneGraphCallbackD0Ev@Base 2.9.0
  _ZN8osgEarth18SceneGraphCallbackD1Ev@Base 2.9.0
  _ZN8osgEarth18SceneGraphCallbackD2Ev@Base 2.9.0
- _ZN8osgEarth19DriverConfigOptions10fromConfigERKNS_6ConfigE@Base 2.7.0
+ (arch=!arm64 !x32)_ZN8osgEarth19DriverConfigOptions10fromConfigERKNS_6ConfigE@Base 2.10.1
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_8Features16FeatureMaskLayerENS_5LayerEEEEC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_8Features16FeatureMaskLayerENS_5LayerEEEEC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_8Features16FeatureMaskLayerENS_5LayerEEEED1Ev@Base 2.9.0
@@ -235,6 +418,10 @@
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_8Features18FeatureSourceLayerENS_5LayerEEEEC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_8Features18FeatureSourceLayerENS_5LayerEEEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_8Features18FeatureSourceLayerENS_5LayerEEEED2Ev@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEEEEC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEEEEC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEEEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEEEED2Ev@Base 2.10.0
  (optional=templinst)_ZN8osgEarth28FindTopMostNodeOfTypeVisitorINS_8Features22FeatureSourceIndexNodeEE5applyERN3osg4NodeE@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth28FindTopMostNodeOfTypeVisitorINS_8Features22FeatureSourceIndexNodeEED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth28FindTopMostNodeOfTypeVisitorINS_8Features22FeatureSourceIndexNodeEED1Ev@Base 2.8~rc1
@@ -246,24 +433,21 @@
  _ZN8osgEarth4Json6ReaderD2Ev@Base 2.4.0
  _ZN8osgEarth5Layer10addedToMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth5Layer14removedFromMapEPKNS_3MapE@Base 2.9.0
- _ZN8osgEarth5Layer15getOrCreateNodeEv@Base 2.9.0
  _ZN8osgEarth5Layer18getSequenceControlEv@Base 2.9.0
- _ZN8osgEarth5Layer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9.0
+ _ZN8osgEarth5Units7convertERKS0_S2_dRd@Base 2.10.0
  _ZN8osgEarth5UnitsD1Ev@Base 2.4.0
  _ZN8osgEarth5UnitsD2Ev@Base 2.4.0
  _ZN8osgEarth6BoundsD0Ev@Base 2.4.0
  _ZN8osgEarth6BoundsD1Ev@Base 2.4.0
  _ZN8osgEarth6BoundsD2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth6Config11updateIfSetIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZN8osgEarth6Config3addINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.7.0
+ (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIS0_EEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIdEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
  _ZN8osgEarth6Config6removeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  (arch=hurd-i386)_ZN8osgEarth6Config6updateIA5_cEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.9.0
- (optional=templinst)_ZN8osgEarth6Config8addIfSetIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst|arch=hurd-i386 i386 m68k mips mipsel)_ZN8osgEarth6Config8addIfSetIdEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.9.0
- (optional=templinst)_ZN8osgEarth6Config8addIfSetIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.9.0
- _ZN8osgEarth6ConfigC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.9.0
  _ZN8osgEarth6ConfigC1ERKS0_@Base 2.4.0
- _ZN8osgEarth6ConfigC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.9.0
  _ZN8osgEarth6ConfigC2ERKS0_@Base 2.4.0
  _ZN8osgEarth6StatusD1Ev@Base 2.8~rc1
  _ZN8osgEarth6StatusD2Ev@Base 2.8~rc1
@@ -326,6 +510,8 @@
  _ZN8osgEarth8Features12ScriptResultD1Ev@Base 2.4.0
  _ZN8osgEarth8Features12ScriptResultD2Ev@Base 2.4.0
  _ZN8osgEarth8Features13FeatureCursor4fillERNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaIS7_EEE@Base 2.7.0
+ _ZN8osgEarth8Features13FeatureCursorC1EPNS_16ProgressCallbackE@Base 2.10.0
+ _ZN8osgEarth8Features13FeatureCursorC2EPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth8Features13FeatureCursorD0Ev@Base 2.9.0
  _ZN8osgEarth8Features13FeatureCursorD1Ev@Base 2.9.0
  _ZN8osgEarth8Features13FeatureCursorD2Ev@Base 2.9.0
@@ -338,12 +524,17 @@
  _ZN8osgEarth8Features13FeatureSource13insertFeatureEPNS0_7FeatureE@Base 2.4.0
  _ZN8osgEarth8Features13FeatureSource14addToBlacklistEm@Base 2.4.0
  _ZN8osgEarth8Features13FeatureSource14clearBlacklistEv@Base 2.4.0
+ _ZN8osgEarth8Features13FeatureSource14setReadOptionsEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth8Features13FeatureSource17setFeatureProfileEPKNS0_14FeatureProfileE@Base 2.8~rc1
- _ZN8osgEarth8Features13FeatureSource19createFeatureCursorEv@Base 2.9.0
+ _ZN8osgEarth8Features13FeatureSource19createFeatureCursorEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth8Features13FeatureSource19removeFromBlacklistEm@Base 2.4.0
  _ZN8osgEarth8Features13FeatureSource4openEPKN5osgDB7OptionsE@Base 2.8~rc1
- _ZN8osgEarth8Features13FeatureSourceC1ERKNS_13ConfigOptionsEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth8Features13FeatureSourceC2ERKNS_13ConfigOptionsEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZN8osgEarth8Features13FeatureSource4openEv@Base 2.10.0
+ _ZN8osgEarth8Features13FeatureSource6createEPKNS0_14FeatureProfileERKSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_13AttributeTypeESt4lessISB_ESaISt4pairIKSB_SC_EEERKNS_9Symbology8Geometry4TypeEPKN5osgDB7OptionsE@Base 2.10.1
+ _ZN8osgEarth8Features13FeatureSourceC1ERKNS_13ConfigOptionsE@Base 2.10.0
+ _ZN8osgEarth8Features13FeatureSourceC1Ev@Base 2.10.0
+ _ZN8osgEarth8Features13FeatureSourceC2ERKNS_13ConfigOptionsE@Base 2.10.0
+ _ZN8osgEarth8Features13FeatureSourceC2Ev@Base 2.10.0
  _ZN8osgEarth8Features13FeatureSourceD0Ev@Base 2.4.0
  _ZN8osgEarth8Features13FeatureSourceD1Ev@Base 2.4.0
  _ZN8osgEarth8Features13FeatureSourceD2Ev@Base 2.4.0
@@ -398,10 +589,6 @@
  _ZN8osgEarth8Features14FeatureProfileD0Ev@Base 2.4.0
  _ZN8osgEarth8Features14FeatureProfileD1Ev@Base 2.4.0
  _ZN8osgEarth8Features14FeatureProfileD2Ev@Base 2.4.0
- _ZN8osgEarth8Features14GPULineShadersC1Ev@Base 2.9.0
- _ZN8osgEarth8Features14GPULineShadersC2Ev@Base 2.9.0
- _ZN8osgEarth8Features14GPULineShadersD1Ev@Base 2.9.0
- _ZN8osgEarth8Features14GPULineShadersD2Ev@Base 2.9.0
  _ZN8osgEarth8Features14ResampleFilter11isSupportedEv@Base 2.4.0
  _ZN8osgEarth8Features14ResampleFilter4pushEPNS0_7FeatureERNS0_13FilterContextE@Base 2.4.0
  _ZN8osgEarth8Features14ResampleFilter4pushERNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaIS7_EEERNS0_13FilterContextE@Base 2.7.0
@@ -416,9 +603,6 @@
  _ZN8osgEarth8Features14ResampleFilterD2Ev@Base 2.4.0
  _ZN8osgEarth8Features14TextSymbolizerC1EPKNS_9Symbology10TextSymbolE@Base 2.4.0
  _ZN8osgEarth8Features14TextSymbolizerC2EPKNS_9Symbology10TextSymbolE@Base 2.4.0
- _ZN8osgEarth8Features14TextSymbolizerD0Ev@Base 2.4.0
- _ZN8osgEarth8Features14TextSymbolizerD1Ev@Base 2.4.0
- _ZN8osgEarth8Features14TextSymbolizerD2Ev@Base 2.4.0
  _ZN8osgEarth8Features15BuildTextFilter4pushERNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaIS7_EEERNS0_13FilterContextE@Base 2.7.0
  _ZN8osgEarth8Features15BuildTextFilterC1ERKNS_9Symbology5StyleE@Base 2.4.0
  _ZN8osgEarth8Features15BuildTextFilterC2ERKNS_9Symbology5StyleE@Base 2.4.0
@@ -445,17 +629,11 @@
  _ZN8osgEarth8Features16FeatureMaskLayer6createEv@Base 2.9.0
  _ZN8osgEarth8Features16FeatureMaskLayerC1EPNS0_23FeatureMaskLayerOptionsE@Base 2.9.0
  _ZN8osgEarth8Features16FeatureMaskLayerC1ERKNS0_23FeatureMaskLayerOptionsE@Base 2.9.0
- _ZN8osgEarth8Features16FeatureMaskLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth8Features16FeatureMaskLayerC2EPNS0_23FeatureMaskLayerOptionsE@Base 2.9.0
  _ZN8osgEarth8Features16FeatureMaskLayerC2ERKNS0_23FeatureMaskLayerOptionsE@Base 2.9.0
- _ZN8osgEarth8Features16FeatureMaskLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth8Features16FeatureMaskLayerD0Ev@Base 2.9.0
  _ZN8osgEarth8Features16FeatureMaskLayerD1Ev@Base 2.9.0
  _ZN8osgEarth8Features16FeatureMaskLayerD2Ev@Base 2.9.0
- _ZN8osgEarth8Features16GPULinesOperatorC1ERKNS_9Symbology6StrokeE@Base 2.9.0
- _ZN8osgEarth8Features16GPULinesOperatorC1Ev@Base 2.9.0
- _ZN8osgEarth8Features16GPULinesOperatorC2ERKNS_9Symbology6StrokeE@Base 2.9.0
- _ZN8osgEarth8Features16GPULinesOperatorC2Ev@Base 2.9.0
  _ZN8osgEarth8Features16GeometryCompiler7compileEPNS0_13FeatureCursorERKNS_9Symbology5StyleERKNS0_13FilterContextE@Base 2.4.0
  _ZN8osgEarth8Features16GeometryCompiler7compileEPNS0_7FeatureERKNS0_13FilterContextE@Base 2.4.0
  _ZN8osgEarth8Features16GeometryCompiler7compileEPNS0_7FeatureERKNS_9Symbology5StyleERKNS0_13FilterContextE@Base 2.4.0
@@ -492,7 +670,7 @@
  _ZN8osgEarth8Features17FeatureListSource10initializeEPKN5osgDB7OptionsE@Base 2.9.0
  _ZN8osgEarth8Features17FeatureListSource13deleteFeatureEm@Base 2.4.0
  _ZN8osgEarth8Features17FeatureListSource13insertFeatureEPNS0_7FeatureE@Base 2.4.0
- _ZN8osgEarth8Features17FeatureListSource19createFeatureCursorERKNS_9Symbology5QueryE@Base 2.4.0
+ _ZN8osgEarth8Features17FeatureListSource19createFeatureCursorERKNS_9Symbology5QueryEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth8Features17FeatureListSource20createFeatureProfileEv@Base 2.4.0
  _ZN8osgEarth8Features17FeatureListSourceC1ERKNS_9GeoExtentE@Base 2.4.0
  _ZN8osgEarth8Features17FeatureListSourceC1Ev@Base 2.4.0
@@ -503,22 +681,22 @@
  _ZN8osgEarth8Features17FeatureListSourceD2Ev@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelGraph10getSessionEv@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelGraph11setupPagingEv@Base 2.4.0
- _ZN8osgEarth8Features17FeatureModelGraph16buildStyleGroupsEPKNS_9Symbology13StyleSelectorERKNS2_5QueryEPNS0_19FeatureIndexBuilderEPN3osg5GroupEPKN5osgDB7OptionsE@Base 2.8~rc1
- _ZN8osgEarth8Features17FeatureModelGraph16createStyleGroupERKNS_9Symbology5StyleERKNS2_5QueryEPNS0_19FeatureIndexBuilderEPKN5osgDB7OptionsE@Base 2.8~rc1
+ _ZN8osgEarth8Features17FeatureModelGraph16buildStyleGroupsEPKNS_9Symbology13StyleSelectorERKNS2_5QueryEPNS0_19FeatureIndexBuilderEPN3osg5GroupEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.10.0
+ _ZN8osgEarth8Features17FeatureModelGraph16createStyleGroupERKNS_9Symbology5StyleERKNS2_5QueryEPNS0_19FeatureIndexBuilderEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth8Features17FeatureModelGraph16createStyleGroupERKNS_9Symbology5StyleERNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaISB_EEERKNS0_13FilterContextEPKN5osgDB7OptionsE@Base 2.8~rc1
  _ZN8osgEarth8Features17FeatureModelGraph16writeTileToCacheERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN3osg5GroupEPKN5osgDB7OptionsE@Base 2.8~rc1
  _ZN8osgEarth8Features17FeatureModelGraph17readTileFromCacheERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.8~rc1
  _ZN8osgEarth8Features17FeatureModelGraph18createOrUpdateNodeEPNS0_13FeatureCursorERKNS_9Symbology5StyleERNS0_13FilterContextEPKN5osgDB7OptionsERN3osg7ref_ptrINSE_4NodeEEE@Base 2.8~rc1
  _ZN8osgEarth8Features17FeatureModelGraph20applyRenderSymbologyERKNS_9Symbology5StyleEPN3osg4NodeE@Base 2.8~rc1
- _ZN8osgEarth8Features17FeatureModelGraph21buildSubTilePagedLODsEjjjPKNS_8MapFrameEPN3osg5GroupEPKN5osgDB7OptionsE@Base 2.8~rc1
+ _ZN8osgEarth8Features17FeatureModelGraph21buildSubTilePagedLODsEjjjPN3osg5GroupEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth8Features17FeatureModelGraph21runPreMergeOperationsEPN3osg4NodeE@Base 2.6.0
  _ZN8osgEarth8Features17FeatureModelGraph22runPostMergeOperationsEPN3osg4NodeE@Base 2.4.0
  _ZN8osgEarth8Features17FeatureModelGraph22setSceneGraphCallbacksEPNS_19SceneGraphCallbacksE@Base 2.9.0
- _ZN8osgEarth8Features17FeatureModelGraph27queryAndSortIntoStyleGroupsERKNS_9Symbology5QueryERKNS2_16StringExpressionEPNS0_19FeatureIndexBuilderEPN3osg5GroupEPKN5osgDB7OptionsE@Base 2.8~rc1
+ _ZN8osgEarth8Features17FeatureModelGraph27queryAndSortIntoStyleGroupsERKNS_9Symbology5QueryERKNS2_16StringExpressionEPNS0_19FeatureIndexBuilderEPN3osg5GroupEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth8Features17FeatureModelGraph32getOrCreateStyleGroupFromFactoryERKNS_9Symbology5StyleE@Base 2.4.0
  _ZN8osgEarth8Features17FeatureModelGraph4ctorEv@Base 2.7.0
  _ZN8osgEarth8Features17FeatureModelGraph4loadEjjjRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.8~rc1
- _ZN8osgEarth8Features17FeatureModelGraph5buildERKNS_9Symbology5StyleERKNS2_5QueryERKNS_9GeoExtentEPNS0_19FeatureIndexBuilderEPKN5osgDB7OptionsE@Base 2.8~rc1
+ _ZN8osgEarth8Features17FeatureModelGraph5buildERKNS_9Symbology5StyleERKNS2_5QueryERKNS_9GeoExtentEPNS0_19FeatureIndexBuilderEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth8Features17FeatureModelGraph5dirtyEv@Base 2.4.0
  _ZN8osgEarth8Features17FeatureModelGraph6redrawEv@Base 2.4.0
  _ZN8osgEarth8Features17FeatureModelGraph8traverseERN3osg11NodeVisitorE@Base 2.4.0
@@ -533,17 +711,18 @@
  _ZN8osgEarth8Features17FeatureModelGraphD2Ev@Base 2.4.0
  _ZN8osgEarth8Features17FeatureModelLayer10addedToMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelLayer14removedFromMapEPKNS_3MapE@Base 2.9.0
- _ZN8osgEarth8Features17FeatureModelLayer15getOrCreateNodeEv@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelLayer16setFeatureSourceEPNS0_13FeatureSourceE@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelLayer21setFeatureSourceLayerEPNS0_18FeatureSourceLayerE@Base 2.9.0
+ _ZN8osgEarth8Features17FeatureModelLayer24createFeatureNodeFactoryEv@Base 2.10.0
+ _ZN8osgEarth8Features17FeatureModelLayer27setFeatureModelLayerOptionsERKNS0_24FeatureModelLayerOptionsE@Base 2.10.0
+ _ZN8osgEarth8Features17FeatureModelLayer35setCreateFeatureNodeFactoryCallbackEPNS1_32CreateFeatureNodeFactoryCallbackE@Base 2.10.0
  _ZN8osgEarth8Features17FeatureModelLayer4initEv@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelLayer4openEv@Base 2.9.0
+ _ZN8osgEarth8Features17FeatureModelLayer5dirtyEv@Base 2.10.0
  _ZN8osgEarth8Features17FeatureModelLayer6createEv@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelLayerC1ERKNS0_24FeatureModelLayerOptionsE@Base 2.9.0
- _ZN8osgEarth8Features17FeatureModelLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelLayerC1Ev@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelLayerC2ERKNS0_24FeatureModelLayerOptionsE@Base 2.9.0
- _ZN8osgEarth8Features17FeatureModelLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelLayerC2Ev@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelLayerD0Ev@Base 2.9.0
  _ZN8osgEarth8Features17FeatureModelLayerD1Ev@Base 2.9.0
@@ -551,14 +730,14 @@
  _ZN8osgEarth8Features17FeatureTileSource10initializeEPKN5osgDB7OptionsE@Base 2.4.0
  _ZN8osgEarth8Features17FeatureTileSource10preProcessEPN3osg5ImageEPNS2_10ReferencedE@Base 2.4.0
  _ZN8osgEarth8Features17FeatureTileSource11createImageERKNS_7TileKeyEPNS_16ProgressCallbackE@Base 2.4.0
- _ZN8osgEarth8Features17FeatureTileSource11getFeaturesERKNS_9Symbology5QueryERKNS_9GeoExtentERNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaISE_EEE@Base 2.8~rc1
+ _ZN8osgEarth8Features17FeatureTileSource11getFeaturesERKNS_9Symbology5QueryERKNS_9GeoExtentERNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaISE_EEEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth8Features17FeatureTileSource11postProcessEPN3osg5ImageEPNS2_10ReferencedE@Base 2.4.0
  _ZN8osgEarth8Features17FeatureTileSource13allocateImageEv@Base 2.7.0
  _ZN8osgEarth8Features17FeatureTileSource15createBuildDataEv@Base 2.4.0
  _ZN8osgEarth8Features17FeatureTileSource16setFeatureSourceEPNS0_13FeatureSourceE@Base 2.4.0
  _ZN8osgEarth8Features17FeatureTileSource22renderFeaturesForStyleEPNS0_7SessionERKNS_9Symbology5StyleERKNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaISD_EEEPNSA_10ReferencedERKNS_9GeoExtentEPNSA_5ImageE@Base 2.7.0
  _ZN8osgEarth8Features17FeatureTileSource22renderFeaturesForStyleERKNS_9Symbology5StyleERKNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaISB_EEEPNS8_10ReferencedERKNS_9GeoExtentEPNS8_5ImageE@Base 2.7.0
- _ZN8osgEarth8Features17FeatureTileSource30queryAndRenderFeaturesForStyleERKNS_9Symbology5StyleERKNS2_5QueryEPN3osg10ReferencedERKNS_9GeoExtentEPNS9_5ImageE@Base 2.4.0
+ _ZN8osgEarth8Features17FeatureTileSource30queryAndRenderFeaturesForStyleERKNS_9Symbology5StyleERKNS2_5QueryEPN3osg10ReferencedERKNS_9GeoExtentEPNS9_5ImageEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth8Features17FeatureTileSourceC1ERKNS_17TileSourceOptionsE@Base 2.4.0
  _ZN8osgEarth8Features17FeatureTileSourceC2ERKNS_17TileSourceOptionsE@Base 2.4.0
  _ZN8osgEarth8Features17FeatureTileSourceD0Ev@Base 2.4.0
@@ -585,11 +764,11 @@
  _ZN8osgEarth8Features18FeatureSourceIndexD2Ev@Base 2.7.0
  _ZN8osgEarth8Features18FeatureSourceLayer16setFeatureSourceEPNS0_13FeatureSourceE@Base 2.9.0
  _ZN8osgEarth8Features18FeatureSourceLayer4openEv@Base 2.9.0
+ _ZN8osgEarth8Features18FeatureSourceLayerC1EPNS0_25FeatureSourceLayerOptionsE@Base 2.10.0
  _ZN8osgEarth8Features18FeatureSourceLayerC1ERKNS0_25FeatureSourceLayerOptionsE@Base 2.9.0
- _ZN8osgEarth8Features18FeatureSourceLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth8Features18FeatureSourceLayerC1Ev@Base 2.9.0
+ _ZN8osgEarth8Features18FeatureSourceLayerC2EPNS0_25FeatureSourceLayerOptionsE@Base 2.10.0
  _ZN8osgEarth8Features18FeatureSourceLayerC2ERKNS0_25FeatureSourceLayerOptionsE@Base 2.9.0
- _ZN8osgEarth8Features18FeatureSourceLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth8Features18FeatureSourceLayerC2Ev@Base 2.9.0
  _ZN8osgEarth8Features18FeatureSourceLayerD0Ev@Base 2.9.0
  _ZN8osgEarth8Features18FeatureSourceLayerD1Ev@Base 2.9.0
@@ -627,6 +806,17 @@
  _ZN8osgEarth8Features19FeatureSourceDriverD0Ev@Base 2.4.0
  _ZN8osgEarth8Features19FeatureSourceDriverD1Ev@Base 2.4.0
  _ZN8osgEarth8Features19FeatureSourceDriverD2Ev@Base 2.4.0
+ _ZN8osgEarth8Features19ImageToFeatureLayer10addedToMapEPKNS_3MapE@Base 2.10.0
+ _ZN8osgEarth8Features19ImageToFeatureLayer13setImageLayerEPNS_10ImageLayerE@Base 2.10.0
+ _ZN8osgEarth8Features19ImageToFeatureLayer14removedFromMapEPKNS_3MapE@Base 2.10.0
+ _ZN8osgEarth8Features19ImageToFeatureLayer4initEv@Base 2.10.0
+ _ZN8osgEarth8Features19ImageToFeatureLayerC1ERKNS0_26ImageToFeatureLayerOptionsE@Base 2.10.0
+ _ZN8osgEarth8Features19ImageToFeatureLayerC1Ev@Base 2.10.0
+ _ZN8osgEarth8Features19ImageToFeatureLayerC2ERKNS0_26ImageToFeatureLayerOptionsE@Base 2.10.0
+ _ZN8osgEarth8Features19ImageToFeatureLayerC2Ev@Base 2.10.0
+ _ZN8osgEarth8Features19ImageToFeatureLayerD0Ev@Base 2.10.0
+ _ZN8osgEarth8Features19ImageToFeatureLayerD1Ev@Base 2.10.0
+ _ZN8osgEarth8Features19ImageToFeatureLayerD2Ev@Base 2.10.0
  _ZN8osgEarth8Features19ScriptEngineFactory11s_singletonE@Base 2.5.0
  _ZN8osgEarth8Features19ScriptEngineFactory16s_singletonMutexE@Base 2.5.0
  _ZN8osgEarth8Features19ScriptEngineFactory17createWithProfileERKNS0_6ScriptERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_b@Base 2.8~rc1
@@ -636,8 +826,8 @@
  _ZN8osgEarth8Features19ScriptEngineFactory8instanceEv@Base 2.5.0
  _ZN8osgEarth8Features19ScriptEngineOptions10fromConfigERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth8Features19ScriptEngineOptions11mergeConfigERKNS_6ConfigE@Base 2.4.0
- _ZN8osgEarth8Features19ScriptEngineOptionsC1ERKNS_13ConfigOptionsE@Base 2.8~rc1
- _ZN8osgEarth8Features19ScriptEngineOptionsC2ERKNS_13ConfigOptionsE@Base 2.8~rc1
+ _ZN8osgEarth8Features19ScriptEngineOptionsC1ERKNS_13ConfigOptionsE@Base 2.10.1
+ _ZN8osgEarth8Features19ScriptEngineOptionsC2ERKNS_13ConfigOptionsE@Base 2.10.1
  _ZN8osgEarth8Features19ScriptEngineOptionsD0Ev@Base 2.4.0
  _ZN8osgEarth8Features19ScriptEngineOptionsD1Ev@Base 2.4.0
  _ZN8osgEarth8Features19ScriptEngineOptionsD2Ev@Base 2.4.0
@@ -666,7 +856,6 @@
  _ZN8osgEarth8Features20FeatureSourceOptionsaSERKS1_@Base 2.6.0
  _ZN8osgEarth8Features20FeaturesToNodeFilter17computeLocalizersERKNS0_13FilterContextE@Base 2.4.0
  _ZN8osgEarth8Features20FeaturesToNodeFilter17computeLocalizersERKNS0_13FilterContextERKNS_9GeoExtentERN3osg7MatrixdESA_@Base 2.6.0
- _ZN8osgEarth8Features20FeaturesToNodeFilter18applyLineSymbologyEPN3osg8StateSetEPKNS_9Symbology10LineSymbolE@Base 2.5.0
  _ZN8osgEarth8Features20FeaturesToNodeFilter19applyPointSymbologyEPN3osg8StateSetEPKNS_9Symbology11PointSymbolE@Base 2.5.0
  _ZN8osgEarth8Features20FeaturesToNodeFilter20transformAndLocalizeERKN3osg5Vec3dEPKNS_16SpatialReferenceERS3_S8_RKNS2_7MatrixdEb@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8Features20FeaturesToNodeFilter20transformAndLocalizeERKSt6vectorIN3osg5Vec3dESaIS4_EEPKNS_16SpatialReferenceEPNS3_13TemplateArrayINS3_5Vec3fELNS3_5Array4TypeE28ELi3ELi5126EEESB_RKNS3_7MatrixdEb@Base 2.4.0
@@ -676,7 +865,7 @@
  _ZN8osgEarth8Features20FeaturesToNodeFilterD2Ev@Base 2.4.0
  _ZN8osgEarth8Features20VirtualFeatureSource10getFeatureEm@Base 2.4.0
  _ZN8osgEarth8Features20VirtualFeatureSource10initializeEPKN5osgDB7OptionsE@Base 2.4.0
- _ZN8osgEarth8Features20VirtualFeatureSource19createFeatureCursorERKNS_9Symbology5QueryE@Base 2.4.0
+ _ZN8osgEarth8Features20VirtualFeatureSource19createFeatureCursorERKNS_9Symbology5QueryEPNS_16ProgressCallbackE@Base 2.10.0
  _ZN8osgEarth8Features20VirtualFeatureSource20createFeatureProfileEv@Base 2.4.0
  _ZN8osgEarth8Features20VirtualFeatureSource3addEPNS0_13FeatureSourceEPNS0_16FeaturePredicateE@Base 2.4.0
  _ZN8osgEarth8Features20VirtualFeatureSourceC1Ev@Base 2.9.0
@@ -688,7 +877,7 @@
  _ZN8osgEarth8Features21ExtrudeGeometryFilter14buildStructureEPKNS_9Symbology8GeometryEdbfPKNS2_12SkinResourceES8_RNS1_9StructureERNS0_13FilterContextE@Base 2.7.0
  _ZN8osgEarth8Features21ExtrudeGeometryFilter17buildRoofGeometryERKNS1_9StructureEPN3osg8GeometryERKNS5_5Vec4fEPKNS_9Symbology12SkinResourceE@Base 2.6.0
  _ZN8osgEarth8Features21ExtrudeGeometryFilter17buildWallGeometryERKNS1_9StructureEPN3osg8GeometryERKNS5_5Vec4fESA_PKNS_9Symbology12SkinResourceE@Base 2.6.0
- _ZN8osgEarth8Features21ExtrudeGeometryFilter20buildOutlineGeometryERKNS1_9StructureEPN3osg8GeometryERKNS5_5Vec4fEf@Base 2.6.0
+ _ZN8osgEarth8Features21ExtrudeGeometryFilter20buildOutlineGeometryERKNS1_9StructureE@Base 2.10.0
  _ZN8osgEarth8Features21ExtrudeGeometryFilter4pushERNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaIS7_EEERNS0_13FilterContextE@Base 2.7.0
  _ZN8osgEarth8Features21ExtrudeGeometryFilter5resetERKNS0_13FilterContextE@Base 2.4.0
  _ZN8osgEarth8Features21ExtrudeGeometryFilter7processERNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaIS7_EEERNS0_13FilterContextE@Base 2.7.0
@@ -720,7 +909,7 @@
  _ZN8osgEarth8Features21PolygonizeLinesFilterD0Ev@Base 2.4.0
  _ZN8osgEarth8Features21PolygonizeLinesFilterD1Ev@Base 2.4.0
  _ZN8osgEarth8Features21PolygonizeLinesFilterD2Ev@Base 2.4.0
- (arch=alpha amd64 arm64 armel armhf hppa hurd-i386 i386 m68k mips64el powerpc ppc64 ppc64el s390x sh4 sparc64)_ZN8osgEarth8Features21ResampleFilterOptions10fromConfigERKNS_6ConfigE@Base 2.9.0
+ _ZN8osgEarth8Features21ResampleFilterOptions10fromConfigERKNS_6ConfigE@Base 2.10.0
  _ZN8osgEarth8Features21ResampleFilterOptionsD0Ev@Base 2.8~rc1
  _ZN8osgEarth8Features21ResampleFilterOptionsD1Ev@Base 2.8~rc1
  _ZN8osgEarth8Features21ResampleFilterOptionsD2Ev@Base 2.8~rc1
@@ -792,15 +981,26 @@
  _ZN8osgEarth8Features25FeatureModelSourceOptions10fromConfigERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth8Features25FeatureModelSourceOptions11mergeConfigERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth8Features25FeatureModelSourceOptionsC1ERKNS_13ConfigOptionsE@Base 2.4.0
+ _ZN8osgEarth8Features25FeatureModelSourceOptionsC1ERKS1_@Base 2.10.0
  _ZN8osgEarth8Features25FeatureModelSourceOptionsC2ERKNS_13ConfigOptionsE@Base 2.4.0
+ _ZN8osgEarth8Features25FeatureModelSourceOptionsC2ERKS1_@Base 2.10.0
  _ZN8osgEarth8Features25FeatureModelSourceOptionsD0Ev@Base 2.4.0
  _ZN8osgEarth8Features25FeatureModelSourceOptionsD1Ev@Base 2.4.0
  _ZN8osgEarth8Features25FeatureModelSourceOptionsD2Ev@Base 2.4.0
  _ZN8osgEarth8Features25FeatureSourceIndexOptionsC1ERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth8Features25FeatureSourceIndexOptionsC2ERKNS_6ConfigE@Base 2.4.0
+ _ZN8osgEarth8Features25FeatureSourceLayerOptionsC1ERKNS_13ConfigOptionsE@Base 2.10.1
+ _ZN8osgEarth8Features25FeatureSourceLayerOptionsC2ERKNS_13ConfigOptionsE@Base 2.10.1
  _ZN8osgEarth8Features25FeatureSourceLayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth8Features25FeatureSourceLayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth8Features25FeatureSourceLayerOptionsD2Ev@Base 2.9.0
+ _ZN8osgEarth8Features26ImageToFeatureLayerOptions10fromConfigERKNS_6ConfigE@Base 2.10.0
+ _ZN8osgEarth8Features26ImageToFeatureLayerOptions11mergeConfigERKNS_6ConfigE@Base 2.10.0
+ _ZN8osgEarth8Features26ImageToFeatureLayerOptionsC1ERKNS_13ConfigOptionsE@Base 2.10.1
+ _ZN8osgEarth8Features26ImageToFeatureLayerOptionsC2ERKNS_13ConfigOptionsE@Base 2.10.1
+ _ZN8osgEarth8Features26ImageToFeatureLayerOptionsD0Ev@Base 2.10.0
+ _ZN8osgEarth8Features26ImageToFeatureLayerOptionsD1Ev@Base 2.10.0
+ _ZN8osgEarth8Features26ImageToFeatureLayerOptionsD2Ev@Base 2.10.0
  (optional=templinst)_ZN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_12BufferFilterEE6createERKNS_6ConfigE@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_12BufferFilterEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_12BufferFilterEED1Ev@Base 2.4.0
@@ -869,22 +1069,21 @@
  _ZN8osgEarth8Features7SessionD0Ev@Base 2.4.0
  _ZN8osgEarth8Features7SessionD1Ev@Base 2.4.0
  _ZN8osgEarth8Features7SessionD2Ev@Base 2.4.0
- _ZN8osgEarth8Features8GPULines17WidthAttrLocationE@Base 2.9.0
- _ZN8osgEarth8Features8GPULines22NextVertexAttrLocationE@Base 2.9.0
- _ZN8osgEarth8Features8GPULines26PreviousVertexAttrLocationE@Base 2.9.0
+ _ZN8osgEarth8Features7ShadersC1Ev@Base 2.10.0
+ _ZN8osgEarth8Features7ShadersC2Ev@Base 2.10.0
  _ZN8osgEarth8Features9RefIDPairD0Ev@Base 2.7.0
  _ZN8osgEarth8Features9RefIDPairD1Ev@Base 2.7.0
  _ZN8osgEarth8Features9RefIDPairD2Ev@Base 2.7.0
+ _ZN8osgEarth8GeoImageD0Ev@Base 2.10.0
+ _ZN8osgEarth8GeoImageD1Ev@Base 2.10.0
+ _ZN8osgEarth8GeoImageD2Ev@Base 2.10.0
  _ZN8osgEarth8GeoPointD0Ev@Base 2.4.0
  _ZN8osgEarth8GeoPointD1Ev@Base 2.4.0
  _ZN8osgEarth8GeoPointD2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8LRUCacheINS_3URIEN3osg7ref_ptrINS_9Symbology16InstanceResourceEEESt4lessIS1_EE11insert_implERKS1_RKS6_@Base 2.4.0
+ (optional=templinst|arch=!arm64 !m68k !mips64el !ppc64el !sparc64 !x32)_ZN8osgEarth8LRUCacheINS_3URIEN3osg7ref_ptrINS_9Symbology16InstanceResourceEEESt4lessIS1_EE11insert_implERKS1_RKS6_@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINS_3URIEN3osg7ref_ptrINS_9Symbology16InstanceResourceEEESt4lessIS1_EED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINS_3URIEN3osg7ref_ptrINS_9Symbology16InstanceResourceEEESt4lessIS1_EED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINS_3URIEN3osg7ref_ptrINS_9Symbology16InstanceResourceEEESt4lessIS1_EED2Ev@Base 2.4.0
- _ZN8osgEarth8MapFrameD0Ev@Base 2.4.0
- _ZN8osgEarth8MapFrameD1Ev@Base 2.4.0
- _ZN8osgEarth8MapFrameD2Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8fast_mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS_3URIEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8fast_mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS_3URIEED2Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_11CachePolicyEED0Ev@Base 2.4.0
@@ -898,6 +1097,9 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_12ShaderPolicyEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_12ShaderPolicyEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_12ShaderPolicyEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED0Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED1Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED2Ev@Base 2.10.1
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEEC1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEEC2Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEED0Ev@Base 2.4.0
@@ -911,6 +1113,9 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_17MaskSourceOptionsEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_17MaskSourceOptionsEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_17MaskSourceOptionsEED2Ev@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED0Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED2Ev@Base 2.10.0
  (optional=templinst)_ZN8osgEarth8optionalINS_3URIEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_3URIEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_3URIEED2Ev@Base 2.4.0
@@ -988,22 +1193,22 @@
  (optional=templinst)_ZN8osgEarth8optionalIjED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIjED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIjED2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8toStringIdEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
- (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZN8osgEarth8toStringIfEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZN8osgEarth8toStringIdEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN8osgEarth8toStringIiEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
  _ZN8osgEarth9GeoExtentD0Ev@Base 2.4.0
  _ZN8osgEarth9GeoExtentD1Ev@Base 2.4.0
  _ZN8osgEarth9GeoExtentD2Ev@Base 2.4.0
- (arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZN8osgEarth9GeoExtentaSERKS0_@Base 2.9.0
+ (arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc powerpcspe)_ZN8osgEarth9GeoExtentaSERKS0_@Base 2.10.0
  _ZN8osgEarth9MaskLayer23getOrCreateMaskBoundaryEfPKNS_16SpatialReferenceEPNS_16ProgressCallbackE@Base 2.9.0
- _ZN8osgEarth9MaskLayerC1ERKS0_RKN3osg6CopyOpE@Base 2.9.0
- _ZN8osgEarth9MaskLayerC2ERKS0_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth9MaskLayerD0Ev@Base 2.9.0
  _ZN8osgEarth9MaskLayerD1Ev@Base 2.9.0
  _ZN8osgEarth9MaskLayerD2Ev@Base 2.9.0
  _ZN8osgEarth9Symbology10SkinSymbolD0Ev@Base 2.4.0
  _ZN8osgEarth9Symbology10SkinSymbolD1Ev@Base 2.4.0
  _ZN8osgEarth9Symbology10SkinSymbolD2Ev@Base 2.4.0
+ _ZN8osgEarth9Symbology10TextSymbolD0Ev@Base 2.10.0
+ _ZN8osgEarth9Symbology10TextSymbolD1Ev@Base 2.10.0
+ _ZN8osgEarth9Symbology10TextSymbolD2Ev@Base 2.10.0
  _ZN8osgEarth9Symbology16StringExpressionD0Ev@Base 2.4.0
  _ZN8osgEarth9Symbology16StringExpressionD1Ev@Base 2.4.0
  _ZN8osgEarth9Symbology16StringExpressionD2Ev@Base 2.4.0
@@ -1092,7 +1297,6 @@
  _ZNK3osg4Node8asCameraEv@Base 2.4.0
  _ZNK3osg4Node8asSwitchEv@Base 2.4.0
  _ZNK3osg4Node9asTerrainEv@Base 2.4.0
- (arch=alpha amd64 arm64 armhf hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sh4 sparc64)_ZNK3osg4QuatmlERKNS_5Vec3fE@Base 2.9.0
  _ZNK3osg5Array11libraryNameEv@Base 2.4.0
  _ZNK3osg5Array12isSameKindAsEPKNS_6ObjectE@Base 2.4.0
  _ZNK3osg5Array7asArrayEv@Base 2.4.0
@@ -1153,11 +1357,52 @@
  _ZNK5osgDB12ReaderWriter9writeNodeERKN3osg4NodeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKNS_7OptionsE@Base 2.7.0
  _ZNK5osgDB12ReaderWriter9writeNodeERKN3osg4NodeERSoPKNS_7OptionsE@Base 2.4.0
  (optional=templinst)_ZNK5osgDB14UserSerializerIN8osgEarth8Features22FeatureSourceIndexNodeEE7getNameB5cxx11Ev@Base 2.8~rc1
+ _ZNK6google8protobuf11MessageLite16InternalGetTableEv@Base 2.10.0
+ _ZNK6google8protobuf11MessageLite20GetMaybeArenaPointerEv@Base 2.10.0
+ (arch=x32)_ZNK6google8protobuf11MessageLite31SerializeWithCachedSizesToArrayEPh@Base 2.10.0
+ _ZNK6google8protobuf11MessageLite8GetArenaEv@Base 2.10.0
+ _ZNK6mapnik6vector10tile_layer11GetTypeNameB5cxx11Ev@Base 2.10.0
+ _ZNK6mapnik6vector10tile_layer12ByteSizeLongEv@Base 2.10.0
+ _ZNK6mapnik6vector10tile_layer13GetCachedSizeEv@Base 2.10.0
+ _ZNK6mapnik6vector10tile_layer13IsInitializedEv@Base 2.10.0
+ _ZNK6mapnik6vector10tile_layer13SetCachedSizeEi@Base 2.10.0
+ _ZNK6mapnik6vector10tile_layer24SerializeWithCachedSizesEPN6google8protobuf2io17CodedOutputStreamE@Base 2.10.0
+ _ZNK6mapnik6vector10tile_layer30RequiredFieldsByteSizeFallbackEv@Base 2.10.0
+ _ZNK6mapnik6vector10tile_layer3NewEPN6google8protobuf5ArenaE@Base 2.10.0
+ _ZNK6mapnik6vector10tile_layer3NewEv@Base 2.10.0
+ (arch=x32)_ZNK6mapnik6vector10tile_layer8ByteSizeEv@Base 2.10.0
+ _ZNK6mapnik6vector10tile_value11GetTypeNameB5cxx11Ev@Base 2.10.0
+ _ZNK6mapnik6vector10tile_value12ByteSizeLongEv@Base 2.10.0
+ _ZNK6mapnik6vector10tile_value13GetCachedSizeEv@Base 2.10.0
+ _ZNK6mapnik6vector10tile_value13IsInitializedEv@Base 2.10.0
+ _ZNK6mapnik6vector10tile_value13SetCachedSizeEi@Base 2.10.0
+ _ZNK6mapnik6vector10tile_value24SerializeWithCachedSizesEPN6google8protobuf2io17CodedOutputStreamE@Base 2.10.0
+ _ZNK6mapnik6vector10tile_value3NewEPN6google8protobuf5ArenaE@Base 2.10.0
+ _ZNK6mapnik6vector10tile_value3NewEv@Base 2.10.0
+ (arch=x32)_ZNK6mapnik6vector10tile_value8ByteSizeEv@Base 2.10.0
+ _ZNK6mapnik6vector12tile_feature11GetTypeNameB5cxx11Ev@Base 2.10.0
+ _ZNK6mapnik6vector12tile_feature12ByteSizeLongEv@Base 2.10.0
+ _ZNK6mapnik6vector12tile_feature13GetCachedSizeEv@Base 2.10.0
+ _ZNK6mapnik6vector12tile_feature13IsInitializedEv@Base 2.10.0
+ _ZNK6mapnik6vector12tile_feature13SetCachedSizeEi@Base 2.10.0
+ _ZNK6mapnik6vector12tile_feature24SerializeWithCachedSizesEPN6google8protobuf2io17CodedOutputStreamE@Base 2.10.0
+ _ZNK6mapnik6vector12tile_feature3NewEPN6google8protobuf5ArenaE@Base 2.10.0
+ _ZNK6mapnik6vector12tile_feature3NewEv@Base 2.10.0
+ (arch=x32)_ZNK6mapnik6vector12tile_feature8ByteSizeEv@Base 2.10.0
+ _ZNK6mapnik6vector4tile11GetTypeNameB5cxx11Ev@Base 2.10.0
+ _ZNK6mapnik6vector4tile12ByteSizeLongEv@Base 2.10.0
+ _ZNK6mapnik6vector4tile13GetCachedSizeEv@Base 2.10.0
+ _ZNK6mapnik6vector4tile13IsInitializedEv@Base 2.10.0
+ _ZNK6mapnik6vector4tile13SetCachedSizeEi@Base 2.10.0
+ _ZNK6mapnik6vector4tile24SerializeWithCachedSizesEPN6google8protobuf2io17CodedOutputStreamE@Base 2.10.0
+ _ZNK6mapnik6vector4tile3NewEPN6google8protobuf5ArenaE@Base 2.10.0
+ _ZNK6mapnik6vector4tile3NewEv@Base 2.10.0
+ (arch=x32)_ZNK6mapnik6vector4tile8ByteSizeEv@Base 2.10.0
  _ZNK8osgEarth10Revisioned10inSyncWithERKNS_8RevisionE@Base 2.4.0
  _ZNK8osgEarth10Revisioned4syncERNS_8RevisionE@Base 2.4.0
  _ZNK8osgEarth10TileSource11libraryNameEv@Base 2.4.0
- _ZNK8osgEarth10TileSource12getExtensionB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth10TileSource12isSameKindAsEPKN3osg6ObjectE@Base 2.4.0
+ _ZNK8osgEarth10TileSource14getAttributionB5cxx11Ev@Base 2.10.0
  _ZNK8osgEarth10TileSource18getCachePolicyHintEPKNS_7ProfileE@Base 2.5.0
  _ZNK8osgEarth10TileSource19getLastModifiedTimeEv@Base 2.5.0
  _ZNK8osgEarth10TileSource5cloneERKN3osg6CopyOpE@Base 2.4.0
@@ -1172,16 +1417,15 @@
  (optional=templinst)_ZNK8osgEarth12PluginLoaderINS_8Features16FeatureMaskLayerENS_5LayerEE10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth12PluginLoaderINS_8Features17FeatureModelLayerENS_5LayerEE10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth12PluginLoaderINS_8Features18FeatureSourceLayerENS_5LayerEE10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.9.0
- _ZNK8osgEarth16SpatialReference12isPlateCarreEv@Base 2.6.0
+ (optional=templinst)_ZNK8osgEarth12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEE10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.10.0
  (optional=templinst)_ZNK8osgEarth16qualified_doubleINS_5AngleEE17asParseableStringB5cxx11Ev@Base 2.9.0
  (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNK8osgEarth16qualified_doubleINS_5AngleEE8asStringB5cxx11Ev@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth16qualified_doubleINS_8DistanceEE17asParseableStringB5cxx11Ev@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNK8osgEarth16qualified_doubleINS_8DistanceEE8asStringB5cxx11Ev@Base 2.8~rc1
  _ZNK8osgEarth5Angle17asParseableStringB5cxx11Ev@Base 2.9.0
- _ZNK8osgEarth5Layer21modifyTileBoundingBoxERKNS_7TileKeyERN3osg15BoundingBoxImplINS4_5Vec3fEEE@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth6Config11getObjIfSetINS_8Features20FeatureDisplayLayoutEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth6Config11getObjIfSetINS_8Features20FeatureSourceOptionsEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIbEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
+ _ZNK8osgEarth5Layer7getNodeEv@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_8Features20FeatureSourceOptionsEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIbEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
  _ZNK8osgEarth8Features11LabelSource11libraryNameEv@Base 2.5.0
  _ZNK8osgEarth8Features11LabelSource12isSameKindAsEPKN3osg6ObjectE@Base 2.5.0
  _ZNK8osgEarth8Features11LabelSource5cloneERKN3osg6CopyOpE@Base 2.5.0
@@ -1222,14 +1466,15 @@
  _ZNK8osgEarth8Features14FeatureProfile11getMaxLevelEv@Base 2.4.0
  _ZNK8osgEarth8Features14FeatureProfile13getFirstLevelEv@Base 2.4.0
  _ZNK8osgEarth8Features14FeatureProfile8getTiledEv@Base 2.4.0
- _ZNK8osgEarth8Features14TextSymbolizer6createEPNS0_7FeatureEPKNS0_13FilterContextERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
+ _ZNK8osgEarth8Features14TextSymbolizer11getEncodingEv@Base 2.10.0
+ _ZNK8osgEarth8Features14TextSymbolizer5applyEPN7osgText4TextE@Base 2.10.0
+ _ZNK8osgEarth8Features14TextSymbolizer5applyEPN7osgText4TextEPNS0_7FeatureEPKNS0_13FilterContextEPKN3osg15BoundingBoxImplINSA_5Vec3fEEE@Base 2.10.0
  _ZNK8osgEarth8Features16FeatureMaskLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth8Features16FeatureMaskLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth8Features16FeatureMaskLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth8Features16FeatureMaskLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth8Features16FeatureMaskLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth8Features16FeatureMaskLayer9cloneTypeEv@Base 2.9.0
- _ZNK8osgEarth8Features16GPULinesOperator14installShadersEPN3osg4NodeE@Base 2.9.0
- _ZNK8osgEarth8Features16GPULinesOperatorclEPN3osg13TemplateArrayINS2_5Vec3fELNS2_5Array4TypeE28ELi3ELi5126EEEb@Base 2.9.0
  _ZNK8osgEarth8Features17ConvertTypeFilter9getConfigEv@Base 2.4.0
  _ZNK8osgEarth8Features17FeatureListCursor7hasMoreEv@Base 2.4.0
  _ZNK8osgEarth8Features17FeatureListSource10isWritableEv@Base 2.4.0
@@ -1239,10 +1484,15 @@
  _ZNK8osgEarth8Features17FeatureListSource17hasEmbeddedStylesEv@Base 2.4.0
  _ZNK8osgEarth8Features17FeatureListSource18supportsGetFeatureEv@Base 2.7.0
  _ZNK8osgEarth8Features17FeatureListSource9classNameEv@Base 2.4.0
- _ZNK8osgEarth8Features17FeatureModelGraph21getBoundInWorldCoordsERKNS_9GeoExtentEPKNS_8MapFrameE@Base 2.4.0
+ _ZNK8osgEarth8Features17FeatureModelGraph21getBoundInWorldCoordsERKNS_9GeoExtentE@Base 2.10.0
  _ZNK8osgEarth8Features17FeatureModelLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth8Features17FeatureModelLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth8Features17FeatureModelLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
+ _ZNK8osgEarth8Features17FeatureModelLayer16getFeatureSourceEv@Base 2.10.1
+ _ZNK8osgEarth8Features17FeatureModelLayer35getCreateFeatureNodeFactoryCallbackEv@Base 2.10.0
+ _ZNK8osgEarth8Features17FeatureModelLayer38createFeatureNodeFactoryImplementationEv@Base 2.10.0
  _ZNK8osgEarth8Features17FeatureModelLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth8Features17FeatureModelLayer7getNodeEv@Base 2.10.0
  _ZNK8osgEarth8Features17FeatureModelLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth8Features17FeatureModelLayer9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth8Features17FeatureModelLayer9getExtentEv@Base 2.9.0
@@ -1262,12 +1512,12 @@
  _ZNK8osgEarth8Features18FeatureSourceIndex11getObjectIDEm@Base 2.8~rc1
  _ZNK8osgEarth8Features18FeatureSourceIndex4sizeEv@Base 2.7.0
  _ZNK8osgEarth8Features18FeatureSourceLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth8Features18FeatureSourceLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth8Features18FeatureSourceLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth8Features18FeatureSourceLayer16getFeatureSourceEv@Base 2.9.0
  _ZNK8osgEarth8Features18FeatureSourceLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth8Features18FeatureSourceLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth8Features18FeatureSourceLayer9cloneTypeEv@Base 2.9.0
- _ZNK8osgEarth8Features18FeatureSourceLayer9getConfigEv@Base 2.9.0
  _ZNK8osgEarth8Features18LabelSourceOptions9getConfigEv@Base 2.4.0
  _ZNK8osgEarth8Features18ScriptEngineDriver22getScriptEngineOptionsEPKN5osgDB7OptionsE@Base 2.4.0
  _ZNK8osgEarth8Features18TessellateOperator4pushERNSt7__cxx114listIN3osg7ref_ptrINS0_7FeatureEEESaIS7_EEERNS0_13FilterContextE@Base 2.9.0
@@ -1275,6 +1525,12 @@
  _ZNK8osgEarth8Features19FeatureFilterDriver16getConfigOptionsEPKN5osgDB7OptionsE@Base 2.8~rc1
  _ZNK8osgEarth8Features19FeatureModelOptions9getConfigEv@Base 2.9.0
  _ZNK8osgEarth8Features19FeatureSourceDriver23getFeatureSourceOptionsEPKN5osgDB7OptionsE@Base 2.4.0
+ _ZNK8osgEarth8Features19ImageToFeatureLayer11libraryNameEv@Base 2.10.0
+ _ZNK8osgEarth8Features19ImageToFeatureLayer12getConfigKeyEv@Base 2.10.0
+ _ZNK8osgEarth8Features19ImageToFeatureLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.10.0
+ _ZNK8osgEarth8Features19ImageToFeatureLayer5cloneERKN3osg6CopyOpE@Base 2.10.0
+ _ZNK8osgEarth8Features19ImageToFeatureLayer9classNameEv@Base 2.10.0
+ _ZNK8osgEarth8Features19ImageToFeatureLayer9cloneTypeEv@Base 2.10.0
  _ZNK8osgEarth8Features19ScriptEngineOptions9getConfigEv@Base 2.4.0
  _ZNK8osgEarth8Features19ScriptFilterOptions9getConfigEv@Base 2.8~rc1
  _ZNK8osgEarth8Features20FeatureDisplayLayout12getNumLevelsEv@Base 2.4.0
@@ -1306,6 +1562,7 @@
  _ZNK8osgEarth8Features25FeatureModelSourceOptions9getConfigEv@Base 2.4.0
  _ZNK8osgEarth8Features25FeatureSourceIndexOptions9getConfigEv@Base 2.4.0
  _ZNK8osgEarth8Features25FeatureSourceLayerOptions9getConfigEv@Base 2.9.0
+ _ZNK8osgEarth8Features26ImageToFeatureLayerOptions9getConfigEv@Base 2.10.0
  _ZNK8osgEarth8Features6Filter11libraryNameEv@Base 2.8~rc1
  _ZNK8osgEarth8Features6Filter12isSameKindAsEPKN3osg6ObjectE@Base 2.8~rc1
  _ZNK8osgEarth8Features6Filter5cloneERKN3osg6CopyOpE@Base 2.8~rc1
@@ -1335,18 +1592,19 @@
  _ZNK8osgEarth8Features7Session11libraryNameEv@Base 2.9.0
  _ZNK8osgEarth8Features7Session12getDBOptionsEv@Base 2.4.0
  _ZNK8osgEarth8Features7Session12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
- _ZNK8osgEarth8Features7Session14createMapFrameEv@Base 2.9.0
  _ZNK8osgEarth8Features7Session15getScriptEngineEv@Base 2.4.0
  _ZNK8osgEarth8Features7Session16getFeatureSourceEv@Base 2.4.0
  _ZNK8osgEarth8Features7Session5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth8Features7Session6getMapEv@Base 2.10.0
  _ZNK8osgEarth8Features7Session9classNameEv@Base 2.9.0
  _ZNK8osgEarth8Features7Session9cloneTypeEv@Base 2.9.0
+ _ZNK8osgEarth8Features7Session9getMapSRSEv@Base 2.10.0
  _ZNK8osgEarth9MaskLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth9MaskLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth9MaskLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth9MaskLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth9MaskLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth9MaskLayer9cloneTypeEv@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEB5cxx11Ev@Base 2.8~rc1
  (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEv@Base 2.9.0
  _ZNK8osgEarth9Symbology10SkinSymbol11libraryNameEv@Base 2.7.0
  _ZNK8osgEarth9Symbology4Ring7isValidEv@Base 2.7.0
@@ -1361,42 +1619,45 @@
  (optional=templinst)_ZNSt11_Deque_baseIPKN8osgEarth9Symbology8GeometryESaIS4_EED2Ev@Base 2.4.0
  (optional=templinst)_ZNSt11_Deque_baseIPN8osgEarth9Symbology8GeometryESaIS3_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt11_Deque_baseIPN8osgEarth9Symbology8GeometryESaIS3_EED2Ev@Base 2.4.0
- (optional=templinst|arch=i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN3osg7ref_ptrIN8osgEarth9Symbology8GeometryEEEPS7_EET0_T_SC_SB_@Base 2.9.0
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth8Features13AttributeTypeESt4lessIS5_ESaISt4pairIKS5_S8_EEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth8Features13AttributeTypeESt4lessIS5_ESaISt4pairIKS5_S8_EEED2Ev@Base 2.7.0
+ (optional=templinst)_ZNSt3mapIPN3osg8StateSetENS0_7ref_ptrINS0_5GeodeEEESt4lessIS2_ESaISt4pairIKS2_S5_EEEixERS9_@Base 2.10.1
  (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth3URIEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth3URIEED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIN3osg5PlaneESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!sparc)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE9push_backERKS1_@Base 2.4.0
+ (optional=templinst|arch=!amd64 !arm64 !i386 !m68k !mips64el !powerpc !ppc64 !ppc64el !s390x !sparc !sparc64 !x32)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE9push_backERKS1_@Base 2.4.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.6.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.6.0
- (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE15_M_range_insertISt14_List_iteratorIS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EET_SB_St20forward_iterator_tag@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE7reserveEj@Base 2.4.0
- (optional=templinst|arch=alpha mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE7reserveEm@Base 2.9.0
+ (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64 !x32)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE7reserveEj@Base 2.4.0
+ (optional=templinst|arch=alpha ppc64 ppc64el s390x)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE7reserveEm@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_assignEjRKS1_@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_assignEmRKS1_@Base 2.4.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.4.0
- (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPS1_S3_EEEEvS8_T_S9_St20forward_iterator_tag@Base 2.6.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sh4 !sparc !sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveEj@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveEm@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE9push_backERKS1_@Base 2.4.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_assignEjRKS1_@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_assignEmRKS1_@Base 2.4.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!arm64 !hppa !sh4)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE9push_backERKS1_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth8Features13FeatureFilterEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology10LineStringEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology4RingEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology4RingEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology7PolygonEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology8GeometryEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_@Base 2.8~rc1
- (optional=templinst|arch=i386)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology8GeometryEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology8GeometryEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology8GeometryEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology8GeometryEEESaIS5_EED1Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology8GeometryEEESaIS5_EED2Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_5GroupEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth10DataExtentESaIS1_EE12emplace_backIJS1_EEEvDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth10DataExtentESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13ConfigOptionsESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13ConfigOptionsESaIS1_EEaSERKS3_@Base 2.8~rc1
@@ -1406,6 +1667,16 @@
  (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_8Features17FeatureModelLayerENS2_18FeatureSourceLayerEE5EntryESaIS6_EE17_M_realloc_insertIJS6_EEEvN9__gnu_cxx17__normal_iteratorIPS6_S8_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_8Features17FeatureModelLayerENS2_18FeatureSourceLayerEE5EntryESaIS6_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_8Features17FeatureModelLayerENS2_18FeatureSourceLayerEE5EntryESaIS6_EED2Ev@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_8Features19ImageToFeatureLayerENS0_10ImageLayerEE5EntryESaIS6_EE17_M_realloc_insertIJS6_EEEvN9__gnu_cxx17__normal_iteratorIPS6_S8_EEDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_8Features19ImageToFeatureLayerENS0_10ImageLayerEE5EntryESaIS6_EED1Ev@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_8Features19ImageToFeatureLayerENS0_10ImageLayerEE5EntryESaIS6_EED2Ev@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EEaSERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EEaSERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth3URIESaIS1_EEaSERKS3_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN8osgEarth8Features20FeatureSourceMappingESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth8Features20FeatureSourceMappingESaIS2_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth8Features20FeatureSourceMappingESaIS2_EED2Ev@Base 2.4.0
@@ -1413,72 +1684,83 @@
  (optional=templinst)_ZNSt6vectorIN8osgEarth8Features21ExtrudeGeometryFilter9ElevationESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!arm64)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=hurd-i386 i386)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED1Ev@Base 2.9.0
  (optional=templinst|arch=hurd-i386 i386)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED2Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEaSERKS7_@Base 2.7.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIPKN8osgEarth8Features12FeatureLevelESaIS4_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS4_S6_EEjRKS4_@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIPKN8osgEarth8Features12FeatureLevelESaIS4_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS4_S6_EEmRKS4_@Base 2.4.0
+ (optional=templinst|subst)_ZNSt6vectorIPKN8osgEarth8Features12FeatureLevelESaIS4_EE17_M_default_appendE{size_t}@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EERS7_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIPN3osg5GeodeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology16StringExpression2OpENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESaISB_EEaSERKSD_@Base 2.7.0
- (optional=templinst|arch=!alpha !hppa !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EEaSERKS7_@Base 2.4.0
- (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth3URIEESaIS9_EE17_M_realloc_insertIJS9_EEEvN9__gnu_cxx17__normal_iteratorIPS9_SB_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EEaSERKS7_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjESaIS7_EEaSERKS9_@Base 2.7.0
- (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraENS1_7ref_ptrINS1_8StateSetEEEESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIfSaIfEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EE{size_t}RKf@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertIJRKfEEEvN9__gnu_cxx17__normal_iteratorIPfS1_EEDpOT_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIfSaIfEE7reserveE{size_t}@Base 2.9.0
  (optional=templinst|arch=!hurd-i386)_ZNSt6vectorIjSaIjEE12emplace_backIJjEEEvDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIjSaIjEE7reserveEj@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt6vectorIjSaIjEE7reserveEj@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIjSaIjEE7reserveEm@Base 2.8~rc1
+ (optional=templinst)_ZNSt6vectorImSaImEE17_M_realloc_insertIJRKmEEEvN9__gnu_cxx17__normal_iteratorIPmS1_EEDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaIS6_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN8osgEarth3URIESaIS2_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN8osgEarth6ConfigESaIS2_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE18_M_assign_dispatchISt20_List_const_iteratorIS2_EEEvT_S8_St12__false_type@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.9.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.9.0
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEaSERKS4_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIRKS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE8_M_eraseEPSt13_Rb_tree_nodeIS1_E@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_IN3osg7ref_ptrINS0_9Symbology16InstanceResourceEEESt14_List_iteratorIS1_EEESt10_Select1stISC_ESt4lessIS1_ESaISC_EE11equal_rangeERS3_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_IN3osg7ref_ptrINS0_9Symbology16InstanceResourceEEESt14_List_iteratorIS1_EEESt10_Select1stISC_ESt4lessIS1_ESaISC_EE24_M_get_insert_unique_posERS3_@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_IN3osg7ref_ptrINS0_9Symbology16InstanceResourceEEESt14_List_iteratorIS1_EEESt10_Select1stISC_ESt4lessIS1_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS3_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_IN3osg7ref_ptrINS0_9Symbology16InstanceResourceEEESt14_List_iteratorIS1_EEESt10_Select1stISC_ESt4lessIS1_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS3_@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_IN3osg7ref_ptrINS0_9Symbology16InstanceResourceEEESt14_List_iteratorIS1_EEESt10_Select1stISC_ESt4lessIS1_ESaISC_EE5eraseERS3_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_S2_IN3osg7ref_ptrINS0_9Symbology16InstanceResourceEEESt14_List_iteratorIS1_EEESt10_Select1stISC_ESt4lessIS1_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE16_M_insert_uniqueIRKS5_EESt4pairISt17_Rb_tree_iteratorIS5_EbEOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESN_IJEEEEESt17_Rb_tree_iteratorISC_ESt23_Rb_tree_const_iteratorISC_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EEaSERKSI_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_5GeodeEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESN_IJEEEEESt17_Rb_tree_iteratorISC_ESt23_Rb_tree_const_iteratorISC_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_5GeodeEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE24_M_get_insert_unique_posERS7_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_5GeodeEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_5GeodeEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_5GeodeEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth8Features13AttributeTypeEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth8Features14AttributeValueEESt10_Select1stISB_ENS8_12CIStringCompESaISB_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESL_IJEEEEESt17_Rb_tree_iteratorISB_ESt23_Rb_tree_const_iteratorISB_EDpOT_@Base 2.8~rc1
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth8Features14AttributeValueEESt10_Select1stISB_ENS8_12CIStringCompESaISB_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISB_ERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth8Features14AttributeValueEESt10_Select1stISB_ENS8_12CIStringCompESaISB_EE7_M_copyINSG_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISB_EPKSK_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth8Features14AttributeValueEESt10_Select1stISB_ENS8_12CIStringCompESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_NS0_4listIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaISE_EEEESt10_Select1stISH_ESt4lessIS5_ESaISH_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_NS0_4listIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaISE_EEEESt10_Select1stISH_ESt4lessIS5_ESaISH_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISH_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_NS0_4listIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaISE_EEEESt10_Select1stISH_ESt4lessIS5_ESaISH_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISH_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_NS0_4listIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaISE_EEEESt10_Select1stISH_ESt4lessIS5_ESaISH_EE8_M_eraseEPSt13_Rb_tree_nodeISH_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESK_IJEEEEESt17_Rb_tree_iteratorIS9_ESt23_Rb_tree_const_iteratorIS9_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS7_@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS7_@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_PSt18_Rb_tree_node_baseRT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.9.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_bESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EEaSERKSE_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIPKN3osg6ObjectESt4pairIKS3_jESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E@Base 2.5.0
- (optional=templinst|arch=arm64 hppa mips64el sh4 sparc64)_ZNSt8_Rb_treeIPN3osg8StateSetESt4pairIKS2_NS0_7ref_ptrINS0_5GeodeEEEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE24_M_get_insert_unique_posERS4_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIPN3osg8StateSetESt4pairIKS2_NS0_7ref_ptrINS0_5GeodeEEEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE24_M_get_insert_unique_posERS4_@Base 2.10.1
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIPN3osg8StateSetESt4pairIKS2_NS0_7ref_ptrINS0_5GeodeEEEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS4_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg8StateSetESt4pairIKS2_NS0_7ref_ptrINS0_5GeodeEEEESt10_Select1stIS8_ESt4lessIS2_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeISt4pairIN8osgEarth3URIEfES0_IKS3_N3osg7ref_ptrINS5_4NodeEEEESt10_Select1stIS9_ESt4lessIS3_ESaIS9_EE24_M_get_insert_unique_posERS4_@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeISt4pairIN8osgEarth3URIEfES0_IKS3_N3osg7ref_ptrINS5_4NodeEEEESt10_Select1stIS9_ESt4lessIS3_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS4_@Base 2.6.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeISt4pairIN8osgEarth3URIEfES0_IKS3_N3osg7ref_ptrINS5_4NodeEEEESt10_Select1stIS9_ESt4lessIS3_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS4_@Base 2.6.0
  (optional=templinst)_ZNSt8_Rb_treeISt4pairIN8osgEarth3URIEfES0_IKS3_N3osg7ref_ptrINS5_4NodeEEEESt10_Select1stIS9_ESt4lessIS3_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E@Base 2.4.0
+ (optional=templinst)_ZNSt8_Rb_treeIcSt4pairIKcbESt10_Select1stIS2_ESt4lessIcESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN8osgEarth8Features12FeatureLevelEESt10_Select1stIS5_ESt4lessIfESaIS5_EE16_M_emplace_equalIJS0_IfS4_EEEESt17_Rb_tree_iteratorIS5_EDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN8osgEarth8Features12FeatureLevelEESt10_Select1stIS5_ESt4lessIfESaIS5_EE7_M_copyINSB_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS5_EPKSF_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN8osgEarth8Features12FeatureLevelEESt10_Select1stIS5_ESt4lessIfESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E@Base 2.4.0
+ (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN8osgEarth8Features12FeatureLevelEESt10_Select1stIS5_ESt4lessIfESaIS5_EEaSERKSB_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjjESt10_Select1stIS2_ESt4lessIjESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjmESt10_Select1stIS2_ESt4lessIjESaIS2_EE5eraseERS1_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjmESt10_Select1stIS2_ESt4lessIjESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.7.0
@@ -1488,13 +1770,13 @@
  (optional=templinst)_ZNSt8_Rb_treeImSt4pairIKmN3osg7ref_ptrIN8osgEarth8Features9RefIDPairEEEESt10_Select1stIS8_ESt4lessImESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeImSt4pairIKmN3osg7ref_ptrIN8osgEarth8Features9RefIDPairEEEESt10_Select1stIS8_ESt4lessImESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeImSt4pairIKmN3osg7ref_ptrIN8osgEarth8Features9RefIDPairEEEESt10_Select1stIS8_ESt4lessImESaIS8_EEaSERKSE_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorImERKm@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImESaImEE8_M_eraseEPSt13_Rb_tree_nodeImE@Base 2.4.0
  (optional=templinst)_ZSt11__make_heapIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrIN8osgEarth9Symbology4RingEEESt6vectorIS7_SaIS7_EEEENS0_5__ops15_Iter_comp_iterIPFbRKS7_SG_EEEEvT_SK_RT0_@Base 2.9.0
  (optional=templinst|subst)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrIN8osgEarth9Symbology4RingEEESt6vectorIS7_SaIS7_EEEE{ssize_t}S7_NS0_5__ops15_Iter_comp_iterIPFbRKS7_SG_EEEEvT_T0_SL_T1_T2_@Base 2.9.0
  (optional=templinst)_ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrIN8osgEarth9Symbology4RingEEESt6vectorIS7_SaIS7_EEEENS0_5__ops15_Iter_comp_iterIPFbRKS7_SG_EEEEvT_SK_T0_@Base 2.9.0
  (optional=templinst|subst)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrIN8osgEarth9Symbology4RingEEESt6vectorIS7_SaIS7_EEEE{ssize_t}NS0_5__ops15_Iter_comp_iterIPFbRKS7_SG_EEEEvT_SK_T0_T1_@Base 2.9.0
  (optional=templinst)_ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrIN8osgEarth9Symbology4RingEEESt6vectorIS7_SaIS7_EEEENS0_5__ops14_Val_comp_iterIPFbRKS7_SG_EEEEvT_T0_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZSt9__find_ifIN9__gnu_cxx17__normal_iteratorIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS7_SaIS7_EEEENS0_5__ops16_Iter_equals_valIKS7_EEET_SH_SH_T0_St26random_access_iterator_tag@Base 2.7.0
  _ZTI32osgEarthFeatureModelPseudoLoader@Base 2.4.0
  _ZTIN11OpenThreads14ReentrantMutexE@Base 2.9.0
  _ZTIN3osg11MixinVectorINS_5Vec2fEEE@Base 2.4.0
@@ -1515,6 +1797,16 @@
  _ZTIN5osgDB14InputExceptionE@Base 2.8~rc1
  _ZTIN5osgDB14UserSerializerIN8osgEarth8Features22FeatureSourceIndexNodeEEE@Base 2.8~rc1
  _ZTIN5osgDB20FileLocationCallbackE@Base 2.6.0
+ (arch=x32)_ZTIN6google8protobuf14ResultCallbackIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.10.0
+ (arch=x32)_ZTIN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_layerEEE@Base 2.10.0
+ (arch=x32)_ZTIN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_valueEEE@Base 2.10.0
+ (arch=x32)_ZTIN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector12tile_featureEEE@Base 2.10.0
+ (arch=x32)_ZTIN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector4tileEEE@Base 2.10.0
+ _ZTIN6google8protobuf8internal29InternalMetadataWithArenaBaseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_29InternalMetadataWithArenaLiteEE9ContainerE@Base 2.10.0
+ _ZTIN6mapnik6vector10tile_layerE@Base 2.10.0
+ _ZTIN6mapnik6vector10tile_valueE@Base 2.10.0
+ _ZTIN6mapnik6vector12tile_featureE@Base 2.10.0
+ _ZTIN6mapnik6vector4tileE@Base 2.10.0
  _ZTIN7osgUtil20BaseOptimizerVisitorE@Base 2.8~rc1
  _ZTIN7osgUtil9Optimizer20MergeGeometryVisitorE@Base 2.8~rc1
  _ZTIN8osgEarth10DataExtentE@Base 2.6.0
@@ -1525,8 +1817,10 @@
  _ZTIN8osgEarth12PluginLoaderINS_8Features16FeatureMaskLayerENS_5LayerEEE@Base 2.9.0
  _ZTIN8osgEarth12PluginLoaderINS_8Features17FeatureModelLayerENS_5LayerEEE@Base 2.9.0
  _ZTIN8osgEarth12PluginLoaderINS_8Features18FeatureSourceLayerENS_5LayerEEE@Base 2.9.0
+ _ZTIN8osgEarth12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEEE@Base 2.10.0
  _ZTIN8osgEarth13LayerListenerINS_8Features16FeatureMaskLayerENS1_18FeatureSourceLayerEE8CallbackE@Base 2.9.0
  _ZTIN8osgEarth13LayerListenerINS_8Features17FeatureModelLayerENS1_18FeatureSourceLayerEE8CallbackE@Base 2.9.0
+ _ZTIN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE8CallbackE@Base 2.10.0
  _ZTIN8osgEarth14ElevationQueryE@Base 2.4.0
  _ZTIN8osgEarth16FindNodesVisitorIN3osg5GeodeEEE@Base 2.7.0
  _ZTIN8osgEarth16qualified_doubleINS_5AngleEEE@Base 2.9.0
@@ -1557,7 +1851,6 @@
  _ZTIN8osgEarth8Features14CentroidFilterE@Base 2.4.0
  _ZTIN8osgEarth8Features14FeatureProfileE@Base 2.4.0
  _ZTIN8osgEarth8Features14ResampleFilterE@Base 2.4.0
- _ZTIN8osgEarth8Features14TextSymbolizerE@Base 2.4.0
  _ZTIN8osgEarth8Features15BuildTextFilterE@Base 2.4.0
  _ZTIN8osgEarth8Features15TransformFilterE@Base 2.4.0
  _ZTIN8osgEarth8Features16FeatureMaskLayerE@Base 2.9.0
@@ -1579,6 +1872,7 @@
  _ZTIN8osgEarth8Features19FeatureIndexBuilderE@Base 2.7.0
  _ZTIN8osgEarth8Features19FeatureModelOptionsE@Base 2.9.0
  _ZTIN8osgEarth8Features19FeatureSourceDriverE@Base 2.4.0
+ _ZTIN8osgEarth8Features19ImageToFeatureLayerE@Base 2.10.0
  _ZTIN8osgEarth8Features19ScriptEngineOptionsE@Base 2.4.0
  _ZTIN8osgEarth8Features19ScriptFilterOptionsE@Base 2.8~rc1
  _ZTIN8osgEarth8Features20FeatureDisplayLayoutE@Base 2.4.0
@@ -1601,6 +1895,7 @@
  _ZTIN8osgEarth8Features24FeatureTileSourceOptionsE@Base 2.4.0
  _ZTIN8osgEarth8Features25FeatureModelSourceOptionsE@Base 2.4.0
  _ZTIN8osgEarth8Features25FeatureSourceLayerOptionsE@Base 2.9.0
+ _ZTIN8osgEarth8Features26ImageToFeatureLayerOptionsE@Base 2.10.0
  _ZTIN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_12BufferFilterEEE@Base 2.4.0
  _ZTIN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_12ScriptFilterEEE@Base 2.8~rc1
  _ZTIN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_14ResampleFilterEEE@Base 2.4.0
@@ -1610,15 +1905,17 @@
  _ZTIN8osgEarth8Features7FeatureE@Base 2.4.0
  _ZTIN8osgEarth8Features7SessionE@Base 2.4.0
  _ZTIN8osgEarth8Features9RefIDPairE@Base 2.7.0
+ _ZTIN8osgEarth8GeoImageE@Base 2.10.0
  _ZTIN8osgEarth8GeoPointE@Base 2.4.0
  _ZTIN8osgEarth8LRUCacheINS_3URIEN3osg7ref_ptrINS_9Symbology16InstanceResourceEEESt4lessIS1_EEE@Base 2.4.0
- _ZTIN8osgEarth8MapFrameE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_11FadeOptionsEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_12ShaderPolicyEEE@Base 2.4.0
+ _ZTIN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTIN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_16GeoInterpolationEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_17MaskSourceOptionsEEE@Base 2.9.0
+ _ZTIN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTIN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_5AngleEEE@Base 2.9.0
  _ZTIN8osgEarth8optionalINS_5UnitsEEE@Base 2.4.0
@@ -1648,6 +1945,7 @@
  _ZTIN8osgEarth9Symbology17NumericExpressionE@Base 2.4.0
  _ZTIN8osgEarth9Symbology5ColorE@Base 2.4.0
  _ZTIN8osgEarth9Symbology8TaggableINS0_6SymbolEEE@Base 2.4.0
+ _ZTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZTS32osgEarthFeatureModelPseudoLoader@Base 2.4.0
  _ZTSN11OpenThreads14ReentrantMutexE@Base 2.9.0
  _ZTSN3osg11MixinVectorINS_5Vec2fEEE@Base 2.4.0
@@ -1668,6 +1966,16 @@
  _ZTSN5osgDB14InputExceptionE@Base 2.8~rc1
  _ZTSN5osgDB14UserSerializerIN8osgEarth8Features22FeatureSourceIndexNodeEEE@Base 2.8~rc1
  _ZTSN5osgDB20FileLocationCallbackE@Base 2.6.0
+ (arch=x32)_ZTSN6google8protobuf14ResultCallbackIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.10.0
+ (arch=x32)_ZTSN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_layerEEE@Base 2.10.0
+ (arch=x32)_ZTSN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_valueEEE@Base 2.10.0
+ (arch=x32)_ZTSN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector12tile_featureEEE@Base 2.10.0
+ (arch=x32)_ZTSN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector4tileEEE@Base 2.10.0
+ _ZTSN6google8protobuf8internal29InternalMetadataWithArenaBaseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_29InternalMetadataWithArenaLiteEE9ContainerE@Base 2.10.0
+ _ZTSN6mapnik6vector10tile_layerE@Base 2.10.0
+ _ZTSN6mapnik6vector10tile_valueE@Base 2.10.0
+ _ZTSN6mapnik6vector12tile_featureE@Base 2.10.0
+ _ZTSN6mapnik6vector4tileE@Base 2.10.0
  _ZTSN7osgUtil20BaseOptimizerVisitorE@Base 2.8~rc1
  _ZTSN7osgUtil9Optimizer20MergeGeometryVisitorE@Base 2.8~rc1
  _ZTSN8osgEarth10DataExtentE@Base 2.6.0
@@ -1678,8 +1986,10 @@
  _ZTSN8osgEarth12PluginLoaderINS_8Features16FeatureMaskLayerENS_5LayerEEE@Base 2.9.0
  _ZTSN8osgEarth12PluginLoaderINS_8Features17FeatureModelLayerENS_5LayerEEE@Base 2.9.0
  _ZTSN8osgEarth12PluginLoaderINS_8Features18FeatureSourceLayerENS_5LayerEEE@Base 2.9.0
+ _ZTSN8osgEarth12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEEE@Base 2.10.0
  _ZTSN8osgEarth13LayerListenerINS_8Features16FeatureMaskLayerENS1_18FeatureSourceLayerEE8CallbackE@Base 2.9.0
  _ZTSN8osgEarth13LayerListenerINS_8Features17FeatureModelLayerENS1_18FeatureSourceLayerEE8CallbackE@Base 2.9.0
+ _ZTSN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE8CallbackE@Base 2.10.0
  _ZTSN8osgEarth14ElevationQueryE@Base 2.4.0
  _ZTSN8osgEarth16FindNodesVisitorIN3osg5GeodeEEE@Base 2.7.0
  _ZTSN8osgEarth16qualified_doubleINS_5AngleEEE@Base 2.9.0
@@ -1710,7 +2020,6 @@
  _ZTSN8osgEarth8Features14CentroidFilterE@Base 2.4.0
  _ZTSN8osgEarth8Features14FeatureProfileE@Base 2.4.0
  _ZTSN8osgEarth8Features14ResampleFilterE@Base 2.4.0
- _ZTSN8osgEarth8Features14TextSymbolizerE@Base 2.4.0
  _ZTSN8osgEarth8Features15BuildTextFilterE@Base 2.4.0
  _ZTSN8osgEarth8Features15TransformFilterE@Base 2.4.0
  _ZTSN8osgEarth8Features16FeatureMaskLayerE@Base 2.9.0
@@ -1732,6 +2041,7 @@
  _ZTSN8osgEarth8Features19FeatureIndexBuilderE@Base 2.7.0
  _ZTSN8osgEarth8Features19FeatureModelOptionsE@Base 2.9.0
  _ZTSN8osgEarth8Features19FeatureSourceDriverE@Base 2.4.0
+ _ZTSN8osgEarth8Features19ImageToFeatureLayerE@Base 2.10.0
  _ZTSN8osgEarth8Features19ScriptEngineOptionsE@Base 2.4.0
  _ZTSN8osgEarth8Features19ScriptFilterOptionsE@Base 2.8~rc1
  _ZTSN8osgEarth8Features20FeatureDisplayLayoutE@Base 2.4.0
@@ -1754,6 +2064,7 @@
  _ZTSN8osgEarth8Features24FeatureTileSourceOptionsE@Base 2.4.0
  _ZTSN8osgEarth8Features25FeatureModelSourceOptionsE@Base 2.4.0
  _ZTSN8osgEarth8Features25FeatureSourceLayerOptionsE@Base 2.9.0
+ _ZTSN8osgEarth8Features26ImageToFeatureLayerOptionsE@Base 2.10.0
  _ZTSN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_12BufferFilterEEE@Base 2.4.0
  _ZTSN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_12ScriptFilterEEE@Base 2.8~rc1
  _ZTSN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_14ResampleFilterEEE@Base 2.4.0
@@ -1763,15 +2074,17 @@
  _ZTSN8osgEarth8Features7FeatureE@Base 2.4.0
  _ZTSN8osgEarth8Features7SessionE@Base 2.4.0
  _ZTSN8osgEarth8Features9RefIDPairE@Base 2.7.0
+ _ZTSN8osgEarth8GeoImageE@Base 2.10.0
  _ZTSN8osgEarth8GeoPointE@Base 2.4.0
  _ZTSN8osgEarth8LRUCacheINS_3URIEN3osg7ref_ptrINS_9Symbology16InstanceResourceEEESt4lessIS1_EEE@Base 2.4.0
- _ZTSN8osgEarth8MapFrameE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_11FadeOptionsEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_12ShaderPolicyEEE@Base 2.4.0
+ _ZTSN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTSN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_16GeoInterpolationEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_17MaskSourceOptionsEEE@Base 2.9.0
+ _ZTSN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTSN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_5AngleEEE@Base 2.9.0
  _ZTSN8osgEarth8optionalINS_5UnitsEEE@Base 2.4.0
@@ -1801,6 +2114,7 @@
  _ZTSN8osgEarth9Symbology17NumericExpressionE@Base 2.4.0
  _ZTSN8osgEarth9Symbology5ColorE@Base 2.4.0
  _ZTSN8osgEarth9Symbology8TaggableINS0_6SymbolEEE@Base 2.4.0
+ _ZTSNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZTTN3osg8CallbackE@Base 2.8~rc1
  _ZTTN7osgUtil9Optimizer20MergeGeometryVisitorE@Base 2.8~rc1
  _ZTTN8osgEarth16FindNodesVisitorIN3osg5GeodeEEE@Base 2.7.0
@@ -1823,6 +2137,14 @@
  _ZTVN5osgDB14BaseSerializerE@Base 2.8~rc1
  _ZTVN5osgDB14InputExceptionE@Base 2.8~rc1
  _ZTVN5osgDB14UserSerializerIN8osgEarth8Features22FeatureSourceIndexNodeEEE@Base 2.8~rc1
+ (arch=x32)_ZTVN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_layerEEE@Base 2.10.0
+ (arch=x32)_ZTVN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector10tile_valueEEE@Base 2.10.0
+ (arch=x32)_ZTVN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector12tile_featureEEE@Base 2.10.0
+ (arch=x32)_ZTVN6google8protobuf8internal26FunctionResultCallback_1_0IPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPN6mapnik6vector4tileEEE@Base 2.10.0
+ _ZTVN6mapnik6vector10tile_layerE@Base 2.10.0
+ _ZTVN6mapnik6vector10tile_valueE@Base 2.10.0
+ _ZTVN6mapnik6vector12tile_featureE@Base 2.10.0
+ _ZTVN6mapnik6vector4tileE@Base 2.10.0
  _ZTVN7osgUtil9Optimizer20MergeGeometryVisitorE@Base 2.8~rc1
  _ZTVN8osgEarth10DataExtentE@Base 2.6.0
  _ZTVN8osgEarth10ReadResultE@Base 2.8~rc1
@@ -1831,8 +2153,10 @@
  _ZTVN8osgEarth12PluginLoaderINS_8Features16FeatureMaskLayerENS_5LayerEEE@Base 2.9.0
  _ZTVN8osgEarth12PluginLoaderINS_8Features17FeatureModelLayerENS_5LayerEEE@Base 2.9.0
  _ZTVN8osgEarth12PluginLoaderINS_8Features18FeatureSourceLayerENS_5LayerEEE@Base 2.9.0
+ _ZTVN8osgEarth12PluginLoaderINS_8Features19ImageToFeatureLayerENS_5LayerEEE@Base 2.10.0
  _ZTVN8osgEarth13LayerListenerINS_8Features16FeatureMaskLayerENS1_18FeatureSourceLayerEE8CallbackE@Base 2.9.0
  _ZTVN8osgEarth13LayerListenerINS_8Features17FeatureModelLayerENS1_18FeatureSourceLayerEE8CallbackE@Base 2.9.0
+ _ZTVN8osgEarth13LayerListenerINS_8Features19ImageToFeatureLayerENS_10ImageLayerEE8CallbackE@Base 2.10.0
  _ZTVN8osgEarth14ElevationQueryE@Base 2.4.0
  _ZTVN8osgEarth16FindNodesVisitorIN3osg5GeodeEEE@Base 2.7.0
  _ZTVN8osgEarth16qualified_doubleINS_5AngleEEE@Base 2.9.0
@@ -1861,7 +2185,6 @@
  _ZTVN8osgEarth8Features14CentroidFilterE@Base 2.4.0
  _ZTVN8osgEarth8Features14FeatureProfileE@Base 2.4.0
  _ZTVN8osgEarth8Features14ResampleFilterE@Base 2.4.0
- _ZTVN8osgEarth8Features14TextSymbolizerE@Base 2.4.0
  _ZTVN8osgEarth8Features15BuildTextFilterE@Base 2.4.0
  _ZTVN8osgEarth8Features15TransformFilterE@Base 2.4.0
  _ZTVN8osgEarth8Features16FeatureMaskLayerE@Base 2.9.0
@@ -1881,6 +2204,7 @@
  _ZTVN8osgEarth8Features18TessellateOperatorE@Base 2.4.0
  _ZTVN8osgEarth8Features19BuildGeometryFilterE@Base 2.4.0
  _ZTVN8osgEarth8Features19FeatureSourceDriverE@Base 2.4.0
+ _ZTVN8osgEarth8Features19ImageToFeatureLayerE@Base 2.10.0
  _ZTVN8osgEarth8Features19ScriptEngineOptionsE@Base 2.4.0
  _ZTVN8osgEarth8Features19ScriptFilterOptionsE@Base 2.8~rc1
  _ZTVN8osgEarth8Features20FeatureDisplayLayoutE@Base 2.4.0
@@ -1901,6 +2225,7 @@
  _ZTVN8osgEarth8Features24FeatureTileSourceOptionsE@Base 2.4.0
  _ZTVN8osgEarth8Features25FeatureModelSourceOptionsE@Base 2.4.0
  _ZTVN8osgEarth8Features25FeatureSourceLayerOptionsE@Base 2.9.0
+ _ZTVN8osgEarth8Features26ImageToFeatureLayerOptionsE@Base 2.10.0
  _ZTVN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_12BufferFilterEEE@Base 2.4.0
  _ZTVN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_12ScriptFilterEEE@Base 2.8~rc1
  _ZTVN8osgEarth8Features26SimpleFeatureFilterFactoryINS0_14ResampleFilterEEE@Base 2.4.0
@@ -1910,15 +2235,17 @@
  _ZTVN8osgEarth8Features7FeatureE@Base 2.4.0
  _ZTVN8osgEarth8Features7SessionE@Base 2.4.0
  _ZTVN8osgEarth8Features9RefIDPairE@Base 2.7.0
+ _ZTVN8osgEarth8GeoImageE@Base 2.10.0
  _ZTVN8osgEarth8GeoPointE@Base 2.4.0
  _ZTVN8osgEarth8LRUCacheINS_3URIEN3osg7ref_ptrINS_9Symbology16InstanceResourceEEESt4lessIS1_EEE@Base 2.4.0
- _ZTVN8osgEarth8MapFrameE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_11FadeOptionsEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_12ShaderPolicyEEE@Base 2.4.0
+ _ZTVN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTVN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_16GeoInterpolationEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_17MaskSourceOptionsEEE@Base 2.9.0
+ _ZTVN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTVN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_5AngleEEE@Base 2.9.0
  _ZTVN8osgEarth8optionalINS_5UnitsEEE@Base 2.4.0
@@ -1965,7 +2292,7 @@
  osgdb_feature_mask@Base 2.9.0
  osgdb_feature_model@Base 2.9.0
  osgdb_feature_source@Base 2.9.0
- osgdb_mask@Base 2.9.0
+ osgdb_image_to_feature@Base 2.10.0
  osgdb_osgearth_pseudo_fmg@Base 2.4.0
  osgearth_simple_featurefilter_buffer@Base 2.9.0
  osgearth_simple_featurefilter_convert@Base 2.9.0
diff -Nru osgearth-2.9.0+dfsg/debian/libosgearthqt5-5.install osgearth-2.10.2+dfsg/debian/libosgearthqt5-5.install
--- osgearth-2.9.0+dfsg/debian/libosgearthqt5-5.install	2018-02-07 17:48:09.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/libosgearthqt5-5.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/libosgEarthQt5.so.*
diff -Nru osgearth-2.9.0+dfsg/debian/libosgearthqt5-5.symbols osgearth-2.10.2+dfsg/debian/libosgearthqt5-5.symbols
--- osgearth-2.9.0+dfsg/debian/libosgearthqt5-5.symbols	2018-02-07 17:53:05.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/libosgearthqt5-5.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-# SymbolsHelper-Confirmed: 2.9.0 armel
-libosgEarthQt5.so.5 #PACKAGE# #MINVER#
- _ZN5osgQt16GraphicsWindowQt10WindowDataD0Ev@Base 2.4.0
- _ZN5osgQt16GraphicsWindowQt10WindowDataD1Ev@Base 2.4.0
- _ZN5osgQt16GraphicsWindowQt10WindowDataD2Ev@Base 2.4.0
- _ZN5osgQt8GLWidget19setForwardKeyEventsEb@Base 2.4.0
- _ZN8osgEarth5QtGui10ViewWidget10paintEventEP11QPaintEvent@Base 2.4.0
- _ZN8osgEarth5QtGui10ViewWidget15createOrShareGCEPN3osg15GraphicsContextE@Base 2.4.0
- _ZN8osgEarth5QtGui10ViewWidget4initEPN3osg15GraphicsContextE@Base 2.4.0
- _ZN8osgEarth5QtGui10ViewWidgetC1EPN9osgViewer4ViewEPN3osg15GraphicsContextE@Base 2.4.0
- _ZN8osgEarth5QtGui10ViewWidgetC1EPN9osgViewer4ViewERK9QGLFormat@Base 2.7.0
- _ZN8osgEarth5QtGui10ViewWidgetC2EPN9osgViewer4ViewEPN3osg15GraphicsContextE@Base 2.4.0
- _ZN8osgEarth5QtGui10ViewWidgetC2EPN9osgViewer4ViewERK9QGLFormat@Base 2.7.0
- _ZN8osgEarth5QtGui10ViewWidgetD0Ev@Base 2.4.0
- _ZN8osgEarth5QtGui10ViewWidgetD1Ev@Base 2.4.0
- _ZN8osgEarth5QtGui10ViewWidgetD2Ev@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidget10paintEventEP11QPaintEvent@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidget11qt_metacallEN11QMetaObject4CallEiPPv@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidget11qt_metacastEPKc@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidget11reconfigureEPN9osgViewer4ViewE@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidget12createViewerEv@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidget16setTimerIntervalEi@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidget16staticMetaObjectE@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidget17installFrameTimerEv@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidgetC1EPN3osg4NodeE@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidgetC1EPN9osgViewer10ViewerBaseE@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidgetC2EPN3osg4NodeE@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidgetC2EPN9osgViewer10ViewerBaseE@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidgetD0Ev@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidgetD1Ev@Base 2.4.0
- _ZN8osgEarth5QtGui12ViewerWidgetD2Ev@Base 2.4.0
- (arch=ia64)_ZN8osgEarth5QtGui20BaseAnnotationDialog14getDescriptionEv@Base 2.4.0
- _ZNK3osg10Referenced5unrefEv@Base 2.4.0
- _ZNK8osgEarth5QtGui12ViewerWidget10metaObjectEv@Base 2.4.0
- (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.6.0
- (optional=templinst)_ZNSt6vectorIPN9osgViewer4ViewESaIS2_EE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPS2_S4_EEEEvS9_T_SA_St20forward_iterator_tag@Base 2.6.0
- _ZTIN5osgQt16GraphicsWindowQt10WindowDataE@Base 2.4.0
- _ZTIN8osgEarth5QtGui10ViewWidgetE@Base 2.4.0
- _ZTIN8osgEarth5QtGui12ViewerWidgetE@Base 2.4.0
- _ZTSN5osgQt16GraphicsWindowQt10WindowDataE@Base 2.4.0
- _ZTSN8osgEarth5QtGui10ViewWidgetE@Base 2.4.0
- _ZTSN8osgEarth5QtGui12ViewerWidgetE@Base 2.4.0
- _ZTVN5osgQt16GraphicsWindowQt10WindowDataE@Base 2.4.0
- _ZTVN8osgEarth5QtGui10ViewWidgetE@Base 2.4.0
- _ZTVN8osgEarth5QtGui12ViewerWidgetE@Base 2.4.0
- (c++)"non-virtual thunk to osgEarth::QtGui::ViewWidget::~ViewWidget()@Base" 2.4.0
- (c++)"non-virtual thunk to osgEarth::QtGui::ViewerWidget::~ViewerWidget()@Base" 2.4.0
diff -Nru osgearth-2.9.0+dfsg/debian/libosgearthsplat5.symbols osgearth-2.10.2+dfsg/debian/libosgearthsplat5.symbols
--- osgearth-2.9.0+dfsg/debian/libosgearthsplat5.symbols	2018-02-07 17:53:05.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/libosgearthsplat5.symbols	2019-04-20 06:08:11.000000000 +0000
@@ -1,11 +1,9 @@
-# SymbolsHelper-Confirmed: 2.9.0 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64
+# SymbolsHelper-Confirmed: 2.10.1 amd64
 libosgEarthSplat.so.5 #PACKAGE# #MINVER#
+* Build-Depends-Package: libosgearth-dev
  _Z15addFeatureToMapPN8osgEarth8Features7FeatureERKNS_9Symbology5StyleERSt6vectorISt4pairIS4_NSt7__cxx114listIN3osg7ref_ptrIS1_EESaISD_EEEESaISG_EE@Base 2.9.0
  _Z27sortFeaturesIntoStyleGroupsPN8osgEarth9Symbology10StyleSheetERNSt7__cxx114listIN3osg7ref_ptrINS_8Features7FeatureEEESaIS9_EEERNS7_13FilterContextERSt6vectorISt4pairINS0_5StyleESB_ESaISI_EE@Base 2.9.0
- (optional=templinst)_ZN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEED0Ev@Base 2.9.0
- (optional=templinst)_ZN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEED1Ev@Base 2.9.0
- (optional=templinst)_ZN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEED2Ev@Base 2.9.0
- (optional=templinst)_ZN3osg18BoundingSphereImplINS_5Vec3fEE8expandByERKS2_@Base 2.9.0
+ (optional=templinst|arch=!armel !armhf !powerpc !powerpcspe)_ZN3osg18BoundingSphereImplINS_5Vec3fEE8expandByERKS2_@Base 2.9.0
  _ZN3osg6Object13asNodeVisitorEv@Base 2.8~rc1
  _ZN3osg6Object16asStateAttributeEv@Base 2.8~rc1
  _ZN3osg6Object19computeDataVarianceEv@Base 2.8~rc1
@@ -20,6 +18,9 @@
  (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyIN8osgEarth5Splat13LandUseDriverEEC2Ev@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyIN8osgEarth5Splat13LandUseDriverEED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN5osgDB25RegisterReaderWriterProxyIN8osgEarth5Splat13LandUseDriverEED2Ev@Base 2.8~rc1
+ _ZN7osgUtil10StateGraphD0Ev@Base 2.10.0
+ _ZN7osgUtil10StateGraphD1Ev@Base 2.10.0
+ _ZN7osgUtil10StateGraphD2Ev@Base 2.10.0
  _ZN8osgEarth10ImageLayer13createTextureERKNS_7TileKeyEPNS_16ProgressCallbackERN3osg7MatrixfE@Base 2.9.0
  _ZN8osgEarth10ImageLayerD0Ev@Base 2.9.0
  _ZN8osgEarth10ImageLayerD1Ev@Base 2.9.0
@@ -33,25 +34,16 @@
  _ZN8osgEarth10ReadResultD0Ev@Base 2.8~rc1
  _ZN8osgEarth10ReadResultD1Ev@Base 2.8~rc1
  _ZN8osgEarth10ReadResultD2Ev@Base 2.8~rc1
- _ZN8osgEarth10TileSource10initializeEPKN5osgDB7OptionsEPKNS_7ProfileE@Base 2.8~rc1
  _ZN8osgEarth10TileSource10storeImageERKNS_7TileKeyEPN3osg5ImageEPNS_16ProgressCallbackE@Base 2.8~rc1
  _ZN8osgEarth10URIContextD0Ev@Base 2.8~rc1
  _ZN8osgEarth10URIContextD1Ev@Base 2.8~rc1
  _ZN8osgEarth10URIContextD2Ev@Base 2.8~rc1
  _ZN8osgEarth11MapCallback11onEndUpdateEv@Base 2.9.0
+ _ZN8osgEarth11MapCallback12onLayerMovedEPNS_5LayerEjj@Base 2.10.0
  _ZN8osgEarth11MapCallback13onBeginUpdateEv@Base 2.9.0
- _ZN8osgEarth11MapCallback16onMaskLayerAddedEPNS_9MaskLayerE@Base 2.9.0
- _ZN8osgEarth11MapCallback17onImageLayerAddedEPNS_10ImageLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback17onImageLayerMovedEPNS_10ImageLayerEjj@Base 2.9.0
- _ZN8osgEarth11MapCallback17onModelLayerAddedEPNS_10ModelLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback17onModelLayerMovedEPNS_10ModelLayerEjj@Base 2.9.0
- _ZN8osgEarth11MapCallback18onMaskLayerRemovedEPNS_9MaskLayerE@Base 2.9.0
- _ZN8osgEarth11MapCallback19onImageLayerRemovedEPNS_10ImageLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback19onModelLayerRemovedEPNS_10ModelLayerEj@Base 2.9.0
+ _ZN8osgEarth11MapCallback14onLayerEnabledEPNS_5LayerE@Base 2.10.0
+ _ZN8osgEarth11MapCallback15onLayerDisabledEPNS_5LayerE@Base 2.10.0
  _ZN8osgEarth11MapCallback20onMapInfoEstablishedERKNS_7MapInfoE@Base 2.9.0
- _ZN8osgEarth11MapCallback21onElevationLayerAddedEPNS_14ElevationLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback21onElevationLayerMovedEPNS_14ElevationLayerEjj@Base 2.9.0
- _ZN8osgEarth11MapCallback23onElevationLayerRemovedEPNS_14ElevationLayerEj@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD2Ev@Base 2.9.0
@@ -65,7 +57,7 @@
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_5Splat16RoadSurfaceLayerENS_5LayerEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth12PluginLoaderINS_5Splat16RoadSurfaceLayerENS_5LayerEED2Ev@Base 2.9.0
  _ZN8osgEarth13ConfigOptions11mergeConfigERKNS_6ConfigE@Base 2.8~rc1
- _ZN8osgEarth13ConfigOptionsaSERKS0_@Base 2.8~rc1
+ _ZN8osgEarth13ConfigOptionsaSERKS0_@Base 2.10.1
  (optional=templinst)_ZN8osgEarth13LayerListenerINS_5Splat10SplatLayerENS_14LandCoverLayerEE5EntryD1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth13LayerListenerINS_5Splat10SplatLayerENS_14LandCoverLayerEE5EntryD2Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth13LayerListenerINS_5Splat10SplatLayerENS_14LandCoverLayerEE5clearEv@Base 2.9.0
@@ -117,6 +109,13 @@
  _ZN8osgEarth13ProxySettingsD0Ev@Base 2.8~rc1
  _ZN8osgEarth13ProxySettingsD1Ev@Base 2.8~rc1
  _ZN8osgEarth13ProxySettingsD2Ev@Base 2.8~rc1
+ _ZN8osgEarth13ShaderOptions7SamplerD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptions7SamplerD2Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsC1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsC2Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD0Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD2Ev@Base 2.10.1
  _ZN8osgEarth13ShaderPackageD1Ev@Base 2.8~rc1
  _ZN8osgEarth13ShaderPackageD2Ev@Base 2.8~rc1
  _ZN8osgEarth14ProfileOptionsD0Ev@Base 2.8~rc1
@@ -126,6 +125,8 @@
  _ZN8osgEarth16TileSourceDriverD0Ev@Base 2.8~rc1
  _ZN8osgEarth16TileSourceDriverD1Ev@Base 2.8~rc1
  _ZN8osgEarth16TileSourceDriverD2Ev@Base 2.8~rc1
+ _ZN8osgEarth17ImageLayerOptionsC1ERKS0_@Base 2.10.0
+ _ZN8osgEarth17ImageLayerOptionsC2ERKS0_@Base 2.10.0
  _ZN8osgEarth17ImageLayerOptionsD0Ev@Base 2.8~rc1
  _ZN8osgEarth17ImageLayerOptionsD1Ev@Base 2.8~rc1
  _ZN8osgEarth17ImageLayerOptionsD2Ev@Base 2.8~rc1
@@ -147,14 +148,13 @@
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_5Splat16RoadSurfaceLayerENS_5LayerEEEEC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_5Splat16RoadSurfaceLayerENS_5LayerEEEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_5Splat16RoadSurfaceLayerENS_5LayerEEEED2Ev@Base 2.9.0
- (optional=templinst)_ZN8osgEarth2asIiEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.9.0
+ (optional=templinst|arch=!x32)_ZN8osgEarth2asIiEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.9.0
+ (optional=templinst|arch=!amd64 !arm64 !ppc64 !s390x)_ZN8osgEarth2asIjEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.10.0
  _ZN8osgEarth3URID0Ev@Base 2.8~rc1
  _ZN8osgEarth3URID1Ev@Base 2.8~rc1
  _ZN8osgEarth3URID2Ev@Base 2.8~rc1
- (arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZN8osgEarth3URIaSERKS0_@Base 2.9.0
- _ZN8osgEarth5Layer15getOrCreateNodeEv@Base 2.9.0
+ _ZN8osgEarth3URIaSERKS0_@Base 2.10.0
  _ZN8osgEarth5Layer18getSequenceControlEv@Base 2.9.0
- _ZN8osgEarth5Layer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9.0
  _ZN8osgEarth5Splat10SplatClassC1ERKNS_6ConfigE@Base 2.8~rc1
  _ZN8osgEarth5Splat10SplatClassC1Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat10SplatClassC2ERKNS_6ConfigE@Base 2.8~rc1
@@ -162,17 +162,18 @@
  _ZN8osgEarth5Splat10SplatClassD1Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat10SplatClassD2Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat10SplatLayer10addedToMapEPKNS_3MapE@Base 2.9.0
+ _ZN8osgEarth5Splat10SplatLayer12ZoneSelectorD0Ev@Base 2.10.0
+ _ZN8osgEarth5Splat10SplatLayer12ZoneSelectorD1Ev@Base 2.10.0
  _ZN8osgEarth5Splat10SplatLayer14buildStateSetsEv@Base 2.9.0
  _ZN8osgEarth5Splat10SplatLayer14removedFromMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth5Splat10SplatLayer17setLandCoverLayerEPNS_14LandCoverLayerE@Base 2.9.0
  _ZN8osgEarth5Splat10SplatLayer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9.0
+ _ZN8osgEarth5Splat10SplatLayer21resizeGLObjectBuffersEj@Base 2.10.1
  _ZN8osgEarth5Splat10SplatLayer22setLandCoverDictionaryEPNS_19LandCoverDictionaryE@Base 2.9.0
  _ZN8osgEarth5Splat10SplatLayer4initEv@Base 2.9.0
  _ZN8osgEarth5Splat10SplatLayerC1ERKNS0_17SplatLayerOptionsE@Base 2.9.0
- _ZN8osgEarth5Splat10SplatLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth5Splat10SplatLayerC1Ev@Base 2.9.0
  _ZN8osgEarth5Splat10SplatLayerC2ERKNS0_17SplatLayerOptionsE@Base 2.9.0
- _ZN8osgEarth5Splat10SplatLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth5Splat10SplatLayerC2Ev@Base 2.9.0
  _ZN8osgEarth5Splat10SplatLayerD0Ev@Base 2.9.0
  _ZN8osgEarth5Splat10SplatLayerD1Ev@Base 2.9.0
@@ -182,6 +183,7 @@
  _ZN8osgEarth5Splat11GroundCover13setBrightnessEf@Base 2.9.0
  _ZN8osgEarth5Splat11GroundCover14setMaxDistanceEf@Base 2.9.0
  _ZN8osgEarth5Splat11GroundCover19getOrCreateStateSetEv@Base 2.9.0
+ _ZN8osgEarth5Splat11GroundCover21resizeGLObjectBuffersEj@Base 2.10.1
  _ZN8osgEarth5Splat11GroundCover7setFillEf@Base 2.9.0
  _ZN8osgEarth5Splat11GroundCover7setWindEf@Base 2.9.0
  _ZN8osgEarth5Splat11GroundCover9configureEPKN5osgDB7OptionsE@Base 2.9.0
@@ -213,23 +215,24 @@
  _ZN8osgEarth5Splat14LandUseOptionsD0Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat14LandUseOptionsD1Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat14LandUseOptionsD2Ev@Base 2.8~rc1
- (arch=!hurd-i386)_ZN8osgEarth5Splat14SplatRangeDataC1EOS1_@Base 2.9.0
+ _ZN8osgEarth5Splat14SplatRangeDataC1EOS1_@Base 2.10.1
  _ZN8osgEarth5Splat14SplatRangeDataC1ERKNS_6ConfigE@Base 2.8~rc1
  _ZN8osgEarth5Splat14SplatRangeDataC1ERKS1_@Base 2.8~rc1
  _ZN8osgEarth5Splat14SplatRangeDataC1Ev@Base 2.8~rc1
- (arch=!hurd-i386)_ZN8osgEarth5Splat14SplatRangeDataC2EOS1_@Base 2.9.0
+ _ZN8osgEarth5Splat14SplatRangeDataC2EOS1_@Base 2.10.1
  _ZN8osgEarth5Splat14SplatRangeDataC2ERKNS_6ConfigE@Base 2.8~rc1
  _ZN8osgEarth5Splat14SplatRangeDataC2ERKS1_@Base 2.8~rc1
  _ZN8osgEarth5Splat14SplatRangeDataC2Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat14SplatRangeDataD1Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat14SplatRangeDataD2Ev@Base 2.8~rc1
+ (arch=armel armhf i386 mips mipsel powerpc powerpcspe x32)_ZN8osgEarth5Splat14SurfaceOptions10fromConfigERKNS_6ConfigE@Base 2.10.0
  _ZN8osgEarth5Splat14SurfaceOptions11mergeConfigERKNS_6ConfigE@Base 2.8~rc1
  _ZN8osgEarth5Splat14SurfaceOptionsC1ERKNS_13ConfigOptionsE@Base 2.8~rc1
  _ZN8osgEarth5Splat14SurfaceOptionsC2ERKNS_13ConfigOptionsE@Base 2.8~rc1
  _ZN8osgEarth5Splat14SurfaceOptionsD0Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat14SurfaceOptionsD1Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat14SurfaceOptionsD2Ev@Base 2.8~rc1
- (arch=amd64 arm64 hppa)_ZN8osgEarth5Splat15CoverageOptions10fromConfigERKNS_6ConfigE@Base 2.9.0
+ _ZN8osgEarth5Splat15CoverageOptions10fromConfigERKNS_6ConfigE@Base 2.10.0
  _ZN8osgEarth5Splat15CoverageOptions11mergeConfigERKNS_6ConfigE@Base 2.8~rc1
  _ZN8osgEarth5Splat15CoverageOptionsD0Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat15CoverageOptionsD1Ev@Base 2.8~rc1
@@ -238,41 +241,43 @@
  _ZN8osgEarth5Splat15SplatDetailDataC1Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat15SplatDetailDataC2ERKNS_6ConfigE@Base 2.8~rc1
  _ZN8osgEarth5Splat15SplatDetailDataC2Ev@Base 2.8~rc1
- _ZN8osgEarth5Splat16GroundCoverBiome9configureERKNS_13ConfigOptionsEPKN5osgDB7OptionsE@Base 2.9.0
+ _ZN8osgEarth5Splat15SplatTextureDef21resizeGLObjectBuffersEj@Base 2.10.1
+ _ZN8osgEarth5Splat16GroundCoverBiome9configureERKNS_13ConfigOptionsEPKN5osgDB7OptionsERSt3mapINS_3URIEN3osg7ref_ptrINSB_5ImageEEESt4lessISA_ESaISt4pairIKSA_SE_EEE@Base 2.10.0
  _ZN8osgEarth5Splat16GroundCoverBiomeD0Ev@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverBiomeD1Ev@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverBiomeD2Ev@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayer10addedToMapEPKNS_3MapE@Base 2.9.0
+ _ZN8osgEarth5Splat16GroundCoverLayer12ZoneSelectorD0Ev@Base 2.10.0
+ _ZN8osgEarth5Splat16GroundCoverLayer12ZoneSelectorD1Ev@Base 2.10.0
  _ZN8osgEarth5Splat16GroundCoverLayer12setMaskLayerEPNS_10ImageLayerE@Base 2.9.0
+ _ZN8osgEarth5Splat16GroundCoverLayer13LayerAcceptorD0Ev@Base 2.10.0
+ _ZN8osgEarth5Splat16GroundCoverLayer13LayerAcceptorD1Ev@Base 2.10.0
+ _ZN8osgEarth5Splat16GroundCoverLayer13LayerAcceptorD2Ev@Base 2.10.0
  _ZN8osgEarth5Splat16GroundCoverLayer14buildStateSetsEv@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayer14removedFromMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayer17setLandCoverLayerEPNS_14LandCoverLayerE@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9.0
+ _ZN8osgEarth5Splat16GroundCoverLayer21resizeGLObjectBuffersEj@Base 2.10.1
  _ZN8osgEarth5Splat16GroundCoverLayer22setLandCoverDictionaryEPNS_19LandCoverDictionaryE@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayer4initEv@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayer4openEv@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayerC1ERKNS0_23GroundCoverLayerOptionsE@Base 2.9.0
- _ZN8osgEarth5Splat16GroundCoverLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayerC1Ev@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayerC2ERKNS0_23GroundCoverLayerOptionsE@Base 2.9.0
- _ZN8osgEarth5Splat16GroundCoverLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayerC2Ev@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayerD0Ev@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayerD1Ev@Base 2.9.0
  _ZN8osgEarth5Splat16GroundCoverLayerD2Ev@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayer10addedToMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayer14removedFromMapEPKNS_3MapE@Base 2.9.0
- _ZN8osgEarth5Splat16RoadSurfaceLayer15getOrCreateNodeEv@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayer16setFeatureSourceEPNS_8Features13FeatureSourceE@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayer21setFeatureSourceLayerEPNS_8Features18FeatureSourceLayerE@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayer25createImageImplementationERKNS_7TileKeyEPNS_16ProgressCallbackE@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayer4initEv@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayer4openEv@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayerC1ERKNS0_23RoadSurfaceLayerOptionsE@Base 2.9.0
- _ZN8osgEarth5Splat16RoadSurfaceLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayerC1Ev@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayerC2ERKNS0_23RoadSurfaceLayerOptionsE@Base 2.9.0
- _ZN8osgEarth5Splat16RoadSurfaceLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayerC2Ev@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayerD0Ev@Base 2.9.0
  _ZN8osgEarth5Splat16RoadSurfaceLayerD1Ev@Base 2.9.0
@@ -309,6 +314,9 @@
  _ZN8osgEarth5Splat19SplatCoverageLegendD0Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat19SplatCoverageLegendD1Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat19SplatCoverageLegendD2Ev@Base 2.8~rc1
+ _ZN8osgEarth5Splat20GroundCoverBillboardD0Ev@Base 2.10.1
+ _ZN8osgEarth5Splat20GroundCoverBillboardD1Ev@Base 2.10.1
+ _ZN8osgEarth5Splat20GroundCoverBillboardD2Ev@Base 2.10.1
  (optional=templinst)_ZN8osgEarth5Splat23CoverageValuePredicateTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth5Splat23CoverageValuePredicateTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth5Splat23CoverageValuePredicateTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED2Ev@Base 2.8~rc1
@@ -319,6 +327,8 @@
  _ZN8osgEarth5Splat23GroundCoverBiomeOptionsD2Ev@Base 2.9.0
  _ZN8osgEarth5Splat23GroundCoverLayerOptions10fromConfigERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth5Splat23GroundCoverLayerOptions11mergeConfigERKNS_6ConfigE@Base 2.9.0
+ _ZN8osgEarth5Splat23GroundCoverLayerOptionsC1ERKNS_13ConfigOptionsE@Base 2.10.1
+ _ZN8osgEarth5Splat23GroundCoverLayerOptionsC2ERKNS_13ConfigOptionsE@Base 2.10.1
  _ZN8osgEarth5Splat23GroundCoverLayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth5Splat23GroundCoverLayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth5Splat23GroundCoverLayerOptionsD2Ev@Base 2.9.0
@@ -329,6 +339,7 @@
  _ZN8osgEarth5Splat23RoadSurfaceLayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth5Splat23RoadSurfaceLayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth5Splat23RoadSurfaceLayerOptionsD2Ev@Base 2.9.0
+ _ZN8osgEarth5Splat4Zone21resizeGLObjectBuffersEj@Base 2.10.1
  _ZN8osgEarth5Splat4Zone8BoundaryD1Ev@Base 2.9.0
  _ZN8osgEarth5Splat4Zone8BoundaryD2Ev@Base 2.9.0
  _ZN8osgEarth5Splat4Zone9configureEPKNS_3MapEPKN5osgDB7OptionsE@Base 2.9.0
@@ -341,6 +352,7 @@
  _ZN8osgEarth5Splat4ZoneD2Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat7Surface12loadTexturesEPKNS_19LandCoverDictionaryEPKN5osgDB7OptionsE@Base 2.9.0
  _ZN8osgEarth5Splat7Surface19getOrCreateStateSetEv@Base 2.9.0
+ _ZN8osgEarth5Splat7Surface21resizeGLObjectBuffersEj@Base 2.10.1
  _ZN8osgEarth5Splat7Surface9configureERKNS_13ConfigOptionsEPKNS_3MapEPKN5osgDB7OptionsE@Base 2.8~rc1
  _ZN8osgEarth5Splat7SurfaceC1Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat7SurfaceC2Ev@Base 2.8~rc1
@@ -355,30 +367,27 @@
  _ZN8osgEarth5Splat8CoverageD0Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat8CoverageD1Ev@Base 2.8~rc1
  _ZN8osgEarth5Splat8CoverageD2Ev@Base 2.8~rc1
+ _ZN8osgEarth5UnitsC1ERKS0_@Base 2.10.0
+ _ZN8osgEarth5UnitsC2ERKS0_@Base 2.10.0
  _ZN8osgEarth5UnitsD1Ev@Base 2.9.0
  _ZN8osgEarth5UnitsD2Ev@Base 2.9.0
- (optional=templinst)_ZN8osgEarth6Config11updateIfSetINS_3URIEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth6Config11updateIfSetINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKNS_8optionalIT_EE@Base 2.8~rc1
- (optional=templinst|arch=!alpha !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZN8osgEarth6Config11updateIfSetIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.9.0
- (optional=templinst)_ZN8osgEarth6Config3addINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.8~rc1
+ _ZN8osgEarth6Config3setERKS0_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth6Config3setINS_3URIEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIiEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
  _ZN8osgEarth6Config6removeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth6Config6updateIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.8~rc1
- (optional=templinst|arch=alpha amd64 arm64 armel armhf hppa i386 kfreebsd-amd64 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64)_ZN8osgEarth6Config8addIfSetINS_3URIEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.8~rc1
- (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZN8osgEarth6Config8addIfSetINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKNS_8optionalIT_EE@Base 2.8~rc3
- (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZN8osgEarth6Config8addIfSetIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.8~rc3
- (optional=templinst|arch=!alpha !amd64 !arm64 !hurd-i386 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZN8osgEarth6Config8addIfSetIiEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.8~rc3
- _ZN8osgEarth6ConfigC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.9.0
  _ZN8osgEarth6ConfigC1ERKS0_@Base 2.8~rc1
- _ZN8osgEarth6ConfigC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth6ConfigC1INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERKS7_RKT_@Base 2.10.1
  _ZN8osgEarth6ConfigC2ERKS0_@Base 2.8~rc1
+ (optional=templinst)_ZN8osgEarth6ConfigC2INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERKS7_RKT_@Base 2.10.1
  _ZN8osgEarth6ConfigaSERKS0_@Base 2.8~rc1
  _ZN8osgEarth6StatusC1ERKNS0_4CodeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  _ZN8osgEarth6StatusC2ERKNS0_4CodeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  _ZN8osgEarth6StatusD1Ev@Base 2.9.0
  _ZN8osgEarth6StatusD2Ev@Base 2.9.0
- _ZN8osgEarth7MapInfoD0Ev@Base 2.9.0
- _ZN8osgEarth7MapInfoD1Ev@Base 2.9.0
- _ZN8osgEarth7MapInfoD2Ev@Base 2.9.0
  _ZN8osgEarth7TileKeyD0Ev@Base 2.8~rc1
  _ZN8osgEarth7TileKeyD1Ev@Base 2.8~rc1
  _ZN8osgEarth7TileKeyD2Ev@Base 2.8~rc1
@@ -391,9 +400,6 @@
  _ZN8osgEarth8GeoImageD0Ev@Base 2.8~rc1
  _ZN8osgEarth8GeoImageD1Ev@Base 2.8~rc1
  _ZN8osgEarth8GeoImageD2Ev@Base 2.8~rc1
- _ZN8osgEarth8MapFrameD0Ev@Base 2.9.0
- _ZN8osgEarth8MapFrameD1Ev@Base 2.9.0
- _ZN8osgEarth8MapFrameD2Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalIN3osg6Vec4ubEED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8optionalIN3osg6Vec4ubEED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8optionalIN3osg6Vec4ubEED2Ev@Base 2.8~rc1
@@ -411,6 +417,9 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_13ProxySettingsEED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8optionalINS_13ProxySettingsEED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8optionalINS_13ProxySettingsEED2Ev@Base 2.8~rc1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED0Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED1Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED2Ev@Base 2.10.1
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEEC1ERKS2_@Base 2.8~rc2
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEEC2ERKS2_@Base 2.8~rc2
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEED0Ev@Base 2.8~rc1
@@ -421,6 +430,9 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_17TileSourceOptionsEED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8optionalINS_17TileSourceOptionsEED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8optionalINS_17TileSourceOptionsEED2Ev@Base 2.8~rc1
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED0Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED2Ev@Base 2.10.0
  (optional=templinst)_ZN8osgEarth8optionalINS_3URIEED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8optionalINS_3URIEED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8optionalINS_3URIEED2Ev@Base 2.8~rc1
@@ -469,8 +481,6 @@
  (optional=templinst)_ZN8osgEarth8optionalIjED0Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8optionalIjED1Ev@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth8optionalIjED2Ev@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth8toStringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEES6_RKT_@Base 2.8~rc1
- (optional=templinst|arch=alpha ppc64 ppc64el s390x)_ZN8osgEarth8toStringIfEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.9.0
  _ZN8osgEarth9GeoExtentD0Ev@Base 2.8~rc1
  _ZN8osgEarth9GeoExtentD1Ev@Base 2.8~rc1
  _ZN8osgEarth9GeoExtentD2Ev@Base 2.8~rc1
@@ -486,8 +496,8 @@
  (optional=templinst)_ZN8osgEarth9Threading6FutureIN3osg5ImageEE9RefPtrRefD0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth9Threading6FutureIN3osg5ImageEE9RefPtrRefD1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth9Threading6FutureIN3osg5ImageEE9RefPtrRefD2Ev@Base 2.9.0
- (optional=templinst|arch=m68k mips mipsel sh4)_ZN8osgEarth9Threading6FutureIN3osg5ImageEEC1Ev@Base 2.9.0
- (optional=templinst|arch=m68k mips mipsel sh4)_ZN8osgEarth9Threading6FutureIN3osg5ImageEEC2Ev@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth9Threading6FutureIN3osg5ImageEEC1Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth9Threading6FutureIN3osg5ImageEEC2Ev@Base 2.10.1
  (optional=templinst)_ZN8osgEarth9Threading6FutureIN3osg5ImageEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth9Threading6FutureIN3osg5ImageEED2Ev@Base 2.9.0
  _ZN8osgEarth9Threading8RefEventD0Ev@Base 2.9.0
@@ -500,7 +510,7 @@
  _ZNK3osg12NodeCallback9classNameEv@Base 2.8~rc1
  _ZNK3osg12NodeCallback9cloneTypeEv@Base 2.8~rc1
  _ZNK3osg4Node29ComputeBoundingSphereCallback12computeBoundERKS0_@Base 2.9.0
- _ZNK3osg4Node8getBoundEv@Base 2.9.0
+ (arch=amd64 armel armhf powerpc powerpcspe)_ZNK3osg4Node8getBoundEv@Base 2.10.1
  _ZNK3osg6Object13asNodeVisitorEv@Base 2.8~rc1
  _ZNK3osg6Object16asStateAttributeEv@Base 2.8~rc1
  _ZNK3osg6Object16releaseGLObjectsEPNS_5StateE@Base 2.8~rc1
@@ -546,12 +556,11 @@
  _ZNK5osgDB12ReaderWriter9writeNodeERKN3osg4NodeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKNS_7OptionsE@Base 2.8~rc1
  _ZNK5osgDB12ReaderWriter9writeNodeERKN3osg4NodeERSoPKNS_7OptionsE@Base 2.8~rc1
  _ZNK7osgUtil11CullVisitor12getViewPointEv@Base 2.9.0
- _ZNK8osgEarth10ImageLayer22createTextureSupportedEv@Base 2.9.0
  _ZNK8osgEarth10PatchLayer14AcceptCallback11acceptLayerERN3osg11NodeVisitorEPKNS2_6CameraE@Base 2.9.0
  _ZNK8osgEarth10PatchLayer14AcceptCallback9acceptKeyERKNS_7TileKeyE@Base 2.9.0
  _ZNK8osgEarth10TileSource11libraryNameEv@Base 2.8~rc1
- _ZNK8osgEarth10TileSource12getExtensionB5cxx11Ev@Base 2.8~rc1
  _ZNK8osgEarth10TileSource12isSameKindAsEPKN3osg6ObjectE@Base 2.8~rc1
+ _ZNK8osgEarth10TileSource14getAttributionB5cxx11Ev@Base 2.10.0
  _ZNK8osgEarth10TileSource18getCachePolicyHintEPKNS_7ProfileE@Base 2.8~rc1
  _ZNK8osgEarth10TileSource19getLastModifiedTimeEv@Base 2.8~rc1
  _ZNK8osgEarth10TileSource5cloneERKN3osg6CopyOpE@Base 2.8~rc1
@@ -563,11 +572,13 @@
  (optional=templinst)_ZNK8osgEarth12PluginLoaderINS_5Splat16RoadSurfaceLayerENS_5LayerEE10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth16qualified_doubleINS_8DistanceEE17asParseableStringB5cxx11Ev@Base 2.9.0
  (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNK8osgEarth16qualified_doubleINS_8DistanceEE8asStringB5cxx11Ev@Base 2.9.0
- _ZNK8osgEarth5Layer21modifyTileBoundingBoxERKNS_7TileKeyERN3osg15BoundingBoxImplINS4_5Vec3fEEE@Base 2.9.0
+ _ZNK8osgEarth5Layer7getNodeEv@Base 2.10.0
  _ZNK8osgEarth5Splat10SplatClass9getConfigEv@Base 2.8~rc1
  _ZNK8osgEarth5Splat10SplatLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth5Splat10SplatLayer12ZoneSelectorclEPN3osg4NodeEPNS3_11NodeVisitorE@Base 2.10.0
+ _ZNK8osgEarth5Splat10SplatLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth5Splat10SplatLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
- _ZNK8osgEarth5Splat10SplatLayer4cullEPKN7osgUtil11CullVisitorERSt6vectorIPKN3osg8StateSetESaISA_EE@Base 2.9.0
+ _ZNK8osgEarth5Splat10SplatLayer16releaseGLObjectsEPN3osg5StateE@Base 2.10.1
  _ZNK8osgEarth5Splat10SplatLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth5Splat10SplatLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth5Splat10SplatLayer9cloneTypeEv@Base 2.9.0
@@ -577,8 +588,9 @@
  _ZNK8osgEarth5Splat11GroundCover13createTextureEv@Base 2.9.0
  _ZNK8osgEarth5Splat11GroundCover13getBrightnessEv@Base 2.9.0
  _ZNK8osgEarth5Splat11GroundCover14getMaxDistanceEv@Base 2.9.0
+ _ZNK8osgEarth5Splat11GroundCover16releaseGLObjectsEPN3osg5StateE@Base 2.10.1
+ _ZNK8osgEarth5Splat11GroundCover18getTotalNumObjectsEv@Base 2.10.1
  _ZNK8osgEarth5Splat11GroundCover21createPredicateShaderEPNS_19LandCoverDictionaryEPNS_14LandCoverLayerE@Base 2.9.0
- _ZNK8osgEarth5Splat11GroundCover21getTotalNumBillboardsEv@Base 2.9.0
  _ZNK8osgEarth5Splat11GroundCover7getFillEv@Base 2.9.0
  _ZNK8osgEarth5Splat11GroundCover7getWindEv@Base 2.9.0
  _ZNK8osgEarth5Splat11ZoneOptions9getConfigEv@Base 2.8~rc1
@@ -590,16 +602,23 @@
  _ZNK8osgEarth5Splat14SurfaceOptions9getConfigEv@Base 2.8~rc1
  _ZNK8osgEarth5Splat15CoverageOptions9getConfigEv@Base 2.8~rc1
  _ZNK8osgEarth5Splat15SplatDetailData9getConfigEv@Base 2.8~rc1
+ _ZNK8osgEarth5Splat15SplatTextureDef16releaseGLObjectsEPN3osg5StateE@Base 2.10.1
  _ZNK8osgEarth5Splat16GroundCoverLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth5Splat16GroundCoverLayer12ZoneSelectorclEPN3osg4NodeEPNS3_11NodeVisitorE@Base 2.10.0
+ _ZNK8osgEarth5Splat16GroundCoverLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth5Splat16GroundCoverLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
- _ZNK8osgEarth5Splat16GroundCoverLayer4cullEPKN7osgUtil11CullVisitorERSt6vectorIPKN3osg8StateSetESaISA_EE@Base 2.9.0
+ _ZNK8osgEarth5Splat16GroundCoverLayer13LayerAcceptor11acceptLayerERN3osg11NodeVisitorEPKNS3_6CameraE@Base 2.10.0
+ _ZNK8osgEarth5Splat16GroundCoverLayer13LayerAcceptor9acceptKeyERKNS_7TileKeyE@Base 2.10.0
+ _ZNK8osgEarth5Splat16GroundCoverLayer16releaseGLObjectsEPN3osg5StateE@Base 2.10.1
  _ZNK8osgEarth5Splat16GroundCoverLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth5Splat16GroundCoverLayer6getLODEv@Base 2.9.0
  _ZNK8osgEarth5Splat16GroundCoverLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth5Splat16GroundCoverLayer9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth5Splat16RoadSurfaceLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth5Splat16RoadSurfaceLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth5Splat16RoadSurfaceLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth5Splat16RoadSurfaceLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth5Splat16RoadSurfaceLayer7getNodeEv@Base 2.10.0
  _ZNK8osgEarth5Splat16RoadSurfaceLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth5Splat16RoadSurfaceLayer9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth5Splat17LandUseTileSource18getCachePolicyHintEv@Base 2.8~rc1
@@ -608,22 +627,25 @@
  _ZNK8osgEarth5Splat19NoiseTextureFactory6createEjj@Base 2.8~rc1
  _ZNK8osgEarth5Splat19SplatCoverageLegend21getPredicatesForClassERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERSt6vectorIPKNS0_23CoverageValuePredicateTIS7_EESaISE_EE@Base 2.8~rc1
  _ZNK8osgEarth5Splat19SplatCoverageLegend9getConfigEv@Base 2.8~rc1
+ _ZNK8osgEarth5Splat20GroundCoverBillboard7getTypeEv@Base 2.10.1
  _ZNK8osgEarth5Splat23GroundCoverBiomeOptions9getConfigEv@Base 2.9.0
  _ZNK8osgEarth5Splat23GroundCoverLayerOptions9getConfigEv@Base 2.9.0
  _ZNK8osgEarth5Splat23RoadSurfaceLayerOptions9getConfigEv@Base 2.9.0
+ _ZNK8osgEarth5Splat4Zone16releaseGLObjectsEPN3osg5StateE@Base 2.10.1
  _ZNK8osgEarth5Splat4Zone8containsERKN3osg5Vec3fE@Base 2.8~rc1
  _ZNK8osgEarth5Splat7Surface15createLUTBufferEPKNS_19LandCoverDictionaryE@Base 2.9.0
+ _ZNK8osgEarth5Splat7Surface16releaseGLObjectsEPN3osg5StateE@Base 2.10.1
  _ZNK8osgEarth5Splat8Coverage9getLegendEv@Base 2.8~rc1
  _ZNK8osgEarth5Splat8Coverage9lockLayerERN3osg7ref_ptrINS_10ImageLayerEEE@Base 2.8~rc1
- (optional=templinst)_ZNK8osgEarth6Config11getObjIfSetINS_8Features20FeatureSourceOptionsEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.9.0
- (optional=templinst|arch=!alpha !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNK8osgEarth6Config5valueIfEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES2_@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetINS_3URIEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.8~rc1
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEbRKS7_RNS_8optionalIT_EE@Base 2.8~rc1
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIfEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.8~rc1
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIiEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.8~rc1
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_3URIEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_8Features20FeatureSourceOptionsEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEbRKS7_RNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst|arch=!arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNK8osgEarth6Config3getIfEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIiEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ _ZNK8osgEarth6Config5valueERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.1
+ (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEv@Base 2.10.0
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.8~rc1
- (optional=templinst|arch=!arm64)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN8osgEarth5Splat11ZoneOptionsEPS4_EET0_T_S9_S8_@Base 2.9.0
- (optional=templinst|arch=!hurd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN8osgEarth5Splat14SplatRangeDataEPS4_EET0_T_S9_S8_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 mips64el sparc64 x32)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPKN8osgEarth5Splat11ZoneOptionsEPS4_EET0_T_S9_S8_@Base 2.9.0
  (optional=templinst|arch=hurd-i386)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIPN8osgEarth5Splat14SplatRangeDataES5_EET0_T_S7_S6_@Base 2.9.0
  (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth5Splat10SplatClassEED1Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth5Splat10SplatClassEED2Ev@Base 2.8~rc1
@@ -633,9 +655,8 @@
  (optional=templinst|subst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10ImageLayerEEESaIS4_EE14_M_fill_assignE{size_t}RKS4_@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10ImageLayerEEESaIS4_EED1Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10ImageLayerEEESaIS4_EED2Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth11ColorFilterEEESaIS4_EED1Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth11ColorFilterEEESaIS4_EED2Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5Splat16GroundCoverBiomeEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5Splat17GroundCoverObjectEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5Splat23CoverageValuePredicateTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEEESaISC_EE17_M_realloc_insertIJSC_EEEvN9__gnu_cxx17__normal_iteratorIPSC_SE_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5Splat4ZoneEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5Splat4ZoneEEESaIS5_EED1Ev@Base 2.9.0
@@ -664,9 +685,16 @@
  (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_5Splat16RoadSurfaceLayerENS0_8Features18FeatureSourceLayerEE5EntryESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_5Splat16RoadSurfaceLayerENS0_8Features18FeatureSourceLayerEE5EntryESaIS7_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_5Splat16RoadSurfaceLayerENS0_8Features18FeatureSourceLayerEE5EntryESaIS7_EED2Ev@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EEaSERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EEaSERKS4_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN8osgEarth17ImageLayerOptionsESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth17ImageLayerOptionsESaIS1_EED1Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth17ImageLayerOptionsESaIS1_EED2Ev@Base 2.8~rc1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth3URIESaIS1_EEaSERKS3_@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat11ZoneOptionsESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat11ZoneOptionsESaIS2_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat11ZoneOptionsESaIS2_EED2Ev@Base 2.9.0
@@ -674,7 +702,6 @@
  (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat14SplatRangeDataESaIS2_EED1Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat14SplatRangeDataESaIS2_EED2Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat14SplatRangeDataESaIS2_EEaSERKS4_@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat20GroundCoverBillboardESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat23GroundCoverBiomeOptionsESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat23GroundCoverBiomeOptionsESaIS2_EEaSERKS4_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat4Zone8BoundaryESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
@@ -682,37 +709,50 @@
  (optional=templinst)_ZNSt6vectorIN8osgEarth5Splat4Zone8BoundaryESaIS3_EED2Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EED2Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIPKN3osg8StateSetESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPKN8osgEarth5Splat23CoverageValuePredicateTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEESaISB_EE17_M_realloc_insertIJSB_EEEvN9__gnu_cxx17__normal_iteratorIPSB_SD_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth3URIEiESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth3URIEiESaIS3_EED1Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth3URIEiESaIS3_EED2Ev@Base 2.8~rc1
+ (optional=templinst)_ZNSt6vectorIPN3osg5ImageESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIPN7osgUtil9RenderBinESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology5StyleENSt7__cxx114listIN3osg7ref_ptrINS1_8Features7FeatureEEESaISA_EEEESaISD_EE17_M_realloc_insertIJSD_EEEvN9__gnu_cxx17__normal_iteratorIPSD_SF_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology5StyleENSt7__cxx114listIN3osg7ref_ptrINS1_8Features7FeatureEEESaISA_EEEESaISD_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology5StyleENSt7__cxx114listIN3osg7ref_ptrINS1_8Features7FeatureEEESaISA_EEEESaISD_EED2Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth5Splat10SplatClassEESaISA_EE17_M_realloc_insertIJSA_EEEvN9__gnu_cxx17__normal_iteratorIPSA_SC_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES_IN8osgEarth5Splat14SplatRangeDataESaIS9_EEESaISC_EE17_M_realloc_insertIJSC_EEEvN9__gnu_cxx17__normal_iteratorIPSC_SE_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaIS6_EE8_M_clearEv@Base 2.9.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN8osgEarth6ConfigESaIS2_EE8_M_clearEv@Base 2.8~rc1
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairIN8osgEarth3URIEiESaIS4_EE8_M_clearEv@Base 2.10.0
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairINS_12basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIN8osgEarth5Splat14SplatRangeDataESaISA_EEESaISD_EE8_M_clearEv@Base 2.10.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.8~rc1
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE18_M_assign_dispatchISt20_List_const_iteratorIS2_EEEvT_S8_St12__false_type@Base 2.8~rc1
- (optional=templinst|arch=!alpha !hurd-i386 !i386 !mips !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIRKS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 2.9.0
- (optional=templinst|arch=!alpha !hurd-i386 !i386 !mips !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 2.9.0
- (optional=templinst|arch=!armel !armhf !mips64el !ppc64el !sparc64)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE24_M_get_insert_unique_posERKS1_@Base 2.9.0
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEaSERKS4_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_N3osg7ref_ptrINS4_5ImageEEEESt10_Select1stIS8_ESt4lessIS1_ESaIS8_EE24_M_get_insert_unique_posERS3_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_N3osg7ref_ptrINS4_5ImageEEEESt10_Select1stIS8_ESt4lessIS1_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS3_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_N3osg7ref_ptrINS4_5ImageEEEESt10_Select1stIS8_ESt4lessIS1_ESaIS8_EE4findERS3_@Base 2.10.1
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth3URIESt4pairIKS1_N3osg7ref_ptrINS4_5ImageEEEESt10_Select1stIS8_ESt4lessIS1_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.10.0
+ (optional=templinst|arch=!alpha !hurd-i386 !i386 !mips !mipsel !powerpc !powerpcspe !ppc64 !s390x)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIRKS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 2.9.0
+ (optional=templinst|arch=!alpha !hurd-i386 !i386 !mips !mipsel !powerpc !powerpcspe !ppc64 !s390x)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 2.9.0
+ (optional=templinst|arch=!armel !armhf)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE24_M_get_insert_unique_posERKS1_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE8_M_eraseEPSt13_Rb_tree_nodeIS1_E@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EEaSERKSI_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.8~rc1
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_PSt18_Rb_tree_node_baseRT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EEaSERKSE_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_bESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeIPKN3osg8StateSetESt4pairIKS3_NS0_7ref_ptrIN7osgUtil10StateGraphEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE24_M_get_insert_unique_posERS5_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIPKN3osg8StateSetESt4pairIKS3_NS0_7ref_ptrIN7osgUtil10StateGraphEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS5_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIPKN3osg8StateSetESt4pairIKS3_NS0_7ref_ptrIN7osgUtil10StateGraphEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE8_M_eraseEPSt13_Rb_tree_nodeISA_E@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIPN3osg5ImageES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE16_M_insert_uniqueIS2_EESt4pairISt17_Rb_tree_iteratorIS2_EbEOT_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIPN3osg5ImageES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIPN3osg5ImageESt4pairIKS2_iESt10_Select1stIS5_ESt4lessIS2_ESaIS5_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS5_ERS4_@Base 2.10.1
+ (optional=templinst)_ZNSt8_Rb_treeIPN3osg5ImageESt4pairIKS2_iESt10_Select1stIS5_ESt4lessIS2_ESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIcSt4pairIKcbESt10_Select1stIS2_ESt4lessIcESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.8~rc1
  (optional=templinst)_ZSteqIcEN9__gnu_cxx11__enable_ifIXsrSt9__is_charIT_E7__valueEbE6__typeERKNSt7__cxx1112basic_stringIS3_St11char_traitsIS3_ESaIS3_EEESE_@Base 2.9.0
- _ZTIN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEEE@Base 2.9.0
  _ZTIN3osg8CallbackE@Base 2.8~rc1
+ _ZTIN7osgUtil10StateGraphE@Base 2.10.0
  _ZTIN8osgEarth10PatchLayer14AcceptCallbackE@Base 2.9.0
  _ZTIN8osgEarth10ReadResultE@Base 2.8~rc1
  _ZTIN8osgEarth10URIContextE@Base 2.8~rc1
@@ -730,6 +770,8 @@
  _ZTIN8osgEarth17PatchLayerOptionsE@Base 2.9.0
  _ZTIN8osgEarth19LandCoverDictionaryE@Base 2.9.0
  _ZTIN8osgEarth3URIE@Base 2.8~rc1
+ _ZTIN8osgEarth5Layer17TraversalCallbackE@Base 2.10.0
+ _ZTIN8osgEarth5Splat10SplatLayer12ZoneSelectorE@Base 2.10.0
  _ZTIN8osgEarth5Splat10SplatLayerE@Base 2.9.0
  _ZTIN8osgEarth5Splat11GroundCoverE@Base 2.9.0
  _ZTIN8osgEarth5Splat11ZoneOptionsE@Base 2.8~rc1
@@ -740,12 +782,16 @@
  _ZTIN8osgEarth5Splat14SurfaceOptionsE@Base 2.8~rc1
  _ZTIN8osgEarth5Splat15CoverageOptionsE@Base 2.8~rc1
  _ZTIN8osgEarth5Splat16GroundCoverBiomeE@Base 2.9.0
+ _ZTIN8osgEarth5Splat16GroundCoverLayer12ZoneSelectorE@Base 2.10.0
+ _ZTIN8osgEarth5Splat16GroundCoverLayer13LayerAcceptorE@Base 2.10.0
  _ZTIN8osgEarth5Splat16GroundCoverLayerE@Base 2.9.0
  _ZTIN8osgEarth5Splat16RoadSurfaceLayerE@Base 2.9.0
+ _ZTIN8osgEarth5Splat17GroundCoverObjectE@Base 2.10.1
  _ZTIN8osgEarth5Splat17LandUseTileSourceE@Base 2.8~rc1
  _ZTIN8osgEarth5Splat17SplatLayerOptionsE@Base 2.9.0
  _ZTIN8osgEarth5Splat18GroundCoverOptionsE@Base 2.9.0
  _ZTIN8osgEarth5Splat19SplatCoverageLegendE@Base 2.8~rc1
+ _ZTIN8osgEarth5Splat20GroundCoverBillboardE@Base 2.10.1
  _ZTIN8osgEarth5Splat23CoverageValuePredicateTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.8~rc1
  _ZTIN8osgEarth5Splat23GroundCoverBiomeOptionsE@Base 2.9.0
  _ZTIN8osgEarth5Splat23GroundCoverLayerOptionsE@Base 2.9.0
@@ -753,19 +799,19 @@
  _ZTIN8osgEarth5Splat4ZoneE@Base 2.8~rc1
  _ZTIN8osgEarth5Splat7SurfaceE@Base 2.8~rc1
  _ZTIN8osgEarth5Splat8CoverageE@Base 2.8~rc1
- _ZTIN8osgEarth7MapInfoE@Base 2.9.0
  _ZTIN8osgEarth7TileKeyE@Base 2.8~rc1
  _ZTIN8osgEarth8DistanceE@Base 2.9.0
  _ZTIN8osgEarth8Features16GeometryCompilerE@Base 2.9.0
  _ZTIN8osgEarth8GeoImageE@Base 2.8~rc1
- _ZTIN8osgEarth8MapFrameE@Base 2.9.0
  _ZTIN8osgEarth8optionalIN3osg6Vec4ubEEE@Base 2.8~rc1
  _ZTIN8osgEarth8optionalIN3osg7Texture10FilterModeEEE@Base 2.8~rc1
  _ZTIN8osgEarth8optionalIN3osg7Texture18InternalFormatModeEEE@Base 2.8~rc1
  _ZTIN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.8~rc1
  _ZTIN8osgEarth8optionalINS_13ProxySettingsEEE@Base 2.8~rc1
+ _ZTIN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTIN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.8~rc1
  _ZTIN8osgEarth8optionalINS_17TileSourceOptionsEEE@Base 2.8~rc1
+ _ZTIN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTIN8osgEarth8optionalINS_3URIEEE@Base 2.8~rc1
  _ZTIN8osgEarth8optionalINS_5Splat14SurfaceOptionsEEE@Base 2.8~rc1
  _ZTIN8osgEarth8optionalINS_5Splat15SplatDetailDataEEE@Base 2.8~rc1
@@ -785,8 +831,8 @@
  _ZTIN8osgEarth9Threading5EventE@Base 2.9.0
  _ZTIN8osgEarth9Threading6FutureIN3osg5ImageEE9RefPtrRefE@Base 2.9.0
  _ZTIN8osgEarth9Threading8RefEventE@Base 2.9.0
- _ZTSN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEEE@Base 2.9.0
  _ZTSN3osg8CallbackE@Base 2.8~rc1
+ _ZTSN7osgUtil10StateGraphE@Base 2.10.0
  _ZTSN8osgEarth10PatchLayer14AcceptCallbackE@Base 2.9.0
  _ZTSN8osgEarth10ReadResultE@Base 2.8~rc1
  _ZTSN8osgEarth10URIContextE@Base 2.8~rc1
@@ -804,6 +850,8 @@
  _ZTSN8osgEarth17PatchLayerOptionsE@Base 2.9.0
  _ZTSN8osgEarth19LandCoverDictionaryE@Base 2.9.0
  _ZTSN8osgEarth3URIE@Base 2.8~rc1
+ _ZTSN8osgEarth5Layer17TraversalCallbackE@Base 2.10.0
+ _ZTSN8osgEarth5Splat10SplatLayer12ZoneSelectorE@Base 2.10.0
  _ZTSN8osgEarth5Splat10SplatLayerE@Base 2.9.0
  _ZTSN8osgEarth5Splat11GroundCoverE@Base 2.9.0
  _ZTSN8osgEarth5Splat11ZoneOptionsE@Base 2.8~rc1
@@ -814,12 +862,16 @@
  _ZTSN8osgEarth5Splat14SurfaceOptionsE@Base 2.8~rc1
  _ZTSN8osgEarth5Splat15CoverageOptionsE@Base 2.8~rc1
  _ZTSN8osgEarth5Splat16GroundCoverBiomeE@Base 2.9.0
+ _ZTSN8osgEarth5Splat16GroundCoverLayer12ZoneSelectorE@Base 2.10.0
+ _ZTSN8osgEarth5Splat16GroundCoverLayer13LayerAcceptorE@Base 2.10.0
  _ZTSN8osgEarth5Splat16GroundCoverLayerE@Base 2.9.0
  _ZTSN8osgEarth5Splat16RoadSurfaceLayerE@Base 2.9.0
+ _ZTSN8osgEarth5Splat17GroundCoverObjectE@Base 2.10.1
  _ZTSN8osgEarth5Splat17LandUseTileSourceE@Base 2.8~rc1
  _ZTSN8osgEarth5Splat17SplatLayerOptionsE@Base 2.9.0
  _ZTSN8osgEarth5Splat18GroundCoverOptionsE@Base 2.9.0
  _ZTSN8osgEarth5Splat19SplatCoverageLegendE@Base 2.8~rc1
+ _ZTSN8osgEarth5Splat20GroundCoverBillboardE@Base 2.10.1
  _ZTSN8osgEarth5Splat23CoverageValuePredicateTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.8~rc1
  _ZTSN8osgEarth5Splat23GroundCoverBiomeOptionsE@Base 2.9.0
  _ZTSN8osgEarth5Splat23GroundCoverLayerOptionsE@Base 2.9.0
@@ -827,19 +879,19 @@
  _ZTSN8osgEarth5Splat4ZoneE@Base 2.8~rc1
  _ZTSN8osgEarth5Splat7SurfaceE@Base 2.8~rc1
  _ZTSN8osgEarth5Splat8CoverageE@Base 2.8~rc1
- _ZTSN8osgEarth7MapInfoE@Base 2.9.0
  _ZTSN8osgEarth7TileKeyE@Base 2.8~rc1
  _ZTSN8osgEarth8DistanceE@Base 2.9.0
  _ZTSN8osgEarth8Features16GeometryCompilerE@Base 2.9.0
  _ZTSN8osgEarth8GeoImageE@Base 2.8~rc1
- _ZTSN8osgEarth8MapFrameE@Base 2.9.0
  _ZTSN8osgEarth8optionalIN3osg6Vec4ubEEE@Base 2.8~rc1
  _ZTSN8osgEarth8optionalIN3osg7Texture10FilterModeEEE@Base 2.8~rc1
  _ZTSN8osgEarth8optionalIN3osg7Texture18InternalFormatModeEEE@Base 2.8~rc1
  _ZTSN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.8~rc1
  _ZTSN8osgEarth8optionalINS_13ProxySettingsEEE@Base 2.8~rc1
+ _ZTSN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTSN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.8~rc1
  _ZTSN8osgEarth8optionalINS_17TileSourceOptionsEEE@Base 2.8~rc1
+ _ZTSN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTSN8osgEarth8optionalINS_3URIEEE@Base 2.8~rc1
  _ZTSN8osgEarth8optionalINS_5Splat14SurfaceOptionsEEE@Base 2.8~rc1
  _ZTSN8osgEarth8optionalINS_5Splat15SplatDetailDataEEE@Base 2.8~rc1
@@ -860,10 +912,12 @@
  _ZTSN8osgEarth9Threading6FutureIN3osg5ImageEE9RefPtrRefE@Base 2.9.0
  _ZTSN8osgEarth9Threading8RefEventE@Base 2.9.0
  _ZTTN3osg8CallbackE@Base 2.8~rc1
+ _ZTTN8osgEarth5Splat10SplatLayer12ZoneSelectorE@Base 2.10.0
  _ZTTN8osgEarth5Splat12ZoneSwitcherE@Base 2.8~rc1
+ _ZTTN8osgEarth5Splat16GroundCoverLayer12ZoneSelectorE@Base 2.10.0
  _ZTTN8osgEarth5Splat17LandUseTileSourceE@Base 2.8~rc1
- _ZTVN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEEE@Base 2.9.0
  _ZTVN3osg8CallbackE@Base 2.8~rc1
+ _ZTVN7osgUtil10StateGraphE@Base 2.10.0
  _ZTVN8osgEarth10PatchLayer14AcceptCallbackE@Base 2.9.0
  _ZTVN8osgEarth10ReadResultE@Base 2.8~rc1
  _ZTVN8osgEarth10URIContextE@Base 2.8~rc1
@@ -879,6 +933,7 @@
  _ZTVN8osgEarth16TileSourceDriverE@Base 2.8~rc1
  _ZTVN8osgEarth16qualified_doubleINS_8DistanceEEE@Base 2.9.0
  _ZTVN8osgEarth3URIE@Base 2.8~rc1
+ _ZTVN8osgEarth5Splat10SplatLayer12ZoneSelectorE@Base 2.10.0
  _ZTVN8osgEarth5Splat10SplatLayerE@Base 2.9.0
  _ZTVN8osgEarth5Splat11GroundCoverE@Base 2.9.0
  _ZTVN8osgEarth5Splat11ZoneOptionsE@Base 2.8~rc1
@@ -889,12 +944,16 @@
  _ZTVN8osgEarth5Splat14SurfaceOptionsE@Base 2.8~rc1
  _ZTVN8osgEarth5Splat15CoverageOptionsE@Base 2.8~rc1
  _ZTVN8osgEarth5Splat16GroundCoverBiomeE@Base 2.9.0
+ _ZTVN8osgEarth5Splat16GroundCoverLayer12ZoneSelectorE@Base 2.10.0
+ _ZTVN8osgEarth5Splat16GroundCoverLayer13LayerAcceptorE@Base 2.10.0
  _ZTVN8osgEarth5Splat16GroundCoverLayerE@Base 2.9.0
  _ZTVN8osgEarth5Splat16RoadSurfaceLayerE@Base 2.9.0
+ _ZTVN8osgEarth5Splat17GroundCoverObjectE@Base 2.10.1
  _ZTVN8osgEarth5Splat17LandUseTileSourceE@Base 2.8~rc1
  _ZTVN8osgEarth5Splat17SplatLayerOptionsE@Base 2.9.0
  _ZTVN8osgEarth5Splat18GroundCoverOptionsE@Base 2.9.0
  _ZTVN8osgEarth5Splat19SplatCoverageLegendE@Base 2.8~rc1
+ _ZTVN8osgEarth5Splat20GroundCoverBillboardE@Base 2.10.1
  _ZTVN8osgEarth5Splat23CoverageValuePredicateTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.8~rc1
  _ZTVN8osgEarth5Splat23GroundCoverBiomeOptionsE@Base 2.9.0
  _ZTVN8osgEarth5Splat23GroundCoverLayerOptionsE@Base 2.9.0
@@ -902,19 +961,19 @@
  _ZTVN8osgEarth5Splat4ZoneE@Base 2.8~rc1
  _ZTVN8osgEarth5Splat7SurfaceE@Base 2.8~rc1
  _ZTVN8osgEarth5Splat8CoverageE@Base 2.8~rc1
- _ZTVN8osgEarth7MapInfoE@Base 2.9.0
  _ZTVN8osgEarth7TileKeyE@Base 2.8~rc1
  _ZTVN8osgEarth8DistanceE@Base 2.9.0
  _ZTVN8osgEarth8Features16GeometryCompilerE@Base 2.9.0
  _ZTVN8osgEarth8GeoImageE@Base 2.8~rc1
- _ZTVN8osgEarth8MapFrameE@Base 2.9.0
  _ZTVN8osgEarth8optionalIN3osg6Vec4ubEEE@Base 2.8~rc1
  _ZTVN8osgEarth8optionalIN3osg7Texture10FilterModeEEE@Base 2.8~rc1
  _ZTVN8osgEarth8optionalIN3osg7Texture18InternalFormatModeEEE@Base 2.8~rc1
  _ZTVN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.8~rc1
  _ZTVN8osgEarth8optionalINS_13ProxySettingsEEE@Base 2.8~rc1
+ _ZTVN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTVN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.8~rc1
  _ZTVN8osgEarth8optionalINS_17TileSourceOptionsEEE@Base 2.8~rc1
+ _ZTVN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTVN8osgEarth8optionalINS_3URIEEE@Base 2.8~rc1
  _ZTVN8osgEarth8optionalINS_5Splat14SurfaceOptionsEEE@Base 2.8~rc1
  _ZTVN8osgEarth8optionalINS_5Splat15SplatDetailDataEEE@Base 2.8~rc1
@@ -948,7 +1007,9 @@
  (c++)"virtual thunk to osg::NodeCallback::cloneType() const@Base" 2.8~rc1
  (c++)"virtual thunk to osg::NodeCallback::isSameKindAs(osg::Object const*) const@Base" 2.8~rc1
  (c++)"virtual thunk to osg::NodeCallback::libraryName() const@Base" 2.8~rc1
+ (c++)"virtual thunk to osgEarth::Splat::GroundCoverLayer::ZoneSelector::~ZoneSelector()@Base" 2.10.0
  (c++)"virtual thunk to osgEarth::Splat::LandUseTileSource::~LandUseTileSource()@Base" 2.8~rc1
+ (c++)"virtual thunk to osgEarth::Splat::SplatLayer::ZoneSelector::~ZoneSelector()@Base" 2.10.0
  (c++)"virtual thunk to osgEarth::Splat::ZoneSwitcher::~ZoneSwitcher()@Base" 2.8~rc1
  (c++)"virtual thunk to osgEarth::TileSource::className() const@Base" 2.8~rc1
  (c++)"virtual thunk to osgEarth::TileSource::clone(osg::CopyOp const&) const@Base" 2.8~rc1
diff -Nru osgearth-2.9.0+dfsg/debian/libosgearthsymbology5.symbols osgearth-2.10.2+dfsg/debian/libosgearthsymbology5.symbols
--- osgearth-2.9.0+dfsg/debian/libosgearthsymbology5.symbols	2018-02-07 17:53:05.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/libosgearthsymbology5.symbols	2019-04-20 06:08:11.000000000 +0000
@@ -1,5 +1,6 @@
-# SymbolsHelper-Confirmed: 2.9.0 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64
+# SymbolsHelper-Confirmed: 2.10.1 amd64
 libosgEarthSymbology.so.5 #PACKAGE# #MINVER#
+* Build-Depends-Package: libosgearth-dev
  _ZN3agg10rasterizer15s_default_gammaE@Base 2.4.0
  _ZN3agg10rasterizer5gammaEPKh@Base 2.4.0
  _ZN3agg10rasterizer5gammaEd@Base 2.4.0
@@ -107,9 +108,6 @@
  (optional=templinst)_ZN3osg11MixinVectorINS_7MatrixfEED0Ev@Base 2.7.0
  (optional=templinst)_ZN3osg11MixinVectorINS_7MatrixfEED1Ev@Base 2.7.0
  (optional=templinst)_ZN3osg11MixinVectorINS_7MatrixfEED2Ev@Base 2.7.0
- (optional=templinst)_ZN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEED0Ev@Base 2.9.0
- (optional=templinst)_ZN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEED1Ev@Base 2.9.0
- (optional=templinst)_ZN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEED2Ev@Base 2.9.0
  (optional=templinst)_ZN3osg11MixinVectorIaED0Ev@Base 2.7.0
  (optional=templinst)_ZN3osg11MixinVectorIaED1Ev@Base 2.7.0
  (optional=templinst)_ZN3osg11MixinVectorIaED2Ev@Base 2.7.0
@@ -252,8 +250,8 @@
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EE4trimEv@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EE6acceptERNS_12ArrayVisitorE@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EE6acceptEjRNS_12ValueVisitorE@Base 2.4.0
- (optional=templinst|arch=hurd-i386 i386 m68k)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EEC1ENS2_7BindingE@Base 2.9.0
- (optional=templinst|arch=hurd-i386 i386 m68k)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EEC2ENS2_7BindingE@Base 2.9.0
+ (optional=templinst|arch=mips64el sparc64 x32)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EEC1ENS2_7BindingE@Base 2.10.0
+ (optional=templinst|arch=mips64el sparc64 x32)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EEC2ENS2_7BindingE@Base 2.10.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EED0Ev@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EED1Ev@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec3fELNS_5Array4TypeE28ELi3ELi5126EED2Ev@Base 2.4.0
@@ -520,20 +518,9 @@
  (optional=templinst)_ZN3osg18TemplateIndexArrayItLNS_5Array4TypeE5ELi1ELi5123EED0Ev@Base 2.7.0
  (optional=templinst)_ZN3osg18TemplateIndexArrayItLNS_5Array4TypeE5ELi1ELi5123EED1Ev@Base 2.7.0
  (optional=templinst)_ZN3osg18TemplateIndexArrayItLNS_5Array4TypeE5ELi1ELi5123EED2Ev@Base 2.7.0
- _ZN3osg4Node10asDrawableEv@Base 2.8~rc1
- _ZN3osg4Node10asGeometryEv@Base 2.8~rc1
- _ZN3osg4Node11asTransformEv@Base 2.4.0
- _ZN3osg4Node6asNodeEv@Base 2.8~rc1
- _ZN3osg4Node7asGeodeEv@Base 2.4.0
- _ZN3osg4Node8asCameraEv@Base 2.4.0
- _ZN3osg4Node8asSwitchEv@Base 2.4.0
- _ZN3osg4Node9asTerrainEv@Base 2.4.0
  _ZN3osg5Array4trimEv@Base 2.7.0
  _ZN3osg5Array7asArrayEv@Base 2.4.0
- _ZN3osg5Group12childRemovedEjj@Base 2.4.0
- _ZN3osg5Group13childInsertedEj@Base 2.4.0
  _ZN3osg5Group6acceptERNS_11NodeVisitorE@Base 2.8~rc1
- _ZN3osg5Group7asGroupEv@Base 2.4.0
  (optional=templinst)_ZN3osg5cloneINS_4NodeEEEPT_PKS2_RKNS_6CopyOpE@Base 2.6.0
  _ZN3osg6Object13asNodeVisitorEv@Base 2.8~rc1
  _ZN3osg6Object16asStateAttributeEv@Base 2.8~rc1
@@ -565,50 +552,41 @@
  _ZN8osgEarth22TextureAndImageVisitor5applyERN3osg5ImageE@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth2asIbEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth2asIjEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hurd-i386)_ZN8osgEarth2asIsEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.9.0
  (optional=templinst)_ZN8osgEarth2asItEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.7.0
  _ZN8osgEarth3URID0Ev@Base 2.4.0
  _ZN8osgEarth3URID1Ev@Base 2.4.0
  _ZN8osgEarth3URID2Ev@Base 2.4.0
+ _ZN8osgEarth5Units7convertERKS0_S2_dRd@Base 2.10.0
  _ZN8osgEarth5UnitsC1ERKS0_@Base 2.9.0
  _ZN8osgEarth5UnitsC2ERKS0_@Base 2.9.0
  _ZN8osgEarth5UnitsD1Ev@Base 2.4.0
  _ZN8osgEarth5UnitsD2Ev@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hurd-i386)_ZN8osgEarth6Config11addObjIfSetINS_9Symbology17NumericExpressionEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth6Config11updateIfSetIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZN8osgEarth6Config3addINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.7.0
+ (arch=!arm64 !x32)_ZN8osgEarth5UnitsaSERKS0_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth6Config3setINS_9Symbology16StringExpressionEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth6Config3setINS_9Symbology17NumericExpressionEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIS0_EEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
  _ZN8osgEarth6Config6removeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
- (optional=templinst)_ZN8osgEarth6Config6updateINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.7.0
- (optional=templinst|arch=!arm64)_ZN8osgEarth6Config8addIfSetIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.8~rc1
  _ZN8osgEarth6ConfigC1ERKS0_@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth6ConfigC1INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERKS7_RKT_@Base 2.10.1
  _ZN8osgEarth6ConfigC2ERKS0_@Base 2.4.0
- _ZN8osgEarth7MapInfoD0Ev@Base 2.9.0
- _ZN8osgEarth7MapInfoD1Ev@Base 2.9.0
- _ZN8osgEarth7MapInfoD2Ev@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth6ConfigC2INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERKS7_RKT_@Base 2.10.1
  _ZN8osgEarth7TileKeyD0Ev@Base 2.4.0
  _ZN8osgEarth7TileKeyD1Ev@Base 2.4.0
  _ZN8osgEarth7TileKeyD2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_4NodeEEESt4lessIS6_EE11insert_implERKS6_RKSA_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_4NodeEEESt4lessIS6_EED0Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_4NodeEEESt4lessIS6_EED1Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_4NodeEEESt4lessIS6_EED2Ev@Base 2.7.0
- (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_7TextureEEESt4lessIS6_EE11insert_implERKS6_RKSA_@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_7TextureEEESt4lessIS6_EED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_7TextureEEESt4lessIS6_EED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_7TextureEEESt4lessIS6_EED2Ev@Base 2.9.0
- (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_8StateSetEEESt4lessIS6_EE11insert_implERKS6_RKSA_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_8StateSetEEESt4lessIS6_EED0Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_8StateSetEEESt4lessIS6_EED1Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_8StateSetEEESt4lessIS6_EED2Ev@Base 2.7.0
- _ZN8osgEarth8MapFrameD0Ev@Base 2.9.0
- _ZN8osgEarth8MapFrameD1Ev@Base 2.9.0
- _ZN8osgEarth8MapFrameD2Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalIN3osg5Vec2sEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIN3osg5Vec2sEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIN3osg5Vec2sEED2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalIN3osg5Vec3fEED0Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalIN3osg5Vec3fEED1Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalIN3osg5Vec3fEED2Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIN3osg6TexEnv4ModeEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIN3osg6TexEnv4ModeEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIN3osg6TexEnv4ModeEED2Ev@Base 2.4.0
@@ -659,12 +637,6 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology10TextSymbol9AlignmentEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology10TextSymbol9AlignmentEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology10TextSymbol9AlignmentEED2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology12MarkerSymbol9AlignmentEED0Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology12MarkerSymbol9AlignmentEED1Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology12MarkerSymbol9AlignmentEED2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology12MarkerSymbol9PlacementEED0Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology12MarkerSymbol9PlacementEED1Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology12MarkerSymbol9PlacementEED2Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology14AltitudeSymbol7BindingEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology14AltitudeSymbol7BindingEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology14AltitudeSymbol7BindingEED2Ev@Base 2.4.0
@@ -677,9 +649,6 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology14InstanceSymbol9PlacementEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology14InstanceSymbol9PlacementEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology14InstanceSymbol9PlacementEED2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology15ExtrusionSymbol15HeightReferenceEED0Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology15ExtrusionSymbol15HeightReferenceEED1Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology15ExtrusionSymbol15HeightReferenceEED2Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology16StringExpressionEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology16StringExpressionEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology16StringExpressionEED2Ev@Base 2.4.0
@@ -724,9 +693,6 @@
  (optional=templinst)_ZN8osgEarth8optionalItED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalItED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalItED2Ev@Base 2.4.0
- (optional=templinst|arch=alpha amd64 arm64 hppa kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN8osgEarth8toStringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEES6_RKT_@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth8toStringIdEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.9.0
- (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZN8osgEarth8toStringIfEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8toStringIsEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.8~rc1
  _ZN8osgEarth9GeoExtentD0Ev@Base 2.4.0
  _ZN8osgEarth9GeoExtentD1Ev@Base 2.4.0
@@ -826,15 +792,6 @@
  _ZN8osgEarth9Symbology12IconResourceD0Ev@Base 2.4.0
  _ZN8osgEarth9Symbology12IconResourceD1Ev@Base 2.4.0
  _ZN8osgEarth9Symbology12IconResourceD2Ev@Base 2.4.0
- _ZN8osgEarth9Symbology12MarkerSymbol11mergeConfigERKNS_6ConfigE@Base 2.4.0
- _ZN8osgEarth9Symbology12MarkerSymbol8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.4.0
- _ZN8osgEarth9Symbology12MarkerSymbolC1ERKNS_6ConfigE@Base 2.4.0
- _ZN8osgEarth9Symbology12MarkerSymbolC1ERKS1_RKN3osg6CopyOpE@Base 2.7.0
- _ZN8osgEarth9Symbology12MarkerSymbolC2ERKNS_6ConfigE@Base 2.4.0
- _ZN8osgEarth9Symbology12MarkerSymbolC2ERKS1_RKN3osg6CopyOpE@Base 2.7.0
- _ZN8osgEarth9Symbology12MarkerSymbolD0Ev@Base 2.4.0
- _ZN8osgEarth9Symbology12MarkerSymbolD1Ev@Base 2.4.0
- _ZN8osgEarth9Symbology12MarkerSymbolD2Ev@Base 2.4.0
  _ZN8osgEarth9Symbology12RenderSymbol11mergeConfigERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth9Symbology12RenderSymbol8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.4.0
  _ZN8osgEarth9Symbology12RenderSymbolC1ERKNS_6ConfigE@Base 2.4.0
@@ -919,12 +876,6 @@
  _ZN8osgEarth9Symbology14InstanceSymbolD0Ev@Base 2.4.0
  _ZN8osgEarth9Symbology14InstanceSymbolD1Ev@Base 2.4.0
  _ZN8osgEarth9Symbology14InstanceSymbolD2Ev@Base 2.4.0
- _ZN8osgEarth9Symbology14MarkerResource11mergeConfigERKNS_6ConfigE@Base 2.4.0
- _ZN8osgEarth9Symbology14MarkerResourceC1ERKNS_6ConfigE@Base 2.4.0
- _ZN8osgEarth9Symbology14MarkerResourceC2ERKNS_6ConfigE@Base 2.4.0
- _ZN8osgEarth9Symbology14MarkerResourceD0Ev@Base 2.4.0
- _ZN8osgEarth9Symbology14MarkerResourceD1Ev@Base 2.4.0
- _ZN8osgEarth9Symbology14MarkerResourceD2Ev@Base 2.4.0
  _ZN8osgEarth9Symbology14MeshSubdivider3runERN3osg8GeometryEdNS_16GeoInterpolationE@Base 2.4.0
  _ZN8osgEarth9Symbology14MeshSubdividerC1ERKN3osg7MatrixdES5_@Base 2.4.0
  _ZN8osgEarth9Symbology14MeshSubdividerC2ERKN3osg7MatrixdES5_@Base 2.4.0
@@ -1026,25 +977,6 @@
  _ZN8osgEarth9Symbology17NumericExpressionD1Ev@Base 2.4.0
  _ZN8osgEarth9Symbology17NumericExpressionD2Ev@Base 2.4.0
  _ZN8osgEarth9Symbology17NumericExpressionaSERKS1_@Base 2.8~rc2
- _ZN8osgEarth9Symbology17StencilVolumeNode10addVolumesEPN3osg4NodeEb@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode11insertChildEjPN3osg4NodeE@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode12replaceChildEPN3osg4NodeES4_@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode14removeChildrenEjj@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode16addQueuedVolumesEv@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode16setBaseRenderBinEi@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode20createFullScreenQuadERKN3osg5Vec4fE@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode4initEv@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode6acceptERN3osg11NodeVisitorE@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode8addChildEPN3osg4NodeE@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode8setChildEjPN3osg4NodeE@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNode8traverseERN3osg11NodeVisitorE@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNodeC1ERKS1_RKN3osg6CopyOpE@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNodeC1Ebb@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNodeC2ERKS1_RKN3osg6CopyOpE@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNodeC2Ebb@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNodeD0Ev@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNodeD1Ev@Base 2.4.0
- _ZN8osgEarth9Symbology17StencilVolumeNodeD2Ev@Base 2.4.0
  _ZN8osgEarth9Symbology18GeometryRasterizer4drawEPKNS0_8GeometryERKN3osg5Vec4fE@Base 2.4.0
  _ZN8osgEarth9Symbology18GeometryRasterizer8finalizeEv@Base 2.4.0
  _ZN8osgEarth9Symbology18GeometryRasterizerC1EPN3osg5ImageERKNS0_5StyleE@Base 2.5.0
@@ -1082,10 +1014,6 @@
  (optional=templinst)_ZN8osgEarth9Symbology19SimpleSymbolFactoryINS0_11PointSymbolEED0Ev@Base 2.5.0
  (optional=templinst)_ZN8osgEarth9Symbology19SimpleSymbolFactoryINS0_11PointSymbolEED1Ev@Base 2.5.0
  (optional=templinst)_ZN8osgEarth9Symbology19SimpleSymbolFactoryINS0_11PointSymbolEED2Ev@Base 2.5.0
- (optional=templinst)_ZN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12MarkerSymbolEE6createERKNS_6ConfigE@Base 2.5.0
- (optional=templinst)_ZN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12MarkerSymbolEED0Ev@Base 2.5.0
- (optional=templinst)_ZN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12MarkerSymbolEED1Ev@Base 2.5.0
- (optional=templinst)_ZN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12MarkerSymbolEED2Ev@Base 2.5.0
  (optional=templinst)_ZN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12RenderSymbolEE6createERKNS_6ConfigE@Base 2.5.0
  (optional=templinst)_ZN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12RenderSymbolEED0Ev@Base 2.5.0
  (optional=templinst)_ZN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12RenderSymbolEED1Ev@Base 2.5.0
@@ -1176,6 +1104,7 @@
  _ZN8osgEarth9Symbology5Color6YellowE@Base 2.4.0
  _ZN8osgEarth9Symbology5Color7FuchsiaE@Base 2.4.0
  _ZN8osgEarth9Symbology5Color7MagentaE@Base 2.4.0
+ _ZN8osgEarth9Symbology5Color7fromHSLERKN3osg5Vec4fE@Base 2.10.0
  _ZN8osgEarth9Symbology5Color8DarkGrayE@Base 2.4.0
  _ZN8osgEarth9Symbology5ColorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS1_6FormatE@Base 2.7.0
  _ZN8osgEarth9Symbology5ColorC1ERKS1_f@Base 2.4.0
@@ -1187,8 +1116,6 @@
  _ZN8osgEarth9Symbology5ColorD1Ev@Base 2.4.0
  _ZN8osgEarth9Symbology5ColorD2Ev@Base 2.4.0
  _ZN8osgEarth9Symbology5Query11mergeConfigERKNS_6ConfigE@Base 2.4.0
- _ZN8osgEarth9Symbology5Query6setMapEPKNS_3MapE@Base 2.7.0
- _ZN8osgEarth9Symbology5Query6setMapERKNS_8MapFrameE@Base 2.9.0
  _ZN8osgEarth9Symbology5QueryC1ERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth9Symbology5QueryC1ERKS1_@Base 2.8~rc1
  _ZN8osgEarth9Symbology5QueryC2ERKNS_6ConfigE@Base 2.4.0
@@ -1197,22 +1124,23 @@
  _ZN8osgEarth9Symbology5QueryD1Ev@Base 2.4.0
  _ZN8osgEarth9Symbology5QueryD2Ev@Base 2.4.0
  _ZN8osgEarth9Symbology5Style11copySymbolsERKS1_@Base 2.7.0
- _ZN8osgEarth9Symbology5Style11mergeConfigERKNS_6ConfigE@Base 2.4.0
+ _ZN8osgEarth9Symbology5Style11mergeConfigERKNS_6ConfigEPKNS0_10StyleSheetE@Base 2.10.0
  _ZN8osgEarth9Symbology5Style12removeSymbolEPNS0_6SymbolE@Base 2.4.0
  (optional=templinst)_ZN8osgEarth9Symbology5Style17getOrCreateSymbolINS0_10IconSymbolEEEPT_v@Base 2.4.0
  (optional=templinst)_ZN8osgEarth9Symbology5Style17getOrCreateSymbolINS0_10LineSymbolEEEPT_v@Base 2.4.0
  (optional=templinst)_ZN8osgEarth9Symbology5Style17getOrCreateSymbolINS0_10SkinSymbolEEEPT_v@Base 2.4.0
  (optional=templinst)_ZN8osgEarth9Symbology5Style17getOrCreateSymbolINS0_10TextSymbolEEEPT_v@Base 2.4.0
  (optional=templinst)_ZN8osgEarth9Symbology5Style17getOrCreateSymbolINS0_11ModelSymbolEEEPT_v@Base 2.8~rc1
- (optional=templinst)_ZN8osgEarth9Symbology5Style17getOrCreateSymbolINS0_12MarkerSymbolEEEPT_v@Base 2.4.0
  (optional=templinst)_ZN8osgEarth9Symbology5Style17getOrCreateSymbolINS0_12RenderSymbolEEEPT_v@Base 2.4.0
  (optional=templinst)_ZN8osgEarth9Symbology5Style17getOrCreateSymbolINS0_14AltitudeSymbolEEEPT_v@Base 2.9.0
- _ZN8osgEarth9Symbology5Style7fromSLDERKNS_6ConfigE@Base 2.4.0
+ _ZN8osgEarth9Symbology5Style7fromSLDERKNS_6ConfigEPKNS0_10StyleSheetE@Base 2.10.0
  _ZN8osgEarth9Symbology5Style9addSymbolEPNS0_6SymbolE@Base 2.4.0
  _ZN8osgEarth9Symbology5StyleC1ERKNS_6ConfigE@Base 2.4.0
+ _ZN8osgEarth9Symbology5StyleC1ERKNS_6ConfigEPKNS0_10StyleSheetE@Base 2.10.0
  _ZN8osgEarth9Symbology5StyleC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth9Symbology5StyleC1ERKS1_RKN3osg6CopyOpE@Base 2.4.0
  _ZN8osgEarth9Symbology5StyleC2ERKNS_6ConfigE@Base 2.4.0
+ _ZN8osgEarth9Symbology5StyleC2ERKNS_6ConfigEPKNS0_10StyleSheetE@Base 2.10.0
  _ZN8osgEarth9Symbology5StyleC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth9Symbology5StyleC2ERKS1_RKN3osg6CopyOpE@Base 2.4.0
  _ZN8osgEarth9Symbology5StyleD0Ev@Base 2.4.0
@@ -1285,7 +1213,7 @@
  _ZN8osgEarth9Symbology8ResourceD0Ev@Base 2.4.0
  _ZN8osgEarth9Symbology8ResourceD1Ev@Base 2.4.0
  _ZN8osgEarth9Symbology8ResourceD2Ev@Base 2.4.0
- (optional=templinst)_ZN8osgEarth9Symbology8TaggableINS0_6SymbolEE7addTagsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
+ (optional=templinst|arch=!armel !armhf !i386 !mips !mipsel !powerpc !powerpcspe)_ZN8osgEarth9Symbology8TaggableINS0_6SymbolEE7addTagsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  (optional=templinst)_ZN8osgEarth9Symbology8TaggableINS0_6SymbolEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth9Symbology8TaggableINS0_6SymbolEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth9Symbology8TaggableINS0_6SymbolEED2Ev@Base 2.4.0
@@ -1616,47 +1544,38 @@
  (optional=templinst)_ZNK3osg18TemplateIndexArrayItLNS_5Array4TypeE5ELi1ELi5123EE6acceptEjRNS_17ConstValueVisitorE@Base 2.7.0
  (optional=templinst)_ZNK3osg18TemplateIndexArrayItLNS_5Array4TypeE5ELi1ELi5123EE7compareEjj@Base 2.7.0
  (optional=templinst)_ZNK3osg18TemplateIndexArrayItLNS_5Array4TypeE5ELi1ELi5123EE9cloneTypeEv@Base 2.7.0
- _ZNK3osg4Node10asDrawableEv@Base 2.8~rc1
- _ZNK3osg4Node10asGeometryEv@Base 2.8~rc1
- _ZNK3osg4Node11asTransformEv@Base 2.4.0
- _ZNK3osg4Node6asNodeEv@Base 2.8~rc1
- _ZNK3osg4Node7asGeodeEv@Base 2.4.0
- _ZNK3osg4Node8asCameraEv@Base 2.4.0
- _ZNK3osg4Node8asSwitchEv@Base 2.4.0
- _ZNK3osg4Node9asTerrainEv@Base 2.4.0
  _ZNK3osg5Array11libraryNameEv@Base 2.4.0
  _ZNK3osg5Array12isSameKindAsEPKNS_6ObjectE@Base 2.4.0
  _ZNK3osg5Array7asArrayEv@Base 2.4.0
- _ZNK3osg5Group7asGroupEv@Base 2.4.0
  _ZNK3osg6Object12isSameKindAsEPKS0_@Base 2.7.0
  _ZNK3osg6Object13asNodeVisitorEv@Base 2.8~rc1
  _ZNK3osg6Object16asStateAttributeEv@Base 2.8~rc1
  _ZNK3osg6Object16releaseGLObjectsEPNS_5StateE@Base 2.7.0
  _ZNK3osg6Object6asNodeEv@Base 2.8~rc1
  _ZNK3osg6Object9asUniformEv@Base 2.8~rc1
- _ZNK3osg7Matrixd7preMultERKNS_5Vec3dE@Base 2.9.0
+ (arch=armel armhf i386 m68k mips mipsel powerpc powerpcspe)_ZNK3osg7Matrixd7preMultERKNS_5Vec3dE@Base 2.10.0
  (optional=templinst)_ZNK8osgEarth16qualified_doubleINS_5AngleEE17asParseableStringB5cxx11Ev@Base 2.9.0
  (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNK8osgEarth16qualified_doubleINS_5AngleEE8asStringB5cxx11Ev@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth16qualified_doubleINS_8DistanceEE17asParseableStringB5cxx11Ev@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNK8osgEarth16qualified_doubleINS_8DistanceEE8asStringB5cxx11Ev@Base 2.8~rc1
  _ZNK8osgEarth3URI8getImageEPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.9.0
  _ZNK8osgEarth5Angle17asParseableStringB5cxx11Ev@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth6Config11getObjIfSetINS_9Symbology17NumericExpressionEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.8~rc1
+ (optional=templinst)_ZNK8osgEarth6Config3getIN7osgText4Text12BackdropTypeES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIN7osgText4Text22BackdropImplementationES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_3URIEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst|arch=!arm64 !x32)_ZNK8osgEarth6Config3getINS_9Symbology10IconSymbol9AlignmentES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
+ (optional=templinst|arch=!arm64 !x32)_ZNK8osgEarth6Config3getINS_9Symbology10TextSymbol6LayoutES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_9Symbology10TextSymbol8EncodingES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_9Symbology10TextSymbol9AlignmentES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_9Symbology17NumericExpressionEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEbRKS7_RNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIfEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst|arch=x32)_ZNK8osgEarth6Config3getIjEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
  _ZNK8osgEarth6Config5valueERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
- (optional=templinst|arch=arm64)_ZNK8osgEarth6Config5valueIsEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES2_@Base 2.9.0
- (arch=!hurd-i386 !i386 !mips64el !ppc64el !sparc64)_ZNK8osgEarth6Config8childrenERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetIN7osgText4Text12BackdropTypeES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc2
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetIN7osgText4Text22BackdropImplementationES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc2
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetINS_3URIEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetINS_9Symbology10IconSymbol9AlignmentES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc2
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetINS_9Symbology10TextSymbol6LayoutES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc2
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetINS_9Symbology10TextSymbol8EncodingES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc2
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetINS_9Symbology10TextSymbol9AlignmentES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc2
- (optional=templinst|arch=mips mipsel)_ZNK8osgEarth6Config8getIfSetINS_9Symbology12MarkerSymbol9AlignmentES4_EEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESC_RNS_8optionalIT_EERKT0_@Base 2.8~rc2
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEbRKS7_RNS_8optionalIT_EE@Base 2.8~rc1
- (optional=templinst|arch=!mips !mipsel)_ZNK8osgEarth6Config8getIfSetIbEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIfEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
- (arch=!arm64)_ZNK8osgEarth6Config8hasValueERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
+ (optional=templinst|arch=x32)_ZNK8osgEarth6Config5valueIsEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES2_@Base 2.9.0
+ _ZNK8osgEarth6Config8childrenERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ (arch=mips mipsel)_ZNK8osgEarth6Config8hasValueERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEv@Base 2.10.0
  _ZNK8osgEarth9Symbology10BBoxSymbol11libraryNameEv@Base 2.8~rc1
  _ZNK8osgEarth9Symbology10BBoxSymbol12isSameKindAsEPKN3osg6ObjectE@Base 2.8~rc1
  _ZNK8osgEarth9Symbology10BBoxSymbol5cloneERKN3osg6CopyOpE@Base 2.8~rc1
@@ -1713,14 +1632,6 @@
  _ZNK8osgEarth9Symbology12IconResource17createNodeFromURIERKNS_3URIEPKN5osgDB7OptionsE@Base 2.4.0
  _ZNK8osgEarth9Symbology12IconResource4is2DEv@Base 2.5.0
  _ZNK8osgEarth9Symbology12IconResource9getConfigEv@Base 2.4.0
- _ZNK8osgEarth9Symbology12MarkerSymbol11libraryNameEv@Base 2.7.0
- _ZNK8osgEarth9Symbology12MarkerSymbol12isSameKindAsEPKN3osg6ObjectE@Base 2.7.0
- _ZNK8osgEarth9Symbology12MarkerSymbol23convertToInstanceSymbolEv@Base 2.4.0
- _ZNK8osgEarth9Symbology12MarkerSymbol5cloneERKN3osg6CopyOpE@Base 2.7.0
- _ZNK8osgEarth9Symbology12MarkerSymbol8getImageEj@Base 2.4.0
- _ZNK8osgEarth9Symbology12MarkerSymbol9classNameEv@Base 2.4.0
- _ZNK8osgEarth9Symbology12MarkerSymbol9cloneTypeEv@Base 2.7.0
- _ZNK8osgEarth9Symbology12MarkerSymbol9getConfigEv@Base 2.4.0
  _ZNK8osgEarth9Symbology12RenderSymbol11libraryNameEv@Base 2.7.0
  _ZNK8osgEarth9Symbology12RenderSymbol12isSameKindAsEPKN3osg6ObjectE@Base 2.7.0
  _ZNK8osgEarth9Symbology12RenderSymbol5cloneERKN3osg6CopyOpE@Base 2.7.0
@@ -1769,9 +1680,6 @@
  _ZNK8osgEarth9Symbology14InstanceSymbol6asIconEv@Base 2.4.0
  _ZNK8osgEarth9Symbology14InstanceSymbol7asModelEv@Base 2.4.0
  _ZNK8osgEarth9Symbology14InstanceSymbol9getConfigEv@Base 2.4.0
- _ZNK8osgEarth9Symbology14MarkerResource10createNodeEPKN5osgDB7OptionsE@Base 2.4.0
- _ZNK8osgEarth9Symbology14MarkerResource17createNodeFromURIERKNS_3URIEPKN5osgDB7OptionsE@Base 2.4.0
- _ZNK8osgEarth9Symbology14MarkerResource9getConfigEv@Base 2.4.0
  _ZNK8osgEarth9Symbology14SymbolRegistry8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.5.0
  _ZNK8osgEarth9Symbology15BillboardSymbol11libraryNameEv@Base 2.8~rc1
  _ZNK8osgEarth9Symbology15BillboardSymbol12isSameKindAsEPKN3osg6ObjectE@Base 2.8~rc1
@@ -1791,7 +1699,6 @@
  _ZNK8osgEarth9Symbology15GeometryFactory15createRectangleERKN3osg5Vec3dERKNS_8DistanceES8_@Base 2.7.0
  _ZNK8osgEarth9Symbology15GeometryFactory19createEllipticalArcERKN3osg5Vec3dERKNS_8DistanceES8_RKNS_5AngleESB_SB_jPNS0_8GeometryEb@Base 2.7.0
  _ZNK8osgEarth9Symbology15GeometryFactory9createArcERKN3osg5Vec3dERKNS_8DistanceERKNS_5AngleESB_jPNS0_8GeometryEb@Base 2.7.0
- _ZNK8osgEarth9Symbology15ResourceLibrary10getMarkersERSt6vectorIN3osg7ref_ptrINS0_14MarkerResourceEEESaIS6_EEPKN5osgDB7OptionsE@Base 2.4.0
  _ZNK8osgEarth9Symbology15ResourceLibrary11getInstanceERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.7.0
  _ZNK8osgEarth9Symbology15ResourceLibrary7getSkinEPKNS0_10SkinSymbolERNS_6RandomEPKN5osgDB7OptionsE@Base 2.4.0
  _ZNK8osgEarth9Symbology15ResourceLibrary7getSkinERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.7.0
@@ -1800,7 +1707,6 @@
  _ZNK8osgEarth9Symbology15ResourceLibrary8getSkinsEPKNS0_10SkinSymbolERSt6vectorIN3osg7ref_ptrINS0_12SkinResourceEEESaIS9_EEPKN5osgDB7OptionsE@Base 2.4.0
  _ZNK8osgEarth9Symbology15ResourceLibrary8getSkinsERSt6vectorIN3osg7ref_ptrINS0_12SkinResourceEEESaIS6_EEPKN5osgDB7OptionsE@Base 2.4.0
  _ZNK8osgEarth9Symbology15ResourceLibrary9getConfigEv@Base 2.4.0
- _ZNK8osgEarth9Symbology15ResourceLibrary9getMarkerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.7.0
  _ZNK8osgEarth9Symbology15ResourceLibrary9getModelsEPKNS0_11ModelSymbolERSt6vectorIN3osg7ref_ptrINS0_13ModelResourceEEESaIS9_EEPKN5osgDB7OptionsE@Base 2.8~rc1
  _ZNK8osgEarth9Symbology15ResourceLibrary9getModelsERSt6vectorIN3osg7ref_ptrINS0_13ModelResourceEEESaIS6_EEPKN5osgDB7OptionsE@Base 2.8~rc1
  _ZNK8osgEarth9Symbology16GeometryIterator7hasMoreEv@Base 2.4.0
@@ -1814,12 +1720,6 @@
  _ZNK8osgEarth9Symbology17BillboardResource9getConfigEv@Base 2.8~rc1
  _ZNK8osgEarth9Symbology17NumericExpression4evalEv@Base 2.4.0
  _ZNK8osgEarth9Symbology17NumericExpression9getConfigEv@Base 2.4.0
- _ZNK8osgEarth9Symbology17StencilVolumeNode11libraryNameEv@Base 2.4.0
- _ZNK8osgEarth9Symbology17StencilVolumeNode12computeBoundEv@Base 2.4.0
- _ZNK8osgEarth9Symbology17StencilVolumeNode12isSameKindAsEPKN3osg6ObjectE@Base 2.4.0
- _ZNK8osgEarth9Symbology17StencilVolumeNode5cloneERKN3osg6CopyOpE@Base 2.4.0
- _ZNK8osgEarth9Symbology17StencilVolumeNode9classNameEv@Base 2.4.0
- _ZNK8osgEarth9Symbology17StencilVolumeNode9cloneTypeEv@Base 2.4.0
  (optional=templinst)_ZNK8osgEarth9Symbology19SimpleSymbolFactoryINS0_10BBoxSymbolEE8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.8~rc1
  (optional=templinst)_ZNK8osgEarth9Symbology19SimpleSymbolFactoryINS0_10IconSymbolEE8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.5.0
  (optional=templinst)_ZNK8osgEarth9Symbology19SimpleSymbolFactoryINS0_10LineSymbolEE8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.5.0
@@ -1827,7 +1727,6 @@
  (optional=templinst)_ZNK8osgEarth9Symbology19SimpleSymbolFactoryINS0_10TextSymbolEE8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.5.0
  (optional=templinst)_ZNK8osgEarth9Symbology19SimpleSymbolFactoryINS0_11ModelSymbolEE8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.5.0
  (optional=templinst)_ZNK8osgEarth9Symbology19SimpleSymbolFactoryINS0_11PointSymbolEE8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.5.0
- (optional=templinst)_ZNK8osgEarth9Symbology19SimpleSymbolFactoryINS0_12MarkerSymbolEE8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.5.0
  (optional=templinst)_ZNK8osgEarth9Symbology19SimpleSymbolFactoryINS0_12RenderSymbolEE8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.5.0
  (optional=templinst)_ZNK8osgEarth9Symbology19SimpleSymbolFactoryINS0_13PolygonSymbolEE8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.5.0
  (optional=templinst)_ZNK8osgEarth9Symbology19SimpleSymbolFactoryINS0_14AltitudeSymbolEE8parseSLDERKNS_6ConfigERNS0_5StyleE@Base 2.5.0
@@ -1845,6 +1744,7 @@
  _ZNK8osgEarth9Symbology4Ring9getLengthEv@Base 2.7.0
  _ZNK8osgEarth9Symbology5Color10brightnessEf@Base 2.4.0
  _ZNK8osgEarth9Symbology5Color2asENS1_6FormatE@Base 2.4.0
+ _ZNK8osgEarth9Symbology5Color5asHSLEv@Base 2.10.0
  _ZNK8osgEarth9Symbology5Color6toHTMLB5cxx11ENS1_6FormatE@Base 2.7.0
  _ZNK8osgEarth9Symbology5Query11combineWithERKS1_@Base 2.4.0
  _ZNK8osgEarth9Symbology5Query9getConfigEv@Base 2.4.0
@@ -1888,73 +1788,89 @@
  _ZNK8osgEarth9Symbology8Resource9cloneTypeEv@Base 2.7.0
  _ZNK8osgEarth9Symbology8Resource9getConfigEv@Base 2.4.0
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.6.0
- (optional=templinst|arch=amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64el sh4 sparc64)_ZNKSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE4findERS7_@Base 2.7.0
  (optional=templinst)_ZNKSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9Symbology5StyleEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE4findERS7_@Base 2.7.0
  (optional=templinst)_ZNSt11_Deque_baseIPN8osgEarth9Symbology8GeometryESaIS3_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt11_Deque_baseIPN8osgEarth9Symbology8GeometryESaIS3_EED2Ev@Base 2.4.0
- (optional=templinst|arch=!alpha !armel !armhf !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !ppc64 !s390x)_ZNSt3mapIN3osg5Vec3fEjSt4lessIS1_ESaISt4pairIKS1_jEEEixERS5_@Base 2.4.0
- (optional=templinst)_ZNSt5dequeIN3osg7ref_ptrINS0_4NodeEEESaIS3_EE16_M_push_back_auxIJS3_EEEvDpOT_@Base 2.8~rc1
- (optional=templinst)_ZNSt5dequeIN3osg7ref_ptrINS0_4NodeEEESaIS3_EED1Ev@Base 2.4.0
- (optional=templinst)_ZNSt5dequeIN3osg7ref_ptrINS0_4NodeEEESaIS3_EED2Ev@Base 2.4.0
  (optional=templinst|arch=hurd-i386)_ZNSt5dequeIPKN8osgEarth9Symbology8GeometryESaIS4_EE16_M_push_back_auxIJRKS4_EEEvDpOT_@Base 2.9.0
  (optional=templinst|arch=!hurd-i386|subst)_ZNSt5dequeIPKN8osgEarth9Symbology8GeometryESaIS4_EE17_M_reallocate_mapE{size_t}b@Base 2.9.0
  (optional=templinst|arch=hurd-i386)_ZNSt5dequeIPN8osgEarth9Symbology8GeometryESaIS3_EE16_M_push_back_auxIJRKS3_EEEvDpOT_@Base 2.9.0
  (optional=templinst|arch=!hurd-i386|subst)_ZNSt5dequeIPN8osgEarth9Symbology8GeometryESaIS3_EE17_M_reallocate_mapE{size_t}b@Base 2.9.0
- (optional=templinst)_ZNSt5dequeISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE16_M_push_back_auxIJRKS5_EEEvDpOT_@Base 2.8~rc1
- (optional=templinst|arch=hurd-i386)_ZNSt5dequeIdSaIdEE12emplace_backIJdEEEvDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt5dequeIdSaIdEE16_M_push_back_auxIJRKdEEEvDpOT_@Base 2.9.0
+ (optional=templinst|arch=!x32)_ZNSt5dequeISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE16_M_push_back_auxIJRKS5_EEEvDpOT_@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc powerpcspe)_ZNSt5dequeIdSaIdEE12emplace_backIJdEEEvDpOT_@Base 2.9.0
  (optional=templinst|arch=!hurd-i386|subst)_ZNSt5dequeIdSaIdEE17_M_reallocate_mapE{size_t}b@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec2bESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec2bESaIS1_EE7reserveE{size_t}@Base 2.9.0
- (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZNSt6vectorIN3osg5Vec2dESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg5Vec2dESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.10.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec2dESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
+ (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc powerpcspe)_ZNSt6vectorIN3osg5Vec2dESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg5Vec2dESaIS1_EE7reserveEj@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 sparc64)_ZNSt6vectorIN3osg5Vec2dESaIS1_EE7reserveEm@Base 2.9.0
- (optional=templinst|arch=!alpha !amd64 !arm64 !armel !hppa !hurd-i386 !i386 !ia64 !kfreebsd-amd64 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390 !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64|subst)_ZNSt6vectorIN3osg5Vec2dESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!alpha !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE7reserveEj@Base 2.9.0
- (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE7reserveEm@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE9push_backERKS1_@Base 2.4.0
+ (optional=templinst|subst|arch=!arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE7reserveE{size_t}@Base 2.10.0
+ (optional=templinst|arch=!amd64 !arm64 !armel !armhf !i386 !m68k !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !sparc64 !x32)_ZNSt6vectorIN3osg5Vec2fESaIS1_EE9push_backERKS1_@Base 2.4.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec2iESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec2iESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec2sESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec2sESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec3bESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec3bESaIS1_EE7reserveE{size_t}@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.4.0
- (optional=templinst|arch=hurd-i386 i386 m68k mips mipsel)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPKS1_S3_EEEEvNS6_IPS1_S3_EET_SC_St20forward_iterator_tag@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE7reserveEj@Base 2.4.0
- (optional=templinst|arch=alpha mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE7reserveEm@Base 2.9.0
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE7reserveEj@Base 2.4.0
+ (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE7reserveEm@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveEj@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveEm@Base 2.4.0
- (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE9push_backERKS1_@Base 2.4.0
- (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZNSt6vectorIN3osg5Vec3iESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64 !x32)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE9push_backERKS1_@Base 2.4.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec3iESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
+ (optional=templinst|arch=armel armhf hurd-i386 powerpc powerpcspe)_ZNSt6vectorIN3osg5Vec3iESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec3iESaIS1_EE7reserveEj@Base 2.7.0
  (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3iESaIS1_EE7reserveEm@Base 2.9.0
- (optional=templinst|arch=!armel !armhf|subst)_ZNSt6vectorIN3osg5Vec3sESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec3sESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec3sESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec4bESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec4bESaIS1_EE7reserveE{size_t}@Base 2.9.0
- (optional=templinst|arch=!alpha !amd64 !arm64 !armel !armhf !hppa !kfreebsd-amd64 !mips !mips64el !mipsel !powerpc !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec4dESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.7.0
- (optional=templinst|arch=!arm64 !mips !mipsel)_ZNSt6vectorIN3osg5Vec4dESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 m68k powerpc sh4)_ZNSt6vectorIN3osg5Vec4dESaIS1_EE7reserveEj@Base 2.9.0
- (optional=templinst|arch=alpha mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4dESaIS1_EE7reserveEm@Base 2.9.0
+ (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec4dESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4dESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
+ (optional=templinst|arch=!amd64 !arm64 !x32)_ZNSt6vectorIN3osg5Vec4dESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.10.0
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt6vectorIN3osg5Vec4dESaIS1_EE7reserveEj@Base 2.9.0
+ (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4dESaIS1_EE7reserveEm@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390 !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|subst|arch=!arm64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE7reserveE{size_t}@Base 2.4.0
- (optional=templinst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE9push_backERKS1_@Base 2.8~rc3
- (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZNSt6vectorIN3osg5Vec4iESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE7reserveE{size_t}@Base 2.4.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64 !x32)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE9push_backERKS1_@Base 2.8~rc3
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec4iESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
+ (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc powerpcspe)_ZNSt6vectorIN3osg5Vec4iESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec4iESaIS1_EE7reserveEj@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x)_ZNSt6vectorIN3osg5Vec4iESaIS1_EE7reserveEm@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4iESaIS1_EE7reserveEm@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec4sESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec4sESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec2ubESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec2ubESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec2uiESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec2uiESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec2usESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec2usESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec3ubESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec3ubESaIS1_EE7reserveE{size_t}@Base 2.9.0
- (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZNSt6vectorIN3osg6Vec3uiESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!amd64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64|subst)_ZNSt6vectorIN3osg6Vec3uiESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec3uiESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
+ (optional=templinst|arch=armel armhf hurd-i386 powerpc powerpcspe)_ZNSt6vectorIN3osg6Vec3uiESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec3usESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec3usESaIS1_EE7reserveE{size_t}@Base 2.9.0
- (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec4ubESaIS1_EE7reserveE{size_t}@Base 2.9.0
- (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZNSt6vectorIN3osg6Vec4uiESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec4ubESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
+ (optional=templinst|subst|arch=!mips !mipsel)_ZNSt6vectorIN3osg6Vec4ubESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec4uiESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
+ (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc powerpcspe)_ZNSt6vectorIN3osg6Vec4uiESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg6Vec4uiESaIS1_EE7reserveEj@Base 2.7.0
- (optional=templinst|arch=!arm64|subst)_ZNSt6vectorIN3osg6Vec4usESaIS1_EE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg6Vec4uiESaIS1_EE7reserveEm@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec4usESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIN3osg6Vec4usESaIS1_EE7reserveE{size_t}@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg7MatrixdESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.7.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg7MatrixdESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIN3osg7MatrixdESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
@@ -1963,16 +1879,13 @@
  (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg7MatrixfESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.7.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg7MatrixfESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEmRKS1_@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIN3osg7MatrixfESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg7MatrixfESaIS1_EE7reserveEj@Base 2.7.0
+ (optional=templinst|arch=!alpha !amd64 !arm64 !armel !armhf !kfreebsd-amd64 !mips !mips64el !mipsel !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIN3osg7MatrixfESaIS1_EE7reserveEj@Base 2.7.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg7MatrixfESaIS1_EE7reserveEm@Base 2.7.0
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth14ElevationLayerEEESaIS4_EEaSERKS6_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth5LayerEEESaIS4_EEaSERKS6_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEESaIS5_EE7reserveEj@Base 2.8.0
+ (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe x32)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEESaIS5_EE7reserveEj@Base 2.8.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEESaIS5_EE7reserveEm@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology13ModelResourceEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology13ModelResourceEEESaIS5_EE7reserveE{size_t}@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology14MarkerResourceEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology14MarkerResourceEEESaIS5_EE7reserveEj@Base 2.8.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology4RingEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology6SymbolEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology6SymbolEEESaIS5_EED1Ev@Base 2.4.0
@@ -1987,78 +1900,97 @@
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_8DrawableEEESaIS3_EED2Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_8GeometryEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_8StateSetEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPS5_S7_EEEEvSC_T_SD_St20forward_iterator_tag@Base 2.7.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!arm64)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EERS7_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPN3osg5ArrayESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPN3osg8DrawableESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology16StringExpression2OpENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESaISB_EE17_M_realloc_insertIJSB_EEEvN9__gnu_cxx17__normal_iteratorIPSB_SD_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology16StringExpression2OpENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESaISB_EED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology16StringExpression2OpENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESaISB_EED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology16StringExpression2OpENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESaISB_EEaSERKSD_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE12emplace_backIJS5_EEEvDpOT_@Base 2.8~rc1
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!arm64 !hurd-i386)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
+ (optional=templinst|arch=amd64 armel armhf mips mipsel powerpc powerpcspe)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EEaSERKS7_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjESaIS7_EED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjESaIS7_EED2Ev@Base 2.7.0
  (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjESaIS7_EEaSERKS9_@Base 2.7.0
- (optional=templinst|arch=!arm64|subst)_ZNSt6vectorIaSaIaEE7reserveE{size_t}@Base 2.9.0
- (optional=templinst|arch=!alpha !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIdSaIdEE7reserveEj@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIaSaIaEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPaS1_EE{size_t}RKa@Base 2.9.0
+ (optional=templinst|arch=mips64el ppc64 ppc64el s390x sparc64 x32|subst)_ZNSt6vectorIaSaIaEE7reserveE{size_t}@Base 2.10.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIdSaIdEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EEjRKd@Base 2.10.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIdSaIdEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EEmRKd@Base 2.9.0
+ (optional=templinst|arch=i386 m68k mips mipsel x32)_ZNSt6vectorIdSaIdEE7reserveEj@Base 2.10.0
  (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIdSaIdEE7reserveEm@Base 2.9.0
- (optional=templinst|arch=!alpha !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIfSaIfEE7reserveEj@Base 2.9.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIfSaIfEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EEjRKf@Base 2.10.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIfSaIfEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EEmRKf@Base 2.9.0
+ (optional=templinst|arch=i386 m68k mips mipsel powerpc x32)_ZNSt6vectorIfSaIfEE7reserveEj@Base 2.10.0
  (optional=templinst|arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIfSaIfEE7reserveEm@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIhSaIhEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPhS1_EE{size_t}RKh@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIhSaIhEE17_M_realloc_insertIJRKhEEEvN9__gnu_cxx17__normal_iteratorIPhS1_EEDpOT_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIhSaIhEE7reserveE{size_t}@Base 2.8.0
- (optional=templinst|subst)_ZNSt6vectorIiSaIiEE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|arch=m68k mips64el sparc64 x32)_ZNSt6vectorIhSaIhEE9push_backERKh@Base 2.10.0
+ (optional=templinst|subst)_ZNSt6vectorIiSaIiEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPiS1_EE{size_t}RKi@Base 2.9.0
+ (optional=templinst|subst|arch=!armel !armhf !powerpcspe)_ZNSt6vectorIiSaIiEE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorIjSaIjEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPjS1_EE{size_t}RKj@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 sparc)_ZNSt6vectorIjSaIjEE7reserveEj@Base 2.4.0
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 sparc x32)_ZNSt6vectorIjSaIjEE7reserveEj@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIjSaIjEE7reserveEm@Base 2.4.0
- (optional=templinst|arch=hurd-i386 i386 m68k powerpc)_ZNSt6vectorIjSaIjEE9push_backERKj@Base 2.9.0
- (optional=templinst|subst)_ZNSt6vectorIsSaIsEE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|arch=mips64el sparc64 x32)_ZNSt6vectorIjSaIjEE9push_backERKj@Base 2.10.0
+ (optional=templinst|subst)_ZNSt6vectorIsSaIsEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPsS1_EE{size_t}RKs@Base 2.9.0
+ (optional=templinst|subst|arch=!armel !armhf !powerpc !powerpcspe)_ZNSt6vectorIsSaIsEE7reserveE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt6vectorItSaItEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPtS1_EE{size_t}RKt@Base 2.9.0
  (optional=templinst)_ZNSt6vectorItSaItEE17_M_realloc_insertIJRKtEEEvN9__gnu_cxx17__normal_iteratorIPtS1_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 sparc)_ZNSt6vectorItSaItEE7reserveEj@Base 2.4.0
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 sparc x32)_ZNSt6vectorItSaItEE7reserveEj@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorItSaItEE7reserveEm@Base 2.4.0
+ (optional=templinst|arch=x32)_ZNSt6vectorItSaItEE9push_backERKt@Base 2.10.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN8osgEarth6ConfigESaIS2_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN8osgEarth9Symbology13StyleSelectorESaIS3_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseINS_12basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE18_M_assign_dispatchISt20_List_const_iteratorIS2_EEEvT_S8_St12__false_type@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.7.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.7.0
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEaSERKS4_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN3osg5Vec3fESt4pairIKS1_jESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE24_M_get_insert_unique_posERS3_@Base 2.4.0
+ (optional=templinst)_ZNSt8_Rb_treeIN3osg5Vec3fESt4pairIKS1_jESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS3_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN3osg5Vec3fESt4pairIKS1_jESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE4findERS3_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN3osg5Vec3fESt4pairIKS1_jESt10_Select1stIS4_ESt4lessIS1_ESaIS4_EE8_M_eraseEPSt13_Rb_tree_nodeIS4_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE7_M_copyINSB_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS5_EPKSF_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EEaSERKSB_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE11equal_rangeERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESP_IJEEEEESt17_Rb_tree_iteratorISE_ESt23_Rb_tree_const_iteratorISE_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE5eraseERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE5eraseERS7_@Base 2.10.1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology12SkinResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE8_M_eraseEPSt13_Rb_tree_nodeISE_E@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology14MarkerResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology14MarkerResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology14MarkerResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE5eraseERS7_@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology14MarkerResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE8_M_eraseEPSt13_Rb_tree_nodeISE_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology15ResourceLibraryEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESP_IJEEEEESt17_Rb_tree_iteratorISE_ESt23_Rb_tree_const_iteratorISE_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology15ResourceLibraryEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology15ResourceLibraryEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology15ResourceLibraryEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE8_M_eraseEPSt13_Rb_tree_nodeISE_E@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE11equal_rangeERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESP_IJEEEEESt17_Rb_tree_iteratorISE_ESt23_Rb_tree_const_iteratorISE_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.7.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE5eraseERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE5eraseERS7_@Base 2.10.1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIN8osgEarth9Symbology16InstanceResourceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE8_M_eraseEPSt13_Rb_tree_nodeISE_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESN_IJEEEEESt17_Rb_tree_iteratorISC_ESt23_Rb_tree_const_iteratorISC_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EEaSERKSI_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9Symbology5StyleEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE11equal_rangeERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9Symbology5StyleEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOS5_EESM_IJEEEEESt17_Rb_tree_iteratorISB_ESt23_Rb_tree_const_iteratorISB_EDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9Symbology5StyleEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESM_IJEEEEESt17_Rb_tree_iteratorISB_ESt23_Rb_tree_const_iteratorISB_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9Symbology5StyleEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9Symbology5StyleEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISB_ERS7_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9Symbology5StyleEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE4findERS7_@Base 2.7.0
@@ -2066,21 +1998,27 @@
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EEaSERKSE_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_4NodeEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE11equal_rangeERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_4NodeEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESQ_IJEEEEESt17_Rb_tree_iteratorISF_ESt23_Rb_tree_const_iteratorISF_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_4NodeEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_4NodeEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISF_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_4NodeEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISF_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_4NodeEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE5eraseERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_4NodeEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE8_M_eraseEPSt13_Rb_tree_nodeISF_E@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_7TextureEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE11equal_rangeERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_7TextureEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESQ_IJEEEEESt17_Rb_tree_iteratorISF_ESt23_Rb_tree_const_iteratorISF_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_7TextureEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE24_M_get_insert_unique_posERS7_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_7TextureEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISF_ERS7_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_7TextureEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISF_ERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_7TextureEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE5eraseERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_7TextureEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE8_M_eraseEPSt13_Rb_tree_nodeISF_E@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_8StateSetEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE11equal_rangeERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_8StateSetEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESQ_IJEEEEESt17_Rb_tree_iteratorISF_ESt23_Rb_tree_const_iteratorISF_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_8StateSetEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_8StateSetEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISF_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_8StateSetEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISF_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_8StateSetEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE5eraseERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S6_IN3osg7ref_ptrINS8_8StateSetEEESt14_List_iteratorIS5_EEESt10_Select1stISF_ESt4lessIS5_ESaISF_EE8_M_eraseEPSt13_Rb_tree_nodeISF_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeIPKN3osg6ObjectESt4pairIKS3_jESt10_Select1stIS6_ESt4lessIS3_ESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E@Base 2.5.0
  (optional=templinst)_ZNSt8_Rb_treeISt6vectorIN3osg7ref_ptrINS1_8StateSetEEESaIS4_EESt4pairIKS6_S0_INS2_INS1_8GeometryEEESaISA_EEESt10_Select1stISD_ESt4lessIS6_ESaISD_EE24_M_get_insert_unique_posERS8_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeISt6vectorIN3osg7ref_ptrINS1_8StateSetEEESaIS4_EESt4pairIKS6_S0_INS2_INS1_8GeometryEEESaISA_EEESt10_Select1stISD_ESt4lessIS6_ESaISD_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISD_ERS8_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 armel armhf hppa i386 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeISt6vectorIN3osg7ref_ptrINS1_8StateSetEEESaIS4_EESt4pairIKS6_S0_INS2_INS1_8GeometryEEESaISA_EEESt10_Select1stISD_ESt4lessIS6_ESaISD_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISD_ERS8_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeISt6vectorIN3osg7ref_ptrINS1_8StateSetEEESaIS4_EESt4pairIKS6_S0_INS2_INS1_8GeometryEEESaISA_EEESt10_Select1stISD_ESt4lessIS6_ESaISD_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeIcSt4pairIKcbESt10_Select1stIS2_ESt4lessIcESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.4.0
  _ZTI8AggState@Base 2.4.0
@@ -2111,7 +2049,6 @@
  _ZTIN3osg11MixinVectorINS_6Vec4usEEE@Base 2.7.0
  _ZTIN3osg11MixinVectorINS_7MatrixdEEE@Base 2.7.0
  _ZTIN3osg11MixinVectorINS_7MatrixfEEE@Base 2.7.0
- _ZTIN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEEE@Base 2.9.0
  _ZTIN3osg11MixinVectorIaEE@Base 2.7.0
  _ZTIN3osg11MixinVectorIdEE@Base 2.7.0
  _ZTIN3osg11MixinVectorIfEE@Base 2.7.0
@@ -2165,15 +2102,12 @@
  _ZTIN8osgEarth16qualified_doubleINS_8DistanceEEE@Base 2.7.0
  _ZTIN8osgEarth3URIE@Base 2.4.0
  _ZTIN8osgEarth5AngleE@Base 2.9.0
- _ZTIN8osgEarth7MapInfoE@Base 2.9.0
  _ZTIN8osgEarth7TileKeyE@Base 2.4.0
  _ZTIN8osgEarth8DistanceE@Base 2.7.0
  _ZTIN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_4NodeEEESt4lessIS6_EEE@Base 2.7.0
  _ZTIN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_7TextureEEESt4lessIS6_EEE@Base 2.9.0
  _ZTIN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_8StateSetEEESt4lessIS6_EEE@Base 2.7.0
- _ZTIN8osgEarth8MapFrameE@Base 2.9.0
  _ZTIN8osgEarth8optionalIN3osg5Vec2sEEE@Base 2.4.0
- _ZTIN8osgEarth8optionalIN3osg5Vec3fEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalIN3osg6TexEnv4ModeEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalIN7osgText4Text12BackdropTypeEEE@Base 2.8~rc1
  _ZTIN8osgEarth8optionalIN7osgText4Text22BackdropImplementationEEE@Base 2.8~rc1
@@ -2190,13 +2124,10 @@
  _ZTIN8osgEarth8optionalINS_9Symbology10TextSymbol6LayoutEEE@Base 2.5.0
  _ZTIN8osgEarth8optionalINS_9Symbology10TextSymbol8EncodingEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_9Symbology10TextSymbol9AlignmentEEE@Base 2.4.0
- _ZTIN8osgEarth8optionalINS_9Symbology12MarkerSymbol9AlignmentEEE@Base 2.4.0
- _ZTIN8osgEarth8optionalINS_9Symbology12MarkerSymbol9PlacementEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_9Symbology14AltitudeSymbol7BindingEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_9Symbology14AltitudeSymbol8ClampingEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_9Symbology14AltitudeSymbol9TechniqueEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_9Symbology14InstanceSymbol9PlacementEEE@Base 2.4.0
- _ZTIN8osgEarth8optionalINS_9Symbology15ExtrusionSymbol15HeightReferenceEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_9Symbology16StringExpressionEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_9Symbology17NumericExpressionEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_9Symbology4FillEEE@Base 2.4.0
@@ -2223,7 +2154,6 @@
  _ZTIN8osgEarth9Symbology11ModelSymbolE@Base 2.4.0
  _ZTIN8osgEarth9Symbology11PointSymbolE@Base 2.4.0
  _ZTIN8osgEarth9Symbology12IconResourceE@Base 2.4.0
- _ZTIN8osgEarth9Symbology12MarkerSymbolE@Base 2.4.0
  _ZTIN8osgEarth9Symbology12RenderSymbolE@Base 2.4.0
  _ZTIN8osgEarth9Symbology12SkinResourceE@Base 2.4.0
  _ZTIN8osgEarth9Symbology13ModelResourceE@Base 2.4.0
@@ -2235,7 +2165,6 @@
  _ZTIN8osgEarth9Symbology14AltitudeSymbolE@Base 2.4.0
  _ZTIN8osgEarth9Symbology14CoverageSymbolE@Base 2.7.0
  _ZTIN8osgEarth9Symbology14InstanceSymbolE@Base 2.4.0
- _ZTIN8osgEarth9Symbology14MarkerResourceE@Base 2.4.0
  _ZTIN8osgEarth9Symbology14SymbolRegistryE@Base 2.5.0
  _ZTIN8osgEarth9Symbology15BillboardSymbolE@Base 2.8~rc1
  _ZTIN8osgEarth9Symbology15ExtrusionSymbolE@Base 2.4.0
@@ -2245,7 +2174,6 @@
  _ZTIN8osgEarth9Symbology16StringExpressionE@Base 2.4.0
  _ZTIN8osgEarth9Symbology17BillboardResourceE@Base 2.8~rc1
  _ZTIN8osgEarth9Symbology17NumericExpressionE@Base 2.4.0
- _ZTIN8osgEarth9Symbology17StencilVolumeNodeE@Base 2.4.0
  _ZTIN8osgEarth9Symbology18GeometryRasterizerE@Base 2.4.0
  _ZTIN8osgEarth9Symbology19SimpleSymbolFactoryINS0_10BBoxSymbolEEE@Base 2.8~rc1
  _ZTIN8osgEarth9Symbology19SimpleSymbolFactoryINS0_10IconSymbolEEE@Base 2.5.0
@@ -2254,7 +2182,6 @@
  _ZTIN8osgEarth9Symbology19SimpleSymbolFactoryINS0_10TextSymbolEEE@Base 2.5.0
  _ZTIN8osgEarth9Symbology19SimpleSymbolFactoryINS0_11ModelSymbolEEE@Base 2.5.0
  _ZTIN8osgEarth9Symbology19SimpleSymbolFactoryINS0_11PointSymbolEEE@Base 2.5.0
- _ZTIN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12MarkerSymbolEEE@Base 2.5.0
  _ZTIN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12RenderSymbolEEE@Base 2.5.0
  _ZTIN8osgEarth9Symbology19SimpleSymbolFactoryINS0_13PolygonSymbolEEE@Base 2.5.0
  _ZTIN8osgEarth9Symbology19SimpleSymbolFactoryINS0_14AltitudeSymbolEEE@Base 2.5.0
@@ -2304,7 +2231,6 @@
  _ZTSN3osg11MixinVectorINS_6Vec4usEEE@Base 2.7.0
  _ZTSN3osg11MixinVectorINS_7MatrixdEEE@Base 2.7.0
  _ZTSN3osg11MixinVectorINS_7MatrixfEEE@Base 2.7.0
- _ZTSN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEEE@Base 2.9.0
  _ZTSN3osg11MixinVectorIaEE@Base 2.7.0
  _ZTSN3osg11MixinVectorIdEE@Base 2.7.0
  _ZTSN3osg11MixinVectorIfEE@Base 2.7.0
@@ -2358,15 +2284,12 @@
  _ZTSN8osgEarth16qualified_doubleINS_8DistanceEEE@Base 2.7.0
  _ZTSN8osgEarth3URIE@Base 2.4.0
  _ZTSN8osgEarth5AngleE@Base 2.9.0
- _ZTSN8osgEarth7MapInfoE@Base 2.9.0
  _ZTSN8osgEarth7TileKeyE@Base 2.4.0
  _ZTSN8osgEarth8DistanceE@Base 2.7.0
  _ZTSN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_4NodeEEESt4lessIS6_EEE@Base 2.7.0
  _ZTSN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_7TextureEEESt4lessIS6_EEE@Base 2.9.0
  _ZTSN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_8StateSetEEESt4lessIS6_EEE@Base 2.7.0
- _ZTSN8osgEarth8MapFrameE@Base 2.9.0
  _ZTSN8osgEarth8optionalIN3osg5Vec2sEEE@Base 2.4.0
- _ZTSN8osgEarth8optionalIN3osg5Vec3fEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalIN3osg6TexEnv4ModeEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalIN7osgText4Text12BackdropTypeEEE@Base 2.8~rc1
  _ZTSN8osgEarth8optionalIN7osgText4Text22BackdropImplementationEEE@Base 2.8~rc1
@@ -2383,13 +2306,10 @@
  _ZTSN8osgEarth8optionalINS_9Symbology10TextSymbol6LayoutEEE@Base 2.5.0
  _ZTSN8osgEarth8optionalINS_9Symbology10TextSymbol8EncodingEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_9Symbology10TextSymbol9AlignmentEEE@Base 2.4.0
- _ZTSN8osgEarth8optionalINS_9Symbology12MarkerSymbol9AlignmentEEE@Base 2.4.0
- _ZTSN8osgEarth8optionalINS_9Symbology12MarkerSymbol9PlacementEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_9Symbology14AltitudeSymbol7BindingEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_9Symbology14AltitudeSymbol8ClampingEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_9Symbology14AltitudeSymbol9TechniqueEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_9Symbology14InstanceSymbol9PlacementEEE@Base 2.4.0
- _ZTSN8osgEarth8optionalINS_9Symbology15ExtrusionSymbol15HeightReferenceEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_9Symbology16StringExpressionEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_9Symbology17NumericExpressionEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_9Symbology4FillEEE@Base 2.4.0
@@ -2416,7 +2336,6 @@
  _ZTSN8osgEarth9Symbology11ModelSymbolE@Base 2.4.0
  _ZTSN8osgEarth9Symbology11PointSymbolE@Base 2.4.0
  _ZTSN8osgEarth9Symbology12IconResourceE@Base 2.4.0
- _ZTSN8osgEarth9Symbology12MarkerSymbolE@Base 2.4.0
  _ZTSN8osgEarth9Symbology12RenderSymbolE@Base 2.4.0
  _ZTSN8osgEarth9Symbology12SkinResourceE@Base 2.4.0
  _ZTSN8osgEarth9Symbology13ModelResourceE@Base 2.4.0
@@ -2428,7 +2347,6 @@
  _ZTSN8osgEarth9Symbology14AltitudeSymbolE@Base 2.4.0
  _ZTSN8osgEarth9Symbology14CoverageSymbolE@Base 2.7.0
  _ZTSN8osgEarth9Symbology14InstanceSymbolE@Base 2.4.0
- _ZTSN8osgEarth9Symbology14MarkerResourceE@Base 2.4.0
  _ZTSN8osgEarth9Symbology14SymbolRegistryE@Base 2.5.0
  _ZTSN8osgEarth9Symbology15BillboardSymbolE@Base 2.8~rc1
  _ZTSN8osgEarth9Symbology15ExtrusionSymbolE@Base 2.4.0
@@ -2438,7 +2356,6 @@
  _ZTSN8osgEarth9Symbology16StringExpressionE@Base 2.4.0
  _ZTSN8osgEarth9Symbology17BillboardResourceE@Base 2.8~rc1
  _ZTSN8osgEarth9Symbology17NumericExpressionE@Base 2.4.0
- _ZTSN8osgEarth9Symbology17StencilVolumeNodeE@Base 2.4.0
  _ZTSN8osgEarth9Symbology18GeometryRasterizerE@Base 2.4.0
  _ZTSN8osgEarth9Symbology19SimpleSymbolFactoryINS0_10BBoxSymbolEEE@Base 2.8~rc1
  _ZTSN8osgEarth9Symbology19SimpleSymbolFactoryINS0_10IconSymbolEEE@Base 2.5.0
@@ -2447,7 +2364,6 @@
  _ZTSN8osgEarth9Symbology19SimpleSymbolFactoryINS0_10TextSymbolEEE@Base 2.5.0
  _ZTSN8osgEarth9Symbology19SimpleSymbolFactoryINS0_11ModelSymbolEEE@Base 2.5.0
  _ZTSN8osgEarth9Symbology19SimpleSymbolFactoryINS0_11PointSymbolEEE@Base 2.5.0
- _ZTSN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12MarkerSymbolEEE@Base 2.5.0
  _ZTSN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12RenderSymbolEEE@Base 2.5.0
  _ZTSN8osgEarth9Symbology19SimpleSymbolFactoryINS0_13PolygonSymbolEEE@Base 2.5.0
  _ZTSN8osgEarth9Symbology19SimpleSymbolFactoryINS0_14AltitudeSymbolEEE@Base 2.5.0
@@ -2500,7 +2416,6 @@
  _ZTVN3osg11MixinVectorINS_6Vec4usEEE@Base 2.7.0
  _ZTVN3osg11MixinVectorINS_7MatrixdEEE@Base 2.7.0
  _ZTVN3osg11MixinVectorINS_7MatrixfEEE@Base 2.7.0
- _ZTVN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEEE@Base 2.9.0
  _ZTVN3osg11MixinVectorIaEE@Base 2.7.0
  _ZTVN3osg11MixinVectorIdEE@Base 2.7.0
  _ZTVN3osg11MixinVectorIfEE@Base 2.7.0
@@ -2552,15 +2467,12 @@
  _ZTVN8osgEarth16qualified_doubleINS_8DistanceEEE@Base 2.7.0
  _ZTVN8osgEarth3URIE@Base 2.4.0
  _ZTVN8osgEarth5AngleE@Base 2.9.0
- _ZTVN8osgEarth7MapInfoE@Base 2.9.0
  _ZTVN8osgEarth7TileKeyE@Base 2.4.0
  _ZTVN8osgEarth8DistanceE@Base 2.7.0
  _ZTVN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_4NodeEEESt4lessIS6_EEE@Base 2.7.0
  _ZTVN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_7TextureEEESt4lessIS6_EEE@Base 2.9.0
  _ZTVN8osgEarth8LRUCacheINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN3osg7ref_ptrINS7_8StateSetEEESt4lessIS6_EEE@Base 2.7.0
- _ZTVN8osgEarth8MapFrameE@Base 2.9.0
  _ZTVN8osgEarth8optionalIN3osg5Vec2sEEE@Base 2.4.0
- _ZTVN8osgEarth8optionalIN3osg5Vec3fEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalIN3osg6TexEnv4ModeEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalIN7osgText4Text12BackdropTypeEEE@Base 2.8~rc1
  _ZTVN8osgEarth8optionalIN7osgText4Text22BackdropImplementationEEE@Base 2.8~rc1
@@ -2577,13 +2489,10 @@
  _ZTVN8osgEarth8optionalINS_9Symbology10TextSymbol6LayoutEEE@Base 2.5.0
  _ZTVN8osgEarth8optionalINS_9Symbology10TextSymbol8EncodingEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_9Symbology10TextSymbol9AlignmentEEE@Base 2.4.0
- _ZTVN8osgEarth8optionalINS_9Symbology12MarkerSymbol9AlignmentEEE@Base 2.4.0
- _ZTVN8osgEarth8optionalINS_9Symbology12MarkerSymbol9PlacementEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_9Symbology14AltitudeSymbol7BindingEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_9Symbology14AltitudeSymbol8ClampingEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_9Symbology14AltitudeSymbol9TechniqueEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_9Symbology14InstanceSymbol9PlacementEEE@Base 2.4.0
- _ZTVN8osgEarth8optionalINS_9Symbology15ExtrusionSymbol15HeightReferenceEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_9Symbology16StringExpressionEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_9Symbology17NumericExpressionEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_9Symbology4FillEEE@Base 2.4.0
@@ -2610,7 +2519,6 @@
  _ZTVN8osgEarth9Symbology11ModelSymbolE@Base 2.4.0
  _ZTVN8osgEarth9Symbology11PointSymbolE@Base 2.4.0
  _ZTVN8osgEarth9Symbology12IconResourceE@Base 2.4.0
- _ZTVN8osgEarth9Symbology12MarkerSymbolE@Base 2.4.0
  _ZTVN8osgEarth9Symbology12RenderSymbolE@Base 2.4.0
  _ZTVN8osgEarth9Symbology12SkinResourceE@Base 2.4.0
  _ZTVN8osgEarth9Symbology13ModelResourceE@Base 2.4.0
@@ -2622,7 +2530,6 @@
  _ZTVN8osgEarth9Symbology14AltitudeSymbolE@Base 2.4.0
  _ZTVN8osgEarth9Symbology14CoverageSymbolE@Base 2.7.0
  _ZTVN8osgEarth9Symbology14InstanceSymbolE@Base 2.4.0
- _ZTVN8osgEarth9Symbology14MarkerResourceE@Base 2.4.0
  _ZTVN8osgEarth9Symbology14SymbolRegistryE@Base 2.5.0
  _ZTVN8osgEarth9Symbology15BillboardSymbolE@Base 2.8~rc1
  _ZTVN8osgEarth9Symbology15ExtrusionSymbolE@Base 2.4.0
@@ -2632,7 +2539,6 @@
  _ZTVN8osgEarth9Symbology16StringExpressionE@Base 2.4.0
  _ZTVN8osgEarth9Symbology17BillboardResourceE@Base 2.8~rc1
  _ZTVN8osgEarth9Symbology17NumericExpressionE@Base 2.4.0
- _ZTVN8osgEarth9Symbology17StencilVolumeNodeE@Base 2.4.0
  _ZTVN8osgEarth9Symbology18GeometryRasterizerE@Base 2.4.0
  _ZTVN8osgEarth9Symbology19SimpleSymbolFactoryINS0_10BBoxSymbolEEE@Base 2.8~rc1
  _ZTVN8osgEarth9Symbology19SimpleSymbolFactoryINS0_10IconSymbolEEE@Base 2.5.0
@@ -2641,7 +2547,6 @@
  _ZTVN8osgEarth9Symbology19SimpleSymbolFactoryINS0_10TextSymbolEEE@Base 2.5.0
  _ZTVN8osgEarth9Symbology19SimpleSymbolFactoryINS0_11ModelSymbolEEE@Base 2.5.0
  _ZTVN8osgEarth9Symbology19SimpleSymbolFactoryINS0_11PointSymbolEEE@Base 2.5.0
- _ZTVN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12MarkerSymbolEEE@Base 2.5.0
  _ZTVN8osgEarth9Symbology19SimpleSymbolFactoryINS0_12RenderSymbolEEE@Base 2.5.0
  _ZTVN8osgEarth9Symbology19SimpleSymbolFactoryINS0_13PolygonSymbolEEE@Base 2.5.0
  _ZTVN8osgEarth9Symbology19SimpleSymbolFactoryINS0_14AltitudeSymbolEEE@Base 2.5.0
@@ -2704,7 +2609,6 @@
  osgearth_simple_symbol_extrusion@Base 2.9.0
  osgearth_simple_symbol_icon@Base 2.9.0
  osgearth_simple_symbol_line@Base 2.9.0
- osgearth_simple_symbol_marker@Base 2.9.0
  osgearth_simple_symbol_model@Base 2.9.0
  osgearth_simple_symbol_point@Base 2.9.0
  osgearth_simple_symbol_polygon@Base 2.9.0
diff -Nru osgearth-2.9.0+dfsg/debian/libosgearthutil5.symbols osgearth-2.10.2+dfsg/debian/libosgearthutil5.symbols
--- osgearth-2.9.0+dfsg/debian/libosgearthutil5.symbols	2018-02-07 17:53:05.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/libosgearthutil5.symbols	2019-04-20 06:08:11.000000000 +0000
@@ -1,8 +1,11 @@
-# SymbolsHelper-Confirmed: 2.9.0 alpha amd64 arm64 armel armhf hppa hurd-i386 i386 m68k mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64
+# SymbolsHelper-Confirmed: 2.10.1 amd64
 libosgEarthUtil.so.5 #PACKAGE# #MINVER#
+* Build-Depends-Package: libosgearth-dev
  _Z10intersectsRKdS0_S0_S0_S0_S0_S0_S0_@Base 2.4.0
  _Z17getHorizSRSStringB5cxx11PKN8osgEarth16SpatialReferenceE@Base 2.7.0
+ _Z20getAttributionStringB5cxx11PN8osgEarth3MapE@Base 2.10.0
  _Z23getAllParentalNodePathsPN3osg4NodeES1_@Base 2.7.0
+ _Z9boundSortRKN3osg7ref_ptrINS_4NodeEEES4_@Base 2.10.0
  _ZN11FeatureTile6acceptEP18FeatureTileVisitor@Base 2.4.0
  _ZN11FeatureTileD0Ev@Base 2.4.0
  _ZN11FeatureTileD1Ev@Base 2.4.0
@@ -11,15 +14,17 @@
  _ZN17AddFeatureVisitorD0Ev@Base 2.4.0
  _ZN17AddFeatureVisitorD1Ev@Base 2.4.0
  _ZN17AddFeatureVisitorD2Ev@Base 2.4.0
+ _ZN17AttributeCallback17onMapModelChangedERKN8osgEarth14MapModelChangeE@Base 2.10.0
+ _ZN17AttributeCallbackD0Ev@Base 2.10.0
+ _ZN17AttributeCallbackD1Ev@Base 2.10.0
+ _ZN17AttributeCallbackD2Ev@Base 2.10.0
  _ZN18FeatureTileVisitor8traverseEP11FeatureTile@Base 2.4.0
  _ZN18FeatureTileVisitorD0Ev@Base 2.4.0
  _ZN18FeatureTileVisitorD1Ev@Base 2.4.0
  _ZN18FeatureTileVisitorD2Ev@Base 2.4.0
  _ZN20LODBlendingExtension10disconnectEPN8osgEarth7MapNodeE@Base 2.8~rc1
  _ZN20LODBlendingExtension7connectEPN8osgEarth7MapNodeE@Base 2.8~rc1
- _ZN20LODBlendingExtensionC1ERKS_RKN3osg6CopyOpE@Base 2.8~rc1
  _ZN20LODBlendingExtensionC1Ev@Base 2.8~rc1
- _ZN20LODBlendingExtensionC2ERKS_RKN3osg6CopyOpE@Base 2.8~rc1
  _ZN20LODBlendingExtensionC2Ev@Base 2.8~rc1
  _ZN20LODBlendingExtensionD0Ev@Base 2.8~rc1
  _ZN20LODBlendingExtensionD1Ev@Base 2.8~rc1
@@ -43,12 +48,14 @@
  (optional=templinst)_ZN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEED1Ev@Base 2.9.0
  (optional=templinst)_ZN3osg11MixinVectorINS_7ref_ptrIN8osgEarth14ElevationLayerEEEED2Ev@Base 2.9.0
  _ZN3osg11NodeVisitor13asNodeVisitorEv@Base 2.8~rc1
- _ZN3osg11NodeVisitor16pushOntoNodePathEPNS_4NodeE@Base 2.7.0
+ (arch=!arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64 !x32)_ZN3osg11NodeVisitor16pushOntoNodePathEPNS_4NodeE@Base 2.10.1
  _ZN3osg11NodeVisitor5resetEv@Base 2.4.0
  _ZN3osg12CullSettings19inheritCullSettingsERKS0_@Base 2.4.0
  _ZN3osg12ValueVisitor5applyERNS_5Vec2fE@Base 2.8~rc1
  _ZN3osg12ValueVisitor5applyERNS_5Vec3fE@Base 2.8~rc1
  _ZN3osg12ValueVisitor5applyERNS_5Vec4fE@Base 2.8~rc1
+ (optional=templinst)_ZN3osg12observer_ptrINS_8StateSetEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN3osg12observer_ptrINS_8StateSetEED2Ev@Base 2.10.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EE11resizeArrayEj@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EE12reserveArrayEj@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EE4trimEv@Base 2.4.0
@@ -72,14 +79,15 @@
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EE4trimEv@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EE6acceptERNS_12ArrayVisitorE@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EE6acceptEjRNS_12ValueVisitorE@Base 2.4.0
- (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EEC1Ej@Base 2.7.0
- (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EEC2Ej@Base 2.7.0
+ (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EEC1ENS2_7BindingEj@Base 2.10.0
+ (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EEC2ENS2_7BindingEj@Base 2.10.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EED0Ev@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EED1Ev@Base 2.4.0
  (optional=templinst)_ZN3osg13TemplateArrayINS_5Vec4fELNS_5Array4TypeE29ELi4ELi5126EED2Ev@Base 2.4.0
  _ZN3osg14EllipsoidModelD0Ev@Base 2.4.0
  _ZN3osg14EllipsoidModelD1Ev@Base 2.4.0
  _ZN3osg14EllipsoidModelD2Ev@Base 2.4.0
+ _ZN3osg14StateAttribute21resizeGLObjectBuffersEj@Base 2.10.0
  _ZN3osg17ConstValueVisitor5applyERKNS_5Vec2fE@Base 2.8~rc1
  _ZN3osg17ConstValueVisitor5applyERKNS_5Vec3fE@Base 2.8~rc1
  _ZN3osg17ConstValueVisitor5applyERKNS_5Vec4fE@Base 2.8~rc1
@@ -106,7 +114,6 @@
  _ZN3osg4Node10asDrawableEv@Base 2.8~rc1
  _ZN3osg4Node10asGeometryEv@Base 2.8~rc1
  _ZN3osg4Node11asTransformEv@Base 2.4.0
- (arch=amd64)_ZN3osg4Node15addCullCallbackEPNS_8CallbackE@Base 2.9.0
  _ZN3osg4Node6asNodeEv@Base 2.8~rc1
  _ZN3osg4Node7asGeodeEv@Base 2.4.0
  _ZN3osg4Node7asGroupEv@Base 2.4.0
@@ -121,7 +128,7 @@
  _ZN3osg5Group6acceptERNS_11NodeVisitorE@Base 2.4.0
  _ZN3osg5Group7asGroupEv@Base 2.4.0
  _ZN3osg5Vec3d9normalizeEv@Base 2.7.0
- (arch=alpha amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x sh4 sparc64)_ZN3osg5roundEf@Base 2.9.0
+ (arch=i386)_ZN3osg5roundEf@Base 2.10.0
  _ZN3osg6Camera6acceptERNS_11NodeVisitorE@Base 2.4.0
  _ZN3osg6Camera8asCameraEv@Base 2.4.0
  _ZN3osg6Object13asNodeVisitorEv@Base 2.8~rc1
@@ -132,14 +139,12 @@
  _ZN3osg6Object7setNameERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN3osg6Object9asUniformEv@Base 2.8~rc1
  _ZN3osg7Matrixd6invertERKS0_@Base 2.7.0
- (arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZN3osg7Matrixd9translateERKNS_5Vec3dE@Base 2.9.0
  _ZN3osg7MatrixdD1Ev@Base 2.6.0
  _ZN3osg7MatrixdD2Ev@Base 2.6.0
- (optional=templinst)_ZN3osg7ref_ptrIKN8osgEarth16SpatialReferenceEE6assignIS3_EEvRKNS0_IT_EE@Base 2.7.0
- (optional=templinst)_ZN3osg7ref_ptrIKN8osgEarth7ProfileEEaSEPS3_@Base 2.9.0
+ (optional=templinst)_ZN3osg7ref_ptrIKN8osgEarth7ProfileEEaSEPS3_@Base 2.10.1
  (optional=templinst)_ZN3osg7ref_ptrINS_6ShaderEED1Ev@Base 2.4.0
  (optional=templinst)_ZN3osg7ref_ptrINS_6ShaderEED2Ev@Base 2.4.0
- (optional=templinst)_ZN3osg7ref_ptrINS_8CallbackEEaSEPS1_@Base 2.8.0
+ (optional=templinst|arch=amd64 armel m68k mips mipsel powerpc powerpcspe)_ZN3osg7ref_ptrINS_8CallbackEEaSEPS1_@Base 2.10.0
  _ZN3osg8Callback20removeNestedCallbackEPS0_@Base 2.9.0
  _ZN3osg8Callback3runEPNS_6ObjectES2_@Base 2.8~rc1
  _ZN3osg8CallbackD0Ev@Base 2.8~rc1
@@ -150,6 +155,7 @@
  _ZN3osg8Drawable15setDrawCallbackEPNS0_12DrawCallbackE@Base 2.4.0
  _ZN3osg8Drawable6acceptERNS0_16AttributeFunctorE@Base 2.4.0
  _ZN3osg8Drawable6acceptERNS_11NodeVisitorE@Base 2.8~rc1
+ _ZN3osg9Texture2D8getImageEj@Base 2.10.0
  _ZN3osg9Transform11asTransformEv@Base 2.4.0
  _ZN3osg9Transform17asMatrixTransformEv@Base 2.4.0
  _ZN3osg9Transform27asPositionAttitudeTransformEv@Base 2.4.0
@@ -159,6 +165,7 @@
  _ZN5osgGA12EventHandler3runEPN3osg6ObjectES3_@Base 2.8~rc1
  _ZN5osgGA15GUIEventHandler6handleERKNS_15GUIEventAdapterERNS_16GUIActionAdapterE@Base 2.4.0
  _ZN5osgGA15GUIEventHandler6handleERKNS_15GUIEventAdapterERNS_16GUIActionAdapterEPN3osg6ObjectEPNS6_11NodeVisitorE@Base 2.4.0
+ _ZN5osgGA16GUIActionAdapter6asViewEv@Base 2.10.0
  _ZN5osgGA17CameraManipulator12updateCameraERN3osg6CameraE@Base 2.4.0
  _ZN5osgGA17CameraManipulator15finishAnimationEv@Base 2.8~rc1
  _ZN5osgGA17CameraManipulator15setHomePositionERKN3osg5Vec3dES4_S4_b@Base 2.4.0
@@ -170,6 +177,12 @@
  _ZN5osgGA17CameraManipulator6handleEPNS_5EventEPN3osg6ObjectEPNS3_11NodeVisitorE@Base 2.8~rc1
  _ZN5osgGA17CameraManipulator7getNodeEv@Base 2.4.0
  _ZN5osgGA17CameraManipulator7setNodeEPN3osg4NodeE@Base 2.4.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZN6kdbush6KDBushISt4pairIiiEE5rangeEiiiiRSt6vectorIjSaIjEEjjj@Base 2.10.0
+ (optional=templinst)_ZN6kdbush6KDBushISt4pairIiiEE5rangeEiiiiRSt6vectorImSaImEEmmm@Base 2.10.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZN6kdbush6KDBushISt4pairIiiEE6selectEjjjj@Base 2.10.0
+ (optional=templinst)_ZN6kdbush6KDBushISt4pairIiiEE6selectEmmmj@Base 2.10.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZN6kdbush6KDBushISt4pairIiiEE6sortKDEjjj@Base 2.10.0
+ (optional=templinst)_ZN6kdbush6KDBushISt4pairIiiEE6sortKDEmmj@Base 2.10.0
  _ZN6osgSim14ElevationSliceD1Ev@Base 2.4.0
  _ZN6osgSim14ElevationSliceD2Ev@Base 2.4.0
  _ZN7osgText4Text7setFontEPNS_4FontE@Base 2.4.0
@@ -177,25 +190,17 @@
  _ZN7osgUtil10StateGraphD0Ev@Base 2.6.0
  _ZN7osgUtil10StateGraphD1Ev@Base 2.6.0
  _ZN7osgUtil10StateGraphD2Ev@Base 2.6.0
- _ZN7osgUtil11CullVisitor12pushStateSetEPKN3osg8StateSetE@Base 2.9.0
+ (arch=!arm64 !m68k !mips64el !ppc64el !sparc64 !x32)_ZN7osgUtil11CullVisitor12pushStateSetEPKN3osg8StateSetE@Base 2.10.1
  _ZN7osgUtil19IntersectionVisitorD1Ev@Base 2.4.0
  _ZN7osgUtil22LineSegmentIntersector12IntersectionD1Ev@Base 2.4.0
  _ZN7osgUtil22LineSegmentIntersector12IntersectionD2Ev@Base 2.4.0
  _ZN7osgUtil22LineSegmentIntersector21containsIntersectionsEv@Base 2.6.0
- _ZN8osgEarth10Annotation14AnnotationNode10getMapNodeEv@Base 2.4.0
- _ZN8osgEarth10Annotation14AnnotationNode8setStyleERKNS_9Symbology5StyleE@Base 2.4.0
- _ZN8osgEarth10Annotation15GeoPositionNode14setLocalOffsetERKN3osg5Vec3fE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNode16setLocalRotationERKN3osg4QuatE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNode6acceptERN3osg11NodeVisitorE@Base 2.8~rc1
- _ZN8osgEarth10Annotation15GeoPositionNode8setScaleERKN3osg5Vec3fE@Base 2.8~rc1
- (arch=!hurd-i386 !i386)_ZN8osgEarth10Annotation15GeoPositionNodeD0Ev@Base 2.9.0
- (arch=!hurd-i386 !i386)_ZN8osgEarth10Annotation15GeoPositionNodeD1Ev@Base 2.9.0
- (arch=!hurd-i386 !i386)_ZN8osgEarth10Annotation15GeoPositionNodeD2Ev@Base 2.9.0
  _ZN8osgEarth10Annotation7Dragger23PositionChangedCallback17onPositionChangedEPKS1_RKNS_8GeoPointE@Base 2.7.0
  _ZN8osgEarth10Annotation7Dragger23PositionChangedCallbackD0Ev@Base 2.7.0
  _ZN8osgEarth10Annotation7Dragger23PositionChangedCallbackD1Ev@Base 2.7.0
  _ZN8osgEarth10Annotation7Dragger23PositionChangedCallbackD2Ev@Base 2.7.0
  _ZN8osgEarth10Annotation9LabelNode6acceptERN3osg11NodeVisitorE@Base 2.9.0
+ _ZN8osgEarth10Annotation9PlaceNode6acceptERN3osg11NodeVisitorE@Base 2.10.0
  _ZN8osgEarth10DataExtentD0Ev@Base 2.4.0
  _ZN8osgEarth10DataExtentD1Ev@Base 2.4.0
  _ZN8osgEarth10DataExtentD2Ev@Base 2.4.0
@@ -207,25 +212,20 @@
  _ZN8osgEarth10URIContextD1Ev@Base 2.4.0
  _ZN8osgEarth10URIContextD2Ev@Base 2.4.0
  _ZN8osgEarth11MapCallback11onEndUpdateEv@Base 2.9.0
+ _ZN8osgEarth11MapCallback12onLayerAddedEPNS_5LayerEj@Base 2.10.0
+ _ZN8osgEarth11MapCallback12onLayerMovedEPNS_5LayerEjj@Base 2.10.0
  _ZN8osgEarth11MapCallback13onBeginUpdateEv@Base 2.9.0
- _ZN8osgEarth11MapCallback16onMaskLayerAddedEPNS_9MaskLayerE@Base 2.9.0
- _ZN8osgEarth11MapCallback17onImageLayerAddedEPNS_10ImageLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback17onImageLayerMovedEPNS_10ImageLayerEjj@Base 2.9.0
- _ZN8osgEarth11MapCallback17onModelLayerAddedEPNS_10ModelLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback17onModelLayerMovedEPNS_10ModelLayerEjj@Base 2.9.0
- _ZN8osgEarth11MapCallback18onMaskLayerRemovedEPNS_9MaskLayerE@Base 2.9.0
- _ZN8osgEarth11MapCallback19onImageLayerRemovedEPNS_10ImageLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback19onModelLayerRemovedEPNS_10ModelLayerEj@Base 2.9.0
+ _ZN8osgEarth11MapCallback14onLayerEnabledEPNS_5LayerE@Base 2.10.0
+ _ZN8osgEarth11MapCallback14onLayerRemovedEPNS_5LayerEj@Base 2.10.0
+ _ZN8osgEarth11MapCallback15onLayerDisabledEPNS_5LayerE@Base 2.10.0
  _ZN8osgEarth11MapCallback20onMapInfoEstablishedERKNS_7MapInfoE@Base 2.9.0
- _ZN8osgEarth11MapCallback21onElevationLayerAddedEPNS_14ElevationLayerEj@Base 2.9.0
- _ZN8osgEarth11MapCallback21onElevationLayerMovedEPNS_14ElevationLayerEjj@Base 2.9.0
- _ZN8osgEarth11MapCallback23onElevationLayerRemovedEPNS_14ElevationLayerEj@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_4Util11SimplePager15ProgressTrackerEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_4Util11SimplePager15ProgressTrackerEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_4Util11SimplePager15ProgressTrackerEED2Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_4Util11SimplePagerEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_4Util11SimplePagerEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth11OptionsDataINS_4Util11SimplePagerEED2Ev@Base 2.9.0
+ _ZN8osgEarth11insertGroupEPN3osg5GroupES2_@Base 2.10.1
  _ZN8osgEarth12LayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth12LayerOptionsD2Ev@Base 2.9.0
@@ -280,6 +280,13 @@
  _ZN8osgEarth13ProxySettingsD0Ev@Base 2.9.0
  _ZN8osgEarth13ProxySettingsD1Ev@Base 2.9.0
  _ZN8osgEarth13ProxySettingsD2Ev@Base 2.9.0
+ _ZN8osgEarth13ShaderOptions7SamplerD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptions7SamplerD2Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsC1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsC2Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD0Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD1Ev@Base 2.10.1
+ _ZN8osgEarth13ShaderOptionsD2Ev@Base 2.10.1
  _ZN8osgEarth13ShaderPackageD1Ev@Base 2.7.0
  _ZN8osgEarth13ShaderPackageD2Ev@Base 2.7.0
  _ZN8osgEarth13TerrainEffect11onUninstallEPNS_17TerrainEngineNodeE@Base 2.5.0
@@ -301,9 +308,9 @@
  _ZN8osgEarth15TerrainCallbackD0Ev@Base 2.4.0
  _ZN8osgEarth15TerrainCallbackD1Ev@Base 2.4.0
  _ZN8osgEarth15TerrainCallbackD2Ev@Base 2.4.0
+ _ZN8osgEarth16MaterialCallbackD1Ev@Base 2.10.0
  _ZN8osgEarth16ProgressCallback11onCompletedEv@Base 2.8~rc1
  _ZN8osgEarth16ProgressCallback6cancelEv@Base 2.8~rc1
- _ZN8osgEarth16ProgressCallback6failedEv@Base 2.8~rc1
  _ZN8osgEarth16ProgressCallback9onStartedEv@Base 2.8~rc1
  _ZN8osgEarth16ProgressCallbackD0Ev@Base 2.8~rc1
  _ZN8osgEarth16ProgressCallbackD1Ev@Base 2.8~rc1
@@ -315,10 +322,6 @@
  _ZN8osgEarth17TileSourceOptionsD0Ev@Base 2.4.0
  _ZN8osgEarth17TileSourceOptionsD1Ev@Base 2.4.0
  _ZN8osgEarth17TileSourceOptionsD2Ev@Base 2.4.0
- _ZN8osgEarth17TileSourceOptionsaSERKS0_@Base 2.9.0
- _ZN8osgEarth18IntersectionPickerD0Ev@Base 2.7.0
- _ZN8osgEarth18IntersectionPickerD1Ev@Base 2.7.0
- _ZN8osgEarth18IntersectionPickerD2Ev@Base 2.7.0
  _ZN8osgEarth19TerrainLayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth19TerrainLayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth19TerrainLayerOptionsD2Ev@Base 2.9.0
@@ -362,6 +365,7 @@
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_4Util21FractalElevationLayerENS_5LayerEEEEC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_4Util21FractalElevationLayerENS_5LayerEEEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth20RegisterPluginLoaderINS_12PluginLoaderINS_4Util21FractalElevationLayerENS_5LayerEEEED2Ev@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth21findTopMostNodeOfTypeIN3osg20CoordinateSystemNodeEEEPT_PNS1_4NodeEj@Base 2.9.0
  (optional=templinst)_ZN8osgEarth21findTopMostNodeOfTypeINS_4Util8Controls13ControlCanvasEEEPT_PN3osg4NodeEj@Base 2.8~rc1
  (optional=templinst)_ZN8osgEarth28ColorFilterRegistrationProxyINS_4Util14HSLColorFilterEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth28ColorFilterRegistrationProxyINS_4Util14HSLColorFilterEED1Ev@Base 2.4.0
@@ -393,10 +397,11 @@
  (optional=templinst)_ZN8osgEarth28FindTopMostNodeOfTypeVisitorINS_4Util8Controls13ControlCanvasEE5applyERN3osg4NodeE@Base 2.6.0
  (optional=templinst)_ZN8osgEarth28FindTopMostNodeOfTypeVisitorINS_4Util8Controls13ControlCanvasEED0Ev@Base 2.6.0
  (optional=templinst)_ZN8osgEarth28FindTopMostNodeOfTypeVisitorINS_4Util8Controls13ControlCanvasEED1Ev@Base 2.6.0
- (optional=templinst|arch=!amd64)_ZN8osgEarth2asIjEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.9.0
+ (optional=templinst|arch=!x32)_ZN8osgEarth2asIjEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKS1_@Base 2.9.0
  _ZN8osgEarth3URID0Ev@Base 2.4.0
  _ZN8osgEarth3URID1Ev@Base 2.4.0
  _ZN8osgEarth3URID2Ev@Base 2.4.0
+ _ZN8osgEarth3URIaSERKS0_@Base 2.10.1
  _ZN8osgEarth4Util10ContourMap11onUninstallEPNS_17TerrainEngineNodeE@Base 2.5.0
  _ZN8osgEarth4Util10ContourMap19setTransferFunctionEPN3osg18TransferFunction1DE@Base 2.5.0
  _ZN8osgEarth4Util10ContourMap4initEv@Base 2.5.0
@@ -409,17 +414,36 @@
  _ZN8osgEarth4Util10ContourMapD0Ev@Base 2.5.0
  _ZN8osgEarth4Util10ContourMapD1Ev@Base 2.5.0
  _ZN8osgEarth4Util10ContourMapD2Ev@Base 2.5.0
+ _ZN8osgEarth4Util10SkyOptions10fromConfigERKNS_6ConfigE@Base 2.10.0
  _ZN8osgEarth4Util10SkyOptions11mergeConfigERKNS_6ConfigE@Base 2.6.0
- _ZN8osgEarth4Util10SkyOptionsC1ERKNS_13ConfigOptionsE@Base 2.9.0
- _ZN8osgEarth4Util10SkyOptionsC2ERKNS_13ConfigOptionsE@Base 2.9.0
  _ZN8osgEarth4Util10SkyOptionsD0Ev@Base 2.6.0
  _ZN8osgEarth4Util10SkyOptionsD1Ev@Base 2.6.0
  _ZN8osgEarth4Util10SkyOptionsD2Ev@Base 2.6.0
  _ZN8osgEarth4Util10ViewFitterC1EPKNS_16SpatialReferenceEPKN3osg6CameraE@Base 2.9.0
  _ZN8osgEarth4Util10ViewFitterC2EPKNS_16SpatialReferenceEPKN3osg6CameraE@Base 2.9.0
- _ZN8osgEarth4Util11DataScannerD0Ev@Base 2.4.0
- _ZN8osgEarth4Util11DataScannerD1Ev@Base 2.4.0
- _ZN8osgEarth4Util11DataScannerD2Ev@Base 2.4.0
+ _ZN8osgEarth4Util11ClusterNode10buildIndexEv@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode10removeNodeEPN3osg4NodeE@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode10setEnabledEb@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode10setMapNodeEPNS_7MapNodeE@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode11getClustersEPN7osgUtil11CullVisitorERSt6vectorINS1_7ClusterESaIS6_EE@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode16getOrCreateLabelEv@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode16getStyleCallbackEv@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode16setStyleCallbackEPNS1_20StyleClusterCallbackE@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode18CanClusterCallbackclEPN3osg4NodeES5_@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode20StyleClusterCallbackclERNS1_7ClusterE@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode21getCanClusterCallbackEv@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode21setCanClusterCallbackEPNS1_18CanClusterCallbackE@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode5clearEv@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode7ClusterD1Ev@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode7ClusterD2Ev@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode7addNodeEPN3osg4NodeE@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode8traverseERN3osg11NodeVisitorE@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNode9setRadiusEj@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNodeC1EPNS_7MapNodeEPN3osg5ImageE@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNodeC2EPNS_7MapNodeEPN3osg5ImageE@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNodeD0Ev@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNodeD1Ev@Base 2.10.0
+ _ZN8osgEarth4Util11ClusterNodeD2Ev@Base 2.10.0
  _ZN8osgEarth4Util11FogCallbackD0Ev@Base 2.8~rc1
  _ZN8osgEarth4Util11FogCallbackD1Ev@Base 2.8~rc1
  _ZN8osgEarth4Util11FogCallbackclEPN3osg14StateAttributeEPNS2_11NodeVisitorE@Base 2.8~rc1
@@ -486,6 +510,7 @@
  _ZN8osgEarth4Util12ShadowCaster14setShadowColorEf@Base 2.8~rc1
  _ZN8osgEarth4Util12ShadowCaster14setTextureSizeEj@Base 2.6.0
  _ZN8osgEarth4Util12ShadowCaster19setTextureImageUnitEi@Base 2.6.0
+ _ZN8osgEarth4Util12ShadowCaster21resizeGLObjectBuffersEj@Base 2.10.0
  _ZN8osgEarth4Util12ShadowCaster8traverseERN3osg11NodeVisitorE@Base 2.6.0
  _ZN8osgEarth4Util12ShadowCaster9setRangesERKSt6vectorIfSaIfEE@Base 2.6.0
  _ZN8osgEarth4Util12ShadowCasterC1Ev@Base 2.6.0
@@ -495,19 +520,18 @@
  _ZN8osgEarth4Util12ShadowCasterD2Ev@Base 2.6.0
  _ZN8osgEarth4Util12UTMGraticule10addedToMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth4Util12UTMGraticule14removedFromMapEPKNS_3MapE@Base 2.9.0
- _ZN8osgEarth4Util12UTMGraticule15getOrCreateNodeEv@Base 2.9.0
  _ZN8osgEarth4Util12UTMGraticule4initEv@Base 2.4.0
  _ZN8osgEarth4Util12UTMGraticule5dirtyEv@Base 2.9.0
  _ZN8osgEarth4Util12UTMGraticule7rebuildEv@Base 2.4.0
  _ZN8osgEarth4Util12UTMGraticuleC1ERKNS0_19UTMGraticuleOptionsE@Base 2.9.0
- _ZN8osgEarth4Util12UTMGraticuleC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util12UTMGraticuleC1Ev@Base 2.9.0
  _ZN8osgEarth4Util12UTMGraticuleC2ERKNS0_19UTMGraticuleOptionsE@Base 2.9.0
- _ZN8osgEarth4Util12UTMGraticuleC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util12UTMGraticuleC2Ev@Base 2.9.0
  _ZN8osgEarth4Util12UTMGraticuleD0Ev@Base 2.4.0
  _ZN8osgEarth4Util12UTMGraticuleD1Ev@Base 2.4.0
  _ZN8osgEarth4Util12UTMGraticuleD2Ev@Base 2.4.0
+ _ZN8osgEarth4Util13CelestialBodyD1Ev@Base 2.10.0
+ _ZN8osgEarth4Util13CelestialBodyD2Ev@Base 2.10.0
  _ZN8osgEarth4Util13ClampCallback14setTerrainNodeEPN3osg4NodeE@Base 2.4.0
  _ZN8osgEarth4Util13ClampCallback19setIntersectionMaskEj@Base 2.8~rc1
  _ZN8osgEarth4Util13ClampCallback9setOffsetEd@Base 2.4.0
@@ -519,15 +543,12 @@
  _ZN8osgEarth4Util13GARSGraticule10addedToMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticule14removedFromMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticule15build30MinCellsEv@Base 2.9.0
- _ZN8osgEarth4Util13GARSGraticule15getOrCreateNodeEv@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticule4initEv@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticule5dirtyEv@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticule7rebuildEv@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticuleC1ERKNS0_20GARSGraticuleOptionsE@Base 2.9.0
- _ZN8osgEarth4Util13GARSGraticuleC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticuleC1Ev@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticuleC2ERKNS0_20GARSGraticuleOptionsE@Base 2.9.0
- _ZN8osgEarth4Util13GARSGraticuleC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticuleC2Ev@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticuleD0Ev@Base 2.9.0
  _ZN8osgEarth4Util13GARSGraticuleD1Ev@Base 2.9.0
@@ -539,16 +560,13 @@
  _ZN8osgEarth4Util13MGRSFormatterD2Ev@Base 2.4.0
  _ZN8osgEarth4Util13MGRSGraticule10addedToMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth4Util13MGRSGraticule14removedFromMapEPKNS_3MapE@Base 2.9.0
- _ZN8osgEarth4Util13MGRSGraticule15getOrCreateNodeEv@Base 2.9.0
  _ZN8osgEarth4Util13MGRSGraticule18setUpDefaultStylesEv@Base 2.9.0
  _ZN8osgEarth4Util13MGRSGraticule4initEv@Base 2.9.0
  _ZN8osgEarth4Util13MGRSGraticule5dirtyEv@Base 2.9.0
  _ZN8osgEarth4Util13MGRSGraticule7rebuildEv@Base 2.9.0
  _ZN8osgEarth4Util13MGRSGraticuleC1ERKNS0_20MGRSGraticuleOptionsE@Base 2.9.0
- _ZN8osgEarth4Util13MGRSGraticuleC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util13MGRSGraticuleC1Ev@Base 2.9.0
  _ZN8osgEarth4Util13MGRSGraticuleC2ERKNS0_20MGRSGraticuleOptionsE@Base 2.9.0
- _ZN8osgEarth4Util13MGRSGraticuleC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util13MGRSGraticuleC2Ev@Base 2.9.0
  _ZN8osgEarth4Util13MGRSGraticuleD0Ev@Base 2.4.0
  _ZN8osgEarth4Util13MGRSGraticuleD1Ev@Base 2.4.0
@@ -628,9 +646,7 @@
  _ZN8osgEarth4Util15FlatteningLayer4initEv@Base 2.9.0
  _ZN8osgEarth4Util15FlatteningLayer4openEv@Base 2.9.0
  _ZN8osgEarth4Util15FlatteningLayerC1ERKNS0_22FlatteningLayerOptionsE@Base 2.9.0
- _ZN8osgEarth4Util15FlatteningLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util15FlatteningLayerC2ERKNS0_22FlatteningLayerOptionsE@Base 2.9.0
- _ZN8osgEarth4Util15FlatteningLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util15FlatteningLayerD0Ev@Base 2.9.0
  _ZN8osgEarth4Util15FlatteningLayerD1Ev@Base 2.9.0
  _ZN8osgEarth4Util15FlatteningLayerD2Ev@Base 2.9.0
@@ -676,7 +692,6 @@
  _ZN8osgEarth4Util15WMSCapabilitiesD2Ev@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator10NullActionE@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator10resetMouseERN5osgGA16GUIActionAdapterEb@Base 2.5.0
- _ZN8osgEarth4Util16EarthManipulator11breakTetherEv@Base 2.7.0
  _ZN8osgEarth4Util16EarthManipulator11establishedEv@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator11resetLookAtEv@Base 2.7.0
  _ZN8osgEarth4Util16EarthManipulator11serviceTaskEv@Base 2.4.0
@@ -687,12 +702,9 @@
  _ZN8osgEarth4Util16EarthManipulator12reinitializeEv@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator12setViewpointERKNS_9ViewpointEd@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator12updateCameraERN3osg6CameraE@Base 2.8~rc1
- _ZN8osgEarth4Util16EarthManipulator12updateTetherEv@Base 2.4.0
+ _ZN8osgEarth4Util16EarthManipulator12updateTetherEd@Base 2.10.0
  _ZN8osgEarth4Util16EarthManipulator13addMouseEventERKN5osgGA15GUIEventAdapterE@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator13applySettingsEPNS1_8SettingsE@Base 2.4.0
- _ZN8osgEarth4Util16EarthManipulator13isMouseMovingEv@Base 2.4.0
- _ZN8osgEarth4Util16EarthManipulator13setTetherNodeEPN3osg4NodeEd@Base 2.6.0
- _ZN8osgEarth4Util16EarthManipulator13setTetherNodeEPN3osg4NodeEdddd@Base 2.7.0
  _ZN8osgEarth4Util16EarthManipulator14TetherCallbackclEPN3osg4NodeE@Base 2.7.0
  _ZN8osgEarth4Util16EarthManipulator14addTouchEventsERKN5osgGA15GUIEventAdapterE@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator14clearViewpointEv@Base 2.7.0
@@ -711,6 +723,7 @@
  _ZN8osgEarth4Util16EarthManipulator18handleScrollActionERKNS1_6ActionEd@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator18setByInverseMatrixERKN3osg7MatrixdE@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator19computeHomePositionEv@Base 2.4.0
+ _ZN8osgEarth4Util16EarthManipulator20UpdateCameraCallback14onUpdateCameraEPKN3osg6CameraE@Base 2.10.0
  _ZN8osgEarth4Util16EarthManipulator20applyOptionsToDeltasERKNS1_6ActionERdS5_@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator20flushMouseEventStackEv@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator20handleKeyboardActionERKNS1_6ActionEd@Base 2.4.0
@@ -718,7 +731,6 @@
  _ZN8osgEarth4Util16EarthManipulator22handleContinuousActionERKNS1_6ActionEPN3osg4ViewE@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator22handleMouseClickActionERKNS1_6ActionE@Base 2.4.0
  _ZN8osgEarth4Util16EarthManipulator24configureDefaultSettingsEv@Base 2.4.0
- _ZN8osgEarth4Util16EarthManipulator25cancelViewpointTransitionEv@Base 2.7.0
  _ZN8osgEarth4Util16EarthManipulator26setUpdateCameraNodeVisitorEPN3osg11NodeVisitorE@Base 2.9.0
  _ZN8osgEarth4Util16EarthManipulator31recalculateCenterFromLookVectorEv@Base 2.6.0
  _ZN8osgEarth4Util16EarthManipulator34collapseTetherRotationIntoRotationEv@Base 2.7.0
@@ -804,16 +816,16 @@
  _ZN8osgEarth4Util16NightColorFilterD1Ev@Base 2.7.0
  _ZN8osgEarth4Util16NightColorFilterD2Ev@Base 2.7.0
  _ZN8osgEarth4Util16SimpleOceanLayer10addedToMapEPKNS_3MapE@Base 2.9.0
+ _ZN8osgEarth4Util16SimpleOceanLayer11setSeaLevelEf@Base 2.10.0
  _ZN8osgEarth4Util16SimpleOceanLayer12setMaskLayerEPKNS_10ImageLayerE@Base 2.9.0
  _ZN8osgEarth4Util16SimpleOceanLayer14removedFromMapEPKNS_3MapE@Base 2.9.0
  _ZN8osgEarth4Util16SimpleOceanLayer14setMaxAltitudeEf@Base 2.9.0
+ _ZN8osgEarth4Util16SimpleOceanLayer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.10.0
  _ZN8osgEarth4Util16SimpleOceanLayer4initEv@Base 2.9.0
  _ZN8osgEarth4Util16SimpleOceanLayer8setColorERKNS_9Symbology5ColorE@Base 2.9.0
  _ZN8osgEarth4Util16SimpleOceanLayerC1ERKNS0_23SimpleOceanLayerOptionsE@Base 2.9.0
- _ZN8osgEarth4Util16SimpleOceanLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util16SimpleOceanLayerC1Ev@Base 2.9.0
  _ZN8osgEarth4Util16SimpleOceanLayerC2ERKNS0_23SimpleOceanLayerOptionsE@Base 2.9.0
- _ZN8osgEarth4Util16SimpleOceanLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util16SimpleOceanLayerC2Ev@Base 2.9.0
  _ZN8osgEarth4Util16SimpleOceanLayerD0Ev@Base 2.9.0
  _ZN8osgEarth4Util16SimpleOceanLayerD1Ev@Base 2.9.0
@@ -830,25 +842,36 @@
  _ZN8osgEarth4Util17ContourMapOptionsD0Ev@Base 2.8~rc1
  _ZN8osgEarth4Util17ContourMapOptionsD1Ev@Base 2.8~rc1
  _ZN8osgEarth4Util17ContourMapOptionsD2Ev@Base 2.8~rc1
+ _ZN8osgEarth4Util17GeodeticGraticule10CameraDataD1Ev@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule10CameraDataD2Ev@Base 2.10.0
  _ZN8osgEarth4Util17GeodeticGraticule10addedToMapEPKNS_3MapE@Base 2.9.0
+ _ZN8osgEarth4Util17GeodeticGraticule10setMapNodeEPNS_7MapNodeE@Base 2.10.0
  _ZN8osgEarth4Util17GeodeticGraticule10setVisibleEb@Base 2.9.0
  _ZN8osgEarth4Util17GeodeticGraticule11getStateSetEPN7osgUtil11CullVisitorE@Base 2.9.0
- _ZN8osgEarth4Util17GeodeticGraticule12removeEffectEv@Base 2.9.0
  _ZN8osgEarth4Util17GeodeticGraticule12updateLabelsEv@Base 2.9.0
  _ZN8osgEarth4Util17GeodeticGraticule13initLabelPoolERNS1_10CameraDataE@Base 2.9.0
- _ZN8osgEarth4Util17GeodeticGraticule13installEffectEv@Base 2.9.0
  _ZN8osgEarth4Util17GeodeticGraticule14removedFromMapEPKNS_3MapE@Base 2.9.0
- _ZN8osgEarth4Util17GeodeticGraticule15getOrCreateNodeEv@Base 2.9.0
+ _ZN8osgEarth4Util17GeodeticGraticule17setEdgeLabelStyleERKNS_9Symbology5StyleE@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule17setGridLabelStyleERKNS_9Symbology5StyleE@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule19setGridLinesVisibleEb@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule20setEdgeLabelsVisibleEb@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule20setGridLabelsVisibleEb@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule21resizeGLObjectBuffersEj@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule24updateGridLineVisibilityEv@Base 2.10.0
  _ZN8osgEarth4Util17GeodeticGraticule4cullEPN7osgUtil11CullVisitorE@Base 2.9.0
  _ZN8osgEarth4Util17GeodeticGraticule4initEv@Base 2.4.0
  _ZN8osgEarth4Util17GeodeticGraticule5dirtyEv@Base 2.9.0
+ _ZN8osgEarth4Util17GeodeticGraticule7MyGroup8traverseERN3osg11NodeVisitorE@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule7MyGroupC1EPS1_@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule7MyGroupC2EPS1_@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule7MyGroupD0Ev@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule7MyGroupD1Ev@Base 2.10.0
+ _ZN8osgEarth4Util17GeodeticGraticule7MyGroupD2Ev@Base 2.10.0
  _ZN8osgEarth4Util17GeodeticGraticule7getTextB5cxx11ERKNS_8GeoPointEb@Base 2.9.0
  _ZN8osgEarth4Util17GeodeticGraticule7rebuildEv@Base 2.4.0
  _ZN8osgEarth4Util17GeodeticGraticuleC1ERKNS0_24GeodeticGraticuleOptionsE@Base 2.9.0
- _ZN8osgEarth4Util17GeodeticGraticuleC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util17GeodeticGraticuleC1Ev@Base 2.9.0
  _ZN8osgEarth4Util17GeodeticGraticuleC2ERKNS0_24GeodeticGraticuleOptionsE@Base 2.9.0
- _ZN8osgEarth4Util17GeodeticGraticuleC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util17GeodeticGraticuleC2Ev@Base 2.9.0
  _ZN8osgEarth4Util17GeodeticGraticuleD0Ev@Base 2.4.0
  _ZN8osgEarth4Util17GeodeticGraticuleD1Ev@Base 2.4.0
@@ -859,10 +882,8 @@
  _ZN8osgEarth4Util17LineOfSightTetherD1Ev@Base 2.4.0
  _ZN8osgEarth4Util17LineOfSightTetherclEPN3osg4NodeEPNS2_11NodeVisitorE@Base 2.4.0
  _ZN8osgEarth4Util17SkyControlFactory6createEPNS0_7SkyNodeE@Base 2.8~rc1
- _ZN8osgEarth4Util17UTMLabelingEngine12cullTraverseERN7osgUtil11CullVisitorERNS1_10CameraDataE@Base 2.9.0
- _ZN8osgEarth4Util17UTMLabelingEngine16AcceptCameraDataclERNS1_10CameraDataE@Base 2.9.0
+ _ZN8osgEarth4Util17UTMLabelingEngine12updateLabelsERKN3osg5Vec3dERS3_S6_RNS0_9ClipSpaceERNS0_23GraticuleLabelingEngine10CameraDataE@Base 2.10.0
  _ZN8osgEarth4Util17UTMLabelingEngine16setMaxResolutionEd@Base 2.9.0
- _ZN8osgEarth4Util17UTMLabelingEngine8traverseERN3osg11NodeVisitorE@Base 2.9.0
  _ZN8osgEarth4Util17UTMLabelingEngineC1EPKNS_16SpatialReferenceE@Base 2.9.0
  _ZN8osgEarth4Util17UTMLabelingEngineC2EPKNS_16SpatialReferenceE@Base 2.9.0
  _ZN8osgEarth4Util17UTMLabelingEngineD0Ev@Base 2.9.0
@@ -890,8 +911,8 @@
  _ZN8osgEarth4Util18MeasureToolHandler6handleERKN5osgGA15GUIEventAdapterERNS2_16GUIActionAdapterE@Base 2.4.0
  _ZN8osgEarth4Util18MeasureToolHandler7rebuildEv@Base 2.4.0
  _ZN8osgEarth4Util18MeasureToolHandler9setIsPathEb@Base 2.4.0
- _ZN8osgEarth4Util18MeasureToolHandlerC1EPN3osg5GroupEPNS_7MapNodeE@Base 2.4.0
- _ZN8osgEarth4Util18MeasureToolHandlerC2EPN3osg5GroupEPNS_7MapNodeE@Base 2.4.0
+ _ZN8osgEarth4Util18MeasureToolHandlerC1EPNS_7MapNodeE@Base 2.10.0
+ _ZN8osgEarth4Util18MeasureToolHandlerC2EPNS_7MapNodeE@Base 2.10.0
  _ZN8osgEarth4Util18MeasureToolHandlerD0Ev@Base 2.4.0
  _ZN8osgEarth4Util18MeasureToolHandlerD1Ev@Base 2.4.0
  _ZN8osgEarth4Util18MeasureToolHandlerD2Ev@Base 2.4.0
@@ -902,9 +923,7 @@
  _ZN8osgEarth4Util19ActivityMonitorToolD1Ev@Base 2.6.0
  _ZN8osgEarth4Util19ContourMapExtension10disconnectEPNS_7MapNodeE@Base 2.8~rc1
  _ZN8osgEarth4Util19ContourMapExtension7connectEPNS_7MapNodeE@Base 2.8~rc1
- _ZN8osgEarth4Util19ContourMapExtensionC1ERKS1_RKN3osg6CopyOpE@Base 2.8~rc1
  _ZN8osgEarth4Util19ContourMapExtensionC1Ev@Base 2.8~rc1
- _ZN8osgEarth4Util19ContourMapExtensionC2ERKS1_RKN3osg6CopyOpE@Base 2.8~rc1
  _ZN8osgEarth4Util19ContourMapExtensionC2Ev@Base 2.8~rc1
  _ZN8osgEarth4Util19ContourMapExtensionD0Ev@Base 2.8~rc1
  _ZN8osgEarth4Util19ContourMapExtensionD1Ev@Base 2.8~rc1
@@ -915,14 +934,13 @@
  _ZN8osgEarth4Util19MultiElevationLayer4initEv@Base 2.9.0
  _ZN8osgEarth4Util19MultiElevationLayer4openEv@Base 2.9.0
  _ZN8osgEarth4Util19MultiElevationLayerC1ERKNS0_26MultiElevationLayerOptionsE@Base 2.9.0
- _ZN8osgEarth4Util19MultiElevationLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util19MultiElevationLayerC1Ev@Base 2.9.0
  _ZN8osgEarth4Util19MultiElevationLayerC2ERKNS0_26MultiElevationLayerOptionsE@Base 2.9.0
- _ZN8osgEarth4Util19MultiElevationLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util19MultiElevationLayerC2Ev@Base 2.9.0
  _ZN8osgEarth4Util19MultiElevationLayerD0Ev@Base 2.9.0
  _ZN8osgEarth4Util19MultiElevationLayerD1Ev@Base 2.9.0
  _ZN8osgEarth4Util19MultiElevationLayerD2Ev@Base 2.9.0
+ _ZN8osgEarth4Util19OceanControlFactory6createEPNS0_16SimpleOceanLayerE@Base 2.10.0
  _ZN8osgEarth4Util19UTMGraticuleOptions10fromConfigERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth4Util19UTMGraticuleOptions11mergeConfigERKNS_6ConfigE@Base 2.4.0
  _ZN8osgEarth4Util19UTMGraticuleOptionsD0Ev@Base 2.4.0
@@ -952,7 +970,6 @@
  _ZN8osgEarth4Util20ChromaKeyColorFilterD0Ev@Base 2.4.0
  _ZN8osgEarth4Util20ChromaKeyColorFilterD1Ev@Base 2.4.0
  _ZN8osgEarth4Util20ChromaKeyColorFilterD2Ev@Base 2.4.0
- _ZN8osgEarth4Util20GARSGraticuleOptions10fromConfigERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth4Util20GARSGraticuleOptions11mergeConfigERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth4Util20GARSGraticuleOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth4Util20GARSGraticuleOptionsD1Ev@Base 2.9.0
@@ -970,10 +987,8 @@
  _ZN8osgEarth4Util21FractalElevationLayer4initEv@Base 2.9.0
  _ZN8osgEarth4Util21FractalElevationLayer4openEv@Base 2.9.0
  _ZN8osgEarth4Util21FractalElevationLayerC1ERKNS0_28FractalElevationLayerOptionsE@Base 2.9.0
- _ZN8osgEarth4Util21FractalElevationLayerC1ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util21FractalElevationLayerC1Ev@Base 2.9.0
  _ZN8osgEarth4Util21FractalElevationLayerC2ERKNS0_28FractalElevationLayerOptionsE@Base 2.9.0
- _ZN8osgEarth4Util21FractalElevationLayerC2ERKS1_RKN3osg6CopyOpE@Base 2.9.0
  _ZN8osgEarth4Util21FractalElevationLayerC2Ev@Base 2.9.0
  _ZN8osgEarth4Util21FractalElevationLayerD0Ev@Base 2.9.0
  _ZN8osgEarth4Util21FractalElevationLayerD1Ev@Base 2.9.0
@@ -1025,27 +1040,40 @@
  _ZN8osgEarth4Util21RadialLineOfSightNodeD2Ev@Base 2.4.0
  _ZN8osgEarth4Util21WFSCapabilitiesReader4readERKNS_3URIEPKN5osgDB7OptionsE@Base 2.4.0
  _ZN8osgEarth4Util21WFSCapabilitiesReader4readERSi@Base 2.4.0
- _ZN8osgEarth4Util21WMSCapabilitiesReader4readERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.7.0
+ _ZN8osgEarth4Util21WMSCapabilitiesReader4readERKNS_3URIEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth4Util21WMSCapabilitiesReader4readERSi@Base 2.4.0
  _ZN8osgEarth4Util22FlatteningLayerOptions11mergeConfigERKNS_6ConfigE@Base 2.9.0
+ _ZN8osgEarth4Util22FlatteningLayerOptionsC1ERKNS_13ConfigOptionsE@Base 2.10.1
+ _ZN8osgEarth4Util22FlatteningLayerOptionsC2ERKNS_13ConfigOptionsE@Base 2.10.1
  _ZN8osgEarth4Util22FlatteningLayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth4Util22FlatteningLayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth4Util22FlatteningLayerOptionsD2Ev@Base 2.9.0
+ _ZN8osgEarth4Util22GeodeticLabelingEngine12updateLabelsERKN3osg5Vec3dERS3_S6_RNS0_9ClipSpaceERNS0_23GraticuleLabelingEngine10CameraDataE@Base 2.10.0
+ _ZN8osgEarth4Util22GeodeticLabelingEngine13setResolutionEd@Base 2.10.0
+ _ZN8osgEarth4Util22GeodeticLabelingEngine7getTextB5cxx11ERKNS_8GeoPointEb@Base 2.10.0
+ _ZN8osgEarth4Util22GeodeticLabelingEngineC1EPKNS_16SpatialReferenceE@Base 2.10.0
+ _ZN8osgEarth4Util22GeodeticLabelingEngineC2EPKNS_16SpatialReferenceE@Base 2.10.0
+ _ZN8osgEarth4Util22GeodeticLabelingEngineD0Ev@Base 2.10.0
+ _ZN8osgEarth4Util22GeodeticLabelingEngineD1Ev@Base 2.10.0
+ _ZN8osgEarth4Util22GeodeticLabelingEngineD2Ev@Base 2.10.0
  _ZN8osgEarth4Util22LogarithmicDepthBuffer15setUseFragDepthEb@Base 2.7.0
  _ZN8osgEarth4Util22LogarithmicDepthBuffer7installEPN3osg6CameraE@Base 2.6.0
  _ZN8osgEarth4Util22LogarithmicDepthBuffer9uninstallEPN3osg6CameraE@Base 2.6.0
  _ZN8osgEarth4Util22LogarithmicDepthBufferC1Ev@Base 2.6.0
  _ZN8osgEarth4Util22LogarithmicDepthBufferC2Ev@Base 2.6.0
- _ZN8osgEarth4Util22LogarithmicDepthBufferD1Ev@Base 2.7.0
- _ZN8osgEarth4Util22LogarithmicDepthBufferD2Ev@Base 2.7.0
- _ZN8osgEarth4Util23AnnotationEventCallback10addHandlerEPNS0_22AnnotationEventHandlerE@Base 2.4.0
- _ZN8osgEarth4Util23AnnotationEventCallback15setHoverEnabledEb@Base 2.6.0
- _ZN8osgEarth4Util23AnnotationEventCallback9fireEventEMNS0_22AnnotationEventHandlerEFvPNS_10Annotation14AnnotationNodeERKNS2_9EventArgsEES5_@Base 2.4.0
- _ZN8osgEarth4Util23AnnotationEventCallbackC1EPNS0_22AnnotationEventHandlerE@Base 2.4.0
- _ZN8osgEarth4Util23AnnotationEventCallbackC2EPNS0_22AnnotationEventHandlerE@Base 2.4.0
- _ZN8osgEarth4Util23AnnotationEventCallbackD0Ev@Base 2.4.0
- _ZN8osgEarth4Util23AnnotationEventCallbackD1Ev@Base 2.4.0
- _ZN8osgEarth4Util23AnnotationEventCallbackclEPN3osg4NodeEPNS2_11NodeVisitorE@Base 2.4.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngine10getVisibleEPN3osg6CameraE@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngine12cullTraverseERN7osgUtil11CullVisitorERNS1_10CameraDataE@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngine12updateLabelsERKN3osg5Vec3dERS3_S6_RNS0_9ClipSpaceERNS1_10CameraDataE@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngine16AcceptCameraDataclERNS1_10CameraDataE@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngine17UpdateLabelStylesclERNS1_10CameraDataE@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngine8setStyleERKNS_9Symbology5StyleE@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngine8traverseERN3osg11NodeVisitorE@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngine9setStylesERKNS_9Symbology5StyleES5_@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngineC1EPKNS_16SpatialReferenceE@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngineC2EPKNS_16SpatialReferenceE@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngineD0Ev@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngineD1Ev@Base 2.10.0
+ _ZN8osgEarth4Util23GraticuleLabelingEngineD2Ev@Base 2.10.0
  _ZN8osgEarth4Util23LinearLineOfSightEditor14updateDraggersEv@Base 2.4.0
  _ZN8osgEarth4Util23LinearLineOfSightEditorC1EPNS0_21LinearLineOfSightNodeE@Base 2.4.0
  _ZN8osgEarth4Util23LinearLineOfSightEditorC2EPNS0_21LinearLineOfSightNodeE@Base 2.4.0
@@ -1064,11 +1092,15 @@
  _ZN8osgEarth4Util23RadialLineOfSightTetherD1Ev@Base 2.4.0
  _ZN8osgEarth4Util23RadialLineOfSightTetherclEPN3osg4NodeEPNS2_11NodeVisitorE@Base 2.4.0
  _ZN8osgEarth4Util23SimpleOceanLayerOptions11mergeConfigERKNS_6ConfigE@Base 2.9.0
+ _ZN8osgEarth4Util23SimpleOceanLayerOptionsC1ERKNS_13ConfigOptionsE@Base 2.10.1
+ _ZN8osgEarth4Util23SimpleOceanLayerOptionsC2ERKNS_13ConfigOptionsE@Base 2.10.1
  _ZN8osgEarth4Util23SimpleOceanLayerOptionsD0Ev@Base 2.9.0
  _ZN8osgEarth4Util23SimpleOceanLayerOptionsD1Ev@Base 2.9.0
  _ZN8osgEarth4Util23SimpleOceanLayerOptionsD2Ev@Base 2.9.0
  _ZN8osgEarth4Util24GeodeticGraticuleOptions10fromConfigERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth4Util24GeodeticGraticuleOptions11mergeConfigERKNS_6ConfigE@Base 2.4.0
+ _ZN8osgEarth4Util24GeodeticGraticuleOptionsC1ERKNS_13ConfigOptionsE@Base 2.10.0
+ _ZN8osgEarth4Util24GeodeticGraticuleOptionsC2ERKNS_13ConfigOptionsE@Base 2.10.0
  _ZN8osgEarth4Util24GeodeticGraticuleOptionsD0Ev@Base 2.4.0
  _ZN8osgEarth4Util24GeodeticGraticuleOptionsD1Ev@Base 2.4.0
  _ZN8osgEarth4Util24GeodeticGraticuleOptionsD2Ev@Base 2.4.0
@@ -1099,23 +1131,6 @@
  _ZN8osgEarth4Util25AutoClipPlaneCullCallbackD0Ev@Base 2.4.0
  _ZN8osgEarth4Util25AutoClipPlaneCullCallbackD1Ev@Base 2.4.0
  _ZN8osgEarth4Util25AutoClipPlaneCullCallbackclEPN3osg4NodeEPNS2_11NodeVisitorE@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode10setMapNodeEPNS_7MapNodeE@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode11setDistanceERKNS_8DistanceE@Base 2.7.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode11setPositionERKNS_8GeoPointE@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode13updateSamplesEv@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode14terrainChangedERKNS_7TileKeyEPN3osg4NodeE@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode15rebuildGeometryEv@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode16setSampleSpacingERKNS_5AngleE@Base 2.7.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode17recalculateExtentEv@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode17setAzimuthalRangeERKNS_5AngleES4_@Base 2.7.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode17setElevationRangeERKNS_5AngleES4_@Base 2.7.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode5dirtyEv@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNode8traverseERN3osg11NodeVisitorE@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNodeC1EPNS_7MapNodeE@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNodeC2EPNS_7MapNodeE@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNodeD0Ev@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNodeD1Ev@Base 2.4.0
- _ZN8osgEarth4Util25PolyhedralLineOfSightNodeD2Ev@Base 2.4.0
  _ZN8osgEarth4Util26MultiElevationLayerOptions10fromConfigERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth4Util26MultiElevationLayerOptions11mergeConfigERKNS_6ConfigE@Base 2.9.0
  _ZN8osgEarth4Util26MultiElevationLayerOptionsC1ERKNS_13ConfigOptionsE@Base 2.9.0
@@ -1146,8 +1161,8 @@
  _ZN8osgEarth4Util3TMS10TileFormatD2Ev@Base 2.4.0
  _ZN8osgEarth4Util3TMS12TileMapEntryC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESA_SA_SA_@Base 2.7.0
  _ZN8osgEarth4Util3TMS12TileMapEntryC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESA_SA_SA_@Base 2.7.0
+ _ZN8osgEarth4Util3TMS19TileMapReaderWriter4readERKNS_3URIEPKN5osgDB7OptionsE@Base 2.10.0
  _ZN8osgEarth4Util3TMS19TileMapReaderWriter4readERKNS_6ConfigE@Base 2.4.0
- _ZN8osgEarth4Util3TMS19TileMapReaderWriter4readERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.7.0
  _ZN8osgEarth4Util3TMS19TileMapReaderWriter5writeEPKNS1_7TileMapERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth4Util3TMS19TileMapReaderWriter5writeEPKNS1_7TileMapERSo@Base 2.4.0
  _ZN8osgEarth4Util3TMS20TileMapServiceReader4readERKNS_6ConfigERNSt7__cxx114listINS1_12TileMapEntryESaIS8_EEE@Base 2.7.0
@@ -1180,8 +1195,8 @@
  _ZN8osgEarth4Util6ArcGIS12RESTResponse17setCurrentVersionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
  _ZN8osgEarth4Util6ArcGIS12RESTResponseC1Ev@Base 2.5.0
  _ZN8osgEarth4Util6ArcGIS12RESTResponseC2Ev@Base 2.5.0
+ _ZN8osgEarth4Util6ArcGIS13ServiceReader4readERKNS_3URIEPKN5osgDB7OptionsERNS1_12RESTResponseE@Base 2.10.0
  _ZN8osgEarth4Util6ArcGIS13ServiceReader4readERKNS_6ConfigERNS1_12RESTResponseE@Base 2.5.0
- _ZN8osgEarth4Util6ArcGIS13ServiceReader4readERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsERNS1_12RESTResponseE@Base 2.7.0
  _ZN8osgEarth4Util6ArcGIS13ServiceReaderC1ERKS2_@Base 2.5.0
  _ZN8osgEarth4Util6ArcGIS13ServiceReaderC1Ev@Base 2.5.0
  _ZN8osgEarth4Util6ArcGIS13ServiceReaderC2ERKS2_@Base 2.5.0
@@ -1234,9 +1249,9 @@
  _ZN8osgEarth4Util7SkyNode20setAtmosphereVisibleEb@Base 2.8~rc1
  _ZN8osgEarth4Util7SkyNode22onSetAtmosphereVisibleEv@Base 2.8~rc1
  _ZN8osgEarth4Util7SkyNode6attachEPN3osg4ViewEi@Base 2.4.0
- _ZN8osgEarth4Util7SkyNode6createEPNS_7MapNodeE@Base 2.6.0
- _ZN8osgEarth4Util7SkyNode6createERKNS0_10SkyOptionsEPNS_7MapNodeE@Base 2.6.0
- _ZN8osgEarth4Util7SkyNode6createERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPNS_7MapNodeE@Base 2.7.0
+ _ZN8osgEarth4Util7SkyNode6createERKNS0_10SkyOptionsE@Base 2.10.0
+ _ZN8osgEarth4Util7SkyNode6createERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
+ _ZN8osgEarth4Util7SkyNode6createEv@Base 2.10.0
  _ZN8osgEarth4Util7SkyNode8baseInitERKNS0_10SkyOptionsE@Base 2.6.0
  _ZN8osgEarth4Util7SkyNodeC1ERKNS0_10SkyOptionsE@Base 2.6.0
  _ZN8osgEarth4Util7SkyNodeC1Ev@Base 2.6.0
@@ -1257,13 +1272,18 @@
  _ZN8osgEarth4Util8Controls11ControlNodeD0Ev@Base 2.4.0
  _ZN8osgEarth4Util8Controls11ControlNodeD1Ev@Base 2.4.0
  _ZN8osgEarth4Util8Controls11ControlNodeD2Ev@Base 2.4.0
+ _ZN8osgEarth4Util8Controls12ImageControl10setTextureEPN3osg7TextureE@Base 2.10.0
  _ZN8osgEarth4Util8Controls12ImageControl11setRotationERKNS_5AngleE@Base 2.7.0
+ _ZN8osgEarth4Util8Controls12ImageControl15s_imageStateSetE@Base 2.10.0
+ _ZN8osgEarth4Util8Controls12ImageControl16getImageStateSetEv@Base 2.10.0
  _ZN8osgEarth4Util8Controls12ImageControl21setFixSizeForRotationEb@Base 2.4.0
  _ZN8osgEarth4Util8Controls12ImageControl4drawERKNS1_14ControlContextE@Base 2.5.0
  _ZN8osgEarth4Util8Controls12ImageControl8calcSizeERKNS1_14ControlContextERN3osg5Vec2fE@Base 2.4.0
  _ZN8osgEarth4Util8Controls12ImageControl8setImageEPN3osg5ImageE@Base 2.4.0
  _ZN8osgEarth4Util8Controls12ImageControlC1EPN3osg5ImageE@Base 2.4.0
+ _ZN8osgEarth4Util8Controls12ImageControlC1EPN3osg7TextureE@Base 2.10.0
  _ZN8osgEarth4Util8Controls12ImageControlC2EPN3osg5ImageE@Base 2.4.0
+ _ZN8osgEarth4Util8Controls12ImageControlC2EPN3osg7TextureE@Base 2.10.0
  _ZN8osgEarth4Util8Controls12ImageControlD0Ev@Base 2.4.0
  _ZN8osgEarth4Util8Controls12ImageControlD1Ev@Base 2.4.0
  _ZN8osgEarth4Util8Controls12ImageControlD2Ev@Base 2.4.0
@@ -1349,7 +1369,7 @@
  _ZN8osgEarth4Util8Controls15CheckBoxControl16fireValueChangedEPNS1_19ControlEventHandlerE@Base 2.4.0
  _ZN8osgEarth4Util8Controls15CheckBoxControl4drawERKNS1_14ControlContextE@Base 2.5.0
  _ZN8osgEarth4Util8Controls15CheckBoxControl6handleERKN5osgGA15GUIEventAdapterERNS3_16GUIActionAdapterERNS1_14ControlContextE@Base 2.4.0
- _ZN8osgEarth4Util8Controls15CheckBoxControl8setValueEb@Base 2.4.0
+ _ZN8osgEarth4Util8Controls15CheckBoxControl8setValueEbb@Base 2.10.0
  _ZN8osgEarth4Util8Controls15CheckBoxControlC1Eb@Base 2.4.0
  _ZN8osgEarth4Util8Controls15CheckBoxControlC1EbPNS1_19ControlEventHandlerE@Base 2.4.0
  _ZN8osgEarth4Util8Controls15CheckBoxControlC2Eb@Base 2.4.0
@@ -1376,6 +1396,7 @@
  _ZN8osgEarth4Util8Controls19ControlEventHandlerD2Ev@Base 2.4.0
  _ZN8osgEarth4Util8Controls4Grid10getControlEii@Base 2.5.0
  (optional=templinst)_ZN8osgEarth4Util8Controls4Grid10setControlINS1_12LabelControlEEEPT_iiS6_@Base 2.8~rc1
+ (optional=templinst)_ZN8osgEarth4Util8Controls4Grid10setControlINS1_14HSliderControlEEEPT_iiS6_@Base 2.10.1
  _ZN8osgEarth4Util8Controls4Grid11addControlsERKSt6vectorIN3osg7ref_ptrINS1_7ControlEEESaIS7_EE@Base 2.4.0
  _ZN8osgEarth4Util8Controls4Grid11getChildrenERSt6vectorIPNS1_7ControlESaIS5_EE@Base 2.5.0
  _ZN8osgEarth4Util8Controls4Grid13clearControlsEv@Base 2.4.0
@@ -1439,10 +1460,12 @@
  _ZN8osgEarth4Util8Controls7Control12setHorizFillEbf@Base 2.4.0
  _ZN8osgEarth4Util8Controls7Control12setVertAlignERKNS2_9AlignmentE@Base 2.4.0
  _ZN8osgEarth4Util8Controls7Control13setHorizAlignERKNS2_9AlignmentE@Base 2.4.0
+ _ZN8osgEarth4Util8Controls7Control14s_geomStateSetE@Base 2.10.0
  _ZN8osgEarth4Util8Controls7Control14setActiveColorERKN3osg5Vec4fE@Base 2.4.0
  _ZN8osgEarth4Util8Controls7Control14setBorderColorERKN3osg5Vec4fE@Base 2.5.0
  _ZN8osgEarth4Util8Controls7Control14setBorderWidthEf@Base 2.5.0
  _ZN8osgEarth4Util8Controls7Control15addEventHandlerEPNS1_19ControlEventHandlerEb@Base 2.4.0
+ _ZN8osgEarth4Util8Controls7Control15getGeomStateSetEv@Base 2.10.0
  _ZN8osgEarth4Util8Controls7Control16fireValueChangedEPNS1_19ControlEventHandlerE@Base 2.4.0
  _ZN8osgEarth4Util8Controls7Control4drawERKNS1_14ControlContextE@Base 2.5.0
  _ZN8osgEarth4Util8Controls7Control4initEv@Base 2.4.0
@@ -1521,6 +1544,10 @@
  _ZN8osgEarth4Util8WMSStyleD0Ev@Base 2.4.0
  _ZN8osgEarth4Util8WMSStyleD1Ev@Base 2.4.0
  _ZN8osgEarth4Util8WMSStyleD2Ev@Base 2.4.0
+ _ZN8osgEarth4Util9ClipSpace11clampToLeftERNS_8GeoPointE@Base 2.10.0
+ _ZN8osgEarth4Util9ClipSpace13clampToBottomERNS_8GeoPointE@Base 2.10.0
+ _ZN8osgEarth4Util9ClipSpaceC1ERKN3osg7MatrixdES5_@Base 2.10.0
+ _ZN8osgEarth4Util9ClipSpaceC2ERKN3osg7MatrixdES5_@Base 2.10.0
  _ZN8osgEarth4Util9EphemerisD0Ev@Base 2.6.0
  _ZN8osgEarth4Util9EphemerisD1Ev@Base 2.6.0
  _ZN8osgEarth4Util9EphemerisD2Ev@Base 2.6.0
@@ -1575,9 +1602,7 @@
  _ZN8osgEarth4Util9TileIndexD0Ev@Base 2.5.0
  _ZN8osgEarth4Util9TileIndexD1Ev@Base 2.5.0
  _ZN8osgEarth4Util9TileIndexD2Ev@Base 2.5.0
- _ZN8osgEarth5Layer15getOrCreateNodeEv@Base 2.9.0
  _ZN8osgEarth5Layer18getSequenceControlEv@Base 2.9.0
- _ZN8osgEarth5Layer19setTerrainResourcesEPNS_16TerrainResourcesE@Base 2.9.0
  _ZN8osgEarth5Units7convertERKS0_S2_dRd@Base 2.9.0
  _ZN8osgEarth5UnitsC1ERKS0_@Base 2.7.0
  _ZN8osgEarth5UnitsC2ERKS0_@Base 2.7.0
@@ -1585,15 +1610,18 @@
  _ZN8osgEarth5UnitsD2Ev@Base 2.4.0
  _ZN8osgEarth5UnitsaSERKS0_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth6Config3addIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.9.0
- (arch=i386 mips mipsel)_ZN8osgEarth6Config6removeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
- _ZN8osgEarth6Config6updateIA8_cEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.9.0
- (optional=templinst)_ZN8osgEarth6Config6updateINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.9.0
- (optional=templinst|arch=!alpha !amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZN8osgEarth6Config8addIfSetIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.9.0
- (arch=i386 mips mipsel)_ZN8osgEarth6ConfigC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.9.0
+ _ZN8osgEarth6Config3setERKS0_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth6Config3setINS_9Symbology5StyleEEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvRKS7_RKT_@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIS0_EEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth6Config3setIbEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth6Config3setIfEEvRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_8optionalIT_EE@Base 2.10.0
+ _ZN8osgEarth6Config6removeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.0
  _ZN8osgEarth6ConfigC1ERKS0_@Base 2.4.0
- (arch=i386 mips mipsel)_ZN8osgEarth6ConfigC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_@Base 2.9.0
+ (optional=templinst)_ZN8osgEarth6ConfigC1INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERKS7_RKT_@Base 2.10.1
  _ZN8osgEarth6ConfigC2ERKS0_@Base 2.4.0
- _ZN8osgEarth6ConfigaSERKS0_@Base 2.7.0
+ (optional=templinst)_ZN8osgEarth6ConfigC2INSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEERKS7_RKT_@Base 2.10.1
+ _ZN8osgEarth6ConfigaSERKS0_@Base 2.10.1
  _ZN8osgEarth6Picker8Callback5onHitEj@Base 2.7.0
  _ZN8osgEarth6Picker8Callback6acceptERKN5osgGA15GUIEventAdapterERKNS2_16GUIActionAdapterE@Base 2.7.0
  _ZN8osgEarth6Picker8Callback6onMissEv@Base 2.7.0
@@ -1616,17 +1644,11 @@
  _ZN8osgEarth7Drivers17OGRFeatureOptionsD1Ev@Base 2.5.0
  _ZN8osgEarth7Drivers17OGRFeatureOptionsD2Ev@Base 2.5.0
  _ZN8osgEarth7Drivers3KML4loadERKNS_3URIEPNS_7MapNodeEPKN5osgDB7OptionsERKNS0_10KMLOptionsE@Base 2.4.0
- _ZN8osgEarth7MapInfoD0Ev@Base 2.9.0
- _ZN8osgEarth7MapInfoD1Ev@Base 2.9.0
- _ZN8osgEarth7MapInfoD2Ev@Base 2.9.0
  _ZN8osgEarth7TileKeyD0Ev@Base 2.4.0
  _ZN8osgEarth7TileKeyD1Ev@Base 2.4.0
  _ZN8osgEarth7TileKeyD2Ev@Base 2.4.0
  _ZN8osgEarth8Features13FeatureSource10getFeatureEm@Base 2.6.0
  _ZN8osgEarth8Features13FeatureSource13insertFeatureEPNS0_7FeatureE@Base 2.6.0
- _ZN8osgEarth8Features14TextSymbolizerD0Ev@Base 2.4.0
- _ZN8osgEarth8Features14TextSymbolizerD1Ev@Base 2.4.0
- _ZN8osgEarth8Features14TextSymbolizerD2Ev@Base 2.4.0
  _ZN8osgEarth8Features16GeometryCompilerD0Ev@Base 2.4.0
  _ZN8osgEarth8Features16GeometryCompilerD1Ev@Base 2.4.0
  _ZN8osgEarth8Features16GeometryCompilerD2Ev@Base 2.4.0
@@ -1637,9 +1659,7 @@
  _ZN8osgEarth8GeoPointD0Ev@Base 2.4.0
  _ZN8osgEarth8GeoPointD1Ev@Base 2.4.0
  _ZN8osgEarth8GeoPointD2Ev@Base 2.4.0
- _ZN8osgEarth8MapFrameD0Ev@Base 2.9.0
- _ZN8osgEarth8MapFrameD1Ev@Base 2.9.0
- _ZN8osgEarth8MapFrameD2Ev@Base 2.9.0
+ (arch=mips mipsel)_ZN8osgEarth8GeoPointaSERKS0_@Base 2.10.0
  (optional=templinst)_ZN8osgEarth8fast_mapIPN3osg6CameraENS_4Util8Controls11ControlNode16TravSpecificDataEEixERKS3_@Base 2.8~rc2
  (optional=templinst)_ZN8osgEarth8optionalIN3osg4QuatEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIN3osg4QuatEED1Ev@Base 2.4.0
@@ -1661,6 +1681,11 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_13ProxySettingsEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_13ProxySettingsEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_13ProxySettingsEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED0Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED1Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_13ShaderOptionsEED2Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEEC1ERKS2_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEEC2ERKS2_@Base 2.10.1
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_14ProfileOptionsEED2Ev@Base 2.4.0
@@ -1669,6 +1694,9 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_17TileSourceOptionsEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_17TileSourceOptionsEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_17TileSourceOptionsEED2Ev@Base 2.4.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED0Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEED2Ev@Base 2.10.0
  (optional=templinst)_ZN8osgEarth8optionalINS_21ElevationNoDataPolicyEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_21ElevationNoDataPolicyEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_21ElevationNoDataPolicyEED2Ev@Base 2.9.0
@@ -1700,9 +1728,7 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_8DurationEED1Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8optionalINS_8DurationEED2Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8optionalINS_8Features20FeatureSourceOptionsEEC1ERKS3_@Base 2.9.0
- (optional=templinst)_ZN8osgEarth8optionalINS_8Features20FeatureSourceOptionsEEC1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_8Features20FeatureSourceOptionsEEC2ERKS3_@Base 2.9.0
- (optional=templinst)_ZN8osgEarth8optionalINS_8Features20FeatureSourceOptionsEEC2Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_8Features20FeatureSourceOptionsEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_8Features20FeatureSourceOptionsEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_8Features20FeatureSourceOptionsEED2Ev@Base 2.9.0
@@ -1712,13 +1738,19 @@
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology16StringExpressionEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology16StringExpressionEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology16StringExpressionEED2Ev@Base 2.4.0
- (optional=templinst|arch=amd64 arm64)_ZN8osgEarth8optionalINS_9Symbology17NumericExpressionEE4initES2_@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology17NumericExpressionEED0Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology17NumericExpressionEED1Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology17NumericExpressionEED2Ev@Base 2.9.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5ColorEED0Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5ColorEED1Ev@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5ColorEED2Ev@Base 2.7.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5QueryEED0Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5QueryEED1Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5QueryEED2Ev@Base 2.10.0
+ (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5StyleEEC1ERKS3_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5StyleEEC1Ev@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5StyleEEC2ERKS3_@Base 2.10.1
+ (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5StyleEEC2Ev@Base 2.10.1
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5StyleEED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5StyleEED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalINS_9Symbology5StyleEED2Ev@Base 2.4.0
@@ -1747,16 +1779,12 @@
  (optional=templinst)_ZN8osgEarth8optionalIjED0Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIjED1Ev@Base 2.4.0
  (optional=templinst)_ZN8osgEarth8optionalIjED2Ev@Base 2.4.0
- (optional=templinst|arch=alpha amd64 arm64 armel armhf hurd-i386 powerpc ppc64 s390x)_ZN8osgEarth8toStringINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEES6_RKT_@Base 2.9.0
- (optional=templinst)_ZN8osgEarth8toStringIfEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
  (optional=templinst)_ZN8osgEarth8toStringIjEENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKT_@Base 2.7.0
  _ZN8osgEarth9Extension12setDBOptionsEPKN5osgDB7OptionsE@Base 2.7.0
  _ZN8osgEarth9GeoExtentD0Ev@Base 2.4.0
  _ZN8osgEarth9GeoExtentD1Ev@Base 2.4.0
  _ZN8osgEarth9GeoExtentD2Ev@Base 2.4.0
- (arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc)_ZN8osgEarth9GeoExtentaSERKS0_@Base 2.9.0
- _ZN8osgEarth9Symbology10StyleSheet9ScriptDefC1Ev@Base 2.9.0
- _ZN8osgEarth9Symbology10StyleSheet9ScriptDefC2Ev@Base 2.9.0
+ (arch=armel armhf hurd-i386 i386 m68k mips mipsel powerpc powerpcspe)_ZN8osgEarth9GeoExtentaSERKS0_@Base 2.10.0
  _ZN8osgEarth9Symbology10StyleSheet9ScriptDefD0Ev@Base 2.9.0
  _ZN8osgEarth9Symbology10StyleSheet9ScriptDefD1Ev@Base 2.9.0
  _ZN8osgEarth9Symbology10StyleSheet9ScriptDefD2Ev@Base 2.9.0
@@ -1766,7 +1794,6 @@
  _ZN8osgEarth9Symbology17NumericExpressionD0Ev@Base 2.4.0
  _ZN8osgEarth9Symbology17NumericExpressionD1Ev@Base 2.4.0
  _ZN8osgEarth9Symbology17NumericExpressionD2Ev@Base 2.4.0
- _ZN8osgEarth9Symbology17NumericExpressionaSERKS1_@Base 2.9.0
  _ZN8osgEarth9Symbology5ColorD0Ev@Base 2.4.0
  _ZN8osgEarth9Symbology5ColorD1Ev@Base 2.4.0
  _ZN8osgEarth9Symbology5ColorD2Ev@Base 2.4.0
@@ -1785,6 +1812,7 @@
  _ZN8osgEarth9ViewpointD2Ev@Base 2.4.0
  _ZN8osgEarth9ViewpointaSERKS0_@Base 2.7.0
  _ZNK20LODBlendingExtension11libraryNameEv@Base 2.8~rc1
+ _ZNK20LODBlendingExtension12getConfigKeyEv@Base 2.10.0
  _ZNK20LODBlendingExtension12isSameKindAsEPKN3osg6ObjectE@Base 2.8~rc1
  _ZNK20LODBlendingExtension16getConfigOptionsEv@Base 2.8~rc1
  _ZNK20LODBlendingExtension5cloneERKN3osg6CopyOpE@Base 2.8~rc1
@@ -1810,6 +1838,8 @@
  _ZNK3osg12NodeCallback5cloneERKNS_6CopyOpE@Base 2.4.0
  _ZNK3osg12NodeCallback9classNameEv@Base 2.4.0
  _ZNK3osg12NodeCallback9cloneTypeEv@Base 2.4.0
+ (optional=templinst)_ZNK3osg12observer_ptrIN8osgEarth7MapNodeEE4lockERNS_7ref_ptrIS2_EE@Base 2.10.0
+ (optional=templinst)_ZNK3osg12observer_ptrINS_4NodeEE4lockERNS_7ref_ptrIS1_EE@Base 2.10.0
  (optional=templinst)_ZNK3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EE14getDataPointerEv@Base 2.4.0
  (optional=templinst)_ZNK3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EE14getElementSizeEv@Base 2.4.0
  (optional=templinst)_ZNK3osg13TemplateArrayINS_5Vec2fELNS_5Array4TypeE27ELi2ELi5126EE14getNumElementsEv@Base 2.4.0
@@ -1842,6 +1872,7 @@
  _ZNK3osg14EllipsoidModel5cloneERKNS_6CopyOpE@Base 2.4.0
  _ZNK3osg14EllipsoidModel9classNameEv@Base 2.4.0
  _ZNK3osg14EllipsoidModel9cloneTypeEv@Base 2.4.0
+ _ZNK3osg14StateAttribute16releaseGLObjectsEPNS_5StateE@Base 2.10.0
  _ZNK3osg22StateAttributeCallback11libraryNameEv@Base 2.8~rc1
  _ZNK3osg22StateAttributeCallback12isSameKindAsEPKNS_6ObjectE@Base 2.8~rc1
  _ZNK3osg22StateAttributeCallback5cloneERKNS_6CopyOpE@Base 2.8~rc1
@@ -1915,6 +1946,7 @@
  _ZNK3osg8Drawable8supportsERKNS_21PrimitiveIndexFunctorE@Base 2.4.0
  _ZNK3osg9Transform11asTransformEv@Base 2.4.0
  _ZNK3osg9Transform17asMatrixTransformEv@Base 2.4.0
+ _ZNK3osg9Transform25computeLocalToWorldMatrixERNS_7MatrixdEPNS_11NodeVisitorE@Base 2.10.1
  _ZNK3osg9Transform27asPositionAttitudeTransformEv@Base 2.4.0
  _ZNK5osgDB12ReaderWriter10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKNS_7OptionsE@Base 2.7.0
  _ZNK5osgDB12ReaderWriter10readObjectERSiPKNS_7OptionsE@Base 2.4.0
@@ -1962,7 +1994,6 @@
  _ZNK5osgGA12EventHandler9classNameEv@Base 2.8~rc1
  _ZNK5osgGA12EventHandler9cloneTypeEv@Base 2.8~rc1
  _ZNK5osgGA15GUIEventAdapter12getEventTypeEv@Base 2.6.0
- (arch=alpha amd64 arm64 mips64el ppc64 ppc64el s390x sh4 sparc64)_ZNK5osgGA15GUIEventAdapter14getXnormalizedEv@Base 2.9.0
  _ZNK5osgGA15GUIEventAdapter14getYnormalizedEv@Base 2.7.0
  _ZNK5osgGA15GUIEventAdapter6getKeyEv@Base 2.6.0
  _ZNK5osgGA15GUIEventHandler11libraryNameEv@Base 2.4.0
@@ -1975,31 +2006,18 @@
  _ZNK5osgGA17CameraManipulator22getFusionDistanceValueEv@Base 2.4.0
  _ZNK5osgGA17CameraManipulator7getNodeEv@Base 2.4.0
  _ZNK5osgGA17CameraManipulator9classNameEv@Base 2.4.0
- _ZNK7osgText4Text11libraryNameEv@Base 2.4.0
- _ZNK7osgText4Text12isSameKindAsEPKN3osg6ObjectE@Base 2.4.0
- _ZNK7osgText4Text5cloneERKN3osg6CopyOpE@Base 2.4.0
  _ZNK7osgText4Text8supportsERKN3osg16PrimitiveFunctorE@Base 2.4.0
  _ZNK7osgText4Text8supportsERKN3osg8Drawable16AttributeFunctorE@Base 2.4.0
  _ZNK7osgText4Text8supportsERKN3osg8Drawable21ConstAttributeFunctorE@Base 2.4.0
  _ZNK7osgText4Text9classNameEv@Base 2.4.0
- _ZNK7osgText4Text9cloneTypeEv@Base 2.4.0
  _ZNK7osgUtil11CullVisitor12getViewPointEv@Base 2.7.0
  _ZNK7osgUtil9RenderBin11libraryNameEv@Base 2.4.0
  _ZNK7osgUtil9RenderBin12isSameKindAsEPKN3osg6ObjectE@Base 2.4.0
  _ZNK7osgUtil9RenderBin5cloneERKN3osg6CopyOpE@Base 2.4.0
  _ZNK7osgUtil9RenderBin9classNameEv@Base 2.4.0
  _ZNK7osgUtil9RenderBin9cloneTypeEv@Base 2.4.0
- _ZNK8osgEarth10Annotation14AnnotationNode24supportsRenderBinDetailsEv@Base 2.9.0
- _ZNK8osgEarth10Annotation14AnnotationNode7getTextB5cxx11Ev@Base 2.7.0
- _ZNK8osgEarth10Annotation14AnnotationNode8getStyleEv@Base 2.4.0
- _ZNK8osgEarth10Annotation15GeoPositionNode11libraryNameEv@Base 2.8~rc1
- _ZNK8osgEarth10Annotation15GeoPositionNode12isSameKindAsEPKN3osg6ObjectE@Base 2.8~rc1
- _ZNK8osgEarth10Annotation15GeoPositionNode5cloneERKN3osg6CopyOpE@Base 2.8~rc1
- _ZNK8osgEarth10Annotation15GeoPositionNode9classNameEv@Base 2.8~rc1
- _ZNK8osgEarth10Annotation15GeoPositionNode9cloneTypeEv@Base 2.8~rc1
  _ZNK8osgEarth10Revisioned10inSyncWithERKNS_8RevisionE@Base 2.4.0
  _ZNK8osgEarth10Revisioned4syncERNS_8RevisionE@Base 2.4.0
- _ZNK8osgEarth10TileSource12getExtensionB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth11ColorFilter9getConfigEv@Base 2.4.0
  (optional=templinst)_ZNK8osgEarth11OptionsDataINS_4Util11SimplePager15ProgressTrackerEE11libraryNameEv@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth11OptionsDataINS_4Util11SimplePager15ProgressTrackerEE12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
@@ -2022,7 +2040,6 @@
  (optional=templinst)_ZNK8osgEarth12PluginLoaderINS_4Util19MultiElevationLayerENS_5LayerEE10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth12PluginLoaderINS_4Util21FractalElevationLayerENS_5LayerEE10readObjectERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKN5osgDB7OptionsE@Base 2.9.0
  _ZNK8osgEarth13TerrainEffect9getConfigEv@Base 2.5.0
- _ZNK8osgEarth16SpatialReference12isPlateCarreEv@Base 2.6.0
  (optional=templinst)_ZNK8osgEarth16qualified_doubleINS_5AngleEE17asParseableStringB5cxx11Ev@Base 2.8~rc1
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNK8osgEarth16qualified_doubleINS_5AngleEE8asStringB5cxx11Ev@Base 2.8~rc1
  (optional=templinst)_ZNK8osgEarth16qualified_doubleINS_5AngleEEmiERKS1_@Base 2.7.0
@@ -2040,9 +2057,15 @@
  (optional=templinst)_ZNK8osgEarth28ColorFilterRegistrationProxyINS_4Util29BrightnessContrastColorFilterEE6createERKNS_6ConfigE@Base 2.4.0
  (optional=templinst)_ZNK8osgEarth3Map9getLayersINS_10ImageLayerEEENS_8RevisionERSt6vectorIN3osg7ref_ptrIT_EESaIS8_EE@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth3Map9getLayersINS_14ElevationLayerEEENS_8RevisionERN3osg11MixinVectorINS4_7ref_ptrIT_EEEE@Base 2.9.0
- (arch=amd64 arm64)_ZNK8osgEarth3URI9getStringB5cxx11EPKN5osgDB7OptionsEPNS_16ProgressCallbackE@Base 2.9.0
+ _ZNK8osgEarth4Text11libraryNameEv@Base 2.10.0
+ _ZNK8osgEarth4Text12isSameKindAsEPKN3osg6ObjectE@Base 2.10.0
+ _ZNK8osgEarth4Text5cloneERKN3osg6CopyOpE@Base 2.10.0
+ _ZNK8osgEarth4Text9cloneTypeEv@Base 2.10.0
  _ZNK8osgEarth4Util10SkyOptions9getConfigEv@Base 2.6.0
  _ZNK8osgEarth4Util10ViewFitter15createViewpointERKSt6vectorINS_8GeoPointESaIS3_EERNS_9ViewpointE@Base 2.9.0
+ _ZNK8osgEarth4Util11ClusterNode10getEnabledEv@Base 2.10.0
+ _ZNK8osgEarth4Util11ClusterNode10getMapNodeEv@Base 2.10.0
+ _ZNK8osgEarth4Util11ClusterNode9getRadiusEv@Base 2.10.0
  _ZNK8osgEarth4Util11DataScanner15findImageLayersERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt6vectorIS7_SaIS7_EERSA_IN3osg7ref_ptrINS_10ImageLayerEEESaISI_EE@Base 2.7.0
  _ZNK8osgEarth4Util11OceanDriver10getMapNodeEPKN5osgDB7OptionsE@Base 2.6.0
  _ZNK8osgEarth4Util11OceanDriver15getOceanOptionsEPKN5osgDB7OptionsE@Base 2.6.0
@@ -2061,29 +2084,36 @@
  _ZNK8osgEarth4Util11TMSPackager22getElevationPixelDepthEv@Base 2.6.0
  _ZNK8osgEarth4Util12AtlasBuilder5buildEPKNS_9Symbology15ResourceLibraryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS1_5AtlasE@Base 2.7.0
  _ZNK8osgEarth4Util12OceanOptions9getConfigEv@Base 2.6.0
+ _ZNK8osgEarth4Util12ShadowCaster16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
  _ZNK8osgEarth4Util12UTMGraticule11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth4Util12UTMGraticule12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth4Util12UTMGraticule12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth4Util12UTMGraticule5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth4Util12UTMGraticule7getNodeEv@Base 2.10.0
  _ZNK8osgEarth4Util12UTMGraticule9classNameEv@Base 2.9.0
  _ZNK8osgEarth4Util12UTMGraticule9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth4Util13ClampCallback13clampGeometryEPN3osg8GeometryERKNS2_7MatrixdES7_@Base 2.4.0
  _ZNK8osgEarth4Util13ClampCallback19getIntersectionMaskEv@Base 2.8~rc1
  _ZNK8osgEarth4Util13ClampCallback5clampERKN3osg5Vec3dERS3_@Base 2.4.0
  _ZNK8osgEarth4Util13GARSGraticule11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth4Util13GARSGraticule12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth4Util13GARSGraticule12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth4Util13GARSGraticule5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth4Util13GARSGraticule7getNodeEv@Base 2.10.0
  _ZNK8osgEarth4Util13GARSGraticule9classNameEv@Base 2.9.0
  _ZNK8osgEarth4Util13GARSGraticule9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth4Util13MGRSFormatter6formatB5cxx11ERKNS_8GeoPointE@Base 2.7.0
  _ZNK8osgEarth4Util13MGRSFormatter9transformERKNS_8GeoPointERNS0_9MGRSCoordE@Base 2.4.0
  _ZNK8osgEarth4Util13MGRSGraticule11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth4Util13MGRSGraticule12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth4Util13MGRSGraticule12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth4Util13MGRSGraticule15loadGZDFeaturesEPKNS_16SpatialReferenceERNSt7__cxx114listIN3osg7ref_ptrINS_8Features7FeatureEEESaISB_EEE@Base 2.9.0
  _ZNK8osgEarth4Util13MGRSGraticule5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth4Util13MGRSGraticule7getNodeEv@Base 2.10.0
  _ZNK8osgEarth4Util13MGRSGraticule9classNameEv@Base 2.9.0
  _ZNK8osgEarth4Util13MGRSGraticule9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth4Util13MapNodeHelper13configureViewEPN9osgViewer4ViewE@Base 2.4.0
- _ZNK8osgEarth4Util13MapNodeHelper4loadERN3osg14ArgumentParserEPN9osgViewer4ViewEPNS0_8Controls9ContainerEPKN5osgDB7OptionsE@Base 2.8~rc1
+ _ZNK8osgEarth4Util13MapNodeHelper4loadERN3osg14ArgumentParserEPN9osgViewer10ViewerBaseEPNS0_8Controls9ContainerEPKN5osgDB7OptionsE@Base 2.10.0
  _ZNK8osgEarth4Util13MapNodeHelper5parseEPNS_7MapNodeERN3osg14ArgumentParserEPN9osgViewer4ViewEPNS4_5GroupEPNS0_8Controls12LabelControlE@Base 2.7.0
  _ZNK8osgEarth4Util13MapNodeHelper5parseEPNS_7MapNodeERN3osg14ArgumentParserEPN9osgViewer4ViewEPNS4_5GroupEPNS0_8Controls9ContainerE@Base 2.7.0
  _ZNK8osgEarth4Util13MapNodeHelper5usageB5cxx11Ev@Base 2.7.0
@@ -2114,6 +2144,7 @@
  _ZNK8osgEarth4Util15CMYKColorFilter7installEPN3osg8StateSetE@Base 2.4.0
  _ZNK8osgEarth4Util15CMYKColorFilter9getConfigEv@Base 2.4.0
  _ZNK8osgEarth4Util15FlatteningLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth4Util15FlatteningLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth4Util15FlatteningLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth4Util15FlatteningLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth4Util15FlatteningLayer9classNameEv@Base 2.9.0
@@ -2127,18 +2158,18 @@
  _ZNK8osgEarth4Util16EarthManipulator12getViewpointEv@Base 2.4.0
  _ZNK8osgEarth4Util16EarthManipulator12isMouseClickEPKN5osgGA15GUIEventAdapterE@Base 2.4.0
  _ZNK8osgEarth4Util16EarthManipulator13getQuaternionEdd@Base 2.7.0
- _ZNK8osgEarth4Util16EarthManipulator13getTetherNodeEv@Base 2.4.0
  _ZNK8osgEarth4Util16EarthManipulator13screenToWorldEffPN3osg4ViewERNS2_5Vec3dE@Base 2.4.0
  _ZNK8osgEarth4Util16EarthManipulator14dumpActionInfoERKNS1_6ActionEN3osg14NotifySeverityE@Base 2.4.0
  _ZNK8osgEarth4Util16EarthManipulator14getEulerAnglesERKN3osg4QuatEPdS6_@Base 2.7.0
+ _ZNK8osgEarth4Util16EarthManipulator14getWorldMatrixEv@Base 2.10.0
  _ZNK8osgEarth4Util16EarthManipulator16getInverseMatrixEv@Base 2.4.0
  _ZNK8osgEarth4Util16EarthManipulator18isSettingViewpointEv@Base 2.7.0
  _ZNK8osgEarth4Util16EarthManipulator19intersectLookVectorERN3osg5Vec3dES4_S4_@Base 2.6.0
  _ZNK8osgEarth4Util16EarthManipulator21computeCenterRotationERKN3osg5Vec3dE@Base 2.7.0
  _ZNK8osgEarth4Util16EarthManipulator21createLocalCoordFrameERKN3osg5Vec3dERNS2_7MatrixdE@Base 2.4.0
  _ZNK8osgEarth4Util16EarthManipulator21getFusionDistanceModeEv@Base 2.4.0
+ _ZNK8osgEarth4Util16EarthManipulator21getWorldInverseMatrixEv@Base 2.10.0
  _ZNK8osgEarth4Util16EarthManipulator22getFusionDistanceValueEv@Base 2.4.0
- _ZNK8osgEarth4Util16EarthManipulator22getTetherNodeViewpointEv@Base 2.6.0
  _ZNK8osgEarth4Util16EarthManipulator23getCompositeEulerAnglesEPdS2_@Base 2.7.0
  _ZNK8osgEarth4Util16EarthManipulator6Action12getIntOptionEii@Base 2.4.0
  _ZNK8osgEarth4Util16EarthManipulator6Action13getBoolOptionEib@Base 2.4.0
@@ -2158,7 +2189,9 @@
  _ZNK8osgEarth4Util16NightColorFilter25getEntryPointFunctionNameB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth4Util16NightColorFilter7installEPN3osg8StateSetE@Base 2.7.0
  _ZNK8osgEarth4Util16NightColorFilter9getConfigEv@Base 2.7.0
+ _ZNK8osgEarth4Util16SimpleOceanLayer11getSeaLevelEv@Base 2.10.0
  _ZNK8osgEarth4Util16SimpleOceanLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth4Util16SimpleOceanLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth4Util16SimpleOceanLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth4Util16SimpleOceanLayer14getMaxAltitudeEv@Base 2.9.0
  _ZNK8osgEarth4Util16SimpleOceanLayer21modifyTileBoundingBoxERKNS_7TileKeyERN3osg15BoundingBoxImplINS5_5Vec3fEEE@Base 2.9.0
@@ -2166,13 +2199,19 @@
  _ZNK8osgEarth4Util16SimpleOceanLayer8getColorEv@Base 2.9.0
  _ZNK8osgEarth4Util16SimpleOceanLayer9classNameEv@Base 2.9.0
  _ZNK8osgEarth4Util16SimpleOceanLayer9cloneTypeEv@Base 2.9.0
- _ZNK8osgEarth4Util16SimpleOceanLayer9getConfigEv@Base 2.9.0
  _ZNK8osgEarth4Util17ContourMapOptions9getConfigEv@Base 2.8~rc1
+ _ZNK8osgEarth4Util17GeodeticGraticule10CameraData16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
  _ZNK8osgEarth4Util17GeodeticGraticule11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth4Util17GeodeticGraticule12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth4Util17GeodeticGraticule12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth4Util17GeodeticGraticule13getCameraDataEPN3osg6CameraE@Base 2.9.0
  _ZNK8osgEarth4Util17GeodeticGraticule13getViewExtentEPN7osgUtil11CullVisitorE@Base 2.9.0
+ _ZNK8osgEarth4Util17GeodeticGraticule16releaseGLObjectsEPN3osg5StateE@Base 2.10.0
+ _ZNK8osgEarth4Util17GeodeticGraticule19getGridLinesVisibleEv@Base 2.10.0
+ _ZNK8osgEarth4Util17GeodeticGraticule20getEdgeLabelsVisibleEv@Base 2.10.0
+ _ZNK8osgEarth4Util17GeodeticGraticule20getGridLabelsVisibleEv@Base 2.10.0
  _ZNK8osgEarth4Util17GeodeticGraticule5cloneERKN3osg6CopyOpE@Base 2.9.0
+ _ZNK8osgEarth4Util17GeodeticGraticule7getNodeEv@Base 2.10.0
  _ZNK8osgEarth4Util17GeodeticGraticule9classNameEv@Base 2.9.0
  _ZNK8osgEarth4Util17GeodeticGraticule9cloneTypeEv@Base 2.9.0
  _ZNK8osgEarth4Util18LODBlendingOptions9getConfigEv@Base 2.8~rc1
@@ -2180,12 +2219,14 @@
  _ZNK8osgEarth4Util18MeasureToolHandler19getGeoInterpolationEv@Base 2.4.0
  _ZNK8osgEarth4Util18MeasureToolHandler9getIsPathEv@Base 2.4.0
  _ZNK8osgEarth4Util19ContourMapExtension11libraryNameEv@Base 2.8~rc1
+ _ZNK8osgEarth4Util19ContourMapExtension12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth4Util19ContourMapExtension12isSameKindAsEPKN3osg6ObjectE@Base 2.8~rc1
  _ZNK8osgEarth4Util19ContourMapExtension16getConfigOptionsEv@Base 2.8~rc1
  _ZNK8osgEarth4Util19ContourMapExtension5cloneERKN3osg6CopyOpE@Base 2.8~rc1
  _ZNK8osgEarth4Util19ContourMapExtension9classNameEv@Base 2.8~rc1
  _ZNK8osgEarth4Util19ContourMapExtension9cloneTypeEv@Base 2.8~rc1
  _ZNK8osgEarth4Util19MultiElevationLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth4Util19MultiElevationLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth4Util19MultiElevationLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth4Util19MultiElevationLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth4Util19MultiElevationLayer9classNameEv@Base 2.9.0
@@ -2202,6 +2243,7 @@
  _ZNK8osgEarth4Util20MGRSGraticuleOptions9getConfigEv@Base 2.4.0
  _ZNK8osgEarth4Util21FractalElevationLayer10getMappingEPKNS_14LandCoverClassE@Base 2.9.0
  _ZNK8osgEarth4Util21FractalElevationLayer11libraryNameEv@Base 2.9.0
+ _ZNK8osgEarth4Util21FractalElevationLayer12getConfigKeyEv@Base 2.10.0
  _ZNK8osgEarth4Util21FractalElevationLayer12isSameKindAsEPKN3osg6ObjectE@Base 2.9.0
  _ZNK8osgEarth4Util21FractalElevationLayer5cloneERKN3osg6CopyOpE@Base 2.9.0
  _ZNK8osgEarth4Util21FractalElevationLayer9classNameEv@Base 2.9.0
@@ -2228,6 +2270,7 @@
  _ZNK8osgEarth4Util21RadialLineOfSightNode9getCenterEv@Base 2.4.0
  _ZNK8osgEarth4Util21RadialLineOfSightNode9getRadiusEv@Base 2.4.0
  _ZNK8osgEarth4Util22FlatteningLayerOptions9getConfigEv@Base 2.9.0
+ _ZNK8osgEarth4Util22GeodeticLabelingEngine13getResolutionEv@Base 2.10.0
  _ZNK8osgEarth4Util23SimpleOceanLayerOptions9getConfigEv@Base 2.9.0
  _ZNK8osgEarth4Util24GeodeticGraticuleOptions9getConfigEv@Base 2.4.0
  _ZNK8osgEarth4Util24TerrainProfileCalculator10getProfileEv@Base 2.4.0
@@ -2235,6 +2278,7 @@
  _ZNK8osgEarth4Util24TerrainProfileCalculator6getEndEv@Base 2.4.0
  _ZNK8osgEarth4Util24TerrainProfileCalculator8getStartENS_12AltitudeModeE@Base 2.6.0
  _ZNK8osgEarth4Util24TerrainProfileCalculator8getStartEv@Base 2.4.0
+ _ZNK8osgEarth4Util25AttributionControlFactory6createEPNS_7MapNodeE@Base 2.10.0
  _ZNK8osgEarth4Util25MouseCoordsControlFactory6createEPNS_7MapNodeEPN9osgViewer4ViewE@Base 2.4.0
  _ZNK8osgEarth4Util26MultiElevationLayerOptions9getConfigEv@Base 2.9.0
  _ZNK8osgEarth4Util28FractalElevationLayerOptions9getConfigEv@Base 2.9.0
@@ -2249,13 +2293,13 @@
  _ZNK8osgEarth4Util6ArcGIS12RESTResponse11getServicesB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth4Util6ArcGIS12RESTResponse13getServiceURLB5cxx11Ev@Base 2.7.0
  _ZNK8osgEarth4Util6ArcGIS12RESTResponse17getCurrentVersionB5cxx11Ev@Base 2.7.0
- _ZNK8osgEarth4Util6ArcGIS12RESTResponse9getFolderERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERS2_@Base 2.7.0
  _ZNK8osgEarth4Util7GeoCell12computeBoundEv@Base 2.4.0
  _ZNK8osgEarth4Util7HTMNode10PolytopeDP13containsAnyOfERKSt6vectorIN3osg5Vec3dESaIS5_EE@Base 2.5.0
  _ZNK8osgEarth4Util7HTMNode10PolytopeDP8containsERKN3osg5Vec3dE@Base 2.5.0
  _ZNK8osgEarth4Util7HTMNode8Triangle12getMidpointsEPN3osg5Vec3dE@Base 2.5.0
  _ZNK8osgEarth4Util7SkyNode12getEphemerisEv@Base 2.6.0
  _ZNK8osgEarth4Util8Controls11ControlNode12computeBoundEv@Base 2.4.0
+ _ZNK8osgEarth4Util8Controls12ImageControl18calculateImageSizeEv@Base 2.10.0
  _ZNK8osgEarth4Util8Controls4Grid10getNumRowsEv@Base 2.5.0
  _ZNK8osgEarth4Util8Controls4Grid13getNumColumnsEv@Base 2.5.0
  _ZNK8osgEarth4Util8Controls6UVec2f1xERKN3osg5Vec2fE@Base 2.4.0
@@ -2266,52 +2310,50 @@
  _ZNK8osgEarth4Util8Controls6UVec2f8asPixelsERKNS1_14ControlContextE@Base 2.4.0
  _ZNK8osgEarth4Util8Controls7Control10intersectsEff@Base 2.4.0
  _ZNK8osgEarth4Util8Controls7Control15parentIsVisibleEv@Base 2.5.0
+ _ZNK8osgEarth4Util9Ephemeris14getSunPositionERKNS_8DateTimeE@Base 2.10.0
+ _ZNK8osgEarth4Util9Ephemeris15getMoonPositionERKNS_8DateTimeE@Base 2.10.0
  _ZNK8osgEarth4Util9Ephemeris17getECEFfromRADeclEddd@Base 2.6.0
- _ZNK8osgEarth4Util9Ephemeris18getSunPositionECEFERKNS_8DateTimeE@Base 2.6.0
- _ZNK8osgEarth4Util9Ephemeris19getMoonPositionECEFERKNS_8DateTimeE@Base 2.6.0
  _ZNK8osgEarth4Util9GeoObject11getPriorityEv@Base 2.4.0
- _ZNK8osgEarth4Util9SkyDriver10getMapNodeEPKN5osgDB7OptionsE@Base 2.6.0
  _ZNK8osgEarth4Util9SkyDriver13getSkyOptionsEPKN5osgDB7OptionsE@Base 2.6.0
  _ZNK8osgEarth5Angle17asParseableStringB5cxx11Ev@Base 2.7.0
- _ZNK8osgEarth5Layer21modifyTileBoundingBoxERKNS_7TileKeyERN3osg15BoundingBoxImplINS4_5Vec3fEEE@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth6Config11getObjIfSetINS_9Symbology17NumericExpressionEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth6Config11getObjIfSetINS_9Symbology5StyleEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.9.0
+ _ZNK8osgEarth5Layer7getNodeEv@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_3URIEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.1
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_9Symbology17NumericExpressionEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINS_9Symbology5StyleEEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEbRKS7_RNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIbEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
+ (optional=templinst)_ZNK8osgEarth6Config3getIfEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.10.0
  _ZNK8osgEarth6Config5valueERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.7.0
- (optional=templinst|arch=!armel !armhf !hurd-i386 !i386 !m68k !mips !mipsel !powerpc)_ZNK8osgEarth6Config5valueIdEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES2_@Base 2.9.0
- (optional=templinst|arch=!amd64 !arm64 !hppa !mips64el !ppc64el !sparc64)_ZNK8osgEarth6Config5valueIjEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES2_@Base 2.9.0
- _ZNK8osgEarth6Config8childrenERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEbRKS7_RNS_8optionalIT_EE@Base 2.7.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIbEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth6Config8getIfSetIfEEbRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERNS_8optionalIT_EE@Base 2.7.0
+ (optional=templinst)_ZNK8osgEarth6Config5valueIjEET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES2_@Base 2.9.0
+ _ZNK8osgEarth6Config8childrenERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.10.1
  _ZNK8osgEarth7Drivers11GDALOptions9getConfigEv@Base 2.4.0
  _ZNK8osgEarth7Drivers17OGRFeatureOptions9getConfigEv@Base 2.5.0
- (arch=armhf ppc64el)_ZNK8osgEarth9GeoExtent11getCentroidEv@Base 2.9.0
- (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEB5cxx11Ev@Base 2.7.0
+ (arch=armhf)_ZNK8osgEarth9GeoExtent11getCentroidEv@Base 2.9.0
  (optional=templinst)_ZNK8osgEarth9StringifycvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEv@Base 2.9.0
- (optional=templinst|arch=hppa sh4)_ZNKSt15_Deque_iteratorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEERS6_PS6_EmiEi@Base 2.8.0
+ (optional=templinst|arch=hppa sh4 x32)_ZNKSt15_Deque_iteratorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEERS6_PS6_EmiEi@Base 2.8.0
  (optional=templinst|arch=amd64 arm64)_ZNKSt15_Deque_iteratorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEERS6_PS6_EmiEl@Base 2.6.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNKSt15_Deque_iteratorISt6vectorIN5osgGA15GUIEventAdapter9TouchData10TouchPointESaIS4_EERS6_PS6_EplEi@Base 2.4.0
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNKSt15_Deque_iteratorISt6vectorIN5osgGA15GUIEventAdapter9TouchData10TouchPointESaIS4_EERS6_PS6_EplEi@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNKSt15_Deque_iteratorISt6vectorIN5osgGA15GUIEventAdapter9TouchData10TouchPointESaIS4_EERS6_PS6_EplEl@Base 2.7.0
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.6.0
+ (optional=templinst|subst)_ZNSt11_Deque_baseIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE17_M_initialize_mapE{size_t}@Base 2.9.0
+ (optional=templinst|subst)_ZNSt11_Deque_baseINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_initialize_mapE{size_t}@Base 2.9.0
  (optional=templinst)_ZNSt11_Deque_baseIPKN8osgEarth9Symbology8GeometryESaIS4_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt11_Deque_baseIPKN8osgEarth9Symbology8GeometryESaIS4_EED2Ev@Base 2.9.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt15_Deque_iteratorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEERKS6_PS7_EpLEi@Base 2.4.0
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt15_Deque_iteratorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEERKS6_PS7_EpLEi@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt15_Deque_iteratorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEERKS6_PS7_EpLEl@Base 2.4.0
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt15_Deque_iteratorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEERS6_PS6_EpLEi@Base 2.4.0
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt15_Deque_iteratorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEERS6_PS6_EpLEi@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt15_Deque_iteratorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEERS6_PS6_EpLEl@Base 2.4.0
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8osgEarth9GeoExtentESt4lessIS5_ESaISt4pairIKS5_S7_EEEixEOS5_@Base 2.8~rc1
- (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_4listIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaISC_EEESt4lessIS5_ESaISt4pairIKS5_SE_EEEixERSI_@Base 2.9.0
+ (optional=templinst|arch=amd64 i386 mips mipsel powerpc powerpcspe ppc64 s390x)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_4listIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaISC_EEESt4lessIS5_ESaISt4pairIKS5_SE_EEEixERSI_@Base 2.10.0
  (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St4lessIS5_ESaISt4pairIKS5_S5_EEEixEOS5_@Base 2.8~rc1
- (optional=templinst)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE12emplace_backIJS6_EEEvDpOT_@Base 2.8~rc1
- (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE13_M_insert_auxISt15_Deque_iteratorIS6_RKS6_PSB_EEEvSA_IS6_RS6_PS6_ET_SI_j@Base 2.4.0
+ (optional=templinst|arch=!amd64 !arm64 !armel !armhf !m68k !mips !mips64el !mipsel !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sparc64 !x32)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE12emplace_backIJS6_EEEvDpOT_@Base 2.8~rc1
+ (optional=templinst|arch=armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4 x32)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE13_M_insert_auxISt15_Deque_iteratorIS6_RKS6_PSB_EEEvSA_IS6_RS6_PS6_ET_SI_j@Base 2.4.0
  (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE13_M_insert_auxISt15_Deque_iteratorIS6_RKS6_PSB_EEEvSA_IS6_RS6_PS6_ET_SI_m@Base 2.4.0
  (optional=templinst|subst)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE17_M_reallocate_mapE{size_t}b@Base 2.4.0
- (optional=templinst)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE19_M_destroy_data_auxESt15_Deque_iteratorIS6_RS6_PS6_ESC_@Base 2.7.0
- (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE19_M_range_insert_auxISt15_Deque_iteratorIS6_RKS6_PSB_EEEvSA_IS6_RS6_PS6_ET_SI_St20forward_iterator_tag@Base 2.4.0
  (optional=templinst|subst)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE23_M_new_elements_at_backE{size_t}@Base 2.4.0
  (optional=templinst|subst)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE24_M_new_elements_at_frontE{size_t}@Base 2.4.0
- (optional=templinst|arch=!hurd-i386 !i386)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EEaSERKS8_@Base 2.4.0
- (optional=templinst)_ZNSt5dequeISt6vectorIN5osgGA15GUIEventAdapter9TouchData10TouchPointESaIS4_EESaIS6_EE16_M_push_back_auxIJS6_EEEvDpOT_@Base 2.8~rc1
+ (optional=templinst)_ZNSt5dequeIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EEaSERKS8_@Base 2.4.0
+ (optional=templinst)_ZNSt5dequeISt6vectorIN5osgGA15GUIEventAdapter9TouchData10TouchPointESaIS4_EESaIS6_EE16_M_push_back_auxIJS6_EEEvDpOT_@Base 2.10.1
  (optional=templinst)_ZNSt5dequeISt6vectorIN5osgGA15GUIEventAdapter9TouchData10TouchPointESaIS4_EESaIS6_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt5dequeISt6vectorIN5osgGA15GUIEventAdapter9TouchData10TouchPointESaIS4_EESaIS6_EED2Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg15BoundingBoxImplINS0_5Vec3fEEESaIS3_EE17_M_realloc_insertIJRKS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
@@ -2324,14 +2366,17 @@
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3dESaIS1_EE9push_backERKS1_@Base 2.4.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveEj@Base 2.7.0
+ (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe x32)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveEj@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec3fESaIS1_EE7reserveEm@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE{size_t}RKS1_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sh4 !sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE7reserveEj@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 mips64el ppc64 ppc64el s390x sparc64)_ZNSt6vectorIN3osg5Vec4fESaIS1_EE7reserveEm@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7MatrixdESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10Annotation9LabelNodeEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10Annotation9LabelNodeEEESaIS5_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10Annotation9LabelNodeEEESaIS5_EED2Ev@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10Annotation9PlaceNodeEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10ImageLayerEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10ImageLayerEEESaIS4_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth10ImageLayerEEESaIS4_EED2Ev@Base 2.9.0
@@ -2343,9 +2388,6 @@
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth4Util15MouseCoordsTool8CallbackEEESaIS6_EE17_M_realloc_insertIJS6_EEEvN9__gnu_cxx17__normal_iteratorIPS6_S8_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth4Util15MouseCoordsTool8CallbackEEESaIS6_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth4Util15MouseCoordsTool8CallbackEEESaIS6_EED2Ev@Base 2.4.0
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth4Util22AnnotationEventHandlerEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth4Util22AnnotationEventHandlerEEESaIS5_EED1Ev@Base 2.4.0
- (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth4Util22AnnotationEventHandlerEEESaIS5_EED2Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEESaIS6_EE17_M_realloc_insertIJS6_EEEvN9__gnu_cxx17__normal_iteratorIPS6_S8_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth4Util8WMSLayerEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth7XmlNodeEEESaIS4_EE12emplace_backIJS4_EEEvDpOT_@Base 2.8~rc1
@@ -2353,26 +2395,40 @@
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth7XmlNodeEEESaIS4_EED1Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth7XmlNodeEEESaIS4_EED2Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrIN8osgEarth9Symbology8GeometryEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_4NodeEEESaIS3_EE17_M_realloc_insertIJRKS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_4NodeEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_4NodeEEESaIS3_EED1Ev@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_4NodeEEESaIS3_EED2Ev@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_5ImageEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN3osg7ref_ptrINS0_6CameraEEESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN5osgGA15GUIEventAdapter9TouchData10TouchPointESaIS3_EE17_M_realloc_insertIJRKS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst|subst)_ZNSt6vectorIN7osgText8TextBase18AutoTransformCacheESaIS2_EE17_M_default_appendE{size_t}@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorIN8osgEarth10DataExtentESaIS1_EE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPKS1_S3_EEEEvNS6_IPS1_S3_EET_SC_St20forward_iterator_tag@Base 2.8~rc1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth10DataExtentESaIS1_EE12emplace_backIJS1_EEEvDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth10DataExtentESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13ConfigOptionsESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13ConfigOptionsESaIS1_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13ConfigOptionsESaIS1_EED2Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13ConfigOptionsESaIS1_EEaSERKS3_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_4Util15FlatteningLayerENS0_8Features18FeatureSourceLayerEE5EntryESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_4Util15FlatteningLayerENS0_8Features18FeatureSourceLayerEE5EntryESaIS7_EED1Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_4Util15FlatteningLayerENS0_8Features18FeatureSourceLayerEE5EntryESaIS7_EED2Ev@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_4Util15FlatteningLayerENS0_8Features18FeatureSourceLayerEE5EntryESaIS7_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_4Util15FlatteningLayerENS0_8Features18FeatureSourceLayerEE5EntryESaIS7_EED2Ev@Base 2.10.1
  (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_4Util16SimpleOceanLayerEKNS0_10ImageLayerEE5EntryESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_4Util16SimpleOceanLayerEKNS0_10ImageLayerEE5EntryESaIS7_EED1Ev@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth13LayerListenerINS0_4Util16SimpleOceanLayerEKNS0_10ImageLayerEE5EntryESaIS7_EED2Ev@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7SamplerESaIS2_EEaSERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED1Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EED2Ev@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth13ShaderOptions7UniformESaIS2_EEaSERKS4_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth3URIESaIS1_EEaSERKS3_@Base 2.10.1
+ (optional=templinst)_ZNSt6vectorIN8osgEarth4Util11ClusterNode7ClusterESaIS3_EE17_M_realloc_insertIJRKS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth4Util11ClusterNode7ClusterESaIS3_EED1Ev@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth4Util11ClusterNode7ClusterESaIS3_EED2Ev@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth4Util16EarthManipulator10TouchEventESaIS3_EE12emplace_backIJS3_EEEvDpOT_@Base 2.8~rc1
- (optional=templinst|arch=!amd64 !arm64)_ZNSt6vectorIN8osgEarth4Util16EarthManipulator10TouchEventESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 armel armhf powerpc)_ZNSt6vectorIN8osgEarth4Util16EarthManipulator12ActionOptionESaIS3_EE12emplace_backIJS3_EEEvDpOT_@Base 2.9.0
- (optional=templinst|arch=!amd64 !arm64)_ZNSt6vectorIN8osgEarth4Util16EarthManipulator12ActionOptionESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIN8osgEarth4Util16EarthManipulator10TouchEventESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
+ (optional=templinst|arch=ppc64 ppc64el s390x x32)_ZNSt6vectorIN8osgEarth4Util16EarthManipulator12ActionOptionESaIS3_EE12emplace_backIJS3_EEEvDpOT_@Base 2.10.0
+ (optional=templinst|arch=!x32)_ZNSt6vectorIN8osgEarth4Util16EarthManipulator12ActionOptionESaIS3_EE17_M_realloc_insertIJS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth4Util16EarthManipulator12ActionOptionESaIS3_EEaSERKS5_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth4Util3TMS7TileSetESaIS3_EE17_M_realloc_insertIJRKS3_EEEvN9__gnu_cxx17__normal_iteratorIPS3_S5_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth4Util8WMSStyleESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
@@ -2383,11 +2439,10 @@
  (optional=templinst)_ZNSt6vectorIN8osgEarth7TileKeyESaIS1_EED2Ev@Base 2.4.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth9GeoExtentESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIN8osgEarth9TileImageESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE12emplace_backIJS5_EEEvDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=!amd64 !arm64)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=arm64 sh4)_ZNSt6vectorIPN3osg4NodeESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIPN3osg4NodeESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EERS7_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPN7osgUtil9RenderBinESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIPN8osgEarth4Util8Controls7ControlESaIS4_EE17_M_realloc_insertIJRKS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIS_IPN3osg4NodeESaIS2_EESaIS4_EE17_M_realloc_insertIJRKS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.9.0
@@ -2396,23 +2451,18 @@
  (optional=templinst)_ZNSt6vectorISt23_Rb_tree_const_iteratorIN8osgEarth4Util13TopologyGraph6VertexEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorISt4pairIN8osgEarth9Symbology17NumericExpression2OpEdESaIS5_EEaSERKS7_@Base 2.4.0
  (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEjESaIS7_EEaSERKS9_@Base 2.7.0
- (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraEN8osgEarth4Util17UTMLabelingEngine10CameraDataEESaIS8_EE17_M_realloc_insertIJS8_EEEvN9__gnu_cxx17__normal_iteratorIPS8_SA_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraEN8osgEarth4Util17UTMLabelingEngine10CameraDataEESaIS8_EED1Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraEN8osgEarth4Util17UTMLabelingEngine10CameraDataEESaIS8_EED2Ev@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraEN8osgEarth4Util8Controls11ControlNode16TravSpecificDataEESaIS9_EE17_M_realloc_insertIJS9_EEEvN9__gnu_cxx17__normal_iteratorIPS9_SB_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraEN8osgEarth4Util8Controls11ControlNode16TravSpecificDataEESaIS9_EED1Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraEN8osgEarth4Util8Controls11ControlNode16TravSpecificDataEESaIS9_EED2Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraENS1_7ref_ptrINS1_12CullSettings29ClampProjectionMatrixCallbackEEEESaIS8_EE17_M_realloc_insertIJS8_EEEvN9__gnu_cxx17__normal_iteratorIPS8_SA_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraENS1_7ref_ptrINS1_12CullSettings29ClampProjectionMatrixCallbackEEEESaIS8_EED1Ev@Base 2.8~rc1
- (optional=templinst)_ZNSt6vectorISt4pairIPN3osg6CameraENS1_7ref_ptrINS1_12CullSettings29ClampProjectionMatrixCallbackEEEESaIS8_EED2Ev@Base 2.8~rc1
- (optional=templinst|arch=!amd64 !arm64)_ZNSt6vectorISt4pairIddESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorISt4pairIddESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.9.0
+ (optional=templinst|arch=mips64el sparc64)_ZNSt6vectorISt4pairIiiESaIS1_EE12emplace_backIJS1_EEEvDpOT_@Base 2.10.0
+ (optional=templinst)_ZNSt6vectorISt4pairIiiESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIdSaIdEE12emplace_backIJdEEEvDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertIJRKdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_@Base 2.9.0
- (optional=templinst)_ZNSt6vectorIfSaIfEE12emplace_backIJfEEEvDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertIJdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_@Base 2.10.1
  (optional=templinst|subst)_ZNSt6vectorIfSaIfEE14_M_fill_assignE{size_t}RKf@Base 2.4.0
+ (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertIJfEEEvN9__gnu_cxx17__normal_iteratorIPfS1_EEDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt6vectorIhSaIhEE17_M_realloc_insertIJRKhEEEvN9__gnu_cxx17__normal_iteratorIPhS1_EEDpOT_@Base 2.9.0
- (optional=templinst|arch=amd64 m68k)_ZNSt6vectorIhSaIhEE9push_backERKh@Base 2.9.0
+ (optional=templinst|arch=m68k)_ZNSt6vectorIhSaIhEE9push_backERKh@Base 2.10.0
  (optional=templinst)_ZNSt6vectorIjSaIjEE17_M_realloc_insertIJRKjEEEvN9__gnu_cxx17__normal_iteratorIPjS1_EEDpOT_@Base 2.9.0
+ (optional=templinst)_ZNSt6vectorImSaImEE17_M_realloc_insertIJRKmEEEvN9__gnu_cxx17__normal_iteratorIPmS1_EEDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN3osg12observer_ptrIN8osgEarth4Util24TerrainProfileCalculator15ChangedCallbackEEESaIS7_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN3osg7ref_ptrIN8osgEarth4Util18LOSChangedCallbackEEESaIS6_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN3osg7ref_ptrIN8osgEarth4Util18MeasureToolHandler23MeasureToolEventHandlerEEESaIS7_EE8_M_clearEv@Base 2.7.0
@@ -2420,87 +2470,108 @@
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaIS6_EE8_M_clearEv@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN8osgEarth4Util9RTTPicker11PickContextESaIS4_EE8_M_clearEv@Base 2.9.0
  (optional=templinst)_ZNSt7__cxx1110_List_baseIN8osgEarth6ConfigESaIS2_EE8_M_clearEv@Base 2.7.0
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairIPN3osg6CameraEN8osgEarth4Util23GraticuleLabelingEngine10CameraDataEESaIS9_EE8_M_clearEv@Base 2.10.0
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairIPN3osg6CameraEN8osgEarth4Util8Controls11ControlNode16TravSpecificDataEESaISA_EE8_M_clearEv@Base 2.10.0
+ (optional=templinst)_ZNSt7__cxx1110_List_baseISt4pairIPN3osg6CameraENS2_7ref_ptrINS2_12CullSettings29ClampProjectionMatrixCallbackEEEESaIS9_EE8_M_clearEv@Base 2.10.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.7.0
- (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE18_M_assign_dispatchISt20_List_const_iteratorIS2_EEEvT_S8_St12__false_type@Base 2.8~rc1
  (optional=templinst|arch=hurd-i386)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EE9push_backERKS2_@Base 2.9.0
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC1ERKS4_@Base 2.7.0
  (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEC2ERKS4_@Base 2.7.0
+ (optional=templinst)_ZNSt7__cxx114listIN8osgEarth6ConfigESaIS2_EEaSERKS4_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN3osg12observer_ptrIN5osgGA15GUIEventHandlerEEESt4pairIKS4_NS1_IN9osgViewer4ViewEEEESt10_Select1stISA_ESt4lessIS4_ESaISA_EE8_M_eraseEPSt13_Rb_tree_nodeISA_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIN7osgUtil22LineSegmentIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.4.0
- (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth20PrimitiveIntersector12IntersectionES2_St9_IdentityIS2_ESt4lessIS2_ESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.5.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth4Util13TopologyGraph6VertexES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE24_M_get_insert_unique_posERKS3_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth4Util13TopologyGraph6VertexES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE8_M_eraseEPSt13_Rb_tree_nodeIS3_E@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth4Util16EarthManipulator9InputSpecESt4pairIKS3_NS2_6ActionEESt10_Select1stIS7_ESt4lessIS3_ESaIS7_EE24_M_get_insert_unique_posERS5_@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIN8osgEarth4Util16EarthManipulator9InputSpecESt4pairIKS3_NS2_6ActionEESt10_Select1stIS7_ESt4lessIS3_ESaIS7_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS7_ERS5_@Base 2.4.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth4Util16EarthManipulator9InputSpecESt4pairIKS3_NS2_6ActionEESt10_Select1stIS7_ESt4lessIS3_ESaIS7_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS7_ERS5_@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth4Util16EarthManipulator9InputSpecESt4pairIKS3_NS2_6ActionEESt10_Select1stIS7_ESt4lessIS3_ESaIS7_EE7_M_copyINSD_11_Alloc_nodeEEEPSt13_Rb_tree_nodeIS7_EPKSH_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth4Util16EarthManipulator9InputSpecESt4pairIKS3_NS2_6ActionEESt10_Select1stIS7_ESt4lessIS3_ESaIS7_EE8_M_eraseEPSt13_Rb_tree_nodeIS7_E@Base 2.4.0
- (optional=templinst|arch=!alpha !hurd-i386 !i386 !mips !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIRKS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 2.9.0
- (optional=templinst|arch=!alpha !hurd-i386 !i386 !mips !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 2.9.0
- (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE24_M_get_insert_unique_posERKS1_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIRKS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE16_M_insert_uniqueIS1_EESt4pairISt17_Rb_tree_iteratorIS1_EbEOT_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE24_M_get_insert_unique_posERKS1_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIN8osgEarth7TileKeyES1_St9_IdentityIS1_ESt4lessIS1_ESaIS1_EE8_M_eraseEPSt13_Rb_tree_nodeIS1_E@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE7_M_copyINSB_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS5_EPKSF_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EEaSERKSB_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIKN8osgEarth16SpatialReferenceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESP_IJEEEEESt17_Rb_tree_iteratorISE_ESt23_Rb_tree_const_iteratorISE_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIKN8osgEarth16SpatialReferenceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIKN8osgEarth16SpatialReferenceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISE_ERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrIKN8osgEarth16SpatialReferenceEEEESt10_Select1stISE_ESt4lessIS5_ESaISE_EE8_M_eraseEPSt13_Rb_tree_nodeISE_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESN_IJEEEEESt17_Rb_tree_iteratorISC_ESt23_Rb_tree_const_iteratorISC_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE7_M_copyINSI_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeISC_EPKSM_PSt18_Rb_tree_node_baseRT_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N3osg7ref_ptrINS8_10ReferencedEEEESt10_Select1stISC_ESt4lessIS5_ESaISC_EEaSERKSI_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth4Util37FractalElevationLayerLandCoverMappingEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESM_IJEEEEESt17_Rb_tree_iteratorISB_ESt23_Rb_tree_const_iteratorISB_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth4Util37FractalElevationLayerLandCoverMappingEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE24_M_get_insert_unique_posERS7_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth4Util37FractalElevationLayerLandCoverMappingEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISB_ERS7_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth4Util37FractalElevationLayerLandCoverMappingEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISB_ERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth4Util37FractalElevationLayerLandCoverMappingEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE7_M_copyINSH_11_Alloc_nodeEEEPSt13_Rb_tree_nodeISB_EPKSL_PSt18_Rb_tree_node_baseRT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth4Util37FractalElevationLayerLandCoverMappingEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9GeoExtentEESt10_Select1stISA_ESt4lessIS5_ESaISA_EE11equal_rangeERS7_@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9GeoExtentEESt10_Select1stISA_ESt4lessIS5_ESaISA_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOS5_EESL_IJEEEEESt17_Rb_tree_iteratorISA_ESt23_Rb_tree_const_iteratorISA_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9GeoExtentEESt10_Select1stISA_ESt4lessIS5_ESaISA_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9GeoExtentEESt10_Select1stISA_ESt4lessIS5_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9GeoExtentEESt10_Select1stISA_ESt4lessIS5_ESaISA_EE5eraseERS7_@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_N8osgEarth9GeoExtentEESt10_Select1stISA_ESt4lessIS5_ESaISA_EE8_M_eraseEPSt13_Rb_tree_nodeISA_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_NS0_4listIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaISE_EEEESt10_Select1stISH_ESt4lessIS5_ESaISH_EE24_M_get_insert_unique_posERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_NS0_4listIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaISE_EEEESt10_Select1stISH_ESt4lessIS5_ESaISH_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISH_ERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_NS0_4listIN3osg7ref_ptrIN8osgEarth8Features7FeatureEEESaISE_EEEESt10_Select1stISH_ESt4lessIS5_ESaISH_EE8_M_eraseEPSt13_Rb_tree_nodeISH_E@Base 2.9.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESK_IJEEEEESt17_Rb_tree_iteratorIS9_ESt23_Rb_tree_const_iteratorIS9_EDpOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE4findERS7_@Base 2.8~rc1
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PvESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE24_M_get_insert_unique_posERS7_@Base 2.7.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.7.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE7_M_copyINSE_20_Reuse_or_alloc_nodeEEEPSt13_Rb_tree_nodeIS8_EPKSI_PSt18_Rb_tree_node_baseRT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.7.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EEaSERKSE_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_bESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.7.0
  (optional=templinst)_ZNSt8_Rb_treeIPKN3osg8StateSetESt4pairIKS3_NS0_7ref_ptrIN7osgUtil10StateGraphEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE24_M_get_insert_unique_posERS5_@Base 2.7.0
  (optional=templinst|arch=!alpha !armel !armhf !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !ppc64 !s390x)_ZNSt8_Rb_treeIPKN3osg8StateSetESt4pairIKS3_NS0_7ref_ptrIN7osgUtil10StateGraphEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS5_@Base 2.6.0
  (optional=templinst)_ZNSt8_Rb_treeIPKN3osg8StateSetESt4pairIKS3_NS0_7ref_ptrIN7osgUtil10StateGraphEEEESt10_Select1stISA_ESt4lessIS3_ESaISA_EE8_M_eraseEPSt13_Rb_tree_nodeISA_E@Base 2.6.0
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg6CameraESt4pairIKS2_N8osgEarth4Util17GeodeticGraticule10CameraDataEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE24_M_get_insert_unique_posERS4_@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIPN3osg6CameraESt4pairIKS2_N8osgEarth4Util17GeodeticGraticule10CameraDataEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS4_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 hppa m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIPN3osg6CameraESt4pairIKS2_N8osgEarth4Util17GeodeticGraticule10CameraDataEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS4_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIPN3osg6CameraESt4pairIKS2_N8osgEarth4Util17GeodeticGraticule10CameraDataEESt10_Select1stIS9_ESt4lessIS2_ESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E@Base 2.9.0
  (optional=templinst|arch=!alpha !armel !armhf !hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !ppc64 !s390x)_ZNSt8_Rb_treeIPN7osgUtil9Optimizer19TextureAtlasBuilder6SourceESt4pairIKS4_PN8osgEarth9Symbology12SkinResourceEESt10_Select1stISB_ESt4lessIS4_ESaISB_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISB_ERS6_@Base 2.6.0
  (optional=templinst)_ZNSt8_Rb_treeIPN7osgUtil9Optimizer19TextureAtlasBuilder6SourceESt4pairIKS4_PN8osgEarth9Symbology12SkinResourceEESt10_Select1stISB_ESt4lessIS4_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E@Base 2.6.0
- (optional=templinst)_ZNSt8_Rb_treeIPN8osgEarth10Annotation14AnnotationNodeES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE16_M_insert_uniqueIRKS3_EESt4pairISt17_Rb_tree_iteratorIS3_EbEOT_@Base 2.8~rc1
- (optional=templinst)_ZNSt8_Rb_treeIPN8osgEarth10Annotation14AnnotationNodeES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE5eraseERKS3_@Base 2.4.0
- (optional=templinst)_ZNSt8_Rb_treeIPN8osgEarth10Annotation14AnnotationNodeES3_St9_IdentityIS3_ESt4lessIS3_ESaIS3_EE8_M_eraseEPSt13_Rb_tree_nodeIS3_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIPN8osgEarth4Util8Controls11ControlNodeESt4pairIKS4_PN3osg15MatrixTransformEESt10_Select1stISA_ESt4lessIS4_ESaISA_EE24_M_get_insert_unique_posERS6_@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZNSt8_Rb_treeIPN8osgEarth4Util8Controls11ControlNodeESt4pairIKS4_PN3osg15MatrixTransformEESt10_Select1stISA_ESt4lessIS4_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS6_@Base 2.4.0
+ (optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64 x32)_ZNSt8_Rb_treeIPN8osgEarth4Util8Controls11ControlNodeESt4pairIKS4_PN3osg15MatrixTransformEESt10_Select1stISA_ESt4lessIS4_ESaISA_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISA_ERS6_@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIPN8osgEarth4Util8Controls11ControlNodeESt4pairIKS4_PN3osg15MatrixTransformEESt10_Select1stISA_ESt4lessIS4_ESaISA_EE5eraseERS6_@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIPN8osgEarth4Util8Controls11ControlNodeESt4pairIKS4_PN3osg15MatrixTransformEESt10_Select1stISA_ESt4lessIS4_ESaISA_EE8_M_eraseEPSt13_Rb_tree_nodeISA_E@Base 2.4.0
- (optional=templinst)_ZNSt8_Rb_treeIPN8osgEarth4Util8Controls7ControlESt4pairIKS4_St17_Rb_tree_iteratorIS5_IKfN3osg7ref_ptrINS2_11ControlNodeEEEEEESt10_Select1stISF_ESt4lessIS4_ESaISF_EE16_M_insert_uniqueIS5_IS4_SE_EEES5_IS7_ISF_EbEOT_@Base 2.8~rc1
+ (optional=templinst)_ZNSt8_Rb_treeIPN8osgEarth4Util8Controls7ControlESt4pairIKS4_St17_Rb_tree_iteratorIS5_IKfN3osg7ref_ptrINS2_11ControlNodeEEEEEESt10_Select1stISF_ESt4lessIS4_ESaISF_EE17_M_emplace_uniqueIJS5_IS4_SE_EEEES5_IS7_ISF_EbEDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIPN8osgEarth4Util8Controls7ControlESt4pairIKS4_St17_Rb_tree_iteratorIS5_IKfN3osg7ref_ptrINS2_11ControlNodeEEEEEESt10_Select1stISF_ESt4lessIS4_ESaISF_EE8_M_eraseEPSt13_Rb_tree_nodeISF_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeISt23_Rb_tree_const_iteratorIN8osgEarth4Util13TopologyGraph6VertexEES5_St9_IdentityIS5_ENS3_9IndexLessESaIS5_EE16_M_insert_uniqueIRKS5_EESt4pairISt17_Rb_tree_iteratorIS5_EbEOT_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeISt23_Rb_tree_const_iteratorIN8osgEarth4Util13TopologyGraph6VertexEES5_St9_IdentityIS5_ENS3_9IndexLessESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeISt23_Rb_tree_const_iteratorIN8osgEarth4Util13TopologyGraph6VertexEESt4pairIKS5_St3setIS5_NS3_9IndexLessESaIS5_EEESt10_Select1stISC_ES9_SaISC_EE24_M_get_insert_unique_posERS7_@Base 2.9.0
+ (optional=templinst|arch=amd64 arm64 m68k mips64el ppc64el sparc64 x32)_ZNSt8_Rb_treeISt23_Rb_tree_const_iteratorIN8osgEarth4Util13TopologyGraph6VertexEESt4pairIKS5_St3setIS5_NS3_9IndexLessESaIS5_EEESt10_Select1stISC_ES9_SaISC_EE29_M_get_insert_hint_unique_posES0_ISC_ERS7_@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeISt23_Rb_tree_const_iteratorIN8osgEarth4Util13TopologyGraph6VertexEESt4pairIKS5_St3setIS5_NS3_9IndexLessESaIS5_EEESt10_Select1stISC_ES9_SaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 2.9.0
  (optional=templinst)_ZNSt8_Rb_treeIcSt4pairIKcbESt10_Select1stIS2_ESt4lessIcESaIS2_EE8_M_eraseEPSt13_Rb_tree_nodeIS2_E@Base 2.4.0
- (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt8_Rb_treeIfSt4pairIKfN3osg7ref_ptrIN8osgEarth4Util8Controls11ControlNodeEEEESt10_Select1stIS9_ESt4lessIfESaIS9_EE15_M_insert_equalIS0_IfS8_EEESt17_Rb_tree_iteratorIS9_EOT_@Base 2.8~rc2
+ (optional=templinst|arch=i386)_ZNSt8_Rb_treeIfSt4pairIKfN3osg7ref_ptrIN8osgEarth4Util8Controls11ControlNodeEEEESt10_Select1stIS9_ESt4lessIfESaIS9_EE16_M_emplace_equalIJS0_IfS8_EEEESt17_Rb_tree_iteratorIS9_EDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN3osg7ref_ptrIN8osgEarth4Util8Controls11ControlNodeEEEESt10_Select1stIS9_ESt4lessIfESaIS9_EE8_M_eraseEPSt13_Rb_tree_nodeIS9_E@Base 2.4.0
- (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZNSt8_Rb_treeIfSt4pairIKfN3osg7ref_ptrIN8osgEarth4Util9GeoObjectEEEESt10_Select1stIS8_ESt4lessIfESaIS8_EE15_M_insert_equalIS0_IfPS6_EEESt17_Rb_tree_iteratorIS8_EOT_@Base 2.8~rc2
+ (optional=templinst|arch=i386)_ZNSt8_Rb_treeIfSt4pairIKfN3osg7ref_ptrIN8osgEarth4Util9GeoObjectEEEESt10_Select1stIS8_ESt4lessIfESaIS8_EE16_M_emplace_equalIJS0_IfPS6_EEEESt17_Rb_tree_iteratorIS8_EDpOT_@Base 2.10.0
  (optional=templinst)_ZNSt8_Rb_treeIfSt4pairIKfN3osg7ref_ptrIN8osgEarth4Util9GeoObjectEEEESt10_Select1stIS8_ESt4lessIfESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.4.0
  (optional=templinst)_ZNSt8_Rb_treeIjSt4pairIKjSt23_Rb_tree_const_iteratorIN8osgEarth4Util13TopologyGraph6VertexEEESt10_Select1stIS8_ESt4lessIjESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E@Base 2.9.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt8_Rb_treeIjjSt9_IdentityIjESt4lessIjESaIjEE16_M_insert_uniqueIRKjEESt4pairISt17_Rb_tree_iteratorIjEbEOT_@Base 2.10.0
+ (optional=templinst)_ZNSt8_Rb_treeIjjSt9_IdentityIjESt4lessIjESaIjEE8_M_eraseEPSt13_Rb_tree_nodeIjE@Base 2.10.0
+ (optional=templinst)_ZSt11__make_heapIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrINS2_4NodeEEESt6vectorIS5_SaIS5_EEEENS0_5__ops15_Iter_comp_iterIPFbRKS5_SE_EEEEvT_SI_RT0_@Base 2.10.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrINS2_4NodeEEESt6vectorIS5_SaIS5_EEEEiS5_NS0_5__ops15_Iter_comp_iterIPFbRKS5_SE_EEEEvT_T0_SJ_T1_T2_@Base 2.10.0
+ (optional=templinst)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrINS2_4NodeEEESt6vectorIS5_SaIS5_EEEElS5_NS0_5__ops15_Iter_comp_iterIPFbRKS5_SE_EEEEvT_T0_SJ_T1_T2_@Base 2.10.0
+ (optional=templinst)_ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrINS2_4NodeEEESt6vectorIS5_SaIS5_EEEENS0_5__ops15_Iter_comp_iterIPFbRKS5_SE_EEEEvT_SI_T0_@Base 2.10.0
+ (optional=templinst|arch=!amd64 !arm64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrINS2_4NodeEEESt6vectorIS5_SaIS5_EEEEiNS0_5__ops15_Iter_comp_iterIPFbRKS5_SE_EEEEvT_SI_T0_T1_@Base 2.10.0
+ (optional=templinst)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrINS2_4NodeEEESt6vectorIS5_SaIS5_EEEElNS0_5__ops15_Iter_comp_iterIPFbRKS5_SE_EEEEvT_SI_T0_T1_@Base 2.10.0
  (optional=templinst|arch=ia64)_ZSt22__uninitialized_move_aIPN8osgEarth4Util3TMS7TileSetES4_SaIS3_EET0_T_S7_S6_RT1_@Base 2.4.0
+ (optional=templinst)_ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPN3osg7ref_ptrINS2_4NodeEEESt6vectorIS5_SaIS5_EEEENS0_5__ops14_Val_comp_iterIPFbRKS5_SE_EEEEvT_T0_@Base 2.10.0
  (optional=templinst)_ZSt4copyIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEEESt15_Deque_iteratorIT_RS8_PS8_ES7_IS8_RKS8_PSC_ESF_SB_@Base 2.9.0
  (optional=templinst|arch=hurd-i386 i386 kfreebsd-i386)_ZSt8_DestroyISt15_Deque_iteratorIN3osg7ref_ptrIN8osgEarth4Util8Controls7ControlEEERS7_PS7_EEvT_SB_@Base 2.4.0
- (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 m68k mips64el ppc64el sh4 sparc64)_ZSt9__find_ifIN9__gnu_cxx17__normal_iteratorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS7_SaIS7_EEEENS0_5__ops16_Iter_equals_valIS8_EEET_SH_SH_T0_St26random_access_iterator_tag@Base 2.7.0
- (optional=templinst|arch=!alpha !hurd-i386 !i386 !mips !mipsel !powerpc !ppc64 !s390x)_ZSt9__find_ifIN9__gnu_cxx17__normal_iteratorIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS7_SaIS7_EEEENS0_5__ops16_Iter_equals_valIKS7_EEET_SH_SH_T0_St26random_access_iterator_tag@Base 2.9.0
- (optional=templinst|arch=amd64 arm64 armel armhf kfreebsd-i386 powerpc powerpcspe)_ZSteqIcEN9__gnu_cxx11__enable_ifIXsrSt9__is_charIT_E7__valueEbE6__typeERKNSt7__cxx1112basic_stringIS3_St11char_traitsIS3_ESaIS3_EEESE_@Base 2.7.0
+ (optional=templinst)_ZSteqIcEN9__gnu_cxx11__enable_ifIXsrSt9__is_charIT_E7__valueEbE6__typeERKNSt7__cxx1112basic_stringIS3_St11char_traitsIS3_ESaIS3_EEESE_@Base 2.10.1
  _ZTI11FeatureTile@Base 2.4.0
  _ZTI17AddFeatureVisitor@Base 2.4.0
+ _ZTI17AttributeCallback@Base 2.10.0
  _ZTI18FeatureTileVisitor@Base 2.4.0
  _ZTI20LODBlendingExtension@Base 2.8~rc1
  _ZTI20WriteFeaturesVisitor@Base 2.4.0
@@ -2521,7 +2592,6 @@
  _ZTIN3osg5Vec4fE@Base 2.4.0
  _ZTIN3osg8CallbackE@Base 2.8~rc1
  _ZTIN5osgDB7OptionsE@Base 2.7.0
- _ZTIN5osgGA5EventE@Base 2.8~rc1
  _ZTIN7osgUtil10StateGraphE@Base 2.6.0
  _ZTIN7osgUtil11IntersectorE@Base 2.4.0
  _ZTIN8osgEarth10Annotation7Dragger23PositionChangedCallbackE@Base 2.7.0
@@ -2548,7 +2618,7 @@
  _ZTIN8osgEarth14GeoHeightFieldE@Base 2.4.0
  _ZTIN8osgEarth15MapNodeObserverE@Base 2.4.0
  _ZTIN8osgEarth15TerrainCallbackE@Base 2.4.0
- _ZTIN8osgEarth16PerObjectFastMapIPN3osg6CameraENS_4Util17UTMLabelingEngine10CameraDataEE7FunctorE@Base 2.9.0
+ _ZTIN8osgEarth16PerObjectFastMapIPN3osg6CameraENS_4Util23GraticuleLabelingEngine10CameraDataEE7FunctorE@Base 2.10.0
  _ZTIN8osgEarth16qualified_doubleINS_5AngleEEE@Base 2.7.0
  _ZTIN8osgEarth16qualified_doubleINS_8DistanceEEE@Base 2.7.0
  _ZTIN8osgEarth16qualified_doubleINS_8DurationEEE@Base 2.7.0
@@ -2556,7 +2626,6 @@
  _ZTIN8osgEarth18ExtensionInterfaceIN3osg4ViewEEE@Base 2.7.0
  _ZTIN8osgEarth18ExtensionInterfaceINS_4Util8Controls7ControlEEE@Base 2.7.0
  _ZTIN8osgEarth18ExtensionInterfaceINS_7MapNodeEEE@Base 2.7.0
- _ZTIN8osgEarth18IntersectionPickerE@Base 2.7.0
  _ZTIN8osgEarth19LandCoverDictionaryE@Base 2.9.0
  _ZTIN8osgEarth28ColorFilterRegistrationProxyINS_4Util14HSLColorFilterEEE@Base 2.4.0
  _ZTIN8osgEarth28ColorFilterRegistrationProxyINS_4Util14RGBColorFilterEEE@Base 2.4.0
@@ -2571,7 +2640,7 @@
  _ZTIN8osgEarth3URIE@Base 2.4.0
  _ZTIN8osgEarth4Util10ContourMapE@Base 2.5.0
  _ZTIN8osgEarth4Util10SkyOptionsE@Base 2.6.0
- _ZTIN8osgEarth4Util11DataScannerE@Base 2.4.0
+ _ZTIN8osgEarth4Util11ClusterNodeE@Base 2.10.0
  _ZTIN8osgEarth4Util11FogCallbackE@Base 2.8~rc1
  _ZTIN8osgEarth4Util11LODBlendingE@Base 2.5.0
  _ZTIN8osgEarth4Util11SimplePager15ProgressTrackerE@Base 2.8~rc1
@@ -2609,9 +2678,9 @@
  _ZTIN8osgEarth4Util16SimpleOceanLayerE@Base 2.9.0
  _ZTIN8osgEarth4Util16TileIndexBuilderE@Base 2.5.0
  _ZTIN8osgEarth4Util17ContourMapOptionsE@Base 2.8~rc1
+ _ZTIN8osgEarth4Util17GeodeticGraticule7MyGroupE@Base 2.10.0
  _ZTIN8osgEarth4Util17GeodeticGraticuleE@Base 2.4.0
  _ZTIN8osgEarth4Util17LineOfSightTetherE@Base 2.4.0
- _ZTIN8osgEarth4Util17UTMLabelingEngine16AcceptCameraDataE@Base 2.9.0
  _ZTIN8osgEarth4Util17UTMLabelingEngineE@Base 2.9.0
  _ZTIN8osgEarth4Util18LODBlendingOptionsE@Base 2.8~rc1
  _ZTIN8osgEarth4Util18LOSChangedCallbackE@Base 2.4.0
@@ -2629,7 +2698,10 @@
  _ZTIN8osgEarth4Util21LinearLineOfSightNodeE@Base 2.4.0
  _ZTIN8osgEarth4Util21RadialLineOfSightNodeE@Base 2.4.0
  _ZTIN8osgEarth4Util22FlatteningLayerOptionsE@Base 2.9.0
- _ZTIN8osgEarth4Util23AnnotationEventCallbackE@Base 2.4.0
+ _ZTIN8osgEarth4Util22GeodeticLabelingEngineE@Base 2.10.0
+ _ZTIN8osgEarth4Util23GraticuleLabelingEngine16AcceptCameraDataE@Base 2.10.0
+ _ZTIN8osgEarth4Util23GraticuleLabelingEngine17UpdateLabelStylesE@Base 2.10.0
+ _ZTIN8osgEarth4Util23GraticuleLabelingEngineE@Base 2.10.0
  _ZTIN8osgEarth4Util23LinearLineOfSightEditorE@Base 2.4.0
  _ZTIN8osgEarth4Util23RadialLineOfSightEditorE@Base 2.4.0
  _ZTIN8osgEarth4Util23RadialLineOfSightTetherE@Base 2.4.0
@@ -2638,7 +2710,6 @@
  _ZTIN8osgEarth4Util24MouseCoordsLabelCallbackE@Base 2.4.0
  _ZTIN8osgEarth4Util24TerrainProfileCalculatorE@Base 2.4.0
  _ZTIN8osgEarth4Util25AutoClipPlaneCullCallbackE@Base 2.4.0
- _ZTIN8osgEarth4Util25PolyhedralLineOfSightNodeE@Base 2.4.0
  _ZTIN8osgEarth4Util26MultiElevationLayerOptionsE@Base 2.9.0
  _ZTIN8osgEarth4Util28FractalElevationLayerOptionsE@Base 2.9.0
  _ZTIN8osgEarth4Util29BrightnessContrastColorFilterE@Base 2.4.0
@@ -2683,23 +2754,22 @@
  _ZTIN8osgEarth7Drivers11GDALOptions15ExternalDatasetE@Base 2.4.0
  _ZTIN8osgEarth7Drivers11GDALOptionsE@Base 2.4.0
  _ZTIN8osgEarth7Drivers17OGRFeatureOptionsE@Base 2.5.0
- _ZTIN8osgEarth7MapInfoE@Base 2.9.0
  _ZTIN8osgEarth7TileKeyE@Base 2.4.0
  _ZTIN8osgEarth8DistanceE@Base 2.7.0
  _ZTIN8osgEarth8DurationE@Base 2.7.0
- _ZTIN8osgEarth8Features14TextSymbolizerE@Base 2.4.0
  _ZTIN8osgEarth8Features16GeometryCompilerE@Base 2.4.0
  _ZTIN8osgEarth8GeoImageE@Base 2.4.0
  _ZTIN8osgEarth8GeoPointE@Base 2.4.0
- _ZTIN8osgEarth8MapFrameE@Base 2.9.0
  _ZTIN8osgEarth8optionalIN3osg4QuatEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalIN3osg5Vec2fEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalIN3osg5Vec4fEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalIN3osg6Shader4TypeEEE@Base 2.6.0
  _ZTIN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.9.0
  _ZTIN8osgEarth8optionalINS_13ProxySettingsEEE@Base 2.4.0
+ _ZTIN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTIN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_17TileSourceOptionsEEE@Base 2.4.0
+ _ZTIN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTIN8osgEarth8optionalINS_21ElevationNoDataPolicyEEE@Base 2.9.0
  _ZTIN8osgEarth8optionalINS_22ElevationInterpolationEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
@@ -2715,6 +2785,7 @@
  _ZTIN8osgEarth8optionalINS_9Symbology16StringExpressionEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_9Symbology17NumericExpressionEEE@Base 2.9.0
  _ZTIN8osgEarth8optionalINS_9Symbology5ColorEEE@Base 2.7.0
+ _ZTIN8osgEarth8optionalINS_9Symbology5QueryEEE@Base 2.10.0
  _ZTIN8osgEarth8optionalINS_9Symbology5StyleEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINS_9ViewpointEEE@Base 2.4.0
  _ZTIN8osgEarth8optionalINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.7.0
@@ -2731,6 +2802,7 @@
  _ZTIN8osgEarth9TileImageE@Base 2.4.0
  _ZTS11FeatureTile@Base 2.4.0
  _ZTS17AddFeatureVisitor@Base 2.4.0
+ _ZTS17AttributeCallback@Base 2.10.0
  _ZTS18FeatureTileVisitor@Base 2.4.0
  _ZTS20LODBlendingExtension@Base 2.8~rc1
  _ZTS20WriteFeaturesVisitor@Base 2.4.0
@@ -2751,7 +2823,6 @@
  _ZTSN3osg5Vec4fE@Base 2.4.0
  _ZTSN3osg8CallbackE@Base 2.8~rc1
  _ZTSN5osgDB7OptionsE@Base 2.7.0
- _ZTSN5osgGA5EventE@Base 2.8~rc1
  _ZTSN7osgUtil10StateGraphE@Base 2.6.0
  _ZTSN7osgUtil11IntersectorE@Base 2.4.0
  _ZTSN8osgEarth10Annotation7Dragger23PositionChangedCallbackE@Base 2.7.0
@@ -2778,7 +2849,7 @@
  _ZTSN8osgEarth14GeoHeightFieldE@Base 2.4.0
  _ZTSN8osgEarth15MapNodeObserverE@Base 2.4.0
  _ZTSN8osgEarth15TerrainCallbackE@Base 2.4.0
- _ZTSN8osgEarth16PerObjectFastMapIPN3osg6CameraENS_4Util17UTMLabelingEngine10CameraDataEE7FunctorE@Base 2.9.0
+ _ZTSN8osgEarth16PerObjectFastMapIPN3osg6CameraENS_4Util23GraticuleLabelingEngine10CameraDataEE7FunctorE@Base 2.10.0
  _ZTSN8osgEarth16qualified_doubleINS_5AngleEEE@Base 2.7.0
  _ZTSN8osgEarth16qualified_doubleINS_8DistanceEEE@Base 2.7.0
  _ZTSN8osgEarth16qualified_doubleINS_8DurationEEE@Base 2.7.0
@@ -2786,7 +2857,6 @@
  _ZTSN8osgEarth18ExtensionInterfaceIN3osg4ViewEEE@Base 2.7.0
  _ZTSN8osgEarth18ExtensionInterfaceINS_4Util8Controls7ControlEEE@Base 2.7.0
  _ZTSN8osgEarth18ExtensionInterfaceINS_7MapNodeEEE@Base 2.7.0
- _ZTSN8osgEarth18IntersectionPickerE@Base 2.7.0
  _ZTSN8osgEarth19LandCoverDictionaryE@Base 2.9.0
  _ZTSN8osgEarth28ColorFilterRegistrationProxyINS_4Util14HSLColorFilterEEE@Base 2.4.0
  _ZTSN8osgEarth28ColorFilterRegistrationProxyINS_4Util14RGBColorFilterEEE@Base 2.4.0
@@ -2801,7 +2871,7 @@
  _ZTSN8osgEarth3URIE@Base 2.4.0
  _ZTSN8osgEarth4Util10ContourMapE@Base 2.5.0
  _ZTSN8osgEarth4Util10SkyOptionsE@Base 2.6.0
- _ZTSN8osgEarth4Util11DataScannerE@Base 2.4.0
+ _ZTSN8osgEarth4Util11ClusterNodeE@Base 2.10.0
  _ZTSN8osgEarth4Util11FogCallbackE@Base 2.8~rc1
  _ZTSN8osgEarth4Util11LODBlendingE@Base 2.5.0
  _ZTSN8osgEarth4Util11SimplePager15ProgressTrackerE@Base 2.8~rc1
@@ -2839,9 +2909,9 @@
  _ZTSN8osgEarth4Util16SimpleOceanLayerE@Base 2.9.0
  _ZTSN8osgEarth4Util16TileIndexBuilderE@Base 2.5.0
  _ZTSN8osgEarth4Util17ContourMapOptionsE@Base 2.8~rc1
+ _ZTSN8osgEarth4Util17GeodeticGraticule7MyGroupE@Base 2.10.0
  _ZTSN8osgEarth4Util17GeodeticGraticuleE@Base 2.4.0
  _ZTSN8osgEarth4Util17LineOfSightTetherE@Base 2.4.0
- _ZTSN8osgEarth4Util17UTMLabelingEngine16AcceptCameraDataE@Base 2.9.0
  _ZTSN8osgEarth4Util17UTMLabelingEngineE@Base 2.9.0
  _ZTSN8osgEarth4Util18LODBlendingOptionsE@Base 2.8~rc1
  _ZTSN8osgEarth4Util18LOSChangedCallbackE@Base 2.4.0
@@ -2859,7 +2929,10 @@
  _ZTSN8osgEarth4Util21LinearLineOfSightNodeE@Base 2.4.0
  _ZTSN8osgEarth4Util21RadialLineOfSightNodeE@Base 2.4.0
  _ZTSN8osgEarth4Util22FlatteningLayerOptionsE@Base 2.9.0
- _ZTSN8osgEarth4Util23AnnotationEventCallbackE@Base 2.4.0
+ _ZTSN8osgEarth4Util22GeodeticLabelingEngineE@Base 2.10.0
+ _ZTSN8osgEarth4Util23GraticuleLabelingEngine16AcceptCameraDataE@Base 2.10.0
+ _ZTSN8osgEarth4Util23GraticuleLabelingEngine17UpdateLabelStylesE@Base 2.10.0
+ _ZTSN8osgEarth4Util23GraticuleLabelingEngineE@Base 2.10.0
  _ZTSN8osgEarth4Util23LinearLineOfSightEditorE@Base 2.4.0
  _ZTSN8osgEarth4Util23RadialLineOfSightEditorE@Base 2.4.0
  _ZTSN8osgEarth4Util23RadialLineOfSightTetherE@Base 2.4.0
@@ -2868,7 +2941,6 @@
  _ZTSN8osgEarth4Util24MouseCoordsLabelCallbackE@Base 2.4.0
  _ZTSN8osgEarth4Util24TerrainProfileCalculatorE@Base 2.4.0
  _ZTSN8osgEarth4Util25AutoClipPlaneCullCallbackE@Base 2.4.0
- _ZTSN8osgEarth4Util25PolyhedralLineOfSightNodeE@Base 2.4.0
  _ZTSN8osgEarth4Util26MultiElevationLayerOptionsE@Base 2.9.0
  _ZTSN8osgEarth4Util28FractalElevationLayerOptionsE@Base 2.9.0
  _ZTSN8osgEarth4Util29BrightnessContrastColorFilterE@Base 2.4.0
@@ -2913,23 +2985,22 @@
  _ZTSN8osgEarth7Drivers11GDALOptions15ExternalDatasetE@Base 2.4.0
  _ZTSN8osgEarth7Drivers11GDALOptionsE@Base 2.4.0
  _ZTSN8osgEarth7Drivers17OGRFeatureOptionsE@Base 2.5.0
- _ZTSN8osgEarth7MapInfoE@Base 2.9.0
  _ZTSN8osgEarth7TileKeyE@Base 2.4.0
  _ZTSN8osgEarth8DistanceE@Base 2.7.0
  _ZTSN8osgEarth8DurationE@Base 2.7.0
- _ZTSN8osgEarth8Features14TextSymbolizerE@Base 2.4.0
  _ZTSN8osgEarth8Features16GeometryCompilerE@Base 2.4.0
  _ZTSN8osgEarth8GeoImageE@Base 2.4.0
  _ZTSN8osgEarth8GeoPointE@Base 2.4.0
- _ZTSN8osgEarth8MapFrameE@Base 2.9.0
  _ZTSN8osgEarth8optionalIN3osg4QuatEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalIN3osg5Vec2fEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalIN3osg5Vec4fEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalIN3osg6Shader4TypeEEE@Base 2.6.0
  _ZTSN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.9.0
  _ZTSN8osgEarth8optionalINS_13ProxySettingsEEE@Base 2.4.0
+ _ZTSN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTSN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_17TileSourceOptionsEEE@Base 2.4.0
+ _ZTSN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTSN8osgEarth8optionalINS_21ElevationNoDataPolicyEEE@Base 2.9.0
  _ZTSN8osgEarth8optionalINS_22ElevationInterpolationEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
@@ -2945,6 +3016,7 @@
  _ZTSN8osgEarth8optionalINS_9Symbology16StringExpressionEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_9Symbology17NumericExpressionEEE@Base 2.9.0
  _ZTSN8osgEarth8optionalINS_9Symbology5ColorEEE@Base 2.7.0
+ _ZTSN8osgEarth8optionalINS_9Symbology5QueryEEE@Base 2.10.0
  _ZTSN8osgEarth8optionalINS_9Symbology5StyleEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINS_9ViewpointEEE@Base 2.4.0
  _ZTSN8osgEarth8optionalINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.7.0
@@ -2971,13 +3043,13 @@
  _ZTTN8osgEarth4Util18MeasureToolHandlerE@Base 2.4.0
  _ZTTN8osgEarth4Util19ActivityMonitorToolE@Base 2.6.0
  _ZTTN8osgEarth4Util20BuildTopologyVisitorE@Base 2.9.0
- _ZTTN8osgEarth4Util23AnnotationEventCallbackE@Base 2.4.0
  _ZTTN8osgEarth4Util23RadialLineOfSightTetherE@Base 2.4.0
  _ZTTN8osgEarth4Util25AutoClipPlaneCullCallbackE@Base 2.4.0
  _ZTTN8osgEarth4Util8Controls13ControlCanvas13EventCallbackE@Base 2.6.0
  _ZTTN8osgEarth4Util9RTTPickerE@Base 2.7.0
  _ZTV11FeatureTile@Base 2.4.0
  _ZTV17AddFeatureVisitor@Base 2.4.0
+ _ZTV17AttributeCallback@Base 2.10.0
  _ZTV18FeatureTileVisitor@Base 2.4.0
  _ZTV20LODBlendingExtension@Base 2.8~rc1
  _ZTV20WriteFeaturesVisitor@Base 2.4.0
@@ -3022,7 +3094,6 @@
  _ZTVN8osgEarth16qualified_doubleINS_8DistanceEEE@Base 2.7.0
  _ZTVN8osgEarth16qualified_doubleINS_8DurationEEE@Base 2.7.0
  _ZTVN8osgEarth18ExtensionInterfaceINS_7MapNodeEEE@Base 2.7.0
- _ZTVN8osgEarth18IntersectionPickerE@Base 2.7.0
  _ZTVN8osgEarth28ColorFilterRegistrationProxyINS_4Util14HSLColorFilterEEE@Base 2.4.0
  _ZTVN8osgEarth28ColorFilterRegistrationProxyINS_4Util14RGBColorFilterEEE@Base 2.4.0
  _ZTVN8osgEarth28ColorFilterRegistrationProxyINS_4Util15CMYKColorFilterEEE@Base 2.4.0
@@ -3036,7 +3107,7 @@
  _ZTVN8osgEarth3URIE@Base 2.4.0
  _ZTVN8osgEarth4Util10ContourMapE@Base 2.5.0
  _ZTVN8osgEarth4Util10SkyOptionsE@Base 2.6.0
- _ZTVN8osgEarth4Util11DataScannerE@Base 2.4.0
+ _ZTVN8osgEarth4Util11ClusterNodeE@Base 2.10.0
  _ZTVN8osgEarth4Util11FogCallbackE@Base 2.8~rc1
  _ZTVN8osgEarth4Util11LODBlendingE@Base 2.5.0
  _ZTVN8osgEarth4Util11SimplePager15ProgressTrackerE@Base 2.8~rc1
@@ -3071,9 +3142,9 @@
  _ZTVN8osgEarth4Util16SimpleOceanLayerE@Base 2.9.0
  _ZTVN8osgEarth4Util16TileIndexBuilderE@Base 2.5.0
  _ZTVN8osgEarth4Util17ContourMapOptionsE@Base 2.8~rc1
+ _ZTVN8osgEarth4Util17GeodeticGraticule7MyGroupE@Base 2.10.0
  _ZTVN8osgEarth4Util17GeodeticGraticuleE@Base 2.4.0
  _ZTVN8osgEarth4Util17LineOfSightTetherE@Base 2.4.0
- _ZTVN8osgEarth4Util17UTMLabelingEngine16AcceptCameraDataE@Base 2.9.0
  _ZTVN8osgEarth4Util17UTMLabelingEngineE@Base 2.9.0
  _ZTVN8osgEarth4Util18LODBlendingOptionsE@Base 2.8~rc1
  _ZTVN8osgEarth4Util18LOSChangedCallbackE@Base 2.4.0
@@ -3091,7 +3162,10 @@
  _ZTVN8osgEarth4Util21LinearLineOfSightNodeE@Base 2.4.0
  _ZTVN8osgEarth4Util21RadialLineOfSightNodeE@Base 2.4.0
  _ZTVN8osgEarth4Util22FlatteningLayerOptionsE@Base 2.9.0
- _ZTVN8osgEarth4Util23AnnotationEventCallbackE@Base 2.4.0
+ _ZTVN8osgEarth4Util22GeodeticLabelingEngineE@Base 2.10.0
+ _ZTVN8osgEarth4Util23GraticuleLabelingEngine16AcceptCameraDataE@Base 2.10.0
+ _ZTVN8osgEarth4Util23GraticuleLabelingEngine17UpdateLabelStylesE@Base 2.10.0
+ _ZTVN8osgEarth4Util23GraticuleLabelingEngineE@Base 2.10.0
  _ZTVN8osgEarth4Util23LinearLineOfSightEditorE@Base 2.4.0
  _ZTVN8osgEarth4Util23RadialLineOfSightEditorE@Base 2.4.0
  _ZTVN8osgEarth4Util23RadialLineOfSightTetherE@Base 2.4.0
@@ -3100,7 +3174,6 @@
  _ZTVN8osgEarth4Util24MouseCoordsLabelCallbackE@Base 2.4.0
  _ZTVN8osgEarth4Util24TerrainProfileCalculatorE@Base 2.4.0
  _ZTVN8osgEarth4Util25AutoClipPlaneCullCallbackE@Base 2.4.0
- _ZTVN8osgEarth4Util25PolyhedralLineOfSightNodeE@Base 2.4.0
  _ZTVN8osgEarth4Util26MultiElevationLayerOptionsE@Base 2.9.0
  _ZTVN8osgEarth4Util28FractalElevationLayerOptionsE@Base 2.9.0
  _ZTVN8osgEarth4Util29BrightnessContrastColorFilterE@Base 2.4.0
@@ -3143,23 +3216,22 @@
  _ZTVN8osgEarth7Drivers10KMLOptionsE@Base 2.4.0
  _ZTVN8osgEarth7Drivers11GDALOptionsE@Base 2.4.0
  _ZTVN8osgEarth7Drivers17OGRFeatureOptionsE@Base 2.5.0
- _ZTVN8osgEarth7MapInfoE@Base 2.9.0
  _ZTVN8osgEarth7TileKeyE@Base 2.4.0
  _ZTVN8osgEarth8DistanceE@Base 2.7.0
  _ZTVN8osgEarth8DurationE@Base 2.7.0
- _ZTVN8osgEarth8Features14TextSymbolizerE@Base 2.4.0
  _ZTVN8osgEarth8Features16GeometryCompilerE@Base 2.4.0
  _ZTVN8osgEarth8GeoImageE@Base 2.4.0
  _ZTVN8osgEarth8GeoPointE@Base 2.4.0
- _ZTVN8osgEarth8MapFrameE@Base 2.9.0
  _ZTVN8osgEarth8optionalIN3osg4QuatEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalIN3osg5Vec2fEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalIN3osg5Vec4fEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalIN3osg6Shader4TypeEEE@Base 2.6.0
  _ZTVN8osgEarth8optionalINS_11CachePolicyEEE@Base 2.9.0
  _ZTVN8osgEarth8optionalINS_13ProxySettingsEEE@Base 2.4.0
+ _ZTVN8osgEarth8optionalINS_13ShaderOptionsEEE@Base 2.10.1
  _ZTVN8osgEarth8optionalINS_14ProfileOptionsEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_17TileSourceOptionsEEE@Base 2.4.0
+ _ZTVN8osgEarth8optionalINS_19VisibleLayerOptions5BlendEEE@Base 2.10.0
  _ZTVN8osgEarth8optionalINS_21ElevationNoDataPolicyEEE@Base 2.9.0
  _ZTVN8osgEarth8optionalINS_22ElevationInterpolationEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_3URIEEE@Base 2.4.0
@@ -3175,6 +3247,7 @@
  _ZTVN8osgEarth8optionalINS_9Symbology16StringExpressionEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_9Symbology17NumericExpressionEEE@Base 2.9.0
  _ZTVN8osgEarth8optionalINS_9Symbology5ColorEEE@Base 2.7.0
+ _ZTVN8osgEarth8optionalINS_9Symbology5QueryEEE@Base 2.10.0
  _ZTVN8osgEarth8optionalINS_9Symbology5StyleEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINS_9ViewpointEEE@Base 2.4.0
  _ZTVN8osgEarth8optionalINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE@Base 2.7.0
@@ -3195,8 +3268,6 @@
  (c++)"non-virtual thunk to osg::TemplateArray<osg::Vec2f, (osg::Array::Type)27, 2, 5126>::~TemplateArray()@Base" 2.4.0
  (c++)"non-virtual thunk to osg::TemplateArray<osg::Vec3f, (osg::Array::Type)28, 3, 5126>::~TemplateArray()@Base" 2.4.0
  (c++)"non-virtual thunk to osg::TemplateArray<osg::Vec4f, (osg::Array::Type)29, 4, 5126>::~TemplateArray()@Base" 2.4.0
- (c++)"non-virtual thunk to osgEarth::Annotation::AnnotationNode::getMapNode()@Base" 2.4.0
- (c++|arch=!hurd-i386 !i386)"non-virtual thunk to osgEarth::Annotation::GeoPositionNode::~GeoPositionNode()@Base" 2.9.0
  (c++)"non-virtual thunk to osgEarth::Util::ActivityMonitorTool::~ActivityMonitorTool()@Base" 2.6.0
  (c++)"non-virtual thunk to osgEarth::Util::ContourMap::~ContourMap()@Base" 2.8~rc1
  (c++)"non-virtual thunk to osgEarth::Util::ContourMapExtension::connect(osgEarth::MapNode*)@Base" 2.8~rc1
@@ -3214,8 +3285,6 @@
  (c++)"non-virtual thunk to osgEarth::Util::MeasureToolHandler::setMapNode(osgEarth::MapNode*)@Base" 2.4.0
  (c++)"non-virtual thunk to osgEarth::Util::MeasureToolHandler::~MeasureToolHandler()@Base" 2.4.0
  (c++)"non-virtual thunk to osgEarth::Util::MouseCoordsTool::~MouseCoordsTool()@Base" 2.4.0
- (c++)"non-virtual thunk to osgEarth::Util::PolyhedralLineOfSightNode::setMapNode(osgEarth::MapNode*)@Base" 2.4.0
- (c++)"non-virtual thunk to osgEarth::Util::PolyhedralLineOfSightNode::~PolyhedralLineOfSightNode()@Base" 2.4.0
  (c++)"non-virtual thunk to osgEarth::Util::RTTPicker::~RTTPicker()@Base" 2.7.0
  (c++)"non-virtual thunk to osgEarth::Util::RadialLineOfSightNode::getMapNode()@Base" 2.4.0
  (c++)"non-virtual thunk to osgEarth::Util::RadialLineOfSightNode::setMapNode(osgEarth::MapNode*)@Base" 2.4.0
@@ -3238,6 +3307,7 @@
  osgdb_geodetic_graticule@Base 2.9.0
  osgdb_mgrs_graticule@Base 2.9.0
  osgdb_multi_elevation@Base 2.9.0
+ osgdb_ocean@Base 2.10.0
  osgdb_osgearth_contour_map@Base 2.8~rc1
  osgdb_osgearth_contourmap@Base 2.8~rc1
  osgdb_osgearth_lod_blending@Base 2.8~rc1
@@ -3287,8 +3357,8 @@
  (c++)"virtual thunk to osg::StateAttributeCallback::libraryName() const@Base" 2.8~rc1
  (c++)"virtual thunk to osgEarth::FindTopMostNodeOfTypeVisitor<osg::CoordinateSystemNode>::~FindTopMostNodeOfTypeVisitor()@Base" 2.4.0
  (c++)"virtual thunk to osgEarth::FindTopMostNodeOfTypeVisitor<osgEarth::Util::Controls::ControlCanvas>::~FindTopMostNodeOfTypeVisitor()@Base" 2.6.0
+ (c++)"virtual thunk to osgEarth::MaterialCallback::~MaterialCallback()@Base" 2.10.0
  (c++)"virtual thunk to osgEarth::Util::ActivityMonitorTool::~ActivityMonitorTool()@Base" 2.6.0
- (c++)"virtual thunk to osgEarth::Util::AnnotationEventCallback::~AnnotationEventCallback()@Base" 2.4.0
  (c++)"virtual thunk to osgEarth::Util::AutoClipPlaneCullCallback::~AutoClipPlaneCullCallback()@Base" 2.4.0
  (c++)"virtual thunk to osgEarth::Util::BuildTopologyVisitor::~BuildTopologyVisitor()@Base" 2.9.0
  (c++)"virtual thunk to osgEarth::Util::ClampCallback::~ClampCallback()@Base" 2.4.0
diff -Nru osgearth-2.9.0+dfsg/debian/man/osgearth_featureinfo.1.xml osgearth-2.10.2+dfsg/debian/man/osgearth_featureinfo.1.xml
--- osgearth-2.9.0+dfsg/debian/man/osgearth_featureinfo.1.xml	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/man/osgearth_featureinfo.1.xml	2018-11-13 08:35:48.000000000 +0000
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<refentry id='osgearth_featureinfo'>
+
+  <refmeta>
+    <refentrytitle>osgearth_featureinfo</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>osgearth_featureinfo</refname>
+    <refpurpose>feature info application</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv id='synopsis'>
+    <cmdsynopsis>
+      <command>osgearth_featureinfo</command>
+      <arg choice='opt'><option>--printfeatures</option></arg>
+      <arg choice='opt'><option>--delete</option> <replaceable>fid</replaceable></arg>
+      <arg choice='opt'><option>--fid</option> <replaceable>fid</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id='description'>
+    <title>DESCRIPTION</title>
+    <para>
+      <command>osgearth_featureinfo</command> displays and deletes featureinfo.
+      another.
+    </para>
+  </refsect1>
+
+  <refsect1 id='options'>
+    <title>OPTIONS</title>
+    <variablelist>
+
+      <varlistentry>
+        <term><option>--printfeatures</option></term>
+        <listitem>
+          <para>Prints all features in the source"</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--delete</option> <replaceable>fid</replaceable></term>
+        <listitem>
+          <para>Deletes the given FID from the source.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--fid</option> <replaceable>fid</replaceable></term>
+        <listitem>
+          <para>Displays the given FID</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
+</refentry>
diff -Nru osgearth-2.9.0+dfsg/debian/man/osgearth_toc.1.xml osgearth-2.10.2+dfsg/debian/man/osgearth_toc.1.xml
--- osgearth-2.9.0+dfsg/debian/man/osgearth_toc.1.xml	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/man/osgearth_toc.1.xml	2018-11-13 08:35:48.000000000 +0000
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<refentry id='osgearth_toc'>
+
+  <refmeta>
+    <refentrytitle>osgearth_toc</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>osgearth_toc</refname>
+    <refpurpose>load and display a map with TOC</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv id='synopsis'>
+    <cmdsynopsis>
+      <command>osgearth_toc</command>
+      <arg choice='plain'><replaceable>earthfile.earth</replaceable></arg>
+      <group>
+        <arg choice='opt'><option>--sky</option></arg>
+        <arg choice='opt'><option>--ocean</option></arg>
+        <arg choice='opt'><option>--kml</option> <replaceable>file.kml</replaceable></arg>
+        <arg choice='opt'><option>--coords</option></arg>
+        <arg choice='opt'><option>--dms</option></arg>
+        <arg choice='opt'><option>--dd</option> <replaceable></replaceable></arg>
+        <arg choice='opt'><option>--mgrs</option> <replaceable></replaceable></arg>
+        <arg choice='opt'><option>--ortho</option> <replaceable></replaceable></arg>
+        <arg choice='opt'><option>--autoclip</option> <replaceable></replaceable></arg>
+        <arg choice='opt'><option>--images</option> <replaceable>path</replaceable></arg>
+        <arg choice='opt'><option>--image-extensions</option> <replaceable>*</replaceable></arg>
+        <arg choice='opt'><option>--out-earth</option> <replaceable>out.earth</replaceable></arg>
+      </group>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1 id='description'>
+    <title>DESCRIPTION</title>
+    <para>
+      <command>osgearth_toc</command> can load and display a map from the
+      command line. The osgEarth EarthManipulator is used to control the camera
+      and is optimized for viewing geospatial data. It also displays a TOC.
+    </para>
+  </refsect1>
+
+  <refsect1 id='options'>
+    <title>OPTIONS</title>
+    <variablelist>
+
+      <varlistentry>
+        <term><replaceable>earthfile.earth</replaceable></term>
+        <listitem>
+          <para>Path to the earth file</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--sky</option></term>
+        <listitem>
+          <para>Installs a SkyNode (sun, moon, stars and atmosphere..globe only)</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--ocean</option></term>
+        <listitem>
+          <para>Installs a sample ocean surface node</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--kml</option> <replaceable>file.kml</replaceable></term>
+        <listitem>
+          <para>Loads a KML or KMZ file</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--coords</option></term>
+        <listitem>
+          <para>Displays map coords under mouse</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--dms</option></term>
+        <listitem>
+          <para>Displays map coords as degrees/mins/seconds</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--dd</option></term>
+        <listitem>
+          <para>Displays map coords as decimal degrees</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--mgrs</option></term>
+        <listitem>
+          <para>Displays map coords as MGRS</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--ortho</option></term>
+        <listitem>
+          <para>Installs an orthographic camera projection</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--autoclip</option></term>
+        <listitem>
+          <para>Installs an automatic clip plane handler</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--images</option> <replaceable>path</replaceable></term>
+        <listitem>
+          <para>Finds images in [path] and loads them as image layers</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--image-extensions</option> <replaceable>*</replaceable></term>
+        <listitem>
+          <para>With <option>--images</option>, only considers the listed extensions</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--out-earth</option> <replaceable>out.earth</replaceable></term>
+        <listitem>
+          <para>With <option>--images</option>, writes out an earth file</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
+</refentry>
diff -Nru osgearth-2.9.0+dfsg/debian/openscenegraph-plugin-osgearth.lintian-overrides osgearth-2.10.2+dfsg/debian/openscenegraph-plugin-osgearth.lintian-overrides
--- osgearth-2.9.0+dfsg/debian/openscenegraph-plugin-osgearth.lintian-overrides	2018-01-25 06:30:06.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/openscenegraph-plugin-osgearth.lintian-overrides	2019-04-20 05:25:43.000000000 +0000
@@ -1,4 +1,10 @@
 # Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
 #  Fortify Source functions: no, only unprotected functions found!
-openscenegraph-plugin-osgearth: hardening-no-fortify-functions usr/lib/osgPlugins-*/osgdb_template.so
+hardening-no-fortify-functions usr/lib/osgPlugins-*/osgdb_template.so
+
+# False positive for American English
+spelling-error-in-binary usr/lib/osgPlugins-*/* Cancelation Cancellation
+
+# Uses __FILE__ macro
+file-references-package-build-path *
 
diff -Nru osgearth-2.9.0+dfsg/debian/osgearth.manpages osgearth-2.10.2+dfsg/debian/osgearth.manpages
--- osgearth-2.9.0+dfsg/debian/osgearth.manpages	2018-01-25 06:30:06.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/osgearth.manpages	2018-11-13 08:35:48.000000000 +0000
@@ -4,10 +4,12 @@
 debian/man/osgearth_cache.1
 debian/man/osgearth_conv.1
 debian/man/osgearth_demo.1
+debian/man/osgearth_featureinfo.1
 debian/man/osgearth_overlayviewer.1
 debian/man/osgearth_package.1
 debian/man/osgearth_terraineffects.1
 debian/man/osgearth_tfs.1
 debian/man/osgearth_tileindex.1
+debian/man/osgearth_toc.1
 debian/man/osgearth_version.1
 debian/man/osgearth_viewer.1
diff -Nru osgearth-2.9.0+dfsg/debian/patches/soversion.patch osgearth-2.10.2+dfsg/debian/patches/soversion.patch
--- osgearth-2.9.0+dfsg/debian/patches/soversion.patch	2018-02-07 17:48:09.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/patches/soversion.patch	2019-07-12 04:58:35.000000000 +0000
@@ -3,10 +3,10 @@
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -25,7 +25,7 @@ PROJECT(OSGEARTH)
+@@ -28,7 +28,7 @@ PROJECT(OSGEARTH)
  SET(OSGEARTH_MAJOR_VERSION 2)
- SET(OSGEARTH_MINOR_VERSION 9)
- SET(OSGEARTH_PATCH_VERSION 0)
+ SET(OSGEARTH_MINOR_VERSION 10)
+ SET(OSGEARTH_PATCH_VERSION 2)
 -SET(OSGEARTH_SOVERSION     0)
 +SET(OSGEARTH_SOVERSION     5)
  
diff -Nru osgearth-2.9.0+dfsg/debian/patches/spelling-errors.patch osgearth-2.10.2+dfsg/debian/patches/spelling-errors.patch
--- osgearth-2.9.0+dfsg/debian/patches/spelling-errors.patch	2018-02-07 17:53:05.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/patches/spelling-errors.patch	2019-04-19 19:27:33.000000000 +0000
@@ -4,7 +4,7 @@
 
 --- a/src/osgEarth/SpatialReference.cpp
 +++ b/src/osgEarth/SpatialReference.cpp
-@@ -399,7 +399,7 @@ SpatialReference::~SpatialReference()
+@@ -400,7 +400,7 @@ SpatialReference::~SpatialReference()
          }
          else
          {
diff -Nru osgearth-2.9.0+dfsg/debian/rules osgearth-2.10.2+dfsg/debian/rules
--- osgearth-2.9.0+dfsg/debian/rules	2018-02-07 17:48:09.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/rules	2019-04-20 05:22:00.000000000 +0000
@@ -40,7 +40,7 @@
 		-DDEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH) \
 		-DLIB_POSTFIX="" \
 		-DOSG_DIR=/usr \
-		-DOSGEARTH_QT_BUILD=1
+		-DOSGEARTH_ENABLE_FASTDXT=0
 
 override_dh_auto_build:
 	# Create man pages from DocBook XML
@@ -70,6 +70,8 @@
 override_dh_install:
 	dh_install --autodest --list-missing
 
+	$(RM) debian/*/usr/share/osgearth/data/resources/README.txt
+
 override_dh_installchangelogs:
 	dh_installchangelogs docs/source/releasenotes.rst
 
@@ -78,7 +80,3 @@
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -c0 -v$(UPSTREAM_VERSION)
-
-get-orig-source:
-	. debian/get-orig-source
-
diff -Nru osgearth-2.9.0+dfsg/debian/source/lintian-overrides osgearth-2.10.2+dfsg/debian/source/lintian-overrides
--- osgearth-2.9.0+dfsg/debian/source/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/source/lintian-overrides	2018-08-01 06:55:50.000000000 +0000
@@ -0,0 +1,3 @@
+# Not worth the effort
+testsuite-autopkgtest-missing
+
diff -Nru osgearth-2.9.0+dfsg/debian/tests/control osgearth-2.10.2+dfsg/debian/tests/control
--- osgearth-2.9.0+dfsg/debian/tests/control	2018-01-25 06:30:06.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-# Test installability
-Depends: @
-Test-Command: /bin/true
diff -Nru osgearth-2.9.0+dfsg/debian/watch osgearth-2.10.2+dfsg/debian/watch
--- osgearth-2.9.0+dfsg/debian/watch	2018-01-25 06:30:06.000000000 +0000
+++ osgearth-2.10.2+dfsg/debian/watch	2018-08-15 16:59:32.000000000 +0000
@@ -4,4 +4,4 @@
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|b|beta|a|alpha)\d*)$/$1~$2/;s/RC/rc/;s/^\d+\.\d+$/$&.0/,\
 repacksuffix=+dfsg \
 https://github.com/gwaldron/osgearth/releases \
-.*/osgearth-(\d[\d\.a-z]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+(?:.*?/archive/)?(?:rel|v|osgearth)?[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
diff -Nru osgearth-2.9.0+dfsg/docs/CMakeLists.txt osgearth-2.10.2+dfsg/docs/CMakeLists.txt
--- osgearth-2.9.0+dfsg/docs/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -4,9 +4,7 @@
     source/about.rst
     source/data.rst
     source/faq.rst
-    source/howtos.rst
     source/index.rst
-    source/install.rst
     source/ios.rst
     source/releasenotes.rst
     source/startup.rst
@@ -100,7 +98,7 @@
 source_group( References\\Drivers\\Tile    FILES ${DOCS_REFERENCES_DRIVERS_TILE} )
 source_group( User                         FILES ${DOCS_USER} )
 
-add_custom_target( 
+add_custom_target(
     Documentation
     SOURCES
         ${DOCS_ROOT}
diff -Nru osgearth-2.9.0+dfsg/docs/Doxyfile osgearth-2.10.2+dfsg/docs/Doxyfile
--- osgearth-2.9.0+dfsg/docs/Doxyfile	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/Doxyfile	2019-07-11 18:30:19.000000000 +0000
@@ -1092,7 +1092,7 @@
 # cascading style sheets that are included after the standard style sheets
 # created by doxygen. Using this option one can overrule certain style aspects.
 # This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
+# standard style sheet and is therefore more robust against future updates.
 # Doxygen will copy the style sheet files to the output directory.
 # Note: The order of the extra stylesheet files is of importance (e.g. the last
 # stylesheet in the list overrules the setting of the previous ones in the
@@ -1635,8 +1635,8 @@
 # Note: Only use a user-defined header if you know what you are doing! The
 # following commands have a special meaning inside the header: $title,
 # $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
-# for the replacement values of the other commands the user is refered to
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty string,
+# for the replacement values of the other commands the user is referred to
 # HTML_HEADER.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
diff -Nru osgearth-2.9.0+dfsg/docs/source/about.rst osgearth-2.10.2+dfsg/docs/source/about.rst
--- osgearth-2.9.0+dfsg/docs/source/about.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/about.rst	2019-07-11 18:30:19.000000000 +0000
@@ -129,7 +129,7 @@
 .. _@pelicanmapping:  https://twitter.com/pelicanmapping
 .. _Google+ Page:     https://plus.google.com/b/104014917856468748129/104014917856468748129/posts
 
-.. _support forum:    http://forum.osgearth.osg
+.. _support forum:    http://forum.osgearth.org
 .. _OSG Mailing List: http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
 .. _OSG Forum:        http://forum.openscenegraph.org
 .. _Contact us:       http://pelicanmapping.com/?page_id=2
diff -Nru osgearth-2.9.0+dfsg/docs/source/conf.py osgearth-2.10.2+dfsg/docs/source/conf.py
--- osgearth-2.9.0+dfsg/docs/source/conf.py	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/conf.py	2019-07-11 18:30:19.000000000 +0000
@@ -41,16 +41,16 @@
 
 # General information about the project.
 project = u'osgEarth'
-copyright = u'2013, Pelican Mapping'
+copyright = u'2018, Pelican Mapping'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.4'
+version = '2.10'
 # The full version, including alpha/beta/rc tags.
-release = '2.4'
+release = '2.10'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Nru osgearth-2.9.0+dfsg/docs/source/data.rst osgearth-2.10.2+dfsg/docs/source/data.rst
--- osgearth-2.9.0+dfsg/docs/source/data.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/data.rst	2019-07-11 18:30:19.000000000 +0000
@@ -154,7 +154,7 @@
     
         osgearth_package file.earth --tms --out output_folder
 
-    This will load each of the data sources in the the earth file 
+    This will load each of the data sources in the earth file 
     (``file.earth`` in this case) and generate a TMS repository for each under the
     folder ``output_folder``. You can also specify options:
     
diff -Nru osgearth-2.9.0+dfsg/docs/source/developer/coordinate_systems.rst osgearth-2.10.2+dfsg/docs/source/developer/coordinate_systems.rst
--- osgearth-2.9.0+dfsg/docs/source/developer/coordinate_systems.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/developer/coordinate_systems.rst	2019-07-11 18:30:19.000000000 +0000
@@ -7,8 +7,8 @@
 
 OpenSceneGraph/OpenGL Coordinate Spaces
 ---------------------------------------
-Here is a brief explaination of the various coordinate systems used in OpenGL and
-OSG. For a more detailed explaination (with pictures!) we direct you to read this
+Here is a brief explanation of the various coordinate systems used in OpenGL and
+OSG. For a more detailed explanation (with pictures!) we direct you to read this
 excellent tutorial on the subject:
 
     `OpenGL Transformation`_
diff -Nru osgearth-2.9.0+dfsg/docs/source/developer/shader_composition.rst osgearth-2.10.2+dfsg/docs/source/developer/shader_composition.rst
--- osgearth-2.9.0+dfsg/docs/source/developer/shader_composition.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/developer/shader_composition.rst	2019-07-11 18:30:19.000000000 +0000
@@ -167,7 +167,7 @@
 
 :MODEL:  Vertex is the raw, untransformed values from the geometry.
 :VIEW:   Vertex is relative to the eyepoint, which lies at the origin (0,0,0) and 
-         points down the -Z axis. In VIEW space, the orginal vertex has been
+         points down the -Z axis. In VIEW space, the original vertex has been
          transformed by ``gl_ModelViewMatrix``.
 :CLIP:   Post-projected clip space. CLIP space lies in the [-w..w] range along all
          three axis, and is the result of transforming the original vertex by
diff -Nru osgearth-2.9.0+dfsg/docs/source/developer/utilities.rst osgearth-2.10.2+dfsg/docs/source/developer/utilities.rst
--- osgearth-2.9.0+dfsg/docs/source/developer/utilities.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/developer/utilities.rst	2019-07-11 18:30:19.000000000 +0000
@@ -6,96 +6,6 @@
 make it easier to perform some common operations.
 
 
-AutoScale
----------
-
-*AutoScale* is a special *Render Bin* that will scale geometry from meters to pixels.
-That is: if you have an object that is 10 meters across, *AutoScale* will draw it in
-the space of 10 pixels (at scale 1.0) regardless of its distance from the camera.
-The effect is similar to OSG's ``AutoTransform::setAutoScaleToScreen`` method but is
-done in a shader and does not require any special nodes.
-
-To activate auto-scaling on a node::
-
-    node->getOrCreateStateSet()->setRenderBinDetails( 0, osgEarth::AUTO_SCALE_BIN );
-    
-And to deactivate it:
-
-    node->getOrCreateStateSet()->setRenderBinToInherit();
-
-
-DataScanner
------------
-
-The ``DataScanner`` will recursively search a directory tree on the local filesystem
-for files that it can load as ``ImageLayer`` objects. It is a quick and easy way to 
-load a full directory of images as layers.
-
-**NOTE** that only the *MP Terrain Engine* supports an unlimited number of image layers,
-so it is wise to use that engine in conjunction with the DataScanner.
-
-Use DataScanner like this::
-
-    DataScanner scanner;
-    ImageLayerVector imageLayers;
-    scanner.findImageLayers( rootFolder, extensions, imageLayers );
-    
-You can then add the image layes to your ``Map`` object.
-
-The ``extensions`` parameter lets you filter files by extension. For example, pass in 
-"tif,ecw" to only consider files with those extensions. Separate multiple extensions
-with a comma.
-
-
-DetailTexture
--------------
-
-``DetailTexture`` is a terrain controller that will apply a non-geospatial texture
-across the terrain. This is an old trick that you can use to generate "noise" that makes
-a low resolution terrain appear more detailed::
-
-    DetailTexture* detail = new DetailTexture();
-    detail->setImage( osgDB::readImageFile("mytexture.jpg") );
-    detail->setIntensity( 0.5f );
-    detail->setImageUnit( 4 );
-    mapnode->getTerrainEngine()->addEffect( detail );
-
-Try the example. Zoom in fairly close to the terrain to see the effect::
-
-    osgearth_detailtex readymap.earth
-
-
-
-LOD Blending
-------------
-
-``LODBlending`` is a terrain controller that will attempt to smoothly morph vertices
-and image textures from one LOD to the next as you zoom in or out. Basic usage is::
-
-    LODBlending* effect = new LODBlending();
-    mapnode->getTerrainEngine()->addEffect( effect );
-
-Caveats: It requires that the terrain elevation tile size dimensions be odd-numbered
-(e.g., 17x17, which is the default.) You can use the ``MapOptions::elevationTileSize``
-property to configure this, or set ``elevation_tile_size`` in your earth file if you
-want to change it::
-
-    <map>
-        <options elevation_tile_size="15" ...
-
-For a demo, run this example and zoom into a mountainous area::
-
-    osgearth_viewer lod_blending.earth
-
-LOD blending supports the following properties (earth file and API):
-
-    :delay:            Time to wait before starting a blending transition (seconds)
-    :duration:         Duration of the blending transition (seconds)
-    :vertical_scale:   Factor by which to vertically scale the terrain (default = 1.0)
-    :blend_imagery:    Whether to blend imagery LODs (true)
-    :blend_elevation:  Whether to morph elevation LODs (true)
-
-
 Logarithmic Depth Buffer
 ------------------------
 
@@ -160,7 +70,7 @@
 
 The ``MGRSFormatter`` constructs a string according to the `Military Grid Reference System`_. 
 Technically, an MGRS coordinate represents a *region* rather than an exact point, so you
-have to specifiy a *precision* qualifier to control the size of the represented region.
+have to specify a *precision* qualifier to control the size of the represented region.
 Example::
 
     MGRSFormatter mgrs( MGRFormatter::PRECISION_1000M );
@@ -204,60 +114,5 @@
 
 For your convenience, ``MouseCoordsTool`` also comes with a stock callback that will
 print the coords to ``osgEarthUtil::Controls::LabelControl``. You can even pass a
-``LabelControl`` to the contructor to make it even easier.
-
-
-NormalMap
----------
-
-The ``NormalMap`` effect will use an ``ImageLayer`` as a bump map texture, adding
-apparent detail to the terrain. 
-
-A *normal map* is a kind of *bump map* in which each texel represents an XYZ normal
-vector instead of an RGB color value. The GPU can then use this information to apply
-lighting to the terrain on a per-pixel basis instead of per-vertex, rendering a
-more detailed-looking surface with the same number of triangles.
-
-First you need to create a normal map layer. You can use the **noise** driver to do
-this. The setup looks like this in the earth file::
-
-    <image name="bump" driver="noise" shared="true" visible="false">
-        <normal_map>true</normal_map>
-    </image>
-    
-The **noise driver** generates Perlin noise; this will fill the image with pseudo-
-random normal vectors. (Setting ``normal_map`` to ``true`` is what tells the driver
-to make normal vectors instead of RGB values. You should also set ``shared`` to 
-``true``; this will make the normal map available to the shader pipeline so that it
-can do the custom lighting calculations.)
-
-Once you have the image layer set up, install the ``NormalMap`` terrain effect and 
-point it at our normal map layer. From the earth file::
-
-    <map>
-        ...
-        <external>
-            <normal_map layer="bump"/>
-        </external>
-
-Or from code::
-
-    NormalMap* normalMap = new NormalMap();
-    normalMap->setNormalMapLayer( myBumpLayer );
-    mapnode->getTerrainEngine()->addEffect( normalMap );
-    
-Please refer to the **normalmap.earth** example for a demo.
-
-
-VerticalScale
--------------
-
-``VerticalScale`` scales the height values of the terrain. Basic usage is::
-
-    VerticalScale* scale = new VerticalScale();
-    scale->setScale( 2.0 );
-    mapnode->getTerrainEngine()->addEffect( scale );
-
-For a demo, run this example::
+``LabelControl`` to the constructor to make it even easier.
 
-    osgearth_verticalscale readymap.earth
diff -Nru osgearth-2.9.0+dfsg/docs/source/faq.rst osgearth-2.10.2+dfsg/docs/source/faq.rst
--- osgearth-2.9.0+dfsg/docs/source/faq.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/faq.rst	2019-07-11 18:30:19.000000000 +0000
@@ -18,17 +18,23 @@
 .....................................
 
     The ``osgEarth::GeoTransform`` class inherits from ``osg::Transform``
-    and will convert map coordinates into OSG world coordinates for you::
+    and will convert map coordinates into OSG world coordinates for you.
+    Place an object at a geospatial position like this::
 
         GeoTransform* xform = new GeoTransform();
-        ...
-        xform->setTerrain( mapNode->getTerrain() );
-        ...
+        GeoPoint point(srs, -121.0, 34.0, 1000.0);
+        xform->setPosition(point);
+
+    If you want your object to automatically clamp to the terrain surface,
+    assign a terrain and leave off the altitude::
+
+        GeoTransform* xform = new GeoTransform();
+        xform->setTerrain(mapNode->getTerrain());
         GeoPoint point(srs, -121.0, 34.0);
         xform->setPosition(point);
 
 
-I added a node, but it has no texture/lighting/etc. in osgEarth. Why?
+I loaded a model, but it has no texture/lighting/etc. in osgEarth. Why?
 .....................................................................
 
     Everything under an osgEarth scene graph is rendered with shaders.
@@ -36,7 +42,7 @@
     need to create shader components in order for them to render properly.
 
     osgEarth has a built-in shader generator for this purpose. Run the
-    shader generator on your node like so:
+    shader generator on your node like so::
 
         osgEarth::Registry::shaderGenerator().run( myNode );
 
@@ -45,87 +51,40 @@
     like sky lighting.
 
 
-How do make the terrain transparent?
-....................................
-
-    By default, the globe will be opaque white when there are no image layers, or when all the image
-    layers have their opacities set to zero. To make the underlying globe transparent, set the 
-    base color of the terrain to a transparent color like so::
-
-        <map>
-            <options>
-                <terrain color="#ffffff00" ...
+Lines or Annotations (FeatureNode, etc.) are not rendering. Why?
+................................................................
 
-    In code, this option is found in the ``MPTerrainEngineOptions`` class::
+    Lines render using a shader that requires some initial state to be set.
+    You can apply this state to your top-level camera (or anywhere else 
+    above the geometry) like so::
     
-        #include <osgEarthDrivers/engine_mp/MPTerrainEngineOptions>
-        using namespace osgEarth::Drivers::MPTerrainEngine;
+        #include <osgEarth/GLUtils>
         ...
-        MPTerrainEngineOptions options;
-        options.color() = osg::Vec4(1,1,1,0);
+        GLUtils::setGlobalDefaults(camera->getOrCreateStateSet());
 
+    For Annotations (FeatureNodes, PlaceNodes, etc.) best practice is to place
+    an Annotation node as a descendant of the MapNode in your scene graph.
+    You can also add them to an AnnotationLayer and add that layer to the Map.
+
+    Annotations need access to the MapNode in order to render properly. If you 
+    cannot place them under the MapNode, you will have to manually install a few
+    things to make them work::
 
-How do I set the resolution of terrain tiles?
-.............................................
-
-    Each tile is a grid of vertices. The number of vertices can vary depending on source data
-    and settings. By default (when you have no elevation data) it is an 17x17 grid, tessellated
-    into triangles.
-    
-    You can expressly set the terrain's tile size by using the Map options.
-    osgEarth will then resample all elevation data to the size you specify::
-
-        <map>
-            <options>
-                <terrain>
-                    <tile_size>65</tile_size> 
-                    ...
-
-
-----
+        #include <osgEarth/CullingUtils>
+        #include <osgEarth/GLUtils>
+        ...
 
-Other Terrain Formats
----------------------
+        // Manully assign the MapNode to your annotation
+        annotationNode->setMapNode(mapNode);
 
-Does osgEarth work with VirtualPlanetBuilder?
-.............................................
+        // In some group above the annotation, install this callback
+        group->addCullCallback(new InstallViewportSizeUniform());
 
-	VirtualPlanetBuilder_ (VPB) is a command-line terrain generation tool. Before osgEarth
-	came along, VPB	was probably the most-used open source tool for building terrains for
-	OSG appliations. We	mention is here because many people ask questions about loading 
-	VPB models or transitioning from VPB to osgEarth.
-	
-	osgEarth differs from VPB in that:
-	
-	* VPB builds static terrain models and saves them to disk. osgEarth generates terrain on
-	  demand as your application runs; you do not (and cannot) save a model to disk.
-	* Changing a VPB terrain generally requires that you rebuild the model. osgEarth does not
-	  require a preprocessing step since it builds the terrain at run time.
-	* osgEarth and VPB both use *GDAL* to read many types of imagery and elevation data from
-	  the local file system. osgEarth also supports network-based data sources through its
-	  plug-in framework.
-
-	osgEarth has a *VPB driver* for "scraping" elevation and imagery tiles from a VPB model.
-    Confiugration of this driver is quite tricky and requires you to understand the details
-    of how VPB models are organized. You're on your own.
-	
-	**Please Note** that this driver only exists as a **last resort** for people that have a VPB
-	model but no longer have access to the source data from which it was built. If at all
-	possible you should feed your source data directly into osgEarth instead of using the VPB
-	driver.
-
-
-Can osgEarth load TerraPage or MetaFlight?
-..........................................
-
-	osgEarth cannot load TerraPage (TXP) or MetaFlight. However, osgEarth does have a
-	"bring your own terrain" plugin that allows you to load an external model and use it as your
-	terrain. The caveat is that since osgEarth doesn't know anything about your terrain model, you
-	will not be able to use some of the features of osgEarth (like being able to add or remove layers).
-	
-	For usage formation, please refer to the ``byo.earth`` example in the repo.
+        // In some group above the annotation, set the GL defaults
+        GLUtils::setGlobalDefaults(group->getOrCreateStateSet());
 
-.. _VirtualPlanetBuilder:	http://www.openscenegraph.com/index.php/documentation/tools/virtual-planet-builder
+    Again: MapNode does all this automatically so this is only necessary if you do
+    not place your annotations as descendants of the MapNode.
 
 
 ----
diff -Nru osgearth-2.9.0+dfsg/docs/source/howtos.rst osgearth-2.10.2+dfsg/docs/source/howtos.rst
--- osgearth-2.9.0+dfsg/docs/source/howtos.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/howtos.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-How To's
-========
-
-
diff -Nru osgearth-2.9.0+dfsg/docs/source/index.rst osgearth-2.10.2+dfsg/docs/source/index.rst
--- osgearth-2.9.0+dfsg/docs/source/index.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/index.rst	2019-07-11 18:30:19.000000000 +0000
@@ -22,7 +22,6 @@
    user/index
    developer/index
    data
-   howto
    references/index
    faq
    releasenotes
diff -Nru osgearth-2.9.0+dfsg/docs/source/install.rst osgearth-2.10.2+dfsg/docs/source/install.rst
--- osgearth-2.9.0+dfsg/docs/source/install.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/install.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-Building osgEarth
-=================
-osgEarth is a cross-platform library. It uses the  CMake cross-platform build system, version 2.8 or newer. This is the same build system that  OpenSceneGraph uses.
-
-Get the source code
--------------------
-#Option 1: Use GIT
-
-osgEarth source is hosted on GitHub. You will need a git client to access it.
-We recommend  TortoiseGit for Windows users.
-
-To clone the repository, point your client at git://github.com/gwaldron/osgearth.git
-
-#Option 2: Download a tarball
-
-To download a tarball, visit http://github.com/gwaldron/osgearth/tags and select the one you want.
-
-
-Get the dependencies
---------------------
-Words can have *emphasis in italics* or be **bold** and you can define
-code samples with back quotes, like when you talk about a command: ``sudo`` 
-gives you super user powers! 
-
diff -Nru osgearth-2.9.0+dfsg/docs/source/ios.rst osgearth-2.10.2+dfsg/docs/source/ios.rst
--- osgearth-2.9.0+dfsg/docs/source/ios.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/ios.rst	2019-07-11 18:30:19.000000000 +0000
@@ -93,7 +93,7 @@
      | Select *OSGEARTH* project in navigator view (top of tree on left)
      | Select *Add Target*
      | Select *Aggregate Target* in the *Other* section, name it lib-build (or whatever)
-     | Select new target and select *Build Phases*, *Target Dependancies*, *+*
+     | Select new target and select *Build Phases*, *Target Dependencies*, *+*
      | Select all the libs and plugins 
      | Select the new target as the current build target (combo box to right of the play/run button)
      | Build
diff -Nru osgearth-2.9.0+dfsg/docs/source/references/drivers/feature/index.rst osgearth-2.10.2+dfsg/docs/source/references/drivers/feature/index.rst
--- osgearth-2.9.0+dfsg/docs/source/references/drivers/feature/index.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/references/drivers/feature/index.rst	2019-07-11 18:30:19.000000000 +0000
@@ -9,3 +9,4 @@
    ogr
    tfs
    wfs
+   mapnikvectortiles
diff -Nru osgearth-2.9.0+dfsg/docs/source/references/drivers/tile/cesiumion.rst osgearth-2.10.2+dfsg/docs/source/references/drivers/tile/cesiumion.rst
--- osgearth-2.9.0+dfsg/docs/source/references/drivers/tile/cesiumion.rst	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/references/drivers/tile/cesiumion.rst	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,25 @@
+Cesium Ion
+==========
+The Cesium Ion plugin reads imagery tiles from the `Cesium Ion <https://cesium.com>`_ service.
+By providing your own access_token you'll gain access to your layers.
+
+Cesium Ion requires your CURL library to be compiled with SSL support to support https links.
+
+Example usage::
+
+    <image name="cesiumion bluemarble" driver="cesiumion">
+        <asset_id>3845</asset_id>    
+        <token>eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0NDViM2NkNi0xYTE2LTRlZTUtODBlNy05M2Q4ODg4M2NmMTQiLCJpZCI6MjU5LCJpYXQiOjE1MTgxOTc4MDh9.sld5jPORDf_lWavMEsugh6vHPnjR6j3qd1aBkQTswNM</token>
+    </image>
+
+Properties:
+
+    :server:         The Cesium Ion server to access.  Default is https://api.cesium.com/
+    :asset_id:       The id of the asset to access.  Only imagery layers are currently supported.
+    :token:          Your access token to the Cesium Ion service
+    :format:         The format of the layer.  Default is png
+    
+Also see:
+
+    ``cesium_ion.earth`` in the repo ``tests`` folder.
+
diff -Nru osgearth-2.9.0+dfsg/docs/source/references/drivers/tile/index.rst osgearth-2.10.2+dfsg/docs/source/references/drivers/tile/index.rst
--- osgearth-2.9.0+dfsg/docs/source/references/drivers/tile/index.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/references/drivers/tile/index.rst	2019-07-11 18:30:19.000000000 +0000
@@ -9,6 +9,7 @@
    agglite
    arcgis
    arcgis_map_cache
+   cesiumion
    colorramp
    debug
    gdal
diff -Nru osgearth-2.9.0+dfsg/docs/source/references/drivers/tile/noise.rst osgearth-2.10.2+dfsg/docs/source/references/drivers/tile/noise.rst
--- osgearth-2.9.0+dfsg/docs/source/references/drivers/tile/noise.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/references/drivers/tile/noise.rst	2019-07-11 18:30:19.000000000 +0000
@@ -1,7 +1,7 @@
 Noise
 ==========================================
 The noise plugin procedurally generates fractal terrain based on a Perlin noise generator called `libnoise`_.
-We will explain how it works here, but you can also refer the the libnoise documentation for the meaning and
+We will explain how it works here, but you can also refer to the libnoise documentation for the meaning and
 application of the properties below.
 
 There are lots of ways to use the ``noise`` driver. After the properties list there are 
@@ -23,7 +23,7 @@
 Advanced Properties:
 
     :frequency:         The reciprocal of the *resolution* above. (Since osgEarth is a mapping SDK,
-                        it is usually more intuitive to specifiy the resolution and leave this empty.)
+                        it is usually more intuitive to specify the resolution and leave this empty.)
     :persistence:       Rate at which the *scale* decreases as the noise function traverses each
                         higher octave. Scale(octave N+1) = Scale(octave N) * Persistence.
     :lacunarity:        Rate at which the *frequency* increases as the noise function traverses each
diff -Nru osgearth-2.9.0+dfsg/docs/source/references/earthfile.rst osgearth-2.10.2+dfsg/docs/source/references/earthfile.rst
--- osgearth-2.9.0+dfsg/docs/source/references/earthfile.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/references/earthfile.rst	2019-07-11 18:30:19.000000000 +0000
@@ -10,7 +10,7 @@
     <map name    = "my map"
          type    = "geocentric"
          version = "2" >
-         
+
         <:ref:`options   <MapOptions>`>
         <:ref:`image     <ImageLayer>`>
         <:ref:`elevation <ElevationLayer>`>
@@ -90,74 +90,55 @@
 
     <map>
         <options>
-            <terrain driver                = "mp"
+            <terrain driver                = "rex"
                      lighting              = "true"
                      min_tile_range_factor = "6"
-                     min_lod               = "0"
-                     max_lod               = "23"
                      first_lod             = "0"
-                     cluster_culling       = "true"
-                     mercator_fast_path    = "true"
                      blending              = "false"
                      color                 = "#ffffffff"
                      tile_size             = "17"
                      normalize_edges       = "false"
-                     elevation_smoothing   = "false"
-                     normal_maps           = "false">
+                     compress_normal_maps  = "false"
+                     normal_maps           = "true"
+                     min_expiry_frames     = "0"
+                     min_expiry_time       = "0" >
 
 +-----------------------+--------------------------------------------------------------------+
 | Property              | Description                                                        |
 +=======================+====================================================================+
-| driver                | Terrain engine plugin to load. Default = "mp".                     |
+| driver                | Terrain engine plugin to load. Default = "rex".                    |
 |                       | Please refer to the driver reference guide for properties specific |
 |                       | to each individual plugin.                                         |
 +-----------------------+--------------------------------------------------------------------+
-| lighting              | Whether to enable GL_LIGHTING on the terrain. By default this is   |
-|                       | unset, meaning it will inherit the lighting mode of the scene.     |
+| lighting              | Whether the terrain will accept lighting if present. Default=true  |
 +-----------------------+--------------------------------------------------------------------+
 | min_tile_range_factor | Determines how close you need to be to a terrain tile for it to    |
 |                       | display. The value is the ratio of a tile's extent to its          |
 |                       | For example, if a tile has a 10km radius, and the MTRF=7, then the |
-|                       | tile will become visible at a range of about 70km.                 |
-+-----------------------+--------------------------------------------------------------------+
-| min_lod               | The lowest level of detail that the terrain is guaranteed to       |
-|                       | display, even if no source data is available at that LOD. The      |
-|                       | terrain will continue to subdivide up to this LOD even if it runs  |
-|                       | out of data.                                                       |
-+-----------------------+--------------------------------------------------------------------+
-| max_lod               | The highest level of detail at which the terrain will render, even |
-|                       | if there is higher resolution source data available.               |
+|                       | tile will become visible at a range of about 70km. Default=6.0     |
 +-----------------------+--------------------------------------------------------------------+
 | first_lod             | The lowest level of detail at which the terrain will display tiles.|
 |                       | I.e., the terrain will never display a lower LOD than this.        |
 +-----------------------+--------------------------------------------------------------------+
-| cluster_culling       | Disable "cluster culling" by setting this to ``false``. You may    |
-|                       | wish to do this is you are placing the camera underground.         |
-+-----------------------+--------------------------------------------------------------------+
-| mercator_fast_path    | The *mercator fast path* allows the renderer to display Mercator   |
-|                       | projection imagery without reprojecting it. You can disable this   |
-|                       | technique (and allow reprojection as necessary) by setting this    |
-|                       | to ``false``.                                                      |
-+-----------------------+--------------------------------------------------------------------+
 | blending              | Set this to ``true`` to enable GL blending on the terrain's        |
 |                       | underlying geometry. This lets you make the globe partially        |
 |                       | transparent. This is handy for seeing underground objects.         |
 +-----------------------+--------------------------------------------------------------------+
 | tile_size             | The dimensions of each terrain tile. Each terrain tile will have   |
-|                       | ``tile_size`` X ``tile_size`` verticies.                           |
+|                       | ``tile_size`` X ``tile_size`` vertices. Default=17                 |
 +-----------------------+--------------------------------------------------------------------+
 | normalize_edges       | Calculate normal vectors along the edges of terrain tiles so that  |
-|                       | lighting appears smoother from one tile to the next.               |
-+-----------------------+--------------------------------------------------------------------+
-| elevation_smoothing   | Whether to smooth the transition across elevation data insets.     |
-|                       | Doing so will give a smoother appearance to disparate height field |
-|                       | data, but elevations will not be as accurate. Default = false      |
+|                       | lighting appears smoother from one tile to the next. Default=false |
 +-----------------------+--------------------------------------------------------------------+
 | normal_maps           | Whether to generate and use normal maps in place of geometry       |
 |                       | normals. Normal maps are used with lighting to create the          |
 |                       | appearance of higher-resolution terrain than can be represented    |
 |                       | with triangles alone. Default is engine-dependent.                 |
 +-----------------------+--------------------------------------------------------------------+
+| compress_normal_maps  | Whether to compress normal maps before sending them to the GPU.    |
+|                       | You must have the NVIDIA Texture Tools image processor plugin      |
+|                       | built in your OpenSceneGraph build.  Default is false              |
++-----------------------+--------------------------------------------------------------------+
 | min_expiry_frames     | The number of frames that a terrain tile hasn't been seen before   |
 |                       | it can be considered for expiration. Default = 0                   |
 +-----------------------+--------------------------------------------------------------------+
@@ -175,30 +156,31 @@
 .. parsed-literal::
 
     <map>
-        <image name           = "my image layer"
-               driver         = "gdal"
-               nodata_image   = "http://readymap.org/nodata.png"
-               opacity        = "1.0"
-               min_range      = "0"
-               max_range      = "100000000"
-               min_level      = "0"
-               max_level      = "23"
-               min_resolution = "100.0"
-               max_resolution = "0.0"
-               max_data_level = "23"
-               enabled        = "true"
-               visible        = "true"
-               shared         = "false"
-               shared_sampler = "string"
-               shared_matrix  = "string"
-               coverage       = "false"
-               feather_pixels = "false"
-               min_filter     = "LINEAR"
-               mag_filter     = "LINEAR" 
-               texture_compression = "auto" >
+        <image name              = "my image layer"
+               driver            = "gdal"
+               nodata_image      = "http://readymap.org/nodata.png"
+               opacity           = "1.0"
+               min_range         = "0"
+               max_range         = "100000000"
+               attenuation_range = "0"
+               min_level         = "0"
+               max_level         = "23"
+               min_resolution    = "100.0"
+               max_resolution    = "0.0"
+               max_data_level    = "23"
+               enabled           = "true"
+               visible           = "true"
+               shared            = "false"
+               shared_sampler    = "string"
+               shared_matrix     = "string"
+               coverage          = "false"
+               min_filter        = "LINEAR"
+               mag_filter        = "LINEAR"
+               blend             = "interpolate"
+               altitude          = "0"
+               texture_compression = "none" >
 
             <:ref:`cache_policy <CachePolicy>`>
-            <:ref:`color_filters <ColorFilterChain>`>
             <:ref:`proxy <ProxySettings>`>
 
 
@@ -223,6 +205,9 @@
 | max_range             | Maximum visibility range, in meters from the camera. The tile will |
 |                       | not be drawn beyond this range.                                    |
 +-----------------------+--------------------------------------------------------------------+
+| attenuation_range     | Distance over which to blend towards min_range or max_range.       |
+|                       | (not supported for text or icons, only geometry)                   |
++-----------------------+--------------------------------------------------------------------+
 | min_level             | Minimum visibility level of detail.                                |
 +-----------------------+--------------------------------------------------------------------+
 | max_level             | Maximum visibility level of detail.                                |
@@ -262,10 +247,6 @@
 |                       | coverage disables any interpolation, filtering, or compression as  |
 |                       | these will corrupt the sampled data values on the GPU.             |
 +-----------------------+--------------------------------------------------------------------+
-| feather_pixels        | Whether to feather out alpha regions for this image layer with the |
-|                       | featherAlphaRegions function. Used to get proper blending when you |
-|                       | have datasets that abutt exactly with no overlap.                  |
-+-----------------------+--------------------------------------------------------------------+
 | min_filter            | OpenGL texture minification filter to use for this layer.          |
 |                       | Options are NEAREST, LINEAR, NEAREST_MIPMAP_NEAREST,               |
 |                       | NEAREST_MIPMIP_LINEAR, LINEAR_MIPMAP_NEAREST, LINEAR_MIPMAP_LINEAR |
@@ -277,6 +258,13 @@
 |                       | "none" to disable.                                                 |
 |                       | "fastdxt" to use the FastDXT real time DXT compressor              |
 +-----------------------+--------------------------------------------------------------------+
+| blend                 | "modulate" to multiply pixels with the framebuffer;                |
+|                       | "interpolate" to blend with the framebuffer based on alpha (def)   |
++-----------------------+--------------------------------------------------------------------+
+| altitude              | Meters above sea level at which to render this image layer. You    |
+|                       | can use this to render a weather or cloud layer above the ground,  |
+|                       | for example, as a visual aide. Default=0                           |
++-----------------------+--------------------------------------------------------------------+
 
 
 .. _ElevationLayer:
@@ -345,15 +333,13 @@
 
 Model Layer
 ~~~~~~~~~~~
-A *Model Layer* renders non-terrain data, like vector features or external 3D models.
+A *Model Layer* renders an external 3D model as a map layer.
 
 .. parsed-literal::
 
     <map>
         <model name    = "my model layer"
-               driver  = "feature_geom"
-               enabled = "true"
-               visible = "true" >
+               driver  = "simple" >
 
 
 +-----------------------+--------------------------------------------------------------------+
@@ -365,18 +351,12 @@
 |                       | Please refer to the driver reference guide for properties specific |
 |                       | to each individual plugin.                                         |
 +-----------------------+--------------------------------------------------------------------+
-| enabled               | Whether to include this layer in the map. You can only set this at |
-|                       | load time; it is just an easy way of "commenting out" a layer in   |
-|                       | the earth file.                                                    |
-+-----------------------+--------------------------------------------------------------------+
-| visible               | Whether to draw the layer.                                         |
-+-----------------------+--------------------------------------------------------------------+
 
 The Model Layer also allows you to define a cut-out mask. The terrain engine will cut a hole
 in the terrain surface matching a *boundary geometry* that you supply. You can use the tool
 *osgearth_boundarygen* to create such a geometry.
 
-This is useful if you have an external terrain model and you want to insert it into the 
+This is useful if you have an external terrain model and you want to insert it into the
 osgEarth terrain. The model MUST be in the same coordinate system as the terrain.
 
 .. parsed-literal::
@@ -391,11 +371,11 @@
 by using an inline geometry:
 
 .. parsed-literal::
-    
+
     <features ...>
         <geometry>POLYGON((120 42 0, 121 41 0, 121 40 0))</geometry>
 
-Or you use a shapefile or other feature source, in which case osgEarth will use the 
+Or you use a shapefile or other feature source, in which case osgEarth will use the
 *first* feature in the source.
 
 Refer to the *mask.earth* sample for an example.
@@ -499,27 +479,8 @@
            port     = "8080"
            username = "jason"
            password = "helloworld" >
-           
-Hopefully the properties are self-explanatory.
-
-
 
-.. _ColorFilterChain:
-
-Color Filters
-~~~~~~~~~~~~~
-A *color filter* is a pluggable shader that can alter the appearance of the
-color data in a layer before the osgEarth engine composites it into the terrain.
-
-.. parsed-literal::
-
-    <image>
-        <color_filters>
-            <gamma rgb="1.3">
-            ...
-            
-You can chain multiple color filters together. Please refer to :doc:`/references/colorfilters` for
-details on color filters.
+Hopefully the properties are self-explanatory.
 
 .. _Libraries:
 
@@ -531,8 +492,8 @@
 
     <libraries>a</libraries>
 
-Multiple library names could be listed by using ';' as separator. 
-    
+Multiple library names could be listed by using ';' as separator.
+
     <libraries>a;b;c;d;e</libraries>
 
 The libraries are searched in the osg library path and library name needs to follow the osg nodekit library name convention (postfixed with osg library version)
diff -Nru osgearth-2.9.0+dfsg/docs/source/references/symbology.rst osgearth-2.10.2+dfsg/docs/source/references/symbology.rst
--- osgearth-2.9.0+dfsg/docs/source/references/symbology.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/references/symbology.rst	2019-07-11 18:30:19.000000000 +0000
@@ -30,7 +30,7 @@
 -----------
 
 These are the basic value types. In the symbol tables on this page, each
-property includes the value type in parantheses following its description.
+property includes the value type in parentheses following its description.
 
   :float:                 Floating-point number
   :float with units:      Floating-point number with unit designator, e.g.
@@ -40,6 +40,7 @@
   :integer:               Integral number
   :numeric_expr:          Expression (simple or JavaScript) resolving to a number
   :string:                Simple text string
+  :boolean:               true or false
   :string_expr:           Expression (simple or JavaScript) resolving to a text string
   :uri_string:            String denoting a resource location (like a URL or file path).
                           URIs can be absolute or relative; relative URIs are always
@@ -57,53 +58,61 @@
 
 +-----------------------+---------------------------------------+----------------------------+
 | Property              | Description                           | Value(s)                   |
-+=======================+=======================================+============================+
-| fill                  | Fill color for a polygon.             | HTML color                 |
-+-----------------------+---------------------------------------+----------------------------+
-| stroke                | Line color (or polygon outline color, | HTML color                 |
-|                       | if ``fill`` is present)               |                            |
-+-----------------------+---------------------------------------+----------------------------+
-| stroke-width          | Line width                            | float with units           |
-+-----------------------+---------------------------------------+----------------------------+
-| stroke-min-pixels     | Minimum rendering width; Prevents a   | float (pixels)             |
-|                       | line from getting thinner than this   |                            |
-|                       | value in pixels. Only applies when    |                            |
-|                       | the ``stroke-width`` is NOT in pixels |                            |
-+-----------------------+---------------------------------------+----------------------------+
-| stroke-tessellation   | Number of times to subdivide a line   | integer                    |
-+-----------------------+---------------------------------------+----------------------------+
-| stroke-linejoin       | Join style for polygonized lines.     | miter, round               |
-|                       | Only applies with ``stroke-width``    |                            |
-|                       | is in world units (and not pixels)    |                            |
-+-----------------------+---------------------------------------+----------------------------+
-| stroke-linecap        | Cap style for polygonized lines.      | square, flat, round        |
-|                       | Only applies with ``stroke-width``    |                            |
-|                       | is in world units (and not pixels)    |                            |
-+-----------------------+---------------------------------------+----------------------------+
-| stroke-rounding-ratio | For joins and caps that are set to    | float (0.4)                |
-|                       | ``round``, the resolution of the      |                            |
-|                       | rounded corner. Value is the ratio of |                            |
-|                       | line width to corner segment length.  |                            |
-+-----------------------+---------------------------------------+----------------------------+
-| stroke-stipple-pattern| Stippling pattern bitmask. Each set   | integer (65535)            |
-|                       | bit represents an "on" pixel in the   |                            |
-|                       | pattern.                              |                            |
-+-----------------------+---------------------------------------+----------------------------+
-| stroke-stipple-factor | Stipple factor for pixel-width lines. | integer (1)                |
-|                       | Number of times to repeat each bit in |                            |
-|                       | the stippling pattern                 |                            |
-+-----------------------+---------------------------------------+----------------------------+
-| stroke-crease-angle   | When outlining extruded polygons,     | float degrees (0.0)        |
-|                       | only draw a post outline if the angle |                            |
-|                       | between the adjoining faces exceeds   |                            |
-|                       | this value. This has the effect of    |                            |
-|                       | only outlining corners that are       |                            |
-|                       | sufficiently "sharp".                 |                            |
-+-----------------------+---------------------------------------+----------------------------+
-| point-fill            | Fill color for a point.               | HTML color                 |
-+-----------------------+---------------------------------------+----------------------------+
-| point-size            | Size for a GL point geometry          | float (1.0)                |
-+-----------------------+---------------------------------------+----------------------------+
++================================+=======================================+============================+
+| fill                           | Fill color for a polygon.             | HTML color                 |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke                         | Line color (or polygon outline color, | HTML color                 |
+|                                | if ``fill`` is present)               |                            |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-width                   | Line width                            | float with units           |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-smooth                  | Enable line antialiasing              | boolean (false)            |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-min-pixels              | Minimum rendering width; Prevents a   | float (pixels)             |
+|                                | line from getting thinner than this   |                            |
+|                                | value in pixels. Only applies when    |                            |
+|                                | the ``stroke-width`` is NOT in pixels |                            |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-tessellation-size       | Subdivide the line with this as the   | float with units           |
+|                                | maximum segment length. Use to make   |                            |
+|                                | long lines conform to the surface     |                            |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-tessellation-segments   | Number of times to subdivide a line   | integer (0)                |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-linejoin                | Join style for polygonized lines.     | miter, round               |
+|                                | Only applies with ``stroke-width``    |                            |
+|                                | is in world units (and not pixels)    |                            |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-linecap                 | Cap style for polygonized lines.      | square, flat, round        |
+|                                | Only applies with ``stroke-width``    |                            |
+|                                | is in world units (and not pixels)    |                            |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-rounding-ratio          | For joins and caps that are set to    | float (0.4)                |
+|                                | ``round``, the resolution of the      |                            |
+|                                | rounded corner. Value is the ratio of |                            |
+|                                | line width to corner segment length.  |                            |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-stipple-pattern         | Stippling pattern bitmask. Each set   | integer (65535)            |
+|                                | bit represents an "on" pixel in the   |                            |
+|                                | pattern.                              |                            |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-stipple-factor          | Stipple factor for pixel-width lines. | integer (1)                |
+|                                | Number of times to repeat each bit in |                            |
+|                                | the stippling pattern                 |                            |
++--------------------------------+---------------------------------------+----------------------------+
+| stroke-crease-angle            | When outlining extruded polygons,     | float degrees (0.0)        |
+|                                | only draw a post outline if the angle |                            |
+|                                | between the adjoining faces exceeds   |                            |
+|                                | this value. This has the effect of    |                            |
+|                                | only outlining corners that are       |                            |
+|                                | sufficiently "sharp".                 |                            |
++--------------------------------+---------------------------------------+----------------------------+
+| point-fill                     | Fill color for a point.               | HTML color                 |
++--------------------------------+---------------------------------------+----------------------------+
+| point-size                     | Size for a GL point geometry          | float (1.0)                |
++--------------------------------+---------------------------------------+----------------------------+
+| point-smooth                   | Altialiasing/rounding                 | boolean (false)            |
++--------------------------------+---------------------------------------+----------------------------+
 
 
 Altitude
@@ -214,7 +223,7 @@
 |                         | osgEarth determines the minimal set of appropriate skins from      |
 |                         | which to choose and chooses one at random. By setting this seed    |
 |                         | value you can ensure that the same "random" selection happens each |
-|                         | time you run the appplication.  (integer)                          |
+|                         | time you run the application.  (integer)                           |
 +-------------------------+--------------------------------------------------------------------+
 
 
@@ -272,7 +281,7 @@
 |                                | randomization is repeatable each time you run the app. (integer)   |
 +--------------------------------+--------------------------------------------------------------------+
 | icon-occlusion-cull            | Whether to occlusion cull the text so they do not display          |
-|                                | when line of sight is obstructed by terrain                        | 
+|                                | when line of sight is obstructed by terrain                        |
 +--------------------------------+--------------------------------------------------------------------+
 | icon-occlusion-cull-altitude   | The viewer altitude (MSL) to start occlusion culling               |
 |                                | when line of sight is obstructed by terrain                        |
@@ -338,7 +347,7 @@
 +-------------------------------+--------------------------------------------------------------+
 | render-bin                    | render bin to use for sorting (string)                       |
 +-------------------------------+--------------------------------------------------------------+
-| render-depth-offset           | Enable or disable Depth Offseting. Depth offsetting is a     |
+| render-depth-offset           | Enable or disable Depth Offsetting. Depth offsetting is a    |
 |                               | GPU technique that modifies a fragment's depth value,        |
 |                               | simulating the rendering of that object closer or farther    |
 |                               | from the viewer than it actually is. It is a mechanism for   |
@@ -365,7 +374,7 @@
 Text
 ----
 
-The *text symbol* (SDK: ``TextSymbol``) controls the existance and appearance of text labels.
+The *text symbol* (SDK: ``TextSymbol``) controls the existence and appearance of text labels.
 
 +--------------------------------+--------------------------------------------------------------------+
 | Property                       | Description                                                        |
@@ -377,14 +386,14 @@
 | text-font                      | Name of the font to use (system-dependent). For example, use       |
 |                                | "arialbd" on Windows for Arial Bold.                               |
 +--------------------------------+--------------------------------------------------------------------+
-| text-halo                      | Outline color of the text; Omit this propery altogether for no     |
+| text-halo                      | Outline color of the text; Omit this property altogether for no    |
 |                                | outline. (HTML Color)                                              |
 +--------------------------------+--------------------------------------------------------------------+
-| text-halo-offset               | Outline thickness (float, pixels)                                  |
+| text-halo-offset               | Outline thickness (float, % of glyph width, default 0.0625)        |
 +--------------------------------+--------------------------------------------------------------------+
-| text-offset-x                  | The x offset of the text in pixels                                 |
+| text-offset-x                  | The x offset of the text in % of glyph width, default 0.0625       |
 +--------------------------------+--------------------------------------------------------------------+
-| text-offset-y                  | The y offset of the text in pixels                                 |
+| text-offset-y                  | The y offset of the text in % of glyph width, default 0.0625       |
 +--------------------------------+--------------------------------------------------------------------+
 | text-align                     | Alignment of the text string relative to its anchor point:         |
 |                                |   * ``left-top``                                                   |
@@ -422,7 +431,7 @@
 |                                | screen. (boolean)                                                  |
 +--------------------------------+--------------------------------------------------------------------+
 | text-occlusion-cull            | Whether to occlusion cull the text so they do not display          |
-|                                | when line of sight is obstructed by terrain                        | 
+|                                | when line of sight is obstructed by terrain                        |
 +--------------------------------+--------------------------------------------------------------------+
 | text-occlusion-cull-altitude   | The viewer altitude (MSL) to start occlusion culling               |
 |                                | when line of sight is obstructed by terrain                        |
diff -Nru osgearth-2.9.0+dfsg/docs/source/releasenotes.rst osgearth-2.10.2+dfsg/docs/source/releasenotes.rst
--- osgearth-2.9.0+dfsg/docs/source/releasenotes.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/releasenotes.rst	2019-07-11 18:30:19.000000000 +0000
@@ -1,10 +1,54 @@
 Release Notes
 =============
 
+Version 2.10.1 (April 2019)
+---------------------------
+* Bug fix and performance release based on the 2.10 branch.
+
+Version 2.10 (November 2018)
+----------------------------
+* REX terrain engine promoted to default. Old MP engine is now in legacy support mode.
+* Removed the osgEarthQt nodekit from the SDK, along with all Qt examples
+* Cleanup of the internal serialization architecture (i.e. osgEarth::Config)
+* Compatibility with OSG 3.6.x release/branch
+* GL3 and GLCORE profile support
+* VirtualProgram performance improvements
+* New LineDrawable and PointDrawable classes for cross-GL-profile support
+* Better progress/cancelation handling throughout the SDK, including feature subsystem
+* Prototype support for ECI reference frames
+* Support for "new" osgText implementation in VirtualProgram framework
+* New ClusterNode utility class for clustering proximite objects
+* Removed deprecations: MaskNode, Profiler, StateSetLOD, TileKeyDataStore, WrapperLayer, MarkerResource, MarkerSymbol, StencilVolumeNode, TritonNode, AnnotationEvents, PolyhedralLineOfSight, some CullingUtils objects
+
+Version 2.9 (February 2018)
+---------------------------
+
+* New "REX" terrain engine that supports random access tile loading, terrain morphing, faster add/remove
+* New Map/Layer architecture to begin standardizing "everything is a layer" approach
+* Per-layer shaders, configuration from earth file (rex only)
+* Experimental screen-space GPU lines
+* Better support for GLCORE, GL 3.3+, and VAOs
+* Transition several Extension/etc. to Layers (AnnotationLayer, MGRSGraticule, FeatureModelLayer, SimpleOceanLayer)
+* Reworked the mask generate for REX to support skirts
+* Synchronous pre-loading of first-LOD terrain data
+* GeoTransform node, Annotations self-discover terrain (don't need to pass in MapNode anymore)
+* Experimental FlatteningLayer to flatten the terrain based on feature data
+* Combine multiple shaders in a single file/string with [break]
+* New ViewFitter class fits to view to a set of points
+* Refactored splatting into SplatLayer, GroundCoverLayer
+* New improved ephemeris calculator for sun position
+* New PagedNode class for easier paging
+* Support new OSG 3.5.8 text implementation
+* Support GEOS 3.6+
+* Added core LandCover/LandCoverLayer classes for classification data
+* Added Future/Promise construct for asynchronous operations
+* Re-written MGRS, UTM and GARS graticules
+* Lots of bug fixes
+
 Version 2.8 (September 2016)
 ---------------------------
 
-* Disabled feature tesselation tiling in BuildGeometryFilter unless max_polygon_tiling_angle is explicitly set.  Cropping code was causing issues especially around the poles.  Need to come up with a more general solution in the future.
+* Disabled feature tessellation tiling in BuildGeometryFilter unless max_polygon_tiling_angle is explicitly set.  Cropping code was causing issues especially around the poles.  Need to come up with a more general solution in the future.
 * Better support for osg::Fog in VirtualPrograms with FogEffect.  Implemented multiple fog modes.
 * Always applying min_range and max_range in MPGeometry to prevent uniform leakage.
 * Proper support for centroid clamping for MultiPolygons.
diff -Nru osgearth-2.9.0+dfsg/docs/source/startup.rst osgearth-2.10.2+dfsg/docs/source/startup.rst
--- osgearth-2.9.0+dfsg/docs/source/startup.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/startup.rst	2019-07-11 18:30:19.000000000 +0000
@@ -2,10 +2,12 @@
 =================
 
 osgEarth is a cross-platform library. It uses the CMake_ build system.
-You will need **version 2.8** or newer. 
+You will need **version 2.8** or newer.
 (This is the same build system that OpenSceneGraph_ uses.)
 
-    NOTE: To build osgEarth for **iOS** see :doc:`ios`
+**Platform specific guides**
+    * :doc:`vcpkg`
+    * :doc:`ios`
 
 Get the Source Code
 -------------------
@@ -32,37 +34,38 @@
 **Required dependencies**
 
     * OpenSceneGraph_ 3.4 or later
-    * GDAL_ 1.9.2 or later - Geospatial Data Abstraction Layer
+    * GDAL_ 2.0 or later - Geospatial Data Abstraction Layer
     * CURL_ - HTTP transfer library (comes with OpenSceneGraph_ 3rd party library distros)
-      
+
 **Recommended pre-built dependencies**
 
     * AlphaPixel_ has pre-built OSG_ and 3rd-party dependencies for various architectures.
     * Pre-built `GDAL binaries`_ for various architectures.
-    
-**Optional depedencies**: osgEarth will compile without them. Look and decide what you need
+    * Use vcpkg_ to install required dependencies
+
+**Optional dependencies**: osgEarth will compile without them. Look and decide what you need
 
     * GEOS_ 3.2.0 or later - C++ library for topological operations.
       osgEarth uses GEOS to perform various geometry operations like buffering and intersections.
       If you plan to use vector feature data in osgEarth, you probably want this.
-	
+
 	* SQLite_ - Self-contained, serverless, zero-configuration, transactional SQL database engine.
 	  Used for accessing sqlite/mbtiles datasets. You may need these tips to create the necessary
 	  .lib file from the .def and .dll files included in the Windows binaries:
 	  http://eli.thegreenplace.net/2009/09/23/compiling-sqlite-on-windows
-      
-    * QT_ - Cross-platform UI framework. Used to built the osgEarthQt support library, which is
+
+    * QT_ 5.4 or later - Cross-platform UI framework. Used to built the osgEarthQt support library, which is
       useful (though not required) for building Qt applications that us osgEarth.  Point the
       ``QT_QMAKE_EXECUTABLE`` CMake variable to the ``qmake.exe`` you want to use and CMake will
       populate all the other QT variables.
 
-    
+
 Build it
 --------
 
 Make sure you built OSG_ and all the dependencies first.
 
-osgEarth uses CMake_, version 2.8 or later. Since OSG_ uses CMake_ as well, 
+osgEarth uses CMake_, version 2.8 or later. Since OSG_ uses CMake_ as well,
 once you get OSG built the process should be familiar.
 
 Here are a few tips.
@@ -70,15 +73,15 @@
     * Always do an "out-of-source" build with CMake. That is, use a build directory
       that is separate from the source code. This makes it easier to maintain separate
       versions and to keep GIT updates clean.
-      
+
     * For optional dependencies (like GEOS_), just leave the CMake field blank
       if you are not using it.
-      
+
     * For the OSG dependencies, just input the **OSG_DIR** variable, and when you generate
       CMake will automatically find all the other OSG directories.
-      
+
     * As always, check `the forum`_ if you have problems!
-  
+
 **Good luck!!**
 
 ----
@@ -91,12 +94,12 @@
 .. _OpenSceneGraph: http://openscenegraph.org
 .. _OSG:            http://openscenegraph.org
 .. _CURL:           http://curl.haxx.se/libcurl/
-.. _GEOS:           http://trac.osgeo.org/geos/ 
+.. _GEOS:           http://trac.osgeo.org/geos/
 .. _GDAL:           http://www.gdal.org/
 .. _GDAL binaries:  http://www.gisinternals.com/
 .. _FWTools:        http://fwtools.maptools.org/
 .. _AlphaPixel:     http://downloads.alphapixel.org/
 .. _Mike Weiblen:   http://mew.cx/osg/
 .. _the forum:      http://forum.osgearth.org
-.. _LevelDB:        https://github.com/pelicanmapping/leveldb
 .. _SQLite:         http://www.sqlite.org/
+.. _vcpkg:          https://github.com/Microsoft/vcpkg
diff -Nru osgearth-2.9.0+dfsg/docs/source/user/caching.rst osgearth-2.10.2+dfsg/docs/source/user/caching.rst
--- osgearth-2.9.0+dfsg/docs/source/user/caching.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/user/caching.rst	2019-07-11 18:30:19.000000000 +0000
@@ -106,7 +106,7 @@
 Precedence of Cache Policy Settings
 -----------------------------------
 Since you can set caching policies in various places, we need to establish
-precendence. Here are the rules.
+precedence. Here are the rules.
 
 - **Map settings**. This is a cache policy set in the ``Map`` object on in the 
   ``<map><options>`` block in an earth file. This sets the default cache policy for every
diff -Nru osgearth-2.9.0+dfsg/docs/source/user/earthfiles.rst osgearth-2.10.2+dfsg/docs/source/user/earthfiles.rst
--- osgearth-2.9.0+dfsg/docs/source/user/earthfiles.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/user/earthfiles.rst	2019-07-11 18:30:19.000000000 +0000
@@ -28,7 +28,7 @@
 Here is a very simple example that reads data from a GeoTIFF file on the local
 file system and renders it as a geocentric round Earth scene::
 
-    <map name="MyMap" type="geocentric" version="2">
+    <map name="MyMap">
         <image name="bluemarble" driver="gdal">
             <url>world.tif</url>
         </image>
@@ -44,8 +44,6 @@
 driver. To learn more about drivers and how to configure each one, please
 refer to the `Driver Reference Guide`_.
 
-    *Note: the ``version`` number is required!*
-
 
 Multiple Image Layers
 ---------------------
@@ -57,7 +55,7 @@
 To add multiple images to a Earth File, simply add multiple "image" blocks
 to your Earth File::
 
-    <map name="Transportation" type="geocentric" version="2">
+    <map name="Transportation">
     
         <!--Add a base map of the blue marble data-->
         <image name="bluemarble" driver="gdal">
@@ -84,7 +82,7 @@
 Adding elevation data (sometimes called "terrain data") to an Earth File is 
 very similar to adding images. Use an ``elevation`` block like so::
 
-    <map name="Elevation" type="geocentric" version="2">
+    <map name="Elevation">
     
         <!--Add a base map of the blue marble data-->
         <image name="bluemarble" driver="gdal">
@@ -123,7 +121,7 @@
 
 Here's an example cache setup::
 
-    <map name="TMS Example" type="geocentric" version="2">
+    <map name="TMS Example">
     
         <image name="metacarta blue marble" driver="tms">
             <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
diff -Nru osgearth-2.9.0+dfsg/docs/source/user/features.rst osgearth-2.10.2+dfsg/docs/source/user/features.rst
--- osgearth-2.9.0+dfsg/docs/source/user/features.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/user/features.rst	2019-07-11 18:30:19.000000000 +0000
@@ -56,7 +56,7 @@
 Here is a *model layer* that renders an ESRI Shapefile as a series of yellow lines,
 rendered as OSG line geometry::
 
-    <model name="my layer" driver="feature_geom">
+    <feature_model name="boundaries">
         <features name="states" driver="ogr">
             <url>states.shp</url>
         </features>
@@ -68,7 +68,26 @@
                 }
             </style>
         </styles>
-    </model>
+    </feature_model>
+
+You can also reference your feature data as a separate layer. This is useful if you 
+have multiple feature layers that use the same dataset::
+
+    <feature_source name="data_layer" driver="ogr">
+        <url>states.shp</url>
+    </feature_source>
+
+    <feature_model name="boundaries" feature_source="data_layer">
+        <styles>
+            <style type="text/css">
+                states {
+                    stroke:       #ffff00;
+                    stroke-width: 2.0;
+                }
+            </style>
+        </styles>
+    </feature_model>
+
 
 Components of a Feature Layer
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -77,7 +96,8 @@
 to any feature layer
 
   * The ``<features>`` block describes the actual feature source; i.e., where osgEarth
-    should go to find the input data.
+    should go to find the input data. Alteratively, a ``<feature_source>`` references
+    another layer that specifies the feature data.
     
   * The ``<styles>`` block describes how osgEarth should render the features, i.e., 
     their appearance in the scene. We call this the *stylesheet* or the *symbology*.
@@ -135,7 +155,7 @@
 Each feature layer requires a *stylesheet*. The stylesheet appears as a ``<styles>``
 block in the earth file. Here's an example::
 
-    <model name="test" driver="feature_geom">
+    <feature_model name="test">
         <features driver="ogr">
             <geometry>POLYGON( (0 0, 1 0, 1 1, 0 1) )</geometry>
             <profile>global-geodetic</profile>
@@ -152,7 +172,7 @@
                 }
             </style>
         </styles>
-    </model>
+    </feature_model>
     
 The *stylesheet* contains one *style* called ``default``. Since there is only one
 style, osgEarth will apply it to all the input features. (To apply different styles 
@@ -303,7 +323,7 @@
 
 The simplest way to load feature data into osgEarth is like this::
 
-   <model name="shapes">
+   <feature_model name="shapes">
       <features name="data" driver="ogr">
          <url>data.shp</url>
       </features>
@@ -312,7 +332,7 @@
              fill: #ffff00;
          }
       </styles>
-   </model>
+   </feature_model>
 
 We just loaded every feature in the shapefile and colored them all yellow.
 
@@ -328,7 +348,7 @@
 The feature display layout activates paging and tiles of feature data.
 Let's modify the previous example::
 
-   <model name="shapes">
+   <feature_model name="shapes">
       <features name="data" driver="ogr">
          <url>data.shp</url>
       </features>
@@ -343,7 +363,7 @@
              fill: #ffff00;
          }
       </styles>
-   </model>
+   </feature_model>
    
 The mere presence of the ``<layout>`` element activates paging. This means that
 instead of being loaded and compiled at load time, the feature data will load
@@ -373,7 +393,7 @@
 
 For example::
 
-  <model name="roads" driver="feature_geom">
+  <feature_model name="roads">
         <features name="roads" driver="ogr" build_spatial_index="true">
               <url>roads.shp</url>
         </features>
@@ -389,7 +409,7 @@
                   }
             </style>
         </styles>        
-  </model>
+  </feature_model>
 
 
 
@@ -413,15 +433,8 @@
 ~~~~~~~~~~~~~~~
 
     :tile_size:         The size (in one dimension) of each tile of features in the layout
-                        at the maximum range. Maximum range must be set for this to take effect.                                                      
-    :tile_size_factor:  The ratio of visibility range to feature tile radius. Default is 15.
-                        Increase this to produce more, smaller tiles at a given visibility
-                        range; decrease this to produce fewer, larger tiles.
-                        For example, for factor=15, at a visibility range of (say) 120,000m
-                        the system will attempt to create tiles that are approximately
-                        8,000m in radius. (120,000 / 15 = 8,000).
-    :max_range:         The desired max range for pre-tiled feature sources like TFS.  The tileSizeFactor will be automatically computed
-                        based on the first level of the feature profile so that it shows up at that range.
+                        at the maximum range. Maximum range must be set for this to take effect.
+    :max_range:         The desired max range for pre-tiled feature sources like TFS.
     :min_range:         Minimum visibility range for all tiles in the layout.
     :crop_features:     Whether to crop geometry to fit within the cell extents when chopping
                         a feature level up into grid cells. By default, this is false, meaning 
diff -Nru osgearth-2.9.0+dfsg/docs/source/user/spatialreference.rst osgearth-2.10.2+dfsg/docs/source/user/spatialreference.rst
--- osgearth-2.9.0+dfsg/docs/source/user/spatialreference.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/user/spatialreference.rst	2019-07-11 18:30:19.000000000 +0000
@@ -200,9 +200,9 @@
 If you're transforming a projected point to latitude/longitude, that's the output
 SRS you will want.
 
-You can also grab an ECEF SRS corresponding to any SRS, like so::
+You can also grab a geocentric (ECEF) SRS corresponding to any SRS, like so::
 
-    ecefSRS = srs->getECEF();    
+    geocentricSRS = srs->getGeocentricSRS();    
 
 ``SpatialReference`` has lots of functions for doing transformations, etc. Consult 
 the header file for information on those. But in practice it is usually best to use
diff -Nru osgearth-2.9.0+dfsg/docs/source/user/tools.rst osgearth-2.10.2+dfsg/docs/source/user/tools.rst
--- osgearth-2.9.0+dfsg/docs/source/user/tools.rst	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/user/tools.rst	2019-07-11 18:30:19.000000000 +0000
@@ -24,20 +24,8 @@
 +----------------------------------+--------------------------------------------------------------------+
 | ``--coords``                     | Displays map coords under mouse                                    |
 +----------------------------------+--------------------------------------------------------------------+
-| ``--dms``                        | Displays map coords as degrees/mins/seconds                        |
-+----------------------------------+--------------------------------------------------------------------+
-| ``--dd``                         | Displays map coords as decimal degrees                             |
-+----------------------------------+--------------------------------------------------------------------+
-| ``--mgrs``                       | Displays map coords as MGRS                                        |
-+----------------------------------+--------------------------------------------------------------------+
 | ``--ortho``                      | Installs an orthographic camera projection                         |
 +----------------------------------+--------------------------------------------------------------------+
-| ``--images [path]``              | Finds images in [path] and loads them as image layers              |
-+----------------------------------+--------------------------------------------------------------------+
-| ``--image-extensions [*]``       | With ``--images``, only considers the listed extensions            |
-+----------------------------------+--------------------------------------------------------------------+
-| ``--out-earth [out.earth]``      | With ``--images``, writes out an earth file                        |
-+----------------------------------+--------------------------------------------------------------------+
 | ``--logdepth``                   | Activates the logarithmic depth buffer in high-speed mode.         |
 +----------------------------------+--------------------------------------------------------------------+
 | ``--logdepth2``                  | Activates the logarithmic depth buffer in high-precision mode.     |
@@ -117,6 +105,38 @@
 | ``--purge``                         | Purges a layer cache in a .earth file                              |
 +-------------------------------------+--------------------------------------------------------------------+
 
+osgearth_conv
+----------------
+osgearth_conv copies the contents of one TileSource to another. All arguments are Config name/value pairs,
+so you need to look in the header file for each driver's Options structure for options. Of course, the output
+driver must support writing (by implementing the ReadWriteTileSource interface). The "in" properties come
+from the GDALOptions getConfig method. The "out" properties come from the MBTilesOptions getConfig method.
+
+**Sample Usage**
+::
+    osgearth_conv --in driver gdal --in url world.tif --out driver mbtiles --out filename world.db
+
++------------------------------------+--------------------------------------------------------------------+
+| Argument                           | Description                                                        |
++====================================+====================================================================+
+| ``--in [name] [value]``            | set the value of an input property                                 |
++------------------------------------+--------------------------------------------------------------------+
+| ``--out [name] [value]``           | set the value of an output property                                |
++------------------------------------+--------------------------------------------------------------------+
+| ``--elevation``                    | convert as elevation data (instead of image data)                  |
++------------------------------------+--------------------------------------------------------------------+
+| ``--profile [profile]``            | reproject to the target profile, e.g. "wgs84"                      |
++------------------------------------+--------------------------------------------------------------------+
+| ``--min-level [int]``              | min level of detail to copy                                        |
++------------------------------------+--------------------------------------------------------------------+
+| ``--max-level [int]``              | max level of detail to copy                                        |
++------------------------------------+--------------------------------------------------------------------+
+| ``--threads [n]``                  | threads to use (Careful, may crash. Doesn't help with GDAL inputs) |
++------------------------------------+--------------------------------------------------------------------+
+| ``--extents [minLat] [minLong]``   | Lat/Long extends to copy                                           |
+| ``[maxLat] [maxLong]``             |                                                                    |
++------------------------------------+--------------------------------------------------------------------+
+
 osgearth_package
 ----------------
 osgearth_package creates a redistributable `TMS`_ based package from an earth file.
@@ -168,34 +188,6 @@
 | ``--verbose``                      | Displays progress of the operation                                 |
 +------------------------------------+--------------------------------------------------------------------+
 
-osgearth_conv
-----------------
-osgearth_conv copies the contents of one TileSource to another. All arguments are Config name/value pairs,
-so you need to look in the header file for each driver's Options structure for options. Of course, the output
-driver must support writing (by implementing the ReadWriteTileSource interface). The "in" properties come
-from the GDALOptions getConfig method. The "out" properties come from the MBTilesOptions getConfig method.
-
-**Sample Usage**
-::
-    osgearth_conv --in driver gdal --in url world.tif --out driver mbtiles --out filename world.db
-
-+------------------------------------+--------------------------------------------------------------------+
-| Argument                           | Description                                                        |
-+====================================+====================================================================+
-| ``--elevation``                    | convert as elevation data (instead of image data)                  |
-+------------------------------------+--------------------------------------------------------------------+
-| ``--profile [profile]``            | reproject to the target profile, e.g. "wgs84"                      |
-+------------------------------------+--------------------------------------------------------------------+
-| ``--min-level [int]``              | min level of detail to copy                                        |
-+------------------------------------+--------------------------------------------------------------------+
-| ``--max-level [int]``              | max level of detail to copy                                        |
-+------------------------------------+--------------------------------------------------------------------+
-| ``--threads [n]``                  | threads to use (Careful, may crash. Doesn't help with GDAL inputs) |
-+------------------------------------+--------------------------------------------------------------------+
-| ``--extents [minLat] [minLong]``   | Lat/Long extends to copy                                           |
-| ``[maxLat] [maxLong]``             |                                                                    |
-+------------------------------------+--------------------------------------------------------------------+
-
 osgearth_tfs
 ------------
 osgearth_tfs generates a TFS dataset from a feature source such as a shapefile.  By pre-processing your features
diff -Nru osgearth-2.9.0+dfsg/docs/source/vcpkg.rst osgearth-2.10.2+dfsg/docs/source/vcpkg.rst
--- osgearth-2.9.0+dfsg/docs/source/vcpkg.rst	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/docs/source/vcpkg.rst	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,56 @@
+Building osgEarth for Windows using vcpkg
+=========================================
+vcpkg_ is an extremly useful C++ package manager.  It works on Windows, Linux and MacOS but for this guide we'll primarily focus on Windows.
+
+First, download and bootstrap vcpkg_ following the instructions on the page.
+
+Next install the dependencies required to build a fully functional osgearth
+::
+  vcpkg install osg:x64-windows sqlite3:x64-windows protobuf:x64-windows poco:x64-windows
+
+This will take awhile the first time you run it as this pulls down lots of dependencies, so go get a cup of coffee.
+
+Once all the dependencies are built, you'll need to actually build osgearth.
+
+**Get the source code**
+::
+  git clone https://github.com/gwaldron/osgearth.git
+
+
+**Create a directory for an out of source build**
+::
+  cd osgearth
+  mkdir build
+  cd build
+
+
+**Configure Cmake**
+
+vcpkg provides a Cmake toolchain file that helps osgEarth find all of it's dependencies.  You'll need to specify a different build directory for Release and Debug and specify the build type using -DCMAKE_BUILD_TYPE.  This is because some dependencies of osgEarth don't pick up both debug and release versions without specifying the build type.  This should be fixed in future cmake versions.  This is for a release build
+::
+  cmake .. -G "Visual Studio 15 2017 Win64" \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DWIN32_USE_MP=ON \
+  -DCMAKE_TOOLCHAIN_FILE=[vcpkg root]\scripts\buildsystems\vcpkg.cmake
+
+
+**Build and install osgEarth**
+
+You can build and install osgEarth on the command line using cmake or you can open up the Visual Studio solution and build it from there.
+::
+  cmake --build . --target INSTALL --config Release
+
+**Setting up your runtime environment**
+
+You'll need to make sure that the vcpkg dependencies and osgEarth are in your path.  So do something like this
+::
+  set PATH=%PATH%;c:\vcpkg\installed\x64-windows\bin
+  set PATH=%PATH%;c:\vcpkg\installed\x64-windows\tools\osg
+  set PATH=%PATH%;c:\Program Files\osgEarth\bin
+
+
+Note:  If you don't want to build osgEarth yourself for your application, you can actually install it using vcpkg as well.  Just use
+::
+  vcpkg install osgearth:x64-windows
+
+.. _vcpkg:          https://github.com/Microsoft/vcpkg
diff -Nru osgearth-2.9.0+dfsg/README.md osgearth-2.10.2+dfsg/README.md
--- osgearth-2.9.0+dfsg/README.md	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/README.md	2019-07-11 18:30:19.000000000 +0000
@@ -1,8 +1,8 @@
 [![Build Status](https://travis-ci.org/gwaldron/osgearth.svg?branch=master)](https://travis-ci.org/gwaldron/osgearth)
 [![Coverity Status](https://scan.coverity.com/projects/9251/badge.svg)](https://scan.coverity.com/projects/gwaldron-osgearth)
 
-osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-Copyright 2015 Pelican Mapping
+osgEarth - Geospatial SDK for OpenSceneGraph
+Copyright 2018 Pelican Mapping
 
 http://osgearth.org
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -7,7 +7,7 @@
 	IF(OSGCORE_FOUND)
 		INCLUDE(${OSGCORE_USE_FILE})
 	ELSE(OSGCORE_FOUND)
-		MESSAGE(ERROR "OSGCORE neeeded but NOT FOUND")
+		MESSAGE(ERROR "OSGCORE needed but NOT FOUND")
 	ENDIF(OSGCORE_FOUND)
 	SET(CMAKE_MODULE_PATH  ${PROJECT_SOURCE_DIR}/../../Macros)
 ENDIF(NOT OSGCORE_BUNDLED)
@@ -29,9 +29,10 @@
 SET(TARGET_DEFAULT_LABEL_PREFIX "Tool")
 SET(TARGET_DEFAULT_APPLICATION_FOLDER "Tools")
 
-IF(NOT OSGEARTH_BUILD_PLATFORM_IPHONE AND NOT OSGEARTH_BUILD_PLATFORM_IPHONE_SIMULATOR)
+IF(NOT OSGEARTH_BUILD_PLATFORM_IPHONE)
 
 ADD_SUBDIRECTORY(osgearth_viewer)
+ADD_SUBDIRECTORY(osgearth_toc)
 ADD_SUBDIRECTORY(osgearth_seed)
 ADD_SUBDIRECTORY(osgearth_package)
 ADD_SUBDIRECTORY(osgearth_tfs)
@@ -42,20 +43,18 @@
 ADD_SUBDIRECTORY(osgearth_atlas)
 ADD_SUBDIRECTORY(osgearth_conv)
 ADD_SUBDIRECTORY(osgearth_3pv)
-
-IF (Qt5Widgets_FOUND OR QT4_FOUND AND NOT ANDROID AND OSGEARTH_QT_BUILD AND OSGEARTH_QT_BUILD_LEGACY_WIDGETS)
-    ADD_SUBDIRECTORY(osgearth_package_qt)
-ENDIF()
+ADD_SUBDIRECTORY(osgearth_featureinfo)
+#ADD_SUBDIRECTORY(osgearth_featuretiler)
 
 IF(BUILD_OSGEARTH_EXAMPLES)
     SET(TARGET_DEFAULT_LABEL_PREFIX "Sample")
     SET(TARGET_DEFAULT_APPLICATION_FOLDER "Samples")
     ADD_SUBDIRECTORY(osgearth_manip)
-    ADD_SUBDIRECTORY(osgearth_toc)
+    ADD_SUBDIRECTORY(osgearth_cluster)
     ADD_SUBDIRECTORY(osgearth_elevation)
     ADD_SUBDIRECTORY(osgearth_features)
-    ADD_SUBDIRECTORY(osgearth_featureinfo)
     ADD_SUBDIRECTORY(osgearth_featurefilter)
+    ADD_SUBDIRECTORY(osgearth_geodetic_graticule)
     ADD_SUBDIRECTORY(osgearth_los)
     ADD_SUBDIRECTORY(osgearth_terrainprofile)
     ADD_SUBDIRECTORY(osgearth_map)
@@ -78,8 +77,6 @@
     ADD_SUBDIRECTORY(osgearth_minimap)
     ADD_SUBDIRECTORY(osgearth_mrt)
     ADD_SUBDIRECTORY(osgearth_shadergen)
-    ADD_SUBDIRECTORY(osgearth_clipplane)
-    ADD_SUBDIRECTORY(osgearth_cache_test)
     ADD_SUBDIRECTORY(osgearth_pick)
     ADD_SUBDIRECTORY(osgearth_wfs)
     ADD_SUBDIRECTORY(osgearth_datetime)
@@ -94,11 +91,12 @@
     ADD_SUBDIRECTORY(osgearth_video)
     ADD_SUBDIRECTORY(osgearth_splat)
     ADD_SUBDIRECTORY(osgearth_htm)
-
-    IF (Qt5Widgets_FOUND OR QT4_FOUND AND NOT ANDROID AND OSGEARTH_QT_BUILD)
-        ADD_SUBDIRECTORY(osgearth_qt_simple)
-        ADD_SUBDIRECTORY(osgearth_qt_windows)
-    ENDIF()
+    ADD_SUBDIRECTORY(osgearth_scenegraphcallbacks)
+    ADD_SUBDIRECTORY(osgearth_drawables)
+    ADD_SUBDIRECTORY(osgearth_magnify)
+    ADD_SUBDIRECTORY(osgearth_eci)
+    ADD_SUBDIRECTORY(osgearth_windows)
+    #ADD_SUBDIRECTORY(osgearth_3dtiles)
 
     IF(SILVERLINING_FOUND)
         ADD_SUBDIRECTORY(osgearth_silverlining)
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_3dtiles/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_3dtiles/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_3dtiles/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_3dtiles/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,7 @@
+INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+
+SET(TARGET_SRC osgearth_3dtiles.cpp )
+
+#### end var setup  ###
+SETUP_APPLICATION(osgearth_3dtiles)
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_3dtiles/osgearth_3dtiles.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_3dtiles/osgearth_3dtiles.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_3dtiles/osgearth_3dtiles.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_3dtiles/osgearth_3dtiles.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,514 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include <osgViewer/Viewer>
+#include <osgDB/WriteFile>
+#include <osgUtil/Simplifier>
+#include <osgEarth/Notify>
+#include <osgEarthUtil/EarthManipulator>
+#include <osgEarthUtil/ExampleResources>
+#include <osgEarthUtil/Controls>
+#include <osgEarthUtil/ViewFitter>
+#include <osgEarth/MapNode>
+#include <osgEarth/ThreadingUtils>
+#include <osgEarth/TDTiles>
+#include <osgEarth/Random>
+#include <osgEarth/TileKey>
+#include <osgEarth/CullingUtils>
+#include <osgEarthAnnotation/FeatureNode>
+#include <osgEarthFeatures/FeatureSource>
+#include <osgEarthFeatures/FeatureCursor>
+#include <osgEarthFeatures/FeatureModelLayer>
+#include <osgEarthFeatures/ResampleFilter>
+#include <osgEarthDrivers/feature_ogr/OGRFeatureOptions>
+#include <iostream>
+
+#define LC "[3dtiles test] "
+
+using namespace osgEarth;
+using namespace osgEarth::Util;
+using namespace osgEarth::Features;
+using namespace osgEarth::Annotation;
+using namespace osgEarth::Symbology;
+using namespace osgEarth::Drivers;
+namespace ui = osgEarth::Util::Controls;
+
+struct App
+{
+    ui::HSliderControl* _sse;
+    TDTiles::ContentHandler* _handler;
+    EarthManipulator* _manip;
+    osg::ref_ptr<TDTilesetGroup> _tileset;
+    osgViewer::View* _view;
+    LODScaleGroup* _sseGroup;
+    float _maxSSE;
+    bool _randomColors;
+
+    void changeSSE()
+    {
+        _sseGroup->setLODScaleFactor(_sse->getValue());
+    }
+
+    void zoomToData()
+    {
+        if (_tileset->getBound().valid())
+        {
+            const osg::BoundingSphere& bs = _tileset->getBound();
+
+            const SpatialReference* wgs84 = SpatialReference::get("wgs84");
+
+            std::vector<GeoPoint> points;
+            points.push_back(GeoPoint());
+            points.back().fromWorld(wgs84, bs.center());
+
+            Viewpoint vp;
+            ViewFitter fit(wgs84, _view->getCamera());
+            fit.setBuffer(bs.radius()*2.0);
+            fit.createViewpoint(points, vp);
+
+            _manip->setViewpoint(vp);
+        }
+    }
+};
+
+OE_UI_HANDLER(changeSSE);
+OE_UI_HANDLER(zoomToData);
+
+ui::Control* makeUI(App& app)
+{
+    ui::Grid* container = new ui::Grid();
+
+    int r=0;
+    container->setControl(0, r, new ui::LabelControl("Screen-space error (px)"));
+    app._sse = container->setControl(1, r, new ui::HSliderControl(app._maxSSE, 1.0f, app._maxSSE, new changeSSE(app)));
+    app._sse->setHorizFill(true, 300.0f);
+    container->setControl(2, r, new ui::LabelControl(app._sse));
+
+    ++r;
+    container->setControl(0, r, new ui::ButtonControl("Zoom to data", new zoomToData(app)));
+
+    return container;
+}
+
+int
+usage(const std::string& message)
+{
+    OE_WARN 
+        << "\n\n" << message
+        << "\n\nUsage: osgearth_3dtiles"
+        << "\n"
+        << "\n   --build [earthfile]          ; build a B3DM file"
+        << "\n     --extent <minLat> <minLon>"
+        << "\n              <maxLat> <maxLon> ; Extents to build (degrees)"
+        << "\n     --out <filename>           ; output file with .b3dm extension"
+        << "\n     --error <meters>           ; geometric error (meters) of data (default=100)"
+        << "\n     --resolution <meters>      ; downsample data to this resolution"
+        << "\n     --limit <n>                ; Only generate <n> tiles (for testing)"
+        << "\n"
+        << "\n   --view                       ; view a 3dtiles dataset"
+        << "\n     --tileset <filename>       ; 3dtiles tileset JSON file to load"
+        << "\n     --maxsse <n>               ; maximum screen space error in pixels for UI"
+        << "\n     --features                 ; treat the 3dtiles content as feature data"
+        << "\n     --random-colors            ; randomly color feature tiles (instead of one color)"
+        << std::endl;
+        //<< MapNodeHelper().usage() << std::endl;
+
+    return -1;
+}
+
+/**
+ * Custom TDTiles ContentHandler that reads feature data from a URL
+ * and renders a simple osg::Node from it.
+ */
+struct FeatureRenderer : public TDTiles::ContentHandler
+{
+    App& _app;
+    mutable Random _random;
+
+    FeatureRenderer(App& app) : _app(app) { }
+
+    osg::ref_ptr<osg::Node> createNode(TDTiles::Tile* tile, const osgDB::Options* readOptions) const
+    {
+        osg::ref_ptr<osg::Node> node;
+
+        if (tile->content().isSet() && tile->content()->uri().isSet())
+        {
+            OE_INFO << "Rendering feature tile: " << tile->content()->uri()->base() << std::endl;
+        
+            OGRFeatureOptions ogr;
+            ogr.url() = tile->content()->uri().get();
+            osg::ref_ptr<FeatureSource> fs = FeatureSourceFactory::create(ogr);
+            if (fs.valid() && fs->open().isOK())
+            {
+                osg::ref_ptr<FeatureCursor> cursor = fs->createFeatureCursor(0L);
+                FeatureList features;
+                cursor->fill(features);
+                if (!features.empty())
+                {
+                    Style style;
+                    osg::Vec4 color;
+                    if (_app._randomColors)
+                        color.set(_random.next(), _random.next(), _random.next(), 1.0f);
+                    else
+                        color.set(1.0, 0.6, 0.0, 1.0);
+
+                    style.getOrCreate<PolygonSymbol>()->fill()->color() = color;
+                    style.getOrCreate<AltitudeSymbol>()->clamping() = AltitudeSymbol::CLAMP_TO_TERRAIN;
+                    style.getOrCreate<AltitudeSymbol>()->technique() = AltitudeSymbol::TECHNIQUE_DRAPE;
+                    node = new FeatureNode(features, style);
+                }
+            }
+        }
+        else
+        {
+            //nop - skip tile with no content
+        }
+
+        return node;
+    }
+};
+
+int
+main_view(osg::ArgumentParser& arguments)
+{
+    App app;
+
+    std::string tilesetLocation;
+    if (!arguments.read("--tileset", tilesetLocation))
+        return usage("Missing required --tileset");
+
+    bool readFeatures = arguments.read("--features");
+    app._randomColors = arguments.read("--random-colors");
+
+    app._maxSSE = 7.0f;
+    arguments.read("--maxsse", app._maxSSE);
+
+    // load the tile set:
+    URI tilesetURI(tilesetLocation);
+    ReadResult rr = tilesetURI.readString();
+    if (rr.failed())
+        return usage(Stringify()<<"Error loading tileset: " <<rr.errorDetail());
+
+    TDTiles::Tileset* tileset = TDTiles::Tileset::create(rr.getString(), tilesetLocation);
+    if (!tileset)
+        return usage("Bad tileset");
+
+    // create a viewer:
+    osgViewer::Viewer viewer(arguments);
+    app._view = &viewer;
+
+    viewer.setCameraManipulator( app._manip = new EarthManipulator(arguments) );
+
+    // load an earth file, and support all or our example command-line options
+    // and earth file <external> tags    
+    osg::ref_ptr<osg::Node> node = MapNodeHelper().load(arguments, &viewer);
+    if (!node.valid())
+        return usage("Failed to load an earth file");
+
+    MapNode* mapNode = MapNode::get(node.get());
+
+    if (readFeatures)
+        app._tileset = new TDTilesetGroup(new FeatureRenderer(app));
+    else
+        app._tileset = new TDTilesetGroup();
+
+
+    app._sseGroup = new LODScaleGroup();
+    app._sseGroup->addChild(app._tileset.get());
+
+    //app._handler = app._tileset->getContentHandler();
+
+    ui::ControlCanvas::get(&viewer)->addControl(makeUI(app));
+
+    app._tileset->setTileset(tileset);
+    app._tileset->setReadOptions(mapNode->getMap()->getReadOptions());
+
+    mapNode->addChild(app._sseGroup);
+
+    viewer.setSceneData( node.get() );
+    return viewer.run();
+}
+
+TileKey
+parseKey(const std::string& input, const Profile* profile)
+{
+    std::vector<std::string> tileparts;
+    StringTokenizer(input, tileparts, "/", "", false, true);
+    if (tileparts.size() != 3)
+        return TileKey::INVALID;
+
+    return TileKey(
+        atoi(tileparts[0].c_str()),
+        atoi(tileparts[1].c_str()),
+        atoi(tileparts[2].c_str()),
+        profile);
+}
+
+TDTiles::Tile*
+createTile(osg::Node* node, const GeoExtent& extent, double error, const std::string& filenamePrefix, TDTiles::RefinePolicy refine)
+{
+    std::string filename = Stringify() << filenamePrefix << "_" << int(error) << ".b3dm";
+
+    if (!osgDB::writeNodeFile(*node, filename))
+    {
+        OE_WARN << "Failed to write to output file (" << filename << ")" << std::endl;
+        return NULL;
+    }
+
+    osg::ref_ptr<TDTiles::Tile> tile = new TDTiles::Tile();
+    tile->content()->uri() = filename;
+
+    // Set up a bounding region (radians)
+    // TODO: calculate the correct Z min/max instead of hard-coding
+    tile->boundingVolume()->region()->set(
+        osg::DegreesToRadians(extent.xMin()),
+        osg::DegreesToRadians(extent.yMin()),
+        -1000.0,
+        osg::DegreesToRadians(extent.xMax()),
+        osg::DegreesToRadians(extent.yMax()),
+        3000.0);
+
+    tile->geometricError() = 0.0; //error;
+    tile->refine() = refine;
+
+    return tile.release();
+}
+
+int
+main_build(osg::ArgumentParser& arguments)
+{
+    // Process:
+    // 1. Open an earth file and load a Map.
+    // 2. Find a feature model layer.
+    // 3. Read in one tile from the feature source.
+    // 4. Compile it into OSG geometry with a matrix transform
+    // 5. Save that geometry to a B3DM file.
+
+    // Estalish extents for the build.
+    double minLat, minLon, maxLat, maxLon;
+    if (!arguments.read("--extent", minLat, minLon, maxLat, maxLon))
+        return usage("Missing required --extent");
+
+    GeoExtent extent(SpatialReference::get("wgs84"), minLon, minLat, maxLon, maxLat);
+    if (!extent.isValid())
+        return usage("Invalid extent");
+
+    // Output filename prefix
+    std::string prefix;
+    if (!arguments.read("--out", prefix))
+        return usage("Missing required --out <prefix>");
+    if (!prefix.empty()) prefix = prefix + "_";
+
+    // Geometric error (only render the data if it's on-screen size
+    // is greater than "maxSSE" pixels per "error" meters.
+    // For example, if error=100m, and maxSSE=16px, the data will only
+    // render once 100m of data takes up at least 16px of screen space.
+    double tilesetError;
+    if (!arguments.read("--error", tilesetError))
+        tilesetError = 500.0;
+
+    double resolution = 0.0;
+    arguments.read("--resolution", resolution);
+
+    TDTiles::RefinePolicy refine = TDTiles::REFINE_REPLACE;
+    if (arguments.read("--add"))
+        refine = TDTiles::REFINE_ADD;
+
+    int limit = INT_MAX;
+    arguments.read("--limit", limit);
+
+    // Open an earth file and load a Map.
+    osg::ref_ptr<osg::Node> earthFile = osgDB::readNodeFiles(arguments);
+    MapNode* mapNode = MapNode::get(earthFile.get());
+    if (!mapNode)
+        return usage("Unable to load an earth file");
+
+    // Open all the layers:
+    mapNode->openMapLayers();
+
+    // Locate the first FeatureModelLayer in the map:
+    const Map* map = mapNode->getMap();
+    FeatureModelLayer* fml = map->getLayer<FeatureModelLayer>();
+    if ( !fml )
+        return usage("Unable to find a FeatureModel layer in the Map");
+    if ( !fml->getStatus().isOK() )
+        return usage(fml->getStatus().message());
+
+    // Extract the feature source from the layer:
+    FeatureSource* fs = fml->getFeatureSource();
+    if ( !fs )
+        return usage("Unable to get feature source from layer");
+    if ( !fs->getStatus().isOK() )
+        return usage(fs->getStatus().message());
+    if ( fs->open(0L).isError() )
+        return usage(fs->getStatus().message());
+
+    const FeatureProfile* fp = fs->getFeatureProfile();
+    if (!fp)
+        return usage("Unable to get a feature profile");
+    if (!fp->getProfile())
+        return usage("Unagle to find a tiling profile in the feature profile");
+
+    std::vector<TileKey> keys;
+    fp->getProfile()->getIntersectingTiles(extent, fp->getMaxLevel(), keys);
+    if (keys.empty())
+        return usage("No data in requested extent");
+    OE_INFO << "Found " << keys.size() << " tiles in extent" << std::endl;
+
+    StyleSheet* sheet = fml->options().styles().get();
+    if (!sheet)
+        return usage("Missing stylesheet");
+
+    // Make sure the b3dm plugin is loaded
+    std::string libname = osgDB::Registry::instance()->createLibraryNameForExtension("gltf");
+    osgDB::Registry::instance()->loadLibrary(libname);
+
+    osg::ref_ptr<Session> session = new Session(map, sheet, fs, 0L);
+    GeometryCompiler compiler(fml->options());
+
+    // Read all the styles in the stylesheet and sort them by geometric error:
+    std::map<double, Style> styles;
+    const StyleMap& smap = sheet->styles();
+    for(StyleMap::const_iterator i = smap.begin(); i != smap.end(); ++i)
+    {
+        styles[atoi(i->first.c_str())] = i->second;
+        OE_INFO << LC << "Found style \"" << i->first << "\"" << std::endl;
+    }
+
+    // Create the tileset file
+    osg::ref_ptr<TDTiles::Tileset> tileset = new TDTiles::Tileset();
+    tileset->asset()->version() = "1.0";
+    tileset->root() = new TDTiles::Tile();
+    tileset->root()->refine() = TDTiles::REFINE_ADD;
+    tileset->root()->geometricError() = tilesetError;
+
+    // track the largest tile radius - we will use this as the geometric error
+    // for the group.
+    double maxTileRadius = 0.0;
+
+    // track the total geospatial extent - this will become the bounding volume
+    // for the group
+    GeoExtent total;
+
+    //TODO: for loop on the feature keys
+    int count = 0;
+    for(std::vector<TileKey>::const_iterator key = keys.begin(); key != keys.end(); ++key)
+    {
+        // Check the "radius"
+        double tileRadius = key->getExtent().computeBoundingGeoCircle().getRadius();
+        maxTileRadius = osg::maximum(tileRadius, maxTileRadius);
+
+        // Query the features corresponding to the tile key:
+        Query query;
+        query.tileKey() = *key;
+
+        std::string filenamePrefix = Stringify() << prefix << key->getLOD() << "_" << key->getTileX() << "_" << key->getTileY();
+
+        osg::ref_ptr<TDTiles::Tile> parent = tileset->root();
+
+        for(std::map<double, Style>::reverse_iterator i = styles.rbegin(); i != styles.rend(); ++i)
+        {
+            double error = i->first;
+            const Style& style = i->second;
+
+            osg::ref_ptr<FeatureCursor> cursor = fs->createFeatureCursor(query, 0L);
+            if (!cursor.valid())
+                continue;
+
+            // Compile into OSG geometry
+            FeatureList features;
+            cursor->fill(features);
+            if (features.empty())
+                continue;
+
+            OE_INFO << LC << "Tile " << key->str() << ", features=" << features.size() << ", width=" << key->getExtent().width() << ", error=" << error << std::endl;
+
+            FilterContext fc(session.get(), fp, key->getExtent());
+
+            // first simplify the feature set
+            if (resolution > 0.0)
+            {
+                ResampleFilter resample(resolution, DBL_MAX);
+                fc = resample.push(features, fc);
+            }
+
+            osg::ref_ptr<osg::Node> result = compiler.compile(features, style, fc);
+            if (!result)
+                return usage("Failed to compile features into OSG geometry");
+
+            if (result->getBound().valid())
+            {
+                GeoExtent extent = key->getExtent().transform(SpatialReference::get("wgs84"));
+                if (total.isValid())
+                    total.expandToInclude(extent);
+                else
+                    total = extent;
+
+                osg::ref_ptr<TDTiles::Tile> tile = createTile(result.get(), extent, error, filenamePrefix, refine);
+                parent->children().push_back(tile);
+
+                parent->geometricError() = error;
+
+                parent = tile;
+            }
+        }
+
+        if (++count >= limit)
+            break;
+    }
+
+    // TODO: calculate the correct Z min/max instead of hard-coding
+    tileset->root()->boundingVolume()->region()->set(
+        osg::DegreesToRadians(total.xMin()),
+        osg::DegreesToRadians(total.yMin()),
+        -1000.0,
+        osg::DegreesToRadians(total.xMax()),
+        osg::DegreesToRadians(total.yMax()),
+        3000.0);
+    
+    tileset->geometricError() = tileset->root()->geometricError().get() * 1.5;
+
+    // write out the tileset file ("tileset.json")
+    std::ofstream out("tileset.json");
+    Json::Value tilesetJSON = tileset->getJSON();
+    Json::StyledStreamWriter writer;
+    writer.write(out, tilesetJSON);
+    out.close();
+
+    return 0;
+}
+
+int
+main(int argc, char** argv)
+{
+    osg::ArgumentParser arguments(&argc, argv);
+
+    if (arguments.read("--help"))
+        return usage("Help!");
+
+    if (arguments.read("--build"))
+        return main_build(arguments);
+    else if (arguments.read("--view"))
+        return main_view(arguments);
+    else
+        return usage("Missing required --build or --view");
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_3pv/osgearth_3pv.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_3pv/osgearth_3pv.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_3pv/osgearth_3pv.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_3pv/osgearth_3pv.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,16 +21,14 @@
 */
 
 #include <osgViewer/Viewer>
-#include <osgEarth/Notify>
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/ExampleResources>
 #include <osgEarthUtil/MouseCoordsTool>
-#include <osgEarthUtil/Controls>
 
-#include <osgEarth/Units>
-#include <osgEarth/Viewpoint>
 #include <osgEarth/Horizon>
 #include <osgEarth/TraversalData>
+#include <osgEarth/Lighting>
+#include <osgEarth/GLUtils>
 
 #include <osgEarthAnnotation/PlaceNode>
 
@@ -39,8 +37,6 @@
 using namespace osgEarth;
 using namespace osgEarth::Util;
 using namespace osgEarth::Annotation;
-namespace ui = osgEarth::Util::Controls;
-
 
 #include <osg/Geometry>
 #include <osg/Depth>
@@ -51,7 +47,7 @@
 #include <osgDB/ReadFile>
 #include <osgViewer/CompositeViewer>
 #include <osgGA/TrackballManipulator>
-
+#include <cstdlib> // for putenv
 
 struct PlacerCallback : public MouseCoordsTool::Callback
 {
@@ -80,27 +76,29 @@
     }
 };
 
+struct CaptureFrustum : public osg::NodeCallback
+{
+    osg::Matrix& _proj;
+
+    CaptureFrustum(osg::Matrix& proj) : _proj(proj) { }
+
+    void operator()(osg::Node* node, osg::NodeVisitor* nv)
+    {
+        traverse(node, nv);
+
+        osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
+        double N = cv->getCalculatedNearPlane();
+        double F = cv->getCalculatedFarPlane();
+        _proj = cv->getCurrentCamera()->getProjectionMatrix();
+        cv->clampProjectionMatrix(_proj, N, F);
+    }
+};
 
 // Given a Camera, create a wireframe representation of its
 // view frustum. Create a default representation if camera==NULL.
 osg::Node*
-makeFrustumFromCamera( osg::Camera* camera )
+makeFrustumFromMVP(const osg::Matrix& mv, const osg::Matrix& proj)
 {
-    // Projection and ModelView matrices
-    osg::Matrixd proj;
-    osg::Matrixd mv;
-    if (camera)
-    {
-        proj = camera->getProjectionMatrix();
-        mv = camera->getViewMatrix();
-    }
-    else
-    {
-        // Create some kind of reasonable default Projection matrix.
-        proj.makePerspective( 30., 1., 1., 10. );
-        // leave mv as identity
-    }
-
     // Get near and far from the Projection matrix.
     const double near = proj(3,2) / (proj(2,2)-1.0);
     const double far = proj(3,2) / (1.0+proj(2,2));
@@ -135,10 +133,9 @@
     geom->setUseDisplayList( false );
     geom->setVertexArray( v );
 
-    osg::Vec4Array* c = new osg::Vec4Array;
+    osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL);
     c->push_back( osg::Vec4( 1., 1., 0., 1. ) );
     geom->setColorArray( c );
-    geom->setColorBinding( osg::Geometry::BIND_OVERALL );
 
     GLushort idxLines[8] = {
         0, 5, 0, 6, 0, 7, 0, 8 };
@@ -152,10 +149,9 @@
 
     osg::Geode* geode = new osg::Geode;
     geode->addDrawable( geom );
-
-    geode->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED );
-    geode->getOrCreateStateSet()->setAttributeAndModes(new osg::LineWidth(2.0f), 1);
-
+    osg::StateSet* gss = geode->getOrCreateStateSet();
+    Lighting::set(gss, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED );
+    GLUtils::setLineWidth(gss, 2.0f, 1);
 
     // Create parent MatrixTransform to transform the view volume by
     // the inverse ModelView matrix.
@@ -164,10 +160,11 @@
     mt->addChild( geode );
 
     osg::Group* g0 = new osg::Group();
+    osg::StateSet* g0ss = g0->getOrCreateStateSet();
     g0->addChild(mt);
-    g0->getOrCreateStateSet()->setAttributeAndModes(new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1);
-    g0->getOrCreateStateSet()->setAttributeAndModes(new osg::LineStipple(1, 0x000F), 1);
-    g0->getOrCreateStateSet()->setRenderBinDetails(2, "RenderBin");
+    g0ss->setAttributeAndModes(new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1);
+    GLUtils::setLineStipple(g0ss, 1, 0xFF, 1);
+    g0ss->setRenderBinDetails(2, "RenderBin");
 
     osg::Group* g1 = new osg::Group();
     g1->addChild(mt);
@@ -185,6 +182,8 @@
 int
 main( int argc, char** argv )
 {
+    putenv("OSGEARTH_REX_DEBUG=1");
+
     osg::ArgumentParser arguments( &argc, argv );
 
     osg::ref_ptr< osg::Group > root = new osg::Group;
@@ -194,7 +193,7 @@
 
     // Child 0: We'll replace this every frame with an updated representation
     //   of the view frustum.
-    root->addChild( makeFrustumFromCamera( NULL ) );
+    root->addChild( makeFrustumFromMVP(osg::Matrix::identity(), osg::Matrix::identity()));
 
     osg::Group* scene = new osg::Group();
     root->addChild( scene );
@@ -224,7 +223,7 @@
     }
 
     MapNodeHelper helper;
-    osg::ref_ptr<osg::Node> node = helper.load(arguments, viewer.getView(0));
+    osg::ref_ptr<osg::Node> node = helper.load(arguments, &viewer);
     if (!node.valid())
     {
         return -1;
@@ -237,7 +236,9 @@
     MapNode* mapNode = MapNode::get(node.get());
 
     osg::ref_ptr<osg::Image> icon = osgDB::readRefImageFile("../data/placemark32.png");
-    PlaceNode* place = new PlaceNode(mapNode, GeoPoint::INVALID, icon.get(), "");
+    PlaceNode* place = new PlaceNode();
+    place->setIconImage(icon.get());
+    place->setMapNode(mapNode);
     place->getOrCreateStateSet()->setRenderBinDetails(10, "DepthSortedBin");
     place->setDynamic(true);
     place->setNodeMask(0);
@@ -249,13 +250,20 @@
 
     mapNode->addChild(new HorizonNode());
 
-    viewer.getView(1)->getCamera()->setCullCallback( new VisitorData::Install("osgEarth.Stealth") );
+    osg::Matrix proj;
+    viewer.getView(0)->getCamera()->addCullCallback(new CaptureFrustum(proj));
+
+    viewer.getView(1)->getCamera()->setName("Spy");
+    viewer.getView(1)->getCamera()->setCullCallback( new VisitorData::Install("osgEarth.Spy") );
 
     while (!viewer.done())
     {
         // Update the wireframe frustum
         root->removeChild( 0, 1 );
-        root->insertChild( 0, makeFrustumFromCamera( viewer.getView( 0 )->getCamera() ) );
+
+        root->insertChild(0, makeFrustumFromMVP(
+            viewer.getView(0)->getCamera()->getViewMatrix(),
+            proj));
 
         viewer.frame();
     }
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_annotation/osgearth_annotation.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_annotation/osgearth_annotation.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_annotation/osgearth_annotation.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_annotation/osgearth_annotation.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -110,23 +110,23 @@
         pm.getOrCreate<TextSymbol>()->halo() = Color("#5f5f5f");
 
         // bunch of pins:
-        labelGroup->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS, -74.00, 40.71), "New York"      , pm));
-        labelGroup->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS, -77.04, 38.85), "Washington, DC", pm));
-        labelGroup->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS,-118.40, 33.93), "Los Angeles"   , pm));
-        labelGroup->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS, -71.03, 42.37), "Boston"        , pm));
-        labelGroup->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS,-157.93, 21.35), "Honolulu"      , pm));
-        labelGroup->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS, 139.75, 35.68), "Tokyo"         , pm));
-        labelGroup->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS, -90.25, 29.98), "New Orleans"   , pm));
-        labelGroup->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS, -80.28, 25.82), "Miami"         , pm));
-        labelGroup->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS,-117.17, 32.72), "San Diego"     , pm));
+        labelGroup->addChild( new PlaceNode(GeoPoint(geoSRS, -74.00, 40.71), "New York"      , pm));
+        labelGroup->addChild( new PlaceNode(GeoPoint(geoSRS, -77.04, 38.85), "Washington, DC", pm));
+        labelGroup->addChild( new PlaceNode(GeoPoint(geoSRS,-118.40, 33.93), "Los Angeles"   , pm));
+        labelGroup->addChild( new PlaceNode(GeoPoint(geoSRS, -71.03, 42.37), "Boston"        , pm));
+        labelGroup->addChild( new PlaceNode(GeoPoint(geoSRS,-157.93, 21.35), "Honolulu"      , pm));
+        labelGroup->addChild( new PlaceNode(GeoPoint(geoSRS, 139.75, 35.68), "Tokyo"         , pm));
+        labelGroup->addChild( new PlaceNode(GeoPoint(geoSRS, -90.25, 29.98), "New Orleans"   , pm));
+        labelGroup->addChild( new PlaceNode(GeoPoint(geoSRS, -80.28, 25.82), "Miami"         , pm));
+        labelGroup->addChild( new PlaceNode(GeoPoint(geoSRS,-117.17, 32.72), "San Diego"     , pm));
 
         // test with an LOD:
         osg::LOD* lod = new osg::LOD();
-        lod->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS, 14.68, 50.0), "Prague", pm), 0.0, 2e6);
+        lod->addChild( new PlaceNode(GeoPoint(geoSRS, 14.68, 50.0), "Prague", pm), 0.0, 2e6);
         labelGroup->addChild( lod );
 
         // absolute altitude:
-        labelGroup->addChild( new PlaceNode(mapNode, GeoPoint(geoSRS, -87.65, 41.90, 1000, ALTMODE_ABSOLUTE), "Chicago", pm));
+        labelGroup->addChild( new PlaceNode(GeoPoint(geoSRS, -87.65, 41.90, 1000, ALTMODE_ABSOLUTE), "Chicago", pm));
     }
 
     //--------------------------------------------------------------------
@@ -158,13 +158,15 @@
         geomStyle.getOrCreate<AltitudeSymbol>()->clamping() = AltitudeSymbol::CLAMP_TO_TERRAIN;
         geomStyle.getOrCreate<AltitudeSymbol>()->technique() = AltitudeSymbol::TECHNIQUE_GPU;
         
-        FeatureNode* fnode = new FeatureNode(mapNode, feature, geomStyle);
+        FeatureNode* fnode = new FeatureNode(feature, geomStyle);
 
         fnode->addCullCallback(new C());
 
         annoGroup->addChild( fnode );
 
-        labelGroup->addChild( new LabelNode(mapNode, GeoPoint(geoSRS,-30, 50), "Rhumb line polygon", labelStyle) );
+        LabelNode* label = new LabelNode("Rhumb line polygon", labelStyle);
+        label->setPosition(GeoPoint(geoSRS, -30, 50));
+        labelGroup->addChild(label);
     }
 
     //--------------------------------------------------------------------
@@ -187,10 +189,12 @@
         geomStyle.getOrCreate<AltitudeSymbol>()->clamping() = AltitudeSymbol::CLAMP_TO_TERRAIN;
         geomStyle.getOrCreate<AltitudeSymbol>()->technique() = AltitudeSymbol::TECHNIQUE_GPU;
 
-        FeatureNode* gnode = new FeatureNode(mapNode, feature, geomStyle);
+        FeatureNode* gnode = new FeatureNode(feature, geomStyle);
         annoGroup->addChild( gnode );
 
-        labelGroup->addChild( new LabelNode(mapNode, GeoPoint(geoSRS, -175, -35), "Antimeridian polygon", labelStyle) );
+        LabelNode* label = new LabelNode("Antimeridian polygon", labelStyle);
+        label->setPosition(GeoPoint(geoSRS, -175, -35));
+        labelGroup->addChild(label);
     }
 
     //--------------------------------------------------------------------
@@ -211,19 +215,23 @@
         Style pathStyle;
         pathStyle.getOrCreate<LineSymbol>()->stroke()->color() = Color::White;
         pathStyle.getOrCreate<LineSymbol>()->stroke()->width() = 1.0f;
+        pathStyle.getOrCreate<LineSymbol>()->stroke()->smooth() = true;
         pathStyle.getOrCreate<LineSymbol>()->tessellationSize() = 75000;
-        pathStyle.getOrCreate<PointSymbol>()->size() = 5;
+        pathStyle.getOrCreate<PointSymbol>()->size() = 8;
         pathStyle.getOrCreate<PointSymbol>()->fill()->color() = Color::Red;
+        pathStyle.getOrCreate<PointSymbol>()->smooth() = true;
         pathStyle.getOrCreate<AltitudeSymbol>()->clamping() = AltitudeSymbol::CLAMP_TO_TERRAIN;
         pathStyle.getOrCreate<AltitudeSymbol>()->technique() = AltitudeSymbol::TECHNIQUE_GPU;
         pathStyle.getOrCreate<RenderSymbol>()->depthOffset()->enabled() = true;
 
         //OE_INFO << "Path extent = " << pathFeature->getExtent().toString() << std::endl;
 
-        pathNode = new FeatureNode(mapNode, pathFeature, pathStyle);
+        pathNode = new FeatureNode(pathFeature, pathStyle);
         annoGroup->addChild( pathNode );
 
-        labelGroup->addChild( new LabelNode(mapNode, GeoPoint(geoSRS,-170, 61.2), "Great circle path", labelStyle) );
+        LabelNode* label = new LabelNode("Great circle path", labelStyle);
+        label->setPosition(GeoPoint(geoSRS,-170, 61.2));
+        labelGroup->addChild(label);
     }
 
     //--------------------------------------------------------------------
@@ -235,11 +243,15 @@
         circleStyle.getOrCreate<AltitudeSymbol>()->clamping() = AltitudeSymbol::CLAMP_TO_TERRAIN;
         circleStyle.getOrCreate<AltitudeSymbol>()->technique() = AltitudeSymbol::TECHNIQUE_DRAPE;
 
-        CircleNode* circle = new CircleNode(
-            mapNode,
+        CircleNode* circle = new CircleNode();
+        circle->set(
             GeoPoint(geoSRS, -90.25, 29.98, 1000., ALTMODE_RELATIVE),
             Distance(300, Units::KILOMETERS),
-            circleStyle, Angle(-45.0, Units::DEGREES), Angle(45.0, Units::DEGREES), true);
+            circleStyle, 
+            Angle(-45.0, Units::DEGREES),
+            Angle(45.0, Units::DEGREES),
+            true);
+
         annoGroup->addChild( circle );
 
         editGroup->addChild( new CircleNodeEditor(circle) );
@@ -251,11 +263,15 @@
 		circleStyle.getOrCreate<AltitudeSymbol>()->clamping() = AltitudeSymbol::CLAMP_TO_TERRAIN;
 		circleStyle.getOrCreate<AltitudeSymbol>()->technique() = AltitudeSymbol::TECHNIQUE_DRAPE;
 
-		CircleNode* circle = new CircleNode(
-			mapNode,
+		CircleNode* circle = new CircleNode();
+        circle->set(
 			GeoPoint(geoSRS, -90.25, 29.98, 1000., ALTMODE_RELATIVE),
 			Distance(300, Units::KILOMETERS),
-			circleStyle, Angle(45.0, Units::DEGREES), Angle(360.0 - 45.0, Units::DEGREES), true);
+			circleStyle,
+            Angle(45.0, Units::DEGREES),
+            Angle(360.0 - 45.0, Units::DEGREES),
+            true);
+
 		annoGroup->addChild( circle );
 
         editGroup->addChild( new CircleNodeEditor(circle) );
@@ -268,8 +284,8 @@
         Style ellipseStyle;
         ellipseStyle.getOrCreate<PolygonSymbol>()->fill()->color() = Color(Color::Orange, 0.75);
         ellipseStyle.getOrCreate<ExtrusionSymbol>()->height() = 250000.0; // meters MSL
-        EllipseNode* ellipse = new EllipseNode(
-            mapNode, 
+        EllipseNode* ellipse = new EllipseNode();
+        ellipse->set(
             GeoPoint(geoSRS, -80.28, 25.82, 0.0, ALTMODE_RELATIVE),
             Distance(250, Units::MILES),
             Distance(100, Units::MILES),
@@ -286,8 +302,8 @@
 		Style ellipseStyle;
 		ellipseStyle.getOrCreate<PolygonSymbol>()->fill()->color() = Color(Color::Blue, 0.75);
 		ellipseStyle.getOrCreate<ExtrusionSymbol>()->height() = 250000.0; // meters MSL
-		EllipseNode* ellipse = new EllipseNode(
-			mapNode, 
+		EllipseNode* ellipse = new EllipseNode();
+        ellipse->set(
 			GeoPoint(geoSRS, -80.28, 25.82, 0.0, ALTMODE_RELATIVE),
 			Distance(250, Units::MILES),
 			Distance(100, Units::MILES),
@@ -310,7 +326,6 @@
         rectStyle.getOrCreate<AltitudeSymbol>()->clamping() = AltitudeSymbol::CLAMP_TO_TERRAIN;
         rectStyle.getOrCreate<AltitudeSymbol>()->technique() = AltitudeSymbol::TECHNIQUE_DRAPE;
         RectangleNode* rect = new RectangleNode(
-            mapNode, 
             GeoPoint(geoSRS, -117.172, 32.721),
             Distance(300, Units::KILOMETERS ),
             Distance(600, Units::KILOMETERS ),
@@ -339,7 +354,8 @@
         utahStyle.getOrCreate<PolygonSymbol>()->fill()->color() = Color(Color::White, 0.8);
 
         Feature*     utahFeature = new Feature(utah, geoSRS);
-        FeatureNode* featureNode = new FeatureNode(mapNode, utahFeature, utahStyle);
+        FeatureNode* featureNode = new FeatureNode(utahFeature, utahStyle);
+
         annoGroup->addChild( featureNode );
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_atlas/osgearth_atlas.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_atlas/osgearth_atlas.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_atlas/osgearth_atlas.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_atlas/osgearth_atlas.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 #include <osgEarthSymbology/ResourceLibrary>
 #include <osgEarthSymbology/Skins>
 #include <osgEarth/Utils>
+#include <osgEarth/Lighting>
 
 #include <osg/ArgumentParser>
 #include <osgDB/FileUtils>
@@ -223,7 +224,7 @@
     osgEarth::ImageUtils::flattenImage(image.get(), images);
     osg::Geode* geode = osg::createGeodeForImage(images[layer].get());
 
-    const osg::BoundingBox& bbox = osgEarth::Utils::getBoundingBox(geode->getDrawable(0));
+    const osg::BoundingBox& bbox = geode->getDrawable(0)->getBoundingBox();
     float width = bbox.xMax() - bbox.xMin();
     float height = bbox.zMax() - bbox.zMin();
 
@@ -233,10 +234,9 @@
     geode2->addDrawable(geom);
     osg::Vec3Array* v = new osg::Vec3Array();
     geom->setVertexArray( v );
-    osg::Vec4Array* c = new osg::Vec4Array(1);
+    osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
     (*c)[0].set(1,1,0,1);
     geom->setColorArray(c);
-    geom->setColorBinding(geom->BIND_OVERALL);
     osgEarth::Symbology::SkinResourceVector skins;
     lib->getSkins(skins);
     OE_WARN << "num = " << skins.size() << "\n";
@@ -276,7 +276,7 @@
     root->addChild( geode );
     root->addChild( geode2 );
 
-    root->getOrCreateStateSet()->setMode(GL_LIGHTING, 0);
+    Lighting::set(root->getOrCreateStateSet(), 0);
     root->getOrCreateStateSet()->setMode(GL_CULL_FACE, 0);
 
     osgViewer::Viewer viewer;
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_boundarygen/boundarygen.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_boundarygen/boundarygen.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_boundarygen/boundarygen.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_boundarygen/boundarygen.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 #include "BoundaryUtil"
 
 #include <osgEarth/FileUtils>
+#include <osgEarth/GLUtils>
 
 #include <iostream>
 #include <iomanip>
@@ -163,14 +164,13 @@
       osg::Geometry* boundaryGeometry = new osg::Geometry();
       boundaryGeometry->setVertexArray( drawHull );
 
-      osg::Vec4Array* colors = new osg::Vec4Array;
+      osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_OVERALL);
       colors->push_back(osg::Vec4(1.0f,1.0f,0.0f,1.0f));
       boundaryGeometry->setColorArray(colors);
-      boundaryGeometry->setColorBinding(osg::Geometry::BIND_OVERALL);
       osg::StateSet* ss = boundaryGeometry->getOrCreateStateSet();
-      ss->setAttributeAndModes( new osg::LineWidth(1.0), 1 );
-      ss->setAttributeAndModes( new osg::Point(3.5), 1 );
-      ss->setMode( GL_LIGHTING, 0 );
+      osgEarth::GLUtils::setLineWidth(ss, 1.0f, 1);
+      osgEarth::GLUtils::setPointSize(ss, 3.5f, 1);
+      osgEarth::GLUtils::setLighting(ss, 0);
 
       boundaryGeometry->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINE_LOOP,0,drawHull->size()));
       boundaryGeometry->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::POINTS,0,drawHull->size()));
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_boundarygen/BoundaryUtil osgearth-2.10.2+dfsg/src/applications/osgearth_boundarygen/BoundaryUtil
--- osgearth-2.9.0+dfsg/src/applications/osgearth_boundarygen/BoundaryUtil	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_boundarygen/BoundaryUtil	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_boundarygen/BoundaryUtil.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_boundarygen/BoundaryUtil.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_boundarygen/BoundaryUtil.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_boundarygen/BoundaryUtil.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -283,8 +283,8 @@
     typedef std::set<Index, IndexLess>            IndexSet;
     typedef std::map<Index, IndexSet, IndexLess>  EdgeMap;
 
-    // Stores the noded topology of a model with unique verticies and edge definitions.
-    // The verticies are stored rotated into the XY plane so that we can properly find
+    // Stores the noded topology of a model with unique vertices and edge definitions.
+    // The vertices are stored rotated into the XY plane so that we can properly find
     // the "bottom-most" vert and walk the boundary.
     struct TopologyGraph
     {
@@ -339,7 +339,7 @@
 
                 if ( _topology->_srs )
                 {
-                    const osgEarth::SpatialReference* ecef = _topology->_srs->getECEF();
+                    const osgEarth::SpatialReference* ecef = _topology->_srs->getGeocentricSRS();
                     ecef->transform(world, _topology->_srs, plane);
                 }
                 else
@@ -349,7 +349,7 @@
 
                 // insert it into the unique vert list
                 std::pair<VertexSet::iterator,bool> f = _topology->_verts.insert( plane );
-                if ( f.second ) // insert succedded
+                if ( f.second ) // insert succeeded
                 {
                     // this is a new location, so check it to see if it is the new "southernmost" point:
                     if ( _topology->_minY == _topology->_verts.end() || plane.y() < _topology->_minY->y() )
@@ -543,7 +543,7 @@
         // pull up the edge set for this vertex:
         IndexSet& edges = topology._edgeMap[vptr];
 
-        // find the edge with the minimun delta angle to the base vector
+        // find the edge with the minimum delta angle to the base vector
         double bestScore = DBL_MAX;
         Index  bestEdge  = topology._verts.end();
         
@@ -615,7 +615,7 @@
     // un-rotate the results from the XY plane back to their original frame:
     if ( topology._srs )
     {
-        const osgEarth::SpatialReference* ecef = topology._srs->getECEF();
+        const osgEarth::SpatialReference* ecef = topology._srs->getGeocentricSRS();
         topology._srs->transform(_result->asVector(), ecef);
     }
     else
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_boundarygen/VertexCollectionVisitor osgearth-2.10.2+dfsg/src/applications/osgearth_boundarygen/VertexCollectionVisitor
--- osgearth-2.9.0+dfsg/src/applications/osgearth_boundarygen/VertexCollectionVisitor	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_boundarygen/VertexCollectionVisitor	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_boundarygen/VertexCollectionVisitor.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_boundarygen/VertexCollectionVisitor.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_boundarygen/VertexCollectionVisitor.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_boundarygen/VertexCollectionVisitor.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_cache_test/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_cache_test/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_cache_test/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_cache_test/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
-
-SET(TARGET_SRC osgearth_cache_test.cpp )
-
-#### end var setup  ###
-SETUP_APPLICATION(osgearth_cache_test)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_cache_test/osgearth_cache_test.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_cache_test/osgearth_cache_test.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_cache_test/osgearth_cache_test.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_cache_test/osgearth_cache_test.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2008-2013 Pelican Mapping
-* http://osgearth.org
-*
-* osgEarth is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-* IN THE SOFTWARE.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-#include <osgEarth/Notify>
-#include <osgEarth/Cache>
-#include <osgEarth/Registry>
-#include <osgEarth/StringUtils>
-#include <osgEarth/ImageUtils>
-#include <osg/ArgumentParser>
-
-#define LC "[cache_test] "
-
-using namespace osgEarth;
-
-
-int
-quit(const std::string& msg)
-{
-    OE_NOTICE << msg << std::endl;
-    return -1;
-}
-
-int
-main(int argc, char** argv)
-{
-    osg::ref_ptr<Cache> cache = Registry::instance()->getDefaultCache();
-    if ( !cache.valid() )
-    {
-        return quit( "Please configure a cache path in your environment (OSGEARTH_CACHE_PATH)." );
-    }
-
-    // open a bin:
-    CacheBin* bin = cache->addBin("test_bin");
-    if (!bin)
-        return quit( "Failed to open the cache bin!" );
-
-    // STRING:
-    {
-        std::string value( "What is the sound of one hand clapping?" );
-        osg::ref_ptr<StringObject> s = new StringObject( value );
-
-        if ( !bin->write("string_key", s.get(), 0L) )
-            return quit( "String write failed." );
-
-        ReadResult r = bin->readString("string_key", 0L);
-        if ( r.failed() )
-            return quit( Stringify() << "String read failed - " << r.getResultCodeString() );
-
-        if ( r.getString().compare(value) != 0 )
-            return quit( "String read error - values do not match" );
-
-        OE_NOTICE << "String test: PASS" << std::endl;
-    }
-
-    // IMAGE:
-    {
-        osg::ref_ptr<osg::Image> image = ImageUtils::createOnePixelImage(osg::Vec4(1,0,0,1));
-
-        if ( !bin->write("image_key", image.get(), 0L) )
-            return quit("Image write failed.");
-
-        ReadResult r = bin->readImage("image_key", 0L);
-        if ( r.failed() )
-            return quit( Stringify() << "Image read failed - " << r.getResultCodeString() );
-
-        if ( !ImageUtils::areEquivalent(r.getImage(), image.get()) )
-            return quit( "Image read error - images do not match" );
-
-        OE_NOTICE << "Image test: PASS" << std::endl;
-    }
-
-    // Need to properly shut down the cache here
-    cache = 0L;
-
-    OE_NOTICE << "All tests passed." << std::endl;
-    return 0;
-}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_city/osgearth_city.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_city/osgearth_city.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_city/osgearth_city.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_city/osgearth_city.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -26,17 +26,14 @@
 
 #include <osgEarth/MapNode>
 #include <osgEarth/ImageLayer>
-#include <osgEarth/ModelLayer>
 
 #include <osgEarthUtil/ExampleResources>
 #include <osgEarthUtil/EarthManipulator>
-#include <osgEarthUtil/AutoClipPlaneHandler>
 #include <osgEarthUtil/LogarithmicDepthBuffer>
 
 #include <osgEarthFeatures/FeatureModelLayer>
 
 #include <osgEarthDrivers/tms/TMSOptions>
-#include <osgEarthDrivers/xyz/XYZOptions>
 #include <osgEarthDrivers/feature_ogr/OGRFeatureOptions>
 #include <osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions>
 #include <osgEarthDrivers/engine_rex/RexTerrainEngineOptions>
@@ -53,7 +50,7 @@
 #define RESOURCE_LIB_URL "../data/resources/textures_us/catalog.xml"
 #define STREETS_URL      "../data/boston-scl-utm19n-meters.shp"
 #define PARKS_URL        "../data/boston-parks.shp"
-#define TREE_MODEL_URL   "../data/loopix/tree4.osgb"
+#define TREE_MODEL_URL   "../data/tree.osg"
 
 // forward declarations.
 void addImagery  (Map* map);
@@ -92,13 +89,8 @@
     osg::Group* root = new osg::Group();
     viewer.setSceneData( root );
 
-    // Pick a terrain engine expressly:
-    RexTerrainEngine::RexTerrainEngineOptions terrainOptions;
-    MapNodeOptions mapNodeOptions;
-    mapNodeOptions.setTerrainOptions(terrainOptions);
-
     // make the map scene graph:
-    MapNode* mapNode = new MapNode(map, mapNodeOptions);
+    MapNode* mapNode = new MapNode(map);
     root->addChild( mapNode );
 
     // zoom to a good startup position
@@ -275,18 +267,16 @@
     // data are polygons, the PLACEMENT_RANDOM directive below will scatter
     // points within the polygon boundary at the specified density.
     ModelSymbol* model = style.getOrCreate<ModelSymbol>();
-    //model->url()->setLiteral(TREE_MODEL_URL);
-    model->scale()->setLiteral( 0.2 );
+    model->url()->setLiteral(TREE_MODEL_URL);
     model->placement() = model->PLACEMENT_RANDOM;
-    model->density() = 3000.0f; // instances per sqkm
-    model->setModel(osgDB::readRefNodeFile(TREE_MODEL_URL).release());
+    model->density() = 6000.0f; // instances per sqkm
     
     // Clamp to the terrain:
     AltitudeSymbol* alt = style.getOrCreate<AltitudeSymbol>();
     alt->clamping() = alt->CLAMP_TO_TERRAIN;
 
     // Since the tree model contains alpha components, we will discard any data
-    // that's sufficiently transparent; this will prevent depth-sorting anomolies
+    // that's sufficiently transparent; this will prevent depth-sorting anomalies
     // common when rendering lots of semi-transparent objects.
     RenderSymbol* render = style.getOrCreate<RenderSymbol>();
     render->transparent() = true;
@@ -296,7 +286,7 @@
     // to determine the tile size, such that tile radius = max range / tile size factor.
     FeatureDisplayLayout layout;
     layout.tileSize() = 650;
-    layout.maxRange() = 2000.0f;
+    layout.addLevel(FeatureLevel(0.0f, 2000.0f, "parks"));
 
     // create a model layer that will render the buildings according to our style sheet.
     FeatureModelLayerOptions parks;
@@ -306,8 +296,11 @@
     parks.styles() = new StyleSheet();
     parks.styles()->addStyle( style );
 
-    parks.instancing() = true;
-    parks.clusterCulling() = false;
+    Layer* parksLayer = new FeatureModelLayer(parks);
+    map->addLayer(parksLayer);
 
-    map->addLayer(new FeatureModelLayer(parks));
+    if (parksLayer->getStatus().isError())
+    {
+        OE_WARN << parksLayer->getStatus().message() << std::endl;
+    }
 }
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_clipplane/osgearth_clipplane.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_clipplane/osgearth_clipplane.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_clipplane/osgearth_clipplane.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_clipplane/osgearth_clipplane.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -21,15 +21,10 @@
 */
 
 #include <osgViewer/Viewer>
-#include <osgEarth/Notify>
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/ExampleResources>
-#include <osgEarth/CullingUtils>
-#include <osgEarth/VirtualProgram>
+#include <osgEarthUtil/HorizonClipPlane>
 #include <osgEarth/MapNode>
-#include <osgEarth/CullingUtils>
-#include <osg/ClipNode>
-#include <osg/ClipPlane>
 
 #define LC "[viewer] "
 
@@ -54,13 +49,6 @@
     return 0;
 }
 
-// Vertex shader to activate clip planes in GLSL:
-const char* clipvs =
-    "#version " GLSL_VERSION_STR "\n"
-    "void oe_clip_vert(inout vec4 vertex_view) { \n"
-    "   gl_ClipVertex = vertex_view; \n"
-    "}\n";
-
 int
 main(int argc, char** argv)
 {
@@ -72,9 +60,6 @@
 
     // set up a viewer:
     osgViewer::Viewer viewer(arguments);
-    viewer.getDatabasePager()->setUnrefImageDataAfterApplyPolicy( false, false );
-
-    // install our default manipulator (do this before calling load)
     viewer.setCameraManipulator( new EarthManipulator() );
 
     // load an earth file, and support all or our example command-line options
@@ -86,37 +71,27 @@
         osg::Group* root = new osg::Group();
         root->addChild( node );
         viewer.setSceneData( root );
-
-        // Install a ClipNode. The ClipNode establishes positional state so it
-        // doesn't need to parent anything. In this case it needs to be at the
-        // top of the scene graph since our clip plane calculator assumes 
-        // you're in world space.
-        osg::ClipNode* clipNode = new osg::ClipNode();
-        root->addChild( clipNode );
         
-        // By default, the clip node will activate any clip planes you add to it
-        // for its subgraph. Our clip node doesn't parent anything, but we include
-        // this to demonstrate how you would disable that:
-        clipNode->getOrCreateStateSet()->setMode(GL_CLIP_PLANE0, 0);
-        
-        // Create a ClipPlane we will use to clip to the visible horizon:
-        osg::ClipPlane* cp = new osg::ClipPlane();
-        clipNode->addClipPlane( cp );
-
-        // This cull callback will recalcuate the position of the clipping plane
-        // each frame based on the camera.
-        const osgEarth::SpatialReference* srs = osgEarth::MapNode::get(node)->getMapSRS();
-        clipNode->addCullCallback( new ClipToGeocentricHorizon(srs, cp) );
-
-        // We also need a shader that will activate clipping in GLSL.
-        VirtualProgram* vp = VirtualProgram::getOrCreate(root->getOrCreateStateSet());
-        vp->setFunction("oe_clip_vert", clipvs, ShaderComp::LOCATION_VERTEX_VIEW, 0.5f);
+        // Grab the map node.
+        osgEarth::MapNode* mapNode = osgEarth::MapNode::get(node);
+
+        // Create a horizon clip plane and install it on the map node.
+        HorizonClipPlane* hcp = new HorizonClipPlane();
+        mapNode->addCullCallback(hcp);
+
+        // Optional: set a custom clip plane number. Default is zero.
+        // If you call this, you must do so before calling installShaders.
+        hcp->setClipPlaneNumber(0u);
+
+        // Next, install the shaders somewhere. Usually this is the 
+        // same node on which you installed the callback.
+        hcp->installShaders(mapNode->getOrCreateStateSet());
 
         // Now everything is set up. The last thing to do is: anywhere in your
         // scene graph that you want to activate the clipping plane, set the 
         // corresponding mode on, like so:
         //
-        // node->getOrCreateStateSet()->setMode(GL_CLIP_PLANE0, osg::StateAttribute::ON);
+        // node->getOrCreateStateSet()->setMode(GL_CLIP_DISTANCE0, osg::StateAttribute::ON);
         //
         // If you are using symbology, you can use RenderSymbol::clipPlane(). Or in 
         // the earth file, for example:
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_cluster/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_cluster/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_cluster/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_cluster/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,8 @@
+INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+
+SET(TARGET_SRC
+    osgearth_cluster.cpp)
+
+#### end var setup  ###
+SETUP_APPLICATION(osgearth_cluster)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_cluster/osgearth_cluster.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_cluster/osgearth_cluster.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_cluster/osgearth_cluster.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_cluster/osgearth_cluster.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,345 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include <osgViewer/Viewer>
+#include <osgEarth/Notify>
+#include <osgEarthUtil/EarthManipulator>
+#include <osgEarthUtil/ExampleResources>
+#include <osgEarth/MapNode>
+#include <osgEarth/ThreadingUtils>
+#include <osgEarth/Metrics>
+#include <osgEarth/Registry>
+#include <iostream>
+
+#include <osgEarthAnnotation/PlaceNode>
+
+#include <osgEarthUtil/ClusterNode>
+
+#define LC "[viewer] "
+
+using namespace osgEarth;
+using namespace osgEarth::Util;
+using namespace osgEarth::Annotation;
+
+int
+usage(const char* name)
+{
+    OE_NOTICE
+        << "\nUsage: " << name << " file.earth" << std::endl
+        << MapNodeHelper().usage() << std::endl;
+
+    return 0;
+}
+
+void makePlaces(MapNode* mapNode, unsigned int count, const GeoExtent& extent, osg::NodeList& nodes)
+{    
+    // set up a style to use for placemarks:
+    Style placeStyle;    
+    placeStyle.getOrCreate<TextSymbol>()->declutter() = false;
+
+    // A lat/long SRS for specifying points.
+    const SpatialReference* geoSRS = mapNode->getMapSRS()->getGeographicSRS();
+
+    //--------------------------------------------------------------------
+
+    {
+        osg::ref_ptr<osg::Image> pin = osgDB::readRefImageFile("../data/hospital.png");
+
+        for (unsigned int i = 0; i < count; i++)
+        {
+            double lat = extent.yMin() + extent.height() * (rand() * 1.0) / (RAND_MAX - 1);
+            double lon = extent.xMin() + extent.width() * (rand() * 1.0) / (RAND_MAX - 1);
+            PlaceNode* place = new PlaceNode("Placemark", placeStyle, pin.get());
+            place->setPosition(GeoPoint(geoSRS, lon, lat, 0.0));
+            place->setMapNode(mapNode);
+            place->setDynamic(true);
+            nodes.push_back(place);
+        }
+    }    
+}
+
+void makeModels(MapNode* mapNode, unsigned int count, const GeoExtent& extent, osg::NodeList& nodes)
+{
+    osg::ref_ptr< osg::Node > cessna = osgDB::readRefNodeFile("cessna.osg.10,10,10.scale");
+    osg::ref_ptr< osg::Node > cow = osgDB::readRefNodeFile("cow.osg.100,100,100.scale");
+    osgEarth::Registry::shaderGenerator().run(cessna.get());
+    osgEarth::Registry::shaderGenerator().run(cow.get());
+
+    // A lat/long SRS for specifying points.
+    const SpatialReference* geoSRS = mapNode->getMapSRS()->getGeographicSRS();
+
+    bool useCow = false;
+
+    for (unsigned int i = 0; i < count; i++)
+    {
+        double lat = extent.yMin() + extent.height() * (rand() * 1.0) / (RAND_MAX - 1);
+        double lon = extent.xMin() + extent.width() * (rand() * 1.0) / (RAND_MAX - 1);
+
+        GeoTransform* transform = new GeoTransform();
+        transform->setPosition(GeoPoint(geoSRS, lon, lat, 1000));
+        if (useCow)
+        {
+            transform->addChild(cow.get());
+            transform->setName("cow");
+        }        
+        else
+        {
+            transform->addChild(cessna.get());
+            transform->setName("plane");
+        }
+        nodes.push_back(transform);
+        useCow = !useCow;
+    }
+}
+
+Container*
+createControlPanel(osgViewer::View* view)
+{
+    ControlCanvas* canvas = ControlCanvas::getOrCreate(view);
+    VBox* vbox = canvas->addControl(new VBox());
+    vbox->setChildSpacing(10);
+    return vbox;
+}
+
+struct SetRadius : public ControlEventHandler
+{
+    SetRadius(ClusterNode* clusterNode) :
+        _clusterNode( clusterNode )
+    { }
+
+    void onValueChanged(Control* control, float value)
+    {
+        _clusterNode->setRadius(value);
+    }
+
+    ClusterNode* _clusterNode;    
+};
+
+struct AddIcons : public ControlEventHandler
+{
+    AddIcons(ClusterNode* clusterNode, MapNode* mapNode) :
+        _clusterNode(clusterNode),
+        _mapNode(mapNode)
+    { }
+
+    void onClick(Control* button)
+    {
+        osg::NodeList nodes;
+        GeoExtent extent(SpatialReference::create("wgs84"), -180, -90, 180, 90);
+        makePlaces(_mapNode, 1000, extent, nodes);
+        for (unsigned int i = 0; i < nodes.size(); ++i)
+        {
+            _clusterNode->addNode(nodes[i].get());
+        }
+    }
+
+    ClusterNode* _clusterNode;
+    MapNode* _mapNode;
+};
+
+struct ToggleEnabled : public ControlEventHandler
+{
+    ToggleEnabled(ClusterNode* clusterNode) :
+        _clusterNode(clusterNode)
+    { }
+
+    virtual void onValueChanged(Control* control, bool value) {
+        _clusterNode->setEnabled(value);
+    }
+
+    ClusterNode* _clusterNode;
+};
+
+
+void buildControls(Container* container, ClusterNode* clusterNode, MapNode* mapNode)
+{
+    // the outer container:
+    Grid* grid = container->addControl(new Grid());
+    grid->setBackColor(0, 0, 0, 0.5);
+    grid->setMargin(10);
+    grid->setPadding(10);
+    grid->setChildSpacing(10);
+    grid->setChildVertAlign(Control::ALIGN_CENTER);
+    grid->setAbsorbEvents(true);
+    grid->setVertAlign(Control::ALIGN_TOP);
+
+    // Radius
+    LabelControl* radiusLabel = new LabelControl("Radius");
+    radiusLabel->setVertAlign(Control::ALIGN_CENTER);
+    grid->setControl(0, 0, radiusLabel);
+
+    HSliderControl* radiusAdjust = new HSliderControl(1, 500, clusterNode->getRadius(), new SetRadius(clusterNode));
+    radiusAdjust->setWidth(125);
+    radiusAdjust->setHeight(12);
+    radiusAdjust->setVertAlign(Control::ALIGN_CENTER);
+    grid->setControl(1, 0, radiusAdjust);
+    grid->setControl(2, 0, new LabelControl(radiusAdjust));
+    
+    grid->setControl(0, 1, new LabelControl("Enabled"));
+    CheckBoxControl* checkBox = new CheckBoxControl(clusterNode->getEnabled());
+    checkBox->setHorizAlign(Control::ALIGN_LEFT);
+    checkBox->addEventHandler(new ToggleEnabled(clusterNode));
+    grid->setControl(1, 1, checkBox);
+
+    
+    grid->setControl(0, 2, new ButtonControl("Add Icons", new AddIcons(clusterNode, mapNode)));
+    
+}
+
+//! Displays a simplified count for the cluster instead of the exact number.
+class SimplifyCountCallback : public ClusterNode::StyleClusterCallback
+{
+public:
+    virtual void operator()(ClusterNode::Cluster& cluster)
+    {        
+        if (cluster.nodes.size() >= 100)
+        {
+            cluster.marker->setText("100+");
+        }
+        else if (cluster.nodes.size() >= 50)
+        {
+            cluster.marker->setText("50+");
+        }
+        else if (cluster.nodes.size() >= 25)
+        {
+            cluster.marker->setText("25+");
+        }
+        else if (cluster.nodes.size() >= 10)
+        {
+            cluster.marker->setText("10+");
+        }
+        else
+        {
+            cluster.marker->setText("2+");
+        } 
+    }
+};
+
+//! Changes the name of a marker based on the name of the clustered nodes.
+class StyleByNameCallback : public ClusterNode::StyleClusterCallback
+{
+public:
+
+    StyleByNameCallback()
+    {
+        _planeImage = osgDB::readRefImageFile("../data/airport.png");
+        _cowImage = osgDB::readRefImageFile("../data/hospital.png");
+    }
+    
+    virtual void operator()(ClusterNode::Cluster& cluster)
+    {    
+        std::stringstream buf;
+        buf << cluster.nodes[0]->getName() << "(" << cluster.nodes.size() << ")" << std::endl;
+        cluster.marker->setText(buf.str());
+
+        if (cluster.nodes[0]->getName() == "plane")
+        {
+            cluster.marker->setIconImage(_planeImage.get());
+        }
+        else if (cluster.nodes[0]->getName() == "cow")
+        {
+            cluster.marker->setIconImage(_cowImage.get());
+        } 
+    }
+
+    osg::ref_ptr< osg::Image > _planeImage;
+    osg::ref_ptr< osg::Image > _cowImage;
+};
+
+//! Only allows nodes with the same name to be clustered together.
+class ClusterByNameCallback : public ClusterNode::CanClusterCallback
+{
+public:
+    virtual bool operator()(osg::Node* a, osg::Node* b)
+    {
+        return (a->getName() == b->getName());
+    }
+};
+
+
+int
+main(int argc, char** argv)
+{
+    osg::ArgumentParser arguments(&argc, argv);
+
+    // help?
+    if (arguments.read("--help"))
+        return usage(argv[0]);
+
+    // create a viewer:
+    osgViewer::Viewer viewer(arguments);
+
+    //Create the control panel    
+    Container* container = createControlPanel(&viewer);
+
+    // Tell the database pager to not modify the unref settings
+    viewer.getDatabasePager()->setUnrefImageDataAfterApplyPolicy(true, false);
+
+    // install our default manipulator (do this before calling load)
+    viewer.setCameraManipulator(new EarthManipulator(arguments));
+
+    // disable the small-feature culling
+    viewer.getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
+
+    // set a near/far ratio that is smaller than the default. This allows us to get
+    // closer to the ground without near clipping. If you need more, use --logdepth
+    viewer.getCamera()->setNearFarRatio(0.0001);
+
+    // load an earth file, and support all or our example command-line options
+    // and earth file <external> tags    
+    osg::Node* node = MapNodeHelper().load(arguments, &viewer);
+    if (node)
+    {
+        MapNode* mapNode = MapNode::findMapNode(node);
+        osg::NodeList nodes;
+
+        //GeoExtent extent(SpatialReference::create("wgs84"), -180, -90, 180, 90);
+        GeoExtent extent(SpatialReference::create("wgs84"), -160.697021484375, 18.208480196039883, -153.951416015625, 22.978623970384913);
+        
+        makeModels(mapNode, 10000, extent, nodes);
+
+        ClusterNode* clusterNode = new ClusterNode(mapNode, osgDB::readImageFile("../data/placemark32.png"));
+        clusterNode->setStyleCallback(new StyleByNameCallback());
+        clusterNode->setCanClusterCallback(new ClusterByNameCallback());
+        for (unsigned int i = 0; i < nodes.size(); i++)
+        {
+            clusterNode->addNode(nodes[i].get());
+        }              
+        mapNode->addChild(clusterNode);
+
+        buildControls(container, clusterNode, mapNode);
+
+        viewer.setSceneData(node);
+
+        while (!viewer.done())
+        {
+            viewer.frame();
+        }
+        return viewer.run();
+    }
+    else
+    {
+        return usage(argv[0]);
+    }
+
+    return 0;
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_colorfilter/osgearth_colorfilter.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_colorfilter/osgearth_colorfilter.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_colorfilter/osgearth_colorfilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_colorfilter/osgearth_colorfilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_computerangecallback/osgearth_computerangecallback.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_computerangecallback/osgearth_computerangecallback.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_computerangecallback/osgearth_computerangecallback.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_computerangecallback/osgearth_computerangecallback.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_controls/osgearth_controls.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_controls/osgearth_controls.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_controls/osgearth_controls.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_controls/osgearth_controls.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_conv/osgearth_conv.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_conv/osgearth_conv.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_conv/osgearth_conv.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_conv/osgearth_conv.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -72,14 +72,17 @@
         bool ok = false;
         GeoImage image = _source->createImage(key);
         if (image.valid())
+        {
+            //OE_INFO << "Read " << key.str() << ", image size = " << image.getImage()->s() << std::endl;
             ok = _dest->storeImage(key, image.getImage(), 0L);
+        }
 
         return ok;
     }
 
     bool hasData(const TileKey& key) const
     {
-        return _source->mayHaveDataInExtent(key.getExtent());
+        return _source->mayHaveData(key);
     }
 
     osg::ref_ptr<ImageLayer> _source;
@@ -109,7 +112,7 @@
 
     bool hasData(const TileKey& key) const
     {
-        return _source->mayHaveDataInExtent(key.getExtent());
+        return _source->mayHaveData(key);
     }
 
     osg::ref_ptr<ElevationLayer> _source;
@@ -240,6 +243,13 @@
         return -1;
     }
 
+    // Assign a custom tile size to the input source, if possible:
+    unsigned tileSize = input->getPixelsPerTile();
+    if (args.read("--tile-size", tileSize))
+    {
+        input->setPixelsPerTile(tileSize);
+    }
+
     Status inputStatus = input->open( input->MODE_READ, dbo.get() );
     if ( inputStatus.isError() )
     {
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_datetime/osgearth_datetime.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_datetime/osgearth_datetime.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_datetime/osgearth_datetime.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_datetime/osgearth_datetime.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -26,7 +26,6 @@
 #include <osgEarth/Registry>
 
 #include <osgEarthUtil/EarthManipulator>
-#include <osgEarthUtil/AnnotationEvents>
 #include <osgEarthUtil/AutoClipPlaneHandler>
 #include <osgEarthUtil/ExampleResources>
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_drawables/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_drawables/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_drawables/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_drawables/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,7 @@
+INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+
+SET(TARGET_SRC osgearth_drawables.cpp )
+
+#### end var setup  ###
+SETUP_APPLICATION(osgearth_drawables)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_drawables/osgearth_drawables.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_drawables/osgearth_drawables.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_drawables/osgearth_drawables.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_drawables/osgearth_drawables.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,298 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include <osgViewer/Viewer>
+#include <osgViewer/ViewerEventHandlers>
+#include <osg/Geometry>
+#include <osg/LineWidth>
+#include <osg/LineStipple>
+#include <osgGA/StateSetManipulator>
+#include <osgDB/ReadFile>
+#include <osgDB/WriteFile>
+#include <osgEarth/LineDrawable>
+#include <osgEarth/PointDrawable>
+#include <osgEarth/CullingUtils>
+#include <osgEarth/VirtualProgram>
+#include <osgEarth/GLUtils>
+
+#define LC "[drawables] "
+
+using namespace osgEarth;
+
+void addVerts(LineDrawable* line, double x, double y)
+{
+    line->pushVertex(osg::Vec3(x, 0, y));
+    line->pushVertex(osg::Vec3(x + 5, 0, y));
+    line->pushVertex(osg::Vec3(x + 10, 0, y));
+    line->pushVertex(osg::Vec3(x + 10, 0, y + 5));
+    line->pushVertex(osg::Vec3(x + 10, 0, y + 10));
+    line->pushVertex(osg::Vec3(x + 5, 0, y + 10));
+    line->pushVertex(osg::Vec3(x, 0, y + 10));
+    line->pushVertex(osg::Vec3(x, 0, y + 5));
+    line->pushVertex(osg::Vec3(x + 5, 0, y + 5));
+    line->finish();
+}
+
+void addLotsOfVerts(LineDrawable* line)
+{
+    for (int x = 0; x < 10; ++x)
+    {
+        for (int y = 0; y < 10; ++y)
+        {
+            line->pushVertex(osg::Vec3(x, 0, y));
+        }
+    }
+    line->finish();
+}
+
+LineDrawable* makeStar(double x, double y, double r)
+{
+    LineDrawable* star = new LineDrawable(GL_LINES);
+    for(float i=0.0f; i<osg::PI*2.0; i += osg::PI/16.0)
+    {
+        float c = cos(i), s = sin(i);
+        star->pushVertex(osg::Vec3(x, 0, y));
+        star->pushVertex(osg::Vec3(x+(r*c-r*s), 0, y+(r*c+r*s)));
+    }
+    star->finish();
+    return star;
+}
+
+PointDrawable* makeGridOfPoints(double x, double y)
+{
+    PointDrawable* grid = new PointDrawable();
+    for(float i=x; i<x+20; i+=5)
+    {
+        for(float j=y; j<y+20; j+=5)
+        {
+            grid->pushVertex(osg::Vec3(i, 0, j));
+        }
+    }
+    grid->finish();
+    return grid;
+}
+
+osg::Node* makeGeometryForImport(double x, double y)
+{
+    osg::Geometry* geom = new osg::Geometry();
+    osg::Vec3Array* verts = new osg::Vec3Array();
+    verts->push_back(osg::Vec3(x, 0, y));
+    verts->push_back(osg::Vec3(x + 5, 0, y));
+    verts->push_back(osg::Vec3(x + 10, 0, y));
+    verts->push_back(osg::Vec3(x + 10, 0, y + 5));
+    verts->push_back(osg::Vec3(x + 10, 0, y + 10));
+    verts->push_back(osg::Vec3(x + 5, 0, y + 10));
+    verts->push_back(osg::Vec3(x, 0, y + 10));
+    verts->push_back(osg::Vec3(x, 0, y + 5));
+    verts->push_back(osg::Vec3(x + 5, 0, y + 5));
+    geom->setVertexArray(verts);    
+    osg::Vec4Array* colors = new osg::Vec4Array(1);
+    (*colors)[0].set(1,1,1,1);
+    geom->setColorArray(colors);
+    geom->addPrimitiveSet(new osg::DrawArrays(GL_LINE_STRIP, 0, verts->size()));
+    geom->getOrCreateStateSet()->setAttributeAndModes(new osg::LineWidth(3.0f));
+    geom->getOrCreateStateSet()->setAttributeAndModes(new osg::LineStipple(1, 0xfff0));
+    return geom;
+}
+
+struct TestFirstCount : public osg::NodeCallback
+{
+    void operator()(osg::Node* node, osg::NodeVisitor* nv)
+    {
+        if (nv->getFrameStamp()->getFrameNumber() % 20 == 0)
+        {
+            LineDrawable* line = (LineDrawable*)node;
+
+            unsigned total = line->getNumVerts();
+            unsigned first = line->getFirst();
+        
+            line->setFirst( (first+1) % total );
+            line->setCount( 3 );
+        }
+    }
+};
+
+osg::Node* createDrawables()
+{
+    // You need a viewport uniform for the lines to work.
+    // MapNode installs one automatically, but we're not using MapNode
+    // in this example.
+    osg::Group* group = new osg::Group();
+    group->addCullCallback(new InstallViewportSizeUniform());
+
+    float x = 10;
+    float y = 10;
+
+    LineDrawable* strip = new LineDrawable(GL_LINE_STRIP);
+    strip->setLineWidth(8);
+    strip->setColor(osg::Vec4(1,1,1,1));
+    addVerts(strip, x, y);
+    group->addChild(strip);
+
+    x += 20;
+    LineDrawable* loop = new LineDrawable(GL_LINE_LOOP);
+    loop->setLineWidth(1);
+    loop->setColor(osg::Vec4(1,1,0,1));
+    addVerts(loop, x, y);
+    group->addChild(loop);
+
+    x += 20;
+    LineDrawable* stippled = new LineDrawable(GL_LINE_STRIP);
+    stippled->setLineWidth(4);
+    stippled->setStipplePattern(0xff00);
+    stippled->setColor(osg::Vec4(0,1,0,1));
+    addVerts(stippled, x, y);
+    group->addChild(stippled);
+    
+    x += 20;
+    LineDrawable* segments = new LineDrawable(GL_LINES);
+    segments->setLineWidth(3);
+    segments->setColor(osg::Vec4(0,1,1,1));
+    addVerts(segments, x, y);
+    group->addChild(segments);
+
+    x += 20;
+    LineDrawable* firstCount = new LineDrawable(GL_LINE_STRIP);
+    firstCount->setLineWidth(5);
+    firstCount->setColor(osg::Vec4(1,0,1,1));
+    addVerts(firstCount, x, y);
+    firstCount->addUpdateCallback(new TestFirstCount());
+    group->addChild(firstCount);
+    
+    x += 20;
+    osg::ref_ptr<osg::Node> node = makeGeometryForImport(x, y);
+    LineGroup* lines = new LineGroup();
+    lines->import(node.get());
+    group->addChild(lines);
+
+    x += 20;
+    LineDrawable* points = new LineDrawable(GL_POINTS);
+    addVerts(points, x, y);
+    group->addChild(points);
+
+    x = 20;
+    y -= 20;
+    for(unsigned i=0; i<10; ++i)
+    {
+        LineDrawable* across = new LineDrawable(GL_LINES);
+        across->pushVertex(osg::Vec3(x, 0, y));
+        across->pushVertex(osg::Vec3(x+100, 0, y));
+        across->setLineWidth((float)(i+1));
+        across->finish();
+        group->addChild(across);
+        y -= (i+2);
+    }
+
+    x = 20;
+    y -= 20;
+    LineDrawable* star = makeStar(x, y, 10);
+    star->setColor(osg::Vec4(1,1,1,1));
+    star->setLineWidth(1.0f);
+    group->addChild(star);
+
+    x += 40;
+    LineDrawable* star2 = makeStar(x, y, 10);
+    star2->setColor(osg::Vec4(1,.5,0,1));
+    star2->setLineWidth(2.0f);
+    group->addChild(star2);
+
+    x += 40;
+    LineDrawable* star3 = makeStar(x, y, 10);
+    star3->setColor(osg::Vec4(1,1,0,1));
+    star3->setLineWidth(3.0f);
+    group->addChild(star3);
+
+    y -= 40;
+    x = 20;
+    PointDrawable* grid = makeGridOfPoints(x, y);
+    grid->setPointSize(3.0f);
+    grid->setColor(osg::Vec4(0,1,1,1));
+    group->addChild(grid);
+
+    x += 50;
+    PointDrawable* grid2 = makeGridOfPoints(x, y);
+    grid2->setPointSize(20.0f);
+    GLUtils::setPointSmooth(grid2->getOrCreateStateSet(), 1);
+    group->addChild(grid2);
+
+    return group;
+}
+
+int
+main(int argc, char** argv)
+{
+    osg::ArgumentParser arguments(&argc,argv);
+    osgViewer::Viewer viewer(arguments);
+
+    osg::ref_ptr<osg::Node> node = createDrawables();
+
+#ifdef OSG_GL3_AVAILABLE
+    // Sets up the State for GL3 mode
+    viewer.setRealizeOperation(new GL3RealizeOperation());
+#endif
+
+    if (arguments.read("--ortho"))
+    {
+        viewer.realize();
+        double r = node->getBound().radius() * 1.2;
+        double ar = viewer.getCamera()->getViewport()->width() / viewer.getCamera()->getViewport()->height();
+        viewer.getCamera()->setProjectionMatrixAsOrtho(-r, +r, -r/ar, +r/ar, -r*2.0, +r*2.0);
+    }
+
+    if (arguments.read("--antialias") || arguments.read("--smooth"))
+    {
+        GLUtils::setLineSmooth(node->getOrCreateStateSet(), 1);
+        GLUtils::setPointSmooth(node->getOrCreateStateSet(), 1);
+        node->getOrCreateStateSet()->setMode(GL_BLEND, 1);
+    }
+
+    if (arguments.read("--serialize"))
+    {
+        const char* fileName = "out.osgt";
+
+        OE_NOTICE << "Writing to " << fileName << " ..." << std::endl;
+        if (!osgDB::writeNodeFile(*node.get(), fileName))
+        {
+            OE_WARN << "serialize failed!\n";
+            return -1;
+        }
+
+        OE_NOTICE << "Reading from " << fileName << " ..." << std::endl;
+        node = osgDB::readRefNodeFile(fileName);
+        if (!node.valid())
+        {
+            OE_WARN << "deserialize failed!\n";
+            return -1;
+        }
+    }
+
+    // Sets up global default uniform values needed by osgEarth
+    GLUtils::setGlobalDefaults(viewer.getCamera()->getOrCreateStateSet());
+
+    viewer.setSceneData(node.get());
+    
+    viewer.addEventHandler(new osgViewer::StatsHandler());
+    viewer.addEventHandler(new osgViewer::WindowSizeHandler());
+    viewer.addEventHandler(new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()));
+
+    return viewer.run();
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_eci/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_eci/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_eci/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_eci/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,7 @@
+INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+
+SET(TARGET_SRC osgearth_eci.cpp )
+
+#### end var setup  ###
+SETUP_APPLICATION(osgearth_eci)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_eci/osgearth_eci.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_eci/osgearth_eci.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_eci/osgearth_eci.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_eci/osgearth_eci.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,415 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+/**
+ * Experiment with using a J2000/ECI reference frame as the root of the scene,
+ * with the MapNode under an ECI-to-ECEF transform.
+ */
+#include <osgEarth/MapNode>
+#include <osgEarth/DateTime>
+#include <osgEarth/NodeUtils>
+#include <osgEarth/PointDrawable>
+#include <osgEarth/CullingUtils>
+#include <osgEarth/LineDrawable>
+#include <osgEarth/Lighting>
+#include <osgEarthUtil/EarthManipulator>
+#include <osgEarthUtil/ExampleResources>
+#include <osgEarthUtil/Sky>
+#include <osgEarthSymbology/Color>
+#include <osgEarthAnnotation/LabelNode>
+#include <osgViewer/Viewer>
+#include <iostream>
+
+#define LC "[eci] "
+
+using namespace osgEarth;
+using namespace osgEarth::Util;
+using namespace osgEarth::Symbology;
+using namespace osgEarth::Annotation;
+namespace ui = osgEarth::Util::Controls;
+
+int
+usage(const char* name, const char* msg)
+{
+    OE_NOTICE 
+        << "\nUsage: " << name << " [file.earth]\n"
+        << "     --tle <filename>    : Load a NORAD TLE file\n"
+        << "     --maxpoints <num>   : Limit the track size to <num> points\n"
+        << "     --ecef              : View the track in ECEF space instead of ECI\n"
+        << "     --tessellate        : Add interpolated points to the track data\n"
+        << "\nDownload NORAD TLE files from https://www.celestrak.com/NORAD/archives\n\n"
+        << msg << std::endl;
+
+    return 0;
+}
+
+// Reference time for the J2000 ECI coordinate frame 
+static DateTime J2000Epoch(2000, 1, 1, 12.00);
+
+// Transform that takes us from a J2000 ECI reference frame 
+// to an ECEF reference frame (i.e. MapNode)
+class J2000ToECEFTransform : public osg::MatrixTransform
+{
+public:
+    void setDateTime(const DateTime& dt)
+    {
+        osg::Matrix matrix = createMatrix(dt);
+        setMatrix(matrix);
+    }
+
+    static osg::Matrix createMatrix(const DateTime& dt)
+    {
+        // Earth's rotation rate: International Astronomical Union (IAU) GRS 67
+        const double IAU_EARTH_ANGULAR_VELOCITY = 7292115.1467e-11; // (rad/sec)
+
+        double secondsElapsed = (double)(dt.asTimeStamp() - J2000Epoch.asTimeStamp());
+        const double rotation = IAU_EARTH_ANGULAR_VELOCITY * secondsElapsed;
+        
+        osg::Matrix matrix;
+        matrix.makeRotate(rotation, 0, 0, 1);
+        return matrix;
+    }
+};
+
+// Code to read TLE track data files from https://celestrak.com/NORAD
+struct ECILocation
+{
+    DateTime timestamp;     // point time
+    Angle incl;             // inclination
+    Angle raan;             // right ascencion of ascending node
+    Distance alt;           // altitude
+    osg::Vec3d eci;         // ECI coordinate
+    osg::Vec3d ecef;        // ECEF coordinate
+
+    void computeECIAndECEF()
+    {
+        eci =
+            osg::Quat(raan.as(Units::RADIANS), osg::Vec3d(0, 0, 1)) *
+            osg::Quat(incl.as(Units::RADIANS), osg::Vec3d(1, 0, 0)) *
+            osg::Vec3d(alt.as(Units::METERS), 0, 0);
+
+        osg::Matrix eci2ecef = J2000ToECEFTransform::createMatrix(timestamp);
+        ecef = eci * eci2ecef;
+    }
+};
+
+struct ECITrack : public std::vector<ECILocation>
+{
+    // interpolate points for a smoother track
+    void tessellate()
+    {
+        ECITrack newTrack;
+        for(unsigned k=0; k<size()-1; ++k)
+        {
+            for(float t=0; t<1.0f; t+=0.1)
+            {
+                const ECILocation& p0 = at(k);
+                const ECILocation& p1 = at(k+1);
+
+                newTrack.push_back(ECILocation());
+                ECILocation& loc = newTrack.back();
+                
+                loc.timestamp = DateTime(p0.timestamp.asTimeStamp() + (p1.timestamp.asTimeStamp()-p0.timestamp.asTimeStamp())*t);
+                loc.raan.set(p0.raan.as(Units::RADIANS) + (p1.raan.as(Units::RADIANS)-p0.raan.as(Units::RADIANS))*t, Units::RADIANS);
+                loc.incl.set(p0.incl.as(Units::RADIANS) + (p1.incl.as(Units::RADIANS)-p0.incl.as(Units::RADIANS))*t, Units::RADIANS);
+                loc.alt = p0.alt;
+                loc.computeECIAndECEF();
+            }
+        }
+        swap(newTrack);
+    }
+};
+
+class TLEReader
+{
+public:
+    // https://celestrak.com/NORAD/documentation/tle-fmt.php
+    bool read(const std::string& filename, ECITrack& track) const
+    {
+        std::ifstream fin(filename.c_str());
+        while(!fin.eof())
+        {
+            std::string line1, line2;
+
+            std::getline(fin, line1);
+            std::getline(fin, line2);
+            if (line1.empty() || line2.empty())
+                break;
+
+            track.push_back(ECILocation());
+            ECILocation& loc = track.back();
+
+            // read timestamp
+            int year2digit = osgEarth::as<int>(line1.substr(18, 2), 99);
+            int year = year2digit > 50? 1900+year2digit : 2000+year2digit;
+            double dayOfYear = osgEarth::as<double>(line1.substr(20, 12), 0);
+            loc.timestamp = DateTime(year, dayOfYear);
+
+            // read ra/decl
+            loc.incl.set(osgEarth::as<double>(line2.substr(8,8),0), Units::DEGREES);
+            loc.raan.set(osgEarth::as<double>(line2.substr(17,8),0), Units::DEGREES);
+            loc.alt.set(6371 + 715, Units::KILOMETERS);
+
+            loc.computeECIAndECEF();
+        }
+        OE_INFO << "Read " << track.size() << " track points" << std::endl;
+        return true;
+    }
+};
+
+// If the "global" coordinate system is ECI, you can put this transform
+// under the MapNode (in ECEF space) to "revert" to that global ECI frame.
+// Useful if you want to put ECI-space data under the MapNode.
+class ECIReferenceFrame : public osg::Group
+{
+public:
+    ECIReferenceFrame()
+    {
+        Lighting::set(getOrCreateStateSet(), osg::StateAttribute::OFF);
+    }
+
+    void traverse(osg::NodeVisitor& nv)
+    {
+        osgUtil::CullVisitor* cv = Culling::asCullVisitor(nv);
+        if (cv)
+        {
+            const osg::Camera* cam = cv->getRenderStage()->getCamera();
+            cv->pushModelViewMatrix(new osg::RefMatrix(cam->getViewMatrix()), osg::Transform::ABSOLUTE_RF);
+            osg::Group::traverse(nv);
+            cv->popModelViewMatrix();
+        }
+        else osg::Group::traverse(nv);
+    }
+};
+
+// Loads up an ECITrack for display as a series of points.
+class ECITrackDrawable : public LineDrawable //public PointDrawable
+{
+public:
+    ECITrackDrawable() : LineDrawable(GL_LINE_STRIP)
+    {
+        Lighting::set(getOrCreateStateSet(), 0);
+        //setPointSmooth(true);
+        //setPointSize(4.0f);
+    }
+
+    void setDateTime(const DateTime& dt)
+    {
+        osg::FloatArray* times = dynamic_cast<osg::FloatArray*>(getVertexAttribArray(6));
+        unsigned i;
+        for (i = 0; i < getNumVerts(); ++i)
+        {
+            if (dt.asTimeStamp() < getVertexAttrib(times, i))
+                break;
+        }
+        setCount(i);
+    }
+    
+    void load(const ECITrack& track, bool drawECEF)
+    {
+        osg::FloatArray* times = new osg::FloatArray();
+        times->setBinding(osg::Array::BIND_PER_VERTEX);
+        setVertexAttribArray(6, times);
+
+        osg::Vec4f HSLA;
+        Color color;
+
+        for(unsigned i=0; i<track.size(); ++i)
+        {
+            const ECILocation& loc = track[i];
+            pushVertex(drawECEF? loc.ecef : loc.eci);
+            pushVertexAttrib(times, (float)loc.timestamp.asTimeStamp());
+            
+            // simple color ramp
+            HSLA.set((float)i/(float)(track.size()-1), 1.0f, 1.0f, 1.0f);
+            color.fromHSL(HSLA);
+            setColor(i, color);      
+        }
+        finish();
+    }
+};
+
+osg::Node* createECIAxes()
+{
+    const float R = 10e6;
+    LineDrawable* d = new LineDrawable(GL_LINES);
+    d->allocate(6);
+
+    d->setVertex(0, osg::Vec3(0,0,0));
+    d->setColor(0, osg::Vec4(1,0,0,1));
+    d->setVertex(1, osg::Vec3(R,0,0));
+    d->setColor(1, osg::Vec4(1,0,0,1));
+
+    d->setVertex(2, osg::Vec3(0,0,0));
+    d->setColor(2, osg::Vec4(0,1,0,1));
+    d->setVertex(3, osg::Vec3(0,R,0));
+    d->setColor(3, osg::Vec4(0,1,0,1));
+
+    d->setVertex(4, osg::Vec3(0,0,0));
+    d->setColor(4, osg::Vec4(0,0,1,1));
+    d->setVertex(5, osg::Vec3(0,0,R));
+    d->setColor(5, osg::Vec4(0,0,1,1));
+
+    d->setLineWidth(10);
+    return d;
+}
+
+// Application-wide data and control structure
+struct App
+{
+    DateTime start, end;
+    HSliderControl* time;
+    LabelControl* timeLabel;
+    SkyNode* sky;
+    J2000ToECEFTransform* ecef;
+    osg::Group* eci;
+    ECITrackDrawable* trackDrawable;    
+    ECITrack track;
+
+    App() 
+    {
+        trackDrawable = 0L;
+        start = J2000Epoch;
+        end = start + 24.0;
+    }
+
+    void setTime()
+    {
+        DateTime newTime(time->getValue());
+
+        if (sky)
+            sky->setDateTime(newTime);
+
+        if (ecef)
+            ecef->setDateTime(newTime);
+
+        if (trackDrawable)
+            trackDrawable->setDateTime(newTime);
+
+        timeLabel->setText(newTime.asRFC1123());
+    }
+};
+
+OE_UI_HANDLER(setTime);
+
+
+int
+main(int argc, char** argv)
+{
+    osg::ArgumentParser arguments(&argc,argv);
+    if ( arguments.read("--help") )
+        return usage(argv[0], "");
+
+    App app;
+
+    // Read in an optiona TLE track data file
+    std::string tlefile;
+    if (arguments.read("--tle", tlefile))
+    {
+        TLEReader().read(tlefile, app.track);
+        if (!app.track.empty())
+        {
+            int maxPoints;
+            if (arguments.read("--maxpoints", maxPoints) && app.track.size() > maxPoints)
+                app.track.resize(maxPoints);
+            if (arguments.read("--tessellate"))
+                app.track.tessellate();
+            app.start = app.track.front().timestamp;
+            app.end   = app.track.back().timestamp;
+        }
+    }
+
+    osgViewer::Viewer viewer(arguments);
+    viewer.setCameraManipulator( new EarthManipulator(arguments) );
+
+    ui::VBox* container = new ui::VBox();
+    container->setChildSpacing(3);
+    container->addControl(new ui::LabelControl("ECI COORDINATE SYSTEM EXAMPLE", Color::Yellow));
+
+    // UI control to modify the time of day.
+    ui::HBox* h = container->addControl(new ui::HBox());
+    h->addControl(new ui::LabelControl("Time:"));
+    app.time = h->addControl(new HSliderControl(
+        app.start.asTimeStamp(), app.end.asTimeStamp(), app.start.asTimeStamp(),
+        new setTime(app)));
+    app.time->setWidth(500);
+    app.timeLabel = container->addControl(new LabelControl());
+
+    // Load an earth file  
+    osg::Node* earth = MapNodeHelper().load(arguments, &viewer, container);
+    if (earth)
+    {
+        // New scene graph root
+        osg::Group* root = new osg::Group();
+
+        // First create a Sky which we will place in the (default) ECI frame.
+        SkyOptions skyOptions;
+        skyOptions.coordinateSystem() = SkyOptions::COORDSYS_ECI;
+        app.sky = SkyNode::create(MapNode::get(earth));
+        app.sky->attach(&viewer);
+        app.sky->getSunLight()->setAmbient(osg::Vec4(0.5,0.5,0.5,1.0));
+        root->addChild(app.sky);
+        
+        // A special transform takes us from the ECI into an ECEF frame
+        // based on the current date and time.
+        // The earth (MapNode) lives here since it is ECEF.
+        app.ecef = new J2000ToECEFTransform();
+        app.sky->addChild(app.ecef);
+        app.ecef->addChild(earth);
+        
+        // This group holds data in the ECI frame.
+        app.eci = new ECIReferenceFrame();
+        app.eci->addChild(createECIAxes());
+        MapNode::get(earth)->addChild(app.eci);
+
+        // Track data
+        if (!app.track.empty())
+        {
+            app.trackDrawable = new ECITrackDrawable();
+
+            bool drawECEF = arguments.read("--ecef");
+            if (drawECEF)
+            {
+                app.trackDrawable->load(app.track, true);
+                MapNode::get(earth)->addChild(app.trackDrawable);
+            }
+            else
+            {
+                app.trackDrawable->load(app.track, false);
+                app.eci->addChild(app.trackDrawable);
+            }
+        }
+
+        viewer.realize();
+        app.time->setWidth(viewer.getCamera()->getViewport()->width()-40);
+
+        app.setTime();
+        viewer.setSceneData(root);
+        viewer.run();
+    }
+    else
+    {
+        return usage(argv[0], "Bad earth file");
+    }
+
+    return 0;
+}
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_elevation/osgearth_elevation.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_elevation/osgearth_elevation.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_elevation/osgearth_elevation.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_elevation/osgearth_elevation.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_ephemeris/osgearth_ephemeris.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_ephemeris/osgearth_ephemeris.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_ephemeris/osgearth_ephemeris.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_ephemeris/osgearth_ephemeris.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -51,11 +51,51 @@
 
 struct App
 {
+    App() {
+        _playing = false;
+        readout = new ui::LabelControl();
+        readout->setVertAlign(ui::Control::ALIGN_CENTER);
+    }
+
     osg::ref_ptr<PlaceNode> sunPos;
     osg::ref_ptr<PlaceNode> moonPos;
     SkyNode* sky;
+    ui::LabelControl* readout;
+
+    void play() { _playing = true; }
+    void stop() { _playing = false; }
+
+    void tick() {
+        if (_playing) {
+            TimeStamp t = sky->getDateTime().asTimeStamp() + 1;
+            sky->setDateTime(DateTime(t));
+        }
+        readout->setText(sky->getDateTime().asRFC1123());
+    }
+    
+    bool _playing;
 };
 
+struct Play : public ui::ControlEventHandler {
+    Play(App& app) : _app(app) { }
+    void onClick(ui::Control*) { _app.play(); }
+    App& _app;
+};
+
+struct Stop : public ui::ControlEventHandler {
+    Stop(App& app) : _app(app) { }
+    void onClick(ui::Control*) { _app.stop(); }
+    App& _app;
+};
+
+ui::Container* createUI(App& app)
+{
+    ui::HBox* vcr = new ui::HBox();
+    vcr->addControl(new ui::ButtonControl("Play", new Play(app)));
+    vcr->addControl(new ui::ButtonControl("Stop", new Stop(app)));
+    vcr->addControl(app.readout);
+    return vcr;
+}
 
 int
 main(int argc, char** argv)
@@ -91,15 +131,13 @@
 
         MapNode* mapNode = MapNode::get(node);
 
-        app.sunPos = new PlaceNode(mapNode, GeoPoint(), mark.get(), "Sun");
+        app.sunPos = new PlaceNode("Sun", Style(), mark.get());
         app.sunPos->setDynamic(true);
         mapNode->addChild( app.sunPos.get() );
 
-        app.moonPos = new PlaceNode(mapNode, GeoPoint(), mark.get(), "Moon");
+        app.moonPos = new PlaceNode("Moon", Style(), mark.get());
         app.moonPos->setDynamic(true);
-
-        mapNode->addChild( app.moonPos.get() );        
-
+        mapNode->addChild( app.moonPos.get() ); 
 
         app.sky = osgEarth::findTopMostNodeOfType<SkyNode>(node);        
         const Ephemeris* ephemeris = 0L;
@@ -110,10 +148,13 @@
 
         LatLongFormatter llf;
         llf.setOptions( LatLongFormatter::Options(llf.FORMAT_DEGREES_MINUTES_SECONDS) );
-        llf.setPrecision( 4 );
+        llf.setPrecision( 8 );
 
         viewer.setSceneData( root );
 
+        ui::ControlCanvas* container = ui::ControlCanvas::getOrCreate(&viewer);
+        container->addChild(createUI(app));
+
         while(!viewer.done())
         {
             viewer.frame();
@@ -122,20 +163,22 @@
             {
                 const DateTime& dt = app.sky->getDateTime();
 
-                osg::Vec3d sunECEF = ephemeris->getSunPositionECEF(dt);
-                GeoPoint sun;
-                sun.fromWorld(mapNode->getMapSRS(), sunECEF);
-                sun.alt() = 0.0;
-                app.sunPos->setPosition( sun );
-                app.sunPos->setText( "Sun\n" + llf.format(sun) );
-
-                osg::Vec3d moonECEF = ephemeris->getMoonPositionECEF(dt);
-                GeoPoint moon;
-                moon.fromWorld(mapNode->getMapSRS(), moonECEF);
-                moon.alt() = 0.0;
-                app.moonPos->setPosition( moon );
-                app.moonPos->setText( "Moon\n" + llf.format(moon) );
+                CelestialBody sun = ephemeris->getSunPosition(dt);
+                GeoPoint sunPos;
+                sunPos.fromWorld(mapNode->getMapSRS(), sun.geocentric);
+                sunPos.alt() = 0.0;
+                app.sunPos->setPosition( sunPos );
+                app.sunPos->setText( "Sun\n" + llf.format(sunPos) );
+
+                CelestialBody moon = ephemeris->getMoonPosition(dt);
+                GeoPoint moonPos;
+                moonPos.fromWorld(mapNode->getMapSRS(), moon.geocentric);
+                moonPos.alt() = 0.0;
+                app.moonPos->setPosition( moonPos );
+                app.moonPos->setText( "Moon\n" + llf.format(moonPos) );
             }
+
+            app.tick();
         }
     }
     else
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_featurefilter/osgearth_featurefilter.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_featurefilter/osgearth_featurefilter.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_featurefilter/osgearth_featurefilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_featurefilter/osgearth_featurefilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -44,16 +44,16 @@
     {
         if (conf.key() == "change_attribute")
         {
-            conf.getIfSet("key", _key);
-            conf.getIfSet("value", _value);
+            conf.get("key", _key);
+            conf.get("value", _value);
         }
     }
 
     virtual Config getConfig() const
     {
         Config config("change_attribute");
-        config.addIfSet("key", _key);
-        config.addIfSet("value", _value);
+        config.set("key", _key);
+        config.set("value", _value);
         return config;
     }
 
@@ -82,7 +82,7 @@
 int
 main(int argc, char** argv)
 {    
-    //Run this example with the the feature_custom_filters.earth file in the tests directory for a simple example
+    //Run this example with the feature_custom_filters.earth file in the tests directory for a simple example
     osg::ArgumentParser arguments(&argc,argv);
 
     // create a viewer:
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_featureinfo/osgearth_featureinfo.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_featureinfo/osgearth_featureinfo.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_featureinfo/osgearth_featureinfo.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_featureinfo/osgearth_featureinfo.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -85,7 +85,7 @@
 
 void printAllFeatures(FeatureSource* features)
 {
-    osg::ref_ptr< FeatureCursor > cursor = features->createFeatureCursor();
+    osg::ref_ptr< FeatureCursor > cursor = features->createFeatureCursor(0L);
     while (cursor.valid() && cursor->hasMore())
     {
         osg::ref_ptr< Feature > feature = cursor->nextFeature();
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_featurequery/osgearth_featurequery.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_featurequery/osgearth_featurequery.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_featurequery/osgearth_featurequery.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_featurequery/osgearth_featurequery.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_features/osgearth_features.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_features/osgearth_features.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_features/osgearth_features.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_features/osgearth_features.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -24,24 +24,19 @@
 #include <osgGA/StateSetManipulator>
 #include <osgViewer/Viewer>
 #include <osgViewer/ViewerEventHandlers>
-#include <osgEarth/Map>
+
 #include <osgEarth/MapNode>
 #include <osgEarth/ImageLayer>
 #include <osgEarth/ModelLayer>
 #include <osgEarthUtil/ExampleResources>
 #include <osgEarthUtil/EarthManipulator>
-#include <osgEarthUtil/AutoClipPlaneHandler>
 
 #include <osgEarthSymbology/Style>
 #include <osgEarthFeatures/FeatureModelLayer>
 
-#include <osgEarthDrivers/engine_rex/RexTerrainEngineOptions>
 #include <osgEarthDrivers/gdal/GDALOptions>
 #include <osgEarthDrivers/feature_ogr/OGRFeatureOptions>
 #include <osgEarthDrivers/agglite/AGGLiteOptions>
-#include <osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions>
-
-#include <osgDB/WriteFile>
 
 using namespace osgEarth;
 using namespace osgEarth::Features;
@@ -52,14 +47,16 @@
 int usage( const std::string& app )
 {
     OE_NOTICE "\n" << app << "\n"
-        << "    --rasterize           : draw features as rasterized image tiles \n"
-        << "    --overlay             : draw features as projection texture \n"
-        << "    --mem                 : load features from memory \n"
-        << "    --labels              : add feature labels \n"
+        << "  --rasterize           : draw features as rasterized image tiles \n"
+        << "  --drape               : draw features as projected texture \n"
+        << "  --clamp               : draw features using shader clamping \n"
+        << "  --mem                 : load features from memory \n"
+        << "  --labels              : add feature labels \n"
         << "\n"
-        << MapNodeHelper().usage();
+        << MapNodeHelper().usage()
+        << std::endl;
 
-    return -1;
+    return 0;
 }
 
 //
@@ -73,10 +70,10 @@
         return usage( argv[0] );
 
     bool useRaster  = arguments.read("--rasterize");
-    bool useOverlay = arguments.read("--overlay");
     bool useMem     = arguments.read("--mem");
     bool useLabels  = arguments.read("--labels");
-
+    bool useDraping = arguments.read("--drape");
+    bool useClamping = arguments.read("--clamp");
 
     osgViewer::Viewer viewer(arguments);
 
@@ -90,11 +87,11 @@
     map->addLayer( new ImageLayer(ImageLayerOptions("basemap", basemap)));
     
     // Next we add a feature layer. 
-    OGRFeatureOptions ogrData;
+    OGRFeatureOptions featureData;
     if ( !useMem )
     {
         // Configures the feature driver to load the vectors from a shapefile:
-        ogrData.url() = "../data/world.shp";
+        featureData.url() = "../data/world.shp";
     }
     else
     {
@@ -104,13 +101,13 @@
         line->push_back( osg::Vec3d(-120, 20, 0) );
         line->push_back( osg::Vec3d(-120, 60, 0) );
         line->push_back( osg::Vec3d(-60, 60, 0) );
-        ogrData.geometry() = line;
+        featureData.geometry() = line;
     }
 
     // Make a feature source layer and add it to the Map:
     FeatureSourceLayerOptions ogrLayer;
     ogrLayer.name() = "vector-data";
-    ogrLayer.featureSource() = ogrData;
+    ogrLayer.featureSource() = featureData;
     map->addLayer(new FeatureSourceLayer(ogrLayer));
 
     // Define a style for the feature data. Since we are going to render the
@@ -120,32 +117,37 @@
     LineSymbol* ls = style.getOrCreateSymbol<LineSymbol>();
     ls->stroke()->color() = Color::Yellow;
     ls->stroke()->width() = 2.0f;
+    ls->tessellationSize()->set(100, Units::KILOMETERS);
 
-    // That's it, the map is ready; now create a MapNode to render the Map:
-    osgEarth::Drivers::RexTerrainEngine::RexTerrainEngineOptions rex;
+    if (useDraping)
+    {
+        AltitudeSymbol* alt = style.getOrCreate<AltitudeSymbol>();
+        alt->clamping() = alt->CLAMP_TO_TERRAIN;
+        alt->technique() = alt->TECHNIQUE_DRAPE;
+    }
 
-    MapNodeOptions mapNodeOptions;
-    mapNodeOptions.enableLighting() = false;
-    mapNodeOptions.setTerrainOptions(rex);
-    MapNode* mapNode = new MapNode( map, mapNodeOptions );
-
-    osg::Group* root = new osg::Group();
-    root->addChild( mapNode );
-    viewer.setSceneData( root );
-    viewer.setCameraManipulator( new EarthManipulator() );
+    else if (useClamping)
+    {
+        AltitudeSymbol* alt = style.getOrCreate<AltitudeSymbol>();
+        alt->clamping() = alt->CLAMP_TO_TERRAIN;
+        alt->technique() = alt->TECHNIQUE_GPU;
+
+        ls->tessellationSize()->set(100, Units::KILOMETERS);
 
-    // Process cmdline args
-    MapNodeHelper().parse(mapNode, arguments, &viewer, root, new LabelControl("Features Demo"));
-   
+        RenderSymbol* render = style.getOrCreate<RenderSymbol>();
+        render->depthOffset()->enabled() = true;
+    }
+    
     if (useRaster)
     {
         AGGLiteOptions rasterOptions;
-        rasterOptions.featureOptions() = ogrData;
+        rasterOptions.featureOptions() = featureData;
         rasterOptions.styles() = new StyleSheet();
         rasterOptions.styles()->addStyle( style );
         map->addLayer(new ImageLayer("My Features", rasterOptions) );
     }
-    else //if (useGeom || useOverlay)
+
+    else //if (useGeom)
     {
         FeatureModelLayerOptions fml;
         fml.name() = "My Features";
@@ -155,9 +157,9 @@
         fml.enableLighting() = false;
 
         map->addLayer(new FeatureModelLayer(fml));
-    }
+    }   
 
-    if ( useLabels )
+    if ( useLabels && !useRaster )
     {
         // set up symbology for drawing labels. We're pulling the label
         // text from the name attribute, and its draw priority from the
@@ -176,18 +178,20 @@
         FeatureModelLayerOptions fml;
         fml.name() = "Labels";
         fml.featureSourceLayer() = "vector-data";
-        //fml.featureSource() = featureOptions;
         fml.styles() = new StyleSheet();
         fml.styles()->addStyle( labelStyle );
 
         map->addLayer(new FeatureModelLayer(fml));
     }
 
-    
+    // That's it, the map is ready; now create a MapNode to render the Map:
+    MapNode* mapNode = new MapNode(map);
+
+    viewer.setSceneData( mapNode );
+    viewer.setCameraManipulator( new EarthManipulator() );
+
     // add some stock OSG handlers:
-    viewer.addEventHandler(new osgViewer::StatsHandler());
-    viewer.addEventHandler(new osgViewer::WindowSizeHandler());
-    viewer.addEventHandler(new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()));
+    MapNodeHelper().configureView(&viewer);
 
     return viewer.run();
 }
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_featuretiler/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_featuretiler/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_featuretiler/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_featuretiler/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,7 @@
+INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+
+SET(TARGET_SRC osgearth_featuretiler.cpp )
+
+#### end var setup  ###
+SETUP_APPLICATION(osgearth_featuretiler)
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_featuretiler/osgearth_featuretiler.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_featuretiler/osgearth_featuretiler.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_featuretiler/osgearth_featuretiler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_featuretiler/osgearth_featuretiler.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,354 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#include <osgEarth/Notify>
+#include <osgEarth/TDTiles>
+#include <osgEarthFeatures/FeatureSource>
+#include <osgEarthFeatures/FeatureCursor>
+#include <osgEarthFeatures/ResampleFilter>
+#include <osgEarthDrivers/feature_ogr/OGRFeatureOptions>
+#include <osg/ArgumentParser>
+#include <osgDB/FileUtils>
+#include <fstream>
+
+#define LC "[featuretiler] "
+
+using namespace osgEarth;
+using namespace osgEarth::Features;
+using namespace osgEarth::Drivers;
+
+int
+usage(const char* msg)
+{
+    OE_NOTICE 
+        << "\n" << msg
+        << "\nUsage: osgearth_featuretiler"
+        << "\n    --in [location]        ; filename of source data (e.g. a shapefile)"
+        << "\n    --out [directory]      ; output folder name"
+        << "\n    --errors [...]         ; Comma-delimited geometric error per level (e.g. 1,150,500)"
+        << std::endl;
+    return -1;
+}
+
+struct Env
+{
+    osg::ref_ptr<FeatureSource> input;
+    double* geometricError;
+    unsigned maxDepth;
+    URIContext uriContext;
+    unsigned counter;
+
+    ~Env() { delete [] geometricError; }
+};
+
+struct FeatureData {
+    double x, y;
+    FeatureID fid;
+};
+
+struct SortByX {
+    bool operator()(const FeatureData& lhs, const FeatureData& rhs) const {
+        return lhs.x < rhs.x;
+    }
+};
+
+struct SortByY {
+    bool operator()(const FeatureData& lhs, const FeatureData& rhs) const {
+        return lhs.y < rhs.y;
+    }
+};
+
+int
+split(const GeoExtent& extent, TDTiles::Tile* parentTile, unsigned depth, Env& env)
+{
+    const Profile* profile = 0L;
+    const FeatureProfile* inputFP = env.input->getFeatureProfile();
+    if (inputFP && inputFP->getExtent().isValid())
+    {
+        const GeoExtent& fex = inputFP->getExtent();
+        profile = Profile::create(fex.getSRS(), fex.xMin(), fex.yMin(), fex.xMax(), fex.yMax());
+    }
+
+    OGRFeatureOptions outputConf[2];
+    osg::ref_ptr<FeatureSource> output[2];
+
+    for (unsigned i = 0; i < 2; ++i)
+    {
+        outputConf[i].url() = URI(Stringify() << "test_" << depth << "_" << (env.counter++) << "_" << i << ".shp", env.uriContext);
+        outputConf[i].openWrite() = true;
+        if (profile)
+            outputConf[i].profile() = profile->toProfileOptions();
+
+        output[i] = FeatureSourceFactory::create(outputConf[i]);
+        if (!output[i].valid())
+            return usage("Failed to open output dataset");
+
+        const Status& outputStatus = output[i]->create(
+            env.input->getFeatureProfile(),
+            env.input->getSchema(),
+            env.input->getGeometryType(),
+            NULL);
+
+        if (outputStatus.isError())
+            return usage(outputStatus.message().c_str());
+    }
+
+    std::vector<FeatureData> data;
+    int count = env.input->getFeatureCount();
+    if (count > 0)
+    {
+        //OE_INFO << "Feature count = " << count << std::endl;
+        data.reserve(count);
+    }
+    else
+    {
+        OE_INFO << "Feature count not available" << std::endl;
+    }
+
+    // Just divide the error by 10 each level. Placeholder for something smarter.
+    double error = env.geometricError[depth];
+
+    FeatureList features;
+    unsigned i = 0;
+    Query query;
+    query.bounds() = extent.bounds();
+    osg::ref_ptr<FeatureCursor> cursor = env.input->createFeatureCursor(query, 0L);
+    if (!cursor.valid())
+    {
+        OE_WARN << "Feature cursor error" << std::endl;
+        return 0;
+    }
+
+    cursor->fill(features);
+    if (features.empty())
+        return 0;
+
+    ResampleFilter resample(error, DBL_MAX);
+    FilterContext fc(0L, env.input->getFeatureProfile(), extent);
+    resample.push(features, fc);
+    
+    for(FeatureList::iterator i = features.begin(); i != features.end(); ++i)
+    {
+        Feature* f = i->get();
+        const GeoExtent& fex = f->getExtent();
+        if (fex.width() < error && fex.height() < error)
+            continue;
+
+        FeatureData d;
+        fex.getCentroid(d.x, d.y);
+        d.fid = f->getFID();
+        data.push_back(d);
+    }
+
+    bool isWide = extent.width() > extent.height();
+
+    OE_INFO << "Depth = " << depth << ", features = " << data.size() << std::endl;
+
+    double median;
+
+    if (data.size() > 0)
+    {
+        if (isWide)
+        {
+            SortByX sortByX;
+            std::sort(data.begin(), data.end(), sortByX);
+            median = ((data.size() & 0x1) == 0) ?
+                0.5 * (data[data.size() / 2].x + data[data.size() / 2].x) :
+                data[data.size() / 2].x;
+            OE_INFO << "  Median X = " << median << std::endl;
+        }
+        else
+        {
+            SortByY sortByY;
+            std::sort(data.begin(), data.end(), sortByY);
+            median = ((data.size() & 0x1) == 0) ?
+                0.5 * (data[data.size() / 2].y + data[data.size() / 2].y) :
+                data[data.size() / 2].y;
+            OE_INFO << "  Median Y = " << median << std::endl;
+        }
+    }
+    else
+    {
+        if (isWide)
+            median = extent.xMin() + extent.width()/2.0;
+        else
+            median = extent.yMin() + extent.height()/2.0;
+    }
+
+    osg::ref_ptr<TDTiles::Tile> child[2];
+
+    child[0] = new TDTiles::Tile();
+    child[0]->refine() = TDTiles::REFINE_REPLACE;
+    parentTile->children().push_back(child[0].get());
+
+    child[1] = new TDTiles::Tile();
+    child[0]->refine() = TDTiles::REFINE_REPLACE;
+    parentTile->children().push_back(child[1].get());
+
+    unsigned afeatures = 0u, bfeatures = 0u;
+
+    for (unsigned i = 0; i < data.size(); ++i)
+    {
+        const FeatureData& d = data[i];
+        Feature* f = env.input->getFeature(d.fid);
+        double x, y;
+        f->getExtent().getCentroid(x, y);
+        double side = isWide ? x : y;
+        if (side < median)
+        {
+            afeatures++;
+            output[0]->insertFeature(f);
+        }
+        else
+        {
+            bfeatures++;
+            output[1]->insertFeature(f);
+        }
+    }
+
+    GeoExtent a(extent.getSRS()), b(extent.getSRS());
+
+    if (isWide)
+    {
+        a.set(extent.xMin(), extent.yMin(), median, extent.yMax());
+        b.set(median, extent.yMin(), extent.xMax(), extent.yMax());
+    }
+    else
+    {
+        a.set(extent.xMin(), extent.yMin(), extent.xMax(), median);
+        b.set(extent.xMin(), median, extent.xMax(), extent.yMax());
+    }
+
+    if (depth < env.maxDepth)
+    {
+        split(a, child[0].get(), depth + 1, env);
+        split(b, child[1].get(), depth + 1, env);
+    }
+
+    output[0] = 0L;
+    output[1] = 0L;
+
+    //TODO: heights
+    const float zmin = 0.0f;
+    const float zmax = 1.0f;
+
+    const SpatialReference* epsg4979 = SpatialReference::get("epsg:4979");
+    a = a.transform(epsg4979);
+    b = b.transform(epsg4979);
+
+    if (afeatures > 0u)
+        child[0]->content()->uri() = outputConf[0].url().get();
+
+    child[0]->boundingVolume()->region()->set(
+        osg::DegreesToRadians(a.xMin()), osg::DegreesToRadians(a.yMin()), zmin, 
+        osg::DegreesToRadians(a.xMax()), osg::DegreesToRadians(a.yMax()), zmax);
+    child[0]->geometricError() = error;
+
+    if (bfeatures > 0u)
+        child[1]->content()->uri() = outputConf[1].url().get();
+
+    child[1]->boundingVolume()->region()->set(
+        osg::DegreesToRadians(b.xMin()), osg::DegreesToRadians(b.yMin()), zmin,
+        osg::DegreesToRadians(b.xMax()), osg::DegreesToRadians(b.yMax()), zmax);
+    child[1]->geometricError() = error;
+
+    return 0;
+}
+
+int
+main(int argc, char** argv)
+{
+    osg::ArgumentParser arguments(&argc,argv);
+
+    if (arguments.read("--help"))
+        return usage("Help!");
+
+    std::string source;
+    if (!arguments.read("--in", source))
+        return usage("Missing required --in argument");
+
+    std::string outputLocation;
+    if (!arguments.read("--out", outputLocation))
+        return usage("Missing required --out argument");
+
+    std::string errors("1,80,200");
+    arguments.read("--errors", errors);
+
+    if (!osgDB::makeDirectory(outputLocation))
+        return usage("Unable to create/find output location");
+
+    osg::ref_ptr<TDTiles::Tile> root = new TDTiles::Tile();
+
+    std::string outFile = Stringify() << outputLocation << "/tileset.json";
+    URIContext uriContext(outFile);
+
+    Config inputConf;
+    inputConf.set("driver", "ogr");
+    inputConf.set("url", source);
+    osg::ref_ptr<FeatureSource> input = FeatureSourceFactory::create(ConfigOptions(inputConf));
+    if (!input.valid())
+        return usage("Failed to create the input feature source");
+
+    if (input->open().isError())
+        return usage("Failed to open the input feature source");
+
+    std::vector<std::string> errorStrings;
+    StringTokenizer(errors, errorStrings, ",");
+    if (errorStrings.size() < 1)
+        return usage("Illegal errors input");
+
+    Env env;
+    env.input = input.get();
+    env.counter = 0;
+    env.uriContext = uriContext;    
+    env.geometricError = new double[errorStrings.size()];
+    env.maxDepth = errorStrings.size()-1;
+
+    // generate level errors:
+    OE_NOTICE << "Geometric errors: ";
+    for(int i=0; i<errorStrings.size(); ++i)
+    {
+        int j = errorStrings.size() - 1 - i;
+        env.geometricError[j] = osgEarth::as<double>(errorStrings[i], -1.0);
+        if (env.geometricError[j] <= 0.0)
+            return usage("Illegal geometric error in input");
+
+        OE_NOTIFY(osg::NOTICE, env.geometricError[j] << " ");
+    }
+    OE_NOTIFY(osg::NOTICE, std::endl);
+
+    // make it so
+    split(input->getFeatureProfile()->getExtent(), root, 0, env);
+
+    osg::ref_ptr<TDTiles::Tileset> tileset = new TDTiles::Tileset();
+    tileset->root() = root.get();
+
+    TDTiles::Asset asset;
+    tileset->asset()->version() = "1.0";
+
+    std::ofstream out(outFile.c_str());
+    Json::Value tilesetJSON = tileset->getJSON();
+    Json::StyledStreamWriter writer;
+    writer.write(out, tilesetJSON);
+    out.close();
+
+    return 0;
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_geodetic_graticule/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_geodetic_graticule/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_geodetic_graticule/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_geodetic_graticule/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,7 @@
+INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+
+SET(TARGET_SRC osgearth_geodetic_graticule.cpp )
+
+#### end var setup  ###
+SETUP_APPLICATION(osgearth_geodetic_graticule)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_geodetic_graticule/osgearth_geodetic_graticule.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_geodetic_graticule/osgearth_geodetic_graticule.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_geodetic_graticule/osgearth_geodetic_graticule.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_geodetic_graticule/osgearth_geodetic_graticule.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,148 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include <osg/Notify>
+#include <osgViewer/Viewer>
+#include <osgEarth/MapNode>
+#include <osgEarth/GLUtils>
+#include <osgEarthUtil/EarthManipulator>
+#include <osgEarthUtil/GeodeticGraticule>
+#include <osgEarthUtil/Controls>
+#include <osgEarthUtil/ExampleResources>
+#include <osgEarthSymbology/Style>
+
+using namespace osgEarth;
+using namespace osgEarth::Util;
+using namespace osgEarth::Symbology;
+namespace ui = osgEarth::Util::Controls;
+
+int
+usage( char** argv, const std::string& msg )
+{
+    OE_NOTICE 
+        << msg << std::endl
+        << "USAGE: " << argv[0] << " file.earth" << std::endl;
+    return -1;
+}
+
+const osg::Vec4 colors[4] = { osg::Vec4(1,1,1,1), osg::Vec4(1,0,0,1), osg::Vec4(1,1,0,1), osg::Vec4(0,1,0,1) };
+
+struct App
+{
+    GeodeticGraticule* graticule;
+
+    int gridColorIndex;
+    int edgeColorIndex;
+
+    App(GeodeticGraticule* g)
+    {
+        graticule = g;
+        gridColorIndex = 0;
+        edgeColorIndex = 1;
+    }
+
+    void cycleStyles()
+    {
+        // Could also use the get/setGridLabelStyle API here, but this demonstrates
+        // changing the options and calling dirty() or apply().
+        Style gridLabelStyle = graticule->options().gridLabelStyle().get();
+        gridColorIndex = (gridColorIndex+1)%4;
+        gridLabelStyle.getOrCreate<TextSymbol>()->fill()->color() = colors[gridColorIndex];
+        graticule->options().gridLabelStyle() = gridLabelStyle;
+
+        Style edgeLabelStyle = graticule->options().edgeLabelStyle().get(); //graticule->getEdgeLabelStyle();
+        edgeColorIndex = (edgeColorIndex+1)%4;
+        edgeLabelStyle.getOrCreate<TextSymbol>()->fill()->color() = colors[edgeColorIndex];
+        graticule->options().edgeLabelStyle() = edgeLabelStyle;
+
+        graticule->dirty();
+    }
+
+    void toggleGridLabels()
+    {
+        bool vis = graticule->getGridLabelsVisible();
+        graticule->setGridLabelsVisible(!vis);
+    }
+
+    void toggleEdgeLabels()
+    {
+        bool vis = graticule->getEdgeLabelsVisible();
+        graticule->setEdgeLabelsVisible(!vis);
+    }
+
+    void toggleGrid()
+    {
+        bool vis = graticule->getGridLinesVisible();
+        graticule->setGridLinesVisible(!vis);
+    }
+
+    void toggleLayer()
+    {
+        bool vis = graticule->getVisible();
+        graticule->setVisible(!vis);
+    }
+};
+
+OE_UI_HANDLER(cycleStyles);
+OE_UI_HANDLER(toggleGridLabels);
+OE_UI_HANDLER(toggleEdgeLabels);
+OE_UI_HANDLER(toggleGrid);
+OE_UI_HANDLER(toggleLayer);
+
+ui::Control* makeUI(App& app)
+{
+    ui::VBox* b = new ui::VBox();
+    b->addChild(new ui::ButtonControl("Change styles", new cycleStyles(app)));
+    b->addChild(new ui::ButtonControl("Toggle grid labels", new toggleGridLabels(app)));
+    b->addChild(new ui::ButtonControl("Toggle edge labels", new toggleEdgeLabels(app)));
+    b->addChild(new ui::ButtonControl("Toggle grid visibility", new toggleGrid(app)));
+    b->addChild(new ui::ButtonControl("Toggle layer visibility", new toggleLayer(app)));
+    return b;
+}
+
+int
+main(int argc, char** argv)
+{
+    osg::ArgumentParser arguments(&argc,argv);
+    osgViewer::Viewer viewer(arguments);
+
+    GLUtils::setGlobalDefaults(viewer.getCamera()->getOrCreateStateSet());
+    viewer.setRealizeOperation(new GL3RealizeOperation());
+    viewer.getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
+
+    // load the .earth file from the command line.
+    MapNode* mapNode = MapNode::load(arguments);
+    if ( !mapNode )
+        return usage( argv, "Failed to load a map from the .earth file" );
+
+    viewer.setSceneData(mapNode);
+    viewer.setCameraManipulator( new EarthManipulator() );
+
+    GeodeticGraticule* graticule = new GeodeticGraticule();
+    mapNode->getMap()->addLayer(graticule);
+
+    App app(graticule);
+    ui::ControlCanvas* canvas = ui::ControlCanvas::getOrCreate(&viewer);
+    canvas->addControl(makeUI(app));
+
+    return viewer.run();
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_graticule/osgearth_graticule.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_graticule/osgearth_graticule.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_graticule/osgearth_graticule.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_graticule/osgearth_graticule.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -117,6 +117,15 @@
     tool->addCallback( new MouseCoordsLabelCallback(readout, formatter) );
     viewer.addEventHandler( tool );
 
+
+    // disable the small-feature culling
+    viewer.getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
+
+    // set a near/far ratio that is smaller than the default. This allows us to get
+    // closer to the ground without near clipping. If you need more, use --logdepth
+    viewer.getCamera()->setNearFarRatio(0.0001);
+
+
     // finalize setup and run.
     viewer.setSceneData( root );
     viewer.addEventHandler(new osgViewer::StatsHandler());
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_horizon/osgearth_horizon.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_horizon/osgearth_horizon.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_horizon/osgearth_horizon.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_horizon/osgearth_horizon.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -64,18 +64,6 @@
     }
 };
 
-struct SetHorizonCallback : public osg::NodeCallback
-{
-    osg::ref_ptr<Horizon> _horizonProto;
-    void operator()(osg::Node* node, osg::NodeVisitor* nv)
-    {
-        osg::ref_ptr<Horizon> horizon = osg::clone(_horizonProto.get(), osg::CopyOp::DEEP_COPY_ALL);
-        horizon->setEye( nv->getViewPoint() );
-        horizon->put( *nv );        
-        traverse(node, nv);
-    }
-};
-
 osg::Node*
 installGeometry1(const SpatialReference* srs)
 {
@@ -132,21 +120,22 @@
         viewer.setSceneData( root );
         root->addChild( node );
 
-        const SpatialReference* srs = MapNode::get(node)->getMapSRS();
-        SetHorizonCallback* set = new SetHorizonCallback();
-        set->_horizonProto = new Horizon(srs);
-        root->addCullCallback( set );
+        MapNode* mapNode = MapNode::get(node);
+        const SpatialReference* srs = mapNode->getMapSRS();
 
         osg::Node* item1 = installGeometry1(srs);
-        root->addChild( item1 );
+        mapNode->addChild( item1 );
 
         osg::Node* item2 = installGeometry2(srs);
-        root->addChild( item2 );
-
-        osg::ref_ptr<Horizon> horizon = new Horizon(srs);
+        mapNode->addChild( item2 );
 
+        // Culls the second item based on its horizon visibility
         HorizonCullCallback* callback = new HorizonCullCallback();
         item2->addCullCallback( callback );
+        
+        // This horizon object we are just using to print out the results;
+        // it's not actually part of the culling cullback!
+        osg::ref_ptr<Horizon> horizon = new Horizon(srs);        
 
         while (!viewer.done())
         {
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_htm/osgearth_htm.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_htm/osgearth_htm.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_htm/osgearth_htm.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_htm/osgearth_htm.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_http/osgearth_http.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_http/osgearth_http.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_http/osgearth_http.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_http/osgearth_http.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_imageoverlay/osgearth_imageoverlay.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_imageoverlay/osgearth_imageoverlay.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_imageoverlay/osgearth_imageoverlay.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_imageoverlay/osgearth_imageoverlay.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -286,6 +286,6 @@
     viewer.addEventHandler(new osgViewer::LODScaleHandler());
     viewer.addEventHandler(new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()));
     viewer.addEventHandler(new osgViewer::HelpHandler(arguments.getApplicationUsage()));
-
+        
     return viewer.run();
 }
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_infinitescroll/osgearth_infinitescroll.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_infinitescroll/osgearth_infinitescroll.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_infinitescroll/osgearth_infinitescroll.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_infinitescroll/osgearth_infinitescroll.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_lights/osgearth_lights.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_lights/osgearth_lights.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_lights/osgearth_lights.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_lights/osgearth_lights.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2015 Pelican Mapping
 * http://osgearth.org
 *
@@ -89,17 +89,18 @@
     {
         Ephemeris e;
         DateTime dt(2016, 8, 10, 14.0);
-        world = e.getSunPositionECEF(dt);
+        CelestialBody sun = e.getSunPosition(dt);
+        world = sun.geocentric;
 
-        osg::Light* sun = new osg::Light(lightNum++);
+        osg::Light* sunLight = new osg::Light(lightNum++);
         world.normalize();
-        sun->setPosition(osg::Vec4d(world, 0.0));
+        sunLight->setPosition(osg::Vec4d(world, 0.0));
 
-        sun->setAmbient(osg::Vec4(0.2, 0.2, 0.2, 1.0));
-        sun->setDiffuse(osg::Vec4(1.0, 1.0, 0.9, 1.0));
+        sunLight->setAmbient(osg::Vec4(0.2, 0.2, 0.2, 1.0));
+        sunLight->setDiffuse(osg::Vec4(1.0, 1.0, 0.9, 1.0));
 
         osg::LightSource* sunLS = new osg::LightSource();
-        sunLS->setLight(sun);
+        sunLS->setLight(sunLight);
 
         lights->addChild( sunLS );
 
@@ -107,7 +108,7 @@
         if (caster)
         {
             OE_INFO << "Found a shadow caster!\n";
-            caster->setLight(sun);
+            caster->setLight(sunLight);
         }
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_los/osgearth_los.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_los/osgearth_los.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_los/osgearth_los.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_los/osgearth_los.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_magnify/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_magnify/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_magnify/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_magnify/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,7 @@
+INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+
+SET(TARGET_SRC osgearth_magnify.cpp )
+
+#### end var setup  ###
+SETUP_APPLICATION(osgearth_magnify)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_magnify/osgearth_magnify.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_magnify/osgearth_magnify.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_magnify/osgearth_magnify.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_magnify/osgearth_magnify.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,225 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include <osgViewer/Viewer>
+#include <osgViewer/CompositeViewer>
+#include <osgEarthUtil/ExampleResources>
+#include <osgEarthUtil/EarthManipulator>
+#include <osgEarth/MapNode>
+#include <osgUtil/CullVisitor>
+
+#define LC "[magnify] "
+
+using namespace osgEarth;
+using namespace osgEarth::Util;
+namespace ui = osgEarth::Util::Controls;
+
+int usage(const char* name)
+{
+    OE_NOTICE 
+        << "\nUsage: " << name << " file.earth" << std::endl
+        << MapNodeHelper().usage() << std::endl;
+
+    return 0;
+}
+
+// Application-wide data
+struct App
+{
+    osgViewer::View* _mainView;
+    osgViewer::View* _magView;
+    ui::HSliderControl* _magSlider;
+    bool _useLODScale;
+
+    App()
+    {
+        _useLODScale = true;
+    }
+
+    float computeRangeScale()
+    {
+        return 1.0f/_magSlider->getValue();
+    }
+
+    void apply()
+    {
+        bool isPerspective = _mainView->getCamera()->getProjectionMatrix()(3,3) == 0.0;
+        if (isPerspective)
+        {
+            double vfov, ar, n, f;
+            _mainView->getCamera()->getProjectionMatrixAsPerspective(vfov, ar, n, f);
+            _magView->getCamera()->setProjectionMatrixAsPerspective(vfov * computeRangeScale(), ar, n, f);
+        }
+        else
+        {
+            double L, R, B, T, N, F;
+            double M, H;
+            _mainView->getCamera()->getProjectionMatrixAsOrtho(L, R, B, T, N, F);
+            M = B+(T-B)/2;
+            H = (T-B)*computeRangeScale()/2;
+            B = M-H, T = M+H;
+            M = L+(R-L)/2;
+            H = (R-L)*computeRangeScale()/2;
+            L = M-H, R = M+H;
+            _magView->getCamera()->setProjectionMatrixAsOrtho(L, R, B, T, N, F);
+        }
+
+        if (_useLODScale)
+        {
+            _magView->getCamera()->setLODScale(computeRangeScale());
+        }
+    }
+};
+
+struct Apply : public ui::ControlEventHandler
+{
+    App& _app;
+    Apply(App& app) : _app(app) { }
+    void onValueChanged(ui::Control* control) {
+        _app.apply();
+    }
+};
+
+ui::Container* createUI(App& app)
+{
+    ui::VBox* box = new ui::VBox();
+    box->setVertAlign(ui::Control::ALIGN_TOP);
+    box->setAbsorbEvents(true);
+
+    ui::HBox* sliderBox = box->addControl(new ui::HBox());
+    sliderBox->addControl(new ui::LabelControl("Magnification:"));
+    app._magSlider = sliderBox->addControl(new ui::HSliderControl(1.0f, 100.0f, 1.0f, new Apply(app)));
+    app._magSlider->setWidth(300.0f);
+    sliderBox->addControl(new ui::LabelControl(app._magSlider));
+
+    return box;
+}
+
+//! Custom CullVisitor to test the getDistanceToViewPoint override approach.
+struct MyCullVisitor : public osgUtil::CullVisitor
+{
+    App& _app;
+
+    MyCullVisitor(App& app) : osgUtil::CullVisitor(), _app(app)
+    {
+    }
+
+    MyCullVisitor(const MyCullVisitor& rhs) :
+        osgUtil::CullVisitor(rhs),
+        _app(rhs._app)
+    {
+    }
+
+    virtual osgUtil::CullVisitor* clone() const
+    { 
+        return new MyCullVisitor(*this);
+    }
+
+    void apply(osg::Group& node)
+    {
+        MapNode* mapNode = dynamic_cast<MapNode*>(&node);
+        if (mapNode && getCurrentCamera()->getView() == _app._magView)
+        {
+            // get the eyepoint in world space:
+            osg::Matrix viewToWorld;
+            viewToWorld.invert(*getModelViewMatrix());
+            osg::Vec3d eye = osg::Vec3d(0,0,0) * viewToWorld;
+
+            // store it:
+            _eyePointStack.push_back(eye);
+
+            // convert to geo and adjust the altitude in order to simulate a zoom-in:
+            GeoPoint p;
+            p.fromWorld(mapNode->getMapSRS(), eye);
+
+            osg::Vec3d zoomedEye;
+            p.alt() = p.alt() * _app.computeRangeScale();
+            p.toWorld(zoomedEye);
+
+            // store the reference view point in view space:
+            _referenceViewPoints.push_back(zoomedEye*(*getModelViewMatrix()));
+
+            // ..and the view point in world space.
+            _viewPointStack.push_back(zoomedEye);
+        }
+        osgUtil::CullVisitor::apply(node);
+    }
+};
+
+
+int main(int argc, char** argv)
+{
+    osg::ArgumentParser arguments(&argc,argv);
+    if ( arguments.read("--help") )
+        return usage(argv[0]);
+    
+    App app;
+
+    // optionally use a custom cull visitor instead of LOD scale:
+    if (arguments.read("--cull-visitor"))
+    {
+        app._useLODScale = false;
+        osgUtil::CullVisitor::prototype() = new MyCullVisitor(app);
+        OE_NOTICE << LC << "Using a custom cull visitor" << std::endl;
+    }
+
+    osgViewer::CompositeViewer viewer(arguments);
+    viewer.setThreadingModel(osgViewer::CompositeViewer::SingleThreaded);
+
+    // main view lets the user control the scene
+    app._mainView = new osgViewer::View();   
+    app._mainView->setUpViewInWindow(10, 10, 800, 800);
+    app._mainView->setCameraManipulator(new EarthManipulator(arguments));
+    viewer.addView(app._mainView);
+
+    // mag view shows the magnified main view, no controls
+    app._magView = new osgViewer::View();
+    app._magView->setUpViewInWindow(830, 10, 800, 800);
+    viewer.addView(app._magView);
+
+    // load the earth file
+    osg::Node* node = MapNodeHelper().load(arguments, &viewer);
+    if (!node) return usage(argv[0]);
+    
+    // Add a UI to the main view:
+    ui::ControlCanvas* canvas = new ui::ControlCanvas();
+    ui::Container* ui = createUI(app);
+    canvas->addControl(ui);
+
+    osg::Group* uiGroup = new osg::Group();
+    uiGroup->addChild(node);
+    uiGroup->addChild(canvas);
+    app._mainView->setSceneData(uiGroup);
+    
+    // Just the map on the magnified view:
+    app._magView->setSceneData(node);
+
+    viewer.realize();
+
+    while(!viewer.done())
+    {
+        // sync magnified view to main view
+        app._magView->getCamera()->setViewMatrix(app._mainView->getCamera()->getViewMatrix());
+        viewer.frame();
+    }
+    return 0;
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_manip/osgearth_manip.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_manip/osgearth_manip.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_manip/osgearth_manip.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_manip/osgearth_manip.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 #include <osg/Notify>
 #include <osg/Timer>
 #include <osg/ShapeDrawable>
+#include <osg/Depth>
 #include <osg/PositionAttitudeTransform>
 #include <osgGA/StateSetManipulator>
 #include <osgGA/GUIEventHandler>
@@ -36,7 +37,6 @@
 #include <osgEarth/TerrainEngineNode>
 #include <osgEarth/Viewpoint>
 #include <osgEarthUtil/EarthManipulator>
-#include <osgEarthUtil/AutoClipPlaneHandler>
 #include <osgEarthUtil/Controls>
 #include <osgEarthUtil/ExampleResources>
 #include <osgEarthUtil/LogarithmicDepthBuffer>
@@ -85,7 +85,7 @@
             "scroll wheel :",      "zoom in/out",
             "arrows :",            "pan",
             //"1-6 :",               "fly to preset viewpoints",
-            "shift-right-mouse :", "locked panning",
+            "shift-left-mouse :",  "locked pan",
             "u :",                 "toggle azimuth lock",
             "o :",                 "toggle perspective/ortho",
             "8 :",                 "Tether to thing 1",
@@ -95,8 +95,7 @@
             "a :",                 "toggle viewpoint arcing",
             "q :",                 "toggle throwing",
             "k :",                 "toggle collision",
-            "L :",                 "toggle log depth buffer",
-            ") :",                 "toggle sceen space layout"
+            "L :",                 "toggle log depth buffer"
         };
 
         Grid* g = new Grid();
@@ -202,16 +201,8 @@
         {
             if (ea.getEventType() == ea.KEYDOWN && ea.getKey() == _key)
             {
-                if ( !_installed )
-                {
-                    ScreenSpaceLayout::activate(_group->getOrCreateStateSet());
-                }
-                else
-                {
-                    ScreenSpaceLayout::deactivate(_group->getOrCreateStateSet());
-                }
-
                 _installed = !_installed;
+                ScreenSpaceLayout::setDeclutteringEnabled(_installed);
                 return true;
             }
             return false;
@@ -262,7 +253,7 @@
 
 
     /**
-     * Handler to toggle "viewpoint transtion arcing", which causes the camera to "arc"
+     * Handler to toggle "viewpoint transition arcing", which causes the camera to "arc"
      * as it travels from one viewpoint to another.
      */
     struct ToggleArcViewpointTransitionsHandler : public osgGA::GUIEventHandler
@@ -372,15 +363,15 @@
                 EarthManipulator::TetherMode mode = _manip->getSettings()->getTetherMode();
                 if ( mode == _manip->TETHER_CENTER ) {
                     _manip->getSettings()->setTetherMode( _manip->TETHER_CENTER_AND_HEADING );
-                    OE_NOTICE << "Tether mode = TETHER_CENTER_AND_HEADING\n";
+                    OE_NOTICE << "Tether mode = TETHER_CENTER_AND_HEADING" << std::endl;
                 }
                 else if ( mode == _manip->TETHER_CENTER_AND_HEADING ) {
                     _manip->getSettings()->setTetherMode( _manip->TETHER_CENTER_AND_ROTATION );
-                    OE_NOTICE << "Tether mode = TETHER_CENTER_AND_ROTATION\n";
+                    OE_NOTICE << "Tether mode = TETHER_CENTER_AND_ROTATION" << std::endl;
                 }
                 else {
                     _manip->getSettings()->setTetherMode( _manip->TETHER_CENTER );
-                    OE_NOTICE << "Tether mode = CENTER\n";
+                    OE_NOTICE << "Tether mode = CENTER" << std::endl;
                 }
 
                 aa.requestRedraw();
@@ -571,15 +562,15 @@
     struct Simulator : public osgGA::GUIEventHandler
     {
         Simulator( osg::Group* root, EarthManipulator* manip, MapNode* mapnode, osg::Node* model, const char* name, char key)
-            : _manip(manip), _mapnode(mapnode), _model(model), _name(name), _key(key)
+            : _manip(manip), _mapnode(mapnode), _model(model), _name(name), _key(key), _varyAngles(false)
         {
             if ( !model )
             { 
                 _model = AnnotationUtils::createHemisphere(250.0, osg::Vec4(1,.7,.4,1));
             }
 
-            _geo = new GeoPositionNode(mapnode);
-            _geo->getPositionAttitudeTransform()->addChild(_model);
+            _attachPoint = new osg::Group();
+            _attachPoint->addChild(_model);
 
             Style style;
             TextSymbol* text = style.getOrCreate<TextSymbol>();
@@ -590,10 +581,12 @@
             _label = new LabelNode(_name, style);
             _label->setDynamic( true );
             _label->setHorizonCulling(false);
+            _attachPoint->addChild(_label);
 
-            _geo->getPositionAttitudeTransform()->addChild(_label);
+            _geo = new GeoPositionNode();
+            _geo->getPositionAttitudeTransform()->addChild(_attachPoint);
 
-            root->addChild(_geo.get());
+            mapnode->addChild(_geo.get());
         }
 
         bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
@@ -602,15 +595,19 @@
             {
                 double t0 = osg::Timer::instance()->time_s();
                 double t = fmod( t0, 6000.0 ) / 6000.0;
-                double lat, lon;
-                GeoMath::interpolate( D2R*_lat0, D2R*_lon0, D2R*_lat1, D2R*_lon1, t, lat, lon );
-                GeoPoint p( SpatialReference::create("wgs84"), R2D*lon, R2D*lat, 2500.0 );
-                double bearing = GeoMath::bearing(D2R*_lat0, D2R*_lon0, lat, lon);
+                GeoPoint p = _start.interpolate(_end, t);
+                double bearing = GeoMath::bearing(_start.y(), _start.x(), p.y(), p.x());
 
-                float a = sin(t0*0.2);
-                //bearing += a * 0.5 * osg::PI;
                 float pitch = 0.0;
 
+                if (_varyAngles)
+                {
+                    float a = sin(t0*0.2);
+                    float b = 0.4 * cos(t0*0.5);
+                    bearing += a;
+                    pitch += b;
+                }
+
                 _geo->setPosition(p);
 
                 _geo->setLocalRotation(
@@ -622,8 +619,7 @@
                 if ( ea.getKey() == _key )
                 {                                
                     Viewpoint vp = _manip->getViewpoint();
-                    //vp.setNode( _pat.get() );
-                    vp.setNode(_model);
+                    vp.setNode(_label);
                     vp.range() = 25000.0;
                     vp.pitch() = -45.0;
                     _manip->setViewpoint(vp, 2.0);
@@ -637,13 +633,110 @@
         char                               _key;
         MapNode*                           _mapnode;
         EarthManipulator*                  _manip;
-        double                             _lat0, _lon0, _lat1, _lon1;
+        GeoPoint                           _start, _end;
         LabelNode*                         _label;
         osg::Node*                         _model;
         float                              _heading;
         float                              _pitch;
-
         osg::ref_ptr<GeoPositionNode>      _geo;
+        osg::Group*                        _attachPoint;
+        bool                               _varyAngles;
+    };
+
+    /**
+     * Place an X at the sim entity position, in screen space.
+     * The point of this is to test the EarthManipulator::UpdateCameraCallback
+     * which provides a frame-synched camera matrix (post-update traversal)
+     */
+    struct CalculateWindowCoords : public osgGA::GUIEventHandler
+                                   
+    {
+        CalculateWindowCoords(char key, EarthManipulator* manip, Simulator* sim)
+            : _key(key), _active(false), _sim(sim), _xform(0L)
+        {
+            //nop
+        }
+
+        void onUpdateCamera(const osg::Camera* cam)
+        {
+            if (_active)
+            {
+                if (!_xform)
+                {
+                    osg::Geometry* geom = new osg::Geometry();
+                    osg::Vec3Array* verts = new osg::Vec3Array();
+                    verts->push_back(osg::Vec3(-10000, 0, 0));
+                    verts->push_back(osg::Vec3( 10000, 0, 0));
+                    verts->push_back(osg::Vec3( 0, -10000, 0));
+                    verts->push_back(osg::Vec3( 0,  10000, 0));
+                    verts->push_back(osg::Vec3( 0, 0, -10000));
+                    verts->push_back(osg::Vec3( 0, 0,  10000));
+                    geom->setVertexArray(verts);
+                    osg::Vec4Array* colors = new osg::Vec4Array();
+                    colors->push_back(osg::Vec4(1, 1, 0, 1));
+                    colors->setBinding(colors->BIND_OVERALL);
+                    geom->setColorArray(colors);
+                    geom->addPrimitiveSet(new osg::DrawArrays(GL_LINES, 0, 6));
+                    geom->setCullingActive(false);
+                    geom->getOrCreateStateSet()->setAttributeAndModes(new osg::Depth(osg::Depth::ALWAYS, 0, 1, true), 1);
+
+                    _xform = new osg::MatrixTransform();
+                    _xform->addChild(geom);
+
+                    osg::View* view = const_cast<osg::View*>(cam->getView());
+                    ControlCanvas::getOrCreate(view)->addChild(_xform);
+                }
+
+                GeoPoint p = _sim->_geo->getPosition();
+
+                osg::Vec3d world;
+                p.toWorld(world);
+
+                osg::Matrix worldToWindow =
+                    cam->getViewMatrix() *
+                    cam->getProjectionMatrix() *
+                    cam->getViewport()->computeWindowMatrix();
+
+                osg::Vec3d win = world * worldToWindow;
+
+                _xform->setMatrix(osg::Matrix::translate(win));
+            }
+        }
+
+        bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
+        {
+            if (ea.getEventType() == ea.KEYDOWN && ea.getKey() == _key)
+            {
+                _active = !_active;
+                aa.requestRedraw();
+                return true;
+            }
+            
+            return false;
+        }
+
+        void getUsage(osg::ApplicationUsage& usage) const
+        {
+            using namespace std;
+            usage.addKeyboardMouseBinding(string(1, _key), string("Show Window Coords"));
+        }
+
+        osg::MatrixTransform* _xform;
+        Simulator* _sim;
+        bool _active;
+        char _key;
+    };
+
+    struct CameraUpdater : public EarthManipulator::UpdateCameraCallback
+    {
+        CalculateWindowCoords* _calc;
+
+        CameraUpdater(CalculateWindowCoords* calc) : _calc(calc) { }
+        
+        void onUpdateCamera(const osg::Camera* cam)
+        {
+            _calc->onUpdateCamera(cam);
+        }
     };
 }
 
@@ -689,20 +782,19 @@
     osg::Group* sims = new osg::Group();
     root->addChild( sims );
 
+    const SpatialReference* wgs84 = SpatialReference::get("wgs84");
+
     // Simulator for tethering:
     Simulator* sim1 = new Simulator(sims, manip, mapNode, model.get(), "Thing 1", '8');
-    sim1->_lat0 = 55.0;
-    sim1->_lon0 = 45.0;
-    sim1->_lat1 = -55.0;
-    sim1->_lon1 = -45.0;
+    sim1->_start = GeoPoint(wgs84, 45.0, 55.0, 10000);
+    sim1->_end = GeoPoint(wgs84, -45, -55.0, 10000);
+    sim1->_varyAngles = false;
     viewer.addEventHandler(sim1);
 
     Simulator* sim2 = new Simulator(sims, manip, mapNode, model.get(), "Thing 2", '9');
-    sim2->_name = "Thing 2";
-    sim2->_lat0 = 54.0;
-    sim2->_lon0 = 45.0;
-    sim2->_lat1 = -54.0;
-    sim2->_lon1 = -44.0;
+    sim2->_start = GeoPoint(wgs84, 45.0, 54.0, 10000);
+    sim2->_end = GeoPoint(wgs84, -44.0, -54.0, 10000);
+    sim2->_varyAngles = true;
     viewer.addEventHandler(sim2);
 
     manip->getSettings()->getBreakTetherActions().push_back( EarthManipulator::ACTION_GOTO );    
@@ -744,8 +836,11 @@
     viewer.addEventHandler(new SetPositionOffset(manip));
     viewer.addEventHandler(new ToggleLDB('L'));
     viewer.addEventHandler(new ToggleSSL(sims, ')'));
-
     viewer.addEventHandler(new FitViewToPoints('j', manip, mapNode->getMapSRS()));
+    
+    CalculateWindowCoords* calc = new CalculateWindowCoords('W', manip, sim1);
+    viewer.addEventHandler(calc);
+    manip->setUpdateCameraCallback(new CameraUpdater(calc));
 
     viewer.getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_map/osgearth_map.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_map/osgearth_map.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_map/osgearth_map.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_map/osgearth_map.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,25 +20,79 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
-#include <osg/Notify>
-#include <osgGA/GUIEventHandler>
-#include <osgGA/StateSetManipulator>
 #include <osgViewer/Viewer>
-#include <osgViewer/ViewerEventHandlers>
+
 #include <osgEarth/MapNode>
 #include <osgEarth/ImageLayer>
+#include <osgEarth/ElevationLayer>
+#include <osgEarth/ModelLayer>
 #include <osgEarth/GeoTransform>
+#include <osgEarth/CompositeTileSource>
+
 #include <osgEarthUtil/EarthManipulator>
-#include <osgEarthUtil/AutoClipPlaneHandler>
-#include <osgEarthUtil/Controls>
-#include <osgEarthSymbology/Color>
+#include <osgEarthUtil/ExampleResources>
+#include <osgEarthUtil/AutoScaleCallback>
+
 #include <osgEarthDrivers/tms/TMSOptions>
 #include <osgEarthDrivers/wms/WMSOptions>
 #include <osgEarthDrivers/gdal/GDALOptions>
+#include <osgEarthDrivers/osg/OSGOptions>
+#include <osgEarthDrivers/xyz/XYZOptions>
+#include <osgEarthDrivers/debug/DebugOptions>
+#include <osgEarthDrivers/feature_ogr/OGRFeatureOptions>
+
+#include <osgEarthFeatures/FeatureMaskLayer>
+
+#include <osg/PositionAttitudeTransform>
+#include <osgDB/WriteFile>
 
 using namespace osgEarth;
 using namespace osgEarth::Drivers;
 using namespace osgEarth::Util;
+using namespace osgEarth::Features;
+
+int
+usage(int argc, char** argv)
+{
+    OE_NOTICE 
+        << "\n" << argv[0]
+        << "\n    [--out outFile] : write map node to outFile before exit"
+        << std::endl;
+
+    return 0;
+}
+
+// Demonstrates how to subclass ImageLayer to directly create textures
+// for use in a layer.
+class MyTextureLayer : public ImageLayer
+{
+public:
+    osg::ref_ptr<osg::Texture2D> _tex;
+
+    MyTextureLayer(const char* path)
+    {
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(path);
+        if (image.valid())
+            _tex = new osg::Texture2D(image.get());
+
+        // Establish a profile for the layer:
+        setProfile(Profile::create("global-geodetic"));
+
+        // Direct the layer to call createTexture:
+        setUseCreateTexture();
+
+        // Restrict the data extents of this layer to LOD 0 (in this case)
+        dataExtents().push_back(DataExtent(getProfile()->getExtent(), 0, 0));
+    }
+
+    osg::Texture* createTexture(const TileKey& key, ProgressCallback* progress, osg::Matrixf& textureMatrix)
+    {
+        // Set the texture matrix corresponding to the tile key:
+        key.getExtent().createScaleBias(getProfile()->getExtent(), textureMatrix);
+
+        return _tex.get();
+    }
+};
 
 /**
  * How to create a simple osgEarth map and display it.
@@ -47,6 +101,8 @@
 main(int argc, char** argv)
 {
     osg::ArgumentParser arguments(&argc,argv);
+    if (arguments.read("--help"))
+        return usage(argc, argv);
 
     // create the empty map.
     Map* map = new Map();
@@ -60,6 +116,19 @@
     TMSOptions elevation;
     elevation.url() = "http://readymap.org/readymap/tiles/1.0.0/116/";
     map->addLayer( new ElevationLayer("ReadyMap Elevation", elevation) );
+
+    // add a semi-transparent XYZ layer:
+    XYZOptions xyz;
+    xyz.url() = "http://[abc].tile.openstreetmap.org/{z}/{x}/{y}.png";
+    xyz.profile()->namedProfile() = "spherical-mercator";
+    ImageLayer* imageLayer = new ImageLayer("OSM", xyz);
+    imageLayer->setOpacity(0.5f);
+    map->addLayer(imageLayer);
+
+    // a custom layer that displays a user texture:
+    MyTextureLayer* texLayer = new MyTextureLayer("../data/grid2.png");
+    texLayer->setOpacity(0.5f);
+    map->addLayer(texLayer);  
     
     // add a local GeoTIFF inset layer:
     GDALOptions gdal;
@@ -78,31 +147,74 @@
     wmsLayerOptions.cachePolicy() = CachePolicy::NO_CACHE;
     map->addLayer(new ImageLayer(wmsLayerOptions));
 
-    // make the map scene graph:
-    MapNode* node = new MapNode( map );
+    // add a local simple image as a layer using the OSG driver:
+    OSGOptions osg;
+    osg.url() = "../data/osgearth.gif";
+    osg.profile()->srsString() = "wgs84";
+    osg.profile()->bounds()->set(-90.0, 10.0, -80.0, 15.0);
+    map->addLayer(new ImageLayer("Simple image", osg));
+
+    // create a composite image layer that combines two other sources:
+    GDALOptions c1;
+    c1.url() = "../data/boston-inset-wgs84.tif";
+
+    GDALOptions c2;
+    c2.url() = "../data/nyc-inset-wgs84.tif";
+
+    CompositeTileSourceOptions composite;
+    composite.add(ImageLayerOptions(c1));
+    composite.add(ImageLayerOptions(c2));
+
+    ImageLayerOptions compLayerOptions("My Composite Layer", composite);
+    map->addLayer(new ImageLayer(compLayerOptions));
+
+    // mask layer
+    OGRFeatureOptions maskOptions;
+    maskOptions.geometry() = new Polygon();
+    maskOptions.geometry()->push_back(osg::Vec3d(-111.0466, 42.0015, 0));
+    maskOptions.geometry()->push_back(osg::Vec3d(-111.0467, 40.9979, 0));
+    maskOptions.geometry()->push_back(osg::Vec3d(-109.0501, 41.0007, 0));
+    maskOptions.geometry()->push_back(osg::Vec3d(-109.0452, 36.9991, 0));
+    maskOptions.geometry()->push_back(osg::Vec3d(-114.0506, 37.0004, 0));
+    maskOptions.geometry()->push_back(osg::Vec3d(-114.0417, 41.9937, 0));
+    maskOptions.profile() = ProfileOptions("global-geodetic");
+    FeatureMaskLayerOptions maskLayerOptions;
+    maskLayerOptions.name() = "Mask layer";
+    maskLayerOptions.featureSource() = maskOptions;
+    map->addLayer(new FeatureMaskLayer(maskLayerOptions));
 
     // put a model on the map atop Pike's Peak, Colorado, USA
-    osg::ref_ptr<osg::Node> model = osgDB::readRefNodeFile("../data/red_flag.osg.10000.scale.osgearth_shadergen");
+    osg::ref_ptr<osg::Node> model = osgDB::readRefNodeFile("cow.osgt.(0,0,3).trans.osgearth_shadergen");
     if (model.valid())
     {
+        osg::PositionAttitudeTransform* pat = new osg::PositionAttitudeTransform();
+        pat->addCullCallback(new AutoScaleCallback<osg::PositionAttitudeTransform>(5.0));
+        pat->addChild(model.get());
+
         GeoTransform* xform = new GeoTransform();
-        xform->addChild(model.get());
-        xform->setPosition(GeoPoint(map->getSRS()->getGeographicSRS(), -105.042292, 38.840829));
-        node->addChild(xform);
+        xform->setPosition(GeoPoint(SpatialReference::get("wgs84"), -105.042292, 38.840829));
+        xform->addChild(pat);
+
+        map->addLayer(new ModelLayer("Model", xform));
     }
 
+    // make the map scene graph:
+    MapNode* node = new MapNode( map );
+
     // initialize a viewer:
     osgViewer::Viewer viewer(arguments);
-    viewer.setCameraManipulator( new EarthManipulator );
+    viewer.setCameraManipulator( new EarthManipulator() );
+    viewer.getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
     viewer.setSceneData( node );
 
     // add some stock OSG handlers:
-    viewer.addEventHandler(new osgViewer::StatsHandler());
-    viewer.addEventHandler(new osgViewer::WindowSizeHandler());
-    viewer.addEventHandler(new osgViewer::ThreadingHandler());
-    viewer.addEventHandler(new osgViewer::LODScaleHandler());
-    viewer.addEventHandler(new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()));
-    viewer.addEventHandler(new osgViewer::HelpHandler(arguments.getApplicationUsage()));
+    MapNodeHelper().configureView(&viewer);
+
+    int r = viewer.run();
+
+    std::string outFile;
+    if (arguments.read("--out", outFile))
+        osgDB::writeNodeFile(*node, outFile);
 
-    return viewer.run();
+    return r;
 }
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_measure/osgearth_measure.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_measure/osgearth_measure.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_measure/osgearth_measure.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_measure/osgearth_measure.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -29,6 +29,8 @@
 #include <osgEarth/XmlUtils>
 #include <osgEarth/Registry>
 #include <osgEarth/Viewpoint>
+#include <osgEarth/CullingUtils>
+#include <osgEarth/GLUtils>
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/AutoClipPlaneHandler>
 #include <osgEarthUtil/Controls>
@@ -80,7 +82,8 @@
     _tool( tool )
     { }
 
-    virtual void onValueChanged(Control* control, bool value) {
+    virtual void onValueChanged(Control* control, bool value)
+    {
         if (_tool->getGeoInterpolation() == GEOINTERP_GREAT_CIRCLE)
         {
             _tool->setGeoInterpolation( GEOINTERP_RHUMB_LINE);
@@ -126,9 +129,9 @@
 
     osg::Group* root = new osg::Group();
     root->addChild( earthNode );
-
+    
     //Create the MeasureToolHandler
-    MeasureToolHandler* measureTool = new MeasureToolHandler(root, mapNode);    
+    MeasureToolHandler* measureTool = new MeasureToolHandler(mapNode);
     measureTool->setIntersectionMask( 0x1 );
     viewer.addEventHandler( measureTool );
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_minimap/osgearth_minimap.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_minimap/osgearth_minimap.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_minimap/osgearth_minimap.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_minimap/osgearth_minimap.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -81,7 +81,8 @@
         Style style;
         style.getOrCreateSymbol<LineSymbol>()->stroke()->color() = Color::Yellow;
         feature->style() = style;
-        FeatureNode* featureNode = new FeatureNode(mapNode, feature);
+        FeatureNode* featureNode = new FeatureNode(feature);
+        featureNode->setMapNode(mapNode);
 
         featureNode->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
         return featureNode;
@@ -183,7 +184,7 @@
     
     // load an earth file, and support all or our example command-line options
     // and earth file <external> tags    
-    osg::Node* node = MapNodeHelper().load( arguments, mainView );
+    osg::Node* node = MapNodeHelper().load( arguments, &viewer );
     if ( node )
     {
         MapNode* mapNode = MapNode::findMapNode(node);
@@ -197,7 +198,7 @@
         MapNode* miniMapNode = makeMiniMapNode();        
         miniMapGroup->addChild( miniMapNode );
        
-        //Get the main MapNode so we can do tranformations between it and our minimap
+        //Get the main MapNode so we can do transformations between it and our minimap
         MapNode* mainMapNode = MapNode::findMapNode( node );
                                
         //Set the scene data for the minimap
@@ -206,7 +207,8 @@
         //Add a marker we can move around with the main view's eye point
         Style markerStyle;
         markerStyle.getOrCreate<IconSymbol>()->url()->setLiteral( "../data/placemark32.png" );
-        PlaceNode* eyeMarker = new PlaceNode(miniMapNode, GeoPoint(miniMapNode->getMapSRS(), 0, 0), "", markerStyle);
+        PlaceNode* eyeMarker = new PlaceNode("", markerStyle);
+        eyeMarker->setPosition(GeoPoint(miniMapNode->getMapSRS(), 0, 0));
         miniMapGroup->addChild( eyeMarker );        
         miniMapGroup->getOrCreateStateSet()->setRenderBinDetails(100, "RenderBin");
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_mrt/osgearth_mrt.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_mrt/osgearth_mrt.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_mrt/osgearth_mrt.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_mrt/osgearth_mrt.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 #include <osgGA/GUIEventHandler>
 #include <osgViewer/Viewer>
 #include <osgEarth/VirtualProgram>
+#include <osgEarth/GLUtils>
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/ExampleResources>
 
@@ -58,6 +59,7 @@
     rtt->setCullingMode(rtt->getCullingMode() & ~osg::CullSettings::SMALL_FEATURE_CULLING); 
 
     static const char* vertSource =
+        "#version " GLSL_VERSION_STR "\n"
         "out float mrt_depth;\n"
         "void oe_mrt_vertex(inout vec4 vertexClip)\n"
         "{\n"
@@ -65,13 +67,17 @@
         "}\n";
 
     static const char* fragSource =
+        "#version " GLSL_VERSION_STR "\n"
         "in float mrt_depth;\n"
         "in vec3 vp_Normal; \n"
+        "layout(location=0) out vec4 gcolor; \n"
+        "layout(location=1) out vec4 gnormal; \n"
+        "layout(location=2) out vec4 gdepth; \n"
         "void oe_mrt_fragment(inout vec4 color)\n"
         "{\n"
-        "    gl_FragData[0] = color; \n"
-        "    gl_FragData[1] = vec4((vp_Normal+1.0)/2.0,1.0);\n"
-        "    gl_FragData[2] = vec4(mrt_depth,mrt_depth,mrt_depth,1.0); \n"
+        "    gcolor = color; \n"
+        "    gnormal = vec4((vp_Normal+1.0)/2.0, 1.0); \n"
+        "    gdepth = vec4(mrt_depth, mrt_depth, mrt_depth, 1.0); \n"
         "}\n";
 
     VirtualProgram* vp = VirtualProgram::getOrCreate( rtt->getOrCreateStateSet() );
@@ -105,12 +111,14 @@
     t->push_back(osg::Vec2(0,h));
     g->setTexCoordArray(0, t);
 
-    osg::Vec4Array* c = new osg::Vec4Array();
+    osg::DrawElementsUByte* i = new osg::DrawElementsUByte(GL_TRIANGLES);
+    i->addElement(0); i->addElement(1); i->addElement(3);
+    i->addElement(1); i->addElement(2); i->addElement(3);
+    g->addPrimitiveSet(i);
+
+    osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL);
     c->push_back(osg::Vec4(1,1,1,1));
     g->setColorArray(c);
-    g->setColorBinding(osg::Geometry::BIND_OVERALL);
-
-    g->addPrimitiveSet(new osg::DrawArrays(GL_QUADS, 0, 4));
 
     osg::Geode* geode = new osg::Geode();
     geode->addDrawable( g );
@@ -126,6 +134,7 @@
     osg::StateSet* stateset = quad->getOrCreateStateSet();
 
     static const char* vertSource =
+        "#version " GLSL_VERSION_STR "\n"
         "out vec4 texcoord;\n"
         "void effect_vert(inout vec4 vertexView)\n"
         "{\n"
@@ -182,7 +191,7 @@
     stateset->addUniform(new osg::Uniform("gnormal", 1));
     stateset->setTextureAttributeAndModes(2, app.gdepth, 1);
     stateset->addUniform(new osg::Uniform("gdepth", 2));
-    stateset->setMode( GL_LIGHTING, 0 );
+    GLUtils::setLineWidth(stateset, 2.0f, 1);
 
     float w = app.gcolor->getTextureWidth();
     float h = app.gcolor->getTextureHeight();
@@ -214,7 +223,7 @@
 
     app.gdepth = new osg::TextureRectangle();
     app.gdepth->setTextureSize(width, height);
-    app.gdepth->setInternalFormat(GL_LUMINANCE);
+    app.gdepth->setInternalFormat(GL_R16F);
     app.gdepth->setFilter(osg::Texture2D::MIN_FILTER,osg::Texture2D::NEAREST);
     app.gdepth->setFilter(osg::Texture2D::MAG_FILTER,osg::Texture2D::NEAREST);
 }
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_noisegen/osgearth_noisegen.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_noisegen/osgearth_noisegen.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_noisegen/osgearth_noisegen.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_noisegen/osgearth_noisegen.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -48,7 +48,7 @@
         "                  --out string         ; output filename\n"
         "                  [--frequency n]      ; default = 16\n"
         "                  [--octaves n]        ; default = 12\n"
-        ;
+        << std::endl;
     return -1;
 }
 /**
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_occlusionculling/osgearth_occlusionculling.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_occlusionculling/osgearth_occlusionculling.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_occlusionculling/osgearth_occlusionculling.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_occlusionculling/osgearth_occlusionculling.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -25,7 +25,6 @@
 #include <osgEarth/ECEF>
 
 #include <osgEarthUtil/EarthManipulator>
-#include <osgEarthUtil/AnnotationEvents>
 #include <osgEarthUtil/AutoClipPlaneHandler>
 #include <osgEarthUtil/ExampleResources>
 
@@ -122,7 +121,9 @@
         {
             double lat = minLat + height * (rand() * 1.0)/(RAND_MAX-1);
             double lon = minLon + width * (rand() * 1.0)/(RAND_MAX-1);        
-            PlaceNode* place = new PlaceNode(mapNode, GeoPoint(geoSRS, lon, lat), pin.get(), "Placemark", placeStyle);
+            PlaceNode* place = new PlaceNode("Placemark", placeStyle, pin.get());
+            place->setMapNode(mapNode);
+            place->setPosition(GeoPoint(geoSRS, lon, lat));
             //Enable occlusion culling.  This will hide placemarks that are hidden behind terrain.
             //This makes use of the OcclusionCullingCallback in CullingUtils.
             place->setOcclusionCulling( true );
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_overlayviewer/osgearth_overlayviewer.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_overlayviewer/osgearth_overlayviewer.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_overlayviewer/osgearth_overlayviewer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_overlayviewer/osgearth_overlayviewer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -30,10 +30,10 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osgEarth/OverlayDecorator>
 #include <osgEarth/MapNode>
+#include <osgEarth/CascadeDrapingDecorator>
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/ExampleResources>
-#include <osgEarthUtil/Controls>
-#include <osgEarthSymbology/Color>
+#include <osgEarthUtil/ViewFitter>
 
 #define LC "[viewer] "
 
@@ -41,56 +41,92 @@
 using namespace osgEarth::Util::Controls;
 using namespace osgEarth::Symbology;
 
-//------------------------------------------------------------------------
+namespace ui = osgEarth::Util::Controls;
 
-static CheckBoxControl* s_cameraCheck;
-//static CheckBoxControl* s_overlayCheck;
-static CheckBoxControl* s_intersectionCheck;
-static CheckBoxControl* s_rttCheck;
+//------------------------------------------------------------------------
 
 namespace
 {
-    void toggle(osg::Group* p, const std::string& name, bool onoff)
+    struct App
     {
-        if (p->getNumChildren() > 1)
+        MapNode* _mapNode;
+        ui::CheckBoxControl* _fitting;
+        ui::HSliderControl* _minNearFarRatio;
+        ui::ButtonControl* _centerView;
+        osg::ref_ptr<osg::Node> _dumpNode;
+        osg::Camera* _overlayCam;
+        EarthManipulator* _manip;
+
+        void toggleFitting()
+        {
+            CascadeDrapingDecorator* cdd = _mapNode->getCascadeDrapingDecorator();
+            if (cdd) cdd->setUseProjectionFitting(_fitting->getValue());
+        }
+
+        void setMinNearFarRatio()
         {
-            osg::Group* g = p->getChild(1)->asGroup();
-            for(unsigned i=0; i<g->getNumChildren(); ++i)
+            CascadeDrapingDecorator* cdd = _mapNode->getCascadeDrapingDecorator();
+            if (cdd) cdd->setMinimumNearFarRatio(_minNearFarRatio->getValue());
+        }
+
+        void findFrusta()
+        {
+            if (_dumpNode.valid())
             {
-                if ( g->getChild(i)->getName() == name )
+                ViewFitter fitter(_mapNode->getMapSRS(), _overlayCam);
+                const osg::BoundingSphere& bs = _dumpNode->getBound();
+                GeoPoint center;
+                center.fromWorld(_mapNode->getMapSRS(), bs.center());
+                std::vector<GeoPoint> points;
+                points.push_back(center);
+                fitter.setBuffer(bs.radius()*0.85);
+                Viewpoint vp;
+                if (fitter.createViewpoint(points, vp))
                 {
-                    g->getChild(i)->setNodeMask( onoff ? ~0 : 0 );
-                    break;
+                    vp.heading() = 45, vp.pitch() = -45;
+                    _manip->setViewpoint(vp, 1.0);
                 }
             }
         }
-        else
-        {
-            OE_WARN << "No overlays to display / toggle." << std::endl;
-        }
-    }
+    };
 
+    OE_UI_HANDLER(toggleFitting);
+    OE_UI_HANDLER(setMinNearFarRatio);
+    OE_UI_HANDLER(findFrusta);
 
-    struct Toggle : public ControlEventHandler
+    ui::Control* makeUI(App& app)
     {
-        osg::Group* _g;
-        std::string _name;
-        Toggle(osg::Group* g, const std::string& name) : _g(g), _name(name) { }
-        void onValueChanged( Control* control, bool value )
+        bool usingCascade = app._mapNode->getCascadeDrapingDecorator() != 0L;
+
+        ui::Grid* grid = new ui::Grid();
+        int r = 0;
+
+        if (usingCascade)
         {
-            toggle(_g, _name, value);
+            grid->setControl(0, r, new ui::LabelControl("Projection fitting"));
+            grid->setControl(1, r, app._fitting = new ui::CheckBoxControl(true, new toggleFitting(app)));
+            ++r;
+
+            grid->setControl(0, r, new ui::LabelControl("Cascade #1 Min NF Ratio"));
+            grid->setControl(1, r, app._minNearFarRatio = new ui::HSliderControl(0.0, 1.0, 0.2, new setMinNearFarRatio(app)));
+            app._minNearFarRatio->setHorizFill(true, 250.0f);
+            ++r;
         }
-    };
 
+        grid->setControl(0, r, app._centerView = new ui::ButtonControl("Sync view", new findFrusta(app)));
+        ++r;
+
+        return grid;
+    }
 
     // it's not used by osgEarth, but you can copy this code into a viewer app and
     // use it to visualize the various polyhedra created by the overlay decorator.
     // see the end of OverlayDecorator::cull for the dump types.
     struct PHDumper : public osgGA::GUIEventHandler
     {
-        MapNode*    _mapNode;
+        App& _app;
         osg::Group* _parent;
-        PHDumper(MapNode* mapNode, osg::Group* parent) : _mapNode(mapNode), _parent(parent)
+        PHDumper(App& app, osg::Group* parent) : _app(app), _parent(parent)
         {
         }
 
@@ -98,10 +134,10 @@
         {
             if ( ea.getEventType() == ea.FRAME )
             {
-                osg::Node* dump = _mapNode->getOverlayDecorator()->getDump();
-                if ( !dump )
+                _app._dumpNode = _app._mapNode->getDrapingDump();
+                if ( !_app._dumpNode.valid() )
                 {
-                    _mapNode->getOverlayDecorator()->requestDump();
+                    _app._mapNode->getOverlayDecorator()->requestDump();
                     aa.requestRedraw();
                 }
                 else
@@ -116,23 +152,20 @@
                     osg::Group* g0 = new osg::Group();
                     g->addChild( g0 );
                     osg::StateSet* g0ss = g0->getOrCreateStateSet();
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
                     g0ss->setAttributeAndModes(new osg::LineStipple(1, 0x000F), 1);
-                    g0->addChild( dump );
+#endif
+                    g0->addChild( _app._dumpNode.get() );
 
                     osg::Group* g1 = new osg::Group();
                     g->addChild( g1 );
                     osg::StateSet* g1ss = g1->getOrCreateStateSet();
                     g1ss->setMode(GL_DEPTH_TEST, osg::StateAttribute::OVERRIDE | 1);
-                    g1->addChild( dump );
+                    g1->addChild( _app._dumpNode.get() );
 
                     _parent->removeChildren(1, _parent->getNumChildren()-1);
                     _parent->addChild( g );
 
-                    toggle(_parent, "camera", s_cameraCheck->getValue());
-                    //toggle(_parent, "overlay", s_overlayCheck->getValue());
-                    toggle(_parent, "intersection", s_intersectionCheck->getValue());
-                    toggle(_parent, "rtt", s_rttCheck->getValue());
-
                     aa.requestRedraw();
                 }
             }
@@ -141,44 +174,6 @@
     };
 }
 
-
-void
-setupOverlayView( osgViewer::View* view, osg::Group* parent, MapNode* mapNode )
-{
-    ControlCanvas* canvas = ControlCanvas::getOrCreate(view);
-
-    VBox* v = canvas->addControl(new VBox());
-    v->setBackColor( Color(Color::Black,0.75) );
-    {
-        HBox* camBox = v->addControl(new HBox());
-        {
-            camBox->addControl(s_cameraCheck = new CheckBoxControl(true, new Toggle(parent,"camera")));
-            camBox->addControl(new LabelControl("Camera", Color("#00ff00")));
-        }
-
-        //HBox* overlayBox = v->addControl(new HBox());
-        //{
-        //    overlayBox->addControl(s_overlayCheck = new CheckBoxControl(false, new Toggle(parent,"overlay")));
-        //    overlayBox->addControl(new LabelControl("Overlay", Color("#00ffff")));
-        //}
-
-        HBox* isectBox = v->addControl(new HBox());
-        {
-            isectBox->addControl(s_intersectionCheck = new CheckBoxControl(true, new Toggle(parent,"intersection")));
-            isectBox->addControl(new LabelControl("Intersection",Color("#ff7f00")));
-        }
-
-        HBox* rttBox = v->addControl(new HBox());
-        {
-            rttBox->addControl(s_rttCheck = new CheckBoxControl(true, new Toggle(parent,"rtt")));
-            rttBox->addControl(new LabelControl("RTT", Color("#ffff00")));
-        }
-    }
-    
-    view->addEventHandler( new PHDumper(mapNode, parent) );
-}
-
-
 int
 main(int argc, char** argv)
 {
@@ -186,6 +181,8 @@
 
     osgViewer::CompositeViewer viewer(arguments);
     viewer.setThreadingModel( osgViewer::CompositeViewer::SingleThreaded );
+    
+    App app;
 
     // query the screen size.
     osg::GraphicsContext::ScreenIdentifier si;
@@ -197,20 +194,18 @@
     unsigned b = 50;
 
     osgViewer::View* mainView = new osgViewer::View();
+    mainView->getCamera()->setName("dump");
     mainView->getCamera()->setNearFarRatio(0.00002);
     EarthManipulator* em = new EarthManipulator();
     em->getSettings()->setMinMaxPitch(-90, 0);
     mainView->setCameraManipulator( em );
-    //mainView->setUpViewInWindow( 50, 50, 600, 600 );
     mainView->setUpViewInWindow( b, b, (width/2)-b*2, (height-b*4) );
     viewer.addView( mainView );
 
     osgViewer::View* overlayView = new osgViewer::View();
     overlayView->getCamera()->setNearFarRatio(0.00002);
-    //overlayView->getCamera()->setProjectionMatrixAsOrtho2D(-1,1,-1,1);
-    overlayView->setCameraManipulator( new EarthManipulator() );
+    overlayView->setCameraManipulator( app._manip = new EarthManipulator() );
     
-    //overlayView->setUpViewInWindow( 700, 50, 600, 600 );
     overlayView->setUpViewInWindow( (width/2), b, (width/2)-b*2, (height-b*4) );
     overlayView->addEventHandler(new osgGA::StateSetManipulator(overlayView->getCamera()->getOrCreateStateSet()));
     viewer.addView( overlayView );
@@ -222,16 +217,19 @@
         mainView->setCameraManipulator( new osgGA::AnimationPathManipulator(pathfile) );
     }
 
-    osg::Node* node = MapNodeHelper().load( arguments, mainView );
+    osg::Node* node = MapNodeHelper().load( arguments, &viewer );
     if ( node )
     {
         mainView->setSceneData( node );
 
-        osg::Group* group = new osg::Group();
-        group->addChild( MapNode::get(node) );
-        overlayView->setSceneData( group );
+        app._mapNode = MapNode::get(node);
+        app._overlayCam = overlayView->getCamera();
+        ui::ControlCanvas::get(mainView)->addControl(makeUI(app));
 
-        setupOverlayView( overlayView, group, MapNode::get(node) );
+        osg::Group* group = new osg::Group();
+        group->addChild(app._mapNode);
+        overlayView->setSceneData( group );       
+        overlayView->addEventHandler( new PHDumper(app, group) );
 
         return viewer.run();
     }
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_package/osgearth_package.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_package/osgearth_package.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_package/osgearth_package.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_package/osgearth_package.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -74,13 +74,12 @@
         << "            [--keep-empties]                : writes out fully transparent image tiles (normally discarded)\n"
         << "            [--continue-single-color]       : continues to subdivide single color tiles, subdivision typicall stops on single color images\n"
         << "            [--elevation-pixel-depth]       : pixeldepth for elevations\n"
-        << "            [--db-options]                : db options string to pass to the image writer in quotes (e.g., \"JPEG_QUALITY 60\")\n"
-        << "            [--mp]                          ; Use multiprocessing to process the tiles.  Useful for GDAL sources as this avoids the global GDAL lock" << std::endl
-        << "            [--mt]                          ; Use multithreading to process the tiles." << std::endl
-        << "            [--concurrency]                 ; The number of threads or processes to use if --mp or --mt are provided." << std::endl
-        << "            [--alpha-mask]                  ; Mask out imagery that isn't in the provided extents." << std::endl
-        << std::endl
-        << "            [--verbose]                     ; Displays progress of the operation" << std::endl;
+        << "            [--db-options]                  : osgDB options string to pass to the image writer in quotes (e.g., \"JPEG_QUALITY 60\")\n"
+        << "            [--mp]                          : Use multiprocessing to process the tiles.  Useful for GDAL sources as this avoids the global GDAL lock" << std::endl
+        << "            [--mt]                          : Use multithreading to process the tiles." << std::endl
+        << "            [--concurrency]                 : The number of threads or processes to use if --mp or --mt are provided." << std::endl
+        << "            [--alpha-mask]                  : Mask out imagery that isn't in the provided extents." << std::endl
+        << "            [--verbose]                     : Displays progress of the operation" << std::endl;
 
     return -1;
 }
@@ -127,17 +126,17 @@
     //Read the max level
     unsigned int maxLevel = 5;
     while (args.read("--max-level", maxLevel));
-    
+
 
     std::vector< Bounds > bounds;
-    // restrict packaging to user-specified bounds.    
+    // restrict packaging to user-specified bounds.
     double xmin=DBL_MAX, ymin=DBL_MAX, xmax=DBL_MIN, ymax=DBL_MIN;
     while (args.read("--bounds", xmin, ymin, xmax, ymax ))
-    {        
+    {
         Bounds b;
         b.xMin() = xmin, b.yMin() = ymin, b.xMax() = xmax, b.yMax() = ymax;
         bounds.push_back( b );
-    }    
+    }
 
     std::string tileList;
     while (args.read( "--tiles", tileList ) );
@@ -165,24 +164,24 @@
     // Read in an index shapefile
     std::string index;
     while (args.read("--index", index))
-    {        
+    {
         //Open the feature source
         OGRFeatureOptions featureOpt;
-        featureOpt.url() = index;        
+        featureOpt.url() = index;
 
         osg::ref_ptr< FeatureSource > features = FeatureSourceFactory::create( featureOpt );
         Status s = features->open();
         if (s.isError())
             return usage(s.message());
 
-        osg::ref_ptr< FeatureCursor > cursor = features->createFeatureCursor();
+        osg::ref_ptr< FeatureCursor > cursor = features->createFeatureCursor(0L);
         while (cursor.valid() && cursor->hasMore())
         {
             osg::ref_ptr< Feature > feature = cursor->nextFeature();
             osgEarth::Bounds featureBounds = feature->getGeometry()->getBounds();
             GeoExtent ext( feature->getSRS(), featureBounds );
             ext = ext.transform( mapNode->getMapSRS() );
-            bounds.push_back( ext.bounds() );            
+            bounds.push_back( ext.bounds() );
         }
     }
 
@@ -192,7 +191,7 @@
 
     // find a .earth file on the command line
     std::string earthFile = findArgumentWithExtension( args, ".earth" );
-    
+
     // folder to which to write the TMS archive.
     std::string rootFolder;
     if( !args.read( "--out", rootFolder ) )
@@ -218,7 +217,7 @@
 
     osg::ref_ptr<osgDB::Options> options = new osgDB::Options( dbOptions );
 
-    // whether to keep 'empty' tiles    
+    // whether to keep 'empty' tiles
     bool keepEmpties = args.read( "--keep-empties" );
 
     //TODO:  Single color
@@ -227,7 +226,7 @@
     // elevation pixel depth
     unsigned elevationPixelDepth = 32;
     args.read( "--elevation-pixel-depth", elevationPixelDepth );
-    
+
     // create a folder for the output
     osgDB::makeDirectory( rootFolder );
     if( !osgDB::fileExists( rootFolder ) )
@@ -238,7 +237,7 @@
 
     int elevationLayerIndex = -1;
     args.read("--elevation", elevationLayerIndex);
-    
+
     Map* map = mapNode->getMap();
 
 
@@ -246,13 +245,13 @@
 
     // If we are given a task file, load it up and create a new TileKeyListVisitor
     if (!tileList.empty())
-    {        
+    {
         TaskList tasks( mapNode->getMap()->getProfile() );
         tasks.load( tileList );
 
         TileKeyListVisitor* v = new TileKeyListVisitor();
         v->setKeys( tasks.getKeys() );
-        visitor = v;     
+        visitor = v;
         // This process is a lowly worker, and shouldn't write out the XML file.
         writeXML = false;
     }
@@ -268,7 +267,7 @@
             {
                 v->setNumThreads(concurrency);
             }
-            visitor = v;            
+            visitor = v;
         }
         else if (args.read("--mp"))
         {
@@ -281,7 +280,7 @@
             }
 
             if (batchSize > 0)
-            {            
+            {
                 v->setBatchSize(batchSize);
             }
 
@@ -299,13 +298,13 @@
 
             v->setEarthFile( earthFile );
 
-            visitor = v;            
+            visitor = v;
         }
         else
         {
             // Create a single thread visitor
-            visitor = new TileVisitor();            
-        }        
+            visitor = new TileVisitor();
+        }
     }
 
     osg::ref_ptr< ProgressCallback > progress = new ConsoleProgressCallback();
@@ -316,24 +315,24 @@
     }
 
     visitor->setMinLevel( minLevel );
-    visitor->setMaxLevel( maxLevel );        
+    visitor->setMaxLevel( maxLevel );
 
 
     for (unsigned int i = 0; i < bounds.size(); i++)
     {
         GeoExtent extent(mapNode->getMapSRS(), bounds[i]);
-        OE_DEBUG << "Adding extent " << extent.toString() << std::endl;                
+        OE_DEBUG << "Adding extent " << extent.toString() << std::endl;
         visitor->addExtent( extent );
-    }    
+    }
 
 
     // Setup a TMSPackager with all the options.
     TMSPackager packager;
     packager.setExtension(extension);
     packager.setVisitor(visitor.get());
-    packager.setDestination(rootFolder);    
+    packager.setDestination(rootFolder);
     packager.setElevationPixelDepth(elevationPixelDepth);
-    packager.setWriteOptions(options.get());    
+    packager.setWriteOptions(options.get());
     packager.setOverwrite(overwrite);
     packager.setKeepEmpties(keepEmpties);
     packager.setApplyAlphaMask(applyAlphaMask);
@@ -348,18 +347,20 @@
     }
 
     std::string outEarthFile = osgDB::concatPaths( rootFolder, osgDB::getSimpleFileName( outEarth ) );
-    
+
 
     // Package an individual image layer
     if (imageLayerIndex >= 0)
-    {        
-        ImageLayer* layer = map->getLayerAt<ImageLayer>(imageLayerIndex);
-        if (layer)
+    {
+        ImageLayerVector imageLayers;
+        map->getLayers(imageLayers);
+        osg::ref_ptr< ImageLayer > layer = imageLayers[imageLayerIndex];
+        if (layer.valid())
         {
-            packager.run(layer, map);
+            packager.run(layer.get(), map);
             if (writeXML)
             {
-                packager.writeXML(layer, map);
+                packager.writeXML(layer.get(), map);
             }
         }
         else
@@ -370,14 +371,16 @@
     }
     // Package an individual elevation layer
     else if (elevationLayerIndex >= 0)
-    {        
-        ElevationLayer* layer = map->getLayerAt<ElevationLayer>(elevationLayerIndex);
-        if (layer)
+    {
+        ElevationLayerVector elevationLayers;
+        map->getLayers(elevationLayers);
+        osg::ref_ptr< ElevationLayer > layer = elevationLayers[elevationLayerIndex];
+        if (layer.valid())
         {
-            packager.run(layer, map);
+            packager.run(layer.get(), map);
             if (writeXML)
             {
-                packager.writeXML(layer, map );
+                packager.writeXML(layer.get(), map );
             }
         }
         else
@@ -393,7 +396,7 @@
 
         // Package all the ImageLayer's
         for (unsigned int i = 0; i < imageLayers.size(); i++)
-        {            
+        {
             ImageLayer* layer = imageLayers[i].get();
             OE_NOTICE << "Packaging " << layer->getName() << std::endl;
             osg::Timer_t start = osg::Timer::instance()->tick();
@@ -402,7 +405,7 @@
             if (verbose)
             {
                 OE_NOTICE << "Completed seeding layer " << layer->getName() << " in " << prettyPrintTime( osg::Timer::instance()->delta_s( start, end ) ) << std::endl;
-            }                
+            }
 
             if (writeXML)
             {
@@ -424,14 +427,14 @@
 
                 outMap->addLayer( new ImageLayer( layerOptions ) );
             }
-        }    
+        }
 
         // Package all the ElevationLayer's
         ElevationLayerVector elevationLayers;
         map->getLayers(elevationLayers);
 
         for (unsigned int i = 0; i < elevationLayers.size(); i++)
-        {            
+        {
             ElevationLayer* layer = elevationLayers[i].get();
             OE_NOTICE << "Packaging " << layer->getName() << std::endl;
             osg::Timer_t start = osg::Timer::instance()->tick();
@@ -440,7 +443,7 @@
             if (verbose)
             {
                 OE_NOTICE << "Completed seeding layer " << layer->getName() << " in " << prettyPrintTime( osg::Timer::instance()->delta_s( start, end ) ) << std::endl;
-            }      
+            }
             if (writeXML)
             {
                 packager.writeXML(layer, map);
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_package_qt/package_qt.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_package_qt/package_qt.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_package_qt/package_qt.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_package_qt/package_qt.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -107,7 +107,7 @@
   osg::ref_ptr<osg::Group> root = new osg::Group();
 
   //create ViewWidget and get views collection
-  osgEarth::QtGui::ViewerWidget* viewerWidget = new osgEarth::QtGui::ViewerWidget( root );
+  osgEarth::QtGui::ViewerWidget* viewerWidget = new osgEarth::QtGui::ViewerWidget( root.get() );
   osgEarth::QtGui::ViewVector views;
   viewerWidget->getViews( views );
 
@@ -131,7 +131,7 @@
   //globe will be loaded
   osg::ArgumentParser args(&argc,argv);
   std::string earthFile = findArgumentWithExtension(args, ".earth");
-  SceneController controller(root, mainView, earthFile);
+  SceneController controller(root.get(), mainView.get(), earthFile);
 
   //create the TMSExporter and main window
   TMSExporter exporter;
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_package_qt/PackageQtMainWindow osgearth-2.10.2+dfsg/src/applications/osgearth_package_qt/PackageQtMainWindow
--- osgearth-2.9.0+dfsg/src/applications/osgearth_package_qt/PackageQtMainWindow	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_package_qt/PackageQtMainWindow	2019-07-11 18:30:19.000000000 +0000
@@ -306,17 +306,17 @@
       if (_controller)
       {
         // create a second catalog widget for viewpoints
-        osgEarth::QtGui::MapCatalogWidget* vpCatalog = new osgEarth::QtGui::MapCatalogWidget(_manager, osgEarth::QtGui::MapCatalogWidget::VIEWPOINTS);
+        osgEarth::QtGui::MapCatalogWidget* vpCatalog = new osgEarth::QtGui::MapCatalogWidget(_manager.get(), osgEarth::QtGui::MapCatalogWidget::VIEWPOINTS);
         vpCatalog->setActiveViews(_views);
         _vpDock->setWidget(vpCatalog);
 
         // create layer manager widget and add as a docked widget on the right
-        osgEarth::QtGui::LayerManagerWidget* elevLayerManager = new osgEarth::QtGui::LayerManagerWidget(_manager, osgEarth::QtGui::LayerManagerWidget::ELEVATION_LAYERS);
+        osgEarth::QtGui::LayerManagerWidget* elevLayerManager = new osgEarth::QtGui::LayerManagerWidget(_manager.get(), osgEarth::QtGui::LayerManagerWidget::ELEVATION_LAYERS);
         elevLayerManager->setActiveViews(_views);
         _elevLayersDock->setWidget(elevLayerManager);
 
         // create layer manager widget and add as a docked widget on the right
-        osgEarth::QtGui::LayerManagerWidget* imgLayerManager = new osgEarth::QtGui::LayerManagerWidget(_manager, osgEarth::QtGui::LayerManagerWidget::IMAGE_LAYERS);
+        osgEarth::QtGui::LayerManagerWidget* imgLayerManager = new osgEarth::QtGui::LayerManagerWidget(_manager.get(), osgEarth::QtGui::LayerManagerWidget::IMAGE_LAYERS);
         imgLayerManager->setActiveViews(_views);
         _imgLayersDock->setWidget(imgLayerManager);
       }
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_package_qt/SceneController.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_package_qt/SceneController.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_package_qt/SceneController.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_package_qt/SceneController.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -118,7 +118,7 @@
   if (_root.valid() && _view.valid())
   {
     //install a canvas for any UI controls we plan to create
-    _canvas = osgEarth::Util::Controls::ControlCanvas::getOrCreate(_view);
+    _canvas = osgEarth::Util::Controls::ControlCanvas::getOrCreate(_view.get());
 
     _controlContainer = _canvas->addControl( new osgEarth::Util::Controls::VBox() );
     _controlContainer->setBackColor( osgEarth::Util::Controls::Color(osgEarth::Util::Controls::Color::Black, 0.8) );
@@ -174,7 +174,7 @@
 
   if (_earthNode.valid())
   {
-    _mapNode = osgEarth::MapNode::findMapNode( _earthNode );
+    _mapNode = osgEarth::MapNode::findMapNode( _earthNode.get() );
     if (_mapNode.valid())
     {        
       _map = _mapNode->getMap();
@@ -269,7 +269,8 @@
 
     if (!_bboxNode.valid())
     {
-      _bboxNode = new osgEarth::Annotation::FeatureNode(_mapNode, feature);
+      _bboxNode = new osgEarth::Annotation::FeatureNode(feature);
+      _bboxNode->setMapNode( _mapNode.get() );
       _bboxNode->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
       _annoRoot->addChild( _bboxNode.get() );
     }
@@ -278,4 +279,4 @@
       _bboxNode->setFeature(feature);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_package_qt/TMSExporter.h osgearth-2.10.2+dfsg/src/applications/osgearth_package_qt/TMSExporter.h
--- osgearth-2.9.0+dfsg/src/applications/osgearth_package_qt/TMSExporter.h	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_package_qt/TMSExporter.h	2019-07-11 18:30:19.000000000 +0000
@@ -51,7 +51,7 @@
     bool getKeepEmpties() { return _keepEmpties; }
     void setKeepEmpties(bool keep) { _keepEmpties = keep; }
   
-    ExportProgressCallback* getProgressCallback() const { return _progress; }
+    ExportProgressCallback* getProgressCallback() const { return _progress.get(); }
     void setProgressCallback(ExportProgressCallback* progress) { _progress = progress; }
 
     unsigned int getConcurrency() const;
@@ -95,7 +95,7 @@
     {
       if (_exporter)
       {
-        _exporter->exportTMS(_mapNode, _earthFilePath, _path, _bounds, _outEarth, _overwrite, _extension);        
+        _exporter->exportTMS(_mapNode.get(), _earthFilePath, _path, _bounds, _outEarth, _overwrite, _extension);        
       }
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_pick/osgearth_pick.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_pick/osgearth_pick.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_pick/osgearth_pick.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_pick/osgearth_pick.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 #include <osgEarth/Registry>
 #include <osgEarth/ShaderGenerator>
 #include <osgEarth/ObjectIndex>
+#include <osgEarth/GLUtils>
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/ExampleResources>
 #include <osgEarthUtil/Controls>
@@ -196,7 +197,7 @@
     rttTex->setUnRefImageDataAfterApply( false );
     rttTex->setResizeNonPowerOfTwoHint(false);
 
-    stateSet->setMode(GL_LIGHTING, 0);
+    GLUtils::setLighting(stateSet, 0);
     stateSet->setMode(GL_CULL_FACE, 0);
     stateSet->setAttributeAndModes(new osg::BlendFunc(GL_ONE, GL_ZERO), 1);
     
@@ -307,7 +308,7 @@
     app.nameLabel = uiContainer->addControl( new ui::LabelControl( "---" ) );
 
     // Load up the earth file.
-    osg::Node* node = MapNodeHelper().load( arguments, app.mainView, uiContainer );
+    osg::Node* node = MapNodeHelper().load( arguments, &app.viewer, uiContainer );
     if ( node )
     {
         app.mainView->setSceneData( node );
@@ -317,7 +318,7 @@
         // start with a picker running
         startPicker(app);
 
-        // Hightlight features as we pick'em.
+        // Highlight features as we pick'em.
         installHighlighter(app);
 
         app.mainView->getCamera()->setName( "Main view" );
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_scenegraphcallbacks/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_scenegraphcallbacks/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_scenegraphcallbacks/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_scenegraphcallbacks/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,7 @@
+INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+
+SET(TARGET_SRC osgearth_scenegraphcallbacks.cpp )
+
+#### end var setup  ###
+SETUP_APPLICATION(osgearth_scenegraphcallbacks)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_scenegraphcallbacks/osgearth_scenegraphcallbacks.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_scenegraphcallbacks/osgearth_scenegraphcallbacks.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_scenegraphcallbacks/osgearth_scenegraphcallbacks.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_scenegraphcallbacks/osgearth_scenegraphcallbacks.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,100 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include <osgViewer/Viewer>
+#include <osgEarth/Notify>
+#include <osgEarthUtil/EarthManipulator>
+#include <osgEarthUtil/ExampleResources>
+#include <osgEarth/MapNode>
+#include <osgEarth/SceneGraphCallback>
+
+#define LC "[scenegraphcallbacks] "
+
+using namespace osgEarth;
+using namespace osgEarth::Util;
+
+int
+usage(const char* name)
+{
+    OE_NOTICE 
+        << "\nUsage: " << name << " file.earth" << std::endl
+        << MapNodeHelper().usage() << std::endl;
+
+    return 0;
+}
+
+class MyCallback : public SceneGraphCallback
+{
+public:
+    void onPreMergeNode(osg::Node* node, osg::Object* sender)
+    {
+        Layer* layer = static_cast<Layer*>(sender);
+        OE_NOTICE << "Layer " << layer->getName() << " pre-merge node " << node->getName() << std::endl;
+    }
+
+    void onPostMergeNode(osg::Node* node, osg::Object* sender)
+    {
+        Layer* layer = static_cast<Layer*>(sender);
+        OE_NOTICE << "Layer " << layer->getName() << " post-merge node " << node->getName() << std::endl;
+    }
+
+    void onRemoveNode(osg::Node* node, osg::Object* sender)
+    {
+        Layer* layer = static_cast<Layer*>(sender);
+        OE_NOTICE << "Layer " << layer->getName() << " remove node " << node->getName() << std::endl;
+    }
+};
+
+int
+main(int argc, char** argv)
+{
+    osg::ArgumentParser arguments(&argc,argv);
+    osgViewer::Viewer viewer(arguments);
+    viewer.setCameraManipulator( new EarthManipulator(arguments) );
+
+    osg::Node* node = MapNodeHelper().load(arguments, &viewer);
+    if ( node )
+    {
+        MapNode* mapNode = MapNode::get(node);
+        if (!mapNode)
+            return -1;
+
+        MyCallback* myCallback = new MyCallback();
+
+        // Install a callback on each loaded layer.
+        LayerVector layers;
+        mapNode->getMap()->getLayers(layers);
+        for (LayerVector::iterator layer = layers.begin(); layer != layers.end(); ++layer)
+        {
+            layer->get()->getSceneGraphCallbacks()->add( myCallback );
+        }
+
+        viewer.setSceneData( node );
+        return viewer.run();
+    }
+    else
+    {
+        return usage(argv[0]);
+    }
+
+    return 0;
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_seed/osgearth_seed.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_seed/osgearth_seed.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_seed/osgearth_seed.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_seed/osgearth_seed.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -89,7 +89,7 @@
         << "    --seed file.earth                   ; Seeds the cache in a .earth file"  << std::endl
         << "        [--estimate]                    ; Print out an estimation of the number of tiles, disk space and time it will take to perform this seed operation" << std::endl
         << "        [--min-level level]             ; Lowest LOD level to seed (default=0)" << std::endl
-        << "        [--max-level level]             ; Highest LOD level to seed (defaut=highest available)" << std::endl
+        << "        [--max-level level]             ; Highest LOD level to seed (default=highest available)" << std::endl
         << "        [--bounds xmin ymin xmax ymax]* ; Geospatial bounding box to seed (in map coordinates; default=entire map)" << std::endl
         << "        [--index shapefile]             ; Use the feature extents in a shapefile to set the bounding boxes for seeding" << std::endl
         << "        [--mp]                          ; Use multiprocessing to process the tiles.  Useful for GDAL sources as this avoids the global GDAL lock" << std::endl
@@ -182,7 +182,7 @@
 
         if (status.isOK())
         {
-            osg::ref_ptr< FeatureCursor > cursor = features->createFeatureCursor();
+            osg::ref_ptr< FeatureCursor > cursor = features->createFeatureCursor(0L);
             while (cursor.valid() && cursor->hasMore())
             {
                 osg::ref_ptr< Feature > feature = cursor->nextFeature();
@@ -198,7 +198,7 @@
         }
     }
 
-    // If they requested to do an estimate then don't do the the seed, just print out the estimated values.
+    // If they requested to do an estimate then don't do the seed, just print out the estimated values.
     if (estimate)
     {        
         CacheEstimator est;
@@ -406,8 +406,8 @@
     MapNode* mapNode = MapNode::findMapNode( node.get() );
     if ( !mapNode )
         return usage( "Input file was not a .earth file" );
-
-    Map* map = mapNode->getMap();
+    
+    const Map* map = mapNode->getMap();
     const Cache* cache = map->getCache();
 
     if ( !cache )
@@ -417,12 +417,9 @@
         << "Cache config: " << std::endl
         << cache->getCacheOptions().getConfig().toJSON(true) << std::endl;
 
-    MapFrame mapf( mapNode->getMap() );
 
     TerrainLayerVector layers;
-    mapf.getLayers(layers);
-    //std::copy( mapf.imageLayers().begin(), mapf.imageLayers().end(), std::back_inserter(layers) );
-    //std::copy( mapf.elevationLayers().begin(), mapf.elevationLayers().end(), std::back_inserter(layers) );
+    map->getLayers(layers);
 
     for( TerrainLayerVector::iterator i =layers.begin(); i != layers.end(); ++i )
     {
@@ -573,7 +570,7 @@
                 if ( input == "y" || input == "Y" )
                 {
                     std::cout << "Purging.." << std::flush;
-                    entries[k-1]._bin->purge();
+                    entries[k-1]._bin->clear();
                 }
                 else
                 {
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_sequencecontrol/osgearth_sequencecontrol.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_sequencecontrol/osgearth_sequencecontrol.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_sequencecontrol/osgearth_sequencecontrol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_sequencecontrol/osgearth_sequencecontrol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_shadercomp/osgearth_shadercomp.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_shadercomp/osgearth_shadercomp.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_shadercomp/osgearth_shadercomp.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_shadercomp/osgearth_shadercomp.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -41,6 +41,7 @@
 #include <osgEarth/Capabilities>
 #include <osgEarth/ShaderUtils>
 #include <osgEarth/FileUtils>
+#include <osgEarth/GLUtils>
 #include <osgEarthUtil/Controls>
 
 using namespace osgEarth;
@@ -79,10 +80,9 @@
     geom->setVertexArray( verts );
     geom->setUseDisplayList(false);
     geom->setUseVertexBufferObjects(true);
-    osg::Vec4Array* colors = new osg::Vec4Array();
+    osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_OVERALL);
     colors->push_back( osg::Vec4(0,0,1,1) );
     geom->setColorArray(colors);
-    geom->setColorBinding(osg::Geometry::BIND_OVERALL);
     geom->addPrimitiveSet(new osg::DrawArrays(GL_TRIANGLES,0,3));
     geode->addDrawable(geom);
     return geode;
@@ -296,7 +296,7 @@
 
         osg::Group* root = new osg::Group();
         root->getOrCreateStateSet()->setRenderBinDetails( 0, "TraversalOrderBin" );
-        root->getOrCreateStateSet()->setMode(GL_LIGHTING,0);
+        GLUtils::setLighting(root->getOrCreateStateSet(), 0);
 
         root->addChild( n1 );
         root->addChild( n2 );
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_shadergen/osgearth_shadergen.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_shadergen/osgearth_shadergen.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_shadergen/osgearth_shadergen.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_shadergen/osgearth_shadergen.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_silverlining/osgearth_silverlining.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_silverlining/osgearth_silverlining.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_silverlining/osgearth_silverlining.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_silverlining/osgearth_silverlining.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_skyview/osgearth_skyview.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_skyview/osgearth_skyview.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_skyview/osgearth_skyview.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_skyview/osgearth_skyview.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_splat/osgearth_splat.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_splat/osgearth_splat.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_splat/osgearth_splat.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_splat/osgearth_splat.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -164,11 +164,11 @@
         return failed("Loading tree image");
 
     BillboardSymbol* treeSymbol = new BillboardSymbol();
-    treeSymbol->setImage(tree.get());
+    treeSymbol->setSideImage(tree.get());
     treeSymbol->width() = 12.0f;
     treeSymbol->height() = 16.0f;
 
-    // Add this symbol to a "frest" biome.
+    // Add this symbol to a "forest" biome.
     GroundCoverBiomeOptions forestBiome;
     forestBiome.biomeClasses() = "forest";
     forestBiome.symbols().push_back(treeSymbol);
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_srstest/osgearth_srstest.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_srstest/osgearth_srstest.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_srstest/osgearth_srstest.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_srstest/osgearth_srstest.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 */
 #include <osgEarth/SpatialReference>
 #include <osgEarth/StringUtils>
+#include <osgEarth/Profile>
 #include <iostream>
 
 bool eq(const double& a, const double& b, double e =1e-6) {
@@ -65,6 +66,29 @@
             }
         }
     }
+
+    // Plate Carre EQC Test.
+    {
+        test = "Plate Carre EQC Test";
+        const SpatialReference* wgs84 = SpatialReference::get("wgs84");
+        const SpatialReference* pceqc = SpatialReference::get("plate-carre");
+        osg::Vec3d input[4] = {
+            osg::Vec3d(-180, -90, 0),
+            osg::Vec3d(-180, +90, 0),
+            osg::Vec3d( 180, -90, 0),
+            osg::Vec3d( 180, +90, 0)
+        };
+        osg::Vec3d output;
+        for (int i = 0; i<4; ++i) {
+            osg::Vec3d output;
+            if (!wgs84->transform(input[i], pceqc, output)) {
+                std::cout << test << ": transform failed for test #" << i << std::endl;
+            }
+            else  {
+                std::cout << "result = " << std::setprecision(24) << output.x() << ", " << output.y() << std::endl;
+            }
+        }
+    }
 
     return 0;
 }
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_terrainprofile/osgearth_terrainprofile.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_terrainprofile/osgearth_terrainprofile.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_terrainprofile/osgearth_terrainprofile.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_terrainprofile/osgearth_terrainprofile.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -33,6 +33,7 @@
 #include <osgEarth/GeoMath>
 #include <osgEarth/Registry>
 #include <osgEarth/FileUtils>
+#include <osgEarth/GLUtils>
 #include <osgEarthFeatures/Feature>
 #include <osgEarthAnnotation/FeatureNode>
 #include <osgText/Text>
@@ -56,9 +57,10 @@
     hud->setClearMask(GL_DEPTH_BUFFER_BIT);
     hud->setRenderOrder(osg::Camera::POST_RENDER);    
     hud->setAllowEventFocus(false);
-    hud->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
-    hud->getOrCreateStateSet()->setMode( GL_DEPTH_TEST, osg::StateAttribute::OFF);
-    hud->getOrCreateStateSet()->setMode( GL_BLEND, osg::StateAttribute::ON);
+    osg::StateSet* hudSS = hud->getOrCreateStateSet();
+    GLUtils::setLighting(hudSS, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
+    hudSS->setMode( GL_DEPTH_TEST, osg::StateAttribute::OFF);
+    hudSS->setMode( GL_BLEND, osg::StateAttribute::ON);
 
     return hud;
 }
@@ -154,10 +156,9 @@
         if ( verts->getVertexBufferObject() )
             verts->getVertexBufferObject()->setUsage(GL_STATIC_DRAW_ARB);
 
-        osg::Vec4Array* colors = new osg::Vec4Array();
+        osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_OVERALL);
         colors->push_back( _color );
         geom->setColorArray( colors );
-        geom->setColorBinding( osg::Geometry::BIND_OVERALL );
 
         double minElevation, maxElevation;
         _profile.getElevationRanges( minElevation, maxElevation );
@@ -217,10 +218,9 @@
         if ( verts->getVertexBufferObject() )
             verts->getVertexBufferObject()->setUsage(GL_STATIC_DRAW_ARB);
 
-        osg::Vec4Array* colors = new osg::Vec4Array();
+        osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_OVERALL);
         colors->push_back( backgroundColor );
         geometry->setColorArray( colors );
-        geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
 
         geometry->addPrimitiveSet( new osg::DrawArrays( GL_QUADS, 0, 4 ) );
 
@@ -312,17 +312,19 @@
           Style style;
           LineSymbol* ls = style.getOrCreateSymbol<LineSymbol>();
           ls->stroke()->color() = Color::Yellow;
-          ls->stroke()->width() = 2.0f;
-          ls->tessellation() = 20;
+          ls->stroke()->width() = 3.0f;
+          ls->tessellationSize()->set(100.0, Units::KILOMETERS);
 
-          style.getOrCreate<AltitudeSymbol>()->clamping() = AltitudeSymbol::CLAMP_TO_TERRAIN;
-          style.getOrCreate<AltitudeSymbol>()->technique() = AltitudeSymbol::TECHNIQUE_SCENE;
+          AltitudeSymbol* alt = style.getOrCreate<AltitudeSymbol>();
+          alt->clamping() = alt->CLAMP_TO_TERRAIN;
+          alt->technique() = alt->TECHNIQUE_DRAPE;
 
-          feature->style() = style;
+          RenderSymbol* render = style.getOrCreate<RenderSymbol>();
+          render->lighting() = false;
 
-          _featureNode = new FeatureNode( _mapNode, feature );
-          //Disable lighting
-          _featureNode->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+          feature->style() = style;
+          _featureNode = new FeatureNode( feature );
+          _featureNode->setMapNode(_mapNode);
           _root->addChild( _featureNode.get() );
 
       }
@@ -391,7 +393,7 @@
 
     viewer.getCamera()->addCullCallback( new AutoClipPlaneCullCallback(mapNode));
 
-    viewer.addEventHandler( new DrawProfileEventHandler( mapNode, root, calculator.get() ) );
+    viewer.addEventHandler( new DrawProfileEventHandler( mapNode, mapNode, calculator.get() ) );
 
     viewer.setSceneData( root );    
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_tfs/osgearth_tfs.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_tfs/osgearth_tfs.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_tfs/osgearth_tfs.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_tfs/osgearth_tfs.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_tileindex/osgearth_tileindex.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_tileindex/osgearth_tileindex.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_tileindex/osgearth_tileindex.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_tileindex/osgearth_tileindex.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_tilesource/osgearth_tilesource.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_tilesource/osgearth_tilesource.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_tilesource/osgearth_tilesource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_tilesource/osgearth_tilesource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_toc/osgearth_toc.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_toc/osgearth_toc.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_toc/osgearth_toc.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_toc/osgearth_toc.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,14 +20,16 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/Map>
-#include <osgEarth/MapFrame>
 #include <osgEarth/MapNode>
 #include <osgEarth/MapModelChange>
 #include <osgEarth/ElevationPool>
+#include <osgEarth/XmlUtils>
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/Controls>
 #include <osgEarthUtil/ExampleResources>
 #include <osgEarthUtil/ViewFitter>
+#include <osgEarthAnnotation/LabelNode>
+#include <osgEarthAnnotation/AnnotationLayer>
 #include <osgViewer/Viewer>
 #include <osgViewer/ViewerEventHandlers>
 #include <osgGA/StateSetManipulator>
@@ -36,12 +38,12 @@
 using namespace osgEarth;
 using namespace osgEarth::Util;
 using namespace osgEarth::Util::Controls;
+using namespace osgEarth::Annotation;
 
-void createControlPanel( osgViewer::View* );
+void createControlPanel(Container*);
 void updateControlPanel();
 
 static osg::ref_ptr<Map> s_activeMap;
-static Grid* s_masterGrid;
 static Grid* s_activeBox;
 static Grid* s_inactiveBox;
 static bool s_updateRequired = true;
@@ -127,6 +129,48 @@
     MapNode* _mapNode;
 };
 
+struct DumpLabel : public osgGA::GUIEventHandler
+{
+    DumpLabel(MapNode* mapNode, char c) : _mapNode(mapNode), _c(c), _layer(0L) { }
+
+    bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa, osg::Object*, osg::NodeVisitor*)
+    {
+        if (ea.getEventType() == ea.KEYDOWN && ea.getKey() == _c)
+        {
+            osg::Vec3d world;
+            _mapNode->getTerrain()->getWorldCoordsUnderMouse(aa.asView(), ea.getX(), ea.getY(), world);
+
+            GeoPoint coords;
+            coords.fromWorld(s_activeMap->getSRS(), world);
+
+            if (!_layer)
+            {
+                _layer = new AnnotationLayer();
+                _layer->setName("User-created Labels");
+                _mapNode->getMap()->addLayer(_layer);
+            }
+
+            LabelNode* label = new LabelNode();
+            label->setText("Label");
+            label->setPosition(coords);
+
+            Style style;
+            TextSymbol* symbol = style.getOrCreate<TextSymbol>();
+            symbol->alignment() = symbol->ALIGN_CENTER_CENTER;
+            label->setStyle(style);
+
+            _layer->addChild(label);
+
+            osg::ref_ptr<XmlDocument> xml = new XmlDocument(label->getConfig());
+            xml->store(std::cout);
+        }
+        return false;
+    }
+    char _c;
+    MapNode* _mapNode;
+    AnnotationLayer* _layer;
+};
+
 //------------------------------------------------------------------------
 
 int
@@ -145,7 +189,11 @@
     viewer.getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
 
     // Load an earth file 
-    osg::Node* loaded = osgEarth::Util::MapNodeHelper().load(arguments, &viewer);
+    Container* uiRoot = new VBox();
+    uiRoot->setAbsorbEvents(false);
+    createControlPanel(uiRoot);
+
+    osg::Node* loaded = osgEarth::Util::MapNodeHelper().load(arguments, &viewer, uiRoot);
     osgEarth::MapNode* mapNode = osgEarth::MapNode::get(loaded);
     if ( !mapNode ) {
         OE_WARN << "No osgEarth MapNode found in the loaded file(s)." << std::endl;
@@ -156,27 +204,37 @@
     s_activeMap = mapNode->getMap();
     s_activeMap->addMapCallback( new MyMapListener() );
 
-    osg::Group* root = new osg::Group();
-
-    // install the control panel
-    createControlPanel( &viewer );
-    root->addChild( loaded );
+    //osg::Group* root = new osg::Group();
+    //root->addChild( loaded );
 
     // update the control panel with the two Maps:
     updateControlPanel();
 
-    viewer.setSceneData( root );
+    viewer.setSceneData( loaded );
 
     // install our control panel updater
     viewer.addUpdateOperation( new UpdateOperation() );
 
     viewer.addEventHandler(new DumpElevation(mapNode, 'E'));
 
+    viewer.addEventHandler(new DumpLabel(mapNode, 'L'));
+
     viewer.run();
 }
 
 //------------------------------------------------------------------------
 
+struct EnableDisableHandler : public ControlEventHandler
+{
+    EnableDisableHandler( Layer* layer ) : _layer(layer) { }
+    void onClick( Control* control )
+    {
+        _layer->setEnabled( !_layer->getEnabled() );
+        updateControlPanel();
+    }
+    Layer* _layer;
+};
+
 struct ToggleLayerVisibility : public ControlEventHandler
 {
     ToggleLayerVisibility( VisibleLayer* layer ) : _layer(layer) { }
@@ -245,16 +303,43 @@
         const GeoExtent& extent = _layer->getExtent();
         if (extent.isValid())
         {
-            ViewFitter fitter(s_activeMap->getSRS(), s_view->getCamera());
             std::vector<GeoPoint> points;
             points.push_back(GeoPoint(extent.getSRS(), extent.west(), extent.south()));
             points.push_back(GeoPoint(extent.getSRS(), extent.east(), extent.north()));
+            
+            ViewFitter fitter(s_activeMap->getSRS(), s_view->getCamera());
             Viewpoint vp;
             if (fitter.createViewpoint(points, vp))
             {
                 s_manip->setViewpoint(vp, 2.0);
             }
         }
+        else if (_layer->getNode())
+        {
+            const osg::BoundingSphere& bs = _layer->getNode()->getBound();
+            if (bs.valid())
+            {
+                osg::Vec3d c = bs.center();
+                double r = bs.radius();
+                const SpatialReference* mapSRS = s_activeMap->getSRS();
+
+                std::vector<GeoPoint> points;
+                GeoPoint p;
+                p.fromWorld(mapSRS, osg::Vec3d(c.x()+r, c.y(), c.z())); points.push_back(p);
+                p.fromWorld(mapSRS, osg::Vec3d(c.x()-r, c.y(), c.z())); points.push_back(p);
+                p.fromWorld(mapSRS, osg::Vec3d(c.x(), c.y()+r, c.z())); points.push_back(p);
+                p.fromWorld(mapSRS, osg::Vec3d(c.x(), c.y()-r, c.z())); points.push_back(p);
+                p.fromWorld(mapSRS, osg::Vec3d(c.x(), c.y(), c.z()+r)); points.push_back(p);
+                p.fromWorld(mapSRS, osg::Vec3d(c.x(), c.y(), c.z()-r)); points.push_back(p);
+
+                ViewFitter fitter(s_activeMap->getSRS(), s_view->getCamera());
+                Viewpoint vp;
+                if (fitter.createViewpoint(points, vp))
+                {
+                    s_manip->setViewpoint(vp, 2.0);
+                }
+            }
+        }
     }
     Layer* _layer;
 };
@@ -263,41 +348,25 @@
 
 
 void
-createControlPanel( osgViewer::View* view )
+createControlPanel(Container* container)
 {
-    ControlCanvas* canvas = ControlCanvas::getOrCreate( view );
-
-    s_masterGrid = new Grid();
-    s_masterGrid->setMargin( 5 );
-    s_masterGrid->setPadding( 5 );
-    s_masterGrid->setChildSpacing( 10 );
-    s_masterGrid->setChildVertAlign( Control::ALIGN_CENTER );
-    s_masterGrid->setAbsorbEvents( true );
-    s_masterGrid->setVertAlign( Control::ALIGN_TOP );
-
     //The Map layers
     s_activeBox = new Grid();
-    s_activeBox->setBackColor(0,0,0,0.5);
-    s_activeBox->setMargin( 10 );
+    s_activeBox->setBackColor(0,0,0,0.1);
     s_activeBox->setPadding( 10 );
     s_activeBox->setChildSpacing( 10 );
     s_activeBox->setChildVertAlign( Control::ALIGN_CENTER );
     s_activeBox->setAbsorbEvents( true );
-    s_activeBox->setVertAlign( Control::ALIGN_TOP );
-    s_masterGrid->setControl( 0, 0, s_activeBox );
+    container->addControl(s_activeBox);
 
     //the removed layers
     s_inactiveBox = new Grid();
-    s_inactiveBox->setBackColor(0,0,0,0.5);
-    s_inactiveBox->setMargin( 10 );
+    s_inactiveBox->setBackColor(0,0,0,0.1);
     s_inactiveBox->setPadding( 10 );
     s_inactiveBox->setChildSpacing( 10 );
     s_inactiveBox->setChildVertAlign( Control::ALIGN_CENTER );
     s_inactiveBox->setAbsorbEvents( true );
-    s_inactiveBox->setVertAlign( Control::ALIGN_TOP );
-    s_masterGrid->setControl( 0, 1, s_inactiveBox );
-
-    canvas->addControl( s_masterGrid );
+    container->addControl(s_inactiveBox);
 }
 
 void
@@ -320,20 +389,32 @@
     
     ElevationLayer* elevationLayer = dynamic_cast<ElevationLayer*>(layer);
 
-    // a checkbox to enable/disable the layer:
+    // a checkbox to toggle the layer's visibility:
     if (visibleLayer && layer->getEnabled() && !(imageLayer && imageLayer->isCoverage()))
     {
-        CheckBoxControl* enabled = new CheckBoxControl( visibleLayer->getVisible() );
-        enabled->addEventHandler( new ToggleLayerVisibility(visibleLayer) );
-        grid->setControl( gridCol, gridRow, enabled );
+        CheckBoxControl* visibility = new CheckBoxControl( visibleLayer->getVisible() );
+        visibility->addEventHandler( new ToggleLayerVisibility(visibleLayer) );
+        grid->setControl( gridCol, gridRow, visibility );
     }
     gridCol++;
 
     // the layer name
-    LabelControl* name = new LabelControl( layer->getName() );
-    if (!layer->getEnabled())
-        name->setForeColor(osg::Vec4f(1,1,1,0.35));
-    grid->setControl( gridCol, gridRow, name );
+    if (layer->getEnabled() && (layer->getExtent().isValid() || layer->getNode()))
+    {
+        ButtonControl* name = new ButtonControl(layer->getName());
+        name->clearBackColor();
+        name->setPadding(4);
+        name->addEventHandler( new ZoomLayerHandler(layer) );
+        grid->setControl( gridCol, gridRow, name );
+    }
+    else
+    {
+        LabelControl* name = new LabelControl( layer->getName() );
+        name->setPadding(4);
+        if (!layer->getEnabled())
+            name->setForeColor(osg::Vec4f(1,1,1,0.35));
+        grid->setControl( gridCol, gridRow, name );
+    }
     gridCol++;
 
     // layer type
@@ -362,17 +443,6 @@
     }
     gridCol++;
 
-    // zoom button
-    if (layer->getExtent().isValid())
-    {
-        LabelControl* zoomButton = new LabelControl("GO", 14);
-        zoomButton->setBackColor( .4,.4,.4,1 );
-        zoomButton->setActiveColor( .8,0,0,1 );
-        zoomButton->addEventHandler( new ZoomLayerHandler(layer) );
-        grid->setControl( gridCol, gridRow, zoomButton );
-    }
-    gridCol++;
-
     // move buttons
     if ( layerIndex < numLayers-1 && isActive )
     {
@@ -400,10 +470,18 @@
     addRemove->setBackColor( .4,.4,.4,1 );
     addRemove->setActiveColor( .8,0,0,1 );
     addRemove->addEventHandler( new RemoveLayerHandler(layer) );
-
     grid->setControl( gridCol, gridRow, addRemove );
     gridCol++;
 
+    // enable/disable button
+    LabelControl* enableDisable = new LabelControl(layer->getEnabled() ? "DISABLE" : "ENABLE", 14);
+    enableDisable->setHorizAlign( Control::ALIGN_CENTER );
+    enableDisable->setBackColor( .4,.4,.4,1 );
+    enableDisable->setActiveColor( .8,0,0,1 );
+    enableDisable->addEventHandler( new EnableDisableHandler(layer) );
+    grid->setControl( gridCol, gridRow, enableDisable );
+    gridCol++;
+
     if (layer->getStatus().isError())
     {
         grid->setControl(gridCol, gridRow, new LabelControl(layer->getStatus().message(), osg::Vec4(1,.2,.2,1)));
@@ -438,13 +516,14 @@
 
     int row = 0;
 
-    LabelControl* activeLabel = new LabelControl( "Map Layers", 20, osg::Vec4f(1,1,0,1) );
+    LabelControl* activeLabel = new LabelControl( "Map Layers" );
+    activeLabel->setForeColor(osg::Vec4f(1,1,0,1));
     s_activeBox->setControl( 1, row++, activeLabel );
 
     // the active map layers:
-    MapFrame mapf( s_activeMap.get() );
+    LayerVector layers;
+    s_activeMap->getLayers(layers);
 
-    const LayerVector& layers = mapf.layers();
     for (int i = layers.size()-1; i >= 0; --i)
     {
         Layer* layer = layers[i].get();
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_tracks/osgearth_tracks.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_tracks/osgearth_tracks.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_tracks/osgearth_tracks.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_tracks/osgearth_tracks.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -31,10 +31,7 @@
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/MGRSFormatter>
 #include <osgEarthUtil/Controls>
-#include <osgEarthUtil/AnnotationEvents>
-#include <osgEarthUtil/HTM>
 #include <osgEarthAnnotation/TrackNode>
-#include <osgEarthAnnotation/AnnotationData>
 #include <osgEarthSymbology/Color>
 
 #include <osgViewer/Viewer>
@@ -53,7 +50,7 @@
  * Demonstrates use of the TrackNode to display entity track symbols.
  */
 
-// field names for the track labels
+// field names for the track labelsL
 #define FIELD_NAME     "name"
 #define FIELD_POSITION "position"
 #define FIELD_NUMBER   "number"
@@ -85,23 +82,14 @@
 struct TrackSim : public osg::Referenced
 {
     TrackNode* _track;
-    Angular _startLat, _startLon, _endLat, _endLon;
+    GeoPoint _start, _end;
 
     void update( double t )
     {
         osg::Vec3d pos;
-        GeoMath::interpolate(
-            _startLat.as(Units::RADIANS), _startLon.as(Units::RADIANS),
-            _endLat.as(Units::RADIANS), _endLon.as(Units::RADIANS),
-            t,
-            pos.y(), pos.x() );
-
-        GeoPoint geo(
-            _track->getMapNode()->getMapSRS(),
-            osg::RadiansToDegrees(pos.x()),
-            osg::RadiansToDegrees(pos.y()),
-            10000.0,
-            ALTMODE_ABSOLUTE);
+
+        GeoPoint geo = _start.interpolate(_end, t);
+        geo.alt() = 10000.0;
 
         // update the position label.
         _track->setPosition(geo);
@@ -140,9 +128,11 @@
 void
 createFieldSchema( TrackNodeFieldSchema& schema )
 {
+    const float R = 2.0f;
+
     // draw the track name above the icon:
     TextSymbol* nameSymbol = new TextSymbol();
-    nameSymbol->pixelOffset()->set( 0, 2+ICON_SIZE/2 );
+    nameSymbol->pixelOffset()->set( 0, R+ICON_SIZE/2 );
     nameSymbol->alignment() = TextSymbol::ALIGN_CENTER_BOTTOM;
     nameSymbol->halo()->color() = Color::Black;
     nameSymbol->size() = nameSymbol->size()->eval() + 2.0f;
@@ -150,7 +140,7 @@
 
     // draw the track coordinates below the icon:
     TextSymbol* posSymbol = new TextSymbol();
-    posSymbol->pixelOffset()->set( 0, -2-ICON_SIZE/2 );
+    posSymbol->pixelOffset()->set( 0, -R-ICON_SIZE/2 );
     posSymbol->alignment() = TextSymbol::ALIGN_CENTER_TOP;
     posSymbol->fill()->color() = Color::Yellow;
     posSymbol->size() = posSymbol->size()->eval() - 2.0f;
@@ -158,7 +148,7 @@
 
     // draw some other field to the left:
     TextSymbol* numberSymbol = new TextSymbol();
-    numberSymbol->pixelOffset()->set( -2-ICON_SIZE/2, 0 );
+    numberSymbol->pixelOffset()->set( -R-ICON_SIZE/2, 0 );
     numberSymbol->alignment() = TextSymbol::ALIGN_RIGHT_CENTER;
     schema[FIELD_NUMBER] = TrackNodeField(numberSymbol, false);
 }
@@ -166,7 +156,7 @@
 
 /** Builds a bunch of tracks. */
 void
-createTrackNodes( MapNode* mapNode, osg::Group* parent, const TrackNodeFieldSchema& schema, TrackSims& sims )
+createTrackNodes(const SpatialReference* mapSRS, osg::Group* parent, const TrackNodeFieldSchema& schema, TrackSims& sims )
 {
     // load an icon to use:
     osg::ref_ptr<osg::Image> srcImage = osgDB::readRefImageFile( ICON_URL );
@@ -175,7 +165,7 @@
 
     // make some tracks, choosing a random simulation for each.
     Random prng;
-    const SpatialReference* geoSRS = mapNode->getMapSRS()->getGeographicSRS();
+    const SpatialReference* geoSRS = mapSRS->getGeographicSRS();
 
     for( unsigned i=0; i<g_numTracks; ++i )
     {
@@ -184,7 +174,7 @@
 
         GeoPoint pos(geoSRS, lon0, lat0);
 
-        TrackNode* track = new TrackNode(mapNode, pos, image.get(), schema);
+        TrackNode* track = new TrackNode(pos, image.get(), schema);
 
         track->setFieldValue( FIELD_NAME,     Stringify() << "Track:" << i );
         track->setFieldValue( FIELD_POSITION, Stringify() << s_format(pos) );
@@ -199,9 +189,9 @@
         double lon1 = -180.0 + prng.next() * 360.0;
         double lat1 = -80.0 + prng.next() * 160.0;
         TrackSim* sim = new TrackSim();
-        sim->_track = track;        
-        sim->_startLat = lat0; sim->_startLon = lon0;
-        sim->_endLat = lat1; sim->_endLon = lon1;
+        sim->_track = track;  
+        sim->_start.set(mapSRS, lon0, lat0, 0.0, ALTMODE_ABSOLUTE);
+        sim->_end.set(mapSRS, lon1, lat1, 0.0, ALTMODE_ABSOLUTE);
         sims.push_back( sim );
     }
 }
@@ -311,9 +301,7 @@
     // count on the cmd line?
     arguments.read("--count", g_numTracks);
     
-    osg::Group* root = new osg::Group();
-    root->addChild( earth );
-    viewer.setSceneData( root );
+    viewer.setSceneData( earth );
 
     // build a track field schema.
     TrackNodeFieldSchema schema;
@@ -322,8 +310,8 @@
     // create some track nodes.
     TrackSims trackSims;
     osg::Group* tracks = new osg::Group();
-    createTrackNodes( mapNode, tracks, schema, trackSims );
-    root->addChild( tracks );
+    createTrackNodes( mapNode->getMapSRS(), tracks, schema, trackSims );
+    mapNode->addChild( tracks );
 
     // Set up the automatic decluttering. setEnabled() activates decluttering for
     // all drawables under that state set. We are also activating priority-based
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_transform/osgearth_transform.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_transform/osgearth_transform.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_transform/osgearth_transform.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_transform/osgearth_transform.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -184,8 +184,6 @@
     ui::ControlCanvas::getOrCreate(&viewer)->addControl( makeUI(app) );
     app.apply();
 
-    em->setTetherNode( app.geo );
-
     osgEarth::Viewpoint vp;
     vp.setNode( app.geo );
     vp.heading()->set( -45.0, Units::DEGREES );
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_triton/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_triton/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_triton/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_triton/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -1,9 +1,31 @@
-INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS})
-SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+# Triton example
+# Later, if we want to link in the Triton library directly
+# to use the Triton API, uncomment the include and lib 
+# below.
 
-SET(TARGET_COMMON_LIBRARIES ${TARGET_COMMON_LIBRARIES} osgEarthUtil osgEarthTriton)
+INCLUDE_DIRECTORIES(
+    ${OSG_INCLUDE_DIRS}
+#    ${TRITON_INCLUDE_DIR}
+)
 
-SET(TARGET_SRC osgearth_triton.cpp )
+# 3rd party:
+SET(TARGET_LIBRARIES_VARS 
+    OSG_LIBRARY 
+    OSGDB_LIBRARY 
+    OSGUTIL_LIBRARY 
+    OSGVIEWER_LIBRARY 
+    OPENTHREADS_LIBRARY
+#    TRITON_LIBRARY
+)
+
+# osgEarth:
+SET(TARGET_COMMON_LIBRARIES 
+    ${TARGET_COMMON_LIBRARIES}
+    osgEarthUtil
+    osgEarthTriton
+)
+
+SET(TARGET_SRC osgearth_triton.cpp)
 
 #### end var setup  ###
 SETUP_APPLICATION(osgearth_triton)
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_triton/osgearth_triton.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_triton/osgearth_triton.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_triton/osgearth_triton.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_triton/osgearth_triton.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -19,24 +19,33 @@
 #include <osgViewer/Viewer>
 #include <osgDB/FileNameUtils>
 #include <osgEarth/NodeUtils>
+#include <osgEarth/LineDrawable>
+#include <osgEarth/Registry>
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/ExampleResources>
 #include <osgEarthUtil/Controls>
-#include <osgEarthTriton/TritonNode>
+#include <osgEarthTriton/TritonAPIWrapper>
+#include <osgEarthTriton/TritonCallback>
+#include <osgEarthTriton/TritonOptions>
+#include <osgEarthTriton/TritonLayer>
+#include <osgEarthAnnotation/AnnotationLayer>
+#include <osgEarthAnnotation/PlaceNode>
+#include <osgEarthAnnotation/GeoPositionNode>
 
 #define LC "[osgearth_triton] "
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
 using namespace osgEarth::Triton;
+using namespace osgEarth::Annotation;
 namespace ui = osgEarth::Util::Controls;
 
-
 struct Settings
 {
     optional<double> chop;
     optional<double> seaState;
     optional<float> alpha;
+    osg::observer_ptr<TritonLayer> tritonLayer;
     
     void apply(Environment& env, Ocean& ocean)
     {
@@ -52,10 +61,12 @@
             seaState.clear();
         }
 
-        //if (alpha.isSet())
-        //{
-        //    triton->setAlpha( alpha.get() );
-        //}
+        osg::ref_ptr<TritonLayer> layer;
+        if (alpha.isSet() && tritonLayer.lock(layer))
+        {
+            layer->setOpacity(alpha.value());
+            alpha.clear();
+        }
     }
 };
 
@@ -82,31 +93,33 @@
 {
     App()
     {
-        triton = NULL;
-        mapNode = NULL;        
-    }
+        tritonLayer = NULL;
+        map = NULL;
+        const double lon = -118.5406, lat = 32.7838;
+
+        anchor.set(
+            SpatialReference::get("wgs84"), lon, lat, 0.0,
+            ALTMODE_ABSOLUTE);
 
-    MapNode*    mapNode;
-    TritonNode* triton;
-    Settings    settings;
-
-    osg::Group* getAttachPoint()
-    {
-        return mapNode;
-        //SkyNode* sky = osgEarth::findTopMostNodeOfType<SkyNode>(mapNode);
-        //if (sky)
-        //    return sky;
-        //else
-        //    return mapNode;
+        isect = new Triton::TritonIntersections();
     }
 
+    Map*         map;
+    TritonLayer* tritonLayer;
+    Settings     settings;
+    osg::ref_ptr<Triton::TritonIntersections> isect;
+    AnnotationLayer* labels;
+    AnnotationLayer* normals;
+    LineDrawable* normalDrawable;
+    GeoPoint anchor;
+
     void addTriton()
     {
         // Create TritonNode from TritonOptions
         osgEarth::Triton::TritonOptions tritonOptions;
         tritonOptions.user()        = "my_user_name";
         tritonOptions.licenseCode() = "my_license_code";
-        tritonOptions.maxAltitude() = 10000;
+        tritonOptions.maxAltitude() = 100000;
         tritonOptions.useHeightMap() = true;
 
         const char* ev_t = ::getenv("TRITON_PATH");
@@ -129,16 +142,88 @@
         }
 
 
-        triton = new TritonNode(tritonOptions, new TritonCallback(settings));
-        triton->setMapNode(mapNode);
+        tritonLayer = new TritonLayer(tritonOptions, new TritonCallback(settings));
+        map->addLayer(tritonLayer);
+        settings.tritonLayer = tritonLayer;
 
-        getAttachPoint()->addChild(triton);
+        tritonLayer->addIntersections(isect.get());
     }
 
     void removeTriton()
     {
-        getAttachPoint()->removeChild(triton);
-        triton = 0L;
+        if (tritonLayer)
+            map->removeLayer(tritonLayer);
+        tritonLayer = 0L;
+    }
+
+    void addBuoyancyTest(osg::Node* model)
+    {
+        //labels = new AnnotationLayer();
+        //map->addLayer(labels);
+
+        normals = new AnnotationLayer();
+        map->addLayer(normals);
+
+        // geometry for a unit normal vector
+        normalDrawable = new LineDrawable(GL_LINES);
+        normalDrawable->setColor(osg::Vec4(1,1,0,1));
+        normalDrawable->pushVertex(osg::Vec3(0,0,0));
+        normalDrawable->pushVertex(osg::Vec3(0,0,10));
+        normalDrawable->pushVertex(osg::Vec3(-2,0,0.5));
+        normalDrawable->pushVertex(osg::Vec3(2,0,0.5));
+        normalDrawable->pushVertex(osg::Vec3(0,-2,0.5));
+        normalDrawable->pushVertex(osg::Vec3(0,2,0.5));
+        normalDrawable->finish();
+
+        // a single shared anchor point for the intersection set:
+        isect->setAnchor(anchor);
+
+        // generate a bunch of local points around the anchor:
+        for(int x=-50; x<=50; x+=25)
+        {
+            for(int y=-50; y<=50; y+=25)
+            {
+                isect->addLocalPoint(osg::Vec3d(x, y, 0));
+
+                // a label communicating the wave height:
+                //PlaceNode* label = new PlaceNode();
+                //label->setDynamic(true);
+                //label->setPosition(anchor);
+                //label->setIconImage(image);
+                //label->setText("-");
+                //labels->getGroup()->addChild(label);
+
+                // a normal vector and optional model:
+                GeoPositionNode* normal = new GeoPositionNode();
+                normal->setDynamic(true);
+                normal->getPositionAttitudeTransform()->addChild(normalDrawable);
+                if (model)
+                    normal->getPositionAttitudeTransform()->addChild(model);
+                normal->setPosition(anchor);
+                normals->getGroup()->addChild(normal);
+            }
+        }
+
+        //ScreenSpaceLayout::setDeclutteringEnabled(false);
+    }
+
+    void updateBuoyancyTest()
+    {
+        for(unsigned i=0; i<isect->getHeights().size(); ++i)
+        {
+            osg::Vec3d local = isect->getInput()[i];
+            local.z() = isect->getHeights()[i];
+
+            //PlaceNode* label = dynamic_cast<PlaceNode*>(labels->getGroup()->getChild(i));
+            //label->getPositionAttitudeTransform()->setPosition(local);
+            //label->setText(Stringify()<<std::setprecision(2)<<local.z());
+
+            GeoPositionNode* normalNode = dynamic_cast<GeoPositionNode*>(normals->getGroup()->getChild(i));
+            normalNode->getPositionAttitudeTransform()->setPosition(local);
+            osg::Quat q;
+            q.makeRotate(osg::Vec3d(0,0,1), isect->getNormals()[i]);
+            normalNode->getPositionAttitudeTransform()->setAttitude(q);
+        }
     }
 };
 
@@ -156,7 +241,7 @@
 struct Toggle : public ui::ControlEventHandler
 {
     void onValueChanged(ui::Control*, bool value) {
-        if (s_app.triton)
+        if (s_app.tritonLayer)
             s_app.removeTriton();
         else
             s_app.addTriton();
@@ -179,7 +264,7 @@
     grid->setControl(1, r, new HSliderControl(0, 1.0, 1.0, new Set<float>(s_app.settings.alpha)));
     ++r;
     grid->setControl(0, r, new LabelControl("Toggle"));
-    grid->setControl(1, r, new CheckBoxControl(false, new Toggle()));
+    grid->setControl(1, r, new CheckBoxControl(true, new Toggle()));
 
     grid->getControl(1, r-1)->setHorizFill(true,200);
 
@@ -206,6 +291,14 @@
     if ( arguments.read("--help") )
         return usage(argv[0]);
 
+    osg::Node* model = 0L;
+    std::string filename;
+    if (arguments.read("--model", filename))
+    {
+        model = osgDB::readRefNodeFile(filename).release();
+        Registry::shaderGenerator().run(model);
+    }
+
     // create a viewer:
     osgViewer::Viewer viewer(arguments);
 
@@ -213,7 +306,8 @@
     viewer.getDatabasePager()->setUnrefImageDataAfterApplyPolicy( false, false );
 
     // install our default manipulator (do this before calling load)
-    viewer.setCameraManipulator( new osgEarth::Util::EarthManipulator() );
+    EarthManipulator* manip = new EarthManipulator();
+    viewer.setCameraManipulator(manip);
 
     // load an earth file, and support all or our example command-line options
     // and earth file <external> tags    
@@ -225,10 +319,24 @@
 
         viewer.setSceneData( node );
 
-        s_app.mapNode = MapNode::get( node );
-        //s_app.addTriton();
+        s_app.map = MapNode::get( node )->getMap();
 
-        return viewer.run();
+        s_app.addTriton();
+        s_app.addBuoyancyTest(model);
+        
+        // Zoom the camera to our area of interest:
+        Viewpoint vp;
+        vp.heading() = 25.0f;
+        vp.pitch() = -25;
+        vp.range() = 400.0;
+        vp.focalPoint() = s_app.anchor;
+        manip->setViewpoint(vp);
+
+        while(!viewer.done())
+        {
+            viewer.frame();
+            s_app.updateBuoyancyTest();
+        }
     }
     else
     {
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_version/osgearth_version.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_version/osgearth_version.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_version/osgearth_version.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_version/osgearth_version.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_video/osgearth_video.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_video/osgearth_video.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_video/osgearth_video.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_video/osgearth_video.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -50,6 +50,9 @@
 {
     osg::ArgumentParser arguments(&argc,argv);
 
+    // initialize a viewer:
+    osgViewer::Viewer viewer(arguments);
+
     // create the empty map.
     Map* map = new Map();
 
@@ -79,9 +82,7 @@
 
     // make the map scene graph:
     MapNode* node = new MapNode( map );
-
-    // initialize a viewer:
-    osgViewer::Viewer viewer(arguments);
+    
     viewer.setCameraManipulator( new EarthManipulator );
     viewer.setSceneData( node );
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer/osgearth_viewer.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_viewer/osgearth_viewer.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer/osgearth_viewer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer/osgearth_viewer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -41,7 +41,6 @@
         << "\nUsage: " << name << " file.earth" << std::endl
         << MapNodeHelper().usage() << std::endl;
 
-    getchar();
     return 0;
 }
 
@@ -55,11 +54,6 @@
     if ( arguments.read("--help") )
         return usage(argv[0]);
 
-    float vfov = -1.0f;
-    arguments.read("--vfov", vfov);
-
-    
-
     // create a viewer:
     osgViewer::Viewer viewer(arguments);
 
@@ -80,13 +74,6 @@
     // closer to the ground without near clipping. If you need more, use --logdepth
     viewer.getCamera()->setNearFarRatio(0.0001);
 
-    if ( vfov > 0.0 )
-    {
-        double fov, ar, n, f;
-        viewer.getCamera()->getProjectionMatrixAsPerspective(fov, ar, n, f);
-        viewer.getCamera()->setProjectionMatrixAsPerspective(vfov, ar, n, f);
-    }
-
     // load an earth file, and support all or our example command-line options
     // and earth file <external> tags    
     osg::Node* node = MapNodeHelper().load(arguments, &viewer);
@@ -101,4 +88,4 @@
     }
 
     return 0;
-}
+}
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/AndroidManifest.xml osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/AndroidManifest.xml
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/AndroidManifest.xml	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="osg.AndroidExample"
+      android:installLocation="preferExternal"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <uses-sdk android:targetSdkVersion="24" android:minSdkVersion="18"></uses-sdk>
+    <uses-feature android:glEsVersion="0x00030000"/> <!-- OpenGL min requirements (2.0) -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+    <application android:label="@string/app_name" android:icon="@drawable/osg">
+        <activity android:name=".osgViewer"
+                  android:label="@string/app_name" android:screenOrientation="landscape"> <!--  Force screen to landscape -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/default.properties osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/default.properties
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/default.properties	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/default.properties	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-18
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/Android.mk osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/Android.mk
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/Android.mk	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/Android.mk	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,172 @@
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := osgNativeLib
+### Main Install dir
+NDK_ROOT                := /Users/thomashogarth/Library/Android/sdk/ndk-bundle
+OSG_ANDROID_DIR		:= /Users/thomashogarth/Documents/AlphaPixel/osgEarth-Droid/osg/
+OSGEARTH_ANDROID_DIR	:= /Users/thomashogarth/Documents/AlphaPixel/osgEarth-Droid/osgearth/
+THIRDPARTY_ANDROID_DIR	:= /Users/thomashogarth/Documents/AlphaPixel/osgEarth-Droid/osg/3rdParty
+
+OSG_LIBDIR 			:= $(OSG_ANDROID_DIR)/lib
+OSGEARTH_LIBDIR 		:= $(OSGEARTH_ANDROID_DIR)/lib
+PNG_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/libpng/obj/local/armeabi
+TIFF_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/libtiff/obj/local/armeabi
+GDAL_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/gdal/obj/local/armeabi
+GEOS_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/geos/obj/local/armeabi
+PROJ_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/proj/obj/local/armeabi
+CURL_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/curl/obj/local/armeabi
+FREETYPE_LIBDIR 		:= $(THIRDPARTY_ANDROID_DIR)/build/freetype/obj/local/armeabi
+SQLITE_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/sqlite/obj/local/armeabi
+ZLIB_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/zlib/obj/local/armeabi
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+	LOCAL_ARM_NEON 	:= true
+	OSG_LIBDIR 			:= $(OSG_ANDROID_DIR)/lib
+	OSGEARTH_LIBDIR 		:= $(OSGEARTH_ANDROID_DIR)/lib
+	PNG_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/libpng/obj/local/armeabi-v7a
+	TIFF_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/libtiff/obj/local/armeabi-v7a
+	GDAL_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/gdal/obj/local/armeabi-v7a
+	GEOS_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/geos/obj/local/armeabi-v7a
+	PROJ_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/proj/obj/local/armeabi-v7a
+	CURL_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/curl/obj/local/armeabi-v7a
+	FREETYPE_LIBDIR 		:= $(THIRDPARTY_ANDROID_DIR)/build/freetype/obj/local/armeabi-v7a
+	SQLITE_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/sqlite/obj/local/armeabi-v7a
+	ZLIB_LIBDIR 			:= $(THIRDPARTY_ANDROID_DIR)/build/zlib/obj/local/armeabi-v7a
+endif
+
+### Add all source file names to be included in lib separated by a whitespace
+
+LOCAL_C_INCLUDES:= $(OSG_ANDROID_DIR)/include $(OSGEARTH_ANDROID_DIR)/src
+LOCAL_CFLAGS    := -Werror -fno-short-enums
+LOCAL_CPPFLAGS  := -DOSG_LIBRARY_STATIC -DOSGEARTH_LIBRARY_STATIC
+
+LOCAL_LDLIBS    := -llog -lGLESv3 -lz -ldl -lgnustl_static -lsupc++
+
+LOCAL_SRC_FILES := osgNativeLib.cpp OsgMainApp.cpp OsgAndroidNotifyHandler.cpp
+
+
+#-losgdb_osgearth_agglite \
+#-losgdb_tiff \
+#-losgdb_png \
+#-losgdb_zip \
+
+LOCAL_LDFLAGS   += -L$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi-v7a -lgnustl_static -lsupc++ \
+-L $(OSGEARTH_LIBDIR) \
+-losgdb_osgearth_arcgis \
+-losgdb_osgearth_bing \
+-losgdb_osgearth_bumpmap \
+-losgdb_osgearth_cache_filesystem \
+-losgdb_osgearth_colorramp \
+-losgdb_osgearth_debug \
+-losgdb_osgearth_detail \
+-losgdb_earth \
+-losgdb_osgearth_engine_mp \
+-losgdb_osgearth_engine_rex \
+-losgdb_osgearth_feature_elevation \
+-losgdb_osgearth_feature_ogr \
+-losgdb_osgearth_feature_tfs \
+-losgdb_osgearth_feature_wfs \
+-losgdb_osgearth_feature_xyz \
+-losgdb_osgearth_featurefilter_intersect \
+-losgdb_osgearth_featurefilter_join \
+-losgdb_osgearth_gdal \
+-losgdb_kml \
+-losgdb_osgearth_label_annotation \
+-losgdb_osgearth_mapinspector \
+-losgdb_osgearth_mask_feature \
+-losgdb_osgearth_mbtiles \
+-losgdb_osgearth_model_feature_geom \
+-losgdb_osgearth_model_simple \
+-losgdb_osgearth_monitor \
+-losgdb_osgearth_ocean_simple \
+-losgdb_osgearth_osg \
+-losgdb_osgearth_scriptengine_javascript \
+-losgdb_osgearth_sky_gl \
+-losgdb_osgearth_sky_simple \
+-losgdb_osgearth_skyview \
+-losgdb_template \
+-losgdb_osgearth_terrainshader \
+-losgdb_osgearth_tileindex \
+-losgdb_osgearth_tms \
+-losgdb_osgearth_vdatum_egm84 \
+-losgdb_osgearth_vdatum_egm96 \
+-losgdb_osgearth_vdatum_egm2008 \
+-losgdb_osgearth_viewpoints \
+-losgdb_osgearth_vpb \
+-losgdb_osgearth_wcs \
+-losgdb_osgearth_wms \
+-losgdb_osgearth_xyz \
+-losgEarthAnnotation \
+-losgEarthFeatures \
+-losgEarthSymbology \
+-losgEarthUtil \
+-losgEarth \
+-L $(OSG_LIBDIR) \
+-losgdb_openflight \
+-losgdb_curl \
+-losgdb_obj \
+-losgdb_shp \
+-losgdb_rot \
+-losgdb_scale \
+-losgdb_trans \
+-losgdb_jpeg \
+-losgdb_freetype \
+-losgdb_osgterrain \
+-losgdb_osg \
+-losgdb_ive \
+-losgdb_deprecated_osgviewer \
+-losgdb_deprecated_osgvolume \
+-losgdb_deprecated_osgtext \
+-losgdb_deprecated_osgterrain \
+-losgdb_deprecated_osgsim \
+-losgdb_deprecated_osgshadow \
+-losgdb_deprecated_osgparticle \
+-losgdb_deprecated_osgfx \
+-losgdb_deprecated_osganimation \
+-losgdb_deprecated_osg \
+-losgdb_serializers_osgvolume \
+-losgdb_serializers_osgtext \
+-losgdb_serializers_osgterrain \
+-losgdb_serializers_osgsim \
+-losgdb_serializers_osgshadow \
+-losgdb_serializers_osgparticle \
+-losgdb_serializers_osgmanipulator \
+-losgdb_serializers_osgfx \
+-losgdb_serializers_osganimation \
+-losgdb_serializers_osg \
+-losgViewer \
+-losgVolume \
+-losgTerrain \
+-losgText \
+-losgShadow \
+-losgSim \
+-losgParticle \
+-losgManipulator \
+-losgGA \
+-losgFX \
+-losgDB \
+-losgAnimation \
+-losgUtil \
+-losg \
+-lOpenThreads \
+-L $(PNG_LIBDIR) \
+-lpng \
+-L $(FREETYPE_LIBDIR) \
+-lft2 \
+-L $(CURL_LIBDIR) \
+-lcurl \
+-L $(GDAL_LIBDIR) \
+-lgdal \
+-L $(GEOS_LIBDIR) \
+-lgeos \
+-L $(PROJ_LIBDIR) \
+-lproj \
+-L $(SQLITE_LIBDIR) \
+-lsqlite3 \
+-L $(ZLIB_LIBDIR) \
+-lzlib
+
+include $(BUILD_SHARED_LIBRARY)
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/Application.mk osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/Application.mk
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/Application.mk	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/Application.mk	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,11 @@
+#ANDROID APPLICATION MAKEFILE
+APP_BUILD_SCRIPT := $(call my-dir)/Android.mk
+#APP_PROJECT_PATH := $(call my-dir)
+
+APP_OPTIM := release
+
+APP_PLATFORM 	:= android-18
+APP_STL 	:= gnustl_static
+APP_CPPFLAGS 	:= -fexceptions -frtti
+APP_ABI 	:= armeabi-v7a
+APP_MODULES     := osgNativeLib
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/OsgAndroidNotifyHandler.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/OsgAndroidNotifyHandler.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/OsgAndroidNotifyHandler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/OsgAndroidNotifyHandler.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ * OsgAndroidNotifyHandler.cpp
+ *
+ *  Created on: 31/05/2011
+ *      Author: Jorge Izquierdo Ciges
+ */
+
+#include "OsgAndroidNotifyHandler.hpp"
+#include <iostream>
+
+void OsgAndroidNotifyHandler::setTag(std::string tag){
+    _tag = tag;
+}
+void OsgAndroidNotifyHandler::notify(osg::NotifySeverity severity, const char *message){
+
+    switch ( severity ) {
+        case osg::DEBUG_FP:
+            __android_log_write(ANDROID_LOG_VERBOSE,_tag.c_str(),message);
+          break;
+        case osg::DEBUG_INFO:
+            __android_log_write(ANDROID_LOG_DEBUG,_tag.c_str(),message);
+          break;
+        case osg::NOTICE:
+        case osg::INFO:
+            __android_log_write(ANDROID_LOG_INFO,_tag.c_str(),message);
+          break;
+        case osg::WARN:
+            __android_log_write(ANDROID_LOG_WARN,_tag.c_str(),message);
+          break;
+        case osg::FATAL:
+        case osg::ALWAYS:
+            __android_log_write(ANDROID_LOG_ERROR,_tag.c_str(),message);
+          break;
+        default:
+            __android_log_write(ANDROID_LOG_DEBUG,_tag.c_str(),message);
+          break;
+    }
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/OsgAndroidNotifyHandler.hpp osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/OsgAndroidNotifyHandler.hpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/OsgAndroidNotifyHandler.hpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/OsgAndroidNotifyHandler.hpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+ * OsgAndroidNotifyHandler.hpp
+ *
+ *  Created on: 31/05/2011
+ *      Author: Jorge Izquierdo Ciges
+ */
+
+#ifndef OSGANDROIDNOTIFYHANDLER_HPP_
+#define OSGANDROIDNOTIFYHANDLER_HPP_
+
+#include <android/log.h>
+
+#include <osg/Notify>
+
+#include <string>
+
+class OSG_EXPORT OsgAndroidNotifyHandler : public osg::NotifyHandler
+{
+private:
+    std::string _tag;
+public:
+    void setTag(std::string tag);
+    void notify(osg::NotifySeverity severity, const char *message);
+};
+
+#endif /* OSGANDROIDNOTIFYHANDLER_HPP_ */
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/OsgMainApp.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/OsgMainApp.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/OsgMainApp.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/OsgMainApp.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,258 +1,100 @@
 #include "OsgMainApp.hpp"
 
-#include <osgDB/FileUtils>
-#include <osgEarth/Capabilities>
-#include <osgEarthUtil/AutoClipPlaneHandler>
-#include <osgEarthUtil/ObjectLocator>
-#include <osgEarthDrivers/tms/TMSOptions>
+#include <osgEarth/MapNode>
+#include <osgEarthUtil/Sky>
+#include <osgEarthUtil/EarthManipulator>
 
-#include <osgDB/WriteFile>
+#include "osgPlugins.h"
 
-#include "GLES2ShaderGenVisitor.h"
-
-using namespace osgEarth;
-using namespace osgEarth::Drivers;
-using namespace osgEarth::Util;
-
-class ClampObjectLocatorCallback : public osgEarth::TerrainCallback
+OsgMainApp::OsgMainApp()
 {
-public:
-    ClampObjectLocatorCallback(ObjectLocatorNode* locator):
-    _locator(locator),
-    _maxLevel(-1),
-    _minLevel(0)
-    {
-    }
-    
-    virtual void onTileAdded(const osgEarth::TileKey& tileKey, osg::Node* terrain, TerrainCallbackContext&)
-    {
-        if ((int)tileKey.getLevelOfDetail() > _minLevel && _maxLevel < (int)tileKey.getLevelOfDetail())
-        {
-            osg::Vec3d position = _locator->getLocator()->getPosition();
-            
-            if (tileKey.getExtent().contains(position.x(), position.y()))
-            {
-                //Compute our location in geocentric
-                const osg::EllipsoidModel* ellipsoid = tileKey.getProfile()->getSRS()->getEllipsoid();
-                double x, y, z;
-                ellipsoid->convertLatLongHeightToXYZ(
-                                                     osg::DegreesToRadians(position.y()), osg::DegreesToRadians(position.x()), 0,
-                                                     x, y, z);
-                //Compute the up vector
-                osg::Vec3d up = ellipsoid->computeLocalUpVector(x, y, z );
-                up.normalize();
-                osg::Vec3d world(x, y, z);
-                
-                double segOffset = 50000;
-                
-                osg::Vec3d start = world + (up * segOffset);
-                osg::Vec3d end = world - (up * segOffset);
-                
-                osgUtil::LineSegmentIntersector* i = new osgUtil::LineSegmentIntersector( start, end );
-                
-                osgUtil::IntersectionVisitor iv;
-                iv.setIntersector( i );
-                terrain->accept( iv );
-                
-                osgUtil::LineSegmentIntersector::Intersections& results = i->getIntersections();
-                if ( !results.empty() )
-                {
-                    const osgUtil::LineSegmentIntersector::Intersection& result = *results.begin();
-                    osg::Vec3d hit = result.getWorldIntersectPoint();
-                    double lat, lon, height;
-                    ellipsoid->convertXYZToLatLongHeight(hit.x(), hit.y(), hit.z(),
-                                                         lat, lon, height);
-                    position.z() = height;
-                    //OE_NOTICE << "Got hit, setting new height to " << height << std::endl;
-                    _maxLevel = tileKey.getLevelOfDetail();
-                    _locator->getLocator()->setPosition( position );
-                }
-            }
-        }
-        
-    }
-    
-    osg::ref_ptr< ObjectLocatorNode > _locator;
-    int _maxLevel;
-    int _minLevel;
-};
-
-
-OsgMainApp::OsgMainApp(){
-
     _initialized = false;
 
 }
-OsgMainApp::~OsgMainApp(){
+OsgMainApp::~OsgMainApp()
+{
 
 }
 
-
 //Initialization function
-void OsgMainApp::initOsgWindow(int x,int y,int width,int height){
-
+void OsgMainApp::initOsgWindow(int x,int y,int width,int height)
+{
     __android_log_write(ANDROID_LOG_ERROR, "OSGANDROID",
             "Initializing geometry");
 
     //Pending
-    _notifyHandler = new OsgAndroidNotifyHandler();
+    OsgAndroidNotifyHandler* _notifyHandler = new OsgAndroidNotifyHandler();
     _notifyHandler->setTag("Osg Viewer");
     osg::setNotifyHandler(_notifyHandler);
-    osgEarth::setNotifyHandler(_notifyHandler);
-    
-    osg::setNotifyLevel(osg::FATAL);
-    osgEarth::setNotifyLevel(osg::INFO);
 
     osg::notify(osg::ALWAYS)<<"Testing"<<std::endl;
 
-    //::setenv("OSGEARTH_HTTP_DEBUG", "1", 1);
-    //::setenv("OSGEARTH_DUMP_SHADERS", "1", 1);
-    
-    osgEarth::Registry::instance()->setDefaultTerrainEngineDriverName("quadtree");
-    
-    _bufferWidth = width;
-    _bufferHeight = height;
-    
     _viewer = new osgViewer::Viewer();
-    _viewer->setUpViewerAsEmbeddedInWindow(x, y, width, height);
-    _viewer->getCamera()->setViewport(new osg::Viewport(0, 0, width, height));
-    _viewer->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    _viewer->getCamera()->setClearColor(osg::Vec4(1.0f,0.0f,0.0f,0.0f));
-    //_viewer->getCamera()->setClearStencil(0);
-    _viewer->getCamera()->setProjectionMatrixAsPerspective(45.0f,(float)width/height,
-                                                           0.1f, 10000.0f);
-    // configure the near/far so we don't clip things that are up close
-    _viewer->getCamera()->setNearFarRatio(0.00002);
-    _viewer->setThreadingModel(osgViewer::ViewerBase::SingleThreaded);
-
-    _viewer->getEventQueue()->getCurrentEventState()->setMouseYOrientation(osgGA::GUIEventAdapter::Y_INCREASING_UPWARDS);
-
-    // install our default manipulator (do this before calling load)
-    //_viewer->setCameraManipulator( new osgEarth::Util::EarthMultiTouchManipulator() );
-    _viewer->setCameraManipulator( new osgEarth::Util::EarthManipulator() ); //EarthMultiTouchManipulator() );
-    
-#if 0
-    osg::Light* light = new osg::Light( 0 );
-    light->setPosition( osg::Vec4(0, -1, 0, 0 ) );
-    light->setAmbient( osg::Vec4(0.4f, 0.4f, 0.4f ,1.0) );
-    light->setDiffuse( osg::Vec4(1,1,1,1) );
-    light->setSpecular( osg::Vec4(0,0,0,1) );
-    
-    osg::Material* material = new osg::Material();
-    material->setAmbient(osg::Material::FRONT, osg::Vec4(0.4,0.4,0.4,1.0));
-    material->setDiffuse(osg::Material::FRONT, osg::Vec4(0.9,0.9,0.9,1.0));
-    material->setSpecular(osg::Material::FRONT, osg::Vec4(0.4,0.4,0.4,1.0));
-#endif
-    
-    osg::Node* node = osgDB::readNodeFile("http://readymap.org/readymap/maps/public/2.earth");
-    if ( !node )
-    {
-        OSG_ALWAYS << "Unable to load an earth file from the command line." << std::endl;
-        return;
-    }
-    
-    osg::ref_ptr<osgEarth::Util::MapNode> mapNode = osgEarth::Util::MapNode::findMapNode(node);
-    if ( !mapNode.valid() )
-    {
-        OSG_ALWAYS << "Loaded scene graph does not contain a MapNode - aborting" << std::endl;
-        return;
-    }
-    
-    // warn about not having an earth manip
-    osgEarth::Util::EarthManipulator* manip = dynamic_cast<osgEarth::Util::EarthManipulator*>(_viewer->getCameraManipulator());
-    if ( manip == 0L )
-    {
-        OSG_ALWAYS << "Helper used before installing an EarthManipulator" << std::endl;
-    }
-    
-    // a root node to hold everything:
-    osg::Group* root = new osg::Group();
-    root->addChild( mapNode.get() );
-    //root->getOrCreateStateSet()->setAttribute(light);
-    
-#if 0
-    //have to add these
-    root->getOrCreateStateSet()->setAttribute(material);
-    //root->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-#endif
-    double hours = 12.0f;
-    float ambientBrightness = 0.4f;
-    osgEarth::Util::SkyNode* sky = new osgEarth::Util::SkyNode( mapNode->getMap() );
-    sky->setAmbientBrightness( ambientBrightness );
-    sky->setDateTime( 1984, 11, 8, hours );
-    sky->attach( _viewer );
-    root->addChild( sky );
-
-
-    root->getOrCreateStateSet()->setMode(GL_LIGHTING,
-    		osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
-    
-    //for some reason we have to do this as global stateset doesn't
-    //appear to be in the statesetstack
-    root->getOrCreateStateSet()->setAttribute(_viewer->getLight());
-    
-    _viewer->setSceneData( root );
 
-    _viewer->setRunFrameScheme( osgViewer::ViewerBase::ON_DEMAND );
+    _viewer->setUpViewerAsEmbeddedInWindow(0, 0, width, height);
+	_viewer->getCamera()->setViewport(new osg::Viewport(0, 0, width, height));
+	_viewer->getCamera()->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	_viewer->getCamera()->setClearColor(osg::Vec4(0.0f, 0.0f, 0.5f, 1.0f));
+	_viewer->getCamera()->setProjectionMatrixAsPerspective(45.0f, (float)(width / height), 0.1f, 1000.0f);
+	_viewer->getEventQueue()->getCurrentEventState()->setMouseYOrientation(osgGA::GUIEventAdapter::Y_INCREASING_UPWARDS);
+	_viewer->getCamera()->setNearFarRatio(0.00002f);
+	_viewer->setThreadingModel(osgViewer::ViewerBase::SingleThreaded);
+	_viewer->getCamera()->setLODScale(_viewer->getCamera()->getLODScale() * 1.5f);
+	_viewer->getDatabasePager()->setIncrementalCompileOperation(new osgUtil::IncrementalCompileOperation());
+	_viewer->getDatabasePager()->setDoPreCompile(true);
+	_viewer->getDatabasePager()->setTargetMaximumNumberOfPageLOD(0);
+	_viewer->getDatabasePager()->setUnrefImageDataAfterApplyPolicy(true, true);
+	_viewer->setCameraManipulator(new osgEarth::Util::EarthManipulator());
+	// _viewer->setRunFrameScheme( osgViewer::ViewerBase::ON_DEMAND );
+
+	std::string filepath = "/sdcard/Download/readymap.earth";
+	osg::Node* node = osgDB::readNodeFile(filepath);
+
+	if(!node) {
+		OSG_ALWAYS << "Unable to load an earth file from the command line." << std::endl;
+		return;
+	}
+
+	osg::ref_ptr<osgEarth::Util::MapNode> mapNode = osgEarth::Util::MapNode::findMapNode(node);
+
+	if(!mapNode.valid()) {
+		OSG_ALWAYS << "Loaded scene graph does not contain a MapNode - aborting" << std::endl;
+
+		return;
+	}
+
+	_viewer->setSceneData(mapNode.get());
 
     _viewer->realize();
 
     _initialized = true;
 
 }
-//Draw
-void OsgMainApp::draw(){
 
+//Draw
+void OsgMainApp::draw()
+{
     _viewer->frame();
-    
-    //clear events for next frame
-    _frameTouchBeganEvents = NULL;
-    _frameTouchMovedEvents = NULL;
-    _frameTouchEndedEvents = NULL;
 }
+
 //Events
-static bool flipy = true;
-void OsgMainApp::touchBeganEvent(int touchid,float x,float y){
-    if (!_frameTouchBeganEvents.valid()) {
-        if(_viewer.valid()){
-            _frameTouchBeganEvents = _viewer->getEventQueue()->touchBegan(touchid, osgGA::GUIEventAdapter::TOUCH_BEGAN, x, flipy ? _bufferHeight-y : y);
-        }
-    } else {
-        _frameTouchBeganEvents->addTouchPoint(touchid, osgGA::GUIEventAdapter::TOUCH_BEGAN, x, flipy ? _bufferHeight-y : y);
-    }
+void OsgMainApp::mouseButtonPressEvent(float x,float y,int button)
+{
+    _viewer->getEventQueue()->mouseButtonPress(x, y, button);
 }
-void OsgMainApp::touchMovedEvent(int touchid,float x,float y){
-    if (!_frameTouchMovedEvents.valid()) {
-        if(_viewer.valid()){
-            _frameTouchMovedEvents = _viewer->getEventQueue()->touchMoved(touchid, osgGA::GUIEventAdapter::TOUCH_MOVED, x, flipy ? _bufferHeight-y : y);
-        }
-    } else {
-        _frameTouchMovedEvents->addTouchPoint(touchid, osgGA::GUIEventAdapter::TOUCH_MOVED, x, flipy ? _bufferHeight-y : y);
-    }
+void OsgMainApp::mouseButtonReleaseEvent(float x,float y,int button)
+{
+    _viewer->getEventQueue()->mouseButtonRelease(x, y, button);
 }
-void OsgMainApp::touchEndedEvent(int touchid,float x,float y,int tapcount){
-    if (!_frameTouchEndedEvents.valid()) {
-        if(_viewer.valid()){
-            _frameTouchEndedEvents = _viewer->getEventQueue()->touchEnded(touchid, osgGA::GUIEventAdapter::TOUCH_ENDED, x, flipy ? _bufferHeight-y : y,tapcount);
-        }
-    } else {
-        _frameTouchEndedEvents->addTouchPoint(touchid, osgGA::GUIEventAdapter::TOUCH_ENDED, x, flipy ? _bufferHeight-y : y,tapcount);
-    }
+void OsgMainApp::mouseMoveEvent(float x,float y)
+{
+    _viewer->getEventQueue()->mouseMotion(x, y);
 }
-void OsgMainApp::keyboardDown(int key){
+void OsgMainApp::keyboardDown(int key)
+{
     _viewer->getEventQueue()->keyPress(key);
 }
-void OsgMainApp::keyboardUp(int key){
-    _viewer->getEventQueue()->keyRelease(key);
-}
-
-void OsgMainApp::clearEventQueue()
+void OsgMainApp::keyboardUp(int key)
 {
-    //clear our groups
-    _frameTouchBeganEvents = NULL;
-    _frameTouchMovedEvents = NULL;
-    _frameTouchEndedEvents = NULL;
-    
-    //clear the viewers queue
-    _viewer->getEventQueue()->clear();
+    _viewer->getEventQueue()->keyRelease(key);
 }
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/OsgMainApp.hpp osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/OsgMainApp.hpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/OsgMainApp.hpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/OsgMainApp.hpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * OsgMainApp.hpp
+ *
+ *  Created on: 29/05/2011
+ *      Author: Jorge Izquierdo Ciges
+ */
+
+#ifndef OSGMAINAPP_HPP_
+#define OSGMAINAPP_HPP_
+
+//Android log
+#include <android/log.h>
+#include <iostream>
+#include <cstdlib>
+#include <math.h>
+
+//Standard libraries
+#include <string>
+
+//osg
+#include <osg/GL>
+#include <osg/GLExtensions>
+#include <osg/Depth>
+#include <osg/Program>
+#include <osg/Shader>
+#include <osg/Node>
+#include <osg/Notify>
+//osgText
+#include <osgText/Text>
+//osgDB
+#include <osgDB/DatabasePager>
+#include <osgDB/Registry>
+#include <osgDB/ReadFile>
+#include <osgDB/WriteFile>
+//osg_viewer
+#include <osgViewer/Viewer>
+#include <osgViewer/Renderer>
+#include <osgViewer/ViewerEventHandlers>
+//osgGA
+#include <osgGA/GUIEventAdapter>
+#include <osgGA/MultiTouchTrackballManipulator>
+#include <osgGA/TrackballManipulator>
+//Self headers
+#include "OsgAndroidNotifyHandler.hpp"
+
+
+
+#define  LOG_TAG    "osgNativeLib"
+#define  LOGI(...)  __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
+#define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
+
+struct Model{
+    std::string filename;
+    std::string name;
+};
+
+static const char gVertexShader[] =
+	"#version 300 es														\n"
+	"precision mediump float;                  \n"
+	"in vec4 osg_Vertex;\n"
+	"in vec3 osg_Normal;\n"
+	"uniform mat4 osg_ModelViewProjectionMatrix;\n"
+	"uniform mat4 osg_ModelViewMatrix;\n"
+	"uniform mat3 osg_NormalMatrix;\n"
+    "out vec4 color;                                                    \n"
+    "const vec3 lightPos      =vec3(0.0, 0.0, 10.0);                        \n"
+    "const vec4 cessnaColor   =vec4(0.8, 0.8, 0.8, 1.0);                    \n"
+    "const vec4 lightAmbient  =vec4(0.1, 0.1, 0.1, 1.0);                    \n"
+    "const vec4 lightDiffuse  =vec4(0.4, 0.4, 0.4, 1.0);                    \n"
+    "const vec4 lightSpecular =vec4(0.8, 0.8, 0.8, 1.0);                    \n"
+    "void DirectionalLight(in vec3 normal,                                  \n"
+    "                      in vec3 ecPos,                                   \n"
+    "                      inout vec4 ambient,                              \n"
+    "                      inout vec4 diffuse,                              \n"
+    "                      inout vec4 specular)                             \n"
+    "{                                                                      \n"
+    "     float nDotVP;                                                     \n"
+    "     vec3 L = normalize(gl_ModelViewMatrix*vec4(lightPos, 0.0)).xyz;   \n"
+    "     nDotVP = max(0.0, dot(normal, L));                                \n"
+    "                                                                       \n"
+    "     if (nDotVP > 0.0) {                                               \n"
+    "       vec3 E = normalize(-ecPos);                                     \n"
+    "       vec3 R = normalize(reflect( L, normal ));                       \n"
+    "       specular = pow(max(dot(R, E), 0.0), 16.0) * lightSpecular;      \n"
+    "     }                                                                 \n"
+    "     ambient  = lightAmbient;                                          \n"
+    "     diffuse  = lightDiffuse * nDotVP;                                 \n"
+    "}                                                                      \n"
+    "void main() {                                                          \n"
+    "    vec4 ambiCol = vec4(0.0);                                          \n"
+    "    vec4 diffCol = vec4(0.0);                                          \n"
+    "    vec4 specCol = vec4(0.0);                                          \n"
+    "    gl_Position   = osg_ModelViewProjectionMatrix * osg_Vertex;          \n"
+    "    vec3 normal   = normalize(osg_NormalMatrix * osg_Normal);            \n"
+    "    vec4 ecPos    = osg_ModelViewMatrix * osg_Vertex;                    \n"
+    "    DirectionalLight(normal, ecPos.xyz, ambiCol, diffCol, specCol);    \n"
+    "    color = cessnaColor * (ambiCol + diffCol + specCol);               \n"
+    "}                                                                      \n";
+
+static const char gFragmentShader[] =
+	"#version 300 es														\n"
+    "precision mediump float;                  \n"
+    "in mediump vec4 color;               \n"
+	"out vec4 fragData;\n"
+    "void main() {                             \n"
+    "  fragData = color;                   \n"
+    "}                                         \n";
+
+
+class OsgMainApp{
+private:
+    osg::ref_ptr<osgViewer::Viewer> _viewer;
+
+    bool _initialized;
+
+
+public:
+    OsgMainApp();
+    ~OsgMainApp();
+
+    //Initialization function
+    void initOsgWindow(int x,int y,int width,int height);
+    //Draw
+    void draw();
+    //Events
+    void mouseButtonPressEvent(float x,float y,int button);
+    void mouseButtonReleaseEvent(float x,float y,int button);
+    void mouseMoveEvent(float x,float y);
+    void keyboardDown(int key);
+    void keyboardUp(int key);
+};
+
+
+#endif /* OSGMAINAPP_HPP_ */
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/osgNativeLib.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/osgNativeLib.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/osgNativeLib.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/osgNativeLib.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,42 @@
+#include <string.h>
+#include <jni.h>
+#include <android/log.h>
+
+#include <iostream>
+
+#include "OsgMainApp.hpp"
+
+OsgMainApp mainApp;
+
+extern "C" {
+    JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_init(JNIEnv * env, jobject obj, jint width, jint height);
+    JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_step(JNIEnv * env, jobject obj);
+    JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_mouseButtonPressEvent(JNIEnv * env, jobject obj, jfloat x, jfloat y, jint button);
+    JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_mouseButtonReleaseEvent(JNIEnv * env, jobject obj, jfloat x, jfloat y, jint button);
+    JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_mouseMoveEvent(JNIEnv * env, jobject obj, jfloat x, jfloat y);
+    JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_keyboardDown(JNIEnv * env, jobject obj, jint key);
+    JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_keyboardUp(JNIEnv * env, jobject obj, jint key);
+};
+
+JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_init(JNIEnv * env, jobject obj, jint width, jint height){
+    mainApp.initOsgWindow(0,0,width,height);
+}
+JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_step(JNIEnv * env, jobject obj){
+    mainApp.draw();
+}
+JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_mouseButtonPressEvent(JNIEnv * env, jobject obj, jfloat x, jfloat y, jint button){
+    mainApp.mouseButtonPressEvent(x,y,button);
+}
+JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_mouseButtonReleaseEvent(JNIEnv * env, jobject obj, jfloat x, jfloat y, jint button){
+    mainApp.mouseButtonReleaseEvent(x,y,button);
+}
+JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_mouseMoveEvent(JNIEnv * env, jobject obj, jfloat x, jfloat y){
+    mainApp.mouseMoveEvent(x,y);
+}
+JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_keyboardDown(JNIEnv * env, jobject obj, jint key){
+    mainApp.keyboardDown(key);
+}
+JNIEXPORT void JNICALL Java_osg_AndroidExample_osgNativeLib_keyboardUp(JNIEnv * env, jobject obj, jint key){
+    mainApp.keyboardUp(key);
+}
+
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/osgPlugins.h osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/osgPlugins.h
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/jni/osgPlugins.h	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/jni/osgPlugins.h	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,17 @@
+#pragma once 
+
+//This file is used to force the linking of the osg plugins
+//as we our doing a static build we can't depend on the loading of the
+//dynamic libs to add the plugins to the registries
+
+USE_OSGPLUGIN(osg)
+USE_OSGPLUGIN(curl)
+//USE_OSGPLUGIN(tiff)
+USE_OSGPLUGIN(jpeg)
+USE_OSGPLUGIN(earth)
+USE_OSGPLUGIN(osgearth_tms)
+USE_OSGPLUGIN(osgearth_engine_mp)
+USE_OSGPLUGIN(osgearth_engine_rex)
+
+USE_DOTOSGWRAPPER_LIBRARY(osg)
+
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/proguard.cfg osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/proguard.cfg
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/proguard.cfg	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/proguard.cfg	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,36 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembers class * {
+    native <methods>;
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
Binary files /tmp/tmpTYJ2CI/zhpOcMvVlM/osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/drawable-hdpi/osg.png and /tmp/tmpTYJ2CI/JDR4shlQBj/osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/drawable-hdpi/osg.png differ
Binary files /tmp/tmpTYJ2CI/zhpOcMvVlM/osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/drawable-hdpi/web_browser.png and /tmp/tmpTYJ2CI/JDR4shlQBj/osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/drawable-hdpi/web_browser.png differ
Binary files /tmp/tmpTYJ2CI/zhpOcMvVlM/osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/drawable-ldpi/osg.png and /tmp/tmpTYJ2CI/JDR4shlQBj/osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/drawable-ldpi/osg.png differ
Binary files /tmp/tmpTYJ2CI/zhpOcMvVlM/osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/drawable-mdpi/osg.png and /tmp/tmpTYJ2CI/JDR4shlQBj/osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/drawable-mdpi/osg.png differ
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/layout/dialog_text_entry.xml osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/layout/dialog_text_entry.xml
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/layout/dialog_text_entry.xml	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/layout/dialog_text_entry.xml	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content">
+  
+  <TextView
+  	android:id="@+id/uiTextEntryText"
+  	android:layout_width="wrap_content"
+  	android:layout_height="wrap_content"
+  	android:layout_marginLeft="20dip"
+  	android:layout_marginRight="20dip"
+  	android:text="@string/uiTextEntryText"
+  	android:gravity="left"
+  	/>
+  <EditText
+  	android:id="@+id/uiEditTextInput"
+  	android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:layout_marginLeft="20dip"
+    android:layout_marginRight="20dip"
+    android:scrollHorizontally="true"
+    android:autoText="false"
+    android:capitalize="none"
+    android:gravity="fill_horizontal"
+    />
+  	
+</LinearLayout>
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/layout/main.xml osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/layout/main.xml
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/layout/main.xml	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/layout/main.xml	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/layout/ui_layout_gles.xml osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/layout/ui_layout_gles.xml
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/layout/ui_layout_gles.xml	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/layout/ui_layout_gles.xml	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:background="@color/uiControlBar"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+  <FrameLayout
+  	android:layout_width="fill_parent"
+  	android:layout_height="fill_parent"
+  	android:layout_weight="1">
+  	<osg.AndroidExample.EGLview android:id="@+id/surfaceGLES"
+  		android:visibility="visible"
+  		android:layout_width="fill_parent"
+  		android:layout_height="fill_parent"
+  	/>
+  </FrameLayout>
+  <RelativeLayout android:id="@+id/uiNavigation"
+  	android:gravity="center"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content">
+	
+	<LinearLayout
+		android:layout_centerInParent="true"
+		android:orientation="horizontal"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center">
+		<Button android:id="@+id/uiButtonLight"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/uiButtonLight"/>
+		<Button android:id="@+id/uiButtonCenter"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/uiButtonCenter"/>
+		<Button android:id="@+id/uiButtonChangeNavigation"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/uiButtonChangeNavigation"/>
+	</LinearLayout>
+	
+	</RelativeLayout>
+  	
+</LinearLayout>
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/menu/appmenu.xml osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/menu/appmenu.xml
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/menu/appmenu.xml	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/menu/appmenu.xml	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/menuLoadObject" android:title="@string/menuLoadObject" android:titleCondensed="@string/menuLoadObjectCondensed"></item>
+    <item android:id="@+id/menuDeleteObject" android:title="@string/menuDeleteObject" android:titleCondensed="@string/menuDeleteObjectCondensed"></item>
+    <item android:id="@+id/menuCleanScene" android:title="@string/menuCleanScene" android:titleCondensed="@string/menuCleanSceneCondensed"></item>
+    <item android:id="@+id/menuChangeBackground" android:title="@string/menuChangeBackground" android:titleCondensed="@string/menuChangeBackgroundCondensed"></item>
+    <item android:id="@+id/menuShowKeyboard" android:title="@string/menuShowKeyboard" android:titleCondensed="@string/menuShowKeyboardCondensed"></item>
+</menu>
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/values/strings.xml osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/values/strings.xml
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/res/values/strings.xml	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/res/values/strings.xml	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello World, osgViewer!</string>
+    <string name="app_name">osgAndroidExample</string>
+    <color name="uiControlBar">#BBBBBB</color>
+    <string name="uiButtonLight">Light (ON/OFF)</string>
+    <string name="uiButtonCenter">Center View</string>
+    <string name="uiButtonChangeNavigation">Change Navigation</string>
+    <string name="uiTextEntryText">Write address</string>
+    <string name="uiToastNavPrincipal">Main navigation</string>
+    <string name="uiToastNavSecond">Second Navigation</string>
+    <string name="uiToastLightOn">Light ON</string>
+    <string name="uiToastLightOff">Light OFF</string>
+    <string name="menuLoadObject">Load Object</string>
+    <string name="menuLoadObjectCondensed">L. Object</string>
+    <string name="menuDeleteObject">Delete Object</string>
+    <string name="menuDeleteObjectCondensed">D. Object</string>
+    <string name="menuCleanScene">Clean Scene</string>
+    <string name="menuCleanSceneCondensed">Clean</string>
+    <string name="menuChangeBackground">Change Background</string>
+    <string name="menuChangeBackgroundCondensed">C.Background</string>
+    <string name="menuShowKeyboard">Show Keyboard</string>
+    <string name="menuShowKeyboardCondensed">S.Keyboard</string>
+    <string name="uiDialogTextChoseRemove">Select Object</string>
+    <string name="uiDialogTextAddress">Write file address</string>
+    <string name="uiDialogOk">Accept</string>
+    <string name="uiDialogCancel">Cancel</string>
+</resources>
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/EGLview.java osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/EGLview.java
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/EGLview.java	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/EGLview.java	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,329 @@
+
+package osg.AndroidExample;
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * 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 android.app.Dialog;
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.opengl.GLSurfaceView;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.*;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.opengles.GL10;
+/**
+ * A simple GLSurfaceView sub-class that demonstrate how to perform
+ * OpenGL ES 3.0 rendering into a GL Surface. Note the following important
+ * details:
+ *
+ * - The class must use a custom context factory to enable 1.0 rendering.
+ *   See ContextFactory class definition below.
+ *
+ * - The class must use a custom EGLConfigChooser to be able to select
+ *   an EGLConfig that supports 3.0. This is done by providing a config
+ *   specification to eglChooseConfig() that has the attribute
+ *   EGL10.ELG_RENDERABLE_TYPE containing the EGL_OPENGL_ES_BIT flag
+ *   set. See ConfigChooser class definition below.
+ *
+ * - The class must select the surface's format, then choose an EGLConfig
+ *   that matches it exactly (with regards to red/green/blue/alpha channels
+ *   bit depths). Failure to do so would result in an EGL_BAD_MATCH error.
+ */
+public class EGLview extends GLSurfaceView {
+	private static String TAG = "EGLview";
+	private static final boolean DEBUG = false;
+	
+	public EGLview(Context context) {
+	    super(context);
+	    init(false, 16, 8);
+	}
+	public EGLview(Context context, AttributeSet attrs) {
+	    super(context,attrs);
+	    init(false, 16, 8);
+	}
+	
+	
+	public EGLview(Context context, boolean translucent, int depth, int stencil) {
+	    super(context);
+	    init(translucent, depth, stencil);
+	}
+	
+	private void init(boolean translucent, int depth, int stencil) {
+	
+	    /* By default, GLSurfaceView() creates a RGB_565 opaque surface.
+	     * If we want a translucent one, we should change the surface's
+	     * format here, using PixelFormat.TRANSLUCENT for GL Surfaces
+	     * is interpreted as any 32-bit surface with alpha by SurfaceFlinger.
+	     */
+	    if (translucent) {
+	        this.getHolder().setFormat(PixelFormat.TRANSLUCENT);
+	    }
+	
+	    /* Setup the context factory for 2.0 rendering.
+	     * See ContextFactory class definition below
+	     */
+	    setEGLContextFactory(new ContextFactory());
+	
+	    /* We need to choose an EGLConfig that matches the format of
+	     * our surface exactly. This is going to be done in our
+	     * custom config chooser. See ConfigChooser class definition
+	     * below.
+	     */
+	    setEGLConfigChooser( translucent ?
+	                         new ConfigChooser(8, 8, 8, 8, depth, stencil) :
+	                         new ConfigChooser(5, 6, 5, 0, depth, stencil) );
+	
+	    /* Set the renderer responsible for frame rendering */
+	    setRenderer(new Renderer());
+	}
+	
+	private static class ContextFactory implements GLSurfaceView.EGLContextFactory {
+	    private static int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+	    public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig eglConfig) {
+	        Log.w(TAG, "creating OpenGL ES 3.0 context");
+	        checkEglError("Before eglCreateContext", egl);
+	        int[] attrib_list = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL10.EGL_NONE };
+	        EGLContext context = egl.eglCreateContext(display, eglConfig, EGL10.EGL_NO_CONTEXT, attrib_list);
+	        checkEglError("After eglCreateContext", egl);
+	        return context;
+	    }
+	
+	    public void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context) {
+	        egl.eglDestroyContext(display, context);
+	    }
+	}
+	
+	private static void checkEglError(String prompt, EGL10 egl) {
+	    int error;
+	    while ((error = egl.eglGetError()) != EGL10.EGL_SUCCESS) {
+	        Log.e(TAG, String.format("%s: EGL error: 0x%x", prompt, error));
+	    }
+	}
+	
+	private static class ConfigChooser implements GLSurfaceView.EGLConfigChooser {
+	
+	    public ConfigChooser(int r, int g, int b, int a, int depth, int stencil) {
+	        mRedSize = r;
+	        mGreenSize = g;
+	        mBlueSize = b;
+	        mAlphaSize = a;
+	        mDepthSize = depth;
+	        mStencilSize = stencil;
+	    }
+	
+	    /* This EGL config specification is used to specify 1.x rendering.
+	     * We use a minimum size of 4 bits for red/green/blue, but will
+	     * perform actual matching in chooseConfig() below.
+	     */
+	    private static int EGL_OPENGL_ES_BIT = 4;
+	    private static int[] s_configAttribs2 =
+	    {
+	        EGL10.EGL_RED_SIZE, 4,
+	        EGL10.EGL_GREEN_SIZE, 4,
+	        EGL10.EGL_BLUE_SIZE, 4,
+	        EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES_BIT,
+	        EGL10.EGL_NONE
+	    };
+	
+	    public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
+	
+	        /* Get the number of minimally matching EGL configurations
+	         */
+	        int[] num_config = new int[1];
+	        egl.eglChooseConfig(display, s_configAttribs2, null, 0, num_config);
+	
+	        int numConfigs = num_config[0];
+	
+	        if (numConfigs <= 0) {
+	            throw new IllegalArgumentException("No configs match configSpec");
+	        }
+	
+	        /* Allocate then read the array of minimally matching EGL configs
+	         */
+	        EGLConfig[] configs = new EGLConfig[numConfigs];
+	        egl.eglChooseConfig(display, s_configAttribs2, configs, numConfigs, num_config);
+	
+	        if (DEBUG) {
+	             printConfigs(egl, display, configs);
+	        }
+	        /* Now return the "best" one
+	         */
+	        return chooseConfig(egl, display, configs);
+	    }
+	
+	    public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display,
+	            EGLConfig[] configs) {
+	        for(EGLConfig config : configs) {
+	            int d = findConfigAttrib(egl, display, config,
+	                    EGL10.EGL_DEPTH_SIZE, 0);
+	            int s = findConfigAttrib(egl, display, config,
+	                    EGL10.EGL_STENCIL_SIZE, 0);
+	
+	            // We need at least mDepthSize and mStencilSize bits
+	            if (d < mDepthSize || s < mStencilSize)
+	                continue;
+	
+	            // We want an *exact* match for red/green/blue/alpha
+	            int r = findConfigAttrib(egl, display, config,
+	                    EGL10.EGL_RED_SIZE, 0);
+	            int g = findConfigAttrib(egl, display, config,
+	                        EGL10.EGL_GREEN_SIZE, 0);
+	            int b = findConfigAttrib(egl, display, config,
+	                        EGL10.EGL_BLUE_SIZE, 0);
+	            int a = findConfigAttrib(egl, display, config,
+	                    EGL10.EGL_ALPHA_SIZE, 0);
+	
+	            if (r == mRedSize && g == mGreenSize && b == mBlueSize && a == mAlphaSize)
+	                return config;
+	        }
+	        return null;
+	    }
+	
+	    private int findConfigAttrib(EGL10 egl, EGLDisplay display,
+	            EGLConfig config, int attribute, int defaultValue) {
+	
+	        if (egl.eglGetConfigAttrib(display, config, attribute, mValue)) {
+	            return mValue[0];
+	        }
+	        return defaultValue;
+	    }
+	
+	    private void printConfigs(EGL10 egl, EGLDisplay display,
+	        EGLConfig[] configs) {
+	        int numConfigs = configs.length;
+	        Log.w(TAG, String.format("%d configurations", numConfigs));
+	        for (int i = 0; i < numConfigs; i++) {
+	            Log.w(TAG, String.format("Configuration %d:\n", i));
+	            printConfig(egl, display, configs[i]);
+	        }
+	    }
+	
+	    private void printConfig(EGL10 egl, EGLDisplay display,
+	            EGLConfig config) {
+	        int[] attributes = {
+	                EGL10.EGL_BUFFER_SIZE,
+	                EGL10.EGL_ALPHA_SIZE,
+	                EGL10.EGL_BLUE_SIZE,
+	                EGL10.EGL_GREEN_SIZE,
+	                EGL10.EGL_RED_SIZE,
+	                EGL10.EGL_DEPTH_SIZE,
+	                EGL10.EGL_STENCIL_SIZE,
+	                EGL10.EGL_CONFIG_CAVEAT,
+	                EGL10.EGL_CONFIG_ID,
+	                EGL10.EGL_LEVEL,
+	                EGL10.EGL_MAX_PBUFFER_HEIGHT,
+	                EGL10.EGL_MAX_PBUFFER_PIXELS,
+	                EGL10.EGL_MAX_PBUFFER_WIDTH,
+	                EGL10.EGL_NATIVE_RENDERABLE,
+	                EGL10.EGL_NATIVE_VISUAL_ID,
+	                EGL10.EGL_NATIVE_VISUAL_TYPE,
+	                0x3030, // EGL10.EGL_PRESERVED_RESOURCES,
+	                EGL10.EGL_SAMPLES,
+	                EGL10.EGL_SAMPLE_BUFFERS,
+	                EGL10.EGL_SURFACE_TYPE,
+	                EGL10.EGL_TRANSPARENT_TYPE,
+	                EGL10.EGL_TRANSPARENT_RED_VALUE,
+	                EGL10.EGL_TRANSPARENT_GREEN_VALUE,
+	                EGL10.EGL_TRANSPARENT_BLUE_VALUE,
+	                0x3039, // EGL10.EGL_BIND_TO_TEXTURE_RGB,
+	                0x303A, // EGL10.EGL_BIND_TO_TEXTURE_RGBA,
+	                0x303B, // EGL10.EGL_MIN_SWAP_INTERVAL,
+	                0x303C, // EGL10.EGL_MAX_SWAP_INTERVAL,
+	                EGL10.EGL_LUMINANCE_SIZE,
+	                EGL10.EGL_ALPHA_MASK_SIZE,
+	                EGL10.EGL_COLOR_BUFFER_TYPE,
+	                EGL10.EGL_RENDERABLE_TYPE,
+	                0x3042 // EGL10.EGL_CONFORMANT
+	        };
+	        String[] names = {
+	                "EGL_BUFFER_SIZE",
+	                "EGL_ALPHA_SIZE",
+	                "EGL_BLUE_SIZE",
+	                "EGL_GREEN_SIZE",
+	                "EGL_RED_SIZE",
+	                "EGL_DEPTH_SIZE",
+	                "EGL_STENCIL_SIZE",
+	                "EGL_CONFIG_CAVEAT",
+	                "EGL_CONFIG_ID",
+	                "EGL_LEVEL",
+	                "EGL_MAX_PBUFFER_HEIGHT",
+	                "EGL_MAX_PBUFFER_PIXELS",
+	                "EGL_MAX_PBUFFER_WIDTH",
+	                "EGL_NATIVE_RENDERABLE",
+	                "EGL_NATIVE_VISUAL_ID",
+	                "EGL_NATIVE_VISUAL_TYPE",
+	                "EGL_PRESERVED_RESOURCES",
+	                "EGL_SAMPLES",
+	                "EGL_SAMPLE_BUFFERS",
+	                "EGL_SURFACE_TYPE",
+	                "EGL_TRANSPARENT_TYPE",
+	                "EGL_TRANSPARENT_RED_VALUE",
+	                "EGL_TRANSPARENT_GREEN_VALUE",
+	                "EGL_TRANSPARENT_BLUE_VALUE",
+	                "EGL_BIND_TO_TEXTURE_RGB",
+	                "EGL_BIND_TO_TEXTURE_RGBA",
+	                "EGL_MIN_SWAP_INTERVAL",
+	                "EGL_MAX_SWAP_INTERVAL",
+	                "EGL_LUMINANCE_SIZE",
+	                "EGL_ALPHA_MASK_SIZE",
+	                "EGL_COLOR_BUFFER_TYPE",
+	                "EGL_RENDERABLE_TYPE",
+	                "EGL_CONFORMANT"
+	        };
+	        int[] value = new int[1];
+	        for (int i = 0; i < attributes.length; i++) {
+	            int attribute = attributes[i];
+	            String name = names[i];
+	            if ( egl.eglGetConfigAttrib(display, config, attribute, value)) {
+	                Log.w(TAG, String.format("  %s: %d\n", name, value[0]));
+	            } else {
+	                // Log.w(TAG, String.format("  %s: failed\n", name));
+	                while (egl.eglGetError() != EGL10.EGL_SUCCESS);
+	            }
+	        }
+	    }
+	
+	    // Subclasses can adjust these values:
+	    protected int mRedSize;
+	    protected int mGreenSize;
+	    protected int mBlueSize;
+	    protected int mAlphaSize;
+	    protected int mDepthSize;
+	    protected int mStencilSize;
+	    private int[] mValue = new int[1];
+	}
+	
+	private static class Renderer implements GLSurfaceView.Renderer {
+	    public void onDrawFrame(GL10 gl) {
+	        osgNativeLib.step();
+	    }
+	
+	    public void onSurfaceChanged(GL10 gl, int width, int height) {
+	        osgNativeLib.init(width, height);
+	    }
+	
+	    public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+	        // Do nothing
+	        	gl.glEnable(GL10.GL_DEPTH_TEST);
+	        }
+	    }
+		    
+}
+
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/osgNativeLib.java osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/osgNativeLib.java
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/osgNativeLib.java	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/osgNativeLib.java	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,22 @@
+package osg.AndroidExample;
+
+public class osgNativeLib {
+	
+	static {
+        System.loadLibrary("osgNativeLib");
+    }
+
+   /**
+    * @param width the current view width
+    * @param height the current view height
+    */
+    public static native void 		init(int width, int height);
+    public static native void 		step();
+    public static native void 		mouseButtonPressEvent(float x,float y, int button);
+    public static native void 		mouseButtonReleaseEvent(float x,float y, int button);
+    public static native void 		mouseMoveEvent(float x,float y);
+    public static native void 		keyboardDown(int key);
+    public static native void 		keyboardUp(int key);
+
+
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/osgViewer.java osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/osgViewer.java
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/osgViewer.java	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewer_android/src/osg/AndroidExample/osgViewer.java	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,291 @@
+package osg.AndroidExample;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.PointF;
+import android.os.Bundle;
+import android.util.FloatMath;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.WindowManager;
+import android.view.View.OnClickListener;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ImageButton;
+
+import java.io.File;
+
+public class osgViewer extends Activity implements View.OnTouchListener, View.OnKeyListener
+{
+	enum moveTypes { NONE , DRAG, MDRAG, ZOOM ,ACTUALIZE}
+	enum navType { PRINCIPAL , SECONDARY }
+	enum lightType { ON , OFF }
+		
+	moveTypes mode=moveTypes.NONE;
+	navType navMode = navType.PRINCIPAL;
+	lightType lightMode = lightType.ON;
+	
+	PointF oneFingerOrigin = new PointF(0,0);
+	long timeOneFinger=0;
+	PointF twoFingerOrigin = new PointF(0,0);
+	long timeTwoFinger=0;
+	float distanceOrigin;
+	
+	private static final String TAG = "OSG Activity";
+	//Ui elements
+    EGLview mView;
+    Button uiCenterViewButton;
+    
+    //Dialogs
+    AlertDialog removeLayerDialog;
+    AlertDialog loadLayerAddress;
+
+    //Main Android Activity life cycle
+    @Override protected void onCreate(Bundle icicle)
+    {
+        super.onCreate(icicle);
+        setContentView(R.layout.ui_layout_gles);
+        
+        // get the gl view and attach touch listeners
+		mView= (EGLview) findViewById(R.id.surfaceGLES);
+		mView.setOnTouchListener(this);
+		mView.setOnKeyListener(this);
+	        
+	    uiCenterViewButton = (Button) findViewById(R.id.uiButtonCenter);
+	    uiCenterViewButton.setOnClickListener(uiListenerCenterView);
+    }
+    
+    @Override protected void onPause() {
+        super.onPause();
+        mView.onPause();
+    }
+    @Override protected void onResume() {
+        super.onResume();
+        mView.onResume();
+    }
+    
+    //Main view event processing
+    @Override
+	public boolean onKey(View v, int keyCode, KeyEvent event) {
+		
+		return true;
+	}
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event){
+    	//DO NOTHING this will render useless every menu key except Home
+    	int keyChar= event.getUnicodeChar();
+    	osgNativeLib.keyboardDown(keyChar);
+    	return true;
+    }
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event){
+    	switch (keyCode){
+    	case KeyEvent.KEYCODE_BACK:
+    		super.onDestroy();
+    		this.finish();
+    		break;
+    	case KeyEvent.KEYCODE_SEARCH:
+    		break;
+    	case KeyEvent.KEYCODE_MENU:
+    		this.openOptionsMenu();
+    		break;
+    	default:
+    		int keyChar= event.getUnicodeChar();
+    		osgNativeLib.keyboardUp(keyChar);    		
+    	}
+    	
+    	return true;
+    }
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+    	
+    	//dumpEvent(event);
+    	
+    	long time_arrival = event.getEventTime();
+    	int n_points = event.getPointerCount();
+    	int action = event.getAction() & MotionEvent.ACTION_MASK;
+    	
+    	switch(n_points){
+    	case 1:
+    		switch(action){
+    		case MotionEvent.ACTION_DOWN:
+	    		mode = moveTypes.DRAG;
+	    		
+	    		osgNativeLib.mouseMoveEvent(event.getX(0), event.getY(0));
+	    		if(navMode==navType.PRINCIPAL)
+	    			osgNativeLib.mouseButtonPressEvent(event.getX(0), event.getY(0), 2);
+	    		else
+	    			osgNativeLib.mouseButtonPressEvent(event.getX(0), event.getY(0), 1);
+	    		
+	    		oneFingerOrigin.x=event.getX(0);
+	    		oneFingerOrigin.y=event.getY(0);
+    			break;
+    		case MotionEvent.ACTION_CANCEL:
+    			switch(mode){
+    			case DRAG:
+    				osgNativeLib.mouseMoveEvent(event.getX(0), event.getY(0));
+    				if(navMode==navType.PRINCIPAL)
+    					osgNativeLib.mouseButtonReleaseEvent(event.getX(0), event.getY(0), 2);
+    				else
+    					osgNativeLib.mouseButtonReleaseEvent(event.getX(0), event.getY(0), 1);
+    				break;
+    			default :
+    				Log.e(TAG,"There has been an anomaly in touch input 1point/action");
+    			}
+    			mode = moveTypes.NONE;
+    			break;
+    		case MotionEvent.ACTION_MOVE:
+    			
+    			osgNativeLib.mouseMoveEvent(event.getX(0), event.getY(0));
+    			
+    			oneFingerOrigin.x=event.getX(0);
+	    		oneFingerOrigin.y=event.getY(0);
+	    		
+    			break;
+    		case MotionEvent.ACTION_UP:
+    			switch(mode){
+    			case DRAG:
+    				if(navMode==navType.PRINCIPAL)
+    					osgNativeLib.mouseButtonReleaseEvent(event.getX(0), event.getY(0), 2);
+    				else
+    					osgNativeLib.mouseButtonReleaseEvent(event.getX(0), event.getY(0), 1);
+    				break;
+    			default :
+    				Log.e(TAG,"There has been an anomaly in touch input 1 point/action");
+    			}
+    			mode = moveTypes.NONE;
+    			break;
+    		default :
+    			Log.e(TAG,"1 point Action not captured");	
+    		}
+    		break;
+    	case 2:
+    		switch (action){
+    		case MotionEvent.ACTION_POINTER_DOWN:
+    			//Free previous Action
+    			switch(mode){
+    			case DRAG:
+    				if(navMode==navType.PRINCIPAL)
+    					osgNativeLib.mouseButtonReleaseEvent(event.getX(0), event.getY(0), 2);
+    				else
+    					osgNativeLib.mouseButtonReleaseEvent(event.getX(0), event.getY(0), 1);
+    				break;
+    			}
+    			mode = moveTypes.ZOOM;
+    			distanceOrigin = sqrDistance(event);
+    			twoFingerOrigin.x=event.getX(1);
+    			twoFingerOrigin.y=event.getY(1);
+    			oneFingerOrigin.x=event.getX(0);
+	    		oneFingerOrigin.y=event.getY(0);
+    			
+    			osgNativeLib.mouseMoveEvent(oneFingerOrigin.x,oneFingerOrigin.y);
+    			osgNativeLib.mouseButtonPressEvent(oneFingerOrigin.x,oneFingerOrigin.y, 3);
+    			osgNativeLib.mouseMoveEvent(oneFingerOrigin.x,oneFingerOrigin.y);
+    			
+    		case MotionEvent.ACTION_MOVE:
+    			float distance = sqrDistance(event);
+    			float result = distance-distanceOrigin;
+    			distanceOrigin=distance;
+    			
+    			if(result>1||result<-1){
+    	    		oneFingerOrigin.y=oneFingerOrigin.y+result;
+    				osgNativeLib.mouseMoveEvent(oneFingerOrigin.x,oneFingerOrigin.y);
+    			}
+    			
+    			break;
+    		case MotionEvent.ACTION_POINTER_UP:
+    			mode =moveTypes.NONE;
+    			osgNativeLib.mouseButtonReleaseEvent(oneFingerOrigin.x,oneFingerOrigin.y, 3);
+    			break;
+    		case MotionEvent.ACTION_UP:
+    			mode =moveTypes.NONE;
+    			osgNativeLib.mouseButtonReleaseEvent(oneFingerOrigin.x,oneFingerOrigin.y, 3);
+    			break;
+    		default :
+    			Log.e(TAG,"2 point Action not captured");
+    		}
+    		break;    		
+    	}
+			
+		return true;
+	}
+
+    //Ui Listeners
+    OnClickListener uiListenerCenterView = new OnClickListener() {
+        public void onClick(View v) {
+        	//Log.d(TAG, "Center View");
+        	osgNativeLib.keyboardDown(32);
+        	osgNativeLib.keyboardUp(32);
+        }
+    };
+    
+    //Menu
+    
+    //Android Life Cycle Menu
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.appmenu, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle item selection
+        switch (item.getItemId()) {
+        case R.id.menuShowKeyboard:
+        	Log.d(TAG,"Keyboard");
+        	InputMethodManager mgr= (InputMethodManager)this.getSystemService(Context.INPUT_METHOD_SERVICE);
+    		mgr.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
+            return true;
+        default:
+            return super.onOptionsItemSelected(item);
+        }
+    }
+    
+    //Utilities
+    /** Show an event in the LogCat view, for debugging */
+    private void dumpEvent(MotionEvent event) {
+       String names[] = { "DOWN", "UP", "MOVE", "CANCEL", "OUTSIDE",
+             "POINTER_DOWN", "POINTER_UP", "7?", "8?", "9?" };
+       StringBuilder sb = new StringBuilder();
+       int action = event.getAction();
+       int actionCode = action & MotionEvent.ACTION_MASK;
+       sb.append("event ACTION_").append(names[actionCode]);
+       if (actionCode == MotionEvent.ACTION_POINTER_DOWN
+             || actionCode == MotionEvent.ACTION_POINTER_UP) {
+          sb.append("(pid ").append(
+                action >> MotionEvent.ACTION_POINTER_ID_SHIFT);
+          sb.append(")");
+       }
+       sb.append("[");
+       for (int i = 0; i < event.getPointerCount(); i++) {
+          sb.append("#").append(i);
+          sb.append("(pid ").append(event.getPointerId(i));
+          sb.append(")=").append((int) event.getX(i));
+          sb.append(",").append((int) event.getY(i));
+          if (i + 1 < event.getPointerCount())
+             sb.append(";");
+       }
+       sb.append("]");
+       //Log.d(TAG, sb.toString());
+    }
+    private float sqrDistance(MotionEvent event) {
+        float x = event.getX(0) - event.getX(1);
+        float y = event.getY(0) - event.getY(1);
+        return (float)(Math.sqrt(x * x + y * y));
+     }
+	
+}
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewerIOS/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_viewerIOS/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewerIOS/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewerIOS/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -15,7 +15,6 @@
 
 SET(TARGET_ADDED_LIBRARIES osgdb_osgearth_agglite
 osgdb_osgearth_arcgis
-osgdb_osgearth_arcgis_map_cache
 osgdb_osgearth_bing
 osgdb_osgearth_bumpmap
 osgdb_osgearth_cache_filesystem
@@ -23,12 +22,10 @@
 osgdb_osgearth_debug
 osgdb_osgearth_detail
 osgdb_earth
-osgdb_osgearth_engine_byo
 osgdb_osgearth_engine_mp
 osgdb_osgearth_engine_rex
 osgdb_osgearth_feature_elevation
 osgdb_osgearth_feature_ogr
-osgdb_osgearth_feature_raster
 osgdb_osgearth_feature_tfs
 osgdb_osgearth_feature_wfs
 osgdb_osgearth_feature_xyz
@@ -43,22 +40,14 @@
 osgdb_osgearth_model_feature_geom
 osgdb_osgearth_model_simple
 osgdb_osgearth_monitor
-osgdb_osgearth_noise
-osgdb_osgearth_ocean_simple
 osgdb_osgearth_osg
-osgdb_osgearth_quadkey
-osgdb_osgearth_refresh
 osgdb_osgearth_scriptengine_javascript
 osgdb_osgearth_sky_gl
 osgdb_osgearth_sky_simple
 osgdb_osgearth_skyview
-osgdb_osgearth_splat_mask
 osgdb_template
-osgdb_osgearth_template_matclass
 osgdb_osgearth_terrainshader
-osgdb_osgearth_tilecache
 osgdb_osgearth_tileindex
-osgdb_osgearth_tileservice
 osgdb_osgearth_tms
 osgdb_osgearth_vdatum_egm84
 osgdb_osgearth_vdatum_egm96
@@ -67,8 +56,7 @@
 osgdb_osgearth_vpb
 osgdb_osgearth_wcs
 osgdb_osgearth_wms
-osgdb_osgearth_xyz
-osgdb_osgearth_yahoo)
+osgdb_osgearth_xyz)
 
 SET(OSG_STATIC_PLUGINS osgdb_tiff osgdb_rgb osgdb_imageio osgdb_curl osgdb_zip osgdb_freetype osgdb_osg osgdb_ive osgdb_obj osgdb_shp osgdb_openflight osgdb_rot osgdb_scale osgdb_trans)
 
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewerIOS/osgPlugins.h osgearth-2.10.2+dfsg/src/applications/osgearth_viewerIOS/osgPlugins.h
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewerIOS/osgPlugins.h	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewerIOS/osgPlugins.h	2019-07-11 18:30:19.000000000 +0000
@@ -70,7 +70,6 @@
 // osgearth plugins
 USE_OSGPLUGIN(osgearth_agglite)
 USE_OSGPLUGIN(osgearth_arcgis)
-USE_OSGPLUGIN(osgearth_arcgis_map_cache)
 USE_OSGPLUGIN(osgearth_bing)
 USE_OSGPLUGIN(osgearth_bumpmap)
 USE_OSGPLUGIN(osgearth_cache_filesystem)
@@ -78,12 +77,10 @@
 USE_OSGPLUGIN(osgearth_debug)
 USE_OSGPLUGIN(osgearth_detail)
 USE_OSGPLUGIN(earth)
-USE_OSGPLUGIN(osgearth_engine_byo)
 USE_OSGPLUGIN(osgearth_engine_mp)
 USE_OSGPLUGIN(osgearth_engine_rex)
 USE_OSGPLUGIN(osgearth_feature_elevation)
 USE_OSGPLUGIN(osgearth_feature_ogr)
-USE_OSGPLUGIN(osgearth_feature_raster)
 USE_OSGPLUGIN(osgearth_feature_tfs)
 USE_OSGPLUGIN(osgearth_feature_wfs)
 USE_OSGPLUGIN(osgearth_feature_xyz)
@@ -98,22 +95,14 @@
 USE_OSGPLUGIN(osgearth_model_feature_geom)
 USE_OSGPLUGIN(osgearth_model_simple)
 USE_OSGPLUGIN(osgearth_monitor)
-USE_OSGPLUGIN(osgearth_noise)
-USE_OSGPLUGIN(osgearth_ocean_simple)
 USE_OSGPLUGIN(osgearth_osg)
-USE_OSGPLUGIN(osgearth_quadkey)
-USE_OSGPLUGIN(osgearth_refresh)
 USE_OSGPLUGIN(osgearth_scriptengine_javascript)
 USE_OSGPLUGIN(osgearth_sky_gl)
 USE_OSGPLUGIN(osgearth_sky_simple)
 USE_OSGPLUGIN(osgearth_skyview)
-USE_OSGPLUGIN(osgearth_splat_mask)
 USE_OSGPLUGIN(template)
-USE_OSGPLUGIN(osgearth_template_matclass)
 USE_OSGPLUGIN(osgearth_terrainshader)
-USE_OSGPLUGIN(osgearth_tilecache)
 USE_OSGPLUGIN(osgearth_tileindex)
-USE_OSGPLUGIN(osgearth_tileservice)
 USE_OSGPLUGIN(osgearth_tms)
 USE_OSGPLUGIN(osgearth_vdatum_egm84)
 USE_OSGPLUGIN(osgearth_vdatum_egm96)
@@ -123,27 +112,14 @@
 USE_OSGPLUGIN(osgearth_wcs)
 USE_OSGPLUGIN(osgearth_wms)
 USE_OSGPLUGIN(osgearth_xyz)
-USE_OSGPLUGIN(osgearth_yahoo)
 
 // extensions
-//USE_OSGPLUGIN(osgearth_annotations)
-//USE_OSGPLUGIN(osgearth_bumpmap)
 USE_OSGPLUGIN(osgearth_bump_map)
 USE_OSGPLUGIN(osgearth_contourmap)
 USE_OSGPLUGIN(osgearth_contour_map)
-//USE_OSGPLUGIN(osgearth_sky_gl)
-//USE_OSGPLUGIN(osgearth_graticule)
 USE_OSGPLUGIN(osgearth_lod_blending)
-//USE_OSGPLUGIN(osgearth_mapinspector)
-//USE_OSGPLUGIN(osgearth_mgrs_graticule)
-//USE_OSGPLUGIN(osgearth_noise)
 USE_OSGPLUGIN(osgearth_screen_space_layout)
 USE_OSGPLUGIN(osgearth_decluttering)
-//USE_OSGPLUGIN(osgearth_ocean_simple)
-//USE_OSGPLUGIN(osgearth_sky_simple)
-//USE_OSGPLUGIN(osgearth_splat)
-//USE_OSGPLUGIN(osgearth_terrainshader)
-//USE_OSGPLUGIN(osgearth_utm_graticule)
 
 // annotations
 USE_OSGEARTH_ANNOTATION(circle)
@@ -168,7 +144,6 @@
 USE_OSGEARTH_LAYER(land_cover)
 USE_OSGEARTH_LAYER(model)
 USE_OSGEARTH_LAYER(multi_elevation)
-//USE_OSGEARTH_LAYER(road_surface)
 USE_OSGEARTH_LAYER(simple_ocean)
 USE_OSGEARTH_LAYER(video)
 
@@ -180,7 +155,6 @@
 USE_OSGEARTH_SIMPLE_SYMBOL(extrusion)
 USE_OSGEARTH_SIMPLE_SYMBOL(icon)
 USE_OSGEARTH_SIMPLE_SYMBOL(line)
-USE_OSGEARTH_SIMPLE_SYMBOL(marker)
 USE_OSGEARTH_SIMPLE_SYMBOL(model)
 USE_OSGEARTH_SIMPLE_SYMBOL(point)
 USE_OSGEARTH_SIMPLE_SYMBOL(polygon)
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_viewerIOS/ViewController.mm osgearth-2.10.2+dfsg/src/applications/osgearth_viewerIOS/ViewController.mm
--- osgearth-2.9.0+dfsg/src/applications/osgearth_viewerIOS/ViewController.mm	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_viewerIOS/ViewController.mm	2019-07-11 18:30:19.000000000 +0000
@@ -86,7 +86,7 @@
     
     setenv("GDAL_DATA", dataPath.c_str(), 1);
     
-    osg::setNotifyLevel(osg::FATAL);
+    osg::setNotifyLevel(osg::DEBUG_FP);
     osgEarth::setNotifyLevel(osg::DEBUG_FP);
     
     // thread-safe initialization of the OSG wrapper manager. Calling this here
@@ -132,7 +132,7 @@
 	traits->sharedContext = 0;
 	traits->setInheritedWindowPixelFormat = true;
     
-	osg::ref_ptr<osg::Referenced> windata = new osgViewer::GraphicsWindowIOS::WindowData(self.view, osgViewer::GraphicsWindowIOS::WindowData::PORTRAIT_ORIENTATION, scale);
+	osg::ref_ptr<osg::Referenced> windata = new osgViewer::GraphicsWindowIOS::WindowData(self.view, self, osgViewer::GraphicsWindowIOS::WindowData::PORTRAIT_ORIENTATION, scale);
 	traits->inheritedWindowData = windata;
     
 	// Create the Graphics Context
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_wfs/osgearth_wfs.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_wfs/osgearth_wfs.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_wfs/osgearth_wfs.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_wfs/osgearth_wfs.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -103,7 +103,7 @@
         }
 
         // Get the features
-        osg::ref_ptr< FeatureCursor > cursor = featureSource->createFeatureCursor(query);
+        osg::ref_ptr< FeatureCursor > cursor = featureSource->createFeatureCursor(query, 0L);
         FeatureList features;
         cursor->fill(features);
         OE_NOTICE << "Got " << features.size() << " features" << std::endl;
@@ -113,7 +113,7 @@
         style.getOrCreateSymbol<TextSymbol>()->content() = StringExpression("[NAME]");
 
         // Create the FeatureNode with the features and the style.
-        osg::ref_ptr< FeatureNode > featureNode = new FeatureNode(mapNode, features, style);
+        osg::ref_ptr< FeatureNode > featureNode = new FeatureNode(features, style);
         mapNode->addChild(featureNode.get());                
 
         viewer.setSceneData( node );
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_windows/CMakeLists.txt osgearth-2.10.2+dfsg/src/applications/osgearth_windows/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/applications/osgearth_windows/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_windows/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,7 @@
+INCLUDE_DIRECTORIES(${OSG_INCLUDE_DIRS} )
+SET(TARGET_LIBRARIES_VARS OSG_LIBRARY OSGDB_LIBRARY OSGUTIL_LIBRARY OSGVIEWER_LIBRARY OPENTHREADS_LIBRARY)
+
+SET(TARGET_SRC osgearth_windows.cpp )
+
+#### end var setup  ###
+SETUP_APPLICATION(osgearth_windows)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_windows/osgearth_windows.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_windows/osgearth_windows.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_windows/osgearth_windows.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_windows/osgearth_windows.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,104 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include <osgViewer/CompositeViewer>
+#include <osgEarth/Notify>
+#include <osgEarthUtil/EarthManipulator>
+#include <osgEarthUtil/ExampleResources>
+#include <osgEarth/MapNode>
+#include <osgEarth/ThreadingUtils>
+#include <osgEarth/Metrics>
+#include <iostream>
+
+#define LC "[viewer] "
+
+using namespace osgEarth;
+using namespace osgEarth::Util;
+
+int
+usage(const char* name)
+{
+    OE_NOTICE 
+        << "\nUsage: " << name << " file.earth"
+        << "\n          --views [num] : Number of windows to open"
+        << "\n          --shared      : Use a shared graphics context"
+        << "\n"
+        << MapNodeHelper().usage() << std::endl;
+
+    return 0;
+}
+
+
+int
+main(int argc, char** argv)
+{
+    osg::ArgumentParser arguments(&argc,argv);
+
+    // help?
+    if ( arguments.read("--help") )
+        return usage(argv[0]);
+
+    int numViews = 1;
+    arguments.read("--views", numViews);
+
+    bool sharedGC;
+    sharedGC = arguments.read("--shared");
+
+    // create a viewer:
+    osgViewer::CompositeViewer viewer(arguments);
+    viewer.setThreadingModel(viewer.SingleThreaded);
+
+    osg::Node* node = MapNodeHelper().load(arguments, &viewer);
+    if (!node)
+        return usage(argv[0]);
+
+    int size = 500;
+
+    for(int i=0; i<numViews; ++i)
+    {
+        osgViewer::View* view = new osgViewer::View();
+        int width = sharedGC? size*numViews : size;
+        view->setUpViewInWindow(10+(i*size+30), 10, width, size);
+        view->setCameraManipulator(new EarthManipulator(arguments));
+        view->setSceneData(node);
+        view->getDatabasePager()->setUnrefImageDataAfterApplyPolicy( true, false );
+        if (sharedGC)
+        {
+            view->getCamera()->setViewport(i*size, 0, size, size);
+            view->getCamera()->setProjectionMatrixAsPerspective(45, 1, 1, 10);
+            view->getCamera()->setName(Stringify()<<"View "<<i);
+        }
+        MapNodeHelper().configureView(view);
+        viewer.addView(view);
+    }
+
+    if (sharedGC)
+    {
+        for(int i=1; i<numViews; ++i)
+        {
+            osgViewer::View* view = viewer.getView(i);
+            view->getCamera()->setGraphicsContext(viewer.getView(0)->getCamera()->getGraphicsContext());
+        }
+    }
+
+    return viewer.run();
+}
diff -Nru osgearth-2.9.0+dfsg/src/applications/osgearth_xfbtest/osgearth_xfbtest.cpp osgearth-2.10.2+dfsg/src/applications/osgearth_xfbtest/osgearth_xfbtest.cpp
--- osgearth-2.9.0+dfsg/src/applications/osgearth_xfbtest/osgearth_xfbtest.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/applications/osgearth_xfbtest/osgearth_xfbtest.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -400,7 +400,7 @@
     // into the Transform Feedback buffer.
     osg::Geometry* genGeom = makeGeneratorGeometry( ig->getControlPoints(), dim, radius );
     genGeom->getOrCreateStateSet()->setAttribute( makeGeneratorProgram() );
-    genGeom->getOrCreateStateSet()->addUniform( new osg::Uniform("cullingRadius", radius) ); // since we don't know where ther center point is
+    genGeom->getOrCreateStateSet()->addUniform( new osg::Uniform("cullingRadius", radius) ); // since we don't know where their center point is
     osg::Geode* genGeode = new osg::Geode();
     genGeode->addDrawable( genGeom );    
     
diff -Nru osgearth-2.9.0+dfsg/src/CMakeLists.txt osgearth-2.10.2+dfsg/src/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -14,7 +14,6 @@
 
 
 FOREACH( lib
-         osgEarthQt
          osgEarthSplat
          osgEarthSilverLining
          osgEarthTriton )
@@ -23,11 +22,11 @@
 
 ADD_SUBDIRECTORY( osgEarthDrivers )
 
-IF(NOT ANDROID)
+IF(BUILD_APPLICATIONS AND NOT ANDROID)
     ADD_SUBDIRECTORY( applications )
 ENDIF()
 
-IF(NOT OSGEARTH_BUILD_PLATFORM_IPHONE AND NOT OSGEARTH_BUILD_PLATFORM_IPHONE_SIMULATOR)
+IF(BUILD_TESTS AND NOT OSGEARTH_BUILD_PLATFORM_IPHONE)
     ADD_SUBDIRECTORY( tests )
 ENDIF()
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Async osgearth-2.10.2+dfsg/src/osgEarth/Async
--- osgearth-2.9.0+dfsg/src/osgEarth/Async	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Async	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,168 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef OSGEARTH_ASYNC_H
+#define OSGEARTH_ASYNC_H
+
+#include <osgEarth/Common>
+#include <osgEarth/IOTypes>
+#include <osgEarth/ThreadingUtils>
+#include <osg/Group>
+
+/**
+ * Classes for asynchronous loading of scene graph nodes.
+ */
+namespace osgEarth 
+{
+    /**
+     * Result returned from an asynchronous function
+     */
+    class OSGEARTH_EXPORT AsyncResult : public osg::Node
+    {
+    public:
+        AsyncResult(osg::Node* node);
+        osg::ref_ptr<osg::Node> _node;
+
+    private:
+        unsigned _requestId;
+        friend struct AsyncNodePseudoLoader;
+        friend class AsyncLOD;
+    };
+
+    //! Function that runs in the background to load a node
+    class OSGEARTH_EXPORT AsyncFunction : public osg::Referenced
+    {
+    public:
+        virtual osgEarth::ReadResult operator()() const = 0;
+    };
+
+    class AsyncNode;
+
+    //! LOD group that loads its children asynchronously.
+    //! This is a osg::PagedLOD replacement with more explicit
+    //! sematics and expanded functionality.
+    class AsyncLOD : public osg::Group
+    {
+    public:
+        enum Mode
+        {
+            MODE_GEOMETRIC_ERROR,
+            MODE_PIXEL_SIZE,
+            MODE_RANGE,
+        };
+
+        enum Policy
+        {
+            //! Load child 0, then add child 1, then add child 2, etc.
+            //! This policy lets you incrementally add more detail as you go.
+            //! Children must be in detail order (lowest->highest)
+            POLICY_ACCUMULATE,
+
+            //! Load child 0, replace child 0 with child 1, replace child 1 with 2, etc.
+            //! This policy is for levels of detail that wholly replace the lower LODs.            
+            //! Children must be in detail order (lowest->highest)
+            POLICY_REPLACE,
+
+            //! Treat each child independently of the others.
+            //! Like have each child under its own separate AsyncLOD node.
+            //! Children can be in any order.
+            POLICY_INDEPENDENT
+        };
+
+        AsyncLOD();
+
+        //! Method used to determine child node visibility
+        void setMode(const Mode& value);
+        const Mode& getMode() const;
+
+        //! How to display parent/child nodes with respect to each other
+        void setPolicy(const Policy& value);
+        const Policy& getPolicy() const;
+
+        //! Center point of this node (since it cannot be determined
+        //! before the contents are loaded)
+        void setCenter(const osg::Vec3d& center);
+
+        //! Radius of this node (since it cannot be determined
+        //! before the contents are loaded)
+        void setRadius(double radius);
+
+        //! Adds a new potential child that will load asynchronously
+        //! by calling the provided function in a background thread
+        void addChild(AsyncFunction* function, float minValue, float maxValue);
+
+        //! Adds a new "real" child
+        void addChild(osg::Node* node, float minValue, float maxValue);
+
+        //! Removes all children, real and potential
+        void clear();
+
+    public:
+
+        // INTERNAL - only to be called by the pager
+        // TODO: move this to a helper object and pass that in the myNodePath instead
+        // so that this method will not sully our API
+        bool addChild(osg::Node* node);
+
+    public:
+
+        //! Computes the bounding sphere, using a user-defined one first
+        //! if it's available
+        virtual osg::BoundingSphere computeBound() const;
+
+        virtual void traverse(osg::NodeVisitor& nv);
+
+    private:
+
+        //! Made a request to the pager to schedule the async function call.
+        void ask(AsyncNode& child, osg::NodeVisitor& nv);
+
+        //! Determines whether a child node is visible and therefore
+        //! should be processed for loading or viewing.
+        virtual bool isVisible(const AsyncNode& async, osg::NodeVisitor& nv) const;
+
+    private:
+
+        // collection of child nodes (potential or real)
+        std::vector<AsyncNode> _children;
+
+        // internal, used to tell the pager where to attach newly loaded nodes
+        osg::NodePath _nodePath;
+
+        // osgDB loader options
+        osg::ref_ptr<osgDB::Options> _readOptions;
+
+        // talbe mapping a request ID to an asynchronous request object
+        std::map<unsigned, AsyncNode*> _lookup;
+
+        // protects the lookup table
+        Threading::Mutex _mutex;
+
+        // how to decide whether to start loading a child
+        Mode _mode;
+
+        // bounding sphere for the as-yet-unloaded data
+        osg::BoundingSphere _userDefinedBound;
+
+        // how child node should interact with each other
+        Policy _policy;
+    };
+}
+
+#endif // OSGEARTH_ASYNC_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Async.cpp osgearth-2.10.2+dfsg/src/osgEarth/Async.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Async.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Async.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,384 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include <osgEarth/Async>
+#include <osgEarth/Registry>
+#include <osgEarth/Utils>
+
+#include <osg/CullStack>
+#include <osgDB/ReaderWriter>
+#include <osgDB/FileNameUtils>
+#include <osgDB/Registry>
+
+using namespace osgEarth;
+
+#define LC "[Async] "
+
+//........................................................................
+
+#define ASYNC_PSEUDOLOADER_EXT "osgearth_async_node"
+#define TAG_ASYNC_CALLBACK     "osgearth_async_callback"
+
+//........................................................................
+
+AsyncResult::AsyncResult(osg::Node* node) : 
+_node(node), _requestId(0u)
+{
+    //nop
+}
+
+//........................................................................
+
+namespace osgEarth
+{
+    // internal class
+    class AsyncNode : public osg::Referenced
+    {
+    public:
+        AsyncNode()
+        {
+            _needy = true;
+            _id = ++_idgen;
+            char buf[64];
+            sprintf(buf, "%u." ASYNC_PSEUDOLOADER_EXT, _id);
+            _pseudoloaderFilename = buf;
+        }
+
+        bool _needy;
+        unsigned _id;
+        osg::ref_ptr<osg::Node> _node;
+        osg::ref_ptr<AsyncFunction> _callback;
+        std::string _pseudoloaderFilename;
+        double _lastTimeWeMet;
+        float _minValue;
+        float _maxValue;
+        osg::BoundingSphere _bound;
+        osg::ref_ptr<osg::Referenced> _internalHandle;
+        osg::ref_ptr<osgDB::Options> _options;
+
+        void accept(osg::NodeVisitor& nv) { if (_node) _node->accept(nv); }
+
+        //! Use the node's bound if we have it, or a preset
+        //! bound if we don't.
+        const osg::BoundingSphere& getBound() const
+        {
+            if (_node.valid())
+                return _node->getBound();
+            else
+                return _bound;
+        }
+
+        static OpenThreads::Atomic _idgen;
+    };
+
+    OpenThreads::Atomic AsyncNode::_idgen;
+}
+
+//........................................................................
+
+AsyncLOD::AsyncLOD()
+{
+    _policy = POLICY_ACCUMULATE;
+    _mode = MODE_GEOMETRIC_ERROR;
+    _nodePath.push_back(this);
+}
+
+void
+AsyncLOD::setMode(const Mode& value)
+{
+    _mode = value;
+}
+
+const AsyncLOD::Mode&
+AsyncLOD::getMode() const
+{
+    return _mode;
+}
+
+void
+AsyncLOD::setPolicy(const Policy& value)
+{
+    _policy = value;
+}
+
+const AsyncLOD::Policy&
+AsyncLOD::getPolicy() const
+{
+    return _policy;
+}
+
+void
+AsyncLOD::setCenter(const osg::Vec3d& center)
+{
+    _userDefinedBound.set(center, _userDefinedBound.radius());
+}
+
+void
+AsyncLOD::setRadius(double radius)
+{
+    _userDefinedBound.set(_userDefinedBound.center(), radius);
+}
+
+void
+AsyncLOD::addChild(AsyncFunction* callback, float minValue, float maxValue)
+{
+    _children.push_back(AsyncNode());
+    AsyncNode& child = _children.back();
+    child._callback = callback;
+    child._minValue = minValue;
+    child._maxValue = maxValue;
+    child._lastTimeWeMet = DBL_MAX;
+    child._options = Registry::instance()->cloneOrCreateOptions(_readOptions.get());
+    OptionsData<AsyncFunction>::set(child._options.get(), TAG_ASYNC_CALLBACK, callback);
+    _lookup[child._id] = &child;
+}
+
+void
+AsyncLOD::addChild(osg::Node* node, float minValue, float maxValue)
+{
+    _children.push_back(AsyncNode());
+    AsyncNode& child = _children.back();
+    child._node = node;
+    child._minValue = minValue;
+    child._maxValue = maxValue;
+    child._lastTimeWeMet = DBL_MAX;
+}
+
+void
+AsyncLOD::clear()
+{
+    _children.clear();
+    _mutex.lock();
+    _lookup.clear();
+    _mutex.unlock();
+}
+
+
+// only to be called by the pager
+// TODO: move this to a helper object and pass that in the myNodePath instead
+// so that this method will not sully our API
+bool
+AsyncLOD::addChild(osg::Node* node)
+{
+    AsyncResult* ar = dynamic_cast<AsyncResult*>(node);
+    if (ar)
+    {
+        _mutex.lock();
+        std::map<unsigned, AsyncNode*>::iterator i = _lookup.find(ar->_requestId);
+        if (i != _lookup.end())
+        {
+            AsyncNode* async = i->second;
+
+            // if the operation returned a node, install it now
+            if (ar->_node.valid())
+            {
+                async->_node = ar->_node.get();
+            }
+
+            // node is no longer needy. Yay!
+            async->_needy = false;
+        }
+        _mutex.unlock();
+        return true;
+    }
+    return false;
+}
+
+
+//! Computes the bounding sphere, using a user-defined one first
+//! if it's available
+
+osg::BoundingSphere
+AsyncLOD::computeBound() const
+{
+    if (_userDefinedBound.valid())
+    {
+        return _userDefinedBound;
+    }
+    else
+    {
+        osg::BoundingSphere bs;
+        for (std::vector<AsyncNode>::const_iterator i = _children.begin();
+            i != _children.end();
+            ++i)
+        {
+            bs.expandBy(i->getBound());
+        }
+        return bs;
+    }
+}
+void
+AsyncLOD::traverse(osg::NodeVisitor& nv)
+{
+    if (nv.getVisitorType() == nv.CULL_VISITOR)
+    {
+        // last child that already has a node to display:
+        AsyncNode* lastHealthyChild = 0L;
+
+        // last child that still needs a node:
+        AsyncNode* lastNeedyChild = 0L;
+
+        // visit each child:
+        for (std::vector<AsyncNode>::iterator i = _children.begin(); i != _children.end(); ++i)
+        {
+            AsyncNode& child = *i;
+
+            // is the child visible?
+            if (isVisible(child, nv))
+            {
+                // if so, update its timestamp
+                child._lastTimeWeMet = nv.getFrameStamp()->getReferenceTime();
+
+                // if this child has a live node, traverse it if we're in 
+                // accumulate mode (which means everything loaded so far is visible)
+                if (child._node.valid())
+                {
+                    lastHealthyChild = &child;
+
+                    // depending on the policy, traverse the live node now.
+                    // In "replace" mode, we have to want and see because we only
+                    // want to display the last healthy node.
+                    if (_policy == POLICY_ACCUMULATE || _policy == POLICY_INDEPENDENT)
+                    {
+                        child._node->accept(nv);
+                    }
+                }
+
+                // if the child does NOT have a node (but wants one)
+                // put in a request. If we're in accumulate or refine mode,
+                // we'll defer this request until after we have checked on
+                // all children.
+                else if (child._needy)
+                {
+                    lastNeedyChild = &child;
+
+                    if (_policy == POLICY_INDEPENDENT)
+                    {
+                        ask(child, nv);
+                    }
+                }
+            }
+        }
+
+        // if we have a needy child, request it's node now. (If we are
+        // in "independent" mode we already did this earlier.)
+        if (lastNeedyChild != NULL && _policy != POLICY_INDEPENDENT)
+        {
+            ask(*lastNeedyChild, nv);
+        }
+
+        // in replacement mode (only display the last node) we need
+        // to traverse the last healthy child now.
+        if (lastHealthyChild != NULL && _policy == POLICY_REPLACE)
+        {
+            lastHealthyChild->accept(nv);
+        }
+    }
+
+    // Update, ComputeBound, CompileGLObjects, etc.
+    else if (nv.getTraversalMode() == nv.TRAVERSE_ALL_CHILDREN)
+    {
+        for (std::vector<AsyncNode>::iterator i = _children.begin(); i != _children.end(); ++i)
+        {
+            if (i->_node.valid())
+            {
+                i->_node->accept(nv);
+            }
+        }
+    }
+}
+
+
+//! Made a request to the pager to schedule the async function call.
+void
+AsyncLOD::ask(AsyncNode& child, osg::NodeVisitor& nv)
+{
+    nv.getDatabaseRequestHandler()->requestNodeFile(
+        child._pseudoloaderFilename,        // pseudo name that will invoke AsyncNodePseudoLoader
+        _nodePath,                          // parent of node to "add" when request completes
+        0.5f,                               // priority
+        nv.getFrameStamp(),                 // frame stamp
+        child._internalHandle,              // associates the request with a unique ID
+        child._options.get()                // osgDB plugin options
+    );
+}
+
+//! Determines whether a child node is visible and therefore
+//! should be processed for loading or viewing.
+bool
+AsyncLOD::isVisible(const AsyncNode& async, osg::NodeVisitor& nv) const
+{
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,6)
+    osg::CullStack* cullStack = nv.asCullStack();
+#else
+    osg::CullStack* cullStack = dynamic_cast<osg::CullStack*>(&nv);
+#endif
+
+    if (_mode == MODE_GEOMETRIC_ERROR)
+    {
+        if (cullStack && cullStack->getLODScale() > 0)
+        {
+            // size of this node. Use setCenter and setRadius to make this work.
+            float sizeInMeters = getBound().radius() * 2.0;
+            float sizeInPixels = cullStack->clampedPixelSize(getBound()) / cullStack->getLODScale();
+            float metersPerPixel = sizeInPixels > 0.0 ? sizeInMeters / sizeInPixels : 0.0f;
+            return metersPerPixel < async._maxValue;
+        }
+    }
+
+    else if (_mode == MODE_PIXEL_SIZE)
+    {
+        if (cullStack && cullStack->getLODScale() > 0)
+        {
+            float sizeInPixels = cullStack->clampedPixelSize(getBound()) / cullStack->getLODScale();
+            return async._minValue <= sizeInPixels && sizeInPixels < async._maxValue;
+        }
+    }
+
+    else if (_mode == MODE_RANGE)
+    {
+        float range = nv.getDistanceToViewPoint(getBound().center(), true);
+        return async._minValue <= range && range < async._maxValue;
+    }
+
+    return false;
+}
+
+namespace osgEarth
+{
+    struct AsyncNodePseudoLoader : public osgDB::ReaderWriter
+    {
+        ReadResult readNode(const std::string& location, const osgDB::Options* options) const
+        {
+            if (osgDB::getFileExtension(location) != ASYNC_PSEUDOLOADER_EXT)
+                return ReadResult::FILE_NOT_HANDLED;
+
+            osg::ref_ptr<AsyncFunction> callback = OptionsData<AsyncFunction>::get(options, TAG_ASYNC_CALLBACK);
+            if (!callback.valid())
+                return ReadResult::FILE_NOT_FOUND;
+
+            unsigned id = atoi(osgDB::getNameLessExtension(location).c_str());
+            osgEarth::ReadResult r = (*callback.get())();
+            //TODO: record error, use Progress...
+            osg::ref_ptr<AsyncResult> result = new AsyncResult(r.releaseNode());
+            if (result.valid())result->_requestId = id;
+            return ReadResult(result.release());
+        }
+    };
+    REGISTER_OSGPLUGIN(ASYNC_PSEUDOLOADER_EXT, AsyncNodePseudoLoader);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Bounds osgearth-2.10.2+dfsg/src/osgEarth/Bounds
--- osgearth-2.9.0+dfsg/src/osgEarth/Bounds	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Bounds	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -59,6 +59,8 @@
         bool isValid() const;
         bool isEmpty() const { return !isValid(); }
         void transform( const SpatialReference* fromSRS, const SpatialReference* toSRS );
+        void set(double xmin, double ymin, double xmax, double ymax);
+        void set(double xmin, double ymin, double zmin, double xmax, double ymax, double zmax); // compat
     };
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Bounds.cpp osgearth-2.10.2+dfsg/src/osgEarth/Bounds.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Bounds.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Bounds.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/Bounds>
-#include <osgEarth/StringUtils>
 #include <osgEarth/SpatialReference>
 
 using namespace osgEarth;
@@ -161,3 +160,15 @@
 {
     from->transformExtentToMBR( to, _min.x(), _min.y(), _max.x(), _max.y() );
 }
+
+void
+Bounds::set(double xmin, double ymin, double xmax, double ymax)
+{
+    osg::BoundingBoxd::set(xmin, ymin, -DBL_MAX, xmax, ymax, DBL_MAX);
+}
+
+void
+Bounds::set(double xmin, double ymin, double zmin, double xmax, double ymax, double zmax)
+{
+    osg::BoundingBoxd::set(xmin, ymin, zmin, xmax, ymax, zmax);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Cache osgearth-2.10.2+dfsg/src/osgEarth/Cache
--- osgearth-2.9.0+dfsg/src/osgEarth/Cache	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Cache	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -140,9 +140,14 @@
             //future
         }
     };
+}
+
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::CacheOptions);
 
 //--------------------------------------------------------------------
 
+namespace osgEarth
+{
     typedef PerObjectRefMap<std::string, CacheBin> ThreadSafeCacheBinMap;
 
 
@@ -213,6 +218,9 @@
          */
         virtual bool clear() { return false; }
 
+        //! Make a legal cache key with an optional prefix
+        static std::string makeCacheKey(const std::string& input, const std::string& prefix="");
+
     protected:
         bool                   _ok;
         CacheOptions           _options;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CacheBin osgearth-2.10.2+dfsg/src/osgEarth/CacheBin
--- osgearth-2.9.0+dfsg/src/osgEarth/CacheBin	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CacheBin	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -163,12 +163,7 @@
          * If key-hashing is enabled, this method returns the hashed key
          * corresponding to a raw input key.
          */
-        virtual std::string getHashedKey(const std::string& key) const =0;
-
-    public: //deprecated
-
-        /** @deprecated - use clear */
-        bool purge() { return clear(); } // backwards compatibility
+        //virtual std::string getHashedKey(const std::string& key) const =0;
 
 
     protected:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CacheBin.cpp osgearth-2.10.2+dfsg/src/osgEarth/CacheBin.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/CacheBin.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CacheBin.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,17 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/CacheBin>
-#include <osgEarth/ImageUtils>
-#include <osgEarth/ThreadingUtils>
 #include <osgEarth/Registry>
 #include <osgEarth/Cache>
 
-#include <osgDB/ReaderWriter>
 #include <osgDB/FileNameUtils>
 #include <osgDB/Registry>
-#include <osg/NodeVisitor>
-#include <osg/Texture>
-#include <osg/Image>
 #include <osg/TextureBuffer>
 
 using namespace osgEarth;
@@ -84,22 +78,12 @@
             traverse(node);
         }
 
-        void apply(osg::Geode& geode)
+        void apply(osg::Drawable& drawable)
         {
-            for (unsigned i = 0; i < geode.getNumDrawables(); ++i)
-            {
-                apply(geode.getDrawable(i));
-            }
-            apply(static_cast<osg::Node&>(geode));
-        }
-
-        void apply(osg::Drawable* drawable)
-        {
-            if (!drawable) return;
-            apply(drawable->getStateSet());
-            applyUserData(*drawable);
+            apply(drawable.getStateSet());
+            applyUserData(drawable);
             
-            osg::Geometry* geom = drawable->asGeometry();
+            osg::Geometry* geom = drawable.asGeometry();
             if (geom)
                 apply(geom);
         }
@@ -144,44 +128,7 @@
                         osg::Texture* tex = dynamic_cast<osg::Texture*>(sa);
                         if (tex)
                         {              
-                            tex->setUnRefImageDataAfterApply(false);               
-
-#if 0 // took this out in favor of the osg::DummyObject serializer above.
-
-                            // OSG's DatabasePager attaches "marker objects" to Textures' UserData when it runs a
-                            // FindCompileableGLObjectsVisitor. This operation is not thread-safe; it doesn't
-                            // account for the possibility that the texture may already be in use elsewhere.
-                            //
-                            // To prevent a threading violation, and the ensuing crash that reliably occurs
-                            // in Release mode (but not Debug for whatever reason) we are forced to make a
-                            // shallow clone of the Texture object and use that for serialization instead of
-                            // the original, since the original may change in the middle of the process.
-                            // We then replace the original with our close locally and serialize it safely.
-                            //
-                            // This "hack" prevents a crash in OSG 3.4.0 when trying to modify and then write
-                            // serialize the scene graph containing these shared texture objects.
-                            // Kudos to Jason B for figuring this one out.
-                            osg::Texture* texClone = osg::clone(tex, osg::CopyOp::SHALLOW_COPY);
-                            if ( texClone )
-                            {
-                                for (unsigned k = 0; k < texClone->getNumImages(); ++k)
-                                {
-                                    osg::Image* image = texClone->getImage(k);
-                                    if ( image )
-                                    {
-                                        applyUserData(*image);
-                                    }
-                                }
-
-                                applyUserData(*texClone);
-
-                                j->second.first = texClone;
-                            }
-                            else
-                            {
-                                OE_WARN << LC << "Texture clone failed.\n";
-                            }
-#endif
+                            tex->setUnRefImageDataAfterApply(false);   
                         }
                         else
                         {
@@ -264,8 +211,8 @@
                 {
                     // get the hashed key that the cache bin will use to actually write the image,
                     // and replace the image filename with it.
-                    std::string cacheKey = path;
-                    std::string hashKey = _bin->getHashedKey(cacheKey);
+                    std::string cacheKey = Cache::makeCacheKey(path, "xref");
+                    //std::string hashKey = _bin->getHashedKey(cacheKey);
 
                     // Append the pseudoloader suffix so our PL can locate the image in the cache.
                     image.setFileName(cacheKey + ".osgearth_cachebin");
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Cache.cpp osgearth-2.10.2+dfsg/src/osgEarth/Cache.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Cache.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Cache.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,14 +18,9 @@
  */
 #include <osgEarth/Cache>
 #include <osgEarth/Registry>
-#include <osgEarth/ThreadingUtils>
+#include "sha1.hpp"
 
-#include <osg/UserDataContainer>
-#include <osgDB/FileNameUtils>
-#include <osgDB/FileUtils>
 #include <osgDB/ReadFile>
-#include <osgDB/Registry>
-#include <osgDB/ReaderWriter>
 
 using namespace osgEarth;
 using namespace osgEarth::Threading;
@@ -142,6 +137,34 @@
     _bins.remove( bin );
 }
 
+namespace
+{
+    int hash8(const std::string& str)
+    {
+        int hash = 0;
+        for(unsigned i=0; i<str.length(); ++i)
+            hash += (int)str[i];
+        return hash;
+    }
+}
+
+std::string
+Cache::makeCacheKey(const std::string& key, const std::string& prefix)
+{
+    char hex[SHA1_HEX_SIZE];
+    sha1(key.c_str()).finalize().print_hex(hex);
+    std::string val(hex);
+    std::stringstream out;
+    if (!prefix.empty())
+    {
+        out << prefix << "/";
+    }
+    // Use the first 2 characters as a directory name and the remainder as the filename
+    // This is the same scheme that git uses
+    out << val.substr(0, 2) << "/" << val.substr(2, 38);
+    return out.str();
+}
+
 //------------------------------------------------------------------------
 
 #undef  LC
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CacheEstimator osgearth-2.10.2+dfsg/src/osgEarth/CacheEstimator
--- osgearth-2.9.0+dfsg/src/osgEarth/CacheEstimator	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CacheEstimator	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CacheEstimator.cpp osgearth-2.10.2+dfsg/src/osgEarth/CacheEstimator.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/CacheEstimator.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CacheEstimator.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CachePolicy osgearth-2.10.2+dfsg/src/osgEarth/CachePolicy
--- osgearth-2.9.0+dfsg/src/osgEarth/CachePolicy	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CachePolicy	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -137,5 +137,6 @@
         optional<TimeStamp> _minTime;
     };
 }
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::CachePolicy);
 
 #endif // OSGEARTH_CACHE_POLICY_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CachePolicy.cpp osgearth-2.10.2+dfsg/src/osgEarth/CachePolicy.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/CachePolicy.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CachePolicy.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/CachePolicy>
-#include <osgEarth/Cache>
-#include <limits.h>
+
+#include <limits.h> 
 
 using namespace osgEarth;
 
@@ -139,24 +139,24 @@
 void
 CachePolicy::fromConfig( const Config& conf )
 {
-    conf.getIfSet( "usage", "read_write",   _usage, USAGE_READ_WRITE );
-    conf.getIfSet( "usage", "read_only",    _usage, USAGE_READ_ONLY );
-    conf.getIfSet( "usage", "cache_only",   _usage, USAGE_CACHE_ONLY );
-    conf.getIfSet( "usage", "no_cache",     _usage, USAGE_NO_CACHE );
-    conf.getIfSet( "usage", "none",         _usage, USAGE_NO_CACHE );
-    conf.getIfSet( "max_age", _maxAge );
-    conf.getIfSet( "min_time", _minTime );
+    conf.get( "usage", "read_write",   _usage, USAGE_READ_WRITE );
+    conf.get( "usage", "read_only",    _usage, USAGE_READ_ONLY );
+    conf.get( "usage", "cache_only",   _usage, USAGE_CACHE_ONLY );
+    conf.get( "usage", "no_cache",     _usage, USAGE_NO_CACHE );
+    conf.get( "usage", "none",         _usage, USAGE_NO_CACHE );
+    conf.get( "max_age", _maxAge );
+    conf.get( "min_time", _minTime );
 }
 
 Config
 CachePolicy::getConfig() const
 {
     Config conf( "cache_policy" );
-    conf.addIfSet( "usage", "read_write",   _usage, USAGE_READ_WRITE );
-    conf.addIfSet( "usage", "read_only",    _usage, USAGE_READ_ONLY );
-    conf.addIfSet( "usage", "cache_only",   _usage, USAGE_CACHE_ONLY );
-    conf.addIfSet( "usage", "no_cache",     _usage, USAGE_NO_CACHE );
-    conf.addIfSet( "max_age", _maxAge );
-    conf.addIfSet( "min_time", _minTime );
+    conf.set( "usage", "read_write",   _usage, USAGE_READ_WRITE );
+    conf.set( "usage", "read_only",    _usage, USAGE_READ_ONLY );
+    conf.set( "usage", "cache_only",   _usage, USAGE_CACHE_ONLY );
+    conf.set( "usage", "no_cache",     _usage, USAGE_NO_CACHE );
+    conf.set( "max_age", _maxAge );
+    conf.set( "min_time", _minTime );
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CacheSeed osgearth-2.10.2+dfsg/src/osgEarth/CacheSeed
--- osgearth-2.9.0+dfsg/src/osgEarth/CacheSeed	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CacheSeed	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CacheSeed.cpp osgearth-2.10.2+dfsg/src/osgEarth/CacheSeed.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/CacheSeed.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CacheSeed.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,13 +21,7 @@
 */
 
 #include <osgEarth/CacheSeed>
-#include <osgEarth/CacheEstimator>
-#include <osgEarth/MapFrame>
-#include <osgEarth/Map>
 #include <osgEarth/ImageLayer>
-#include <osgEarth/ElevationLayer>
-#include <OpenThreads/ScopedLock>
-#include <limits.h>
 
 #define LC "[CacheSeed] "
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Capabilities osgearth-2.10.2+dfsg/src/osgEarth/Capabilities
--- osgearth-2.9.0+dfsg/src/osgEarth/Capabilities	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Capabilities	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -150,6 +150,9 @@
         /** Maximum size of a texture buffer, when supportsTextureBuffer() is true. */
         int getMaxTextureBufferSize() const { return _maxTextureBufferSize; }
 
+        /** whether OpenGL core profile is active */
+        bool isCoreProfile() const { return _isCoreProfile; }
+
     protected:
         Capabilities();
 
@@ -194,6 +197,7 @@
         bool _isGLES;
         bool _supportsTextureBuffer;
         int  _maxTextureBufferSize;
+        bool _isCoreProfile;
 
     public:
         friend class Registry;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Capabilities.cpp osgearth-2.10.2+dfsg/src/osgEarth/Capabilities.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Capabilities.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Capabilities.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,18 +19,22 @@
 #include <osgEarth/Capabilities>
 #include <osgEarth/Version>
 #include <osg/FragmentProgram>
-#include <osg/GraphicsContext>
-#include <osg/GL>
-#include <osg/GLExtensions>
 #include <osg/GL2Extensions>
-#include <osg/Texture>
+#include <osg/Version>
 #include <osgViewer/Version>
-#include <OpenThreads/Thread>
+#include <gdal_priv.h>
 
 using namespace osgEarth;
 
 #define LC "[Capabilities] "
 
+#ifndef GL_CONTEXT_PROFILE_MASK
+#define GL_CONTEXT_PROFILE_MASK           0x9126
+#endif
+#ifndef GL_CONTEXT_CORE_PROFILE_BIT
+#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
+#endif
+
 // ---------------------------------------------------------------------------
 // A custom P-Buffer graphics context that we will use to query for OpenGL 
 // extension and hardware support. (Adapted from osgconv in OpenSceneGraph)
@@ -140,7 +144,8 @@
 _supportsETC            ( false ),
 _supportsRGTC           ( false ),
 _supportsTextureBuffer  ( false ),
-_maxTextureBufferSize   ( 0 )
+_maxTextureBufferSize   ( 0 ),
+_isCoreProfile          ( true )
 {
     // little hack to force the osgViewer library to link so we can create a graphics context
     osgViewerGetVersion();
@@ -161,15 +166,30 @@
 #endif
 
     // create a graphics context so we can query OpenGL support:
+    osg::GraphicsContext* gc = NULL;
+    unsigned int id = 0;
+#ifndef __ANDROID__
     MyGraphicsContext mgc;
-
     if ( mgc.valid() )
     {
-        osg::GraphicsContext* gc = mgc._gc.get();
-        unsigned int id = gc->getState()->getContextID();
+        gc = mgc._gc.get();
+        id = gc->getState()->getContextID();
+    }
+#endif
+
+#ifndef __ANDROID__
+    if ( gc != NULL )
+#endif
+    {
         const osg::GL2Extensions* GL2 = osg::GL2Extensions::Get( id, true );
 
         OE_INFO << LC << "osgEarth Version: " << osgEarthGetVersion() << std::endl;
+
+        OE_INFO << LC << "OSG Version:      " << osgGetVersion() << std::endl;
+
+#ifdef GDAL_RELEASE_NAME
+        OE_INFO << LC << "GDAL Version:     " << GDAL_RELEASE_NAME << std::endl;
+#endif
         
         if ( ::getenv("OSGEARTH_NO_GLSL") )
         {
@@ -192,6 +212,19 @@
         _version = std::string( reinterpret_cast<const char*>(glGetString(GL_VERSION)) );
         OE_INFO << LC << "  Version = " << _version << std::endl;
 
+        // Detect core profile by investigating GL_CONTEXT_PROFILE_MASK
+        if ( GL2->glVersion < 3.2f )
+        {
+            _isCoreProfile = false;
+        }
+        else
+        {
+            GLint profileMask = 0;
+            glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &profileMask);
+            _isCoreProfile = ((profileMask & GL_CONTEXT_CORE_PROFILE_BIT) != 0);
+        }
+        OE_INFO << LC << "  Core Profile = " << SAYBOOL(_isCoreProfile) << std::endl;
+
 #if !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GLES3_AVAILABLE)
         glGetIntegerv( GL_MAX_TEXTURE_UNITS, &_maxFFPTextureUnits );
         //OE_INFO << LC << "  Max FFP texture units = " << _maxFFPTextureUnits << std::endl;
@@ -237,8 +270,6 @@
 #else
         _maxLights = 1;
 #endif
-        OE_INFO << LC << "  Max lights = " << _maxLights << std::endl;
-
         OE_INFO << LC << "  GLSL = " << SAYBOOL(_supportsGLSL) << std::endl;
 
         if ( _supportsGLSL )
@@ -253,14 +284,11 @@
             osg::isGLExtensionSupported( id, "GL_EXT_texture_array" );
         OE_INFO << LC << "  Texture arrays = " << SAYBOOL(_supportsTextureArrays) << std::endl;
 
-        _supportsTexture3D = osg::isGLExtensionSupported( id, "GL_EXT_texture3D" );
-        OE_INFO << LC << "  3D textures = " << SAYBOOL(_supportsTexture3D) << std::endl;
-
         _supportsMultiTexture = 
             osg::getGLVersionNumber() >= 1.3f ||
             osg::isGLExtensionSupported( id, "GL_ARB_multitexture") ||
             osg::isGLExtensionSupported( id, "GL_EXT_multitexture" );
-        OE_INFO << LC << "  Multitexturing = " << SAYBOOL(_supportsMultiTexture) << std::endl;
+        //OE_INFO << LC << "  Multitexturing = " << SAYBOOL(_supportsMultiTexture) << std::endl;
 
         _supportsStencilWrap = osg::isGLExtensionSupported( id, "GL_EXT_stencil_wrap" );
         //OE_INFO << LC << "  Stencil wrapping = " << SAYBOOL(_supportsStencilWrap) << std::endl;
@@ -286,7 +314,7 @@
         _supportsUniformBufferObjects = 
             _supportsGLSL &&
             osg::isGLExtensionOrVersionSupported( id, "GL_ARB_uniform_buffer_object", 2.0f );
-        OE_INFO << LC << "  uniform buffer objects = " << SAYBOOL(_supportsUniformBufferObjects) << std::endl;
+        //OE_INFO << LC << "  uniform buffer objects = " << SAYBOOL(_supportsUniformBufferObjects) << std::endl;
 
         if ( _supportsUniformBufferObjects && _maxUniformBlockSize == 0 )
         {
@@ -300,7 +328,7 @@
 #else
         _supportsNonPowerOfTwoTextures = true;
 #endif
-        OE_INFO << LC << "  NPOT textures = " << SAYBOOL(_supportsNonPowerOfTwoTextures) << std::endl;
+        //OE_INFO << LC << "  NPOT textures = " << SAYBOOL(_supportsNonPowerOfTwoTextures) << std::endl;
 
 
 #if !defined(OSG_GLES3_AVAILABLE)
@@ -324,7 +352,7 @@
 
         bool supportsTransformFeedback =
             osg::isGLExtensionSupported( id, "GL_ARB_transform_feedback2" );
-        OE_INFO << LC << "  Transform feedback = " << SAYBOOL(supportsTransformFeedback) << "\n";
+        //OE_INFO << LC << "  Transform feedback = " << SAYBOOL(supportsTransformFeedback) << "\n";
 
 
         // Writing to gl_FragDepth is not supported under GLES, is supported under gles3
@@ -342,22 +370,11 @@
         // BUT unfortunately, they dont' seem to work too well with shaders. Colors
         // change randomly, etc. Might work OK for textured geometry but not for 
         // untextured. TODO: investigate.
-#if 1
         _preferDLforStaticGeom = false;
         if ( ::getenv("OSGEARTH_TRY_DISPLAY_LISTS") )
         {
             _preferDLforStaticGeom = true;
         }
-#else
-        if ( ::getenv("OSGEARTH_ALWAYS_USE_VBOS") )
-        {
-            _preferDLforStaticGeom = false;
-        }
-        else
-        {
-            _preferDLforStaticGeom = isNVIDIA;
-        }
-#endif
 
         //OE_INFO << LC << "  prefer DL for static geom = " << SAYBOOL(_preferDLforStaticGeom) << std::endl;
 
@@ -365,15 +382,6 @@
         bool isATI = _vendor.find("ATI ") == 0;
 
         _supportsMipmappedTextureUpdates = isATI && enableATIworkarounds ? false : true;
-        //OE_INFO << LC << "  Mipmapped texture updates = " << SAYBOOL(_supportsMipmappedTextureUpdates) << std::endl;
-
-#if 0
-        // Intel workarounds:
-        bool isIntel = 
-            _vendor.find("Intel ")   != std::string::npos ||
-            _vendor.find("Intel(R)") != std::string::npos ||
-            _vendor.compare("Intel") == 0;
-#endif
 
         _maxFastTextureSize = _maxTextureSize;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CascadeDrapingDecorator osgearth-2.10.2+dfsg/src/osgEarth/CascadeDrapingDecorator
--- osgearth-2.9.0+dfsg/src/osgEarth/CascadeDrapingDecorator	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CascadeDrapingDecorator	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,149 @@
+/* -*-c++-*- */
+/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+* Copyright 2016 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#ifndef OSGEARTH_CASCADE_DRAPING_DECORATOR
+#define OSGEARTH_CASCADE_DRAPING_DECORATOR
+
+#include <osgEarth/Common>
+#include <osgEarth/Containers>
+#include <osgEarth/DrapingCullSet>
+#include <osg/Group>
+
+namespace osg {
+    class Plane;
+}
+namespace osgUtil {
+    class CullVisitor;
+}
+
+namespace osgEarth
+{
+    class TerrainResources;
+
+    /**
+     * Projects geometry from a separate scene graph onto the terrain.
+     */
+    class OSGEARTH_EXPORT CascadeDrapingDecorator : public osg::Group
+    {
+    public:
+        //! Constructs a decorator
+        CascadeDrapingDecorator(const SpatialReference* srs, TerrainResources*);
+
+        //! Sets the maximum number of texture cascases to use (default=4, max=4)
+        void setMaxNumCascades(unsigned value);
+
+        //! Number of multisamples to use to improve image quality (default=4)
+        void setNumMultiSamples(unsigned value);
+
+        //! Texture size for draping target (default=1024)
+        void setTextureSize(unsigned value);
+
+        //! Whether to mipmap projected textures (default=false)
+        void setUseMipMaps(bool value);
+
+        //! Whether to use projection matrix fitting
+        void setUseProjectionFitting(bool value);
+        bool getUseProjectionFitting() const { return _useProjectionFitting; }
+
+        //! Sets the minimum n/f ratio for projection fitting
+        void setMinimumNearFarRatio(double value);
+
+        //! Debugging method (used by osgearth_overlayviewer to visualize cascades)
+        osg::Node* getDump();
+
+    public: // osg::Node
+
+        void traverse( osg::NodeVisitor& nv );
+
+    protected:
+
+        virtual ~CascadeDrapingDecorator() { }
+
+        // Data for one RTT cascade
+        struct Cascade
+        {
+            double _minClipY, _maxClipY;
+            //double _minX, _minY, _maxX, _maxY;
+            osg::BoundingBoxd _box;
+            double _widthNDC, _heightNDC;
+
+            void expandToInclude(const osg::Vec3d&);
+            void computeProjection(const osg::Matrix&, const osg::Matrix&, const osg::EllipsoidModel&, const osg::Plane&, double, const osg::BoundingBoxd&);
+            void computeClipCoverage(const osg::Matrix&, const osg::Matrix&);
+            void makeProj(double dp);
+
+            osg::ref_ptr<osg::Camera> _rtt;
+            osg::Matrix _rttProj;
+            osg::ref_ptr<osg::StateSet> _stateSet;
+        };
+
+        // RTT configuration for a single master camera.
+        // (i.e. there will be one of these for each Camera that traverses DrapingDecorator)
+        struct CameraLocal : public osg::Observer
+        {
+            Cascade _cascades[8];
+            unsigned _numCascades;
+            unsigned _maxCascades;
+            osg::ref_ptr<osg::StateSet> _rttSS;
+            osg::ref_ptr<osg::StateSet> _terrainSS;
+            osg::Matrix _projMatrixLastFrame;
+
+            void initialize(osg::Camera* camera, CascadeDrapingDecorator&);
+            void traverse(osgUtil::CullVisitor*, CascadeDrapingDecorator&, const osg::BoundingSphere&);
+            void clear();
+            void constrainRttBoxToFrustum(const osg::Matrix&, const osg::Matrix&, const osg::EllipsoidModel&, bool, osg::BoundingBoxd& rttBox);
+            void constrainRttBoxToBounds(const osg::Matrix&, const osg::BoundingSphere&, osg::BoundingBoxd& rttBox);
+            bool intersectTerrain(CascadeDrapingDecorator& dec, const osg::Vec3d& startWorld, const osg::Vec3d& endWorld, osg::Vec3d& output);
+
+            void dump(const osg::Camera* cam, CascadeDrapingDecorator&);
+
+            osg::observer_ptr<osg::Camera> _token;            
+            void objectDeleted(void*);
+            ~CameraLocal();
+        };
+        
+        int _unit;
+        unsigned _multisamples;
+        unsigned _maxCascades;
+        unsigned _texSize;
+        bool _mipmapping;
+        double _maxHorizonDistance;
+        PerObjectFastMap<const osg::Camera*, CameraLocal> _data;
+        osg::ref_ptr<osg::Group> _dump;
+        bool _debug;
+        osg::ref_ptr<const SpatialReference> _srs;
+        bool _constrainMaxYToFrustum;
+        bool _constrainRttBoxToDrapingSetBounds;
+        bool _useProjectionFitting;
+        double _minNearFarRatio;
+
+        // tracks drapable objects in the scene graph
+        mutable DrapingManager _manager;
+        DrapingManager& getDrapingManager() { return _manager; }
+        friend class MapNode;
+
+        osg::observer_ptr<TerrainResources> _resources;
+        void reserveTextureImageUnit();
+    };
+
+} // namespace osgEarth
+
+#endif //OSGEARTH_CASCADE_DRAPING_DECORATOR
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CascadeDrapingDecorator.cpp osgearth-2.10.2+dfsg/src/osgEarth/CascadeDrapingDecorator.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/CascadeDrapingDecorator.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CascadeDrapingDecorator.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,1192 @@
+/* -*-c++-*- */
+/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+* Copyright 2016 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#include <osgEarth/CascadeDrapingDecorator>
+#include <osgEarth/Registry>
+#include <osgEarth/Capabilities>
+#include <osgEarth/Horizon>
+#include <osgEarth/VirtualProgram>
+#include <osgEarth/Shaders>
+#include <osgEarth/TerrainResources>
+#include <osgEarth/ShaderUtils>
+#include <osgEarth/LineDrawable>
+#include <osgEarth/GLUtils>
+
+#include <osg/Texture2D>
+#include <osg/Texture2DArray>
+#include <osg/BlendFunc>
+#include <osg/ShapeDrawable>
+#include <osg/AutoTransform>
+#include <osg/Depth>
+#include <osgUtil/CullVisitor>
+#include <osgUtil/LineSegmentIntersector>
+#include <osgShadow/ConvexPolyhedron>
+
+#include <stdlib.h> // getenv
+
+#define LC "[CascadeDrapingDecorator] "
+
+using namespace osgEarth;
+
+
+
+// Whether to intersect the ellipsoid versus the horizon plane when
+// building cascade bounding boxes. This will result in closer cascades
+// but less resolution at distance
+//#define USE_ELLIPSOID_INTERSECTIONS
+
+// Enable this to generate an "--activity" readout of all cascade information
+//#define DEBUG_CASCADES
+
+// Enable this to do a terrain intersection before configuring the first cascade
+#define USE_TERRAIN_INTERSECTION
+
+// TODO ITEMS:
+// - Address the dangling CameraLocal when a view disappears
+
+
+namespace
+{
+    struct Line2d
+    {
+        bool intersectRaysXY(
+            const osg::Vec3d& p0, const osg::Vec3d& d0,
+            const osg::Vec3d& p1, const osg::Vec3d& d1,
+            osg::Vec3d& out_p,
+            double&     out_u,
+            double&     out_v) const
+        {
+            static const double epsilon = 0.001;
+
+            double det = d0.y()*d1.x() - d0.x()*d1.y();
+            if ( osg::equivalent(det, 0.0, epsilon) )
+                return false; // parallel
+
+            out_u = (d1.x()*(p1.y()-p0.y())+d1.y()*(p0.x()-p1.x()))/det;
+            out_v = (d0.x()*(p1.y()-p0.y())+d0.y()*(p0.x()-p1.x()))/det;
+            out_p = p0 + d0*out_u;
+            return true;
+        }
+
+        osg::Vec3d _a, _b;
+
+        Line2d(const osg::Vec3d& p0, const osg::Vec3d& p1) : _a(p0), _b(p1) { }
+
+        Line2d(const osg::Vec4d& p0, const osg::Vec4d& p1)
+            : _a(p0.x()/p0.w(), p0.y()/p0.w(), p0.x()/p0.w()), _b(p1.x()/p1.w(), p1.y()/p1.w(), p1.z()/p1.w()) { }
+
+        bool intersect(const Line2d& rhs, osg::Vec4d& out) const {
+            double u, v;
+            osg::Vec3d temp;
+            bool ok = intersectRaysXY(_a, (_b-_a), rhs._a, (rhs._b-rhs._a), temp, u, v);
+            out.set( temp.x(), temp.y(), temp.z(), 1.0 );
+            return ok;
+        }
+        bool intersect(const Line2d& rhs, osg::Vec3d& out) const {
+            double u, v;
+            return intersectRaysXY(_a, (_b-_a), rhs._a, (rhs._b-rhs._a), out, u, v);
+        }
+    };
+
+    void fitProjectionMatrix(osg::Matrix& proj, double nfratio)
+    {
+        // construct the polygon, which winds counter-clockwise from upper-right to lower-right.a
+        osg::Vec4d t0(+1.0, 1.0, 0.0, 1.0);
+        osg::Vec4d t1(-1.0, 1.0, 0.0, 1.0);
+        osg::Vec4d t2(-nfratio, -1.0, 0.0, 1.0);
+        osg::Vec4d t3(+nfratio, -1.0, 0.0, 1.0);
+
+        // Next warp our polygon t0,t1,t2,t3 into a clip-space square
+        // through a series of matrix operations.
+        osg::Vec4d u, v;
+        osg::Matrix M;
+
+        // translate the center of the near plane to the origin
+        u = (t2 + t3) * 0.5;
+        osg::Matrix T1;
+        T1.makeTranslate(-u.x(), -u.y(), 0.0);
+        M = T1;
+
+        // find the intersection of the side lines t0,t3 and t1,t2
+        // and translate that point is at the origin:
+        osg::Vec4d i;
+        Line2d(t0, t3).intersect(Line2d(t1, t2), i);
+        u = i*M;
+        osg::Matrix T2;
+        T2.makeTranslate(-u.x(), -u.y(), 0.0);
+        M = T2*M;
+
+        // scale the near corners to [-1,1] and [1,1] respectively:
+        u = t3*M; // ...not t2.
+        osg::Matrix S1;
+        S1.makeScale(1 / u.x(), 1 / u.y(), 1.0);
+        M = M*S1;
+
+        // project onto the Y plane and translate the whole thing
+        // back down to the origin at the same time.
+        const osg::Matrix N(
+            1, 0, 0, 0,
+            0, 1, 0, 1,
+            0, 0, 1, 0,
+            0, -1, 0, 0);
+        M = M*N;
+
+        // scale it back to unit size:
+        u = t0*M;
+        v = t3*M;
+        osg::Matrix S3;
+        S3.makeScale(1.0, 2.0 / (u.y() / u.w() - v.y() / v.w()), 1.0);
+        M = M*S3;
+
+        // finally, translate it to it lines up with the clip space boundaries.
+        osg::Matrix T4;
+        T4.makeTranslate(0.0, -1.0, 0.0);
+        M = M*T4;
+
+        // apply the result to the projection matrix.
+        proj.postMult(M);
+    }
+}
+
+
+
+CascadeDrapingDecorator::CascadeDrapingDecorator(const SpatialReference* srs, TerrainResources* resources) :
+_unit(-1),
+_multisamples(2u),
+_maxCascades(4u),
+_texSize(1024u),
+_mipmapping(false),
+_maxHorizonDistance(DBL_MAX),
+_debug(false),
+_srs(srs),
+_resources(resources),
+_constrainMaxYToFrustum(false),
+_constrainRttBoxToDrapingSetBounds(true),
+_useProjectionFitting(true),
+_minNearFarRatio(0.25)
+{
+    if (::getenv("OSGEARTH_DRAPING_DEBUG"))
+        _debug = true;
+
+    const char* c = NULL;
+
+    c = ::getenv("OSGEARTH_DRAPING_TEXTURE_SIZE");
+    if (c)
+        setTextureSize((unsigned)atoi(c));
+
+    c = ::getenv("OSGEARTH_DRAPING_MAX_CASCADES");
+    if (c)
+        setMaxNumCascades((unsigned)atoi(c));
+
+    c = ::getenv("OSGEARTH_DRAPING_MIPMAPPING");
+    if (c)
+        setUseMipMaps(atoi(c)? true : false);
+
+    c = ::getenv("OSGEARTH_DRAPING_MULTISAMPLES");
+    if (c)
+        setNumMultiSamples((unsigned)atoi(c));
+
+    c = ::getenv("OSGEARTH_DRAPING_MAX_HORIZON_DISTANCE");
+    if (c)
+        _maxHorizonDistance = (double)atoi(c);
+
+    c = ::getenv("OSGEARTH_DRAPING_CONSTRAIN_TO_BOUNDS");
+    if (c)
+        _constrainRttBoxToDrapingSetBounds = atoi(c)?true:false;
+
+    c = ::getenv("OSGEARTH_DRAPING_CONSTRAIN_TO_FRUSTUM");
+    if (c)
+        _constrainMaxYToFrustum = atoi(c)?true:false;
+
+    c = ::getenv("OSGEARTH_DRAPING_USE_PROJECTION_FITTING");
+    if (c)
+        _useProjectionFitting = atoi(c)?true:false;
+}
+
+void
+CascadeDrapingDecorator::setMaxNumCascades(unsigned value)
+{
+    _maxCascades = osg::clampBetween(value, 1u, 8u);
+}
+
+void
+CascadeDrapingDecorator::setNumMultiSamples(unsigned value)
+{
+    _multisamples = osg::clampBetween(value, 0u, 4u);
+}
+
+void
+CascadeDrapingDecorator::setTextureSize(unsigned value)
+{
+    _texSize = osg::clampBetween(value, 256u, 4096u);
+}
+
+void
+CascadeDrapingDecorator::setUseMipMaps(bool value)
+{
+    _mipmapping = value;
+}
+
+void
+CascadeDrapingDecorator::setUseProjectionFitting(bool value)
+{
+    _useProjectionFitting = value;
+}
+
+void
+CascadeDrapingDecorator::setMinimumNearFarRatio(double value)
+{
+    _minNearFarRatio = value;
+}
+
+void
+CascadeDrapingDecorator::traverse(osg::NodeVisitor& nv)
+{
+    bool traversedChildren = false;
+
+    if (nv.getVisitorType() == nv.CULL_VISITOR)
+    {
+        osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(&nv);
+        if (cv)
+        {
+            const osg::Camera* camera = cv->getCurrentCamera();
+
+            // only proceed if there is geometry to drape.
+            // TODO: is this correct? if there's nothing, should be clear out any
+            // pre-existing projected texture or set a uniform or something?
+            const osg::BoundingSphere& bound = _manager.get(camera).getBound();
+            if (bound.valid())
+            {
+                // if we don't have a texture unit reserved, do so now.
+                if (_unit < 0)
+                {
+                    reserveTextureImageUnit();
+                }
+
+                if (_unit >= 0)
+                {
+                    // access the draping configuration for this camera:
+                    CameraLocal& local = _data.get(camera);
+
+                    // traverse the RTT camera(s) and generate the projective texture
+                    local.traverse(cv, *this, bound);
+
+                    // then push the projected texture state and traverse the terrain.
+                    cv->pushStateSet(local._terrainSS.get());
+                    osg::Group::traverse(nv);
+                    cv->popStateSet();
+
+                    traversedChildren = true;
+                
+                    // debugging
+                    if (camera->getName() == "dump")
+                        local.dump(camera, *this);
+
+                    local._projMatrixLastFrame = *cv->getProjectionMatrix();
+                }
+            }
+        }
+    }
+
+    if (!traversedChildren)
+    {
+        osg::Group::traverse(nv);
+    }
+}
+
+void
+CascadeDrapingDecorator::reserveTextureImageUnit()
+{
+    if (_unit < 0)
+    {
+        static Threading::Mutex mutex;
+        mutex.lock();
+
+        osg::ref_ptr<TerrainResources> tr;
+        if (_unit < 0 && _resources.lock(tr))
+        {
+            tr->reserveTextureImageUnit(_unit, "Draping");
+        }
+
+        mutex.unlock();
+    }
+}
+
+osg::Node*
+CascadeDrapingDecorator::getDump()
+{
+    osg::Node* n = _dump.release();
+    _dump = 0L;
+    return n;
+}
+
+//........................................................................
+
+namespace
+{
+    /**
+     * A camera that will traverse the per-thread DrapingCullSet instead of its own children.
+     */
+    class DrapingCamera : public osg::Camera
+    {
+    public:
+        DrapingCamera(DrapingManager& dm, const osg::Camera* parentCamera) 
+            : osg::Camera(), _parentCamera(parentCamera), _dm(dm)
+        {
+            setCullingActive( false );
+            osg::StateSet* ss = getOrCreateStateSet();
+
+            // do not sort geometry - draw it in traversal order without depth testing
+            ss->setMode(GL_DEPTH_TEST, 0);
+            ss->setRenderBinDetails(1, "TraversalOrderBin", osg::StateSet::OVERRIDE_PROTECTED_RENDERBIN_DETAILS);
+        }
+
+    public: // osg::Node
+
+        void traverse(osg::NodeVisitor& nv)
+        {
+            DrapingCullSet& cullSet = _dm.get(_parentCamera);
+            cullSet.accept( nv );
+
+            // manhandle the render bin sorting, since OSG ignores the override
+            // in the render bin details above
+            osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(&nv);
+            if (cv)
+            {
+                applyTraversalOrderSorting(cv->getCurrentRenderBin());
+            }
+        }
+
+        void applyTraversalOrderSorting(osgUtil::RenderBin* bin)
+        {
+            bin->setSortMode(osgUtil::RenderBin::TRAVERSAL_ORDER);
+
+            for (osgUtil::RenderBin::RenderBinList::iterator i = bin->getRenderBinList().begin();
+                i != bin->getRenderBinList().end();
+                ++i)
+            {
+                osgUtil::RenderBin* child = i->second.get();
+                applyTraversalOrderSorting(child);
+            }
+        }
+
+    protected:
+        virtual ~DrapingCamera() { }
+        const osg::Camera* _parentCamera;
+        DrapingManager& _dm;
+    };
+
+
+    //! Intersect a world-space ray with a plane.
+    bool
+    intersectRayWithPlane(const osg::Vec3d& L0,
+                          const osg::Vec3d& L1,
+                          const osg::Plane& plane,
+                          osg::Vec3d& output)
+    {
+        osg::Vec3d L = L1 - L0;
+        L.normalize();
+
+        const osg::Plane::Vec3_type N = plane.getNormal();
+
+        double dist = plane.distance(L0);
+
+#if 0
+        // Numerator always resolves to -dist, so this is commented out
+        // as an optimization. Leave it here to show why.
+        osg::Vec3d P0 = L0-N*dist;    // point on the plane
+        double numer = (P0 - L0) * N; // always -dist
+        if (numer == 0)
+            return false;
+#endif
+
+        double numer = -dist;
+
+        double denom = L * N;
+        if (osg::equivalent(denom, 0.0))
+            return false;
+
+        double d = numer/denom;
+
+        // enforce "ray" .. fail if intersection is behind L0
+        if (d <= 0.0)
+            return false;
+
+        output = L0 + L*d;
+        return true;
+    }
+
+    //! Intersect a world-space ray with the ellipsoid
+    bool
+    intersectRayWithEllipsoid(const osg::Vec3d& p0,
+                              const osg::Vec3d& p1,
+                              const osg::EllipsoidModel& ellipsoid,
+                              osg::Vec3d& output)
+    {
+        // reference frame (converts world ellipsoid to unit sphere)
+        osg::Vec3d unitSphereFrame(
+            1.0/ellipsoid.getRadiusEquator(),
+            1.0/ellipsoid.getRadiusEquator(),
+            1.0/ellipsoid.getRadiusPolar());
+
+        // get radius at p0:
+        osg::Vec3d temp = osg::componentMultiply(p0, unitSphereFrame);
+        temp.normalize();
+        temp = osg::componentDivide(temp, unitSphereFrame);
+        double R = temp.length();
+
+        osg::Vec3d d = p1 - p0;
+
+        double a = d * d;
+        double b = 2.0 * (d*p0);
+        double c = (p0*p0) - R*R;
+
+        double t0, t1;
+
+        double D = b*b - 4*a*c;
+        if (D < 0.0)
+            return false;
+
+        double sD = sqrt(D);
+        
+        t0 = (-b+sD)/(2*a);
+        t1 = (-b-sD)/(2*a);
+
+        if (t0>t1)
+            std::swap(t0,t1);
+
+        if (t0 < 0.0)
+            t0 = t1;
+
+        if (t0 < 0.0)
+            return false;
+
+        osg::Vec3d v = d*t0;
+        output = p0 + v;
+        //maxDist = osg::maximum(maxDist, (output-p0).length());
+        return true;
+    }
+
+    inline double mix(double a, double b, double t) 
+    { 
+        return a*(1.0 - t) + b*t;
+    }
+}
+
+CascadeDrapingDecorator::CameraLocal::~CameraLocal()
+{
+    osg::ref_ptr<osg::Camera> camera;
+    if (_token.lock(camera))
+    {
+        camera->removeObserver(this);
+    }
+}
+
+void
+CascadeDrapingDecorator::CameraLocal::objectDeleted(void* ptr)
+{
+    OE_DEBUG << "CameraLocal::objectDeleted" << std::endl;
+    for (unsigned i = 0; i < 4; ++i)
+    {
+        _cascades[i]._rtt = 0L;
+        _terrainSS = 0L;
+    }
+}
+
+void
+CascadeDrapingDecorator::CameraLocal::initialize(osg::Camera* camera, CascadeDrapingDecorator& decorator)
+{
+    // set up the auto-delete of orphaned cameras
+    _token = camera;
+    camera->getOrCreateObserverSet()->addObserver(this);
+
+    unsigned textureWidth;
+    unsigned textureHeight;
+
+    unsigned multiSamples;
+    osg::Texture::FilterMode minifyFilter, magnifyFilter;
+    osg::Vec4 clearColor;
+    bool mipmapping = decorator._mipmapping;
+
+    // if the master cam is a picker, just limit to one cascade with no sampling.
+    bool isPickCamera = camera->getName() == "osgEarth::RTTPicker";
+    if (isPickCamera)
+    {
+        textureWidth = osg::minimum(512u, decorator._texSize);
+        textureHeight = osg::minimum(512u, decorator._texSize);
+        _maxCascades = 2u; // limit to one cascade when picking
+        multiSamples = 0u; // no antialiasing allowed
+        minifyFilter = osg::Texture::NEAREST; // no texture filtering allowed
+        magnifyFilter = osg::Texture::NEAREST;
+        clearColor.set(0,0,0,0);
+        mipmapping = false;
+    }
+    else
+    {
+        textureWidth = decorator._texSize;
+        textureHeight = decorator._texSize;
+        _maxCascades = decorator._maxCascades;
+        multiSamples = decorator._multisamples;
+        minifyFilter = mipmapping? osg::Texture::LINEAR_MIPMAP_LINEAR : osg::Texture::LINEAR;
+        magnifyFilter = osg::Texture::LINEAR;
+        clearColor.set(1,1,1,0);
+    }
+
+    // Create the shared draping texture.
+    osg::Texture2DArray* tex = new osg::Texture2DArray();
+    tex->setTextureSize(textureWidth, textureHeight, osg::maximum(_maxCascades+1, 4u));
+    tex->setInternalFormat(GL_RGBA);
+    tex->setSourceFormat(GL_RGBA);
+    tex->setSourceType(GL_UNSIGNED_BYTE);
+    tex->setResizeNonPowerOfTwoHint(false);
+    tex->setFilter(tex->MIN_FILTER, minifyFilter);
+    tex->setFilter(tex->MAG_FILTER, magnifyFilter);
+    tex->setWrap(tex->WRAP_S, tex->CLAMP_TO_EDGE);
+    tex->setWrap(tex->WRAP_T, tex->CLAMP_TO_EDGE);
+    tex->setMaxAnisotropy(4.0f);
+    
+    // set up the global RTT camera state:
+    _rttSS = new osg::StateSet();
+    osg::StateAttribute::OverrideValue forceOff = osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE;
+    osg::StateAttribute::OverrideValue forceOn  = osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED | osg::StateAttribute::OVERRIDE;
+    
+    // blending:
+    _rttSS->setAttributeAndModes(
+        new osg::BlendFunc(GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_ONE, GL_ONE_MINUS_SRC_ALPHA),
+        forceOn);
+
+    // Cannot do this because it will break picking -gw
+    //VirtualProgram* rttVP = VirtualProgram::getOrCreate(_rttSS.get());
+    //rttVP->setInheritShaders(false);
+
+    for (unsigned i = 0; i < _maxCascades; ++i)
+    {
+        osg::ref_ptr<osg::Camera> rtt = new DrapingCamera(decorator._manager, camera);
+
+        rtt->setClearColor(clearColor);
+
+        if (decorator._debug && camera->getName() == "dump")
+        {
+            if (i==0 || i==4)
+                rtt->setClearColor(osg::Vec4(1,0,0,0.15));
+            else if (i==1 || i==5)
+                rtt->setClearColor(osg::Vec4(0,1,0,0.15));
+            else if (i==2 || i==6)
+                rtt->setClearColor(osg::Vec4(0,0,1,0.15));
+            else
+                rtt->setClearColor(osg::Vec4(1,1,0,0.15));
+        }
+
+        rtt->setGraphicsContext(camera->getGraphicsContext());
+        rtt->setReferenceFrame(rtt->ABSOLUTE_RF_INHERIT_VIEWPOINT);
+        rtt->setViewport(0, 0, textureWidth, textureHeight);
+        rtt->setRenderOrder(rtt->PRE_RENDER);
+        rtt->setRenderTargetImplementation(rtt->FRAME_BUFFER_OBJECT);
+        rtt->setComputeNearFarMode(rtt->DO_NOT_COMPUTE_NEAR_FAR);
+        rtt->setImplicitBufferAttachmentMask(0, 0); // no implicit attachments!
+        rtt->setDrawBuffer(GL_FRONT);
+        rtt->setReadBuffer(GL_FRONT);
+
+        rtt->attach(
+            rtt->COLOR_BUFFER,        // target
+            tex,                      // texture to populate
+            0u,                       // mipmap level
+            i,                        // texture array index
+            mipmapping,               // mipmapping
+            multiSamples);            // antialiasing multi-samples
+
+        // Note: No depth buffer.
+
+        // Set this so we can detect the RTT camera's parent for the DrapingCamera and
+        // for things like auto-scaling, picking, etc.
+        // GW: unnecessary unless we want to eventually share RTT cameras?
+        rtt->setView(camera->getView());
+
+        // no addChild() because the DrapingCamera will automatically traverse the current cull set
+
+        _cascades[i]._rtt = rtt.get();
+    }
+
+    // Set up a stateSet for the terrain that will apply the projected texture.
+    _terrainSS = new osg::StateSet();
+
+    // bind the projected texture
+    _terrainSS->setTextureAttributeAndModes(decorator._unit, tex, 1);
+    _terrainSS->getOrCreateUniform("oe_Draping_tex", osg::Uniform::SAMPLER_2D)->set((int)decorator._unit);
+    _terrainSS->setDefine("OE_DRAPING_MAX_CASCADES", Stringify() << decorator._maxCascades);
+    
+    // install the shader program to project a texture on the terrain
+    VirtualProgram* drapingShader = VirtualProgram::getOrCreate(_terrainSS.get());
+    drapingShader->setName("Draping");
+    Shaders shaders;
+    shaders.load(drapingShader, shaders.CascadeDraping);
+}
+
+void
+CascadeDrapingDecorator::CameraLocal::clear()
+{
+    //todo - clear out unused RTT cameras/textures
+}
+
+void CascadeDrapingDecorator::Cascade::expandToInclude(const osg::Vec3d& pointView)
+{
+    _box.xMin() = osg::minimum(_box.xMin(), pointView.x());
+    _box.yMin() = osg::minimum(_box.yMin(), pointView.y());
+    _box.xMax() = osg::maximum(_box.xMax(), pointView.x());
+    _box.yMax() = osg::maximum(_box.yMax(), pointView.y());
+}
+
+namespace
+{
+    void clipBox(osg::BoundingBoxd& box, const osg::BoundingBoxd& crop) //, double prevMaxY)
+    {
+        box.xMin() = box.xMin() !=  DBL_MAX ? osg::maximum(box.xMin(), crop.xMin()) : crop.xMin();
+        box.xMax() = box.xMax() != -DBL_MAX ? osg::minimum(box.xMax(), crop.xMax()) : crop.xMax();
+        box.yMin() = box.yMin() !=  DBL_MAX ? osg::maximum(box.yMin(), crop.yMin()) : crop.yMin();
+        box.yMax() = box.yMax() != -DBL_MAX ? osg::minimum(box.yMax(), crop.yMax()) : crop.yMax();
+    }
+}
+
+void CascadeDrapingDecorator::Cascade::computeProjection(const osg::Matrix& rttView,
+                                                  const osg::Matrix& iCamMVP,
+                                                  const osg::EllipsoidModel& ellipsoid,
+                                                  const osg::Plane& plane,
+                                                  double dp,
+                                                  const osg::BoundingBoxd& rttBox)
+{
+    osg::EllipsoidModel e;
+
+    // intersect the view frustum's edge vectors with the horizon plane
+    osg::Vec3d LL, LR, UL, UR;
+    bool LL_ok=false, LR_ok=false, UL_ok=false, UR_ok=false;
+   
+    osg::Vec3d N, F;
+
+    N = osg::Vec3d(-1,_maxClipY,-1)*iCamMVP, F = osg::Vec3d(-1,_maxClipY,+1)*iCamMVP;
+#ifdef USE_ELLIPSOID_INTERSECTIONS
+    UL_ok = intersectRayWithEllipsoid(N, F, ellipsoid, UL);
+#endif
+    if (!UL_ok) UL_ok = intersectRayWithPlane(N, F, plane, UL);
+
+    N = osg::Vec3d(+1,_maxClipY,-1)*iCamMVP, F = osg::Vec3d(+1,_maxClipY,+1)*iCamMVP;
+#ifdef USE_ELLIPSOID_INTERSECTIONS
+    UR_ok = intersectRayWithEllipsoid(N, F, ellipsoid, UR);
+#endif
+    if (!UR_ok) UR_ok = intersectRayWithPlane(N, F, plane, UR);
+    
+    N = osg::Vec3d(-1,_minClipY,-1)*iCamMVP, F = osg::Vec3d(-1,_minClipY,+1)*iCamMVP;
+#ifdef USE_ELLIPSOID_INTERSECTIONS
+    LL_ok = intersectRayWithEllipsoid(N, F, ellipsoid, LL);
+#endif
+    if (!LL_ok) LL_ok = intersectRayWithPlane(N, F, plane, LL);
+
+    N = osg::Vec3d(+1,_minClipY,-1)*iCamMVP, F = osg::Vec3d(+1,_minClipY,+1)*iCamMVP;
+#ifdef USE_ELLIPSOID_INTERSECTIONS
+    LR_ok = intersectRayWithEllipsoid(N, F, ellipsoid, LR);
+#endif
+    if (!LR_ok) LR_ok = intersectRayWithPlane(N, F, plane, LR);
+
+    // next, transform each frustum point into RTT view space (looking down),
+    // and expand the orthographic extents to include all valid points    
+    _box.set(DBL_MAX, DBL_MAX, DBL_MAX, -DBL_MAX, -DBL_MAX, -DBL_MAX);
+
+    // if all frustum edges intersect the horizon plane, calculate the region
+    // bounded by the intersected area. Do this by projecting each point into
+    // the RTT's view plane.
+    if (UL_ok && UR_ok && LL_ok && LR_ok)
+    {
+        expandToInclude(UL*rttView);
+        expandToInclude(UR*rttView);
+        expandToInclude(LL*rttView);
+        expandToInclude(LR*rttView);
+    }
+
+    // if only the LL and LR edges intersect, the view is pitched up over the horizon. 
+    // Clamp the Y extent to 0 to prevent RTT-ing behind the camera.
+    else if (LL_ok && LR_ok)
+    {
+        _box.yMin() = 0.0;
+    }
+
+    // If looking forward, clamp the minimum Y to zero so we don't
+    // clip geometry in front of us
+    if (_minClipY == -1.0 && _box.yMin() >= 0.0)
+    {
+        _box.yMin() = 0.0;
+
+        // bump to near clip plane
+        osg::Vec3d NP(0, -1, -1);
+        osg::Vec3d RT = NP * iCamMVP * rttView;
+        _box.yMin() = osg::maximum(0.0, RT.y());
+    }
+
+    // constrain by original RTT box (e.g., bounds of geometry)
+    clipBox(_box, rttBox);
+
+    // construct the projection matrix for RTT
+    makeProj(dp);
+}
+
+void CascadeDrapingDecorator::Cascade::makeProj(double rttFar)
+{
+    _rttProj.makeOrtho(_box.xMin(), _box.xMax(), _box.yMin(), _box.yMax(), -rttFar*4, rttFar);
+}
+
+// Computes the "coverage" of the RTT region in normalized [0..1] clip space.
+// If the width and height are 1.0, that means the RTT region will fit exactly 
+// within the camera's viewport. For example, a heightNDC of 3.0 means that the
+// RTT region is 3x "longer" than the viewport can accommodate; therefore we will need
+// multiple cascades.
+void CascadeDrapingDecorator::Cascade::computeClipCoverage(const osg::Matrix& rttView, const osg::Matrix& camMVP)
+{
+    // inverse of the RTT MVP matrix:
+    osg::Matrix rttMVP = rttView * _rttProj;
+    osg::Matrix rttMVPInv;
+    rttMVPInv.invert(rttMVP);
+
+    // matrix to transform from RTT clip to camera clip:
+    osg::Matrix rttClipToCamClip = rttMVPInv * camMVP;
+
+    osg::Vec3d winLL = osg::Vec3d(-1, _minClipY, +1) * rttClipToCamClip;
+    osg::Vec3d winLR = osg::Vec3d(+1, _minClipY, +1) * rttClipToCamClip;
+    osg::Vec3d winUL = osg::Vec3d(-1, _maxClipY, +1) * rttClipToCamClip;
+    osg::Vec3d winUR = osg::Vec3d(+1, _maxClipY, +1) * rttClipToCamClip;
+
+    // NEW:
+    _minClipY = osg::minimum(winLL.y(), winLR.y());
+    _maxClipY = osg::maximum(winUL.y(), winUR.y());
+
+    // width and height [0..1]
+    _widthNDC = std::max(winUR.x() - winUL.x(), winLR.x() - winLL.x())*0.5 + 0.5;
+    _heightNDC = (std::max(winUL.y(), winUR.y()) - std::min(winLL.y(), winLR.y()))*0.5 + 0.5;
+}
+
+#define MAXABS4(A,B,C,D) \
+    osg::maximum(fabs(A), osg::maximum(fabs(B), osg::maximum(fabs(C),fabs(D))))
+
+void CascadeDrapingDecorator::CameraLocal::constrainRttBoxToFrustum(const osg::Matrix& iCamMVP, 
+                                                             const osg::Matrix& rttView, 
+                                                             const osg::EllipsoidModel& ellipsoid,
+                                                             bool constrainY,
+                                                             osg::BoundingBoxd& rttBox)
+{
+    // transform camera clip space into RTT view space (the maxExt space)
+    osg::Matrix camProjToRttView = iCamMVP * rttView;
+
+    if (constrainY)
+    {
+        // contrain both dimensions - in practice, this might not be necessary
+        // because the far clip plane is always (?) beyond the horizon plane due to 
+        // bounding-sphere culling. Also, doing this may cause the cascade sizes to
+        // "jump" which might be an undesirable visual effect. -gw
+        osg::Vec3d farLL = osg::Vec3d(-1,-1,+1)*camProjToRttView;
+        osg::Vec3d farLR = osg::Vec3d(+1,-1,+1)*camProjToRttView;
+        osg::Vec3d farUL = osg::Vec3d(-1,+1,+1)*camProjToRttView;
+        osg::Vec3d farUR = osg::Vec3d(+1,+1,+1)*camProjToRttView;
+        double x = osg::minimum(rttBox.xMax(), MAXABS4(farLL.x(), farLR.x(), farUL.x(), farUR.x()));
+        double y = osg::minimum(rttBox.yMax(), MAXABS4(farLL.y(), farLR.y(), farUL.y(), farUR.y()));
+        rttBox.set(-x, -y, 0, x, y, 0);
+    }
+    else
+    {
+        osg::Vec3d farLL = osg::Vec3d(-1,-1,+1)*camProjToRttView;
+        osg::Vec3d farUR = osg::Vec3d(+1,+1,+1)*camProjToRttView;
+        double x = osg::minimum(rttBox.xMax(), osg::maximum(fabs(farLL.x()), fabs(farUR.x())));
+        rttBox.xMin() = -x, rttBox.xMax() = x;
+    }
+}
+
+void CascadeDrapingDecorator::CameraLocal::constrainRttBoxToBounds(const osg::Matrix& rttView, 
+                                                            const osg::BoundingSphere& bound, 
+                                                            osg::BoundingBoxd& rttBox)
+{
+    // center point in RTT view space:
+    osg::Vec3d c = bound.center() * rttView;
+
+    // radius (no scale? what is the earth is scaled?)
+    double r = bound.radius();
+    
+    rttBox.yMin() = osg::maximum(rttBox.yMin(), c.y()-r);
+    rttBox.yMax() = osg::minimum(rttBox.yMax(), c.y()+r);
+    rttBox.xMin() = osg::maximum(rttBox.xMin(), c.x()-r);
+    rttBox.xMax() = osg::minimum(rttBox.xMax(), c.x()+r);
+}
+
+bool
+CascadeDrapingDecorator::CameraLocal::intersectTerrain(CascadeDrapingDecorator& terrain, const osg::Vec3d& startWorld, const osg::Vec3d& endWorld, osg::Vec3d& outputWorld)
+{
+    osgUtil::LineSegmentIntersector* lsi = new osgUtil::LineSegmentIntersector(osgUtil::Intersector::MODEL, startWorld, endWorld);
+    lsi->setIntersectionLimit(lsi->LIMIT_NEAREST);
+    osgUtil::IntersectionVisitor iv(lsi);
+    terrain.accept(iv);
+    bool hit = lsi->containsIntersections();
+    if (hit)
+    {
+        outputWorld = lsi->getFirstIntersection().getWorldIntersectPoint();
+    }
+    return hit;
+}
+
+void
+CascadeDrapingDecorator::CameraLocal::traverse(osgUtil::CullVisitor* cv, CascadeDrapingDecorator& decorator, const osg::BoundingSphere& bounds)
+{    
+    osg::Camera* camera = cv->getCurrentCamera();
+
+    // first time through, intiailize the RTT cameras.
+    if (_rttSS.valid() == false)
+    {
+        initialize(camera, decorator);
+    }
+
+    // establish the camera view vectors:
+    const osg::Matrix& camView = camera->getViewMatrix();
+    osg::Vec3d camEye, camCenter, camUp;
+    camView.getLookAt(camEye, camCenter, camUp);
+    osg::Vec3d camLook = camCenter-camEye;
+    camLook.normalize();
+
+    // camera modelview matrix (world -> view)
+    const osg::Matrix& camMV = *cv->getModelViewMatrix();
+
+    // camera projection matrix (from previous frame)
+    const osg::Matrix& camProj = _projMatrixLastFrame;
+
+    // camera world -> clip
+    osg::Matrixd camMVP = camMV * camProj;
+
+    // camera clip -> world
+    osg::Matrixd iCamMVP;
+    iCamMVP.invert(camMVP);
+
+    // horizon plane (world space) - the plane passing through the
+    // ellipsoid's visible horizon in all directions from the camera.
+    osg::Plane horizonPlane;
+
+    // distance to the visible horizon (in any direction)
+    double dh;
+
+    // Shortest distance from the camera to the horizon plane (straight down)
+    double dp;
+    
+    // Maximum theorectical extent of the draping region; i.e. the distance
+    // from the camera to the visible horizon projected onto the horizon plane.
+    // This the largest possible extent we will need for RTT.
+    osg::BoundingBoxd rttBox;
+    
+    osg::EllipsoidModel fakeEM;
+    const osg::EllipsoidModel* ellipsoid = decorator._srs->getEllipsoid();
+
+    if (decorator._srs->isGeographic())
+    {
+        Horizon* horizon = Horizon::get(*cv);
+        horizon->getPlane(horizonPlane);
+        dh = horizon->getDistanceToVisibleHorizon();
+        dp = horizonPlane.distance(camEye);
+    }
+    else
+    {
+        // in projected mode, the horizon is at an infinite distance, so
+        // we need to simulate it.
+        dp = osg::maximum(camEye.z(), 100.0);
+        dh = sqrt(2.0*6356752.3142*dp + dp*dp);
+        horizonPlane.set(osg::Vec3d(0,0,1), dp);
+    }
+
+#if 0
+    // intersect the terrain and build a custom horizon plane.
+    osg::Vec3d camFar = osg::Vec3d(0, 0, 1) * iCamMVP;
+    osg::Vec3d isect;
+    if (intersectTerrain(decorator, camEye, camFar, isect))
+    {
+        //double diff = isect.length() - dp;
+        //if (diff > 0.0)
+        {
+            fakeEM.setRadiusEquator(isect.length());
+            fakeEM.setRadiusPolar(isect.length());
+            osg::ref_ptr<Horizon> horizon = new Horizon(fakeEM);
+            horizon->setEye(camEye);
+            horizon->getPlane(horizonPlane);
+            dh = horizon->getDistanceToVisibleHorizon();
+            dp = horizonPlane.distance(camEye);
+            ellipsoid = &fakeEM;
+        }
+    }
+#endif
+
+    // project visible horizon distance into the horizon plane:
+    double m = sqrt(dh*dh - dp*dp);
+    m = osg::minimum(m, decorator._maxHorizonDistance);
+    rttBox.set(-m, -m, 0, m, m, 0);
+
+    // Create a view matrix that looks straight down at the horizon plane form the eyepoint.
+    // This will be our view matrix for all RTT draping cameras.
+    osg::Matrix rttView;
+    osg::Vec3d rttLook = -ellipsoid->computeLocalUpVector(camEye.x(), camEye.y(), camEye.z());
+    rttLook.normalize();
+    osg::Vec3d camLeft = camUp ^ camLook;
+    osg::Vec3d rttUp = rttLook ^ camLeft;
+    rttView.makeLookAt(camEye, camEye + rttLook, rttUp);
+
+    bool colinear = (rttLook * camLook) > 0.99999;
+
+    osg::Matrix iRttView;
+    iRttView.invert(rttView);
+
+    // So far, rttBox is a theoretical max. Now we can constrain it based on
+    // the actual camera frustum and (optionally) far clip plane. 
+    // Constraining the the far clip gives a tigher bounds, but can result in 
+    // "resolution jumps" as the camera moves around and the far clip plane
+    // jumps around.
+    constrainRttBoxToFrustum(iCamMVP, rttView, *ellipsoid, decorator._constrainMaxYToFrustum, rttBox);
+
+    // further constrain the max extent based on the bounds of the draped geometry
+    if (decorator._constrainRttBoxToDrapingSetBounds)
+    {
+        constrainRttBoxToBounds(rttView, bounds, rttBox);
+    }
+
+    // camera view -> world
+    osg::Matrix iCamMV;
+    iCamMV.invert(camMV);
+
+    // Start by computing the full extent of the RTT region. We will use the results
+    // of this math to decide how many cascades we need to use. (We are using 
+    // cascade[0] here as a temporary workspace, but will re-use it later for the actual
+    // highest resolution cascade).
+    _cascades[0]._minClipY = -1.0;
+    _cascades[0]._maxClipY = 1.0;
+    _cascades[0].computeProjection(rttView, iCamMVP, *ellipsoid, horizonPlane, dp, rttBox);
+
+    // Next compute the extent, in pixels, of the full RTT. If it's larger than our
+    // texture cascade size, we may need multiple cascases.
+    _cascades[0].computeClipCoverage(rttView, camMVP);
+
+    // Update the main RTT box with the new computation:
+    rttBox = _cascades[0]._box;
+
+    // Compute the nunber and size of the draping cascades.
+    {
+        // Interesect the terrain along the view vector.
+        // Use this information to gauge the relative elevation near the camera
+        // so we can increase the resolution of the near cascade if necessary.
+        optional<double> firstYMax(rttBox.yMax());
+
+#ifdef USE_TERRAIN_INTERSECTIONS
+        if (rttBox.yMin() >= 0.0)
+        {
+            osg::Vec3d camFar = osg::Vec3d(0,0,1) * iCamMVP;
+            osg::Vec3d isect;
+            if (intersectTerrain(decorator, camEye, camFar, isect))
+            {
+                isect = isect * rttView;        // terrain look-at point in rttView space
+                double hat = -isect.z();        // height above terrain
+                double ymax = isect.y() + hat;
+                firstYMax = ymax;
+            }
+        }
+#endif
+
+#ifdef DEBUG_CASCADES
+        std::stringstream buf;
+#endif
+
+        // Height (Y-span) of the RTT box in meters
+        double rttHeight = rttBox.yMax() - rttBox.yMin();
+
+        // Height (Y-span) of the RTT box [0..1]
+        double rttHeightNDC = osg::maximum(_cascades[0]._heightNDC, 1.0);
+
+        // Number of texels it will take to represent the RTT frustum:
+        double totalTexels = rttHeightNDC * decorator._texSize;
+
+        // Texels still needed
+        double remainingTexels = totalTexels;
+        
+#ifdef DEBUG_CASCADES
+        buf << "\nTexels: " << totalTexels
+            << "\nHeight: " << rttHeight << "m"
+            << "\nHeightNDC: " << rttHeightNDC
+            << "\nRttbox: " << rttBox.yMin() << " -> " << rttBox.yMax();
+#endif
+
+        // resolution, roughly
+        double metersPerTexel = rttHeight / totalTexels;
+
+        // Start with one cascade and keep adding them until we don't need any more.
+        for(_numCascades = 0u; 
+            remainingTexels > 0.0 && _numCascades < _maxCascades;
+            _numCascades++)
+        {
+            Cascade& cascade = _cascades[_numCascades];
+            
+#ifdef DEBUG_CASCADES
+            buf << "\nCascade " << _numCascades << ": ";
+#endif
+
+            // Number of texels this cascade will consume:
+            double texels = osg::minimum((double)decorator._texSize, remainingTexels);
+
+            // near extent in rtt view space:
+            double ymin = _numCascades > 0? _cascades[_numCascades-1]._box.yMax() : rttBox.yMin();
+
+            // far extent in rtt view space:
+            double ymax = ymin + (texels * metersPerTexel);
+
+            // If we calculated a special YMax for the first cascade, apply it now:
+            if (_numCascades == 0 && firstYMax.isSet() && firstYMax.get() < ymax)
+            {
+                ymax = firstYMax.get();
+            }
+
+            // Set the Y extents of the RTT projection:
+            cascade._box.yMin() = ymin;
+            cascade._box.yMax() = ymax;
+            
+            // If this the final cascade, force the Y to the maximum:
+            if (texels >= remainingTexels ||            // out of texels?
+                ymax >= rttBox.yMax()     ||            // exceeded RTT range?
+                _numCascades+1 == _maxCascades)         // exceeded cascade count?
+            {
+                cascade._box.yMax() = rttBox.yMax();
+            }
+
+            // Track the number of texels we still need:
+            remainingTexels -= texels;
+
+            // Calculate the X extents of the cascade (widest necessary to accommodate).            
+            osg::Vec3d point(0.0, cascade._box.yMax(), -dp); // Point in RTT view space at yMax on the horizon plane
+            osg::Vec3d camClip = point * iRttView * camMVP;  // Xform into camera's clip space
+
+            osg::Vec3d P;
+            intersectRayWithPlane(camEye, osg::Vec3d(+1,camClip.y(),+1)*iCamMVP, horizonPlane, P);
+            cascade._box.xMax() = (P * rttView).x();
+            cascade._box.xMin() = -cascade._box.xMax();
+
+            // Finally assemble the projection matrix.
+            cascade.makeProj(dp);
+
+            if (decorator._useProjectionFitting && !colinear)
+            {
+                // now intersect with near plane:
+                point.set(0.0, cascade._box.yMin(), -dp);
+                camClip = point * iRttView * camMVP;
+                intersectRayWithPlane(camEye, osg::Vec3d(+1,camClip.y(),-1)*iCamMVP, horizonPlane, P);
+                double nfRatio = (P*rttView).x() / cascade._box.xMax();
+                if (_numCascades == 0)
+                    nfRatio = osg::maximum(nfRatio, decorator._minNearFarRatio);
+                fitProjectionMatrix(cascade._rttProj, nfRatio);
+            }
+
+            
+#ifdef DEBUG_CASCADES
+            buf << "\n  Texels: " << texels
+                << "\n  Range: " << cascade._box.yMin() << " -> " << cascade._box.yMax()
+                << "\n  Coverage: " << 100*(texels/totalTexels) << "%"
+                << "\n  MetersPerTexel: " << metersPerTexel;            
+#endif
+        }
+        
+#ifdef DEBUG_CASCADES
+        if (camera->getName() == "dump")
+            osgEarth::Registry::instance()->startActivity("Cascades", buf.str());
+#endif
+    }
+
+
+    // xform from clip [-1..1] to texture [0..1] space
+    static const osg::Matrix clipToTex =
+        osg::Matrix::translate(1.0, 1.0, 1.0) *
+        osg::Matrix::scale(0.5, 0.5, 0.5);
+    
+    // For each active cascade, configure its RTT camera and build the
+    // texture projection matrix
+    ArrayUniform texMat("oe_Draping_texMatrix", osg::Uniform::FLOAT_MAT4, _terrainSS.get(), decorator._maxCascades);
+    unsigned i;
+
+    for (i = 0; i < _numCascades; ++i)
+    {
+        Cascade& cascade = _cascades[i];
+        osg::Camera* rtt = cascade._rtt.get();
+
+        // configure the RTT camera's matrices:
+        rtt->setViewMatrix(rttView);
+        rtt->setProjectionMatrix(cascade._rttProj);
+
+        // Create the texture matrix that will transform the RTT frame into texture [0..1] space.
+        // Doing this on the CPU avoids precision errors on the GPU.
+        texMat.setElement(i, iCamMV * rttView * cascade._rttProj * clipToTex);
+    }
+
+    if (i < _maxCascades)
+    {
+        // install a "marker" matrix that tells the shader we're past the final cascade.
+        static osg::Matrix marker(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+        texMat.setElement(i, marker);
+    }
+
+    // traverse and write to the texture.
+    if (_numCascades > 0u)
+    {
+        cv->pushStateSet(_rttSS.get());
+        for (unsigned i = 0; i < _numCascades; ++i)
+        {
+            Cascade& c = _cascades[i];
+            c._rtt->accept(*cv);
+        }
+        cv->popStateSet(); // _rttSS
+    }
+}
+
+void
+CascadeDrapingDecorator::CameraLocal::dump(const osg::Camera* cam, CascadeDrapingDecorator& decorator)
+{
+    static const char* fn = "CascadeDrapingDecoratorDump.osgb";
+ 
+    decorator._dump = new osg::Group();
+
+    // Main camera:
+    {
+        osgShadow::ConvexPolyhedron ph;
+        ph.setToUnitFrustum();
+        osg::Matrix mvp = cam->getViewMatrix() * cam->getProjectionMatrix();
+        osg::Matrix imvp; imvp.invert(mvp);
+        ph.transform( imvp, mvp );
+        ph.dumpGeometry(0,0,0,fn);
+        osg::ref_ptr<osg::Node> camNode = osgDB::readRefNodeFile(fn);
+        camNode->setName("camera");
+        decorator._dump->addChild(camNode.get());
+    }
+
+    // RTT cameras
+    for (unsigned i=0; i<_numCascades; ++i)
+    {
+        const osg::Camera* rtt = _cascades[i]._rtt.get();
+        osgShadow::ConvexPolyhedron ph;
+        ph.setToUnitFrustum();
+        osg::Matrix mvp = rtt->getViewMatrix() * rtt->getProjectionMatrix();
+        osg::Matrix imvp; imvp.invert(mvp);
+        ph.transform( imvp, mvp );
+        ph.dumpGeometry(0, 0, 0, fn, osg::Vec4(1, 1, 0, 1), osg::Vec4(1, 1, 0, 0.25));
+        osg::ref_ptr<osg::Node> camNode = osgDB::readRefNodeFile(fn);
+        camNode->setName("rtt");
+        decorator._dump->addChild(camNode.get());
+    }
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CascadeDraping.glsl osgearth-2.10.2+dfsg/src/osgEarth/CascadeDraping.glsl
--- osgearth-2.9.0+dfsg/src/osgEarth/CascadeDraping.glsl	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CascadeDraping.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,53 @@
+#version $GLSL_VERSION_STR
+
+#pragma vp_name       Draping Vertex Shader
+#pragma vp_entryPoint oe_Draping_VS
+#pragma vp_location   vertex_view
+
+out vec4 oe_Draping_vertexView;
+
+void oe_Draping_VS(inout vec4 vertexView)
+{
+    oe_Draping_vertexView = vertexView;
+}
+
+
+[break]
+
+
+#version $GLSL_VERSION_STR
+
+#pragma vp_name       Draping Fragment Shader
+#pragma vp_entryPoint oe_Draping_FS
+#pragma vp_location   fragment_coloring
+#pragma vp_order      0.6
+
+#pragma import_defines(OE_IS_PICK_CAMERA)
+#pragma import_defines(OE_DRAPING_MAX_CASCADES)
+
+uniform sampler2DArray oe_Draping_tex;
+uniform mat4 oe_Draping_texMatrix[OE_DRAPING_MAX_CASCADES];
+in vec4 oe_Draping_vertexView;
+
+void oe_Draping_FS(inout vec4 color)
+{
+    vec4 texel = vec4(0,0,0,0);
+
+    // the [3][3] slot will be zero if we have exceeded the current number of cascades
+    for (int i=0; i<OE_DRAPING_MAX_CASCADES && oe_Draping_texMatrix[i][3][3] != 0; ++i)
+    {
+        vec4 coord = oe_Draping_texMatrix[i] * oe_Draping_vertexView;
+        coord.xy /= coord.w;
+        if (clamp(coord.xy, 0, 1) == coord.xy)
+        {
+            texel = texture(oe_Draping_tex, vec3(coord.xy, i));
+            break;
+        }
+    }
+
+#ifdef OE_IS_PICK_CAMERA
+    color = texel;
+#else
+    color = vec4( mix( color.rgb, texel.rgb, texel.a ), color.a);
+#endif
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ClampableNode osgearth-2.10.2+dfsg/src/osgEarth/ClampableNode
--- osgearth-2.9.0+dfsg/src/osgEarth/ClampableNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ClampableNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2011 Pelican Mapping
  * http://osgearth.org
  *
@@ -38,6 +38,9 @@
         //! Constructs a new clampable node.
         ClampableNode();
 
+		//! Whether the given camera is a depth camera.
+		static bool isDepthCamera(const osg::Camera* camera);
+
     public: // osg::Node
 
         virtual void traverse(osg::NodeVisitor& nv);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ClampableNode.cpp osgearth-2.10.2+dfsg/src/osgEarth/ClampableNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ClampableNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ClampableNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,8 +19,6 @@
 
 #include <osgEarth/ClampableNode>
 #include <osgEarth/ClampingTechnique>
-#include <osgEarth/DepthOffset>
-#include <osgEarth/OverlayDecorator>
 #include <osgEarth/MapNode>
 #include <osgEarth/NodeUtils>
 
@@ -63,25 +61,53 @@
             // Actual bounds of geometry:
             osg::BoundingSphere bs = getBound();
 
-            // Find any two points on the bounding sphere's up-vector
-            // and transform them into view space:
-            osg::Vec3d p0 = bs.center() * (*MV);
-            osg::Vec3d p1 =
-                mapNode->isGeocentric() ? (bs.center() * 2.0 * (*MV)) :
-                                          (bs.center() + osg::Vec3d(0, 0, bs.radius())) * (*MV);
-
-            // Center plane of the view frustum (in view space)
-            static osg::Vec3d v0(0, 0, 0);  // point on the plane
-            static osg::Vec3d n(0, 1, 0);   // normal vector to the plane
-
-            // Find the intersection of the up vector and the center plane
-            // and then transform the result back into world space for culling.
-            osg::Vec3d w = p0 - v0;
-            osg::Vec3d u = p1 - p0;
-            double t = (-n * w) / (n * u);
-            bs.center() = (p0 + u*t) * MVinverse;
+            // First check for simple intersection at the geometry's actual position:
+            bool visible = false; //(cv->isCulled(bs) == false);
+            if (!visible)
+            {
+                // Failing that, project the geometry to the ellipsoid's surface and
+                // expand the radius to account for reasonable elevation changes.
+                // On Earth, elevations of +/- 12000m results in a variance of
+                // 12000/R = ~0.002. Obviously this differs for other planets but
+                // good enough for now
+                const double variance = 0.002;  // * R.
+
+                const SpatialReference* mapSRS = mapNode->getMapSRS();
+                if (mapSRS->isGeographic())
+                {
+                    osg::Vec3d p0 = bs.center();
+                    p0.normalize();
+
+                    // approximate radius under bs.center:
+                    double R = 
+                        osg::absolute(p0.z()) * mapSRS->getEllipsoid()->getRadiusPolar() +
+                        (1.0 - osg::absolute(p0.z())) * mapSRS->getEllipsoid()->getRadiusEquator();
+
+                    // project to mean surface:
+                    bs.center() = p0 * R;
+
+                    // buffer the radius to account for elevation data
+                    bs.radius() = bs.radius() + R*variance;
+                }
+
+                else // projected
+                {
+                    double R = osg::maximum(
+                        mapSRS->getEllipsoid()->getRadiusPolar(),
+                        mapSRS->getEllipsoid()->getRadiusEquator());
+                    
+                    // project to mean surface:
+                    bs.center().z() = 0.0;
+
+                    // buffer the radius to account for elevation data
+                    bs.radius() = bs.radius() + R*variance;
+                }
+
+                // Test against the virtual bounding sphere
+                visible = (cv->isCulled(bs) == false);
+            }
 
-            if (cv->isCulled(bs) == false)
+            if (visible)
             {
                 // Passed the cull test, so put this node in the clamping cull set.
                 ClampingCullSet& cullSet = mapNode->getClampingManager()->get( cv->getCurrentCamera() );
@@ -115,16 +141,25 @@
 }
 
 
+bool ClampableNode::isDepthCamera(const osg::Camera* camera)
+{
+    if (camera->getStateSet() == NULL)
+    {
+        return false;
+    }
+
+    // Check for the existence of the OE_IS_DEPTH_CAMERA define
+    return (camera->getStateSet()->getDefineList().find("OE_IS_DEPTH_CAMERA") != camera->getStateSet()->getDefineList().end());
+}
+
+
 //...........................................................................
 
 #undef  LC
 #define LC "[ClampableNode Serializer] "
 
-#include <osgDB/ObjectWrapper>
-#include <osgDB/InputStream>
-#include <osgDB/OutputStream>
 
-namespace
+namespace osgEarth { namespace Serializers { namespace ClampableNode
 {
     REGISTER_OBJECT_WRAPPER(
         ClampableNode,
@@ -134,4 +169,4 @@
     {
         //nop
     }
-}
+}}}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Clamping osgearth-2.10.2+dfsg/src/osgEarth/Clamping
--- osgearth-2.9.0+dfsg/src/osgEarth/Clamping	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Clamping	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Clamping.cpp osgearth-2.10.2+dfsg/src/osgEarth/Clamping.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Clamping.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Clamping.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,12 +21,7 @@
 */
 #include <osgEarth/Clamping>
 #include <osgEarth/CullingUtils>
-#include <osgEarth/Registry>
-#include <osg/Drawable>
-#include <osg/NodeVisitor>
-#include <osg/Geode>
-#include <osg/Geometry>
-#include <osgUtil/CullVisitor>
+#include <osgEarth/LineDrawable>
 
 using namespace osgEarth;
 
@@ -55,31 +50,29 @@
             setNodeMaskOverride( ~0 );
         }
 
-        void apply(osg::Geometry* geom)
+        void applyGeometry(osg::Geometry* geom)
         {
-            if ( geom )
+            osg::Vec3Array* verts = static_cast<osg::Vec3Array*>(geom->getVertexArray());
+            osg::Vec4Array* anchors = new osg::Vec4Array();
+            anchors->setBinding(osg::Array::BIND_PER_VERTEX);
+            anchors->reserve( verts->size() );
+            for(unsigned i=0; i<verts->size(); ++i)
             {
-                osg::Vec3Array* verts = static_cast<osg::Vec3Array*>(geom->getVertexArray());
-                osg::Vec4Array* anchors = new osg::Vec4Array();
-                anchors->reserve( verts->size() );
-                for(unsigned i=0; i<verts->size(); ++i)
-                {
-                    anchors->push_back( osg::Vec4f(
-                        (*verts)[i].x(), (*verts)[i].y(),
-                        _verticalOffset,
-                        Clamping::ClampToGround) );
-                }
-
-                geom->setVertexAttribArray    (Clamping::AnchorAttrLocation, anchors);
-                geom->setVertexAttribBinding  (Clamping::AnchorAttrLocation, geom->BIND_PER_VERTEX);
-                geom->setVertexAttribNormalize(Clamping::AnchorAttrLocation, false);
+                anchors->push_back( osg::Vec4f(
+                    (*verts)[i].x(), (*verts)[i].y(),
+                    _verticalOffset,
+                    Clamping::ClampToGround) );
             }
+            geom->setVertexAttribArray(Clamping::AnchorAttrLocation, anchors);
         }
 
         void apply(osg::Drawable& drawable)
         {
             osg::Geometry* geom = drawable.asGeometry();
-            if (geom) apply(geom);
+            if (geom)
+            {
+                applyGeometry(geom);
+            }
         }
     };
 }
@@ -100,7 +93,7 @@
     if ( geom )
     {
         ApplyDefaultsVisitor visitor( verticalOffset );
-        visitor.apply( geom );
+        visitor.apply( *geom );
     }
 }
 
@@ -120,9 +113,18 @@
 {
     if ( geom )
     {
-        geom->setVertexAttribArray( HeightsAttrLocation, hats );
-        geom->setVertexAttribBinding( HeightsAttrLocation, geom->BIND_PER_VERTEX );
-        geom->setVertexAttribNormalize( HeightsAttrLocation, false );
+        hats->setBinding(osg::Array::BIND_PER_VERTEX);
+        hats->setNormalize(false);
+
+        LineDrawable* line = dynamic_cast<LineDrawable*>(geom);
+        if (line)
+        {
+            line->importVertexAttribArray(HeightsAttrLocation, hats);
+        }
+        else
+        {
+            geom->setVertexAttribArray(HeightsAttrLocation, hats);
+        }
     }
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ClampingTechnique osgearth-2.10.2+dfsg/src/osgEarth/ClampingTechnique
--- osgearth-2.9.0+dfsg/src/osgEarth/ClampingTechnique	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ClampingTechnique	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -60,8 +60,8 @@
     class OSGEARTH_EXPORT ClampingTechnique : public OverlayTechnique
     {
     public:
-        typedef osg::Group* (*TechniqueProvider)(class MapNode*);
-        static TechniqueProvider Provider;
+        //typedef osg::Group* (*TechniqueProvider)(class MapNode*);
+        //static TechniqueProvider Provider;
 
     public:
         ClampingTechnique();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ClampingTechnique.cpp osgearth-2.10.2+dfsg/src/osgEarth/ClampingTechnique.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ClampingTechnique.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ClampingTechnique.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -23,18 +23,11 @@
 #include <osgEarth/Capabilities>
 #include <osgEarth/CullingUtils>
 #include <osgEarth/Registry>
-#include <osgEarth/VirtualProgram>
-#include <osgEarth/MapNode>
-#include <osgEarth/Utils>
 #include <osgEarth/Shaders>
-#include <osgEarth/Clamping>
 
 #include <osg/Depth>
 #include <osg/PolygonMode>
 #include <osg/Texture2D>
-#include <osg/Uniform>
-#include <osg/ValueObject>
-#include <osg/Timer>
 
 #define LC "[ClampingTechnique] "
 
@@ -73,7 +66,7 @@
 namespace
 {
     // Additional per-view data stored by the clamping technique.
-    struct LocalPerViewData : public osg::Referenced
+    struct LocalPerViewData : public osg::Object
     {
         osg::ref_ptr<osg::Texture2D> _rttTexture;
         osg::ref_ptr<osg::StateSet>  _groupStateSet;
@@ -87,6 +80,24 @@
 
         unsigned _renderLeafCount;
 
+        META_Object(osgEarth,LocalPerViewData);
+        LocalPerViewData() { }
+        LocalPerViewData(const LocalPerViewData& rhs, const osg::CopyOp& co) { }
+        
+        void resizeGLObjectBuffers(unsigned maxSize) {
+            if (_rttTexture.valid())
+                _rttTexture->resizeGLObjectBuffers(maxSize);
+            if (_groupStateSet.valid())
+                _groupStateSet->resizeGLObjectBuffers(maxSize);
+        }
+        void releaseGLObjects(osg::State* state) const {
+            if (_rttTexture.valid())
+                _rttTexture->releaseGLObjects(state);
+            if (_groupStateSet.valid())
+                _groupStateSet->releaseGLObjects(state);
+        }
+
+
 #ifdef DUMP_RTT_IMAGE
         osg::ref_ptr<osg::Image> _rttDebugImage;
 #endif
@@ -195,11 +206,20 @@
     rttStateSet->setAttributeAndModes(
         new osg::PolygonMode( osg::PolygonMode::FRONT_AND_BACK, osg::PolygonMode::FILL ),
         osg::StateAttribute::ON | osg::StateAttribute::PROTECTED );
+    
+    // matrix that transforms the RTT's view to the main camera's view (for morphing support)
+    params._rttToPrimaryMatrixUniform = rttStateSet->getOrCreateUniform(
+        "oe_shadowToPrimaryMatrix",
+        osg::Uniform::FLOAT_MAT4);
+
+    // We use this define to tell the terrain it's a depth-only camera
+    rttStateSet->setDefine("OE_IS_DEPTH_CAMERA");
 
     // install a VP on the stateset that cancels out any higher-up VP code.
     // This will prevent things like VPs on the main camera (e.g., log depth buffer)
     // from interfering with the depth camera
     VirtualProgram* rttVP = VirtualProgram::getOrCreate(rttStateSet);
+    rttVP->setName("GPU Clamping RTT");
     rttVP->setInheritShaders(false);
     
     // attach the terrain to the camera.
@@ -311,12 +331,19 @@
         // update the RTT camera.
         params._rttCamera->setViewMatrix      ( params._rttViewMatrix );
         params._rttCamera->setProjectionMatrix( params._rttProjMatrix );
-
-        LocalPerViewData& local = *static_cast<LocalPerViewData*>(params._techniqueData.get());
+        
+        // set the primary-camera-to-rtt-camera transformation matrix,
+        // which lets you perform vertex shader operations from the perspective
+        // of the primary camera (morphing, etc.) so that things match up
+        // between the two cameras.
+        osg::Matrix viewMatrixInverse = osg::Matrix::inverse(params._rttViewMatrix);
+        params._rttToPrimaryMatrixUniform->set(viewMatrixInverse * (*cv->getModelViewMatrix()));
 
         // create the depth texture (render the terrain to tex)
         params._rttCamera->accept( *cv );
+        
 
+        LocalPerViewData& local = *static_cast<LocalPerViewData*>(params._techniqueData.get());
 
         // construct a matrix that transforms from camera view coords to depth texture
         // clip coords directly. This will avoid precision loss in the 32-bit shader.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ClipPlane.glsl osgearth-2.10.2+dfsg/src/osgEarth/ClipPlane.glsl
--- osgearth-2.9.0+dfsg/src/osgEarth/ClipPlane.glsl	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ClipPlane.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,19 @@
+#version 330
+#pragma vp_name       ClipPlane.glsl
+#pragma vp_entryPoint oe_ClipPlane_VS
+#pragma vp_location   vertex_view
+#pragma vp_order      last
+#pragma import_defines(OE_CLIPPLANE_NUM)
+
+// OSG built-in to transform from view to world
+uniform mat4 osg_ViewMatrixInverse;
+
+// clipping plane
+uniform vec4 oe_ClipPlane_plane;
+
+void oe_ClipPlane_VS(inout vec4 vertex_view)
+{
+#ifndef GL_ES
+    gl_ClipDistance[OE_CLIPPLANE_NUM] = dot(osg_ViewMatrixInverse * vertex_view, oe_ClipPlane_plane);
+#endif
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarth/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarth/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -38,6 +38,8 @@
 SET(LIB_NAME osgEarth)
 
 set(TARGET_GLSL
+    CascadeDraping.glsl
+    ClipPlane.glsl
     DepthOffset.vert.glsl
     Draping.vert.glsl
     Draping.frag.glsl
@@ -45,8 +47,14 @@
     GPUClamping.vert.lib.glsl
     GPUClamping.frag.glsl
     Instancing.vert.glsl
+    LineDrawable.glsl
     PhongLighting.vert.glsl
-    PhongLighting.frag.glsl)
+    PhongLighting.frag.glsl
+    PointDrawable.glsl
+    Text.vert.glsl
+    Text.frag.glsl
+    Text_legacy.glsl
+    )
 
 set(SHADERS_CPP "${CMAKE_CURRENT_BINARY_DIR}/AutoGenShaders.cpp")
 
@@ -61,6 +69,7 @@
 SET(HEADER_PATH ${OSGEARTH_SOURCE_DIR}/include/${LIB_NAME})
 
 SET(LIB_PUBLIC_HEADERS
+    Async
     Bounds
     Cache
     CacheEstimator
@@ -68,6 +77,7 @@
     CachePolicy
     CacheSeed
     Capabilities
+    CascadeDrapingDecorator
     Clamping
     ClampableNode
     ClampingTechnique
@@ -90,6 +100,7 @@
     ElevationLOD
     ElevationPool
     ElevationQuery
+    EllipsoidIntersector
     Endian
     Export
     Extension
@@ -102,8 +113,10 @@
     GeoTransform
     GeometryClamper
     GLSLChunker
+    GLUtils
     HeightFieldUtils
     Horizon
+    HorizonClipPlane
     HTTPClient
     ImageLayer
     ImageMosaic
@@ -116,7 +129,9 @@
     LandCoverLayer
     Layer
     LayerListener
+    LayerShader
     Lighting
+    LineDrawable
     LineFunctor
     Locators
     LocalTangentPlane
@@ -130,7 +145,6 @@
     MapNodeOptions
     MapOptions
     MaskLayer
-    MaskNode
     MaskSource
     Memory
     MemCache
@@ -149,9 +163,9 @@
     PhongLightingEffect
     Picker
     PluginLoader
+    PointDrawable
     PrimitiveIntersector
     Profile
-    Profiler
     Progress
     Random
     Registry
@@ -163,15 +177,15 @@
     ShaderFactory
     ShaderGenerator
     ShaderLoader
+    ShaderMerger
     ShaderUtils
     Shadowing
-    SharedSARepo
     SimplexNoise
     SpatialReference
     StateSetCache
-    StateSetLOD
     Status
     StringUtils
+    #TDTiles
     TaskService
     Terrain
     TerrainEffect
@@ -183,8 +197,8 @@
     TerrainTileModel
     TerrainTileModelFactory
     TerrainTileNode
-    TileKeyDataStore
     Tessellator
+    Text
     TileKey
     TileHandler
     TileRasterizer
@@ -202,7 +216,6 @@
     Viewpoint
     VirtualProgram
     VisibleLayer
-    WrapperLayer
     XmlUtils
 )
 
@@ -239,6 +252,7 @@
 ENDIF (OSGEARTH_EMBED_GIT_SHA)
 
 set(TARGET_SRC
+    Async.cpp
     Bounds.cpp
     Cache.cpp
     CacheBin.cpp
@@ -246,6 +260,7 @@
     CachePolicy.cpp
     CacheSeed.cpp
     Capabilities.cpp
+    CascadeDrapingDecorator.cpp
     Clamping.cpp
     ClampableNode.cpp
     ClampingTechnique.cpp
@@ -266,6 +281,7 @@
     ElevationLOD.cpp
     ElevationPool.cpp
     ElevationQuery.cpp
+    EllipsoidIntersector.cpp
     Extension.cpp
     FadeEffect.cpp
     FileUtils.cpp
@@ -275,8 +291,10 @@
     GeoTransform.cpp
     GeometryClamper.cpp
     GLSLChunker.cpp
+    GLUtils.cpp
     HeightFieldUtils.cpp
     Horizon.cpp
+    HorizonClipPlane.cpp
     HTTPClient.cpp
     ImageLayer.cpp
     ImageMosaic.cpp
@@ -288,7 +306,9 @@
     LandCover.cpp
     LandCoverLayer.cpp
     Layer.cpp
+    LayerShader.cpp
     Lighting.cpp
+    LineDrawable.cpp
     Locators.cpp
     LocalTangentPlane.cpp
     Map.cpp
@@ -299,7 +319,6 @@
     MapNodeOptions.cpp
     MapOptions.cpp
     MaskLayer.cpp
-    MaskNode.cpp
     MaskSource.cpp
     MemCache.cpp
     Memory.cpp
@@ -315,9 +334,9 @@
     PagedNode.cpp
     PatchLayer.cpp
     PhongLightingEffect.cpp
+    PointDrawable.cpp
     PrimitiveIntersector.cpp
     Profile.cpp
-    Profiler.cpp
     Progress.cpp
     Random.cpp
     Registry.cpp
@@ -328,15 +347,16 @@
     ShaderFactory.cpp
     ShaderGenerator.cpp
     ShaderLoader.cpp
+    ShaderMerger.cpp
     ShaderUtils.cpp
     Shadowing.cpp
     SimplexNoise.cpp
     SpatialReference.cpp
     StateSetCache.cpp
-    StateSetLOD.cpp
     Status.cpp
     StringUtils.cpp
     TaskService.cpp
+    #TDTiles.cpp
     Terrain.cpp
     TerrainLayer.cpp
     TerrainOptions.cpp
@@ -345,6 +365,7 @@
     TerrainTileModel.cpp
     TerrainTileModelFactory.cpp
     Tessellator.cpp
+    Text.cpp
     TextureBufferSerializer.cpp
     TileKey.cpp
     TileHandler.cpp
@@ -392,9 +413,9 @@
 
 OPTION(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF)
 if(NOT NRL_STATIC_LIBRARIES)
-  LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGTERRAIN_LIBRARY OSGDB_LIBRARY OSGFX_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY CURL_LIBRARY GDAL_LIBRARY ZLIB_LIBRARY OSGMANIPULATOR_LIBRARY)
+  LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGTERRAIN_LIBRARY OSGDB_LIBRARY OSGFX_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY)
 else(NOT NRL_STATIC_LIBRARIES)
-  LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGTERRAIN_LIBRARY OSGDB_LIBRARY OSGFX_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY CURL_LIBRARY GDAL_LIBRARY ZLIB_LIBRARY OSGMANIPULATOR_LIBRARY SSL_EAY_RELEASE LIB_EAY_RELEASE TIFF_LIBRARY PROJ4_LIBRARY PNG_LIBRARY JPEG_LIBRARY)
+  LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGTERRAIN_LIBRARY OSGDB_LIBRARY OSGFX_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY SSL_EAY_RELEASE LIB_EAY_RELEASE TIFF_LIBRARY PROJ4_LIBRARY PNG_LIBRARY JPEG_LIBRARY)
 endif(NOT NRL_STATIC_LIBRARIES)
 
 LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY})
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ColorFilter osgearth-2.10.2+dfsg/src/osgEarth/ColorFilter
--- osgearth-2.9.0+dfsg/src/osgEarth/ColorFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ColorFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ColorFilter.cpp osgearth-2.10.2+dfsg/src/osgEarth/ColorFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ColorFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ColorFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Common osgearth-2.10.2+dfsg/src/osgEarth/Common
--- osgearth-2.9.0+dfsg/src/osgEarth/Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Common	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 #include <osgEarth/Notify>
 #include <osg/Version>
 #include <osg/ref_ptr>
+#include <osg/Math>
 
 // define the OSG Version checks for older OSG versions
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CompositeTileSource osgearth-2.10.2+dfsg/src/osgEarth/CompositeTileSource
--- osgearth-2.9.0+dfsg/src/osgEarth/CompositeTileSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CompositeTileSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CompositeTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarth/CompositeTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/CompositeTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CompositeTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/CompositeTileSource>
-#include <osgEarth/ImageUtils>
-#include <osgEarth/StringUtils>
 #include <osgEarth/Registry>
 #include <osgEarth/Progress>
-#include <osgEarth/HeightFieldUtils>
-#include <osgDB/FileNameUtils>
 
 #define LC "[CompositeTileSource] "
 
@@ -113,17 +109,17 @@
         {
             image = 0;
             opacity = 1;
-            dataInExtents = false;
+            mayHaveDataForKey = false;
         }
 
-        ImageInfo(osg::Image* image, float opacity, bool dataInExtents)
+        ImageInfo(osg::Image* image, float opacity, bool mayHaveDataForKey)
         {
             this->image = image;
             this->opacity = opacity;
-            this->dataInExtents = dataInExtents;
+            this->mayHaveDataForKey = mayHaveDataForKey;
         }
 
-        bool dataInExtents;
+        bool mayHaveDataForKey;
         float opacity;
         osg::ref_ptr< osg::Image> image;
     };
@@ -155,10 +151,10 @@
     {
         ImageLayer* layer = itr->get();
         ImageInfo imageInfo;
-        imageInfo.dataInExtents = layer->mayHaveDataInExtent(key.getExtent());
+        imageInfo.mayHaveDataForKey = layer->mayHaveData(key);
         imageInfo.opacity = layer->getOpacity();
 
-        if (imageInfo.dataInExtents)
+        if (imageInfo.mayHaveDataForKey)
         {
             GeoImage image = layer->createImage(key, progress);
             if (image.valid())
@@ -166,8 +162,10 @@
                 imageInfo.image = image.getImage();
             }
 
-            // If the progress got cancelled or it needs a retry then return NULL to prevent this tile from being built and cached with incomplete or partial data.
-            if (progress && (progress->isCanceled() || progress->needsRetry()))
+            // If the progress got cancelled (due to any reason, including network error)
+            // then return NULL to prevent this tile from being built and cached with
+            // incomplete or partial data.
+            if (progress && progress->isCanceled())
             {
                 OE_DEBUG << LC << " createImage was cancelled or needs retry for " << key.str() << std::endl;
                 return 0L;
@@ -200,7 +198,10 @@
         {
             ImageInfo& info = images[i];
             ImageLayer* layer = _imageLayers[i].get();
-            if (!info.image.valid() && info.dataInExtents)
+
+            // If we didn't get any data for the tilekey, but the extents do overlap,
+            // we will try to fall back on lower LODs and get data there instead:
+            if (!info.image.valid() && layer->getDataExtentsUnion().intersects(key.getExtent()))
             {                      
                 TileKey parentKey = key.createParentKey();
 
@@ -214,7 +215,7 @@
                     }
 
                     // If the progress got cancelled or it needs a retry then return NULL to prevent this tile from being built and cached with incomplete or partial data.
-                    if (progress && (progress->isCanceled() || progress->needsRetry()))
+                    if (progress && progress->isCanceled())
                     {
                         OE_DEBUG << LC << " createImage was cancelled or needs retry for " << key.str() << std::endl;
                         return 0L;
@@ -392,7 +393,9 @@
             }
             else
             {
-                OE_DEBUG << LC << "Could not open image layer (" << layer->getName() << ") ... " << status.message() << std::endl;
+                setStatus(Status(Status::ResourceUnavailable, Stringify()
+                    << "Could not open sublayer (" << layer->getName() << ") ... " << status.message()));
+                return getStatus();
             }            
         }
         else if (i->_elevationLayerOptions.isSet() && !i->_layer.valid())
@@ -411,7 +414,9 @@
             }
             else
             {
-                OE_WARN << LC << "Could not open elevation layer (" << layer->getName() << ") ... " << status.message() << std::endl;
+                setStatus(Status(Status::ResourceUnavailable, Stringify()
+                    << "Could not open sublayer (" << layer->getName() << ") ... " << status.message()));
+                return getStatus();
             }
         }
 
@@ -456,9 +461,9 @@
                     getDataExtents().push_back( dataExtent );
                 }
             }            
-        }
 
-        ++i;
+            ++i;
+        }
     }
 
     // If there is no profile set by the user or by a component, fall back
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Config osgearth-2.10.2+dfsg/src/osgEarth/Config
--- osgearth-2.9.0+dfsg/src/osgEarth/Config	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Config	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -31,20 +31,8 @@
 
 namespace osgEarth
 {
-    class URI;
-
     typedef std::list<class Config> ConfigSet;
 
-
-    // general-purpose name/value pair set.
-    struct Properties : public std::map<std::string,std::string> {
-        std::string get( const std::string& key ) const {
-            std::map<std::string,std::string>::const_iterator i = find(key);
-            return i != end()? i->second : std::string();
-        }
-    };
-
-
     /**
      * Config is a general-purpose container for serializable data. You store an object's members
      * to Config, and then translate the Config to a particular format (like XML or JSON). Likewise,
@@ -55,17 +43,27 @@
     {
     public:
         Config()
-            : _isLocation(false) { }
+            : _isLocation(false), _isNumber(false) { }
 
-        Config( const std::string& key )
-            : _key(key), _isLocation(false) { }
+        Config(const std::string& key)
+            : _key(key), _isLocation(false), _isNumber(false) { }
+
+        template<typename T>
+        explicit Config(const std::string& key, const T& value)
+            : _key(key), _isLocation(false), _isNumber(false)
+        {
+            setValue(value);
+        }
 
-        Config( const std::string& key, const std::string& value ) 
-            : _key( key ), _defaultValue( value ), _isLocation(false) { }
+        explicit Config(const std::string& key, const Config& value)
+            : _key(key), _isLocation(false), _isNumber(false)
+        {
+            add(value);
+        }
 
-        /** Copy ctor */
-        Config( const Config& rhs ) 
-            : _key(rhs._key), _defaultValue(rhs._defaultValue), _children(rhs._children), _referrer(rhs._referrer), _isLocation(rhs._isLocation), _externalRef(rhs._externalRef), _refMap(rhs._refMap) { }
+        // Copy CTOR
+        Config(const Config& rhs)
+            : _key(rhs._key), _defaultValue(rhs._defaultValue), _children(rhs._children), _referrer(rhs._referrer), _isLocation(rhs._isLocation), _isNumber(rhs._isNumber), _externalRef(rhs._externalRef), _refMap(rhs._refMap) { }
 
         virtual ~Config();
 
@@ -74,35 +72,35 @@
          * For example, if the value is a filename "file.txt" and the referrer is "C:/temp/a.earth",
          * then the full path of the file is "C:/temp/file.txt".
          *
-         * Calling this sets a referrer on this object and its children. 
+         * Calling this sets a referrer on this object and its children.
          */
-        void setReferrer( const std::string& value );
+        void setReferrer(const std::string& value);
 
         /** Access this object's "relative-to" location. */
         const std::string& referrer() const { return _referrer; }
 
         /** Referrer associated with a key */
-        const std::string referrer( const std::string& key ) const {
+        const std::string referrer(const std::string& key) const {
             return child(key).referrer();
         }
 
         /** Sets whether this Config's value represents a location, i.e. a URI, filename, or
             other string that can be relocated to be relative to a different referrer. */
         void setIsLocation(bool tf) { _isLocation = tf; }
-        bool isLocation() const     { return _isLocation; }
+        bool isLocation() const { return _isLocation; }
 
         /** Hint that this Config came from an externally referenced resource. */
-        const std::string& externalRef() const { return _externalRef;}
+        const std::string& externalRef() const { return _externalRef; }
         void setExternalRef(const std::string& externalRef) { _externalRef = externalRef; }
 
         /** Populate this object from an XML input stream. */
-        bool fromXML( std::istream& in );
+        bool fromXML(std::istream& in);
 
         /** Encode this object as JSON. */
-        std::string toJSON( bool pretty =false ) const;
+        std::string toJSON(bool pretty = false) const;
 
         /** Populate this object from a JSON string. */
-        bool fromJSON( const std::string& json );
+        bool fromJSON(const std::string& json);
         static Config readJSON(const std::string& json);
 
         /** True if this object contains no data. */
@@ -121,313 +119,207 @@
 
         /** The value corresponding to the key */
         const std::string& value() const { return _defaultValue; }
-        std::string& value() { return _defaultValue; }
+
+        /** Main setValue method - see specializations inline below */
+        template<typename T>
+        void setValue(const T& value) {
+            _defaultValue = Stringify() << value;
+        }
 
         /** Child objects. */
         ConfigSet& children() { return _children; }
         const ConfigSet& children() const { return _children; }
 
         /** A collection of all the children of this object with a particular key */
-        const ConfigSet children( const std::string& key ) const {
+        const ConfigSet children(const std::string& key) const {
             ConfigSet r;
-            for(ConfigSet::const_iterator i = _children.begin(); i != _children.end(); i++ ) {
-                if ( i->key() == key )
-                    r.push_back( *i );
+            for (ConfigSet::const_iterator i = _children.begin(); i != _children.end(); i++) {
+                if (i->key() == key)
+                    r.push_back(*i);
             }
             return r;
         }
 
         /** Whether this object has a child with a given key */
-        bool hasChild( const std::string& key ) const {
-            for(ConfigSet::const_iterator i = _children.begin(); i != _children.end(); i++ )
-                if ( i->key() == key )
+        bool hasChild(const std::string& key) const {
+            for (ConfigSet::const_iterator i = _children.begin(); i != _children.end(); i++)
+                if (i->key() == key)
                     return true;
             return false;
         }
 
         /** Removes all children with the given key */
-        void remove( const std::string& key ) {
-            for(ConfigSet::iterator i = _children.begin(); i != _children.end(); ) {
-                if ( i->key() == key )
-                    i = _children.erase( i );
+        void remove(const std::string& key) {
+            for (ConfigSet::iterator i = _children.begin(); i != _children.end(); ) {
+                if (i->key() == key)
+                    i = _children.erase(i);
                 else
                     ++i;
             }
         }
 
         /** First child with the given key */
-        //Config child( const std::string& key ) const;
-        const Config& child( const std::string& key ) const;
+        const Config& child(const std::string& key) const;
 
         /** Pointer to the first child with the given key, or NULL if none exist */
-        const Config* child_ptr( const std::string& key ) const;
+        const Config* child_ptr(const std::string& key) const;
 
         /** Mutable pointer to the first child with the given key, or NULL if none exist */
-        Config* mutable_child( const std::string& key );
+        Config* mutable_child(const std::string& key);
 
         /** Merge the contents of another Config object into this object.. danger, read the code
             before you use this */
-        void merge( const Config& rhs );
+        void merge(const Config& rhs);
 
         /** Locate (recursively) the first descendant object with this key, optionally checking
             the current object as well */
-        Config* find( const std::string& key, bool checkThis =true );
-        const Config* find( const std::string& key, bool checkThis =true) const;
-
-        /** Adds an optional value as a child, but only if its value is set */
-        template<typename T>
-        void addIfSet( const std::string& key, const optional<T>& opt ) {
-            if ( opt.isSet() ) {
-                add( key, osgEarth::toString<T>( opt.value() ) );
-            }
-        }
-        
-        /** Adds a referenced object as a child, but only if its value is set */
-        template<typename T>
-        void addObjIfSet( const std::string& key, const osg::ref_ptr<T>& opt ) {
-            if ( opt.valid() ) {
-                Config conf = opt->getConfig();
-                conf.key() = key;
-                add( conf );
-            }
-        }
-
-        /** Adds an optional object as a child, but only if its value is set */
-        template<typename T>
-        void addObjIfSet( const std::string& key, const optional<T>& obj ) {
-            if ( obj.isSet() ) {
-                Config conf = obj->getConfig();
-                conf.key() = key;
-                add( conf );
-            }
-        }
-
-        /** Adds an enumeration value as a child, but only if its value is set */
-        template<typename X, typename Y>
-        void addIfSet( const std::string& key, const std::string& val, const optional<X>& target, const Y& targetValue ) {
-            if ( target.isSetTo( targetValue ) )
-                add( key, val );
-        }
+        Config* find(const std::string& key, bool checkThis = true);
+        const Config* find(const std::string& key, bool checkThis = true) const;
 
         /** Add a value as a child */
         template<typename T>
-        void add( const std::string& key, const T& value ) {
-            _children.push_back( Config(key, Stringify() << value) );
-            _children.back().setReferrer( _referrer );
+        void add(const std::string& key, const T& value) {
+            _children.push_back(Config(key, value));
+            _children.back().setReferrer(_referrer);
         }
 
         /** Add a Config as a child */
-        void add( const Config& conf ) {
-            _children.push_back( conf );
-            _children.back().setReferrer( _referrer );
+        void add(const Config& conf) {
+            _children.push_back(conf);
+            _children.back().setReferrer(_referrer);
         }
 
         /** Add a config as a child, assigning it a key */
-        void add( const std::string& key, const Config& conf ) {
+        void add(const std::string& key, const Config& conf) {
             Config temp = conf;
             temp.key() = key;
-            add( temp );
+            add(temp);
         }
 
         /** Add a set of config objects as children. */
-        void add( const ConfigSet& set ) {
-            for( ConfigSet::const_iterator i = set.begin(); i != set.end(); i++ )
-                add( *i );
+        void add(const ConfigSet& set) {
+            for (ConfigSet::const_iterator i = set.begin(); i != set.end(); i++)
+                add(*i);
         }
 
-        /** Adds an object as a child. */
+        /** Adds or replaces an optional value as a child, but only if it is set */
         template<typename T>
-        void addObj( const std::string& key, const T& value ) {
-            Config conf = value.getConfig();
-            conf.key() = key;
-            add( conf );
-        }
-
-        /** Adds or replaces a value as a child, but only if it is set */
-        template<typename T>
-        void updateIfSet( const std::string& key, const optional<T>& opt ) {
+        void set(const std::string& key, const optional<T>& opt) {
             remove(key);
-            if ( opt.isSet() ) {
-                add( key, osgEarth::toString<T>( opt.value() ) );
+            if (opt.isSet()) {
+                set(Config(key, opt.get()));
             }
         }
+
         template<typename T>
-        void set( const std::string& key, const optional<T>& opt ) {
-            updateIfSet(key, opt);
-        }
-        
-        /** Adds or replaces a referenced object as a child, but only if it is set */
-        template<typename T>
-        void updateObjIfSet( const std::string& key, const osg::ref_ptr<T>& opt ) {
+        void set(const std::string& key, const osg::ref_ptr<T>& obj) {
             remove(key);
-            if ( opt.valid() ) {
-                Config conf = opt->getConfig();
-                conf.key() = key;
-                add( conf );
-            }
-        }
-        template<typename T>
-        void setObj( const std::string& key, const osg::ref_ptr<T>& opt ) {
-            updateObjIfSet(key, opt);
-        }
-        
-        /** Adds or replaces an object as a child, but only if it is set */
-        template<typename T>
-        void updateObjIfSet( const std::string& key, const optional<T>& obj ) {
-            if ( obj.isSet() ) {
-                remove(key);
+            if (obj.valid()) {
                 Config conf = obj->getConfig();
                 conf.key() = key;
-                add( conf );
+                set(conf);
             }
         }
-        template<typename T>
-        void setObj( const std::string& key, const optional<T>& obj ) {
-            updateObjIfSet(key, obj);
-        }
-        
-        /** Adds or replaces an enumeration value as a child, but only if it is set */
+
+        // If target is set to targetValue, set key to val.
         template<typename X, typename Y>
-        void updateIfSet( const std::string& key, const std::string& val, const optional<X>& target, const Y& targetValue ) {
+        void set(const std::string& key, const std::string& val, const optional<X>& target, const Y& targetValue) {
             if (target.isSetTo(targetValue)) {
                 remove(key);
-                add( key, val );
+                set(key, val);
             }
         }
 
-        // If target is set to targetValue, set key to val.
-        template<typename X, typename Y>
-        void set( const std::string& key, const std::string& val, const optional<X>& target, const Y& targetValue ) {
-            updateIfSet(key, val, target, targetValue);
-        }
-        
-        /** Adds or replaces value as a child */
-        template<typename T>
-        void update( const std::string& key, const T& value ) {
-            update( Config(key, Stringify() << value) );
-        }
-
         /** Adds or replaces a config as a child. */
-        void update( const Config& conf ) {
+        void set(const Config& conf) {
             remove(conf.key());
-            add( conf );
-        }
-        template<typename T>
-        void set( const std::string& key, const T& value ) {
-            update( key, value );
+            add(conf);
         }
 
-        /** Adds or replaces an object as a child */
+        /** Sets a key value pair child */
         template<typename T>
-        void updateObj( const std::string& key, const T& value ) {
-            remove(key);
-            Config conf = value.getConfig();
-            conf.key() = key;
-            add( conf );
-        }
-        template<typename T>
-        void setObj( const std::string& key, const T& value ) {
-            updateObj(key, value);
+        void set(const std::string& key, const T& value) {
+            set(Config(key, value));
         }
 
         /** Whether this object has the key OR has a child with the key */
-        bool hasValue( const std::string& key ) const {
+        bool hasValue(const std::string& key) const {
             return !value(key).empty();
         }
 
         /** The value of this object (if the key matches) or a matching child object */
-        const std::string value( const std::string& key ) const {
+        const std::string value(const std::string& key) const {
             std::string r = trim(child(key).value());
-            if ( r.empty() && _key == key )
+            if (r.empty() && _key == key)
                 r = _defaultValue;
             return r;
         }
 
+        /** Default value transformed to another type */
+        template<typename T>
+        T valueAs(const T& fallback) const {
+            return osgEarth::as<T>(_defaultValue, fallback);
+        }
+
         /** Value cast to a particular primitive type (with fallback in case casting fails) */
         template<typename T>
-        T value( const std::string& key, T fallback ) const {
+        T value(const std::string& key, T fallback) const {
             std::string r;
-            if ( hasChild( key ) )
+            if (hasChild(key))
                 r = child(key).value();
-            return osgEarth::as<T>( r, fallback );
-        }
-
-        /** Value case to a boolean */
-        bool boolValue( bool fallback ) const {
-            return osgEarth::as<bool>( _defaultValue, fallback );
+            return osgEarth::as<T>(r, fallback);
         }
 
         /** Populates the output value iff the Config exists. */
         template<typename T>
-        bool getIfSet( const std::string& key, optional<T>& output ) const {
+        bool get(const std::string& key, optional<T>& output) const {
             std::string r;
-            if ( hasChild(key) )
+            if (hasChild(key))
                 r = child(key).value();
-            if ( !r.empty() ) {
-                output = osgEarth::as<T>( r, output.defaultValue() );
-                return true;
-            } 
-            else
-                return false;
-        }
-        
-        /** Populates the output object iff the Config exists. */
-        template<typename T>
-        bool getObjIfSet( const std::string& key, optional<T>& output ) const {
-            if ( hasChild( key ) ) {
-                output = T( child(key) );
+            if (!r.empty()) {
+                output = osgEarth::as<T>(r, output.defaultValue());
                 return true;
             }
             else
                 return false;
         }
-        
+
         /** Populates the output referenced value iff the Config exists. */
         template<typename T>
-        bool getObjIfSet( const std::string& key, osg::ref_ptr<T>& output ) const {
-            if ( hasChild( key ) ) {
-                output = new T( child(key) );
+        bool get(const std::string& key, osg::ref_ptr<T>& output) const {
+            if (hasChild(key)) {
+                output = new T(child(key));
                 return true;
             }
             else
                 return false;
         }
-        
-        /** Populates the output object value iff the Config exists. */
-        template<typename T>
-        bool getObjIfSet( const std::string& key, T& output ) const {
-            if ( hasChild(key) ) {
-                output = T( child(key) );
-                return true;
-            }
-            return false;
-        }
-        
+
         /** Populates the output enumerable pair iff the Config exists. */
         template<typename X, typename Y>
-        bool getIfSet( const std::string& key, const std::string& val, optional<X>& target, const Y& targetValue ) const {
-            if ( hasValue( key ) && value( key ) == val ) {
+        bool get(const std::string& key, const std::string& val, optional<X>& target, const Y& targetValue) const {
+            if (hasValue(key) && value(key) == val) {
                 target = targetValue;
                 return true;
             }
-            else 
+            else
                 return false;
         }
-        
+
         /** Populates the output enumerable pair iff the Config exists. */
         template<typename X, typename Y>
-        bool getIfSet( const std::string& key, const std::string& val, X& target, const Y& targetValue ) const {
-            if ( hasValue(key) && value(key) == val ) {
+        bool get(const std::string& key, const std::string& val, X& target, const Y& targetValue) const {
+            if (hasValue(key) && value(key) == val) {
                 target = targetValue;
                 return true;
             }
             return false;
         }
-        
+
         /** Populates the ouptut value iff the Config exists. */
         template<typename T>
-        bool getIfSet( const std::string& key, T& output ) const {
-            if ( hasValue(key) ) {
+        bool get(const std::string& key, T& output) const {
+            if (hasValue(key)) {
                 output = value<T>(key, output);
                 return true;
             }
@@ -437,68 +329,58 @@
         /** support for conveying non-serializable objects in a Config (in memory only) */
         typedef std::map<std::string, osg::ref_ptr<osg::Referenced> > RefMap;
 
-        void addNonSerializable( const std::string& key, osg::Referenced* obj ) {
-            _refMap[key] = obj;
-        }
-        
-        void updateNonSerializable( const std::string& key, osg::Referenced* obj ) {
+        //! @deprecated
+        void setNonSerializable(const std::string& key, osg::Referenced* obj) {
             _refMap[key] = obj;
         }
 
+        //! @deprecated
         template<typename X>
-        X* getNonSerializable( const std::string& key ) const {
+        X* getNonSerializable(const std::string& key) const {
             RefMap::const_iterator i = _refMap.find(key);
-            return i == _refMap.end() ? 0 : dynamic_cast<X*>( i->second.get() );
+            return i == _refMap.end() ? 0 : dynamic_cast<X*>(i->second.get());
         }
 
         // remove everything from (this) that also appears in rhs (diff)
-        Config operator - ( const Config& rhs ) const;
+        Config operator - (const Config& rhs) const;
+
+        //! Whether the encoded value is actual a number
+        bool isNumber() const { return _isNumber; }
 
     protected:
         std::string _key;
         std::string _defaultValue;
-        ConfigSet   _children;   
+        ConfigSet   _children;
         std::string _referrer;
         bool        _isLocation;
+        bool        _isNumber;
         std::string _externalRef;
         RefMap      _refMap;
     };
 
-
-
-    // specialization for Config
-    template <> inline
-    void Config::addIfSet<Config>( const std::string& key, const optional<Config>& opt ) {
-        if ( opt.isSet() ) {
-            Config conf = opt.value();
-            conf.key() = key;
-            add( conf );
-        }
-    }
+    // SPECIALIZATION - Config
 
     template<> inline
-    void Config::updateIfSet<Config>( const std::string& key, const optional<Config>& opt ) {
-        if ( opt.isSet() ) {
-            remove(key);
-            Config conf = opt.value();
-            conf.key() = key;
-            add( conf );
-        }
+        void Config::set<Config>(const std::string& key, const Config& conf) {
+        remove(key);
+        Config temp = conf;
+        temp.key() = key;
+        add(temp);
     }
 
     template<> inline
-    void Config::set<Config>( const std::string& key, const optional<Config>& opt ) {
+        void Config::set<Config>(const std::string& key, const optional<Config>& opt) {
         remove(key);
-        if ( opt.isSet() ) {
+        if (opt.isSet()) {
             Config conf = opt.value();
             conf.key() = key;
-            add( conf );
+            add(conf);
         }
     }
 
     template<> inline
-    bool Config::getIfSet<Config>( const std::string& key, optional<Config>& output ) const {
-        if ( hasChild( key ) ) {
+        bool Config::get<Config>(const std::string& key, optional<Config>& output) const {
+        if (hasChild(key)) {
             output = child(key);
             return true;
         }
@@ -506,49 +388,101 @@
             return false;
     }
 
-    template<> inline
-    void Config::add<std::string>( const std::string& key, const std::string& value ) {
-        _children.push_back( Config( key, value ) );
-        _children.back().setReferrer( _referrer );
-    }
+    // SPECIALIZATIONS - setValue
 
-    template<> inline
-    void Config::update<std::string>( const std::string& key, const std::string& value ) {
-        remove(key);
-        add( Config(key, value) );
+    template<> inline void Config::setValue<std::string>(const std::string& value) {
+        _defaultValue = value;
+        _isNumber = false;
     }
-
-    template<> inline
-    void Config::update<Config>( const std::string& key, const Config& conf ) {
-        remove(key);
-        Config temp = conf;
-        temp.key() = key;
-        add( temp );
+    template<> inline void Config::setValue<bool>(const bool& value) {
+        _defaultValue = value == true ? "true" : "false";
+        _isNumber = false;
     }
-
-    template<> inline
-    void Config::add<float>( const std::string& key, const float& value ) {
-        add( key, Stringify() << std::setprecision(8) << value );
-        //add( key, Stringify() << std::fixed << std::setprecision(8) << value );
+    template<> inline void Config::setValue<short>(const short& value) {
+        _defaultValue = Stringify() << value;
+        _isNumber = true;
     }
-
-    template<> inline
-    void Config::add<double>( const std::string& key, const double& value ) {
-        add( key, Stringify() << std::setprecision(16) << value );
-        //add( key, Stringify() << std::fixed << std::setprecision(16) << value );
+    template<> inline void Config::setValue<unsigned short>(const unsigned short& value) {
+        _defaultValue = Stringify() << value;
+        _isNumber = true;
+    }
+    template<> inline void Config::setValue<int>(const int& value) {
+        _defaultValue = Stringify() << value;
+        _isNumber = true;
+    }
+    template<> inline void Config::setValue<unsigned int>(const unsigned int& value) {
+        _defaultValue = Stringify() << value;
+        _isNumber = true;
+    }
+    template<> inline void Config::setValue<long>(const long& value) {
+        _defaultValue = Stringify() << value;
+        _isNumber = true;
+    }
+    template<> inline void Config::setValue<unsigned long>(const unsigned long& value) {
+        _defaultValue = Stringify() << value;
+        _isNumber = true;
+    }
+    template<> inline void Config::setValue<float>(const float& value) {
+        _defaultValue = Stringify() << std::setprecision(8) << value;
+        _isNumber = true;
+    }
+    template<> inline void Config::setValue<double>(const double& value) {
+        _defaultValue = Stringify() << std::setprecision(16) << value;
+        _isNumber = true;
     }
 
+    // SPECIALIZATION - std::string
+
     template<> inline
-    void Config::update<float>( const std::string& key, const float& value ) {
-        update( key, Stringify() << std::setprecision(8) << value );
-        //update( key, Stringify() << std::fixed << std::setprecision(8) << value );
+        void Config::add<std::string>(const std::string& key, const std::string& value) {
+        _children.push_back(Config(key, value));
+        _children.back().setReferrer(_referrer);
     }
 
     template<> inline
-    void Config::update<double>( const std::string& key, const double& value ) {
-        update( key, Stringify() << std::setprecision(16) << value );
+        void Config::set<std::string>(const std::string& key, const std::string& value) {
+        remove(key);
+        add(Config(key, value));
     }
 
+    // Use this macro to "activate" any object with a getConfig/ctor(const Config&) pair
+    // and make it usable with Config::set/get/add.
+    // NOTE: You must only use this macro in the global namespace!
+
+#define OSGEARTH_SPECIALIZE_CONFIG(TYPE) \
+    namespace osgEarth { \
+        template<> inline \
+        void Config::set<TYPE>(const std::string& key, const TYPE& obj) { \
+            set( key, obj.getConfig() ); \
+        } \
+        template<> inline \
+        void Config::set<TYPE>(const std::string& key, const optional<TYPE>& opt) { \
+            if ( opt.isSet() ) \
+                set(key, opt.get()); \
+        } \
+        template<> inline \
+        bool Config::get<TYPE>(const std::string& key, TYPE& opt) const { \
+            if ( hasChild(key) ) { \
+                opt = TYPE(child(key)); \
+                return true; \
+            } \
+            else return false; \
+        } \
+        template<> inline \
+        bool Config::get<TYPE>(const std::string& key, optional<TYPE>& opt) const { \
+            if ( hasChild(key) ) { \
+                opt = TYPE(child(key)); \
+                return true; \
+            } \
+            else return false; \
+        } \
+        template<> inline void Config::add<TYPE>(const std::string& key, const TYPE& value) { \
+            Config conf = value.getConfig(); \
+            conf.key() = key; \
+            add( conf ); \
+        } \
+    } // namespace osgEarth
+
     //--------------------------------------------------------------------
 
     /**
@@ -557,26 +491,26 @@
     class OSGEARTH_EXPORT ConfigOptions
     {
     public:
-        ConfigOptions( const Config& conf =Config() )
-            : _conf( conf ) { }
-        ConfigOptions( const ConfigOptions& rhs )
-            : _conf( rhs.getConfig() ) { } //rhs._conf ) { }
+        ConfigOptions(const Config& conf = Config())
+            : _conf(conf) { }
+        ConfigOptions(const ConfigOptions& rhs)
+            : _conf(rhs.getConfig()) { } //rhs._conf ) { }
 
         virtual ~ConfigOptions();
-        
+
         const std::string& referrer() const { return _conf.referrer(); }
 
-        ConfigOptions& operator = ( const ConfigOptions& rhs ) {
-            if ( this != &rhs ) {
+        ConfigOptions& operator = (const ConfigOptions& rhs) {
+            if (this != &rhs) {
                 _conf = rhs.getConfig();
-                mergeConfig( _conf );
+                mergeConfig(_conf);
             }
             return *this;
         }
 
-        void merge( const ConfigOptions& rhs ) {
-            _conf.merge( rhs._conf );
-            mergeConfig( rhs.getConfig() );
+        void merge(const ConfigOptions& rhs) {
+            _conf.merge(rhs._conf);
+            mergeConfig(rhs.getConfig());
         }
 
         virtual Config getConfig() const;
@@ -584,7 +518,7 @@
         bool empty() const { return _conf.empty(); }
 
     protected:
-        virtual void mergeConfig( const Config& conf ) { }
+        virtual void mergeConfig(const Config& conf) { }
 
         Config _conf;
     };
@@ -595,14 +529,16 @@
     class OSGEARTH_EXPORT DriverConfigOptions : public ConfigOptions
     {
     public:
-        DriverConfigOptions( const ConfigOptions& rhs =ConfigOptions() )
-            : ConfigOptions( rhs ) { fromConfig( _conf ); }
+        DriverConfigOptions(const ConfigOptions& rhs = ConfigOptions())
+            : ConfigOptions(rhs) {
+            fromConfig(_conf);
+        }
 
         /** dtor */
         virtual ~DriverConfigOptions();
 
         /** Gets or sets the name of the driver to load */
-        void setDriver( const std::string& value ) { _driver = value; }
+        void setDriver(const std::string& value) { _driver = value; }
         const std::string& getDriver() const { return _driver; }
 
     public:
@@ -612,15 +548,15 @@
             return conf;
         }
 
-        virtual void mergeConfig( const Config& conf ) {
+        virtual void mergeConfig(const Config& conf) {
             ConfigOptions::mergeConfig(conf);
             fromConfig(conf);
         }
 
     public:
-        void fromConfig( const Config& conf ) {
-            _driver = conf.value( "driver" );
-            if ( _driver.empty() && conf.hasValue("type") )
+        void fromConfig(const Config& conf) {
+            _driver = conf.value("driver");
+            if (_driver.empty() && conf.hasValue("type"))
                 _driver = conf.value("type");
         }
 
@@ -629,5 +565,43 @@
     };
 }
 
-#endif // OSGEARTH_CONFIG_H
+//! Macro to use when defining a COnfigOptions class
+#define META_ConfigOptions(LIBRARY, MYCLASS, SUPERCLASS) \
+    protected: \
+        virtual void mergeConfig(const Config& conf) { \
+            SUPERCLASS ::mergeConfig(conf); \
+            fromConfig(conf); \
+        } \
+    public: \
+        MYCLASS () : SUPERCLASS() { fromConfig(_conf); } \
+        MYCLASS (const ConfigOptions& opt) : SUPERCLASS(opt) { fromConfig(_conf); }
+
+//! optional property macro
+#define OE_OPTION(TYPE, NAME) \
+    private: \
+    optional< TYPE > _ ## NAME ; \
+    public: \
+    optional< TYPE >& NAME () { return _ ## NAME; } \
+    const optional< TYPE >& NAME () const { return _ ## NAME; }
+
+//! ref_ptr property macro
+#define OE_OPTION_REFPTR(TYPE, NAME) \
+    private: \
+    osg::ref_ptr< TYPE > _ ## NAME ; \
+    public: \
+    osg::ref_ptr< TYPE >& NAME () { return _ ## NAME; } \
+    const osg::ref_ptr< TYPE >& NAME () const { return _ ## NAME; }
+
+//! vector property macro
+#define OE_OPTION_VECTOR(TYPE, NAME) \
+    private: \
+    std::vector< TYPE > _ ## NAME ; \
+    public: \
+    std::vector< TYPE >& NAME () { return _ ## NAME; } \
+    const std::vector< TYPE >& NAME () const { return _ ## NAME; }
+
+#define OE_PROPERTY_IMPL(CLASS, TYPE, FUNC, OPTION) \
+    void CLASS ::set ## FUNC (const TYPE & value) { options(). OPTION () = value; }\
+    const TYPE & CLASS ::get ## FUNC () const { return options(). OPTION ().get(); }
 
+#endif // OSGEARTH_CONFIG_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Config.cpp osgearth-2.10.2+dfsg/src/osgEarth/Config.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Config.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Config.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -23,12 +23,7 @@
 #include <osgEarth/XmlUtils>
 #include <osgEarth/JsonUtils>
 #include <osgEarth/FileUtils>
-#include <osgDB/ReaderWriter>
 #include <osgDB/FileNameUtils>
-#include <osgDB/Registry>
-#include <sstream>
-#include <fstream>
-#include <iomanip>
 
 using namespace osgEarth;
 
@@ -140,6 +135,10 @@
     // add in the new values.
     for( ConfigSet::const_iterator c = rhs._children.begin(); c != rhs._children.end(); ++c )
         add( *c );
+    
+    // merge ref map
+    for( RefMap::const_iterator c = rhs._refMap.begin(); c != rhs._refMap.end(); ++c )
+        _refMap[c->first] = c->second;
 }
 
 const Config*
@@ -247,7 +246,10 @@
                             Config& c = i->second[0];
                             if ( c.isSimple() )
                             {
-                                value[i->first] = c.value();
+                                if (c.isNumber())
+                                    value[i->first] = c.valueAs<double>(0.0);
+                                else
+                                    value[i->first] = c.value();
                             }
                             else
                             {
@@ -362,7 +364,7 @@
                 }
                 else if ( (*i) == "$value" )
                 {
-                    conf.value() = value.asString();
+                    conf.setValue(value.asString());
                 }
                 else if ( (*i) == "$children" && value.isArray() )
                 {
@@ -370,7 +372,16 @@
                 }
                 else
                 {
-                    conf.add( *i, value.asString() );
+                    if( value.isBool())
+                        conf.add(*i, value.asBool());
+                    else if( value.isDouble())
+                        conf.add(*i, value.asDouble());
+                    else if (value.isInt())
+                        conf.add(*i, value.asInt());
+                    else if (value.isUInt())
+                        conf.add(*i, value.asUInt());
+                    else
+                        conf.add(*i, value.asString());
                 }
             }
         }
@@ -386,7 +397,7 @@
         }
         else if ( json.type() != Json::nullValue )
         {
-            conf.value() = json.asString();
+            conf.setValue(json.asString());
         }
     }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Containers osgearth-2.10.2+dfsg/src/osgEarth/Containers
--- osgearth-2.9.0+dfsg/src/osgEarth/Containers	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Containers	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -80,7 +80,7 @@
         iterator begin() { return _data.begin(); }
         iterator end() { return _data.end(); }
         bool empty() const { return _data.empty(); }
-        void clear() { _data.clear(); }        
+        void clear() { _data.clear(); }
         void erase(iterator i) { _data.erase(i); }
         void erase(const DATA& data) { iterator i = find(data); if (i != _data.end()) _data.erase(i); }
         int size() const { return _data.size(); }
@@ -108,7 +108,7 @@
         typedef typename container_t::iterator       iterator;
         typedef typename container_t::const_iterator const_iterator;
 
-        container_t _container;        
+        container_t _container;
 
         inline DATA& operator[](const KEY& key) {
             for(unsigned i=0; i<_container.size(); ++i) {
@@ -176,7 +176,7 @@
     struct fast_map
     {
         typedef std::pair<KEY,DATA>  entry_t;
-        typedef std::vector<entry_t> container_t;
+        typedef std::list<entry_t> container_t;
 
         typedef typename container_t::iterator       iterator;
         typedef typename container_t::const_iterator const_iterator;
@@ -222,7 +222,7 @@
         void clear() {
             _data.clear();
         }
-        
+
         iterator erase(iterator i) {
             return _data.erase( i );
         }
@@ -238,6 +238,7 @@
             }
         }
 
+        // Note: std::list::size() can be O(n)
         int size() const { return _data.size(); }
 
         template<typename InputIterator>
@@ -271,9 +272,9 @@
      *
      * usage:
      *    LRUCache<K,T> cache;
-     *    cache.put( key, value );
-     *    LRUCache.Record rec = cache.get( key );
-     *    if ( rec.valid() )
+     *    cache.insert( key, value );
+     *    LRUCache<K,T>::Record rec;
+     *    if ( cache.get( key, rec ) )
      *        const T& value = rec.value();
      */
     template<typename K, typename T, typename COMPARE=std::less<K> >
@@ -467,7 +468,7 @@
         }
 
         void setMaxSize_impl( unsigned max ) {
-            _max = std::max(max,10u);
+            _max = osg::maximum(max,10u);
             _buf = _max/10u;
             while( _map.size() > _max ) {
                 const K& key = _lru.front();
@@ -548,7 +549,7 @@
         void clear() { _impl.clear(); }
         void resize(size_type new_size, const value_type& fill_value = value_type()) { _impl.resize(new_size, fill_value); }
         void reserve(size_type new_capacity) { _impl.reserve(new_capacity); }
-        
+
         void swap(vector_type& other) { _impl.swap(other); }
         void swap(MixinVector& other) { _impl.swap(other._impl); }
 
@@ -646,7 +647,7 @@
         std::map<unsigned,T> _data;
         Threading::Mutex     _mutex;
     };
-    
+
 
     /** Template for thread safe per-object data storage */
     template<typename KEY, typename DATA>
@@ -689,6 +690,10 @@
             virtual void operator()(DATA& data) =0;
         };
 
+        struct ConstFunctor {
+            virtual void operator()(const DATA& data) const =0;
+        };
+
         DATA& get(KEY k)
         {
             osgEarth::Threading::ScopedMutexLock lock(_mutex);
@@ -712,12 +717,25 @@
                 functor.operator()(i->second);
         }
 
+        void forEach(ConstFunctor& functor) const
+        {
+            osgEarth::Threading::ScopedMutexLock lock(_mutex);
+            for (typename fast_map<KEY, DATA>::const_iterator i = _data.begin(); i != _data.end(); ++i)
+                functor.operator()(i->second);
+        }
+
         unsigned size() const
         {
             osgEarth::Threading::ScopedMutexLock lock(_mutex);
             return _data.size();
         }
 
+        void clear()
+        {
+            osgEarth::Threading::ScopedMutexLock lock(_mutex);
+            _data.clear();
+        }
+
     private:
         osgEarth::fast_map<KEY,DATA> _data;
         mutable osgEarth::Threading::Mutex _mutex;
@@ -869,7 +887,7 @@
         void iterate( const ConstFunctor& f )
         {
             osgEarth::Threading::ScopedReadLock lock(_mutex);
-            for( typename std::set<T>::iterator i = _data.begin(); i != _data.end(); )
+            for( typename std::set<osg::observer_ptr<T> >::iterator i = _data.begin(); i != _data.end(); )
             {
                 if ( i->valid() )
                 {
@@ -899,7 +917,7 @@
         std::set<osg::observer_ptr<T> >      _data;
         osgEarth::Threading::ReadWriteMutex  _mutex;
     };
-    
+
 
     // borrowed from osg::buffered_object. Auto-resizing array.
     template<class T>
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Cube osgearth-2.10.2+dfsg/src/osgEarth/Cube
--- osgearth-2.9.0+dfsg/src/osgEarth/Cube	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Cube	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -121,9 +121,7 @@
         /** dtor */
         virtual ~CubeSpatialReference();
 
-        virtual GeoLocator* createLocator(
-            double xmin, double ymin, double xmax, double ymax,
-            bool plate_carre =false) const;
+        virtual GeoLocator* createLocator(double xmin, double ymin, double xmax, double ymax) const;
 
         // CUBE is a projected coordinate system.
         virtual bool isGeographic() const { return false; }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Cube.cpp osgearth-2.10.2+dfsg/src/osgEarth/Cube.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Cube.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Cube.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,10 +18,6 @@
  */
 
 #include <osgEarth/Cube>
-#include <osg/Math>
-#include <osg/Notify>
-#include <sstream>
-#include <algorithm>
 
 using namespace osgEarth;
 
@@ -425,8 +421,7 @@
 }
 
 GeoLocator*
-CubeSpatialReference::createLocator(double xmin, double ymin, double xmax, double ymax,
-                                    bool plate_carre) const
+CubeSpatialReference::createLocator(double xmin, double ymin, double xmax, double ymax) const
 {
     int face;
     CubeUtils::cubeToFace( xmin, ymin, xmax, ymax, face );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CullingUtils osgearth-2.10.2+dfsg/src/osgEarth/CullingUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/CullingUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CullingUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -86,56 +86,6 @@
         static osg::NodeCallback* create(const class GeoExtent& extent);
     };
 
-    
-    /**
-     * A simple culling-plane callback (a simpler version of ClusterCullingCallback)
-     * @deprecated
-     */
-    struct OSGEARTH_EXPORT CullNodeByNormal : public osg::NodeCallback {
-        osg::Vec3d _normal;
-        CullNodeByNormal( const osg::Vec3d& normal );
-        void operator()(osg::Node* node, osg::NodeVisitor* nv);
-    };
-
-    // @deprecated
-    struct CullDrawableByNormal : public osg::Drawable::CullCallback {
-        osg::Vec3d _normal;
-        CullDrawableByNormal( const osg::Vec3d& normal ) : _normal(normal) { }
-        bool cull(osg::NodeVisitor* nv, osg::Drawable* drawable, osg::State* state) const {
-            return nv && nv->getEyePoint() * _normal <= 0;
-        }
-    };
-
-    // @deprecated
-    struct OSGEARTH_EXPORT CullNodeByFrameNumber : public osg::NodeCallback {
-        unsigned _frame;
-        CullNodeByFrameNumber() : _frame(0) { }
-        void operator()( osg::Node* node, osg::NodeVisitor* nv ) {
-            if ( nv->getFrameStamp()->getFrameNumber() - _frame <= 1 )
-                traverse(node, nv);
-        }
-    };
-
-    // @deprecated
-    struct DisableSubgraphCulling : public osg::NodeCallback {
-        void operator()(osg::Node* n, osg::NodeVisitor* v);
-    };
-
-    // @deprecated
-    struct StaticBound : public osg::Node::ComputeBoundingSphereCallback {
-        osg::BoundingSphere _bs;
-        StaticBound(const osg::BoundingSphere& bs) : _bs(bs) { }
-        osg::BoundingSphere computeBound(const osg::Node&) const { return _bs; }
-    };
-
-    // a cull callback that prevents objects from being included in the near/fear clip
-    // plane calculates that OSG does.
-    // @deprecated
-    struct OSGEARTH_EXPORT DoNotComputeNearFarCullCallback : public osg::NodeCallback
-    {
-        void operator()(osg::Node* node, osg::NodeVisitor* nv);
-    };
-
     /**
      * Simple occlusion culling callback that does a ray interseciton between the eyepoint
      * and a A GeoTransform node.
@@ -219,7 +169,6 @@
 
         void apply(osg::Node& node);
         void apply(osg::Transform& xform);
-        void apply(osg::Geode& geode);
         void apply(osg::Drawable& drawable);
         void apply(osg::LOD& lod);
     };
@@ -293,21 +242,30 @@
     class OSGEARTH_EXPORT InstallViewportSizeUniform : public osg::NodeCallback
     {
     public:
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) {
-            osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
-            const osg::Camera* camera = cv->getCurrentCamera();
-            osg::ref_ptr<osg::StateSet> ss;
-            if (camera && camera->getViewport()) {
-                ss = new osg::StateSet();
-                ss->addUniform(new osg::Uniform("oe_ViewportSize", osg::Vec2f(
-                    camera->getViewport()->width(),
-                    camera->getViewport()->height())));
-                cv->pushStateSet(ss.get());
-            }
-            traverse(node, nv);
-            if (ss.valid())
-                cv->popStateSet();
-        }
+        META_Object(osgEarth, InstallViewportSizeUniform);
+        
+        void operator()(osg::Node* node, osg::NodeVisitor* nv);
+
+        InstallViewportSizeUniform() { }
+
+        InstallViewportSizeUniform(const InstallViewportSizeUniform& rhs, const osg::CopyOp& copy) :
+            osg::NodeCallback(rhs, copy) { }
+    };
+
+    /**
+     * Cull callback that limits visibility to an altitude range (HAE)
+     */
+    class OSGEARTH_EXPORT AltitudeCullCallback : public osg::NodeCallback
+    {
+    public:
+        optional<float>& maxAltitude() { return _maxAltitude; }
+        osg::ref_ptr<const SpatialReference>& srs() { return _srs; }
+        
+        void operator()(osg::Node* node, osg::NodeVisitor* nv);
+
+    private:
+        optional<float> _maxAltitude;
+        osg::ref_ptr<const SpatialReference> _srs;
     };
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/CullingUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/CullingUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/CullingUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/CullingUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,17 +19,9 @@
 #include <osgEarth/CullingUtils>
 #include <osgEarth/LineFunctor>
 #include <osgEarth/VirtualProgram>
-#include <osgUtil/LineSegmentIntersector>
-#include <osgEarth/GeoData>
 #include <osgEarth/Utils>
-#include <osg/ClusterCullingCallback>
-#include <osg/PrimitiveSet>
-#include <osg/Geode>
 #include <osg/TemplatePrimitiveFunctor>
-#include <osgGA/GUIActionAdapter>
-#include <osgUtil/CullVisitor>
-#include <osgUtil/IntersectionVisitor>
-#include <osgUtil/LineSegmentIntersector>
+#include <osgDB/ObjectWrapper>
 
 using namespace osgEarth;
 
@@ -160,8 +152,8 @@
             node->accept( *this );
         }
 
-        void apply( osg::Geode& geode )
-        {            
+        void apply(osg::Drawable& drawable)
+        {
             if ( _pass == 1 )
             {
                 osg::Matrixd local2world;
@@ -171,8 +163,7 @@
                 osg::TemplatePrimitiveFunctor<ComputeMaxNormalLength> pass1;
                 pass1.set( _normalECEF, local2world, &_maxNormalLen );
 
-                for( unsigned i=0; i<geode.getNumDrawables(); ++i )
-                    geode.getDrawable(i)->accept( pass1 );
+                drawable.accept(pass1);
             }
 
             else // if ( _pass == 2 )
@@ -181,8 +172,8 @@
 
                 osg::TemplatePrimitiveFunctor<ComputeMaxRadius2> pass2;
                 pass2.set( center, &_maxRadius2 );
-                for( unsigned i=0; i<geode.getNumDrawables(); ++i )
-                    geode.getDrawable(i)->accept( pass2 );
+
+                drawable.accept(pass2);
             }
         }
 
@@ -261,17 +252,12 @@
             _matrixStack.push_back( osg::Matrixd::identity() );
         }
 
-        void apply( osg::Geode& geode )
+        void apply(osg::Drawable& drawable)
         {
             LineFunctor<ComputeMinDeviation> functor;
             functor.set( _matrixStack.back(), _ecefNormal, &_minDeviation );
-
-             for( unsigned i=0; i<geode.getNumDrawables(); ++i )
-             {
-                 geode.getDrawable(i)->accept( functor );
-             }
-
-             traverse(geode);
+            drawable.accept(functor);
+            traverse(drawable);
         }
 
         void apply( osg::Transform& xform )
@@ -313,26 +299,6 @@
     return 0L;
 }
 
-//------------------------------------------------------------------------
-
-void
-DoNotComputeNearFarCullCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
-{
-    osgUtil::CullVisitor* cv = static_cast< osgUtil::CullVisitor*>( nv );
-    osg::CullSettings::ComputeNearFarMode oldMode;
-    if( cv )
-    {
-        oldMode = cv->getComputeNearFarMode();
-        cv->setComputeNearFarMode( osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR );
-    }
-    traverse(node, nv);
-    if( cv )
-    {
-        cv->setComputeNearFarMode(oldMode);
-    }
-}
-
-
 //----------------------------------------------------------------------------
 
 bool 
@@ -539,59 +505,12 @@
         maxRadius);
 }
 
-//------------------------------------------------------------------------
-
-CullNodeByNormal::CullNodeByNormal( const osg::Vec3d& normal )
-{
-    _normal = normal;
-    //_normal.normalize();
-}
-
-void
-CullNodeByNormal::operator()(osg::Node* node, osg::NodeVisitor* nv)
-{
-    osg::Vec3d eye, center, up;
-    osgUtil::CullVisitor* cv = Culling::asCullVisitor(nv);
-
-    cv->getCurrentCamera()->getViewMatrixAsLookAt(eye,center,up);
-
-    eye.normalize();
-    osg::Vec3d normal = _normal;
-    normal.normalize();
-
-    double dotProduct = eye * normal;
-    if ( dotProduct > 0.0 )
-    {
-        traverse(node, nv);
-    }
-}
-
-//------------------------------------------------------------------------
-
-void
-DisableSubgraphCulling::operator()(osg::Node* n, osg::NodeVisitor* v)
-{
-    osgUtil::CullVisitor* cv = Culling::asCullVisitor(v);
-    cv->getCurrentCullingSet().setCullingMask( osg::CullSettings::NO_CULLING );
-    traverse(n, v);
-}
-
 
 //------------------------------------------------------------------------
 
 // The max frame time in ms
 double OcclusionCullingCallback::_maxFrameTime = 10.0;
 
-//OcclusionCullingCallback::OcclusionCullingCallback(const osgEarth::SpatialReference *srs, const osg::Vec3d& world, osg::Node* node):
-//_srs        ( srs ),
-//_world      ( world ),
-//_node       ( node ),
-//_visible    ( true ),
-//_maxAltitude( 200000 )
-//{
-//    //nop
-//}
-//
 OcclusionCullingCallback::OcclusionCullingCallback(GeoTransform* xform) :
 _xform      ( xform ),
 _visible    ( true ),
@@ -866,12 +785,6 @@
 }
 
 void 
-ProxyCullVisitor::apply(osg::Geode& node)
-{
-    ProxyCullVisitor::apply(static_cast<osg::Node&>(node));
-}
-
-void 
 ProxyCullVisitor::apply(osg::LOD& node)
 {
     ProxyCullVisitor::apply(static_cast<osg::Node&>(node));
@@ -890,7 +803,7 @@
     if (node_state) _cv->pushStateSet(node_state);
 
     osg::RefMatrix& matrix = *_cv->getModelViewMatrix();
-    const osg::BoundingBox& bb = Utils::getBoundingBox(&drawable);
+    const osg::BoundingBox& bb = drawable.getBoundingBox();
 
     bool culledOut = false;
 
@@ -1014,6 +927,7 @@
     if ( stateset )
     {
         VirtualProgram* vp = VirtualProgram::getOrCreate(stateset);
+        vp->setName("HorizonCullingProgram");
         vp->setFunction( "oe_horizon_vertex",   horizon_vs, ShaderComp::LOCATION_VERTEX_VIEW );
         vp->setFunction( "oe_horizon_fragment", horizon_fs, ShaderComp::LOCATION_FRAGMENT_COLORING );
     }
@@ -1095,22 +1009,75 @@
     traverse(node, nv);
 }
 
+//..........................................................................
+
+void
+AltitudeCullCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
+{
+    bool visible = true;
+
+    if (_maxAltitude.isSet())
+    {
+        Horizon* horizon = Horizon::get(*nv);
+        if (horizon)
+        {
+            visible = nv->getDistanceToViewPoint(osg::Vec3(0, 0, 0), true) <
+                _maxAltitude.get() + horizon->getRadius();
+        }
+        else if (_srs.valid())
+        {
+            if (_srs->isGeographic())
+            {
+                visible = nv->getDistanceToViewPoint(osg::Vec3(0, 0, 0), true) <
+                    _maxAltitude.get() + _srs->getEllipsoid()->getRadiusEquator();
+            }
+            else
+            {
+                visible = nv->getViewPoint().z() <= _maxAltitude.get();
+            }
+        }
+    }
+
+    if (visible)
+    {
+        traverse(node, nv);
+    }
+}
+
 //......................................................................
 
 namespace
 {
+    Config dumpStateSet(const osg::StateSet* ss)
+    {
+        Config conf("StateSetAttrs");
+        for (osg::StateSet::AttributeList::const_iterator i = ss->getAttributeList().begin(); i != ss->getAttributeList().end(); ++i)
+        {
+            osg::StateAttribute* sa = i->second.first.get();
+            Config saconf(sa->className());
+            conf.add(saconf);
+        }
+        return conf;
+    }
+
+    Config dumpRenderLeaf(osgUtil::RenderLeaf* leaf)
+    {
+        Config conf("Leaf");
+        conf.add("Name", leaf->getDrawable()->getName());
+        conf.add("Depth", leaf->_depth);
+        if (leaf->getDrawable()->getStateSet())
+            conf.add(dumpStateSet(leaf->getDrawable()->getStateSet()));
+        return conf;
+    }
+
     Config dumpStateGraph(osgUtil::StateGraph* sg)
     {
         Config conf("StateGraph");
 
         Config leaves("Leaves");
         for(osgUtil::StateGraph::LeafList::const_iterator i = sg->_leaves.begin(); i != sg->_leaves.end(); ++i)
-        {
-            Config leaf("Leaf");
-            leaf.add("Name", i->get()->getDrawable()->getName());
-            leaf.add("Depth", i->get()->_depth);
-            leaves.add( leaf );
-        }
+            leaves.add(dumpRenderLeaf(i->get()));
+
         if ( !leaves.empty() )
             conf.add(leaves);
 
@@ -1132,8 +1099,19 @@
     Config conf("RenderBin");
     if ( !bin->getName().empty() )
         conf.set("Name", bin->getName());
+    conf.set("SortMode", Stringify()<<bin->getSortMode());
+    if (bin->getStateSet())
+        conf.set("StateSet", dumpStateSet(bin->getStateSet()));
+
     conf.set("BinNum", bin->getBinNum());
-    
+
+    Config leaves("Leaves");
+    for (osgUtil::RenderBin::RenderLeafList::const_iterator i = bin->getRenderLeafList().begin(); i != bin->getRenderLeafList().end(); ++i)
+        leaves.add(dumpRenderLeaf(*i));
+
+    if (!leaves.empty())
+        conf.add(leaves);
+
     Config sg("StateGraphList");
     sg.add("NumChildren", bin->getStateGraphList().size());
 
@@ -1156,3 +1134,41 @@
 
     return conf;
 }
+
+//...................................................................
+
+void
+InstallViewportSizeUniform::operator()(osg::Node* node, osg::NodeVisitor* nv)
+{
+    osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
+    const osg::Camera* camera = cv->getCurrentCamera();
+    
+    osg::ref_ptr<osg::StateSet> ss;
+
+    if (camera && camera->getViewport())
+    {
+        ss = new osg::StateSet();
+        ss->addUniform(new osg::Uniform("oe_ViewportSize", osg::Vec2f(
+            camera->getViewport()->width(),
+            camera->getViewport()->height())));
+        cv->pushStateSet(ss.get());
+    }
+
+    traverse(node, nv);
+
+    if (ss.valid())
+        cv->popStateSet();
+}
+
+namespace osgEarth { namespace Serializers { namespace InstallViewportSizeUniform
+{
+    REGISTER_OBJECT_WRAPPER(
+        InstallViewportSizeUniform,
+        new osgEarth::InstallViewportSizeUniform,
+        osgEarth::InstallViewportSizeUniform,
+        "osg::Object osg::NodeCallback osgEarth::InstallViewportSizeUniform")
+    {
+        // no properties
+    }
+} } }
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DateTime osgearth-2.10.2+dfsg/src/osgEarth/DateTime
--- osgearth-2.9.0+dfsg/src/osgEarth/DateTime	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DateTime	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -28,7 +28,7 @@
 
 namespace osgEarth
 {
-    /** Basic timestamp (seconds from the epoch) */
+    /** Basic timestamp (seconds from the 1970 epoch) */
     typedef ::time_t TimeStamp;
 
     /** Time span (in seconds) */
@@ -56,6 +56,9 @@
         /** DateTime from year, month [1-12], date [1-31], hours [0-24) */
         DateTime(int year, int month, int day, double hours);
 
+        /** DateTime from year and fractional day-of-year [1..365] */
+        DateTime(int year, double dayOfYear);
+
         /** DateTime from an ISO 8601 string */
         DateTime(const std::string& iso8601);
 
@@ -69,14 +72,21 @@
           * order with no delimiters). */
         const std::string asCompactISO8601() const;
 
+        /** Julian day (fractional) corresponding to this DateTime */
+        double getJulianDay() const;
+
+        /** Seconds since Jan 1, 1970 00:00 UTC */
+        TimeStamp asTimeStamp() const { return _time_t; }
+
+        /** Adds hours to return a new DateTime */
+        DateTime operator + (double hours) const;
+
     public:
         int    year()  const;
         int    month() const;
         int    day()   const;
         double hours() const;
 
-        TimeStamp   asTimeStamp() const { return _time_t; }
-
     protected:
         ::tm     _tm;
         ::time_t _time_t;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DateTime.cpp osgearth-2.10.2+dfsg/src/osgEarth/DateTime.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/DateTime.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DateTime.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -21,9 +21,8 @@
 */
 #include <osgEarth/DateTime>
 #include <osgEarth/StringUtils>
-#include <math.h>
-#include <iomanip>
-#include <stdio.h>
+
+#include <stdio.h> 
 
 using namespace osgEarth;
 
@@ -94,6 +93,15 @@
     else memset( &_tm, 0, sizeof(tm) );
 }
 
+DateTime::DateTime(int year, double dayOfYear)
+{
+    TimeStamp utc = DateTime(year,1,1,0).asTimeStamp() + (int)((dayOfYear-1.0)*24.0*3600.0);
+    _time_t = utc;
+    tm* temp = ::gmtime( &_time_t );
+    if ( temp ) _tm = *temp;
+    else memset( &_tm, 0, sizeof(tm) );    
+}
+
 DateTime::DateTime(const std::string& input) :
 _time_t(0)
 {
@@ -225,6 +233,15 @@
         << 'Z';
 }
 
+
+// https://en.wikipedia.org/wiki/Julian_day#Converting_Gregorian_calendar_date_to_Julian_Day_Number
+double
+DateTime::getJulianDay() const
+{
+    int d = (1461 * (year() + 4800 + (month() - 14) / 12)) / 4 + (367 * (month() - 2 - 12 * ((month() - 14) / 12))) / 12 - (3 * ((year() + 4900 + (month()-14)/12)/100))/4 + day() - 32075;
+    return (double)(d-0.5) + hours()/24.0;
+}
+
 //------------------------------------------------------------------------
 
 /*
@@ -304,4 +321,11 @@
     seconds = minutes * 60 + tm->tm_sec;
 
     return seconds;
-}
\ No newline at end of file
+}
+
+DateTime
+DateTime::operator+(double hours) const
+{
+    double seconds = (double)asTimeStamp() + (hours*3600.0);
+    return DateTime((TimeStamp)seconds);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DateTimeRange osgearth-2.10.2+dfsg/src/osgEarth/DateTimeRange
--- osgearth-2.9.0+dfsg/src/osgEarth/DateTimeRange	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DateTimeRange	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DateTimeRange.cpp osgearth-2.10.2+dfsg/src/osgEarth/DateTimeRange.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/DateTimeRange.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DateTimeRange.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DepthOffset osgearth-2.10.2+dfsg/src/osgEarth/DepthOffset
--- osgearth-2.9.0+dfsg/src/osgEarth/DepthOffset	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DepthOffset	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -95,8 +95,12 @@
         optional<Distance> _maxRange;
         optional<bool>  _auto;
     };
+}
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::DepthOffsetOptions);
 
+namespace osgEarth
+{
     /**
      * Interface for adding depth offset methods to anothe class without
      * disturbing the class hierarchy. Use this in conjuction with the
@@ -143,8 +147,7 @@
         bool                         _supported;
         bool                         _dirty;
         osg::observer_ptr<osg::Node> _graph;
-        osg::ref_ptr<osg::Uniform>   _minBiasUniform, _maxBiasUniform;
-        osg::ref_ptr<osg::Uniform>   _minRangeUniform, _maxRangeUniform;
+        osg::ref_ptr<osg::Uniform>   _paramsUniform;
         DepthOffsetOptions           _options;
     };
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DepthOffset.cpp osgearth-2.10.2+dfsg/src/osgEarth/DepthOffset.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/DepthOffset.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DepthOffset.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,16 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/DepthOffset>
-#include <osgEarth/StringUtils>
-#include <osgEarth/ThreadingUtils>
 #include <osgEarth/LineFunctor>
 #include <osgEarth/Registry>
 #include <osgEarth/NodeUtils>
 #include <osgEarth/Capabilities>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/Shaders>
 
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Depth>
 
@@ -37,10 +33,6 @@
 
 using namespace osgEarth;
 
-// vertex-only method - just pull the actual vertex. test for a while
-// and accept if it works consistently.
-#define VERTEX_ONLY_METHOD 1
-
 //------------------------------------------------------------------------
 
 
@@ -73,18 +65,13 @@
             }
         }
 
-        void apply( osg::Geode& geode )
+        void apply(osg::Drawable& drawable)
         {
-            for( unsigned i=0; i<geode.getNumDrawables(); ++i )
+            if (drawable.asGeometry())
             {
-                osg::Drawable* d = geode.getDrawable(i);
-
-                if ( d->asGeometry() )
-                {
-                    d->accept( _segmentAnalyzer );
-                }
+                drawable.asGeometry()->accept(_segmentAnalyzer);
             }
-            traverse((osg::Node&)geode);
+            apply(static_cast<osg::Node&>(drawable));
         }
 
         LineFunctor<SegmentAnalyzer> _segmentAnalyzer;
@@ -103,12 +90,12 @@
 _maxRange( 10000000.0f ),
 _auto    ( true )
 {
-    conf.getIfSet( "enabled",   _enabled );
-    conf.getIfSet( "min_bias",  _minBias );
-    conf.getIfSet( "max_bias",  _maxBias );
-    conf.getIfSet( "min_range", _minRange );
-    conf.getIfSet( "max_range", _maxRange );
-    conf.getIfSet( "auto",      _auto );
+    conf.get( "enabled",   _enabled );
+    conf.get( "min_bias",  _minBias );
+    conf.get( "max_bias",  _maxBias );
+    conf.get( "min_range", _minRange );
+    conf.get( "max_range", _maxRange );
+    conf.get( "auto",      _auto );
 }
 
 
@@ -116,12 +103,12 @@
 DepthOffsetOptions::getConfig() const
 {
     Config conf("depth_offset");
-    conf.addIfSet( "enabled",   _enabled );
-    conf.addIfSet( "min_bias",  _minBias );
-    conf.addIfSet( "max_bias",  _maxBias );
-    conf.addIfSet( "min_range", _minRange );
-    conf.addIfSet( "max_range", _maxRange );
-    conf.addIfSet( "auto",      _auto );
+    conf.set( "enabled",   _enabled );
+    conf.set( "min_bias",  _minBias );
+    conf.set( "max_bias",  _maxBias );
+    conf.set( "min_range", _minRange );
+    conf.set( "max_range", _maxRange );
+    conf.set( "auto",      _auto );
     return conf;
 }
 
@@ -147,10 +134,7 @@
     _supported = Registry::capabilities().supportsGLSL();
     if ( _supported )
     {
-        _minBiasUniform  = new osg::Uniform(osg::Uniform::FLOAT, "oe_depthOffset_minBias");
-        _maxBiasUniform  = new osg::Uniform(osg::Uniform::FLOAT, "oe_depthOffset_maxBias");
-        _minRangeUniform = new osg::Uniform(osg::Uniform::FLOAT, "oe_depthOffset_minRange");
-        _maxRangeUniform = new osg::Uniform(osg::Uniform::FLOAT, "oe_depthOffset_maxRange");
+        _paramsUniform = new osg::Uniform(osg::Uniform::FLOAT_VEC4, "oe_DepthOffset_params");
         updateUniforms();
     }
 }
@@ -179,10 +163,7 @@
 
         // uninstall uniforms and shaders.
         osg::StateSet* s = _graph->getStateSet();
-        s->removeUniform( _minBiasUniform.get() );
-        s->removeUniform( _maxBiasUniform.get() );
-        s->removeUniform( _minRangeUniform.get() );
-        s->removeUniform( _maxRangeUniform.get() );
+        s->removeUniform( _paramsUniform.get() );
         
         shaders.unload( VirtualProgram::get(s), shaders.DepthOffsetVertex );
 
@@ -199,12 +180,11 @@
         // so the stateset doesn't get merged by a state set optimizer
         s->setDataVariance(s->DYNAMIC);
 
-        s->addUniform( _minBiasUniform.get() );
-        s->addUniform( _maxBiasUniform.get() );
-        s->addUniform( _minRangeUniform.get() );
-        s->addUniform( _maxRangeUniform.get() );
+        s->addUniform( _paramsUniform.get() );
         
-        shaders.load(VirtualProgram::getOrCreate(s), shaders.DepthOffsetVertex);    
+        VirtualProgram* vp = VirtualProgram::getOrCreate(s);
+        vp->setName("DepthOffset");
+        shaders.load(vp, shaders.DepthOffsetVertex);    
 
         // disable depth writes
         s->setAttributeAndModes(new osg::Depth(osg::Depth::LEQUAL, 0.0, 1.0, false), 1);
@@ -225,10 +205,11 @@
 {
     if ( !_supported ) return;
 
-    _minBiasUniform->set( (float)_options.minBias()->as(Units::METERS) );
-    _maxBiasUniform->set( (float)_options.maxBias()->as(Units::METERS) );
-    _minRangeUniform->set( (float)_options.minRange()->as(Units::METERS) );
-    _maxRangeUniform->set( (float)_options.maxRange()->as(Units::METERS) );
+    _paramsUniform->set(osg::Vec4f(
+        (float)_options.minBias()->as(Units::METERS),
+        (float)_options.maxBias()->as(Units::METERS),
+        (float)_options.minRange()->as(Units::METERS),
+        (float)_options.maxRange()->as(Units::METERS)));
 }
 
 void 
@@ -260,7 +241,7 @@
         {
             GeometryAnalysisVisitor v;
             _graph->accept( v );
-            float maxLen = std::max(1.0f, sqrtf(v._segmentAnalyzer._maxLen2));
+            float maxLen = osg::maximum(1.0f, sqrtf(v._segmentAnalyzer._maxLen2));
             _options.minRange() = sqrtf(maxLen) * 19.0f;
             _dirty = false;
             OE_TEST << LC << "Recalcluated." << std::endl;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DepthOffset.vert.glsl osgearth-2.10.2+dfsg/src/osgEarth/DepthOffset.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarth/DepthOffset.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DepthOffset.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -1,42 +1,33 @@
 #version $GLSL_VERSION_STR
 $GLSL_DEFAULT_PRECISION_FLOAT
 
-#pragma vp_entryPoint oe_depthOffset_vertex
+#pragma vp_entryPoint oe_DepthOffset_vertex
 #pragma vp_location   vertex_view
 #pragma vp_order      0.8
 
-uniform float oe_depthOffset_minBias;
-uniform float oe_depthOffset_maxBias;
-uniform float oe_depthOffset_minRange;
-uniform float oe_depthOffset_maxRange;
+uniform vec4 oe_DepthOffset_params;
 
-//uniform mat4 gl_ProjectionMatrix;
-
-float oe_depthOffset_biasClip;
-
-void oe_depthOffset_vertex(inout vec4 vertexView)
+void oe_DepthOffset_vertex(inout vec4 vertexView)
 {
     // calculate range to target:
     float range = length(vertexView.xyz);
 
+    // extract params for clarity.
+    float minBias = oe_DepthOffset_params[0];
+    float maxBias = oe_DepthOffset_params[1];
+    float minRange = oe_DepthOffset_params[2];
+    float maxRange = oe_DepthOffset_params[3];
+
     // calculate the depth offset bias for this range:
-    float ratio = (clamp(range, oe_depthOffset_minRange, oe_depthOffset_maxRange)-oe_depthOffset_minRange)/(oe_depthOffset_maxRange-oe_depthOffset_minRange);
-    float bias = oe_depthOffset_minBias + ratio * (oe_depthOffset_maxBias-oe_depthOffset_minBias);
+    float ratio = (clamp(range, minRange, maxRange)-minRange)/(maxRange-minRange);
+    float bias = minBias + ratio * (maxBias-minBias);
 
 	// clamp the bias to 1/2 of the range of the vertex. We don't want to 
     // pull the vertex TOO close to the camera and certainly not behind it.
     bias = min(bias, range*0.5);
-    bias = min(bias, oe_depthOffset_maxBias);
-
-    //vec4 p0 = gl_ProjectionMatrix * vec4(0,0,0,1);
-    //vec4 p1 = gl_ProjectionMatrix * vec4(0,0,-bias,1);
-    //oe_depthOffset_biasClip = distance(p0, p1);
-    //oe_depthOffset_biasClip = p1.z;
-
-    //vec4 refPointClip = gl_ProjectionMatrix * vec4(0.0, 0.0, -bias, 1.0);
-    //oe_depthOffset_biasClip = refPointClip.z;
+    bias = min(bias, maxBias);
 
-    //   pull the vertex towards the camera.
+    // pull the vertex towards the camera.
     vec3 pullVec = normalize(vertexView.xyz);
     vec3 simVert3 = vertexView.xyz - pullVec*bias;
     vertexView = vec4(simVert3, 1.0);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DrapeableNode osgearth-2.10.2+dfsg/src/osgEarth/DrapeableNode
--- osgearth-2.9.0+dfsg/src/osgEarth/DrapeableNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DrapeableNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2011 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DrapeableNode.cpp osgearth-2.10.2+dfsg/src/osgEarth/DrapeableNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/DrapeableNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DrapeableNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,11 +19,8 @@
 
 #include <osgEarth/DrapeableNode>
 #include <osgEarth/DrapingCullSet>
-#include <osgEarth/Registry>
 #include <osgEarth/CullingUtils>
-#include <osgEarth/MapNode>
 #include <osgEarth/NodeUtils>
-#include <osgEarth/TerrainEngineNode>
 
 #define LC "[DrapeableNode] "
 
@@ -105,11 +102,8 @@
 #undef  LC
 #define LC "[DrapeableNode Serializer] "
 
-#include <osgDB/ObjectWrapper>
-#include <osgDB/InputStream>
-#include <osgDB/OutputStream>
 
-namespace
+namespace osgEarth { namespace Serializers { namespace DrapeableNode
 {
     REGISTER_OBJECT_WRAPPER(
         DrapeableNode,
@@ -119,4 +113,4 @@
     {
         ADD_BOOL_SERIALIZER(DrapingEnabled, true);
     }
-}
+} } }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DrapingCullSet osgearth-2.10.2+dfsg/src/osgEarth/DrapingCullSet
--- osgearth-2.9.0+dfsg/src/osgEarth/DrapingCullSet	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DrapingCullSet	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DrapingCullSet.cpp osgearth-2.10.2+dfsg/src/osgEarth/DrapingCullSet.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/DrapingCullSet.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DrapingCullSet.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -89,8 +89,9 @@
             // If there's an active (non-identity matrix), apply it
             if ( entry->_matrix.valid() )
             {
-                entry->_matrix->postMult( *cv->getModelViewMatrix() );
-                cv->pushModelViewMatrix( entry->_matrix.get(), osg::Transform::RELATIVE_RF );
+                osg::ref_ptr<osg::RefMatrix> m = osg::clone(entry->_matrix.get());
+                m->postMult( *cv->getModelViewMatrix() );
+                cv->pushModelViewMatrix( m.get(), osg::Transform::RELATIVE_RF );
             }
 
             // After pushing the matrix, we can perform the culling bounds test.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DrapingTechnique osgearth-2.10.2+dfsg/src/osgEarth/DrapingTechnique
--- osgearth-2.9.0+dfsg/src/osgEarth/DrapingTechnique	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DrapingTechnique	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DrapingTechnique.cpp osgearth-2.10.2+dfsg/src/osgEarth/DrapingTechnique.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/DrapingTechnique.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DrapingTechnique.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,19 +20,13 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/DrapingTechnique>
-#include <osgEarth/DrapingCullSet>
 #include <osgEarth/Capabilities>
 #include <osgEarth/Registry>
-#include <osgEarth/ShaderFactory>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/Shaders>
-#include <osgEarth/CullingUtils>
 #include <osgEarth/Lighting>
 
 #include <osg/BlendFunc>
-#include <osg/TexGen>
 #include <osg/Texture2D>
-#include <osg/Uniform>
 
 #define LC "[DrapingTechnique] "
 
@@ -48,6 +42,22 @@
 
 namespace
 {
+    struct RenderBinSortingVisitor
+    {
+        void apply(osgUtil::RenderBin* bin)
+        {
+            bin->setSortMode(osgUtil::RenderBin::TRAVERSAL_ORDER);
+
+            for(osgUtil::RenderBin::RenderBinList::iterator i = bin->getRenderBinList().begin();
+                i != bin->getRenderBinList().end();
+                ++i)
+            {
+                osgUtil::RenderBin* child = i->second.get();
+                apply(child);
+            }
+        }
+    };
+
     /**
      * A camera that will traverse the per-thread DrapingCullSet instead of
      * its own children.
@@ -58,6 +68,9 @@
         DrapingCamera(DrapingManager& dm) : osg::Camera(), _dm(dm), _camera(0L)
         {
             setCullingActive( false );
+            osg::StateSet* ss = getOrCreateStateSet();
+            ss->setMode(GL_DEPTH_TEST, 0);
+            ss->setRenderBinDetails(1, "TraversalOrderBin", osg::StateSet::OVERRIDE_PROTECTED_RENDERBIN_DETAILS);
         }
 
     public: // osg::Node
@@ -72,6 +85,27 @@
         {
             DrapingCullSet& cullSet = _dm.get(_camera);
             cullSet.accept( nv );
+
+            // manhandle the render bin sorting, since OSG ignores the override
+            // in the render bin details above
+            osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(&nv);
+            if (cv)
+            {
+                applyTraversalOrderSorting(cv->getCurrentRenderBin());
+            }
+        }
+
+        void applyTraversalOrderSorting(osgUtil::RenderBin* bin)
+        {
+            bin->setSortMode(osgUtil::RenderBin::TRAVERSAL_ORDER);
+
+            for (osgUtil::RenderBin::RenderBinList::iterator i = bin->getRenderBinList().begin();
+                i != bin->getRenderBinList().end();
+                ++i)
+            {
+                osgUtil::RenderBin* child = i->second.get();
+                applyTraversalOrderSorting(child);
+            }
         }
 
     protected:
@@ -82,9 +116,23 @@
 
 
     // Additional per-view data stored by the draping technique.
-    struct LocalPerViewData : public osg::Referenced
+    struct LocalPerViewData : public osg::Object
     {
+        META_Object(osgEarth, LocalPerViewData);
+
         osg::ref_ptr<osg::Uniform> _texGenUniform;
+
+        void resizeGLObjectBuffers(unsigned maxSize) {
+            if (_texGenUniform.valid())
+                _texGenUniform->resizeGLObjectBuffers(maxSize);
+        }
+        void releaseGLObjects(osg::State* state) const {
+            if (_texGenUniform.valid())
+                _texGenUniform->releaseGLObjects(state);
+        }
+
+        LocalPerViewData() { }
+        LocalPerViewData(const LocalPerViewData& rhs, const osg::CopyOp& co) { }
     };
 }
 
@@ -244,7 +292,7 @@
                     //break;
                 }
 
-                halfWidthNear = std::max(halfWidthNear, minHalfWidthNear);
+                halfWidthNear = osg::maximum(halfWidthNear, minHalfWidthNear);
             }
 
             // if the far plane is narrower than the near plane, bail out and 
@@ -385,7 +433,7 @@
     osg::Texture2D* projTexture = new DrapingTexture(); 
 
     projTexture->setTextureSize( *_textureSize, *_textureSize );
-    projTexture->setInternalFormat( GL_RGBA );
+    projTexture->setInternalFormat( GL_RGBA8 );  //use GL_RGBA8 for compatibility with osg's glTexStorage extension
     projTexture->setSourceFormat( GL_RGBA );
     projTexture->setSourceType( GL_UNSIGNED_BYTE );
     projTexture->setFilter( osg::Texture::MIN_FILTER, _mipmapping? osg::Texture::LINEAR_MIPMAP_LINEAR: osg::Texture::LINEAR );
@@ -475,11 +523,6 @@
     //       while we are changing its children.
     params._rttCamera->addChild( params._group );
 
-    // overlay geometry is rendered with no depth testing, and in the order it's found in the
-    // scene graph... until further notice.
-    rttStateSet->setMode(GL_DEPTH_TEST, 0);
-    rttStateSet->setRenderBinDetails(1, "TraversalOrderBin", osg::StateSet::OVERRIDE_PROTECTED_RENDERBIN_DETAILS );
-
     // add to the terrain stateset, i.e. the stateset that the OverlayDecorator will
     // apply to the terrain before cull-traversing it. This will activate the projective
     // texturing on the terrain.
@@ -506,12 +549,13 @@
             "    if (vclip.z > 1.0) vclip.z = vclip.w+1.0; \n"
             "} \n";
         VirtualProgram* rtt_vp = VirtualProgram::getOrCreate(rttStateSet);
+        rtt_vp->setName("Draping RTT");
         rtt_vp->setFunction( "oe_overlay_warpClip", warpClip, ShaderComp::LOCATION_VERTEX_CLIP );
     }
 
     // Assemble the terrain shaders that will apply projective texturing.
     VirtualProgram* terrain_vp = VirtualProgram::getOrCreate(params._terrainStateSet);
-    terrain_vp->setName( "Draping terrain shaders");
+    terrain_vp->setName( "Draping apply");
 
     // sampler for projected texture:
     params._terrainStateSet->getOrCreateUniform(
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DrawInstanced osgearth-2.10.2+dfsg/src/osgEarth/DrawInstanced
--- osgearth-2.9.0+dfsg/src/osgEarth/DrawInstanced	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DrawInstanced	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -24,7 +24,11 @@
 #include <osgEarth/Containers>
 #include <osgEarth/VirtualProgram>
 #include <osg/NodeVisitor>
-#include <osg/Geode>
+#include <osg/Drawable>
+
+namespace osg {
+    class TextureBuffer;
+}
 
 /**
  * Some utilities to support *DrawInstanced rendering.
@@ -62,16 +66,25 @@
             ConvertToDrawInstanced(
                 unsigned                numInstances,
                 const osg::BoundingBox& bbox,
-                bool                    optimize );
+                bool                    optimize,
+                osg::TextureBuffer*     tbo,
+                int                     firstTboUnit);
 
-            void apply(osg::Geode&);
+            void apply(osg::Drawable&);
             void apply(osg::LOD&);
+            void apply(osg::Node&);
+
+        public:
+            int getTextureImageUnit() const { return _tboUnit; }
 
         protected:
             unsigned _numInstances;
             osg::BoundingBox _bbox;
             bool _optimize;
             std::list<osg::PrimitiveSet*> _primitiveSets;
+            osg::TextureBuffer* _tbo;
+            int _tboUnit;
+            osg::ref_ptr<osg::Drawable::ComputeBoundingBoxCallback> _bboxComputer;
         };
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/DrawInstanced.cpp osgearth-2.10.2+dfsg/src/osgEarth/DrawInstanced.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/DrawInstanced.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/DrawInstanced.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,22 +18,15 @@
  */
 #include <osgEarth/DrawInstanced>
 #include <osgEarth/CullingUtils>
-#include <osgEarth/ShaderGenerator>
-#include <osgEarth/ShaderUtils>
-#include <osgEarth/StateSetCache>
 #include <osgEarth/Registry>
 #include <osgEarth/Capabilities>
-#include <osgEarth/ImageUtils>
 #include <osgEarth/Utils>
 #include <osgEarth/Shaders>
 #include <osgEarth/ObjectIndex>
 
 #include <osg/ComputeBoundsVisitor>
-#include <osg/MatrixTransform>
-#include <osg/UserDataContainer>
-#include <osg/LOD>
 #include <osg/TextureBuffer>
-#include <osgUtil/MeshOptimizers>
+#include <osgUtil/Optimizer>
 
 #define LC "[DrawInstanced] "
 
@@ -42,7 +35,6 @@
 
 // Ref: http://sol.gfxile.net/instancing.html
 
-#define POSTEX_TBO_UNIT 5
 #define TAG_MATRIX_VECTOR "osgEarth::DrawInstanced::MatrixRefVector"
 
 //Uncomment to experiment with instance count adjustment
@@ -50,6 +42,24 @@
 
 //----------------------------------------------------------------------
 
+namespace osgEarth { namespace DrawInstanced
+{
+    class MakeTransformsStatic : public osg::NodeVisitor
+    {
+    public:
+        MakeTransformsStatic() : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) 
+        {
+            setNodeMaskOverride(~0);
+        }
+
+        void apply(osg::Transform& node)
+        {
+            node.setDataVariance(osg::Object::STATIC);
+            traverse(node);
+        }
+    };
+}}
+
 namespace
 {
 #ifdef USE_INSTANCE_LODS
@@ -68,7 +78,7 @@
                 _first = false;
             }
 
-            const osg::BoundingBox bbox = Utils::getBoundingBox(geom);
+            const osg::BoundingBox bbox = geom->getBoundingBox();
             float radius = bbox.radius();
 
             osg::Vec3d centerView = bbox.center() * ri.getState()->getModelViewMatrix();
@@ -131,53 +141,64 @@
 //----------------------------------------------------------------------
 
 
+namespace
+{
+    struct StaticBBox : public osg::Drawable::ComputeBoundingBoxCallback
+    {
+        osg::BoundingBox _box;
+        StaticBBox(const osg::BoundingBox& box) : _box(box) { }
+        osg::BoundingBox computeBound(const osg::Drawable&) const { return _box; }
+    };
+}
+
 ConvertToDrawInstanced::ConvertToDrawInstanced(unsigned                numInstances,
                                                const osg::BoundingBox& bbox,
-                                               bool                    optimize ) :
-_numInstances    ( numInstances ),
+                                               bool                    optimize,
+                                               osg::TextureBuffer*     tbo,
+                                               int                     defaultUnit) :
+_numInstances( numInstances ),
 _bbox(bbox),
-_optimize        ( optimize )
+_optimize( optimize ),
+_tbo(tbo),
+_tboUnit(defaultUnit)
 {
     setTraversalMode( TRAVERSE_ALL_CHILDREN );
     setNodeMaskOverride( ~0 );
+    _bboxComputer = new StaticBBox(bbox);
 }
 
 
 void 
-ConvertToDrawInstanced::apply( osg::Geode& geode )
+ConvertToDrawInstanced::apply(osg::Drawable& drawable)
 {
-    for( unsigned d=0; d<geode.getNumDrawables(); ++d )
+    osg::Geometry* geom = drawable.asGeometry();
+    if ( geom )
     {
-        osg::Geometry* geom = geode.getDrawable(d)->asGeometry();
-        if ( geom )
+        if ( _optimize )
         {
-            if ( _optimize )
-            {
-                // activate VBOs
-                geom->setUseDisplayList( false );
-                geom->setUseVertexBufferObjects( true );
-            }
+            // activate VBOs
+            geom->setUseDisplayList( false );
+            geom->setUseVertexBufferObjects( true );
+        }
 
-            geom->setInitialBound(_bbox);
+        geom->setComputeBoundingBoxCallback(_bboxComputer.get());
+        geom->dirtyBound();
 
-            // convert to use DrawInstanced
-            for( unsigned p=0; p<geom->getNumPrimitiveSets(); ++p )
-            {
-                osg::PrimitiveSet* ps = geom->getPrimitiveSet(p);
-                ps->setNumInstances( _numInstances );
-                _primitiveSets.push_back( ps );
-            }
+        // convert to use DrawInstanced
+        for( unsigned p=0; p<geom->getNumPrimitiveSets(); ++p )
+        {
+            osg::PrimitiveSet* ps = geom->getPrimitiveSet(p);
+            ps->setNumInstances( _numInstances );
+            _primitiveSets.push_back( ps );
+        }
 
 #ifdef USE_INSTANCE_LODS
-            geom->setDrawCallback( new LODCallback() );
+        geom->setDrawCallback( new LODCallback() );
 #endif
-        }
     }
-
-    traverse(geode);
+    apply(static_cast<osg::Node&>(drawable));
 }
 
-
 void
 ConvertToDrawInstanced::apply(osg::LOD& lod)
 {
@@ -200,9 +221,20 @@
     // add it back with a full range.
     lod.addChild( highestLOD.get(), 0.0f, FLT_MAX );
 
-    traverse(lod);
+    apply(static_cast<osg::Group&>(lod));
 }
 
+void
+ConvertToDrawInstanced::apply(osg::Node& node)
+{
+    osg::StateSet* stateSet = node.getStateSet();
+    if (stateSet)
+    {
+        int numTexAttrs = stateSet->getNumTextureAttributeLists();
+        _tboUnit = osg::maximum(_tboUnit, numTexAttrs);
+    }
+    traverse(node);
+}
 
 bool
 DrawInstanced::install(osg::StateSet* stateset)
@@ -214,12 +246,10 @@
         return false;
 
     VirtualProgram* vp = VirtualProgram::getOrCreate(stateset);
-    
+    vp->setName("DrawInstanced");
     osgEarth::Shaders pkg;
     pkg.load( vp, pkg.InstancingVertex );
 
-    stateset->getOrCreateUniform("oe_di_postex_TBO", osg::Uniform::SAMPLER_BUFFER)->set(POSTEX_TBO_UNIT);
-
     return true;
 }
 
@@ -236,11 +266,8 @@
 
     Shaders pkg;
     pkg.unload( vp, pkg.InstancingVertex );
-
-    stateset->removeUniform("oe_di_postex_TBO");
 }
 
-
 bool
 DrawInstanced::convertGraphToUseDrawInstanced( osg::Group* parent )
 {
@@ -251,6 +278,7 @@
     // the structure of the subgraph.
     const osg::BoundingSphere& bs = parent->getBound();
     parent->setInitialBound(bs);
+    //parent->setComputeBoundingSphereCallback(new StaticBound(bs));
     parent->dirtyBound();
 
     ModelInstanceMap models;
@@ -294,6 +322,8 @@
     // we make more tbos
     int matrixSize = 4 * 4 * sizeof(float); // 4 vec4's.
     int maxTBOInstancesSize = maxTBOSize / matrixSize;
+        
+    osgUtil::Optimizer optimizer;
 
     // For each model:
     for( ModelInstanceMap::iterator i = models.begin(); i != models.end(); ++i )
@@ -335,12 +365,6 @@
 			numInstancesToStore = maxTBOInstancesSize;
 		}
 		
-        // Convert the node's primitive sets to use "draw-instanced" rendering; at the
-        // same time, assign our computed bounding box as the static bounds for all
-        // geometries. (As DI's they cannot report bounds naturally.)
-        ConvertToDrawInstanced cdi(numInstancesToStore, bbox, true);
-        node->accept( cdi );
-		
         // Assign matrix vectors to the node, so the application can easily retrieve
         // the original position data if necessary.
         MatrixRefVector* nodeMats = new MatrixRefVector();
@@ -385,19 +409,34 @@
 			nodeMats->push_back(mat);
 		}
 
+        // so the TBO will serialize properly.
+        image->setWriteHint(osg::Image::STORE_INLINE);
+
+        // Constuct the TBO:
         osg::TextureBuffer* posTBO = new osg::TextureBuffer;
 		posTBO->setImage(image);
         posTBO->setInternalFormat( GL_RGBA32F_ARB );
         posTBO->setUnRefImageDataAfterApply( true );
 
-        // so the TBO will serialize properly.
-        image->setWriteHint(osg::Image::STORE_INLINE);
-
-        // Tell the SG to skip the positioning texture.
-        ShaderGenerator::setIgnoreHint(posTBO, true);
+        // Flatten any transforms in the node graph:
+        MakeTransformsStatic makeStatic;
+        node->accept(makeStatic);
+        osgUtil::Optimizer::FlattenStaticTransformsDuplicatingSharedSubgraphsVisitor flatten;
+        node->accept(flatten);
 
+        // Convert the node's primitive sets to use "draw-instanced" rendering; at the
+        // same time, assign our computed bounding box as the static bounds for all
+        // geometries. (As DI's they cannot report bounds naturally.)
+        ConvertToDrawInstanced cdi(numInstancesToStore, bbox, true, posTBO, 0);
+        node->accept( cdi );
+        
+        // Bind the TBO sampler:
         osg::StateSet* stateset = instanceGroup->getOrCreateStateSet();
-        stateset->setTextureAttribute(POSTEX_TBO_UNIT, posTBO);
+        stateset->setTextureAttribute(cdi.getTextureImageUnit(), posTBO);
+        stateset->getOrCreateUniform("oe_di_postex_TBO", osg::Uniform::SAMPLER_BUFFER)->set(cdi.getTextureImageUnit());
+
+        // Tell the SG to skip the positioning TBO.
+        ShaderGenerator::setIgnoreHint(posTBO, true);
 
 		// add the node as a child:
         instanceGroup->addChild( node );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/earcut.hpp osgearth-2.10.2+dfsg/src/osgEarth/earcut.hpp
--- osgearth-2.9.0+dfsg/src/osgEarth/earcut.hpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/earcut.hpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,776 @@
+#pragma once
+
+#include <algorithm>
+#include <cassert>
+#include <cmath>
+#include <memory>
+#include <vector>
+
+namespace mapbox {
+
+namespace util {
+
+template <std::size_t I, typename T> struct nth {
+    inline static typename std::tuple_element<I, T>::type
+    get(const T& t) { return std::get<I>(t); };
+};
+
+}
+
+namespace detail {
+
+template <typename N = uint32_t>
+class Earcut {
+public:
+    std::vector<N> indices;
+    std::size_t vertices = 0;
+
+    template <typename Polygon>
+    void operator()(const Polygon& points);
+
+private:
+    struct Node {
+        Node(N index, double x_, double y_) : i(index), x(x_), y(y_) {}
+        Node(const Node&) = delete;
+        Node& operator=(const Node&) = delete;
+        Node(Node&&) = delete;
+        Node& operator=(Node&&) = delete;
+
+        const N i;
+        const double x;
+        const double y;
+
+        // previous and next vertice nodes in a polygon ring
+        Node* prev = nullptr;
+        Node* next = nullptr;
+
+        // z-order curve value
+        int32_t z = 0;
+
+        // previous and next nodes in z-order
+        Node* prevZ = nullptr;
+        Node* nextZ = nullptr;
+
+        // indicates whether this is a steiner point
+        bool steiner = false;
+    };
+
+    template <typename Ring> Node* linkedList(const Ring& points, const bool clockwise);
+    Node* filterPoints(Node* start, Node* end = nullptr);
+    void earcutLinked(Node* ear, int pass = 0);
+    bool isEar(Node* ear);
+    bool isEarHashed(Node* ear);
+    Node* cureLocalIntersections(Node* start);
+    void splitEarcut(Node* start);
+    template <typename Polygon> Node* eliminateHoles(const Polygon& points, Node* outerNode);
+    void eliminateHole(Node* hole, Node* outerNode);
+    Node* findHoleBridge(Node* hole, Node* outerNode);
+    void indexCurve(Node* start);
+    Node* sortLinked(Node* list);
+    int32_t zOrder(const double x_, const double y_);
+    Node* getLeftmost(Node* start);
+    bool pointInTriangle(double ax, double ay, double bx, double by, double cx, double cy, double px, double py) const;
+    bool isValidDiagonal(Node* a, Node* b);
+    double area(const Node* p, const Node* q, const Node* r) const;
+    bool equals(const Node* p1, const Node* p2);
+    bool intersects(const Node* p1, const Node* q1, const Node* p2, const Node* q2);
+    bool intersectsPolygon(const Node* a, const Node* b);
+    bool locallyInside(const Node* a, const Node* b);
+    bool middleInside(const Node* a, const Node* b);
+    Node* splitPolygon(Node* a, Node* b);
+    template <typename Point> Node* insertNode(std::size_t i, const Point& p, Node* last);
+    void removeNode(Node* p);
+
+    bool hashing;
+    double minX, maxX;
+    double minY, maxY;
+    double inv_size = 0;
+
+    template <typename T, typename Alloc = std::allocator<T>>
+    class ObjectPool {
+    public:
+        ObjectPool() { }
+        ObjectPool(std::size_t blockSize_) {
+            reset(blockSize_);
+        }
+        ~ObjectPool() {
+            clear();
+        }
+        template <typename... Args>
+        T* construct(Args&&... args) {
+            if (currentIndex >= blockSize) {
+                currentBlock = alloc_traits::allocate(alloc, blockSize);
+                allocations.emplace_back(currentBlock);
+                currentIndex = 0;
+            }
+            T* object = &currentBlock[currentIndex++];
+            alloc_traits::construct(alloc, object, std::forward<Args>(args)...);
+            return object;
+        }
+        void reset(std::size_t newBlockSize) {
+            for (auto allocation : allocations) {
+                alloc_traits::deallocate(alloc, allocation, blockSize);
+            }
+            allocations.clear();
+            blockSize = std::max<std::size_t>(1, newBlockSize);
+            currentBlock = nullptr;
+            currentIndex = blockSize;
+        }
+        void clear() { reset(blockSize); }
+    private:
+        T* currentBlock = nullptr;
+        std::size_t currentIndex = 1;
+        std::size_t blockSize = 1;
+        std::vector<T*> allocations;
+        Alloc alloc;
+        typedef typename std::allocator_traits<Alloc> alloc_traits;
+    };
+    ObjectPool<Node> nodes;
+};
+
+template <typename N> template <typename Polygon>
+void Earcut<N>::operator()(const Polygon& points) {
+    // reset
+    indices.clear();
+    vertices = 0;
+
+    if (points.empty()) return;
+
+    double x;
+    double y;
+    int threshold = 80;
+    std::size_t len = 0;
+
+    for (size_t i = 0; threshold >= 0 && i < points.size(); i++) {
+        threshold -= static_cast<int>(points[i].size());
+        len += points[i].size();
+    }
+
+    //estimate size of nodes and indices
+    nodes.reset(len * 3 / 2);
+    indices.reserve(len + points[0].size());
+
+    Node* outerNode = linkedList(points[0], true);
+    if (!outerNode || outerNode->prev == outerNode->next) return;
+
+    if (points.size() > 1) outerNode = eliminateHoles(points, outerNode);
+
+    // if the shape is not too simple, we'll use z-order curve hash later; calculate polygon bbox
+    hashing = threshold < 0;
+    if (hashing) {
+        Node* p = outerNode->next;
+        minX = maxX = outerNode->x;
+        minY = maxY = outerNode->y;
+        do {
+            x = p->x;
+            y = p->y;
+            minX = std::min<double>(minX, x);
+            minY = std::min<double>(minY, y);
+            maxX = std::max<double>(maxX, x);
+            maxY = std::max<double>(maxY, y);
+            p = p->next;
+        } while (p != outerNode);
+
+        // minX, minY and size are later used to transform coords into integers for z-order calculation
+        inv_size = std::max<double>(maxX - minX, maxY - minY);
+        inv_size = inv_size != .0 ? (1. / inv_size) : .0;
+    }
+
+    earcutLinked(outerNode);
+
+    nodes.clear();
+}
+
+// create a circular doubly linked list from polygon points in the specified winding order
+template <typename N> template <typename Ring>
+typename Earcut<N>::Node*
+Earcut<N>::linkedList(const Ring& points, const bool clockwise) {
+    using Point = typename Ring::value_type;
+    double sum = 0;
+    const std::size_t len = points.size();
+    std::size_t i, j;
+    Node* last = nullptr;
+
+    // calculate original winding order of a polygon ring
+    for (i = 0, j = len > 0 ? len - 1 : 0; i < len; j = i++) {
+        const auto& p1 = points[i];
+        const auto& p2 = points[j];
+        const double p20 = util::nth<0, Point>::get(p2);
+        const double p10 = util::nth<0, Point>::get(p1);
+        const double p11 = util::nth<1, Point>::get(p1);
+        const double p21 = util::nth<1, Point>::get(p2);
+        sum += (p20 - p10) * (p11 + p21);
+    }
+
+    // link points into circular doubly-linked list in the specified winding order
+    if (clockwise == (sum > 0)) {
+        for (i = 0; i < len; i++) last = insertNode(vertices + i, points[i], last);
+    } else {
+        for (i = len; i-- > 0;) last = insertNode(vertices + i, points[i], last);
+    }
+
+    if (last && equals(last, last->next)) {
+        removeNode(last);
+        last = last->next;
+    }
+
+    vertices += len;
+
+    return last;
+}
+
+// eliminate colinear or duplicate points
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::filterPoints(Node* start, Node* end) {
+    if (!end) end = start;
+
+    Node* p = start;
+    bool again;
+    do {
+        again = false;
+
+        if (!p->steiner && (equals(p, p->next) || area(p->prev, p, p->next) == 0)) {
+            removeNode(p);
+            p = end = p->prev;
+
+            if (p == p->next) break;
+            again = true;
+
+        } else {
+            p = p->next;
+        }
+    } while (again || p != end);
+
+    return end;
+}
+
+// main ear slicing loop which triangulates a polygon (given as a linked list)
+template <typename N>
+void Earcut<N>::earcutLinked(Node* ear, int pass) {
+    if (!ear) return;
+
+    // interlink polygon nodes in z-order
+    if (!pass && hashing) indexCurve(ear);
+
+    Node* stop = ear;
+    Node* prev;
+    Node* next;
+
+    int iterations = 0;
+
+    // iterate through ears, slicing them one by one
+    while (ear->prev != ear->next) {
+        iterations++;
+        prev = ear->prev;
+        next = ear->next;
+
+        if (hashing ? isEarHashed(ear) : isEar(ear)) {
+            // cut off the triangle
+            indices.emplace_back(prev->i);
+            indices.emplace_back(ear->i);
+            indices.emplace_back(next->i);
+
+            removeNode(ear);
+
+            // skipping the next vertice leads to less sliver triangles
+            ear = next->next;
+            stop = next->next;
+
+            continue;
+        }
+
+        ear = next;
+
+        // if we looped through the whole remaining polygon and can't find any more ears
+        if (ear == stop) {
+            // try filtering points and slicing again
+            if (!pass) earcutLinked(filterPoints(ear), 1);
+
+            // if this didn't work, try curing all small self-intersections locally
+            else if (pass == 1) {
+                ear = cureLocalIntersections(ear);
+                earcutLinked(ear, 2);
+
+            // as a last resort, try splitting the remaining polygon into two
+            } else if (pass == 2) splitEarcut(ear);
+
+            break;
+        }
+    }
+}
+
+// check whether a polygon node forms a valid ear with adjacent nodes
+template <typename N>
+bool Earcut<N>::isEar(Node* ear) {
+    const Node* a = ear->prev;
+    const Node* b = ear;
+    const Node* c = ear->next;
+
+    if (area(a, b, c) >= 0) return false; // reflex, can't be an ear
+
+    // now make sure we don't have other points inside the potential ear
+    Node* p = ear->next->next;
+
+    while (p != ear->prev) {
+        if (pointInTriangle(a->x, a->y, b->x, b->y, c->x, c->y, p->x, p->y) &&
+            area(p->prev, p, p->next) >= 0) return false;
+        p = p->next;
+    }
+
+    return true;
+}
+
+template <typename N>
+bool Earcut<N>::isEarHashed(Node* ear) {
+    const Node* a = ear->prev;
+    const Node* b = ear;
+    const Node* c = ear->next;
+
+    if (area(a, b, c) >= 0) return false; // reflex, can't be an ear
+
+    // triangle bbox; min & max are calculated like this for speed
+    const double minTX = std::min<double>(a->x, std::min<double>(b->x, c->x));
+    const double minTY = std::min<double>(a->y, std::min<double>(b->y, c->y));
+    const double maxTX = std::max<double>(a->x, std::max<double>(b->x, c->x));
+    const double maxTY = std::max<double>(a->y, std::max<double>(b->y, c->y));
+
+    // z-order range for the current triangle bbox;
+    const int32_t minZ = zOrder(minTX, minTY);
+    const int32_t maxZ = zOrder(maxTX, maxTY);
+
+    // first look for points inside the triangle in increasing z-order
+    Node* p = ear->nextZ;
+
+    while (p && p->z <= maxZ) {
+        if (p != ear->prev && p != ear->next &&
+            pointInTriangle(a->x, a->y, b->x, b->y, c->x, c->y, p->x, p->y) &&
+            area(p->prev, p, p->next) >= 0) return false;
+        p = p->nextZ;
+    }
+
+    // then look for points in decreasing z-order
+    p = ear->prevZ;
+
+    while (p && p->z >= minZ) {
+        if (p != ear->prev && p != ear->next &&
+            pointInTriangle(a->x, a->y, b->x, b->y, c->x, c->y, p->x, p->y) &&
+            area(p->prev, p, p->next) >= 0) return false;
+        p = p->prevZ;
+    }
+
+    return true;
+}
+
+// go through all polygon nodes and cure small local self-intersections
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::cureLocalIntersections(Node* start) {
+    Node* p = start;
+    do {
+        Node* a = p->prev;
+        Node* b = p->next->next;
+
+        // a self-intersection where edge (v[i-1],v[i]) intersects (v[i+1],v[i+2])
+        if (!equals(a, b) && intersects(a, p, p->next, b) && locallyInside(a, b) && locallyInside(b, a)) {
+            indices.emplace_back(a->i);
+            indices.emplace_back(p->i);
+            indices.emplace_back(b->i);
+
+            // remove two nodes involved
+            removeNode(p);
+            removeNode(p->next);
+
+            p = start = b;
+        }
+        p = p->next;
+    } while (p != start);
+
+    return p;
+}
+
+// try splitting polygon into two and triangulate them independently
+template <typename N>
+void Earcut<N>::splitEarcut(Node* start) {
+    // look for a valid diagonal that divides the polygon into two
+    Node* a = start;
+    do {
+        Node* b = a->next->next;
+        while (b != a->prev) {
+            if (a->i != b->i && isValidDiagonal(a, b)) {
+                // split the polygon in two by the diagonal
+                Node* c = splitPolygon(a, b);
+
+                // filter colinear points around the cuts
+                a = filterPoints(a, a->next);
+                c = filterPoints(c, c->next);
+
+                // run earcut on each half
+                earcutLinked(a);
+                earcutLinked(c);
+                return;
+            }
+            b = b->next;
+        }
+        a = a->next;
+    } while (a != start);
+}
+
+// link every hole into the outer loop, producing a single-ring polygon without holes
+template <typename N> template <typename Polygon>
+typename Earcut<N>::Node*
+Earcut<N>::eliminateHoles(const Polygon& points, Node* outerNode) {
+    const size_t len = points.size();
+
+    std::vector<Node*> queue;
+    for (size_t i = 1; i < len; i++) {
+        Node* list = linkedList(points[i], false);
+        if (list) {
+            if (list == list->next) list->steiner = true;
+            queue.push_back(getLeftmost(list));
+        }
+    }
+    std::sort(queue.begin(), queue.end(), [](const Node* a, const Node* b) {
+        return a->x < b->x;
+    });
+
+    // process holes from left to right
+    for (size_t i = 0; i < queue.size(); i++) {
+        eliminateHole(queue[i], outerNode);
+        outerNode = filterPoints(outerNode, outerNode->next);
+    }
+
+    return outerNode;
+}
+
+// find a bridge between vertices that connects hole with an outer ring and and link it
+template <typename N>
+void Earcut<N>::eliminateHole(Node* hole, Node* outerNode) {
+    outerNode = findHoleBridge(hole, outerNode);
+    if (outerNode) {
+        Node* b = splitPolygon(outerNode, hole);
+        filterPoints(b, b->next);
+    }
+}
+
+// David Eberly's algorithm for finding a bridge between hole and outer polygon
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::findHoleBridge(Node* hole, Node* outerNode) {
+    Node* p = outerNode;
+    double hx = hole->x;
+    double hy = hole->y;
+    double qx = -std::numeric_limits<double>::infinity();
+    Node* m = nullptr;
+
+    // find a segment intersected by a ray from the hole's leftmost Vertex to the left;
+    // segment's endpoint with lesser x will be potential connection Vertex
+    do {
+        if (hy <= p->y && hy >= p->next->y && p->next->y != p->y) {
+          double x = p->x + (hy - p->y) * (p->next->x - p->x) / (p->next->y - p->y);
+          if (x <= hx && x > qx) {
+            qx = x;
+            if (x == hx) {
+                if (hy == p->y) return p;
+                if (hy == p->next->y) return p->next;
+            }
+            m = p->x < p->next->x ? p : p->next;
+          }
+        }
+        p = p->next;
+    } while (p != outerNode);
+
+    if (!m) return 0;
+
+    if (hx == qx) return m->prev;
+
+    // look for points inside the triangle of hole Vertex, segment intersection and endpoint;
+    // if there are no points found, we have a valid connection;
+    // otherwise choose the Vertex of the minimum angle with the ray as connection Vertex
+
+    const Node* stop = m;
+    double tanMin = std::numeric_limits<double>::infinity();
+    double tanCur = 0;
+
+    p = m->next;
+    double mx = m->x;
+    double my = m->y;
+
+    while (p != stop) {
+        if (hx >= p->x && p->x >= mx && hx != p->x &&
+            pointInTriangle(hy < my ? hx : qx, hy, mx, my, hy < my ? qx : hx, hy, p->x, p->y)) {
+
+            tanCur = std::abs(hy - p->y) / (hx - p->x); // tangential
+
+            if ((tanCur < tanMin || (tanCur == tanMin && p->x > m->x)) && locallyInside(p, hole)) {
+                m = p;
+                tanMin = tanCur;
+            }
+        }
+
+        p = p->next;
+    }
+
+    return m;
+}
+
+// interlink polygon nodes in z-order
+template <typename N>
+void Earcut<N>::indexCurve(Node* start) {
+    assert(start);
+    Node* p = start;
+
+    do {
+        p->z = p->z ? p->z : zOrder(p->x, p->y);
+        p->prevZ = p->prev;
+        p->nextZ = p->next;
+        p = p->next;
+    } while (p != start);
+
+    p->prevZ->nextZ = nullptr;
+    p->prevZ = nullptr;
+
+    sortLinked(p);
+}
+
+// Simon Tatham's linked list merge sort algorithm
+// http://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::sortLinked(Node* list) {
+    assert(list);
+    Node* p;
+    Node* q;
+    Node* e;
+    Node* tail;
+    int i, numMerges, pSize, qSize;
+    int inSize = 1;
+
+    for (;;) {
+        p = list;
+        list = nullptr;
+        tail = nullptr;
+        numMerges = 0;
+
+        while (p) {
+            numMerges++;
+            q = p;
+            pSize = 0;
+            for (i = 0; i < inSize; i++) {
+                pSize++;
+                q = q->nextZ;
+                if (!q) break;
+            }
+
+            qSize = inSize;
+
+            while (pSize > 0 || (qSize > 0 && q)) {
+
+                if (pSize == 0) {
+                    e = q;
+                    q = q->nextZ;
+                    qSize--;
+                } else if (qSize == 0 || !q) {
+                    e = p;
+                    p = p->nextZ;
+                    pSize--;
+                } else if (p->z <= q->z) {
+                    e = p;
+                    p = p->nextZ;
+                    pSize--;
+                } else {
+                    e = q;
+                    q = q->nextZ;
+                    qSize--;
+                }
+
+                if (tail) tail->nextZ = e;
+                else list = e;
+
+                e->prevZ = tail;
+                tail = e;
+            }
+
+            p = q;
+        }
+
+        tail->nextZ = nullptr;
+
+        if (numMerges <= 1) return list;
+
+        inSize *= 2;
+    }
+}
+
+// z-order of a Vertex given coords and size of the data bounding box
+template <typename N>
+int32_t Earcut<N>::zOrder(const double x_, const double y_) {
+    // coords are transformed into non-negative 15-bit integer range
+    int32_t x = static_cast<int32_t>(32767.0 * (x_ - minX) * inv_size);
+    int32_t y = static_cast<int32_t>(32767.0 * (y_ - minY) * inv_size);
+
+    x = (x | (x << 8)) & 0x00FF00FF;
+    x = (x | (x << 4)) & 0x0F0F0F0F;
+    x = (x | (x << 2)) & 0x33333333;
+    x = (x | (x << 1)) & 0x55555555;
+
+    y = (y | (y << 8)) & 0x00FF00FF;
+    y = (y | (y << 4)) & 0x0F0F0F0F;
+    y = (y | (y << 2)) & 0x33333333;
+    y = (y | (y << 1)) & 0x55555555;
+
+    return x | (y << 1);
+}
+
+// find the leftmost node of a polygon ring
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::getLeftmost(Node* start) {
+    Node* p = start;
+    Node* leftmost = start;
+    do {
+        if (p->x < leftmost->x || (p->x == leftmost->x && p->y < leftmost->y))
+            leftmost = p;
+        p = p->next;
+    } while (p != start);
+
+    return leftmost;
+}
+
+// check if a point lies within a convex triangle
+template <typename N>
+bool Earcut<N>::pointInTriangle(double ax, double ay, double bx, double by, double cx, double cy, double px, double py) const {
+    return (cx - px) * (ay - py) - (ax - px) * (cy - py) >= 0 &&
+           (ax - px) * (by - py) - (bx - px) * (ay - py) >= 0 &&
+           (bx - px) * (cy - py) - (cx - px) * (by - py) >= 0;
+}
+
+// check if a diagonal between two polygon nodes is valid (lies in polygon interior)
+template <typename N>
+bool Earcut<N>::isValidDiagonal(Node* a, Node* b) {
+    return a->next->i != b->i && a->prev->i != b->i && !intersectsPolygon(a, b) &&
+           locallyInside(a, b) && locallyInside(b, a) && middleInside(a, b);
+}
+
+// signed area of a triangle
+template <typename N>
+double Earcut<N>::area(const Node* p, const Node* q, const Node* r) const {
+    return (q->y - p->y) * (r->x - q->x) - (q->x - p->x) * (r->y - q->y);
+}
+
+// check if two points are equal
+template <typename N>
+bool Earcut<N>::equals(const Node* p1, const Node* p2) {
+    return p1->x == p2->x && p1->y == p2->y;
+}
+
+// check if two segments intersect
+template <typename N>
+bool Earcut<N>::intersects(const Node* p1, const Node* q1, const Node* p2, const Node* q2) {
+    if ((equals(p1, q1) && equals(p2, q2)) ||
+        (equals(p1, q2) && equals(p2, q1))) return true;
+    return (area(p1, q1, p2) > 0) != (area(p1, q1, q2) > 0) &&
+           (area(p2, q2, p1) > 0) != (area(p2, q2, q1) > 0);
+}
+
+// check if a polygon diagonal intersects any polygon segments
+template <typename N>
+bool Earcut<N>::intersectsPolygon(const Node* a, const Node* b) {
+    const Node* p = a;
+    do {
+        if (p->i != a->i && p->next->i != a->i && p->i != b->i && p->next->i != b->i &&
+                intersects(p, p->next, a, b)) return true;
+        p = p->next;
+    } while (p != a);
+
+    return false;
+}
+
+// check if a polygon diagonal is locally inside the polygon
+template <typename N>
+bool Earcut<N>::locallyInside(const Node* a, const Node* b) {
+    return area(a->prev, a, a->next) < 0 ?
+        area(a, b, a->next) >= 0 && area(a, a->prev, b) >= 0 :
+        area(a, b, a->prev) < 0 || area(a, a->next, b) < 0;
+}
+
+// check if the middle Vertex of a polygon diagonal is inside the polygon
+template <typename N>
+bool Earcut<N>::middleInside(const Node* a, const Node* b) {
+    const Node* p = a;
+    bool inside = false;
+    double px = (a->x + b->x) / 2;
+    double py = (a->y + b->y) / 2;
+    do {
+        if (((p->y > py) != (p->next->y > py)) && p->next->y != p->y &&
+                (px < (p->next->x - p->x) * (py - p->y) / (p->next->y - p->y) + p->x))
+            inside = !inside;
+        p = p->next;
+    } while (p != a);
+
+    return inside;
+}
+
+// link two polygon vertices with a bridge; if the vertices belong to the same ring, it splits
+// polygon into two; if one belongs to the outer ring and another to a hole, it merges it into a
+// single ring
+template <typename N>
+typename Earcut<N>::Node*
+Earcut<N>::splitPolygon(Node* a, Node* b) {
+    Node* a2 = nodes.construct(a->i, a->x, a->y);
+    Node* b2 = nodes.construct(b->i, b->x, b->y);
+    Node* an = a->next;
+    Node* bp = b->prev;
+
+    a->next = b;
+    b->prev = a;
+
+    a2->next = an;
+    an->prev = a2;
+
+    b2->next = a2;
+    a2->prev = b2;
+
+    bp->next = b2;
+    b2->prev = bp;
+
+    return b2;
+}
+
+// create a node and util::optionally link it with previous one (in a circular doubly linked list)
+template <typename N> template <typename Point>
+typename Earcut<N>::Node*
+Earcut<N>::insertNode(std::size_t i, const Point& pt, Node* last) {
+    Node* p = nodes.construct(static_cast<N>(i), util::nth<0, Point>::get(pt), util::nth<1, Point>::get(pt));
+
+    if (!last) {
+        p->prev = p;
+        p->next = p;
+
+    } else {
+        assert(last);
+        p->next = last->next;
+        p->prev = last;
+        last->next->prev = p;
+        last->next = p;
+    }
+    return p;
+}
+
+template <typename N>
+void Earcut<N>::removeNode(Node* p) {
+    p->next->prev = p->prev;
+    p->prev->next = p->next;
+
+    if (p->prevZ) p->prevZ->nextZ = p->nextZ;
+    if (p->nextZ) p->nextZ->prevZ = p->prevZ;
+}
+}
+
+template <typename N = uint32_t, typename Polygon>
+std::vector<N> earcut(const Polygon& poly) {
+    mapbox::detail::Earcut<N> earcut;
+    earcut(poly);
+    return std::move(earcut.indices);
+}
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ECEF osgearth-2.10.2+dfsg/src/osgEarth/ECEF
--- osgearth-2.9.0+dfsg/src/osgEarth/ECEF	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ECEF	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -29,14 +29,6 @@
     struct OSGEARTH_EXPORT ECEF
     {
         /**
-         * Creates a "localization" matrix for double-precision geocentric
-         * coordinates. The matrix is ceneterd at the specified ECEF reference point.
-         * @deprecated - use SpatialReference::createLocalToWorld
-         */
-        static osg::Matrixd createLocalToWorld( 
-            const osg::Vec3d& ecefRefPoint );
-
-        /**
          * Transforms a point into ECEF coordinates, localizes it with
          * the provided world2local matrix, and puts the result in "output".
          */
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ECEF.cpp osgearth-2.10.2+dfsg/src/osgEarth/ECEF.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ECEF.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ECEF.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,54 +18,11 @@
  */
 
 #include <osgEarth/ECEF>
-#include <osgEarth/Notify>
 
 using namespace osgEarth;
 
 #define LC "[ECEF] "
 
-// --------------------------------------------------------------------------
-
-osg::Matrixd
-ECEF::createLocalToWorld( const osg::Vec3d& input )
-{
-    double X = input.x(), Y = input.y(), Z = input.z();
-
-    osg::Matrixd localToWorld;
-    localToWorld.makeTranslate(X,Y,Z);
-
-    // normalize X,Y,Z
-    double inverse_length = 1.0/sqrt(X*X + Y*Y + Z*Z);
-
-    X *= inverse_length;
-    Y *= inverse_length;
-    Z *= inverse_length;
-
-    double length_XY = sqrt(X*X + Y*Y);
-    double inverse_length_XY = 1.0/length_XY;
-
-    // Vx = |(-Y,X,0)|
-    localToWorld(0,0) = -Y*inverse_length_XY;
-    localToWorld(0,1) = X*inverse_length_XY;
-    localToWorld(0,2) = 0.0;
-
-    // Vy = /(-Z*X/(sqrt(X*X+Y*Y), -Z*Y/(sqrt(X*X+Y*Y),sqrt(X*X+Y*Y))| 
-    double Vy_x = -Z*X*inverse_length_XY;
-    double Vy_y = -Z*Y*inverse_length_XY;
-    double Vy_z = length_XY;
-    inverse_length = 1.0/sqrt(Vy_x*Vy_x + Vy_y*Vy_y + Vy_z*Vy_z);            
-    localToWorld(1,0) = Vy_x*inverse_length;
-    localToWorld(1,1) = Vy_y*inverse_length;
-    localToWorld(1,2) = Vy_z*inverse_length;
-
-    // Vz = (X,Y,Z)
-    localToWorld(2,0) = X;
-    localToWorld(2,1) = Y;
-    localToWorld(2,2) = Z;
-
-    return localToWorld;
-}
-
 void
 ECEF::transformAndLocalize(const osg::Vec3d&       input,
                            const SpatialReference* inputSRS,
@@ -74,8 +31,7 @@
                            const osg::Matrixd&     world2local)
 {
     osg::Vec3d ecef;
-    //inputSRS->transformToECEF( input, ecef );
-    inputSRS->transform( input, outputSRS->getECEF(), ecef );
+    inputSRS->transform( input, outputSRS->getGeocentricSRS(), ecef );
     output = ecef * world2local;
 }
 
@@ -87,15 +43,15 @@
                            const SpatialReference*        outputSRS,
                            const osg::Matrixd&            world2local )
 {
-    const SpatialReference* ecefSRS = outputSRS->getECEF();
+    const SpatialReference* geocentricSRS = outputSRS->getGeocentricSRS();
     output->reserve( output->size() + input.size() );
 
     for( std::vector<osg::Vec3d>::const_iterator i = input.begin(); i != input.end(); ++i )
     {
-        osg::Vec3d ecef;
-        inputSRS->transform( *i, ecefSRS, ecef );
+        osg::Vec3d geoc;
+        inputSRS->transform( *i, geocentricSRS, geoc );
         //inputSRS->transformToECEF( *i, ecef );
-        output->push_back( ecef * world2local );
+        output->push_back( geoc * world2local );
     }
 }
 
@@ -108,7 +64,7 @@
                            const SpatialReference*        outputSRS,
                            const osg::Matrixd&            world2local )
 {
-    const SpatialReference* ecefSRS = outputSRS->getECEF();
+    const SpatialReference* ecefSRS = outputSRS->getGeocentricSRS();
     out_verts->reserve( out_verts->size() + input.size() );
     
     for( std::vector<osg::Vec3d>::const_iterator i = input.begin(); i != input.end(); ++i )
@@ -160,7 +116,7 @@
                                     osg::Matrixd&           out_rotation )
 {
     const SpatialReference* geoSRS  = inputSRS->getGeographicSRS();
-    const SpatialReference* ecefSRS = outputSRS->getECEF();
+    const SpatialReference* ecefSRS = outputSRS->getGeocentricSRS();
 
     // first transform the geographic (lat/long):
     osg::Vec3d geoPoint;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ElevationLayer osgearth-2.10.2+dfsg/src/osgEarth/ElevationLayer
--- osgearth-2.9.0+dfsg/src/osgEarth/ElevationLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ElevationLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -66,8 +66,12 @@
         optional<bool>                  _offset;
         optional<ElevationNoDataPolicy> _noDataPolicy;
     };
+}
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::ElevationLayerOptions);
     
 
+namespace osgEarth
+{
     struct ElevationLayerCallback : public TerrainLayerCallback
     {
         //EMPTY
@@ -80,7 +84,7 @@
     class OSGEARTH_EXPORT ElevationLayer : public TerrainLayer
     {
     public:
-        META_Layer(osgEarth, ElevationLayer, ElevationLayerOptions);
+        META_Layer(osgEarth, ElevationLayer, ElevationLayerOptions, elevation);
 
         /**
          * Constructs a blank Elevation Layer;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ElevationLayer.cpp osgearth-2.10.2+dfsg/src/osgEarth/ElevationLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ElevationLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ElevationLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,14 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/ElevationLayer>
-#include <osgEarth/VerticalDatum>
 #include <osgEarth/HeightFieldUtils>
 #include <osgEarth/Progress>
-#include <osgEarth/MemCache>
 #include <osgEarth/Metrics>
-#include <osgEarth/ImageUtils>
-#include <osg/Version>
-#include <iterator>
+#include <osgEarth/URI>
 
 using namespace osgEarth;
 using namespace OpenThreads;
@@ -35,6 +31,8 @@
     REGISTER_OSGEARTH_LAYER(elevation, osgEarth::ElevationLayer);
 }
 
+//#define ANALYZE
+
 //------------------------------------------------------------------------
 
 ElevationLayerOptions::ElevationLayerOptions() :
@@ -76,26 +74,20 @@
 ElevationLayerOptions::getConfig() const
 {
     Config conf = TerrainLayerOptions::getConfig();
-    conf.key() = "elevation";
-
     conf.set("offset", _offset);
     conf.set("nodata_policy", "default",     _noDataPolicy, NODATA_INTERPOLATE );
     conf.set("nodata_policy", "interpolate", _noDataPolicy, NODATA_INTERPOLATE );
     conf.set("nodata_policy", "msl",         _noDataPolicy, NODATA_MSL );
-
-    //if (driver().isSet())
-    //    conf.set("driver", driver()->getDriver());
-
     return conf;
 }
 
 void
 ElevationLayerOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet("offset", _offset );
-    conf.getIfSet("nodata_policy", "default",     _noDataPolicy, NODATA_INTERPOLATE );
-    conf.getIfSet("nodata_policy", "interpolate", _noDataPolicy, NODATA_INTERPOLATE );
-    conf.getIfSet("nodata_policy", "msl",         _noDataPolicy, NODATA_MSL );
+    conf.get("offset", _offset );
+    conf.get("nodata_policy", "default",     _noDataPolicy, NODATA_INTERPOLATE );
+    conf.get("nodata_policy", "interpolate", _noDataPolicy, NODATA_INTERPOLATE );
+    conf.get("nodata_policy", "msl",         _noDataPolicy, NODATA_MSL );
 }
 
 void
@@ -245,14 +237,23 @@
 {
     osg::ref_ptr<osg::HeightField> result;
 
+    if (progress && progress->isCanceled())
+    {
+        return 0L;
+    }
+
     TileSource* source = getTileSource();
     if ( !source )
+    {
+        if (progress) progress->message() = "no tile source";
         return 0L;
+    }
 
     // If the key is blacklisted, fail.
     if ( source->getBlacklist()->contains( key ))
     {
         OE_DEBUG << LC << "Tile " << key.str() << " is blacklisted " << std::endl;
+        if (progress) progress->message() = "blacklisted";
         return 0L;
     }
 
@@ -264,12 +265,13 @@
         if (!mayHaveData(key))
         {
             OE_DEBUG << LC << "Source for layer has no data at " << key.str() << std::endl;
+            //if (progress) progress->message() = "mayHaveData=false";
             return 0L;
         }
 
         // Make it from the source:
         result = source->createHeightField( key, getOrCreatePreCacheOp(), progress );
-   
+
         // If the result is good, we how have a heightfield but it's vertical values
         // are still relative to the tile source's vertical datum. Convert them.
         if (result.valid())
@@ -288,8 +290,7 @@
         // we can't get it and it wasn't cancelled
         if (!result.valid())
         {
-            if ( progress == 0L ||
-                 ( !progress->isCanceled() && !progress->needsRetry() ) )
+            if ( progress == 0L || !progress->isCanceled() )
             {
                 source->getBlacklist()->add( key );
             }
@@ -304,6 +305,11 @@
         assembleHeightField( key, result, dummyNormalMap, progress );
     }
 
+    if (progress && progress->isCanceled())
+    {
+        return 0L;
+    }
+
     return result.release();
 }
 
@@ -314,14 +320,44 @@
                                     osg::ref_ptr<NormalMap>& out_normalMap,
                                     ProgressCallback* progress)
 {			
-    //osg::HeightField* result = 0L;
-
     // Collect the heightfields for each of the intersecting tiles.
     GeoHeightFieldVector heightFields;
 
     //Determine the intersecting keys
     std::vector< TileKey > intersectingTiles;
-    getProfile()->getIntersectingTiles( key, intersectingTiles );
+    
+    if (key.getLOD() > 0u)
+    {
+        getProfile()->getIntersectingTiles(key, intersectingTiles);
+    }
+
+    else
+    {
+        // LOD is zero - check whether the LOD mapping went out of range, and if so,
+        // fall back until we get valid tiles. This can happen when you have two
+        // profiles with very different tile schemes, and the "equivalent LOD" 
+        // surpasses the max data LOD of the tile source.
+        unsigned numTilesThatMayHaveData = 0u;
+
+        int intersectionLOD = getProfile()->getEquivalentLOD(key.getProfile(), key.getLOD());
+
+        while (numTilesThatMayHaveData == 0u && intersectionLOD >= 0)
+        {
+            intersectingTiles.clear();
+            getProfile()->getIntersectingTiles(key.getExtent(), intersectionLOD, intersectingTiles);
+
+            for (unsigned int i = 0; i < intersectingTiles.size(); ++i)
+            {
+                const TileKey& layerKey = intersectingTiles[i];
+                if (mayHaveData(layerKey) == true)
+                {
+                    ++numTilesThatMayHaveData;
+                }
+            }
+
+            --intersectionLOD;
+        }
+    }
 
     // collect heightfield for each intersecting key. Note, we're hitting the
     // underlying tile source here, so there's no vetical datum shifts happening yet.
@@ -337,72 +373,89 @@
                 osg::ref_ptr<osg::HeightField> hf;
                 osg::ref_ptr<NormalMap> normalMap;
                 createImplementation(layerKey, hf, normalMap, progress);
-                //osg::HeightField* hf = createHeightFieldImplementation( layerKey, progress );
                 if (hf.valid())
                 {
                     heightFields.push_back( GeoHeightField(hf.get(), normalMap.get(), layerKey.getExtent()) );
                 }
             }
         }
-    }
 
-    // If we actually got a HeightField, resample/reproject it to match the incoming TileKey's extents.
-    if (heightFields.size() > 0)
-    {		
-        unsigned int width = 0;
-        unsigned int height = 0;
+        // If we actually got a HeightField, resample/reproject it to match the incoming TileKey's extents.
+        if (heightFields.size() > 0)
+        {		
+            unsigned int width = 0;
+            unsigned int height = 0;
 
-        for (GeoHeightFieldVector::iterator itr = heightFields.begin(); itr != heightFields.end(); ++itr)
-        {
-            if (itr->getHeightField()->getNumColumns() > width)
-                width = itr->getHeightField()->getNumColumns();
-            if (itr->getHeightField()->getNumRows() > height) 
-                height = itr->getHeightField()->getNumRows();                        
-        }
+            for (GeoHeightFieldVector::iterator itr = heightFields.begin(); itr != heightFields.end(); ++itr)
+            {
+                if (itr->getHeightField()->getNumColumns() > width)
+                    width = itr->getHeightField()->getNumColumns();
+                if (itr->getHeightField()->getNumRows() > height) 
+                    height = itr->getHeightField()->getNumRows();                        
+            }
 
-        //Now sort the heightfields by resolution to make sure we're sampling the highest resolution one first.
-        std::sort( heightFields.begin(), heightFields.end(), GeoHeightField::SortByResolutionFunctor());        
+            //Now sort the heightfields by resolution to make sure we're sampling the highest resolution one first.
+            std::sort( heightFields.begin(), heightFields.end(), GeoHeightField::SortByResolutionFunctor());        
 
-        out_hf = new osg::HeightField();
-        out_hf->allocate(width, height);
+            out_hf = new osg::HeightField();
+            out_hf->allocate(width, height);
 
-        out_normalMap = new NormalMap(width, height);
+            out_normalMap = new NormalMap(width, height);
 
-        //Go ahead and set up the heightfield so we don't have to worry about it later
-        double minx, miny, maxx, maxy;
-        key.getExtent().getBounds(minx, miny, maxx, maxy);
-        double dx = (maxx - minx)/(double)(width-1);
-        double dy = (maxy - miny)/(double)(height-1);
+            //Go ahead and set up the heightfield so we don't have to worry about it later
+            double minx, miny, maxx, maxy;
+            key.getExtent().getBounds(minx, miny, maxx, maxy);
+            double dx = (maxx - minx)/(double)(width-1);
+            double dy = (maxy - miny)/(double)(height-1);
 
-        //Create the new heightfield by sampling all of them.
-        for (unsigned int c = 0; c < width; ++c)
-        {
-            double x = minx + (dx * (double)c);
-            for (unsigned r = 0; r < height; ++r)
+            //Create the new heightfield by sampling all of them.
+            for (unsigned int c = 0; c < width; ++c)
             {
-                double y = miny + (dy * (double)r);
+                double x = minx + (dx * (double)c);
+                for (unsigned r = 0; r < height; ++r)
+                {
+                    double y = miny + (dy * (double)r);
 
-                //For each sample point, try each heightfield.  The first one with a valid elevation wins.
-                float elevation = NO_DATA_VALUE;
-                osg::Vec3 normal(0,0,1);
+                    //For each sample point, try each heightfield.  The first one with a valid elevation wins.
+                    float elevation = NO_DATA_VALUE;
+                    osg::Vec3 normal(0,0,1);
 
-                for (GeoHeightFieldVector::iterator itr = heightFields.begin(); itr != heightFields.end(); ++itr)
-                {
-                    // get the elevation value, at the same time transforming it vertically into the 
-                    // requesting key's vertical datum.
-                    float e = 0.0;
-                    osg::Vec3 n;
-                    if (itr->getElevationAndNormal(key.getExtent().getSRS(), x, y, INTERP_BILINEAR, key.getExtent().getSRS(), e, n))
+                    for (GeoHeightFieldVector::iterator itr = heightFields.begin(); itr != heightFields.end(); ++itr)
                     {
-                        elevation = e;
-                        normal = n;
-                        break;
+                        // get the elevation value, at the same time transforming it vertically into the 
+                        // requesting key's vertical datum.
+                        float e = 0.0;
+                        osg::Vec3 n;
+                        if (itr->getElevationAndNormal(key.getExtent().getSRS(), x, y, INTERP_BILINEAR, key.getExtent().getSRS(), e, n))
+                        {
+                            elevation = e;
+                            normal = n;
+                            break;
+                        }
                     }
+                    out_hf->setHeight( c, r, elevation );   
+                    out_normalMap->set( c, r, normal );
                 }
-                out_hf->setHeight( c, r, elevation );   
-                out_normalMap->set( c, r, normal );
             }
         }
+        else
+        {
+            //if (progress && progress->message().empty())
+            //    progress->message() = "assemble yielded no heightfields";
+        }
+    }
+    else
+    {
+        //if (progress && progress->message().empty())
+        //    progress->message() = "assemble yielded no intersecting tiles";
+    }
+
+
+    // If the progress was cancelled clear out any of the output data.
+    if (progress && progress->isCanceled())
+    {
+        out_hf = 0;
+        out_normalMap = 0;
     }
 }
 
@@ -439,7 +492,10 @@
     bool fromMemCache = false;
 
     // cache key combines the key with the full signature (incl vdatum)
-    std::string cacheKey = Stringify() << key.str() << "_" << key.getProfile()->getFullSignature();
+    // the cache key combines the Key and the horizontal profile.
+    std::string cacheKey = Cache::makeCacheKey(
+        Stringify() << key.str() << "-" << key.getProfile()->getHorizSignature(),
+        "elevation");
     const CachePolicy& policy = getCacheSettings()->cachePolicy().get();
 
     if ( _memCache.valid() )
@@ -537,6 +593,12 @@
                 createImplementation(key, hf, normalMap, progress);
             }
 
+            // Check for cancelation before writing to a cache
+            if (progress && progress->isCanceled())
+            {
+                return GeoHeightField::INVALID;
+            }
+
             // validate it to make sure it's legal.
             if ( hf.valid() && !validateHeightField(hf.get()) )
             {
@@ -582,15 +644,14 @@
         }
     }
 
-    // write to mem cache if needed:
-    if ( result.valid() && !fromMemCache && _memCache.valid() )
+    // Check for cancelation before writing to a cache:
+    if ( progress && progress->isCanceled() )
     {
-        CacheBin* bin = _memCache->getOrCreateDefaultBin();
-        bin->write(cacheKey, result.getHeightField(), 0L);
+        return GeoHeightField::INVALID;
     }
 
-    // post-processing:
-    if ( result.valid() )
+    // post-processing -- must be done before caching because it may alter the heightfield data
+    if ( result.valid() && !fromMemCache && hf.valid() )
     {
         if ( options().noDataPolicy() == NODATA_MSL )
         {
@@ -609,13 +670,20 @@
             }
 
             HeightFieldUtils::resolveInvalidHeights(
-                result.getHeightField(),
+                hf.get(),
                 result.getExtent(),
                 NO_DATA_VALUE,
                 geoid );
         }
     }
 
+    // write to mem cache if needed:
+    if ( result.valid() && !fromMemCache && _memCache.valid() )
+    {
+        CacheBin* bin = _memCache->getOrCreateDefaultBin();
+        bin->write(cacheKey, result.getHeightField(), 0L);
+    }
+
     return result;
 }
 
@@ -721,10 +789,10 @@
                 }
                 else
                 {
-                    int s0 = std::max(s - (s % step), 0);
-                    int s1 = (s%step == 0)? s0 : std::min(s0+step, w-1);
-                    int t0 = std::max(t - (t % step), 0);
-                    int t1 = (t%step == 0)? t0 : std::min(t0+step, h-1);
+                    int s0 = osg::maximum(s - (s % step), 0);
+                    int s1 = (s%step == 0)? s0 : osg::minimum(s0+step, w-1);
+                    int t0 = osg::maximum(t - (t % step), 0);
+                    int t1 = (t%step == 0)? t0 : osg::minimum(t0+step, h-1);
                     
                     if (s0 == s1 && t0 == t1)
                     {
@@ -795,6 +863,14 @@
     LayerDataVector contenders;
     LayerDataVector offsets;
 
+#ifdef ANALYZE
+    struct LayerAnalysis {
+        LayerAnalysis() : samples(0), used(false), failed(false), fallback(false), actualKeyValid(true) { }
+        int samples; bool used; bool failed; bool fallback; bool actualKeyValid; std::string message;
+    };
+    std::map<ElevationLayer*, LayerAnalysis> layerAnalysis;
+#endif
+
     // Track the number of layers that would return fallback data.
     unsigned numFallbackLayers = 0;
 
@@ -857,6 +933,10 @@
                     ld.key = bestKey;
                     ld.index = i;
                 }
+
+#ifdef ANALYZE
+                layerAnalysis[layer].used = true;
+#endif
             }
         }
     }
@@ -880,47 +960,16 @@
     double   ymin       = key.getExtent().yMin();
     double   dx         = key.getExtent().width() / (double)(numColumns-1);
     double   dy         = key.getExtent().height() / (double)(numRows-1);
-
-#if 0
-    // If the incoming heightfield requests a positive border width, 
-    // we need to adjust the extents so that we request data outside the
-    // extent of the tile key:
-    unsigned border = hf->getBorderWidth();
-    if (border > 0u)
-    {
-        dx = key.getExtent().width() / (double)(numColumns - (border*2+1));
-        dy = key.getExtent().height() / (double)(numRows - (border*2+1));
-        xmin -= dx * (double)border;
-        ymin -= dy * (double)border;
-    }
-#endif
-    
+   
     // We will load the actual heightfields on demand. We might not need them all.
-#if 0
     GeoHeightFieldVector heightFields(contenders.size());
     GeoHeightFieldVector offsetFields(offsets.size());
     std::vector<bool>    heightFallback(contenders.size(), false);
     std::vector<bool>    heightFailed(contenders.size(), false);
     std::vector<bool>    offsetFailed(offsets.size(), false);
-#else
-    GeoHeightFieldVector heightFields[9];
-    GeoHeightFieldVector offsetFields[9]; //(offsets.size());
-    std::vector<bool>    heightFallback[9]; //(contenders.size(), false);
-    std::vector<bool>    heightFailed[9]; //(contenders.size(), false);
-    std::vector<bool>    offsetFailed[9]; //(offsets.size(), false);
-
-    for (int n = 0; n < 9; ++n)
-    {
-        heightFields[n].resize(contenders.size());
-        offsetFields[n].resize(offsets.size());
-        heightFallback[n].assign(9, false);
-        heightFailed[n].assign(9, false);
-        offsetFailed[n].assign(9, false);
-    }
-#endif
 
     // The maximum number of heightfields to keep in this local cache
-    unsigned int maxHeightFields = 50;
+    const unsigned maxHeightFields = 50;
     unsigned numHeightFieldsInCache = 0;
 
     const SpatialReference* keySRS = keyToUse.getProfile()->getSRS();
@@ -936,182 +985,198 @@
 
     TileKey scratchKey; // Storage if a new key needs to be constructed
 
-    for (unsigned c = 0; c < numColumns; ++c)
+    bool requiresResample = true;
+
+    // If we only have a single contender layer, and the tile is the same size as the requested 
+    // heightfield then we just use it directly and avoid having to resample it
+    if (contenders.size() == 1 && offsets.empty())
     {
-        double x = xmin + (dx * (double)c);
-        for (unsigned r = 0; r < numRows; ++r)
+        ElevationLayer* layer = contenders[0].layer.get();
+        TileKey& contenderKey = contenders[0].key;
+
+        GeoHeightField layerHF = layer->createHeightField(contenderKey, progress);
+        if (layerHF.valid())
         {
-            double y = ymin + (dy * (double)r);
+            if (layerHF.getHeightField()->getNumColumns() == hf->getNumColumns() &&
+                layerHF.getHeightField()->getNumRows() == hf->getNumRows())
+            {
+                requiresResample = false;
+                memcpy(hf->getFloatArray()->asVector().data(),
+                    layerHF.getHeightField()->getFloatArray()->asVector().data(),
+                    sizeof(float) * hf->getFloatArray()->size()
+                );
+                deltaLOD->resize(hf->getFloatArray()->size(), 0);
+                realData = true;
+            }
+        }
+    }
 
-            // Collect elevations from each layer as necessary.
-            int resolvedIndex = -1;
+    // If we need to mosaic multiple layers or resample it to a new output tilesize go through a resampling loop.
+    if (requiresResample)
+    {
+        for (unsigned c = 0; c < numColumns; ++c)
+        {
+            double x = xmin + (dx * (double)c);
 
-            osg::Vec3 normal_sum(0,0,0);
+            // periodically check for cancelation
+            if (progress && progress->isCanceled())
+            {
+                return false;
+            }
 
-            for(int i=0; i<contenders.size() && resolvedIndex<0; ++i)
+            for (unsigned r = 0; r < numRows; ++r)
             {
-                ElevationLayer* layer = contenders[i].layer.get();                
-                TileKey& contenderKey = contenders[i].key;
-                int index = contenders[i].index;
+                double y = ymin + (dy * (double)r);
 
-                // If there is a border, the edge points may not fall within the key extents 
-                // and we may need to fetch a neighboring key.
+                // Collect elevations from each layer as necessary.
+                int resolvedIndex = -1;
 
-                int n = 4; // index 4 is the center/default tile
+                osg::Vec3 normal_sum(0, 0, 0);
 
-#if 0
-                if (border > 0u && !contenderKey.getExtent().contains(x, y))
+                for (int i = 0; i < contenders.size() && resolvedIndex < 0; ++i)
                 {
-                    int dTx = x < contenderKey.getExtent().xMin() ? -1 : x > contenderKey.getExtent().xMax() ? +1 : 0;
-                    int dTy = y < contenderKey.getExtent().yMin() ? +1 : y > contenderKey.getExtent().yMax() ? -1 : 0;
-                    contenderKey = contenderKey.createNeighborKey(dTx, dTy);
-                    n = (dTy+1)*3 + (dTx+1);
-                }
-#endif
+                    ElevationLayer* layer = contenders[i].layer.get();
+                    TileKey& contenderKey = contenders[i].key;
+                    int index = contenders[i].index;
 
-                if ( heightFailed[n][i] )
-                    continue;
+                    if (heightFailed[i])
+                        continue;
 
-                TileKey* actualKey = &contenderKey;
+                    TileKey* actualKey = &contenderKey;
 
-                GeoHeightField& layerHF = heightFields[n][i];
+                    GeoHeightField& layerHF = heightFields[i];
 
-                if (!layerHF.valid())
-                {
-                    // We couldn't get the heightfield from the cache, so try to create it.
-                    // We also fallback on parent layers to make sure that we have data at the location even if it's fallback.
-                    while (!layerHF.valid() && actualKey->valid() && layer->isKeyInLegalRange(*actualKey))
+                    if (!layerHF.valid())
                     {
-                        layerHF = layer->createHeightField(*actualKey, progress);
-                        if (!layerHF.valid())
+                        // We couldn't get the heightfield from the cache, so try to create it.
+                        // We also fallback on parent layers to make sure that we have data at the location even if it's fallback.
+                        while (!layerHF.valid() && actualKey->valid() && layer->isKeyInLegalRange(*actualKey))
                         {
-                            if (actualKey != &scratchKey)
+                            layerHF = layer->createHeightField(*actualKey, progress);
+                            if (!layerHF.valid())
                             {
-                                scratchKey = *actualKey;
-                                actualKey = &scratchKey;
+                                if (actualKey != &scratchKey)
+                                {
+                                    scratchKey = *actualKey;
+                                    actualKey = &scratchKey;
+                                }
+                                *actualKey = actualKey->createParentKey();
                             }
-                            *actualKey = actualKey->createParentKey();
+                        }
+
+                        // Mark this layer as fallback if necessary.
+                        if (layerHF.valid())
+                        {
+                            heightFallback[i] = (*actualKey != contenderKey); // actualKey != contenders[i].second;
+                            numHeightFieldsInCache++;
+                        }
+                        else
+                        {
+                            heightFailed[i] = true;
+#ifdef ANALYZE
+                            layerAnalysis[layer].failed = true;
+                            layerAnalysis[layer].actualKeyValid = actualKey->valid();
+                            if (progress) layerAnalysis[layer].message = progress->message();
+#endif
+                            continue;
                         }
                     }
 
-                    // Mark this layer as fallback if necessary.
                     if (layerHF.valid())
                     {
-                        heightFallback[n][i] = (*actualKey != contenderKey); // actualKey != contenders[i].second;
-                        numHeightFieldsInCache++;
-                    }
-                    else
-                    {
-                        heightFailed[n][i] = true;
-                        continue;
-                    }
-                }
+                        bool isFallback = heightFallback[i];
+#ifdef ANALYZE
+                        layerAnalysis[layer].fallback = isFallback;
+#endif
 
-                if (layerHF.valid())
-                {
-                    bool isFallback = heightFallback[n][i];
+                        // We only have real data if this is not a fallback heightfield.
+                        if (!isFallback)
+                        {
+                            realData = true;
+                        }
 
-                    // We only have real data if this is not a fallback heightfield.
-                    if (!isFallback)
-                    {
-                        realData = true;
-                    }
-                    
-                    float elevation;
-                    if (layerHF.getElevation(keySRS, x, y, interpolation, keySRS, elevation))
-                    {
-                        if ( elevation != NO_DATA_VALUE )
+                        float elevation;
+                        if (layerHF.getElevation(keySRS, x, y, interpolation, keySRS, elevation))
                         {
-                            // remember the index so we can only apply offset layers that
-                            // sit on TOP of this layer.
-                            resolvedIndex = index;
+                            if (elevation != NO_DATA_VALUE)
+                            {
+                                // remember the index so we can only apply offset layers that
+                                // sit on TOP of this layer.
+                                resolvedIndex = index;
+
+                                hf->setHeight(c, r, elevation);
 
-                            hf->setHeight(c, r, elevation);
+#ifdef ANALYZE
+                                layerAnalysis[layer].samples++;
+#endif
 
-                            if (deltaLOD)
+                                if (deltaLOD)
+                                {
+                                    (*deltaLOD)[r*numColumns + c] = key.getLOD() - actualKey->getLOD();
+                                }
+                            }
+                            else
                             {
-                                (*deltaLOD)[r*numColumns + c] = key.getLOD() - actualKey->getLOD();
+                                ++nodataCount;
                             }
                         }
-                        else
-                        {
-                            ++nodataCount;
-                        }
-                    }                    
-                }
+                    }
 
 
-                // Clear the heightfield cache if we have too many heightfields in the cache.
-                if (numHeightFieldsInCache >= maxHeightFields)
-                {
-                    //OE_NOTICE << "Clearing cache" << std::endl;
-                    for (unsigned int j = 0; j < 9; ++j)
+                    // Clear the heightfield cache if we have too many heightfields in the cache.
+                    if (numHeightFieldsInCache >= maxHeightFields)
                     {
-                        for (unsigned int k = 0; k < heightFields[j].size(); k++)
+                        //OE_NOTICE << "Clearing cache" << std::endl;
+                        for (unsigned int k = 0; k < heightFields.size(); k++)
                         {
-                            heightFields[j][k] = GeoHeightField::INVALID;
-                            heightFallback[j][k] = false;
+                            heightFields[k] = GeoHeightField::INVALID;
+                            heightFallback[k] = false;
                         }
+                        numHeightFieldsInCache = 0;
                     }
-                    numHeightFieldsInCache = 0;
                 }
-            }
-
-            for(int i=offsets.size()-1; i>=0; --i)
-            {
-                // Only apply an offset layer if it sits on top of the resolved layer
-                // (or if there was no resolved layer).
-                if (resolvedIndex >= 0 && offsets[i].index < resolvedIndex)
-                    continue;
-
-                TileKey &contenderKey = offsets[i].key;
-
-                // If there is a border, the edge points may not fall within the key extents 
-                // and we may need to fetch a neighboring key.
-
-                int n = 4; // index 4 is the center/default tile
 
-#if 0
-                if (border > 0u && !contenderKey.getExtent().contains(x, y))
+                for (int i = offsets.size() - 1; i >= 0; --i)
                 {
-                    int dTx = x < contenderKey.getExtent().xMin() ? -1 : x > contenderKey.getExtent().xMax() ? +1 : 0;
-                    int dTy = y < contenderKey.getExtent().yMin() ? +1 : x > contenderKey.getExtent().yMax() ? -1 : 0;
-                    contenderKey = contenderKey.createNeighborKey(dTx, dTy);
-                    n = (dTy+1)*3 + (dTx+1);
-                }
-#endif
-                
-                if ( offsetFailed[n][i] == true )
-                    continue;
+                    // Only apply an offset layer if it sits on top of the resolved layer
+                    // (or if there was no resolved layer).
+                    if (resolvedIndex >= 0 && offsets[i].index < resolvedIndex)
+                        continue;
 
-                GeoHeightField& layerHF = offsetFields[n][i];
-                if ( !layerHF.valid() )
-                {
-                    ElevationLayer* offset = offsets[i].layer.get();
+                    TileKey &contenderKey = offsets[i].key;
 
-                    layerHF = offset->createHeightField(contenderKey, progress);
-                    if ( !layerHF.valid() )
-                    {
-                        offsetFailed[n][i] = true;
+                    if (offsetFailed[i] == true)
                         continue;
+
+                    GeoHeightField& layerHF = offsetFields[i];
+                    if (!layerHF.valid())
+                    {
+                        ElevationLayer* offset = offsets[i].layer.get();
+
+                        layerHF = offset->createHeightField(contenderKey, progress);
+                        if (!layerHF.valid())
+                        {
+                            offsetFailed[i] = true;
+                            continue;
+                        }
                     }
-                }
 
-                // If we actually got a layer then we have real data
-                realData = true;
+                    // If we actually got a layer then we have real data
+                    realData = true;
 
-                float elevation = 0.0f;
-                if (layerHF.getElevation(keySRS, x, y, interpolation, keySRS, elevation) &&
-                    elevation != NO_DATA_VALUE)
-                {                    
-                    hf->getHeight(c, r) += elevation;
-
-                    // Update the resolution tracker to account for the offset. Sadly this
-                    // will wipe out the resolution of the actual data, and might result in 
-                    // normal faceting. See the comments on "createNormalMap" for more info
-                    if (deltaLOD)
+                    float elevation = 0.0f;
+                    if (layerHF.getElevation(keySRS, x, y, interpolation, keySRS, elevation) &&
+                        elevation != NO_DATA_VALUE)
                     {
-                        (*deltaLOD)[r*numColumns + c] = key.getLOD() - contenderKey.getLOD();
+                        hf->getHeight(c, r) += elevation;
+
+                        // Update the resolution tracker to account for the offset. Sadly this
+                        // will wipe out the resolution of the actual data, and might result in 
+                        // normal faceting. See the comments on "createNormalMap" for more info
+                        if (deltaLOD)
+                        {
+                            (*deltaLOD)[r*numColumns + c] = key.getLOD() - contenderKey.getLOD();
+                        }
                     }
                 }
             }
@@ -1120,9 +1185,41 @@
 
     if (normalMap)
     {
+        // periodically check for cancelation
+        if (progress && progress->isCanceled())
+        {
+            return false;
+        }
+
         createNormalMap(key.getExtent(), hf, deltaLOD.get(), normalMap);
     }
 
+#ifdef ANALYZE
+    {
+        static Threading::Mutex m;
+        Threading::ScopedMutexLock lock(m);
+        std::cout << key.str() << ": ";
+        for (std::map<ElevationLayer*, LayerAnalysis>::const_iterator i = layerAnalysis.begin();
+            i != layerAnalysis.end(); ++i)
+        {
+            std::cout << i->first->getName() 
+                << " used=" << i->second.used
+                << " failed=" << i->second.failed
+                << " akv=" << i->second.actualKeyValid
+                << " fallback=" << i->second.fallback
+                << " samples=" << i->second.samples
+                << " msg=" << i->second.message
+                << "; ";
+        }
+        std::cout << std::endl;
+    }
+#endif
+
+    if (progress && progress->isCanceled())
+    {
+        return false;
+    }
+
     // Return whether or not we actually read any real data
     return realData;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ElevationLOD osgearth-2.10.2+dfsg/src/osgEarth/ElevationLOD
--- osgearth-2.9.0+dfsg/src/osgEarth/ElevationLOD	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ElevationLOD	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ElevationLOD.cpp osgearth-2.10.2+dfsg/src/osgEarth/ElevationLOD.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ElevationLOD.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ElevationLOD.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,8 +18,6 @@
  */
 #include <osgEarth/ElevationLOD>
 #include <osgEarth/CullingUtils>
-#include <osgEarth/GeoData>
-#include <osg/CoordinateSystemNode>
 
 using namespace osgEarth;
 
@@ -115,8 +113,7 @@
 
 void ElevationLOD::traverse( osg::NodeVisitor& nv)
 {
-    if (nv.getVisitorType()   == osg::NodeVisitor::CULL_VISITOR &&
-        nv.getTraversalMode() == osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN )
+    if (nv.getVisitorType()   == osg::NodeVisitor::CULL_VISITOR)
     {
         bool rangeOK     = true;
         bool altitudeOK  = true;
@@ -141,7 +138,14 @@
 
                 osg::Vec3d eye = cv->getViewPoint();
 
-                if ( _srs && !_srs->isProjected() )
+                Horizon* horizon = Horizon::get(nv);
+                if (horizon)
+                {
+                    double R = horizon->getRadius();
+                    alt = eye.length() - R;
+                }
+
+                else if ( _srs && !_srs->isProjected() )
                 {
                     GeoPoint mapPoint;
                     mapPoint.fromWorld( _srs.get(), eye );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ElevationPool osgearth-2.10.2+dfsg/src/osgEarth/ElevationPool
--- osgearth-2.9.0+dfsg/src/osgEarth/ElevationPool	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ElevationPool	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2016 Pelican Mapping
  * http://osgearth.org
  *
@@ -21,7 +21,6 @@
 
 #include <osgEarth/Common>
 #include <osgEarth/ElevationLayer>
-#include <osgEarth/MapFrame>
 #include <osgEarth/GeoData>
 #include <osgEarth/TileKey>
 #include <osgEarth/ThreadingUtils>
@@ -95,7 +94,7 @@
 
     protected:
 
-        osg::observer_ptr<const osg::Referenced> _map;
+        osg::observer_ptr<const Map> _map;
 
         ElevationLayerVector _layers;
 
@@ -180,13 +179,13 @@
     protected:
 
         // safely popluate the tile; called when Tile._status = IN_PROGRESS
-        bool fetchTileFromMap(const TileKey& key, MapFrame& frame, Tile* tile);
+        bool fetchTileFromMap(const TileKey& key, const ElevationLayerVector& layers, Tile* tile);
         
         // safely fetch a tile from the central repo, loading from map if necessary
-        bool getTile(const TileKey& key, MapFrame& frame, osg::ref_ptr<Tile>& output);
+        bool getTile(const TileKey& key, const ElevationLayerVector& layers, osg::ref_ptr<Tile>& output);
         
         // safely fetch a tile from the central repo, loading from map if necessary
-        bool tryTile(const TileKey& key, MapFrame& frame, osg::ref_ptr<Tile>& output);
+        bool tryTile(const TileKey& key, const ElevationLayerVector& layers, osg::ref_ptr<Tile>& output);
 
         // safely remove the oldest item on the MRU
         void popMRU();
@@ -250,11 +249,12 @@
         ElevationEnvelope();
         virtual ~ElevationEnvelope();
 
+        ElevationLayerVector _layers;
         ElevationPool::QuerySet _tiles;
         osg::ref_ptr<const SpatialReference> _inputSRS;
         unsigned _lod;
-        MapFrame _frame;
-        ElevationPool* _pool;
+        osg::observer_ptr<ElevationPool> _pool;
+        osg::ref_ptr<const Profile> _mapProfile;
         friend class ElevationPool;
 
     private:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ElevationPool.cpp osgearth-2.10.2+dfsg/src/osgEarth/ElevationPool.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ElevationPool.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ElevationPool.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2016 Pelican Mapping
  * http://osgearth.org
  *
@@ -17,12 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/ElevationPool>
-#include <osgEarth/TileKey>
-#include <osgEarth/MapFrame>
 #include <osgEarth/Map>
 #include <osgEarth/Metrics>
-#include <osgEarth/Registry>
-#include <osg/Shape>
 
 using namespace osgEarth;
 
@@ -124,7 +120,7 @@
 }
 
 bool
-ElevationPool::fetchTileFromMap(const TileKey& key, MapFrame& frame, Tile* tile)
+ElevationPool::fetchTileFromMap(const TileKey& key, const ElevationLayerVector& layers, Tile* tile)
 {
     tile->_loadTime = osg::Timer::instance()->tick();
 
@@ -140,8 +136,8 @@
         bool ok;
         if (_layers.empty())
         {
-            OE_TEST << LC << "Populating from FULL MAP (" << keyToUse.str() << ")\n";
-            ok = frame.populateHeightField(hf, keyToUse, false /*heightsAsHAE*/, 0L);
+            OE_TEST << LC << "Populating from envelope (" << keyToUse.str() << ")\n";
+            ok = layers.populateHeightFieldAndNormalMap(hf.get(), 0L, keyToUse, 0L, INTERP_BILINEAR, 0L);
         }
         else
         {
@@ -184,7 +180,7 @@
 }
 
 bool
-ElevationPool::tryTile(const TileKey& key, MapFrame& frame, osg::ref_ptr<Tile>& out)
+ElevationPool::tryTile(const TileKey& key, const ElevationLayerVector& layers, osg::ref_ptr<Tile>& out)
 {
     // first see whether the tile is available
     _tilesMutex.lock();
@@ -223,7 +219,7 @@
         tile->_status.exchange(STATUS_IN_PROGRESS);
         _tilesMutex.unlock();
 
-        bool ok = fetchTileFromMap(key, frame, tile.get());
+        bool ok = fetchTileFromMap(key, layers, tile.get());
         tile->_status.exchange( ok ? STATUS_AVAILABLE : STATUS_FAIL );
         
         out = ok ? tile.get() : 0L;
@@ -280,24 +276,13 @@
 }
 
 bool
-ElevationPool::getTile(const TileKey& key, MapFrame& frame, osg::ref_ptr<ElevationPool::Tile>& output)
-{
-    // Synchronize the MapFrame to its Map; if there's an update,
-    // clear out the internal cache and MRU.
-    if ( frame.needsSync() )
-    {
-        if (frame.sync())
-        {
-            // Probably unnecessary because the Map itself will clear the pool.
-            clear();
-        }
-    }
-   
+ElevationPool::getTile(const TileKey& key, const ElevationLayerVector& layers, osg::ref_ptr<ElevationPool::Tile>& output)
+{   
     OE_START_TIMER(get);
 
     const double timeout = 30.0;
     osg::ref_ptr<Tile> tile;
-    while( tryTile(key, frame, tile) && !tile.valid() && OE_GET_TIMER(get) < timeout)
+    while( tryTile(key, layers, tile) && !tile.valid() && OE_GET_TIMER(get) < timeout)
     {
         // condition: another thread is working on fetching the tile from the map,
         // so wait and try again later. Do this until we succeed or time out.
@@ -330,12 +315,27 @@
 ElevationPool::createEnvelope(const SpatialReference* srs, unsigned lod)
 {
     ElevationEnvelope* e = new ElevationEnvelope();
-    e->_inputSRS = srs;
-    osg::ref_ptr<const osg::Referenced> map;
-    if (_map.lock(map))
-        e->_frame.setMap(static_cast<const Map*>(map.get()));
+    e->_inputSRS = srs; 
     e->_lod = lod;
     e->_pool = this;
+    
+    osg::ref_ptr<const Map> map;
+    if (_map.lock(map))
+    {
+        if (_layers.size() > 0)
+        {
+            // user-specified layers
+            e->_layers = _layers;
+        }
+        else
+        {
+            // all elevation layers
+            map->getLayers(e->_layers);
+        }
+
+        e->_mapProfile = map->getProfile();
+    }
+
     return e;
 }
 
@@ -361,7 +361,7 @@
 
     GeoPoint p(_inputSRS.get(), x, y, 0.0f, ALTMODE_ABSOLUTE);
 
-    if (p.transformInPlace(_frame.getProfile()->getSRS()))
+    if (p.transformInPlace(_mapProfile->getSRS()))
     {
         // find the tile containing the point:
         for(ElevationPool::QuerySet::const_iterator tile_ref = _tiles.begin();
@@ -388,9 +388,12 @@
         // for the tile so we can add it to the query set.
         if (!foundTile)
         {
-            TileKey key = _frame.getProfile()->createTileKey(p.x(), p.y(), _lod);
+            TileKey key = _mapProfile->createTileKey(p.x(), p.y(), _lod);
             osg::ref_ptr<ElevationPool::Tile> tile;
-            if (_pool && _pool->getTile(key, _frame, tile))
+
+            osg::ref_ptr<ElevationPool> pool;
+
+            if (_pool.lock(pool) && pool->getTile(key, _layers, tile))
             {
                 // Got the new tile; put it in the query set:
                 _tiles.insert(tile.get());
@@ -451,17 +454,6 @@
             ++count;
     }
 
-    if (count < input.size())
-    {
-        OE_WARN << LC << "Issue: Envelope had failed samples" << std::endl;
-        for (ElevationPool::QuerySet::const_iterator tile_ref = _tiles.begin(); tile_ref != _tiles.end(); ++tile_ref)
-        {
-            ElevationPool::Tile* tile = tile_ref->get();
-            OE_WARN << LC << " ... tile " << tile->_bounds.toString() << std::endl;
-        }
-        OE_WARN << LC << std::endl;
-    }
-
     return count;
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ElevationQuery osgearth-2.10.2+dfsg/src/osgEarth/ElevationQuery
--- osgearth-2.9.0+dfsg/src/osgEarth/ElevationQuery	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ElevationQuery	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 #ifndef OSGEARTH_ELEVATION_QUERY_H
 #define OSGEARTH_ELEVATION_QUERY_H 1
 
-#include <osgEarth/MapFrame>
 #include <osgEarth/ElevationPool>
 #include <osgEarth/Containers>
 #include <osgEarth/ModelLayer>
@@ -28,7 +27,7 @@
 namespace osgEarth
 {
     /**
-     * @deprecated - Use ElevationPool instead, via Map::getElevationPool to
+     * @deprecated after 2.10 - Use ElevationPool instead, via Map::getElevationPool to
      *    query elevation data, and use Terrain::getHeight to query the in-scene
      *    terrain graph.
      *
@@ -57,15 +56,7 @@
          * @param map
          *      Map against which to perform elevation queries.
          */
-        ElevationQuery( const Map* map );
-
-        /**
-         * Constructs a new elevation manager.
-         *
-         * @param mapFrame
-         *      Map frame against which to perform elevation queries.
-         */
-        ElevationQuery( const MapFrame& mapFrame );
+        ElevationQuery(const Map* map);
 
         /**
          * Sets a new map
@@ -73,11 +64,6 @@
         void setMap(const Map* map);
 
         /**
-         * Sets a new map frame
-         */
-        void setMapFrame(const MapFrame& frame);
-
-        /**
          * Gets the elevation data at a point, given a terrain resolution.
          *
          * @param point
@@ -120,14 +106,13 @@
         virtual ~ElevationQuery() { }
 
     private:
-        // Map to query
-        MapFrame _mapf;
 
         // Map model layers marked as terrain patches
-        std::vector<ModelLayer*> _patchLayers;
+        LayerVector _terrainModelLayers;
+        ElevationLayerVector _elevationLayers;
 
         // Intersector to query the patch layers
-        osg::ref_ptr<osgUtil::LineSegmentIntersector> _patchLayersLSI;
+        osg::ref_ptr<osgUtil::LineSegmentIntersector> _lsi;
 
         // Callback to force the intersector to materialize paged model nodes
         osg::ref_ptr<osgUtil::IntersectionVisitor::ReadCallback> _ivrc;
@@ -138,13 +123,16 @@
     private:
         void reset();
         void sync();
-        void gatherPatchLayers();
+        void gatherTerrainModelLayers(const Map*);
 
         bool getElevationImpl(
             const GeoPoint& point,
             float&          out_elevation,
             double          desiredResolution,
             double*         out_actualResolution );
+
+        osg::observer_ptr<const Map> _map;
+        Revision _mapRevision;
     };
 
 } // namespace osgEarth
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ElevationQuery.cpp osgearth-2.10.2+dfsg/src/osgEarth/ElevationQuery.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ElevationQuery.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ElevationQuery.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,10 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/ElevationQuery>
-#include <osgUtil/LineSegmentIntersector>
 #include <osgEarth/Map>
-#include <osgEarth/ElevationPool>
-#include <osgUtil/IntersectionVisitor>
 #include <osgSim/LineOfSight>
 
 #define LC "[ElevationQuery] "
@@ -30,7 +27,6 @@
 
 ElevationQuery::ElevationQuery()
 {
-    reset();
 }
 
 ElevationQuery::ElevationQuery(const Map* map)
@@ -38,23 +34,10 @@
     setMap(map);
 }
 
-ElevationQuery::ElevationQuery(const MapFrame& mapFrame)
-{
-    setMapFrame(mapFrame);
-}
-
 void
 ElevationQuery::setMap(const Map* map)
 {
-    _mapf.setMap(map);
-    reset();
-}
-
-void
-ElevationQuery::setMapFrame(const MapFrame& frame)
-{
-    _mapf = frame;
-    reset();
+    _map = map;
 }
 
 void
@@ -63,36 +46,60 @@
     // set read callback for IntersectionVisitor
     _ivrc = new osgSim::DatabaseCacheReadCallback();
 
-    // find terrain patch layers.
-    gatherPatchLayers();
+    _terrainModelLayers.clear();
+    _elevationLayers.clear();
+
+    osg::ref_ptr<const Map> map;
+    if (_map.lock(map))
+    {
+        map->getLayers(_elevationLayers);
+        
+        // cache a vector of terrain patch models.
+        LayerVector layers;
+        map->getLayers(layers);
+        for (LayerVector::const_iterator i = layers.begin(); i != layers.end(); ++i)
+        {
+            if (i->get()->options().terrainPatch() == true)
+            {
+                _terrainModelLayers.push_back(i->get());
+            }
+        }
+
+        // revisions are now in sync.
+        _mapRevision = map->getDataModelRevision();
+    }
 
     // clear any active envelope
     _envelope = 0L;
 }
-
 void
 ElevationQuery::sync()
 {
-    if ( _mapf.needsSync() )
+    osg::ref_ptr<const Map> map;
+    if (_map.lock(map))
     {
-        _mapf.sync();
-        reset();
+        if (_mapRevision != map->getDataModelRevision())
+        {
+            reset();
+        }
     }
 }
 
 void
-ElevationQuery::gatherPatchLayers()
+ElevationQuery::gatherTerrainModelLayers(const Map* map)
 {
     // cache a vector of terrain patch models.
-    _patchLayers.clear();
-    ModelLayerVector modelLayers;
-    _mapf.getLayers(modelLayers);
-    for(ModelLayerVector::const_iterator i = modelLayers.begin();
-        i != modelLayers.end();
+    _terrainModelLayers.clear();
+    LayerVector layers;
+    map->getLayers(layers);
+    for (LayerVector::const_iterator i = layers.begin();
+        i != layers.end();
         ++i)
     {
-        if ( i->get()->isTerrainPatch() )
-            _patchLayers.push_back( i->get() );
+        if (i->get()->options().terrainPatch() == true)
+        {
+            _terrainModelLayers.push_back(i->get());
+        }
     }
 }
 
@@ -183,17 +190,18 @@
     osg::Timer_t begin = osg::Timer::instance()->tick();
 
     // first try the terrain patches.
-    if ( _patchLayers.size() > 0 )
+    if ( _terrainModelLayers.size() > 0 )
     {
         osgUtil::IntersectionVisitor iv;
 
         if ( _ivrc.valid() )
             iv.setReadCallback(_ivrc.get());
 
-        for(std::vector<ModelLayer*>::iterator i = _patchLayers.begin(); i != _patchLayers.end(); ++i)
+        for(LayerVector::iterator i = _terrainModelLayers.begin(); i != _terrainModelLayers.end(); ++i)
         {
             // find the scene graph for this layer:
-            osg::Node* node = (*i)->getSceneGraph( _mapf.getUID() );
+            Layer* layer = i->get();
+            osg::Node* node = layer->getNode();
             if ( node )
             {
                 // configure for intersection:
@@ -210,26 +218,26 @@
                     osg::Vec3d end  ( surface - nvector*5e5 );
 
                     // first time through, set up the intersector on demand
-                    if ( !_patchLayersLSI.valid() )
+                    if ( !_lsi.valid() )
                     {
-                        _patchLayersLSI = new osgUtil::LineSegmentIntersector(start, end);
-                        _patchLayersLSI->setIntersectionLimit( _patchLayersLSI->LIMIT_NEAREST );
+                        _lsi = new osgUtil::LineSegmentIntersector(start, end);
+                        _lsi->setIntersectionLimit( _lsi->LIMIT_NEAREST );
                     }
                     else
                     {
-                        _patchLayersLSI->reset();
-                        _patchLayersLSI->setStart( start );
-                        _patchLayersLSI->setEnd  ( end );
+                        _lsi->reset();
+                        _lsi->setStart( start );
+                        _lsi->setEnd  ( end );
                     }
 
                     // try it.
-                    iv.setIntersector( _patchLayersLSI.get() );
+                    iv.setIntersector( _lsi.get() );
                     node->accept( iv );
 
                     // check for a result!!
-                    if ( _patchLayersLSI->containsIntersections() )
+                    if ( _lsi->containsIntersections() )
                     {
-                        osg::Vec3d isect = _patchLayersLSI->getIntersections().begin()->getWorldIntersectPoint();
+                        osg::Vec3d isect = _lsi->getIntersections().begin()->getWorldIntersectPoint();
 
                         // transform back to input SRS:
                         GeoPoint output;
@@ -247,15 +255,22 @@
                 }
             }
         }
-    }
+    } 
 
-    if ( _mapf.elevationLayers().empty() )
+    if (_elevationLayers.empty())
     {
         // this means there are no heightfields.
         out_elevation = NO_DATA_VALUE;
         return true;
     }
 
+    // secure map pointer:
+    osg::ref_ptr<const Map> map;
+    if (!_map.lock(map))
+    {
+        return false;
+    }    
+
     // tile size (resolution of elevation tiles)
     unsigned tileSize = 257; // yes?
 
@@ -265,7 +280,7 @@
     // attempt to map the requested resolution to an LOD:
     if (desiredResolution > 0.0)
     {
-        int level = _mapf.getProfile()->getLevelOfDetailForHorizResolution(desiredResolution, tileSize);
+        int level = map->getProfile()->getLevelOfDetailForHorizResolution(desiredResolution, tileSize);
         if ( level > 0 )
             lod = level;
     }
@@ -275,7 +290,7 @@
         !point.getSRS()->isHorizEquivalentTo(_envelope->getSRS()) ||
         lod != _envelope->getLOD())
     {        
-        _envelope = _mapf.getElevationPool()->createEnvelope(point.getSRS(), lod);
+        _envelope = map->getElevationPool()->createEnvelope(point.getSRS(), lod);
     }
 
     // sample the elevation, and if requested, the resolution as well:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/EllipsoidIntersector osgearth-2.10.2+dfsg/src/osgEarth/EllipsoidIntersector
--- osgearth-2.9.0+dfsg/src/osgEarth/EllipsoidIntersector	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/EllipsoidIntersector	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,52 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef OSGEARTH_ELLIPSOID_INTERSECTOR_H
+#define OSGEARTH_ELLIPSOID_INTERSECTOR_H 1
+
+#include <osg/Matrix>
+#include <osg/CoordinateSystemNode>
+#include <osgEarth/Common>
+
+namespace osgEarth
+{
+    /**
+    * Utility class to perform ellipsoid intersections
+    */
+    class OSGEARTH_EXPORT EllipsoidIntersector
+    {
+    public:
+        //! Construct a new ellipsoid intersector
+        EllipsoidIntersector(const osg::EllipsoidModel* em);
+
+        //! Interects a line (world space) with an ellipsoid.
+        //! @param p0 First point on the line
+        //! @param p1 Second point on the line
+        //! @param out_world Output world coordinates of closest intersection
+        bool intersectLine(const osg::Vec3d& p0_world, const osg::Vec3d& p1_world, osg::Vec3d& out_world);
+
+    private:
+        osg::Matrix _ellipsoidToUnitSphere;
+        osg::Matrix _unitSphereToEllipsoid;
+        osg::Matrix _clipToWorld;
+    };
+
+} // namespace osgEarth
+
+#endif // OSGEARTH_ELLIPSOID_INTERSECTOR_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/EllipsoidIntersector.cpp osgearth-2.10.2+dfsg/src/osgEarth/EllipsoidIntersector.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/EllipsoidIntersector.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/EllipsoidIntersector.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,88 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include <osgEarth/EllipsoidIntersector>
+
+using namespace osgEarth;
+
+EllipsoidIntersector::EllipsoidIntersector(const osg::EllipsoidModel* em)
+{
+    _ellipsoidToUnitSphere.makeScale(
+        1.0 / em->getRadiusEquator(),
+        1.0 / em->getRadiusEquator(),
+        1.0 / em->getRadiusPolar());
+
+    _unitSphereToEllipsoid.makeScale(
+        em->getRadiusEquator(),
+        em->getRadiusEquator(),
+        em->getRadiusPolar());
+}
+
+bool EllipsoidIntersector::intersectLine(const osg::Vec3d& p0_world, const osg::Vec3d& p1_world, osg::Vec3d& out_world)
+{
+    double dist2 = 0.0;
+    osg::Vec3d v;
+    osg::Vec3d p0 = p0_world * _ellipsoidToUnitSphere;
+    osg::Vec3d p1 = p1_world * _ellipsoidToUnitSphere;
+
+    const double R = 1.0; // for unit sphere.
+
+                          // http://paulbourke.net/geometry/circlesphere/index.html#linesphere
+
+    osg::Vec3d d = p1 - p0;
+
+    double A = d * d;
+    double B = 2.0 * (d * p0);
+    double C = (p0 * p0) - R*R;
+
+    // now solve the quadratic A + B*t + C*t^2 = 0.
+    double D = B*B - 4.0*A*C;
+    if (D > 0)
+    {
+        // two roots (line passes through sphere twice)
+        // find the closer of the two.
+        double sqrtD = sqrt(D);
+        double t0 = (-B + sqrtD) / (2.0*A);
+        double t1 = (-B - sqrtD) / (2.0*A);
+
+        //seg; pick closest:
+        if (fabs(t0) < fabs(t1))
+            v = d*t0;
+        else
+            v = d*t1;
+    }
+    else if (D == 0.0)
+    {
+        // one root (line is tangent to sphere?)
+        double t = -B / (2.0*A);
+        v = d*t;
+    }
+
+    dist2 = v.length2();
+
+    if (dist2 > 0.0)
+    {
+        out_world = (p0 + v) * _unitSphereToEllipsoid;
+        return true;
+    }
+    else
+    {
+        // either no intersection, or the distance was not the max.
+        return false;
+    }
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Endian osgearth-2.10.2+dfsg/src/osgEarth/Endian
--- osgearth-2.9.0+dfsg/src/osgEarth/Endian	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Endian	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -174,5 +174,23 @@
     return r;
 }
 
+namespace osgEarth
+{
+    inline void byteSwapInPlace(uint32_t x) {
+        unsigned char* p = (unsigned char*)&x;
+        std::swap(p[0], p[3]);
+        std::swap(p[1], p[2]);
+    }
+    inline void byteSwapInPlace(uint16_t x) {
+        unsigned char* p = (unsigned char*)&x;
+        std::swap(p[0], p[1]);
+    }
+}
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+    #define OE_IS_LITTLE_ENDIAN
+#else
+    #define OE_IS_BIG_ENDIAN
+#endif
 
 #endif // OSGEARTH_PORTABLE_ENDIAN_H__
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Export osgearth-2.10.2+dfsg/src/osgEarth/Export
--- osgearth-2.9.0+dfsg/src/osgEarth/Export	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Export	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -24,11 +24,6 @@
 #ifndef OSGEARTH_EXPORT_H
 #define OSGEARTH_EXPORT_H 1
 
-// define USE_DEPRECATED_API is used to include in API which is being phased out
-// if you can compile your apps with this turned off you are
-// well placed for compatibility with future versions.
-#define USE_DEPRECATED_API
-
 #if defined(_MSC_VER)
     #pragma warning( disable : 4244 )
     #pragma warning( disable : 4251 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Extension osgearth-2.10.2+dfsg/src/osgEarth/Extension
--- osgearth-2.9.0+dfsg/src/osgEarth/Extension	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Extension	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2013 Pelican Mapping
  * http://osgearth.org
  *
@@ -29,6 +29,11 @@
 #include <osgDB/FileNameUtils>
 #include <osgDB/Registry>
 
+    
+#define META_OE_Extension(NS, CLASS, SLUG) \
+    META_Object(NS, CLASS); \
+    CLASS (const CLASS & rhs, const osg::CopyOp& op) { } \
+    virtual const char* getConfigKey() const { return #SLUG ; }
 
 namespace osgEarth
 {
@@ -62,6 +67,8 @@
     class OSGEARTH_EXPORT Extension : public osg::Object // header-only
     {
     public:
+        META_OE_Extension(osgEarth, Extension, extension);
+
         /**
          * Sets DB options that this extension should use when doing IO operations.
          */
@@ -128,17 +135,10 @@
         }
     };
 
-    // convenience define for extensions
-#define META_osgEarth_Extension(CLASS) \
-    META_Object(osgEarth,CLASS); \
-    CLASS () { } \
-    CLASS (const CLASS & rhs, const osg::CopyOp& op) { } \
-    virtual ~ CLASS() { }
-
 } // namespace osgEarth
 
-#define REGISTER_OSGEARTH_EXTENSION(NAME,CLASS) \
-    extern "C" void osgdb_##NAME(void) {} \
-    static osgEarth::RegisterPluginLoader< osgEarth::PluginLoader<CLASS, osgEarth::Extension> > g_proxy_##CLASS_##NAME( #NAME );
+#define REGISTER_OSGEARTH_EXTENSION(PLUGINNAME, CLASS) \
+    extern "C" void osgdb_##PLUGINNAME(void) {} \
+    static osgEarth::RegisterPluginLoader< osgEarth::PluginLoader<CLASS, osgEarth::Extension> > g_proxy_##CLASS_##PLUGINNAME( #PLUGINNAME );
 
 #endif
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Extension.cpp osgearth-2.10.2+dfsg/src/osgEarth/Extension.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Extension.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Extension.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2013 Pelican Mapping
  * http://osgearth.org
  *
@@ -18,8 +18,6 @@
  */
 #include <osgEarth/Extension>
 #include <osgEarth/Registry>
-#include <osgDB/Registry>
-#include <osgDB/ReadFile>
 
 using namespace osgEarth;
 
@@ -31,6 +29,7 @@
 Extension::Extension()
 {
     //nop
+    _defaultOptions = Config("extension");
 }
 
 const ConfigOptions&
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/FadeEffect osgearth-2.10.2+dfsg/src/osgEarth/FadeEffect
--- osgearth-2.9.0+dfsg/src/osgEarth/FadeEffect	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/FadeEffect	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -58,8 +58,11 @@
         optional<float> _maxRange;
         optional<float> _attenDist;
     };
+}
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::FadeOptions);
 
-
+namespace osgEarth
+{
     /**
      * Decorator node that will only display it's children when the camera is within a given elevation range
      */
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/FadeEffect.cpp osgearth-2.10.2+dfsg/src/osgEarth/FadeEffect.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/FadeEffect.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/FadeEffect.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/FadeEffect>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/Registry>
 #include <osgEarth/Capabilities>
 #include <osgEarth/CullingUtils>
@@ -31,18 +30,18 @@
 _maxRange      ( FLT_MAX ),
 _attenDist     ( 1000.0f )
 {
-    conf.getIfSet( "duration",             _duration );
-    conf.getIfSet( "max_range",            _maxRange );
-    conf.getIfSet( "attenuation_distance", _attenDist );
+    conf.get( "duration",             _duration );
+    conf.get( "max_range",            _maxRange );
+    conf.get( "attenuation_distance", _attenDist );
 }
 
 Config
 FadeOptions::getConfig() const
 {
     Config conf("fading");
-    conf.addIfSet( "duration",             _duration );
-    conf.addIfSet( "max_range",            _maxRange );
-    conf.addIfSet( "attenuation_distance", _attenDist );
+    conf.set( "duration",             _duration );
+    conf.set( "max_range",            _maxRange );
+    conf.set( "attenuation_distance", _attenDist );
     return conf;
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/FileUtils osgearth-2.10.2+dfsg/src/osgEarth/FileUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/FileUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/FileUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -64,12 +64,6 @@
     extern OSGEARTH_EXPORT bool isPathToArchivedFile(const std::string& path);
 
     /**
-     * @deprecated Please use isPathToArchivedFile instead
-     * Gets whether or not the given path contains a zip file within the path
-     */
-    extern OSGEARTH_EXPORT bool isZipPath(const std::string& path);
-
-    /**
      * Gets the path to the temp directory
      */
     extern OSGEARTH_EXPORT std::string getTempPath();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/FileUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/FileUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/FileUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/FileUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,14 +19,13 @@
 
 #include <osgEarth/FileUtils>
 #include <osgEarth/StringUtils>
-#include <osgEarth/DateTime>
 #include <osgEarth/ThreadingUtils>
 #include <osgDB/FileUtils>
 #include <osgDB/FileNameUtils>
-#include <osgDB/Registry>
-#include <osg/Notify>
+#include <osgDB/ConvertUTF>
 #include <stack>
-#include <errno.h>
+
+#include <errno.h> 
 
 #ifdef WIN32
 #  include <windows.h>
@@ -35,7 +34,6 @@
 #  include <stdlib.h>
 #endif
 
-#include <sys/types.h>
 
 #ifdef WIN32
 #  include <sys/utime.h>
@@ -43,11 +41,7 @@
 #  include <utime.h>
 #endif
 
-#include <sys/stat.h>
-#include <time.h>
 
-#include <list>
-#include <sstream>
 
 // currently this impl is for _all_ platforms, except as defined.
 // the mac version will change soon to reflect the path scheme under osx, but
@@ -129,6 +123,27 @@
 
 using namespace osgEarth;
 
+namespace osgEarth
+{
+#ifdef OSG_USE_UTF8_FILENAME
+#define OSGDB_STRING_TO_FILENAME(s) osgDB::convertUTF8toUTF16(s)
+#define OSGDB_FILENAME_TO_STRING(s) osgDB::convertUTF16toUTF8(s)
+#define OSGDB_FILENAME_TEXT(x) L ## x
+#define OSGDB_WINDOWS_FUNCT(x) x ## W
+#define OSGDB_WINDOWS_FUNCT_STRING(x) #x "W"
+    typedef wchar_t filenamechar;
+    typedef std::wstring filenamestring;
+#else
+#define OSGDB_STRING_TO_FILENAME(s) s
+#define OSGDB_FILENAME_TO_STRING(s) s
+#define OSGDB_FILENAME_TEXT(x) x
+#define OSGDB_WINDOWS_FUNCT(x) x ## A
+#define OSGDB_WINDOWS_FUNCT_STRING(x) #x "A"
+    typedef char filenamechar;
+    typedef std::string filenamestring;
+#endif
+}
+
 
 std::string
 osgEarth::getAbsolutePath(const std::string& path)
@@ -281,12 +296,6 @@
     return false;
 }
 
-bool osgEarth::isZipPath(const std::string &path)
-{
-    OE_WARN << LC << "FileUtils::isZipPath is deprecated; use isPathToArchivedFile instead" << std::endl;
-    return (path.find(".zip") != std::string::npos);
-}
-
 std::string osgEarth::getTempPath()
 {
 #if defined(WIN32)  && !defined(__CYGWIN__)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GeoCommon osgearth-2.10.2+dfsg/src/osgEarth/GeoCommon
--- osgearth-2.9.0+dfsg/src/osgEarth/GeoCommon	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GeoCommon	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -45,7 +45,9 @@
         INTERP_AVERAGE,
         INTERP_NEAREST,
         INTERP_BILINEAR,
-        INTERP_TRIANGULATE
+        INTERP_TRIANGULATE,
+        INTERP_CUBIC,
+        INTERP_CUBICSPLINE
     };
 
     /**
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GeoData osgearth-2.10.2+dfsg/src/osgEarth/GeoData
--- osgearth-2.9.0+dfsg/src/osgEarth/GeoData	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GeoData	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -236,10 +236,18 @@
         bool createWorldUpVector( osg::Vec3d& out_up ) const;
 
         /**
-         * Calculates the distance in meters from this geopoint to another.
+         * The great-circle distance, in meters, from this point to another.
+         * This calculation does not consider altitude.
          */
         double distanceTo(const GeoPoint& rhs) const;
 
+        /**
+         * Interpolates a point between this point and another point,
+         * along a great circle, using the parameter t [0..1]. It will also
+         * interpolate the altitude value.
+         */
+        GeoPoint interpolate(const GeoPoint& rhs, double t) const;
+
 
         bool operator == (const GeoPoint& rhs) const;
         bool operator != (const GeoPoint& rhs) const { return !operator==(rhs); }
@@ -318,8 +326,11 @@
          GeoPoint _center;
          double   _radius;
      };
+}
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::GeoPoint);
 
-
+namespace osgEarth
+{
     /**
      * An axis-aligned geospatial extent. A bounding box that is aligned with a
      * spatial reference's coordinate system.
@@ -466,7 +477,7 @@
          */
         void expandToInclude( double x, double y ); 
         void expandToInclude( const osg::Vec3d& v ) { expandToInclude(v.x(), v.y()); }
-        void expandToInclude( const Bounds& bounds );
+        //void expandToInclude( const Bounds& bounds );
 
         /**
          * Expand this extent to include the bounds of another extent.
@@ -517,7 +528,8 @@
          * validity nor for SRS equivalence -- so be sure to validate those beforehand.
          * It also assumes the output matrix is preset to the identity.
          */
-        bool createScaleBias(const GeoExtent& target, osg::Matrix& output) const;
+        bool createScaleBias(const GeoExtent& target, osg::Matrixd& output) const;
+        bool createScaleBias(const GeoExtent& target, osg::Matrixf& output) const;
 
         /**
          * Generates a BoundingSphere encompassing the extent and a vertical 
@@ -541,6 +553,7 @@
         void setOriginAndSize(double west, double south, double width, double height);
     };
 
+
     /**
      * A geospatial area with tile data LOD extents
      */
@@ -548,8 +561,11 @@
     {
     public:
         DataExtent(const GeoExtent& extent);
+        DataExtent(const GeoExtent& extent, const std::string &description);
         DataExtent(const GeoExtent& extent, unsigned minLevel );
+        DataExtent(const GeoExtent& extent, unsigned minLevel, const std::string &description);
         DataExtent(const GeoExtent& extent, unsigned minLevel, unsigned maxLevel);
+        DataExtent(const GeoExtent& extent, unsigned minLevel, unsigned maxLevel, const std::string &description);
 
         /** dtor */
         virtual ~DataExtent() { }
@@ -562,9 +578,13 @@
         optional<unsigned>& maxLevel() { return _maxLevel; }
         const optional<unsigned>& maxLevel() const { return _maxLevel; }
 
+        /** description for the data extents */
+        const osgEarth::optional<std::string>& description() const { return _description; }
+
     private:
         optional<unsigned> _minLevel;
         optional<unsigned> _maxLevel;
+        optional<std::string> _description;
     };
 
     typedef std::vector< DataExtent > DataExtentList;
@@ -809,16 +829,9 @@
          * Gets a pointer to the underlying OSG heightfield.
          */
         const osg::HeightField* getHeightField() const;
-        osg::HeightField* getHeightField();
 
         //! Normal map
         const NormalMap* getNormalMap() const;
-        NormalMap* getNormalMap();
-
-        /**
-         * Gets a pointer to the underlying OSG heightfield, and releases the internal reference.
-         */
-        osg::HeightField* takeHeightField();
 
         /**
          * Gets the X interval of this GeoHeightField
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GeoData.cpp osgearth-2.10.2+dfsg/src/osgEarth/GeoData.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/GeoData.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GeoData.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,25 +19,14 @@
 
 #include <osgEarth/GeoData>
 #include <osgEarth/GeoMath>
-#include <osgEarth/ImageUtils>
 #include <osgEarth/HeightFieldUtils>
 #include <osgEarth/Registry>
-#include <osgEarth/Cube>
-#include <osgEarth/VerticalDatum>
 #include <osgEarth/Terrain>
 
-#include <osg/Notify>
-#include <osg/Timer>
-#include <osgShadow/ConvexPolyhedron>
 
 #include <gdal_priv.h>
 #include <gdalwarper.h>
-#include <ogr_spatialref.h>
-#include <memory.h>
 
-#include <sstream>
-#include <iomanip>
-#include <cmath>
 
 using namespace osgEarth;
 
@@ -124,37 +113,39 @@
 _srs    ( srs ),
 _altMode( ALTMODE_ABSOLUTE )
 {
-    conf.getIfSet( "x", _p.x() );
-    conf.getIfSet( "y", _p.y() );
-    conf.getIfSet( "z", _p.z() );
-    conf.getIfSet( "alt", _p.z() );
-    conf.getIfSet( "hat", _p.z() ); // height above terrain (relative)
+    conf.get( "x", _p.x() );
+    conf.get( "y", _p.y() );
+    conf.get( "z", _p.z() );
+    conf.get( "alt", _p.z() );
+    conf.get( "hat", _p.z() ); // height above terrain (relative)
 
     if ( !_srs.valid() )
         _srs = SpatialReference::create( conf.value("srs"), conf.value("vdatum") );
 
     if ( conf.hasValue("lat") && (!_srs.valid() || _srs->isGeographic()) )
     {
-        conf.getIfSet( "lat", _p.y() );
+        conf.get( "lat", _p.y() );
         if ( !_srs.valid() ) 
             _srs = SpatialReference::create("wgs84");
     }
     if ( conf.hasValue("long") && (!_srs.valid() || _srs->isGeographic()) )
     {
-        conf.getIfSet("long", _p.x());
+        conf.get("long", _p.x());
         if ( !_srs.valid() ) 
             _srs = SpatialReference::create("wgs84");
     }
 
     if ( conf.hasValue("mode") )
     {
-        conf.getIfSet( "mode", "relative",            _altMode, ALTMODE_RELATIVE );
-        conf.getIfSet( "mode", "relative_to_terrain", _altMode, ALTMODE_RELATIVE );
-        conf.getIfSet( "mode", "absolute",            _altMode, ALTMODE_ABSOLUTE );
+        conf.get( "mode", "relative",            _altMode, ALTMODE_RELATIVE );
+        conf.get( "mode", "relative_to_terrain", _altMode, ALTMODE_RELATIVE );
+        conf.get( "mode", "absolute",            _altMode, ALTMODE_ABSOLUTE );
     }
     else
     {
-        if ( conf.hasValue("alt") || conf.hasValue("z") )
+        if (conf.hasValue("hat"))
+            _altMode = ALTMODE_RELATIVE;
+        else if ( conf.hasValue("alt") || conf.hasValue("z") )
             _altMode = ALTMODE_ABSOLUTE;
         else
             _altMode = ALTMODE_RELATIVE;
@@ -440,16 +431,6 @@
         out_up.set(0, 0, 1);
         return true;
     }
-    else if ( _srs->isGeographic() )
-    {
-        double coslon = cos( osg::DegreesToRadians(x()) );
-        double coslat = cos( osg::DegreesToRadians(y()) );
-        double sinlon = sin( osg::DegreesToRadians(x()) );
-        double sinlat = sin( osg::DegreesToRadians(y()) );
-
-        out_up.set( coslon*coslat, sinlon*coslat, sinlat );
-        return true;
-    }
     else
     {
         osg::Vec3d ecef;
@@ -462,31 +443,108 @@
     return false;
 }
 
+GeoPoint
+GeoPoint::interpolate(const GeoPoint& rhs, double t) const
+{
+    if (t == 0.0)
+        return *this;
+    else if (t == 1.0)
+        return rhs;
+
+    GeoPoint result;
+
+    // Geometric slerp in unit sphere space
+    // https://en.wikipedia.org/wiki/Slerp#Geometric_Slerp
+
+    GeoPoint p1 = transform(getSRS()->getGeodeticSRS());
+    GeoPoint p2 = rhs.transform(p1.getSRS());
+
+    double deltaZ = p2.z()-p1.z();
+
+    // Convert each point to unit sphere world space:
+    osg::Vec3d unitToEllip(
+        getSRS()->getEllipsoid()->getRadiusEquator(),
+        getSRS()->getEllipsoid()->getRadiusEquator(),
+        getSRS()->getEllipsoid()->getRadiusPolar());
+
+    osg::Vec3d ellipToUnit = osg::componentDivide(
+        osg::Vec3d(1,1,1), unitToEllip);
+        
+    osg::Vec3d w1;
+    p1.toWorld(w1);
+    w1 = osg::componentMultiply(w1, ellipToUnit);
+    w1.normalize();
+
+    osg::Vec3d w2;
+    p2.toWorld(w2);
+    w2 = osg::componentMultiply(w2, ellipToUnit);
+    w2.normalize();
+
+    // perform geometric slerp:
+    double dp = w1*w2;
+    if (dp == 1.0)
+        return *this;
+
+    double angle = acos(dp);
+
+    double s = sin(angle);
+    if (s == 0.0)
+        return *this;
+
+    double c1 = sin((1.0-t)*angle)/s;
+    double c2 = sin(t*angle)/s;
+
+    osg::Vec3d n = w1*c1 + w2*c2;
+
+    // convert back to world space and apply altitude lerp
+    n = osg::componentMultiply(n, unitToEllip);
+    result.fromWorld(getSRS(), n);
+    result.z() = p1.z() + t*deltaZ;
+
+    result.transformInPlace(getSRS());
+    return result;
+}
+
 double
 GeoPoint::distanceTo(const GeoPoint& rhs) const
 {
-    if ( getSRS()->isProjected() && rhs.getSRS()->isProjected() )
-    {
-        if ( getSRS()->isEquivalentTo(rhs.getSRS()) )
-        {
-            return (vec3d() - rhs.vec3d()).length();
-        }
-        else
-        {
-            GeoPoint rhsT = rhs.transform(getSRS());
-            return (vec3d() - rhsT.vec3d()).length();
-        }
-    }
-    else
-    {
-        GeoPoint p1 = transform( getSRS()->getGeographicSRS() );
-        GeoPoint p2 = rhs.transform( getSRS()->getGeodeticSRS() );
+    // https://en.wikipedia.org/wiki/Geographical_distance#Ellipsoidal-surface_formulae
 
-        return GeoMath::distance(
-            osg::DegreesToRadians(p1.y()), osg::DegreesToRadians(p1.x()),
-            osg::DegreesToRadians(p2.y()), osg::DegreesToRadians(p2.x()),
-            getSRS()->getGeographicSRS()->getEllipsoid()->getRadiusEquator() );
-    }
+    // Convert both points to geographic
+    GeoPoint p1 = transform( getSRS()->getGeographicSRS() );
+    GeoPoint p2 = rhs.transform( p1.getSRS() );
+
+    double Re = getSRS()->getEllipsoid()->getRadiusEquator();
+    double Rp = getSRS()->getEllipsoid()->getRadiusPolar();
+    double F  = (Re-Rp)/Re; // flattening
+
+    double
+        lat1 = osg::DegreesToRadians(p1.y()),
+        lon1 = osg::DegreesToRadians(p1.x()),
+        lat2 = osg::DegreesToRadians(p2.y()),
+        lon2 = osg::DegreesToRadians(p2.x());
+
+    double B1 = atan( (1.0-F)*tan(lat1) );
+    double B2 = atan( (1.0-F)*tan(lat2) );
+
+    double P = (B1+B2)/2.0;
+    double Q = (B2-B1)/2.0;
+
+    double G = acos(sin(B1)*sin(B2) + cos(B1)*cos(B2)*cos(fabs(lon2-lon1)));
+
+    double 
+        sinG = sin(G), 
+        sinP = sin(P), sinQ = sin(Q), 
+        cosP = cos(P), cosQ = cos(Q), 
+        sinG2 = sin(G/2.0), cosG2 = cos(G/2.0);
+
+    double X = (G-sinG)*((sinP*sinP*cosQ*cosQ)/(cosG2*cosG2));
+    double Y = (G+sinG)*((cosP*cosP*sinQ*sinQ)/(sinG2*sinG2));
+
+    double dist = Re*(G-(F/2.0)*(X+Y));
+
+    // NaN could mean start/end points are the same
+    return osg::isNaN(dist)? 0.0 : dist;
 }
 
 std::string
@@ -603,6 +661,7 @@
 
 
 GeoExtent::GeoExtent():
+_srs(0L),
 _west(0.0),
 _width(-1.0),
 _south(0.0),
@@ -623,14 +682,22 @@
 
 GeoExtent::GeoExtent(const SpatialReference* srs,
                      double west, double south, double east, double north ) :
-_srs( srs )
+_srs( srs ),
+_west(0.0),
+_width(-1.0),
+_south(0.0),
+_height(-1.0)
 {
     set(west, south, east, north);
 }
 
 
 GeoExtent::GeoExtent(const SpatialReference* srs, const Bounds& bounds) :
-_srs( srs )
+_srs(srs),
+_west(0.0),
+_width(-1.0),
+_south(0.0),
+_height(-1.0)
 {
     set(bounds.xMin(), bounds.yMin(), bounds.xMax(), bounds.yMax());
 }
@@ -678,9 +745,9 @@
         while (east < west)
             east += 360.0;
     }
-    width = std::max(0.0, east - west);
+    width = osg::maximum(0.0, east - west);
 
-    height = std::max(0.0, north-south);
+    height = osg::maximum(0.0, north-south);
 
     setOriginAndSize(west, south, width, height);
 }
@@ -960,7 +1027,7 @@
 
         if ( getSRS()->isProjected() )
         {
-            double ext = std::max( width(), height() );
+            double ext = osg::maximum( width(), height() );
             circle.setRadius( 0.5*ext * 1.414121356237 ); /*sqrt(2)*/
         }
         else // isGeographic
@@ -974,9 +1041,9 @@
             GeoPoint(getSRS(), west(), north(), 0, ALTMODE_ABSOLUTE).toWorld(nw);
             
             double radius2 = (center-sw).length2();
-            radius2 = std::max(radius2, (center-se).length2());
-            radius2 = std::max(radius2, (center-ne).length2());
-            radius2 = std::max(radius2, (center-sw).length2());
+            radius2 = osg::maximum(radius2, (center-se).length2());
+            radius2 = osg::maximum(radius2, (center-ne).length2());
+            radius2 = osg::maximum(radius2, (center-sw).length2());
 
             circle.setRadius( sqrt(radius2) );
         }
@@ -1077,18 +1144,10 @@
     }
 }
 
-void
-GeoExtent::expandToInclude(const Bounds& rhs)
-{
-    expandToInclude( rhs.center() );
-    expandToInclude( rhs.xMin(), rhs.yMin() );
-    expandToInclude( rhs.xMax(), rhs.yMax() );
-}
-
 bool
 GeoExtent::expandToInclude(const GeoExtent& rhs)
 {
-    if ( isInvalid() || rhs.isInvalid() )
+    if (rhs.isInvalid() || !_srs.valid())
         return false;
 
     if ( !rhs.getSRS()->isHorizEquivalentTo( _srs.get() ) )
@@ -1097,12 +1156,54 @@
     }
 
     else
-    {
-        // include the centroid first in order to get the optimal
-        // expansion direction.
-        expandToInclude( rhs.getCentroid() );
-        expandToInclude( rhs.west(), rhs.south() );
-        expandToInclude( rhs.east(), rhs.north() );
+    {        
+        if (area() <= 0.0)
+        {
+            *this = rhs;
+            return true;
+        }
+
+        double h = osg::maximum(north(), rhs.north()) - osg::minimum(south(), rhs.south());
+        if (rhs.south() < south())
+        {
+            _south = rhs.south();
+        }
+        _height = h;
+        
+        // non-wrap-around new width:
+        double w0 = osg::maximum(xMax(), rhs.xMax()) - osg::minimum(xMin(), rhs.xMin());
+
+        if (isGeographic())
+        {
+            // wrap-around width:
+            double w1 = west() > rhs.east()? (180-west())+(rhs.east()-(-180)) : (180-rhs.west()) + (east()-(-180));
+
+            // pick the smaller one:
+            if (w0 < w1)
+            {
+                if (w0 > _width)
+                {
+                    _width = w0;
+                    _west = osg::minimum(west(), rhs.west());
+                }
+            }
+            else
+            {
+                if (w1 > _width)
+                {
+                    _width = w1;
+                    if (west() <= rhs.east())
+                        _west = rhs.west();
+                }
+            }
+        }
+        else
+        {
+            // projected mode is the same approach as Y
+            _west = osg::minimum(west(), rhs.west());
+            _width = w0;
+        }
+
     }
 
     return true;
@@ -1188,13 +1289,13 @@
     else
     {
         // projected mode is simple
-        result._west = std::max(west(), rhs.west());
-        double eastTemp = std::min(east(), rhs.east());
+        result._west = osg::maximum(west(), rhs.west());
+        double eastTemp = osg::minimum(east(), rhs.east());
         result._width = eastTemp - result._west;
     }
 
-    result._south = std::max(south(), rhs.south());
-    double northTemp = std::min(north(), rhs.north());
+    result._south = osg::maximum(south(), rhs.south());
+    double northTemp = osg::minimum(north(), rhs.north());
     result._height = northTemp - result._south;
 
     result.clamp();
@@ -1287,10 +1388,22 @@
 {
     if (isValid() && is_valid(x) && _srs->isGeographic())
     {
-        while (x < -180.0)
-            x += 360.0;
-        while ( x > 180.0 )
+        if (fabs(x) <= 180.0)
+        {
+            return x;
+        }
+
+        if (x < 0.0 || x >= 360.0)
+        {
+            x = fmod(x, 360.0);
+            if (x < 0.0)
+                x += 360.0;
+        }
+        
+        if (x > 180.0)
+        {
             x -= 360.0;
+        }
     }
     return x;
 }
@@ -1386,7 +1499,23 @@
 }
 
 bool
-GeoExtent::createScaleBias(const GeoExtent& rhs, osg::Matrix& output) const
+GeoExtent::createScaleBias(const GeoExtent& rhs, osg::Matrixf& output) const
+{    
+    double scalex = width() / rhs.width();
+    double scaley = height() / rhs.height();
+    double biasx  = (west()-rhs.west()) / rhs.width();
+    double biasy  = (south()-rhs.south()) / rhs.height();
+
+    output(0,0) = scalex;
+    output(1,1) = scaley;
+    output(3,0) = biasx;
+    output(3,1) = biasy;
+
+    return true;
+}
+
+bool
+GeoExtent::createScaleBias(const GeoExtent& rhs, osg::Matrixd& output) const
 {    
     double scalex = width() / rhs.width();
     double scaley = height() / rhs.height();
@@ -1403,6 +1532,22 @@
 
 /***************************************************************************/
 
+DataExtent::DataExtent(const GeoExtent& extent, unsigned minLevel, unsigned maxLevel, const std::string &description) :
+GeoExtent(extent)
+{
+    _minLevel = minLevel;
+    _maxLevel = maxLevel;
+    _description = description;
+}
+
+DataExtent::DataExtent(const GeoExtent& extent, const std::string &description) :
+GeoExtent(extent),
+_minLevel( 0 ),
+_maxLevel( 0 )
+{
+    _description = description;
+}
+
 DataExtent::DataExtent(const GeoExtent& extent, unsigned minLevel,  unsigned maxLevel) :
 GeoExtent(extent)
 {
@@ -1417,6 +1562,14 @@
     _minLevel = minLevel;
 }
 
+DataExtent::DataExtent(const GeoExtent& extent, unsigned minLevel, const std::string &description) :
+GeoExtent(extent),
+_maxLevel( 0 )
+{
+    _minLevel = minLevel;
+    _description = description;
+}
+
 DataExtent::DataExtent(const GeoExtent& extent ) :
 GeoExtent(extent),
 _minLevel( 0 ),
@@ -1621,7 +1774,7 @@
         osg::Image *image = new osg::Image;
         image->allocateImage(ds->GetRasterXSize(), ds->GetRasterYSize(), 1, pixelFormat, dataType);
 
-        ds->RasterIO(
+        CPLErr err = ds->RasterIO(
             GF_Read, 
             0, 0, 
             image->s(), image->t(), 
@@ -1633,8 +1786,11 @@
             pixelBytes,
             pixelBytes * image->s(),
             1);
+        if ( err != CE_None )
+        {
+            OE_WARN << LC << "RasterIO failed.\n";
+        }
 
-//        ds->RasterIO(GF_Read, 0, 0, image->s(), image->t(), (void*)image->data(), image->s(), image->t(), GDT_Byte, 4, NULL, 4, 4 * image->s(), 1);
         ds->FlushCache();
 
         image->flipVertical();
@@ -1724,7 +1880,7 @@
 
         if ( srcDS )
         {
-            srcDS->RasterIO(
+            CPLErr err = srcDS->RasterIO(
                 GF_Write, 
                 0, 0,
                 clonedImage->s(), clonedImage->t(),
@@ -1737,36 +1893,10 @@
                 pixelBytes,
                 pixelBytes * image->s(),
                 1);
-
-
-#if 0
-
-        //Write the image data into the memory dataset
-        //If the image is already RGBA, just read all 4 bands in one call
-        if (image->getPixelFormat() == GL_RGBA)
-        {
-            srcDS->RasterIO(GF_Write, 0, 0, clonedImage->s(), clonedImage->t(), (void*)clonedImage->data(), clonedImage->s(), clonedImage->t(), GDT_Byte, 4, NULL, 4, 4 * image->s(), 1);
-        }
-        else if (image->getPixelFormat() == GL_RGB)
-        {    
-            //OE_NOTICE << "[osgEarth::GeoData] Reprojecting RGB " << std::endl;
-            //Read the read, green and blue bands
-            srcDS->RasterIO(GF_Write, 0, 0, clonedImage->s(), clonedImage->t(), (void*)clonedImage->data(), clonedImage->s(), clonedImage->t(), GDT_Byte, 3, NULL, 3, 3 * image->s(), 1);
-
-            //Initialize the alpha values to 255.
-            unsigned char *alpha = new unsigned char[clonedImage->s() * clonedImage->t()];
-            memset(alpha, 255, clonedImage->s() * clonedImage->t());
-
-            GDALRasterBand* alphaBand = srcDS->GetRasterBand(4);
-            alphaBand->RasterIO(GF_Write, 0, 0, clonedImage->s(), clonedImage->t(), alpha, clonedImage->s(),clonedImage->t(), GDT_Byte, 0, 0);
-
-            delete[] alpha;
-        }
-        else
-        {
-            OE_WARN << LC << "createDataSetFromImage: unsupported pixel format " << std::hex << image->getPixelFormat() << std::endl;
-        }
-#endif
+            if ( err != CE_None )
+            {
+                OE_WARN << LC << "RasterIO failed.\n";
+            }
 
             srcDS->FlushCache();
         }
@@ -2511,24 +2641,6 @@
     return _heightField.get();
 }
 
-osg::HeightField*
-GeoHeightField::getHeightField() 
-{
-    return _heightField.get();
-}
-
-osg::HeightField*
-GeoHeightField::takeHeightField()
-{
-    return _heightField.release();
-}
-
-NormalMap*
-GeoHeightField::getNormalMap()
-{
-    return _normalMap.get();
-}
-
 const NormalMap*
 GeoHeightField::getNormalMap() const
 {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Geoid osgearth-2.10.2+dfsg/src/osgEarth/Geoid
--- osgearth-2.9.0+dfsg/src/osgEarth/Geoid	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Geoid	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Geoid.cpp osgearth-2.10.2+dfsg/src/osgEarth/Geoid.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Geoid.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Geoid.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GeoMath osgearth-2.10.2+dfsg/src/osgEarth/GeoMath
--- osgearth-2.9.0+dfsg/src/osgEarth/GeoMath	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GeoMath	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -102,16 +102,6 @@
             double &out_latRad, double &out_lonRad);
 
         /**
-         * Computes a great-circle interpolation from one lat/long to another,
-         * where t => [0..1].
-         */
-        static void interpolate(
-            double lat1Rad, double lon1Rad,
-            double lat2Rad, double lon2Rad,
-            double t,
-            double& out_latRad, double& out_lonRad );
-
-        /**
          * Computes the destination point given a start point, a bearing and a distance
          * @param lat1Rad
          *    The latitude in radians
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GeoMath.cpp osgearth-2.10.2+dfsg/src/osgEarth/GeoMath.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/GeoMath.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GeoMath.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -84,8 +84,8 @@
                                    double lat2Rad, double lon2Rad,
                                    double& out_minLatRad, double& out_maxLatRad)
 {
-    out_minLatRad = std::min(lat1Rad, lat2Rad);
-    out_maxLatRad = std::max(lat1Rad, lat2Rad);
+    out_minLatRad = osg::minimum(lat1Rad, lat2Rad);
+    out_maxLatRad = osg::maximum(lat1Rad, lat2Rad);
 
     // apply some spherical trig
     // http://en.wikipedia.org/wiki/Spherical_trigonometry
@@ -102,20 +102,20 @@
 
     double B = osg::PI_2 - lat1Rad;                       // angle between p1 and the pole
     if ( a < osg::PI_2 && b < osg::PI_2 )
-        out_maxLatRad = std::max( out_maxLatRad, osg::PI_2 - asin(sin(B)*sin(a)) );
+        out_maxLatRad = osg::maximum( out_maxLatRad, osg::PI_2 - asin(sin(B)*sin(a)) );
     //out_maxLatRad = a < osg::PI_2 && b < osg::PI_2 ? 
     //    osg::PI_2 - asin( sin(B)*sin(a) ) : 
-    //    std::max(lat1Rad,lat2Rad);
+    //    osg::maximum(lat1Rad,lat2Rad);
 
     // flip over to the triangle formed by the south pole:
     a = osg::PI - a, b = osg::PI - b;
     B = osg::PI - B; //lat1Rad - (-osg::PI_2);
 
     if ( a < osg::PI_2 && b < osg::PI_2 )
-        out_minLatRad = std::min( out_minLatRad, -osg::PI_2 + asin(sin(B)*sin(a)) );
+        out_minLatRad = osg::minimum( out_minLatRad, -osg::PI_2 + asin(sin(B)*sin(a)) );
     //out_minLatRad = a < osg::PI_2 && b < osg::PI_2 ? 
     //    osg::PI_2 - asin( sin(B)*sin(a) ) :
-    //    std::min(lat1Rad,lat2Rad);
+    //    osg::minimum(lat1Rad,lat2Rad);
 
     //OE_INFO 
     //    << "a = " << osg::RadiansToDegrees(a)
@@ -158,33 +158,6 @@
                                  cos(dR)-sin(lat1Rad)*sin(out_latRad));
 }
 
-void
-GeoMath::interpolate(double lat1Rad, double lon1Rad,
-                     double lat2Rad, double lon2Rad,
-                     double t,
-                     double& out_latRad, double& out_lonRad)
-{
-    static osg::EllipsoidModel em; // questionable. make non-static?
-
-    osg::Vec3d v0, v1;
-
-    em.convertLatLongHeightToXYZ(lat1Rad, lon1Rad, 0, v0.x(), v0.y(), v0.z());
-    double r0 = v0.length();
-    v0.normalize();
-    em.convertLatLongHeightToXYZ(lat2Rad, lon2Rad, 0, v1.x(), v1.y(), v1.z());
-    double r1 = v1.length();
-    v1.normalize();
-
-    osg::Vec3d axis = v0 ^ v1;
-    double angle = acos( v0 * v1 );
-    osg::Quat q( angle * t, axis );
-
-    v0 = (q * v0) * 0.5*(r0 + r1);
-
-    double dummy;
-    em.convertXYZToLatLongHeight( v0.x(), v0.y(), v0.z(), out_latRad, out_lonRad, dummy );
-}
-
 double
 GeoMath::rhumbDistance(double lat1Rad, double lon1Rad,
                        double lat2Rad, double lon2Rad,
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GeometryClamper osgearth-2.10.2+dfsg/src/osgEarth/GeometryClamper
--- osgearth-2.9.0+dfsg/src/osgEarth/GeometryClamper	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GeometryClamper	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -37,18 +37,34 @@
     class OSGEARTH_EXPORT GeometryClamper : public osg::NodeVisitor
     {
     public:
-        GeometryClamper();
+        class GeometryData {
+            osg::ref_ptr<osg::Vec3Array> _verts;
+            osg::ref_ptr<osg::FloatArray> _altitudes;
+            friend class GeometryClamper;
+        };
+
+        typedef std::map<osg::Array*, GeometryData> LocalData;      
+
+    public:
+        //! Construct a geometry clamper, passing in a data structure managed
+        //! by the caller.
+        GeometryClamper(LocalData& data);
 
         virtual ~GeometryClamper() { }
 
+        //! Terrain graph the clamper should use to sample in-memory terrain
         void setTerrainPatch(osg::Node* node) { _terrainPatch = node; }
         osg::Node* getTerrainPatch() const { return _terrainPatch.get(); }
 
+        //! SRS of the terrain model in memory
         void setTerrainSRS(const SpatialReference* srs) { _terrainSRS = srs; }
         const SpatialReference* getTerrainSRS() const   { return _terrainSRS.get(); }
 
-        void setPreserveZ(bool value) { _preserveZ = value; }
-        bool getPreserveZ() const     { return _preserveZ; }
+        //! Whether to incorporate (add) the original vertex's altitude to the result
+        //! of the clamping operation. Default=true. If false, the vert's height information 
+        //! is ignored.
+        void setUseVertexZ(bool value) { _useVertexZ = value; }
+        bool getUseVertexZ() const     { return _useVertexZ; }
 
         void setScale(float scale) { _scale = scale; }
         float getScale() const     { return _scale; }
@@ -56,6 +72,9 @@
         void setOffset(float offset) { _offset = offset; }
         float getOffset() const      { return _offset; }
 
+        //! Whether to revert a previous clamping operation (default=false)
+        void setRevert(bool value) { _revert = value; }
+
     public: // osg::NodeVisitor
 
         void apply( osg::Drawable& );
@@ -63,9 +82,11 @@
 
     protected:
 
+        LocalData&                           _localData;
         osg::ref_ptr<osg::Node>              _terrainPatch;
         osg::ref_ptr<const SpatialReference> _terrainSRS;
-        bool                                 _preserveZ;
+        bool                                 _useVertexZ;
+        bool                                 _revert;
         float                                _scale;
         float                                _offset;
         osg::fast_back_stack<osg::Matrixd>   _matrixStack;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GeometryClamper.cpp osgearth-2.10.2+dfsg/src/osgEarth/GeometryClamper.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/GeometryClamper.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GeometryClamper.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,12 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/GeometryClamper>
-
-#include <osgUtil/IntersectionVisitor>
-
-#include <osg/Geode>
 #include <osg/Geometry>
-#include <osg/UserDataContainer>
 
 #define LC "[GeometryClamper] "
 
@@ -32,11 +27,13 @@
 
 //-----------------------------------------------------------------------
 
-GeometryClamper::GeometryClamper() :
+GeometryClamper::GeometryClamper(GeometryClamper::LocalData& localData) :
 osg::NodeVisitor( osg::NodeVisitor::TRAVERSE_ALL_CHILDREN ),
-_preserveZ      ( false ),
-_scale          ( 1.0f ),
-_offset         ( 0.0f )
+_localData(localData),
+_useVertexZ(true),
+_revert(false),
+_scale( 1.0f ),
+_offset( 0.0f )
 {
     this->setNodeMaskOverride( ~0 );
     _lsi = new osgUtil::LineSegmentIntersector(osg::Vec3d(0,0,0), osg::Vec3d(0,0,0));
@@ -56,13 +53,26 @@
 void
 GeometryClamper::apply(osg::Drawable& drawable)
 {
-    if ( !_terrainSRS.valid() )
-        return;
-
     osg::Geometry* geom = drawable.asGeometry();
     if ( !geom )
         return;
 
+    osg::Vec3Array* verts = static_cast<osg::Vec3Array*>(geom->getVertexArray());
+
+    if (_revert)
+    {
+        GeometryData& data = _localData[verts];
+        if (data._verts.valid() && verts->size() == data._verts->size())
+        {
+            std::copy(data._verts->begin(), data._verts->end(), verts->begin());
+            verts->dirty();
+        }
+        return;
+    }
+    
+    if ( !_terrainSRS.valid() )
+        return;
+
     const osg::Matrixd& local2world = _matrixStack.back();
     osg::Matrix world2local;
     world2local.invert( local2world );
@@ -74,34 +84,22 @@
 
     osgUtil::IntersectionVisitor iv( _lsi.get() );
 
-    double r = std::min( em->getRadiusEquator(), em->getRadiusPolar() );
+    double r = osg::minimum( em->getRadiusEquator(), em->getRadiusPolar() );
 
     unsigned count = 0;
 
     bool geomDirty = false;
-    osg::Vec3Array*  verts = static_cast<osg::Vec3Array*>(geom->getVertexArray());
-    osg::FloatArray* zOffsets = 0L;
 
-    // if preserve-Z is on, check for our elevations array. Create it if is doesn't
-    // already exist.
-    bool buildZOffsets = false;
-    if ( _preserveZ )
-    {
-        osg::UserDataContainer* udc = geom->getOrCreateUserDataContainer();
-        unsigned n = udc->getUserObjectIndex( ZOFFSETS_NAME );
-        if ( n < udc->getNumUserObjects() )
-        {
-            zOffsets = dynamic_cast<osg::FloatArray*>(udc->getUserObject(n));
-        }
+    GeometryData& data = _localData[verts];
+    
+    bool storeAltitudes = false;
 
-        else
-        {
-            zOffsets = new osg::FloatArray();
-            zOffsets->setName( ZOFFSETS_NAME );
-            zOffsets->reserve( verts->size() );
-            udc->addUserObject( zOffsets );
-            buildZOffsets = true;
-        }
+    if (!data._verts.valid() || data._verts->size() != verts->size())
+    {
+        data._verts = osg::clone(verts, osg::CopyOp::DEEP_COPY_ALL);
+        data._altitudes = new osg::FloatArray();
+        data._altitudes->reserve(verts->size());
+        storeAltitudes = true;
     }
 
     for( unsigned k=0; k<verts->size(); ++k )
@@ -114,27 +112,22 @@
             // normal to the ellipsoid:
             n_vector = em->computeLocalUpVector(vw.x(),vw.y(),vw.z());
 
-            // if we need to build to z-offsets array, calculate the z offset now:
-            if ( buildZOffsets || _scale != 1.0 )
+            // if we need to store the original altitudes:
+            if (storeAltitudes)
             {
-                double lat,lon,hae;
-                em->convertXYZToLatLongHeight(vw.x(), vw.y(), vw.z(), lat, lon, hae);
-
-                if ( buildZOffsets )
-                {
-                    zOffsets->push_back( hae ); //(*verts)[k].z() );
-                }
-
-                if ( _scale != 1.0 )
-                {
-                    msl = vw - n_vector*hae;
-                }
+                // should really be the alt along the n_vector but leave for now
+                // since most scene-clamped geometry will be in relative to a
+                // local tangent plane anyway -gw
+                data._altitudes->push_back( (*verts)[k].z() );
             }
         }
 
-        else if ( buildZOffsets ) // flat map
+        else
         {
-            zOffsets->push_back( float(vw.z()) );
+            if (storeAltitudes)
+            {
+                data._altitudes->push_back( float(vw.z()) - _offset);
+            }
         }
 
         _lsi->reset();
@@ -147,18 +140,20 @@
         if ( _lsi->containsIntersections() )
         {
             osg::Vec3d fw = _lsi->getFirstIntersection().getWorldIntersectPoint();
-            if ( _scale != 1.0 )
-            {
-                osg::Vec3d delta = fw - msl;
-                fw += delta*_scale;
-            }
+            //if ( _scale != 1.0 )
+            //{
+            //    osg::Vec3d delta = fw - msl;
+            //    fw += delta*_scale;
+            //}
+
             if ( _offset != 0.0 )
             {
                 fw += n_vector*_offset;
             }
-            if ( _preserveZ && (zOffsets != 0L) )
+
+            if (_useVertexZ)
             {
-                fw += n_vector * (*zOffsets)[k];
+                fw += n_vector * (*data._altitudes)[k];
             }
 
             (*verts)[k] = (fw * world2local);
@@ -177,7 +172,11 @@
         }
         else
         {
+#if OSG_VERSION_LESS_THAN(3,6,0)
             geom->dirtyDisplayList();
+#else
+            geom->dirtyGLObjects();
+#endif
         }
 
         OE_DEBUG << LC << "clamped " << count << " verts." << std::endl;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GeoTransform osgearth-2.10.2+dfsg/src/osgEarth/GeoTransform
--- osgearth-2.9.0+dfsg/src/osgEarth/GeoTransform	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GeoTransform	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -120,9 +120,9 @@
         GeoPoint                   _position;                 // Current position
         osg::observer_ptr<Terrain> _terrain;                  // Terrain for relative height resolution
         bool                       _terrainCallbackInstalled; // Whether the Terrain callback is in
-        bool                       _findTerrain;              // True is we need _terrain but don't have it
         bool                       _autoRecomputeHeights;     // Whether to resolve relative position Z's
-        bool                       _dirtyClamp;               // Whether a terrain clamp is required
+        bool                       _findTerrainInUpdateTraversal; // True is we need _terrain but don't have it
+        bool                       _clampInUpdateTraversal;       // Whether a terrain clamp is required
 
         osg::ref_ptr<ComputeMatrixCallback> _computeMatrixCallback;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GeoTransform.cpp osgearth-2.10.2+dfsg/src/osgEarth/GeoTransform.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/GeoTransform.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GeoTransform.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/GeoTransform>
-#include <osgEarth/Terrain>
 #include <osgEarth/MapNode>
 #include <osgEarth/NodeUtils>
 
@@ -28,10 +27,10 @@
 using namespace osgEarth;
 
 GeoTransform::GeoTransform() :
-_findTerrain(false),
+_findTerrainInUpdateTraversal(false),
 _terrainCallbackInstalled(false),
 _autoRecomputeHeights(true),
-_dirtyClamp(false)
+_clampInUpdateTraversal(false)
 {
    //nop
 }
@@ -43,8 +42,8 @@
     _terrain = rhs._terrain.get();
     _autoRecomputeHeights = rhs._autoRecomputeHeights;
     _terrainCallbackInstalled = false;
-    _findTerrain = false;
-    _dirtyClamp = rhs._dirtyClamp;
+    _findTerrainInUpdateTraversal = false;
+    _clampInUpdateTraversal = false;
 }
 
 void
@@ -86,9 +85,9 @@
 
     // If we don't have a pointer to a terrain, schedule an attempt
     // to find one on the next update traversal.
-    if (!terrain.valid() && !_findTerrain)
+    if (!terrain.valid() && !_findTerrainInUpdateTraversal)
     {
-        _findTerrain = true;
+        _findTerrainInUpdateTraversal = true;
         ADJUST_UPDATE_TRAV_COUNT(this, +1);
     }
 
@@ -143,7 +142,7 @@
                           osg::Node*              node,
                           TerrainCallbackContext& context)
 {
-    if (!_dirtyClamp)
+    if (!_clampInUpdateTraversal)
     {
        if (!_position.isValid() || _position.altitudeMode() != ALTMODE_RELATIVE || !_autoRecomputeHeights)
        {
@@ -157,11 +156,9 @@
            return;
        }
 
-       _dirtyClamp = true;
+       _clampInUpdateTraversal = true;
        ADJUST_UPDATE_TRAV_COUNT(this, +1);
     }
-
-    //setPosition(_position);
 }
 
 void
@@ -169,22 +166,23 @@
 {
     if (nv.getVisitorType() == nv.UPDATE_VISITOR)
     {
-        if (_findTerrain)
+        if (_findTerrainInUpdateTraversal)
         {
             MapNode* mapNode = osgEarth::findInNodePath<MapNode>(nv);
             if (mapNode)
             {
-                _findTerrain = false;
+                _findTerrainInUpdateTraversal = false;
                 ADJUST_UPDATE_TRAV_COUNT(this, -1);
+
                 setTerrain(mapNode->getTerrain());
                 OE_DEBUG << LC << "Discovered terrain.\n";
             }
         }
 
-        if (_dirtyClamp)
+        if (_clampInUpdateTraversal)
         {
             setPosition(_position);
-            _dirtyClamp = false;
+            _clampInUpdateTraversal = false;
             ADJUST_UPDATE_TRAV_COUNT(this, -1);
         }
     }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GLSLChunker osgearth-2.10.2+dfsg/src/osgEarth/GLSLChunker
--- osgearth-2.9.0+dfsg/src/osgEarth/GLSLChunker	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GLSLChunker	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GLSLChunker.cpp osgearth-2.10.2+dfsg/src/osgEarth/GLSLChunker.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/GLSLChunker.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GLSLChunker.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
  */
 #include <osgEarth/GLSLChunker>
 #include <osgEarth/StringUtils>
-#include <sstream>
 
 using namespace osgEarth;
 
@@ -144,18 +143,26 @@
                     --parenLevel;
                 }
 
-                else if (c0 == '{') {
+                else if (c0 == '{')
+                {
                     ++braceLevel;
                     // if we were in a statement, the precense of an open-brace converts it to a FUNCTION
-                    // unless we can detect that it's a struct.
-                    if (type == Chunk::TYPE_STATEMENT) {
-                        if (tokens.empty() || (tokens[0] != "struct" && tokens[0].substr(0,6) != "layout")) {
+                    // unless we can detect that it's a struct or an interface block.
+                    if (type == Chunk::TYPE_STATEMENT)
+                    {
+                        if (tokens.empty() || 
+                            (tokens[0] != "struct"  && 
+                             tokens[0] != "in"      &&
+                             tokens[0] != "out"     &&
+                             tokens[0].substr(0,6) != "layout"))
+                        {
                             type = Chunk::TYPE_FUNCTION;
                         }
                     }
                 }
 
-                else if (c0 == '}') {
+                else if (c0 == '}')
+                {
                     --braceLevel;
                 }
             }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GLUtils osgearth-2.10.2+dfsg/src/osgEarth/GLUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/GLUtils	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GLUtils	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,66 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2015 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#ifndef OSGEARTH_GLUTILS_H
+#define OSGEARTH_GLUTILS_H 1
+
+#include <osgEarth/Common>
+#include <osg/StateSet>
+#include <osg/OperationThread>
+
+namespace osgEarth
+{
+    struct OSGEARTH_EXPORT GLUtils
+    {
+        //! Sets any default uniforms required by the implementation
+        static void setGlobalDefaults(osg::StateSet* stateSet);
+
+        //! Configure lighting (GL_LIGHTING)
+        static void setLighting(osg::StateSet* stateSet, osg::StateAttribute::OverrideValue ov);
+        
+        //! Configure line width (GL_LINE_WIDTH)
+        static void setLineWidth(osg::StateSet* stateSet, float value, osg::StateAttribute::OverrideValue ov);
+
+        //! Configure line stippling (GL_LINE_STIPPLE)
+        static void setLineStipple(osg::StateSet* stateSet, int factor, unsigned short pattern, osg::StateAttribute::OverrideValue ov);
+
+        //! Configure line antialiasing (GL_LINE_SMOOTH)
+        static void setLineSmooth(osg::StateSet* stateSet, osg::StateAttribute::OverrideValue ov);
+
+        //! Configure point rendering size (GL_POINT_SIZE)
+        static void setPointSize(osg::StateSet* stateSet, float value, osg::StateAttribute::OverrideValue ov);
+
+        //! Configure point rounding/antialiasing (GL_POINT_SMOOTH)
+        static void setPointSmooth(osg::StateSet* stateSet, osg::StateAttribute::OverrideValue ov);
+
+        //! Removes the state associated with a GL capability, causing it to inherit from above.
+        //! and if one of: GL_LIGHTING, GL_LINE_WIDTH, GL_LINE_STIPPLE, GL_LINE_SMOOTH, GL_POINT_SIZE
+        static void remove(osg::StateSet* stateSet, GLenum cap);
+    };
+
+    struct OSGEARTH_EXPORT GL3RealizeOperation : public osg::Operation
+    {
+        void operator()(osg::Object*);
+    };
+}
+
+#endif // OSGEARTH_GLUTILS_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GLUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/GLUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/GLUtils.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GLUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,207 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2015 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#include <osgEarth/GLUtils>
+#include <osgEarth/Lighting>
+
+#include <osg/LineStipple>
+#include <osg/GraphicsContext>
+
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
+#include <osg/LineWidth>
+#include <osg/Point>
+#endif
+
+using namespace osgEarth;
+
+#define LC "[GLUtils] "
+
+#ifndef GL_LINE_SMOOTH
+#define GL_LINE_SMOOTH 0x0B20
+#endif
+
+#ifndef GL_POINT_SIZE
+#define GL_POINT_SIZE 0x0B11
+#endif
+
+#ifndef GL_NORMALIZE
+#define GL_NORMALIZE 0x0BA1
+#endif
+
+
+void
+GLUtils::setGlobalDefaults(osg::StateSet* stateSet)
+{
+    // anything that uses a uniform.
+    setLineWidth(stateSet, 1.0f, osg::StateAttribute::ON);
+    setLineStipple(stateSet, 1, 0xffff, osg::StateAttribute::ON);
+    setPointSize(stateSet, 1, osg::StateAttribute::ON);
+}
+
+void
+GLUtils::setLighting(osg::StateSet* stateSet, osg::StateAttribute::OverrideValue ov)
+{
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
+    stateSet->setMode(GL_LIGHTING, ov);
+#endif
+
+    stateSet->setDefine(OE_LIGHTING_DEFINE, ov);
+}
+
+void
+GLUtils::setLineWidth(osg::StateSet* stateSet, float value, osg::StateAttribute::OverrideValue ov)
+{
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
+    stateSet->setAttributeAndModes(new osg::LineWidth(value), ov);
+#endif
+
+    stateSet->addUniform(new osg::Uniform("oe_GL_LineWidth", value), ov);
+}
+
+void
+GLUtils::setLineStipple(osg::StateSet* stateSet, int factor, unsigned short pattern, osg::StateAttribute::OverrideValue ov)
+{
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
+    stateSet->setAttributeAndModes(new osg::LineStipple(factor, pattern), ov);
+#endif
+
+    stateSet->addUniform(new osg::Uniform("oe_GL_LineStippleFactor", (int)factor), ov);
+    stateSet->addUniform(new osg::Uniform("oe_GL_LineStipplePattern", (int)pattern), ov);
+}
+
+void
+GLUtils::setLineSmooth(osg::StateSet* stateSet, osg::StateAttribute::OverrideValue ov)
+{
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
+    stateSet->setMode(GL_LINE_SMOOTH, ov);
+#endif
+
+    stateSet->setDefine("OE_LINE_SMOOTH", ov);
+}
+
+void
+GLUtils::setPointSize(osg::StateSet* stateSet, float value, osg::StateAttribute::OverrideValue ov)
+{
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
+    stateSet->setAttributeAndModes(new osg::Point(value), ov);
+#endif
+
+    stateSet->addUniform(new osg::Uniform("oe_GL_PointSize", value), ov);
+}
+
+void
+GLUtils::setPointSmooth(osg::StateSet* stateSet, osg::StateAttribute::OverrideValue ov)
+{
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
+    stateSet->setMode(GL_POINT_SMOOTH, ov);
+#endif
+
+    stateSet->setDefine("OE_POINT_SMOOTH", ov);
+}
+
+void
+GLUtils::remove(osg::StateSet* stateSet, GLenum cap)
+{
+    if (!stateSet)
+        return;
+
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
+    switch(cap)
+    {
+    case GL_LIGHTING:
+        stateSet->removeMode(GL_LIGHTING);
+        break;
+
+    case GL_LINE_WIDTH:
+        stateSet->removeAttribute(osg::StateAttribute::LINEWIDTH);
+        break;
+
+    case GL_LINE_STIPPLE:
+        stateSet->removeAttribute(osg::StateAttribute::LINESTIPPLE);
+        break;
+
+    case GL_LINE_SMOOTH:
+        stateSet->removeMode(GL_LINE_SMOOTH);
+        break;
+
+    case GL_POINT_SIZE:
+        stateSet->removeAttribute(osg::StateAttribute::POINT);
+        break;
+
+    default:
+        stateSet->removeMode(cap);
+        break;
+    }
+#endif
+
+    switch(cap)
+    {   
+    case GL_LIGHTING:
+        stateSet->removeDefine(OE_LIGHTING_DEFINE);
+        break;
+
+    case GL_LINE_WIDTH:
+        stateSet->removeUniform("oe_GL_LineWidth");
+        break;
+
+    case GL_LINE_STIPPLE:
+        stateSet->removeUniform("oe_GL_LineStippleFactor");
+        stateSet->removeUniform("oe_GL_LineStipplePattern");
+        break;
+
+    case GL_LINE_SMOOTH:
+        stateSet->removeDefine("OE_LINE_SMOOTH");
+        break;
+
+    case GL_POINT_SIZE:
+        stateSet->removeUniform("oe_GL_PointSize");
+        break;
+    }
+}
+
+
+void
+GL3RealizeOperation::operator()(osg::Object* object)
+{
+    osg::GraphicsContext* gc = dynamic_cast<osg::GraphicsContext*>(object);
+    if (gc)
+    {
+        osg::State* state = gc->getState();
+
+        // force NVIDIA-style vertex attribute aliasing, since osgEarth
+        // makes use of some specific attribute registers. Later we can
+        // perhaps create a reservation system for this.
+        state->resetVertexAttributeAlias(false);
+
+#ifdef OSG_GL3_AVAILABLE
+        state->setUseModelViewAndProjectionUniforms(true);
+        state->setUseVertexAttributeAliasing(true);
+#endif
+
+#ifndef OSG_GL_FIXED_FUNCTION_AVAILABLE
+        state->setModeValidity(GL_LIGHTING, false);
+        state->setModeValidity(GL_NORMALIZE, false);
+        state->setModeValidity(GL_RESCALE_NORMAL, false);
+        state->setModeValidity(GL_LINE_STIPPLE, false);
+        state->setModeValidity(GL_LINE_SMOOTH, false);
+#endif
+    }
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/GPUClamping.vert.glsl osgearth-2.10.2+dfsg/src/osgEarth/GPUClamping.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarth/GPUClamping.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/GPUClamping.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -4,7 +4,8 @@
 #pragma vp_entryPoint oe_clamp_vertex
 #pragma vp_location   vertex_view
 #pragma vp_order      0.5
-#pragma import_defines(OE_CLAMP_HAS_ATTRIBUTES, OE_GPU_LINES)
+#pragma import_defines(OE_CLAMP_HAS_ATTRIBUTES)
+#pragma import_defines(OE_IS_GEOCENTRIC)
 #pragma include GPUClamping.vert.lib.glsl
 
 #ifdef OE_CLAMP_HAS_ATTRIBUTES
@@ -12,20 +13,11 @@
 in float oe_clamp_height;   // vertex attribute
 #endif
 
-#ifdef OE_GPU_LINES
-in vec3 oe_GPULines_prev;
-in vec3 oe_GPULines_next;
-vec4 oe_GPULines_prevViewClamped;
-vec4 oe_GPULines_nextViewClamped;
-#endif
-
 out float oe_clamp_alpha;
 
-uniform bool oe_isGeocentric;
 uniform float oe_clamp_altitudeOffset;
 uniform float oe_clamp_horizonDistance2;
 
-
 void oe_clamp_clampViewSpaceVertex(inout vec4 vertexView)
 {
 #ifdef OE_CLAMP_HAS_ATTRIBUTES
@@ -46,7 +38,7 @@
 #endif
 
     // clamp the point and remember it's depth:
-    vec4  clampedPoint;
+    vec4 clampedPoint;
     float depth;
     oe_getClampedViewVertex(pointToClamp, clampedPoint, depth);
 
@@ -82,22 +74,16 @@
 void oe_clamp_vertex(inout vec4 vertexView)
 {
     // check distance; alpha out if its beyone the horizon distance.
-    oe_clamp_alpha = oe_isGeocentric ? 
-        clamp(oe_clamp_horizonDistance2 - (vertexView.z*vertexView.z), 0.0, 1.0) :
-        1.0;
+#ifdef OE_IS_GEOCENTRIC
+    oe_clamp_alpha = clamp(oe_clamp_horizonDistance2 - (vertexView.z*vertexView.z), 0.0, 1.0);
+#else
+    oe_clamp_alpha = 1.0;
+#endif
 
     // if visible, calculate clamping.
     // note: no branch divergence in the vertex shader
     if ( oe_clamp_alpha > 0.0 )
     {
         oe_clamp_clampViewSpaceVertex(vertexView);
-
-#ifdef OE_GPU_LINES
-        oe_GPULines_prevViewClamped = gl_ModelViewMatrix * vec4(oe_GPULines_prev, 1.0);
-        oe_clamp_clampViewSpaceVertex(oe_GPULines_prevViewClamped);
-
-        oe_GPULines_nextViewClamped = gl_ModelViewMatrix * vec4(oe_GPULines_next, 1.0);
-        oe_clamp_clampViewSpaceVertex(oe_GPULines_nextViewClamped);
-#endif
     }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/HeightFieldUtils osgearth-2.10.2+dfsg/src/osgEarth/HeightFieldUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/HeightFieldUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/HeightFieldUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/HeightFieldUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/HeightFieldUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/HeightFieldUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/HeightFieldUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,7 +1,7 @@
 
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,11 +19,7 @@
  */
 
 #include <osgEarth/HeightFieldUtils>
-#include <osgEarth/GeoData>
-#include <osgEarth/Geoid>
 #include <osgEarth/CullingUtils>
-#include <osgEarth/ImageUtils>
-#include <osg/Notify>
 
 using namespace osgEarth;
 
@@ -61,42 +57,132 @@
 HeightFieldUtils::getHeightAtPixel(const osg::HeightField* hf, double c, double r, ElevationInterpolation interpolation)
 {
     float result = 0.0;
-    if (interpolation == INTERP_NEAREST)
+    switch (interpolation)
+    {
+    case INTERP_BILINEAR:
+    {
+        //OE_INFO << "getHeightAtPixel: (" << c << ", " << r << ")" << std::endl;
+        int rowMin = osg::maximum((int)floor(r), 0);
+        int rowMax = osg::maximum(osg::minimum((int)ceil(r), (int)(hf->getNumRows() - 1)), 0);
+        int colMin = osg::maximum((int)floor(c), 0);
+        int colMax = osg::maximum(osg::minimum((int)ceil(c), (int)(hf->getNumColumns() - 1)), 0);
+
+        if (rowMin > rowMax) rowMin = rowMax;
+        if (colMin > colMax) colMin = colMax;
+
+        float urHeight = hf->getHeight(colMax, rowMax);
+        float llHeight = hf->getHeight(colMin, rowMin);
+        float ulHeight = hf->getHeight(colMin, rowMax);
+        float lrHeight = hf->getHeight(colMax, rowMin);
+
+        //Make sure not to use NoData in the interpolation
+        if (!validateSamples(urHeight, llHeight, ulHeight, lrHeight))
+        {
+            return NO_DATA_VALUE;
+        }
+
+        //OE_INFO << "Heights (ll, lr, ul, ur) ( " << llHeight << ", " << urHeight << ", " << ulHeight << ", " << urHeight << std::endl;
+
+        //Check for exact value
+        if ((colMax == colMin) && (rowMax == rowMin))
+        {
+            //OE_NOTICE << "Exact value" << std::endl;
+            result = hf->getHeight((int)c, (int)r);
+        }
+        else if (colMax == colMin)
+        {
+            //OE_NOTICE << "Vertically" << std::endl;
+            //Linear interpolate vertically
+            result = ((double)rowMax - r) * llHeight + (r - (double)rowMin) * ulHeight;
+        }
+        else if (rowMax == rowMin)
+        {
+            //OE_NOTICE << "Horizontally" << std::endl;
+            //Linear interpolate horizontally
+            result = ((double)colMax - c) * llHeight + (c - (double)colMin) * lrHeight;
+        }
+        else
+        {
+            //OE_NOTICE << "Bilinear" << std::endl;
+            //Bilinear interpolate
+            double r1 = ((double)colMax - c) * (double)llHeight + (c - (double)colMin) * (double)lrHeight;
+            double r2 = ((double)colMax - c) * (double)ulHeight + (c - (double)colMin) * (double)urHeight;
+            result = ((double)rowMax - r) * (double)r1 + (r - (double)rowMin) * (double)r2;
+        }
+        break;
+    }
+    case INTERP_AVERAGE:
+    {
+        //OE_INFO << "getHeightAtPixel: (" << c << ", " << r << ")" << std::endl;
+        int rowMin = osg::maximum((int)floor(r), 0);
+        int rowMax = osg::maximum(osg::minimum((int)ceil(r), (int)(hf->getNumRows() - 1)), 0);
+        int colMin = osg::maximum((int)floor(c), 0);
+        int colMax = osg::maximum(osg::minimum((int)ceil(c), (int)(hf->getNumColumns() - 1)), 0);
+
+        if (rowMin > rowMax) rowMin = rowMax;
+        if (colMin > colMax) colMin = colMax;
+
+        float urHeight = hf->getHeight(colMax, rowMax);
+        float llHeight = hf->getHeight(colMin, rowMin);
+        float ulHeight = hf->getHeight(colMin, rowMax);
+        float lrHeight = hf->getHeight(colMax, rowMin);
+
+        //Make sure not to use NoData in the interpolation
+        if (!validateSamples(urHeight, llHeight, ulHeight, lrHeight))
+        {
+            return NO_DATA_VALUE;
+        }
+
+        //OE_INFO << "Heights (ll, lr, ul, ur) ( " << llHeight << ", " << urHeight << ", " << ulHeight << ", " << urHeight << std::endl;
+
+        double x_rem = c - (int)c;
+        double y_rem = r - (int)r;
+
+        double w00 = (1.0 - y_rem) * (1.0 - x_rem) * (double)llHeight;
+        double w01 = (1.0 - y_rem) * x_rem * (double)lrHeight;
+        double w10 = y_rem * (1.0 - x_rem) * (double)ulHeight;
+        double w11 = y_rem * x_rem * (double)urHeight;
+
+        result = (float)(w00 + w01 + w10 + w11);
+        break;
+    }
+    case INTERP_NEAREST:
     {
         //Nearest interpolation
         result = hf->getHeight((unsigned int)osg::round(c), (unsigned int)osg::round(r));
+        break;
     }
-    else if (interpolation == INTERP_TRIANGULATE)
+    case INTERP_TRIANGULATE:
     {
         //Interpolation to make sure that the interpolated point follows the triangles generated by the 4 parent points
         int rowMin = osg::maximum((int)floor(r), 0);
-        int rowMax = osg::maximum(osg::minimum((int)ceil(r), (int)(hf->getNumRows()-1)), 0);
+        int rowMax = osg::maximum(osg::minimum((int)ceil(r), (int)(hf->getNumRows() - 1)), 0);
         int colMin = osg::maximum((int)floor(c), 0);
-        int colMax = osg::maximum(osg::minimum((int)ceil(c), (int)(hf->getNumColumns()-1)), 0);
+        int colMax = osg::maximum(osg::minimum((int)ceil(c), (int)(hf->getNumColumns() - 1)), 0);
 
         if (rowMin == rowMax)
         {
-            if (rowMin < (int)hf->getNumRows()-1)
+            if (rowMin < (int)hf->getNumRows() - 1)
             {
                 rowMax = rowMin + 1;
             }
-            else if ( rowMax > 0 )
+            else if (rowMax > 0)
             {
                 rowMin = rowMax - 1;
             }
-         }
+        }
 
-         if (colMin == colMax)
-         {
-            if (colMin < (int)hf->getNumColumns()-1)
+        if (colMin == colMax)
+        {
+            if (colMin < (int)hf->getNumColumns() - 1)
             {
                 colMax = colMin + 1;
             }
-            else if ( colMax > 0 )
+            else if (colMax > 0)
             {
-               colMin = colMax - 1;
+                colMin = colMax - 1;
             }
-         }
+        }
 
         if (rowMin > rowMax) rowMin = rowMax;
         if (colMin > colMax) colMin = colMax;
@@ -141,73 +227,9 @@
         //Compute the normal
         osg::Vec3d n = (v1 - v0) ^ (v2 - v0);
 
-        result = ( n.x() * ( c - v0.x() ) + n.y() * ( r - v0.y() ) ) / -n.z() + v0.z();
+        result = (n.x() * (c - v0.x()) + n.y() * (r - v0.y())) / -n.z() + v0.z();
+        break;
     }
-    else
-    {
-        //OE_INFO << "getHeightAtPixel: (" << c << ", " << r << ")" << std::endl;
-        int rowMin = osg::maximum((int)floor(r), 0);
-        int rowMax = osg::maximum(osg::minimum((int)ceil(r), (int)(hf->getNumRows()-1)), 0);
-        int colMin = osg::maximum((int)floor(c), 0);
-        int colMax = osg::maximum(osg::minimum((int)ceil(c), (int)(hf->getNumColumns()-1)), 0);
-
-        if (rowMin > rowMax) rowMin = rowMax;
-        if (colMin > colMax) colMin = colMax;
-
-        float urHeight = hf->getHeight(colMax, rowMax);
-        float llHeight = hf->getHeight(colMin, rowMin);
-        float ulHeight = hf->getHeight(colMin, rowMax);
-        float lrHeight = hf->getHeight(colMax, rowMin);
-
-        //Make sure not to use NoData in the interpolation
-        if (!validateSamples(urHeight, llHeight, ulHeight, lrHeight))
-        {
-            return NO_DATA_VALUE;
-        }
-
-        //OE_INFO << "Heights (ll, lr, ul, ur) ( " << llHeight << ", " << urHeight << ", " << ulHeight << ", " << urHeight << std::endl;
-
-        if (interpolation == INTERP_BILINEAR)
-        {
-            //Check for exact value
-            if ((colMax == colMin) && (rowMax == rowMin))
-            {
-                //OE_NOTICE << "Exact value" << std::endl;
-                result = hf->getHeight((int)c, (int)r);
-            }
-            else if (colMax == colMin)
-            {
-                //OE_NOTICE << "Vertically" << std::endl;
-                //Linear interpolate vertically
-                result = ((double)rowMax - r) * llHeight + (r - (double)rowMin) * ulHeight;
-            }
-            else if (rowMax == rowMin)
-            {
-                //OE_NOTICE << "Horizontally" << std::endl;
-                //Linear interpolate horizontally
-                result = ((double)colMax - c) * llHeight + (c - (double)colMin) * lrHeight;
-            }
-            else
-            {
-                //OE_NOTICE << "Bilinear" << std::endl;
-                //Bilinear interpolate
-                double r1 = ((double)colMax - c) * (double)llHeight + (c - (double)colMin) * (double)lrHeight;
-                double r2 = ((double)colMax - c) * (double)ulHeight + (c - (double)colMin) * (double)urHeight;
-                result = ((double)rowMax - r) * (double)r1 + (r - (double)rowMin) * (double)r2;
-            }
-        }
-        else if (interpolation == INTERP_AVERAGE)
-        {
-            double x_rem = c - (int)c;
-            double y_rem = r - (int)r;
-
-            double w00 = (1.0 - y_rem) * (1.0 - x_rem) * (double)llHeight;
-            double w01 = (1.0 - y_rem) * x_rem * (double)lrHeight;
-            double w10 = y_rem * (1.0 - x_rem) * (double)ulHeight;
-            double w11 = y_rem * x_rem * (double)urHeight;
-
-            result = (float)(w00 + w01 + w10 + w11);
-        }
     }
 
     return result;
@@ -364,38 +386,6 @@
     return false;
 }
 
-#if 0
-bool
-HeightFieldUtils::getNormalAtNormalizedLocation(const osg::HeightField* input,
-                                                double nx, double ny,
-                                                osg::Vec3& output,
-                                                ElevationInterpolation interp)
-{
-    double xcells = (double)(input->getNumColumns()-1);
-    double ycells = (double)(input->getNumRows()-1);
-
-    double w = input->getXInterval() * xcells * 111000.0;
-    double h = input->getYInterval() * ycells * 111000.0;
-
-    double ndx = 1.0/xcells;
-    double ndy = 1.0/ycells;
-
-    double xmin = osg::clampAbove( nx-ndx, 0.0 );
-    double xmax = osg::clampBelow( nx+ndx, 1.0 );
-    double ymin = osg::clampAbove( ny-ndy, 0.0 );
-    double ymax = osg::clampBelow( ny+ndy, 1.0 );
-
-    osg::Vec3 west (xmin*w, ny*h, getHeightAtNormalizedLocation(input, xmin, ny, interp));
-    osg::Vec3 east (xmax*w, ny*h, getHeightAtNormalizedLocation(input, xmax, ny, interp));
-    osg::Vec3 south(nx*w, ymin*h, getHeightAtNormalizedLocation(input, nx, ymin, interp));
-    osg::Vec3 north(nx*w, ymax*h, getHeightAtNormalizedLocation(input, nx, ymax, interp));
-
-    output = (west-east) ^ (north-south);
-    output.normalize();
-    return true;
-}
-#endif
-
 void
 HeightFieldUtils::scaleHeightFieldToDegrees( osg::HeightField* hf )
 {
@@ -808,10 +798,10 @@
             osg::Vec3f south( 0, t > 0 ? -dy : 0, h );
             osg::Vec3f north( 0, t < tMax ? dy : 0, h );
 
-            west.z() = readElevation(std::max(0, s - 1), t).r();
-            east.z() = readElevation(std::min(sMax, s + 1), t).r();
-            south.z() = readElevation(s, std::max(0, t - 1)).r();
-            north.z() = readElevation(s, std::min(tMax, t + 1)).r();
+            west.z() = readElevation(osg::maximum(0, s - 1), t).r();
+            east.z() = readElevation(osg::minimum(sMax, s + 1), t).r();
+            south.z() = readElevation(s, osg::maximum(0, t - 1)).r();
+            north.z() = readElevation(s, osg::minimum(tMax, t + 1)).r();
 
             osg::Vec3f n = (east-west) ^ (north-south);
             n.normalize();
@@ -830,72 +820,3 @@
         }
     }
 }
-
-/******************************************************************************************/
-#if 0
-ReplaceInvalidDataOperator::ReplaceInvalidDataOperator():
-_replaceWith(0.0f)
-{
-}
-
-void
-ReplaceInvalidDataOperator::operator ()(osg::HeightField *heightField)
-{
-    if (heightField && _validDataOperator.valid())
-    {
-        for (unsigned int i = 0; i < heightField->getHeightList().size(); ++i)
-        {
-            float elevation = heightField->getHeightList()[i];
-            if (!(*_validDataOperator)(elevation))
-            {
-                heightField->getHeightList()[i] = _replaceWith;
-            }
-        }
-    }
-}
-
-
-/******************************************************************************************/
-FillNoDataOperator::FillNoDataOperator():
-_defaultValue(0.0f)
-{
-}
-
-void
-FillNoDataOperator::operator ()(osg::HeightField *heightField)
-{
-    if (heightField && _validDataOperator.valid())
-    {
-        for( unsigned int row=0; row < heightField->getNumRows(); row++ )
-        {
-            for( unsigned int col=0; col < heightField->getNumColumns(); col++ )
-            {
-                float val = heightField->getHeight(col, row);
-
-                if (!(*_validDataOperator)(val))
-                {
-                    if ( col > 0 )
-                        val = heightField->getHeight(col-1,row);
-                    else if ( col <= heightField->getNumColumns()-1 )
-                        val = heightField->getHeight(col+1,row);
-
-                    if (!(*_validDataOperator)(val))
-                    {
-                        if ( row > 0 )
-                            val = heightField->getHeight(col, row-1);
-                        else if ( row < heightField->getNumRows()-1 )
-                            val = heightField->getHeight(col, row+1);
-                    }
-
-                    if (!(*_validDataOperator)(val))
-                    {
-                        val = _defaultValue;
-                    }
-
-                    heightField->setHeight( col, row, val );
-                }
-            }
-        }
-    }
-}
-#endif
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Horizon osgearth-2.10.2+dfsg/src/osgEarth/Horizon
--- osgearth-2.9.0+dfsg/src/osgEarth/Horizon	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Horizon	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -30,10 +30,6 @@
 #include <osg/ValueObject>
 #include <osg/MatrixTransform>
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,4,0)
-#    define OSGEARTH_HORIZON_SUPPORTS_NODEVISITOR
-#endif
-
 namespace osgEarth
 {
     /**
@@ -79,8 +75,9 @@
 
         /**
          * Sets the eye position to use when testing for occlusion.
+         * Returns true if the value changed; false if it was the same
          */
-        void setEye(const osg::Vec3d& eyeECEF);
+        bool setEye(const osg::Vec3d& eyeECEF);
         
         /**
          * Whether a point is visible over the horizon.
@@ -113,11 +110,21 @@
          * normal pointing at the eye. 
          */
         bool getPlane(osg::Plane& out_plane) const;
+
+        //! Caclulate distance from eye to visible horizon
+        double getDistanceToVisibleHorizon() const;
+
+        /**
+         * Gets the radius of the ellipsoid under the eye
+         */
+        double getRadius() const;
         
     protected:
 
         virtual ~Horizon() { }
 
+        osg::EllipsoidModel _em;
+
         bool       _valid;
         osg::Vec3d _eye;
         osg::Vec3d _eyeUnit;
@@ -199,4 +206,4 @@
 
 }
 
-#endif // OSGEARTH_HORIZON_H
+#endif // OSGEARTH_HORIZON_H
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/HorizonClipPlane osgearth-2.10.2+dfsg/src/osgEarth/HorizonClipPlane
--- osgearth-2.9.0+dfsg/src/osgEarth/HorizonClipPlane	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/HorizonClipPlane	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,97 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#ifndef OSGEARTH_HORIZON_CLIP_PLANE_H
+#define OSGEARTH_HORIZON_CLIP_PLANE_H 1
+
+#include <osgEarth/Common>
+#include <osgEarth/Horizon>
+#include <osgEarth/Containers>
+#include <osg/NodeCallback>
+#include <osg/CoordinateSystemNode>
+#include <osg/Plane>
+
+namespace osgEarth
+{
+    /**
+     * Installs an OpenGL clip plane that will clip graphics
+     * at the geocentric horizon. Usage:
+     *
+     *   HorizonClipPlane* hcp = new HorizonClipPlane();
+     *   hcp->setClipPlaneNumber(0);
+     *   hcp->installShaders(mapNode);
+     *   mapNode->addCullCallback(hcp);
+     *
+     * Then, anywhere under that node that you want to apply clipping:
+     *
+     *   node->getOrCreateStateSet()->setMode(GL_CLIP_DISTANCE0, 1);
+     */
+    class OSGEARTH_EXPORT HorizonClipPlane : public osg::NodeCallback
+    {
+    public:
+        //! Construct a new horizon clip plane with default (WGS84) ellipsoid
+        HorizonClipPlane();
+
+        //! Construct a new horizon clip plane with specific ellipsoid
+        HorizonClipPlane(const osg::EllipsoidModel* em);
+
+        //! Set the GL clip plane to use. Default is zero.
+        void setClipPlaneNumber(unsigned n);
+        unsigned getClipPlaneNumber() const { return _num; }
+
+    public: // osg::NodeCallback
+
+        void operator()(osg::Node* node, osg::NodeVisitor* nv);
+
+    public: // osg::Object
+
+        virtual void resizeGLObjectBuffers(unsigned maxSize);
+        virtual void releaseGLObjects(osg::State* state) const;
+
+    private:
+
+        unsigned _num;
+        osg::EllipsoidModel _ellipsoid;
+
+        struct PerCameraData {
+            osg::ref_ptr<Horizon> horizon;
+            osg::ref_ptr<osg::StateSet> stateSet;
+            osg::ref_ptr<osg::Uniform> uniform;
+        };
+        typedef PerObjectFastMap<osg::Camera*, PerCameraData> DataMap;
+        DataMap data;
+
+        struct ResizeFunctor : public DataMap::Functor {
+            unsigned _s;
+            ResizeFunctor(unsigned s) : _s(s) { }
+            virtual void operator()(PerCameraData& data);
+        };
+        struct ReleaseFunctor : public DataMap::ConstFunctor {
+            osg::State* _state;
+            ReleaseFunctor(osg::State* state) : _state(state) { }
+            virtual void operator()(const PerCameraData& data) const;
+        };
+    };
+
+} // namespace osgEarth
+
+#endif // OSGEARTH_HORIZON_CLIP_PLANE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/HorizonClipPlane.cpp osgearth-2.10.2+dfsg/src/osgEarth/HorizonClipPlane.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/HorizonClipPlane.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/HorizonClipPlane.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,119 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#include <osgEarth/HorizonClipPlane>
+#include <osgEarth/VirtualProgram>
+#include <osgEarth/Shaders>
+#include <osgUtil/CullVisitor>
+
+using namespace osgEarth;
+
+HorizonClipPlane::HorizonClipPlane() :
+_num(0u)
+{
+    //nop
+}
+
+HorizonClipPlane::HorizonClipPlane(const osg::EllipsoidModel* em) :
+_ellipsoid(em ? *em : osg::EllipsoidModel()),
+_num(0u)
+{
+    //nop
+}
+
+void
+HorizonClipPlane::setClipPlaneNumber(unsigned num)
+{
+    _num = num;
+}
+
+void
+HorizonClipPlane::operator()(osg::Node* node, osg::NodeVisitor* nv)
+{
+    osgUtil::CullVisitor* cv = static_cast<osgUtil::CullVisitor*>(nv);
+    PerCameraData& d = data.get(cv->getCurrentCamera());
+
+    if (!d.horizon.valid())
+    {
+        d.horizon = new Horizon(_ellipsoid);
+        d.stateSet = new osg::StateSet();
+        d.uniform = new osg::Uniform("oe_ClipPlane_plane", osg::Vec4f());
+        d.stateSet->addUniform(d.uniform.get());
+
+        VirtualProgram* vp = VirtualProgram::getOrCreate(d.stateSet.get());
+        vp->setName("HorizonClipPlane");
+        Shaders shaders;
+        shaders.load(vp, shaders.ClipPlane);
+        d.stateSet->setDefine("OE_CLIPPLANE_NUM", Stringify() << getClipPlaneNumber());
+    }
+
+    // push this horizon on to the nodevisitor so modules can access it
+    d.horizon->put(*nv);
+
+    // update with current eyepoint
+    if (d.horizon->setEye(nv->getViewPoint()))
+    {
+        // compute the horizon plane and update the clipping uniform
+        osg::Plane horizonPlane;
+        d.horizon->getPlane(horizonPlane);
+        d.uniform->set(osg::Vec4f(horizonPlane.asVec4()));
+    }
+    
+    cv->pushStateSet(d.stateSet.get());
+    traverse(node, nv);
+    cv->popStateSet();
+}
+
+void
+HorizonClipPlane::ResizeFunctor::operator()(HorizonClipPlane::PerCameraData& data)
+{
+    if (data.horizon.valid())
+        data.horizon->resizeGLObjectBuffers(_s);
+    if (data.stateSet.valid())
+        data.stateSet->resizeGLObjectBuffers(_s);
+    if (data.uniform.valid())
+        data.uniform->resizeGLObjectBuffers(_s);
+}
+
+void
+HorizonClipPlane::resizeGLObjectBuffers(unsigned maxSize)
+{
+    ResizeFunctor f(maxSize);
+    data.forEach(f);
+}
+
+void
+HorizonClipPlane::ReleaseFunctor::operator()(const HorizonClipPlane::PerCameraData& data) const
+{
+    if (data.horizon.valid())
+        data.horizon->releaseGLObjects(_state);
+    if (data.stateSet.valid())
+        data.stateSet->releaseGLObjects(_state);
+    if (data.uniform.valid())
+        data.uniform->releaseGLObjects(_state);
+}
+
+void
+HorizonClipPlane::releaseGLObjects(osg::State* state) const
+{
+    ReleaseFunctor f(state);
+    data.forEach(f);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Horizon.cpp osgearth-2.10.2+dfsg/src/osgEarth/Horizon.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Horizon.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Horizon.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
  */
 #include <osgEarth/Horizon>
 #include <osgUtil/CullVisitor>
-#include <osg/Transform>
 #include <osgEarth/Registry>
-#include <osg/ValueObject>
 #include <osg/Geometry>
 #include <osg/Geode>
 
@@ -93,6 +91,9 @@
 void
 Horizon::setEllipsoid(const osg::EllipsoidModel& e)
 {
+    _em.setRadiusEquator(e.getRadiusEquator());
+    _em.setRadiusPolar(e.getRadiusPolar());
+
     _scaleInv.set(
         e.getRadiusEquator(),
         e.getRadiusEquator(),
@@ -119,26 +120,34 @@
     _minVCmag = 1.0 + (_scale*_minHAE).length();
 }
 
-void
+bool
 Horizon::setEye(const osg::Vec3d& eye)
 {
-    if ( eye != _eye )
-    {
-        _eye = eye;
-        _eyeUnit = eye;
-        _eyeUnit.normalize();
-
-        _VC     = osg::componentMultiply( -_eye, _scale );  // viewer->center (scaled)
-        _VCmag  = std::max( _VC.length(), _minVCmag );      // clamped to the min HAE
-        _VCmag2 = _VCmag*_VCmag;
-        _VHmag2 = _VCmag2 - 1.0;  // viewer->horizon line (scaled)
+    if (eye == _eye)
+        return false;
 
-        double VPmag = _VCmag - 1.0/_VCmag; // viewer->horizon plane dist (scaled)
-        double VHmag = sqrtf( _VHmag2 );
+    _eye = eye;
+    _eyeUnit = eye;
+    _eyeUnit.normalize();
+
+    _VC     = osg::componentMultiply( -_eye, _scale );  // viewer->center (scaled)
+    _VCmag  = osg::maximum( _VC.length(), _minVCmag );      // clamped to the min HAE
+    _VCmag2 = _VCmag*_VCmag;
+    _VHmag2 = _VCmag2 - 1.0;  // viewer->horizon line (scaled)
 
-        _coneCos = VPmag / VHmag; // cos of half-angle of horizon cone
-        _coneTan = tan(acos(_coneCos));
-    }
+    double VPmag = _VCmag - 1.0/_VCmag; // viewer->horizon plane dist (scaled)
+    double VHmag = sqrtf( _VHmag2 );
+
+    _coneCos = VPmag / VHmag; // cos of half-angle of horizon cone
+    _coneTan = tan(acos(_coneCos));
+
+    return true;
+}
+
+double
+Horizon::getRadius() const
+{
+    return osg::componentMultiply(_eyeUnit, _scaleInv).length();
 }
 
 bool
@@ -250,7 +259,7 @@
     // (since the above test failed) the target is occluded.
     // NOTE: it might be better instead to check for a maximum distance from
     // the eyepoint instead.
-    double VCmag = std::max( VC.length(), _minVCmag );      // clamped to the min HAE
+    double VCmag = osg::maximum( VC.length(), _minVCmag );      // clamped to the min HAE
     if ( VCmag < 0.0 )
     {
         return false;
@@ -324,6 +333,22 @@
     return true;
 }
 
+double
+Horizon::getDistanceToVisibleHorizon() const
+{
+    double eyeLen = _eye.length();
+
+    osg::Vec3d geodetic;
+    double lat, lon, hasl;
+    _em.convertXYZToLatLongHeight(_eye.x(), _eye.y(), _eye.z(), lat, lon, hasl);
+
+    // limit it:
+    hasl = osg::maximum(hasl, 100.0);
+
+    double radius = eyeLen - hasl;
+    return sqrt(2.0*radius*hasl + hasl*hasl);
+}
+
 //........................................................................
 
 
@@ -358,26 +383,6 @@
         return horizon->isVisible( bs.center()*local2world, radius );
     }
 
-    // If we are cloning the horizon from a prototype...
-    else if ( _horizonProto.valid() )
-    {
-        // make a local copy to support multi-threaded cull
-        local2world  = osg::computeLocalToWorld(np);
-        osg::Vec3d eye = osg::Vec3d(nv->getViewPoint()) * local2world;
-
-        // pop the last node in the path (which is the node this callback is on)
-        // to prevent double-transforming the bounding sphere's center point
-        np.pop_back();
-        local2world = osg::computeLocalToWorld(np);
-
-        osg::ref_ptr<Horizon> horizonCopy = osg::clone(_horizonProto.get(), osg::CopyOp::DEEP_COPY_ALL);
-        horizonCopy->setEye( eye );
-
-        const osg::BoundingSphere& bs = node->getBound();
-        double radius = _centerOnly ? 0.0 : bs.radius();
-        return horizonCopy->isVisible( bs.center()*local2world, radius );
-    }
-
     // If the user forgot to install a horizon at all...
     else
     {
@@ -439,13 +444,12 @@
         verts->push_back(osg::Vec3( 0.5f, -0.5f + float(y)/r, 0.0f));
     }
 
-    osg::Vec4Array* colors = new osg::Vec4Array();
+    osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_OVERALL);
     colors->push_back(osg::Vec4(1,0,0,0.5f));
 
     osg::Geometry* geom = new osg::Geometry();
     geom->setVertexArray(verts);
     geom->setColorArray(colors);
-    geom->setColorBinding(geom->BIND_OVERALL);
     geom->addPrimitiveSet(new osg::DrawArrays(GL_LINES, 0, verts->size()));
     
     geom->addPrimitiveSet(de);
@@ -463,11 +467,11 @@
 void
 HorizonNode::traverse(osg::NodeVisitor& nv)
 {
-    bool isStealth = (VisitorData::isSet(nv, "osgEarth.Stealth"));
+    bool isSpy = (VisitorData::isSet(nv, "osgEarth.Spy"));
 
     if (nv.getVisitorType() == nv.CULL_VISITOR)
     {
-        if (!isStealth)
+        if (!isSpy)
         {
             //Horizon* h = Horizon::get(nv);
             osg::ref_ptr<Horizon> h = new Horizon();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/HTTPClient osgearth-2.10.2+dfsg/src/osgEarth/HTTPClient
--- osgearth-2.9.0+dfsg/src/osgEarth/HTTPClient	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/HTTPClient	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -70,7 +70,11 @@
         std::string _userName;
         std::string _password;
     };
+}
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::ProxySettings);
 
+namespace osgEarth
+{
     typedef std::map<std::string,std::string> Headers;
 
 
@@ -99,12 +103,15 @@
         /** Ready-only access to the parameter list (as built with addParameter) */
         const Parameters& getParameters() const;        
 
-        //! Add a head name/value pair to an HTTP request
+        //! Add a header name/value pair to an HTTP request
         void addHeader( const std::string& name, const std::string& value );
 
         //! Collection of headers in this request
         const Headers& getHeaders() const;
 
+        //! Collection of headers in this request
+        Headers& getHeaders();
+
         /**
          * Sets the last modified date of any locally cached data for this request.  This will 
          * automatically add a If-Modified-Since header to the request
@@ -134,7 +141,15 @@
             BAD_REQUEST  = 400,
             NOT_FOUND    = 404,
             CONFLICT     = 409,
-            SERVER_ERROR = 500
+            INTERNAL_SERVER_ERROR = 500
+        };
+        enum CodeCategory {
+            CATEGORY_UNKNOWN   = 0,
+            CATEGORY_INFORMATIONAL = 100,
+            CATEGORY_SUCCESS       = 200,
+            CATEGORY_REDIRECTION   = 300,
+            CATEGORY_CLIENT_ERROR  = 400,
+            CATEGORY_SERVER_ERROR  = 500
         };
 
     public:
@@ -150,6 +165,9 @@
         /** Gets the HTTP response code (Code) in this response */
         unsigned getCode() const;
 
+        /** Gets the HTTP response code category for this response */
+        unsigned getCodeCategory() const;
+
         /** True is the HTTP response code is OK (200) */
         bool isOK() const;
 
@@ -175,14 +193,14 @@
         const std::string& getMimeType() const;
 
         /** How long did it take to fetch this response (in seconds) */
-        double getDuration() const { return _duration_s; }     
+        double getDuration() const { return _duration_s; }
 
         const std::string& getMessage() const { return _message; }
 
     private:
         struct Part : public osg::Referenced
         {
-            Part() : _size(0) { }            
+            Part() : _size(0) { }
             Headers _headers;
             unsigned int _size;
             std::stringstream _stream;
@@ -233,9 +251,10 @@
          * Returns true is the result code represents a recoverable situation,
          * i.e. one in which retrying might work.
          */
-        static bool isRecoverable( ReadResult::Code code )
+        static bool isRecoverable(ReadResult::Code code)
         {
             return
+                code == ReadResult::RESULT_UNKNOWN_ERROR ||
                 code == ReadResult::RESULT_OK ||                
                 code == ReadResult::RESULT_SERVER_ERROR ||
                 code == ReadResult::RESULT_TIMEOUT ||
@@ -252,7 +271,11 @@
 
         /** Sets up proxy info to use in all HTTP requests.
             TODO: This should probably move into the Registry */
-        static void setProxySettings( const ProxySettings &proxySettings );
+		static void setProxySettings( const optional<ProxySettings> &proxySettings );
+
+        /** Gets up proxy info to use in all HTTP requests.
+            TODO: This should probably move into the Registry */
+        static const optional<ProxySettings> & getProxySettings();
 
         /**
            Gets the timeout in seconds to use for HTTP requests.*/
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/HTTPClient.cpp osgearth-2.10.2+dfsg/src/osgEarth/HTTPClient.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/HTTPClient.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/HTTPClient.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,22 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/HTTPClient>
-#include <osgEarth/Registry>
-#include <osgEarth/Version>
 #include <osgEarth/Progress>
-#include <osgEarth/StringUtils>
 #include <osgEarth/Metrics>
 #include <osgDB/ReadFile>
-#include <osgDB/Registry>
 #include <osgDB/FileNameUtils>
-#include <osg/Notify>
-#include <osg/Timer>
-#include <string.h>
-#include <sstream>
-#include <fstream>
-#include <iterator>
-#include <iostream>
-#include <algorithm>
 #include <curl/curl.h>
 
 // Whether to use WinInet instead of cURL - CMAKE option
@@ -240,6 +228,12 @@
     return _headers;
 }
 
+Headers&
+HTTPRequest::getHeaders()
+{
+    return _headers;
+}
+
 void HTTPRequest::setLastModified( const DateTime &lastModified)
 {
     addHeader("If-Modified-Since", lastModified.asRFC1123());
@@ -295,6 +289,18 @@
     return _response_code;
 }
 
+unsigned
+HTTPResponse::getCodeCategory() const 
+{
+    return
+        getCode() < 100 ? CATEGORY_UNKNOWN :
+        getCode() < 200 ? CATEGORY_INFORMATIONAL :
+        getCode() < 300 ? CATEGORY_SUCCESS :
+        getCode() < 400 ? CATEGORY_REDIRECTION :
+        getCode() < 500 ? CATEGORY_CLIENT_ERROR :
+                          CATEGORY_SERVER_ERROR;
+}
+
 bool
 HTTPResponse::isOK() const {
     return _response_code == 200L && !isCancelled();
@@ -328,7 +334,8 @@
 std::string
 HTTPResponse::getPartAsString( unsigned int n ) const {
     std::string streamStr;
-    streamStr = _parts[n]->_stream.str();
+    if (n < _parts.size())
+        streamStr = _parts[n]->_stream.str();
     return streamStr;
 }
 
@@ -492,11 +499,17 @@
 }
 
 void
-HTTPClient::setProxySettings( const ProxySettings& proxySettings )
+HTTPClient::setProxySettings( const optional<ProxySettings> & proxySettings )
 {
     s_proxySettings = proxySettings;
 }
 
+const optional<ProxySettings> & 
+HTTPClient::getProxySettings()
+{
+    return s_proxySettings;
+}
+
 const std::string& HTTPClient::getUserAgent()
 {
     return s_userAgent;
@@ -1281,6 +1294,13 @@
             << url << "\" (" << DateTime(filetime).asRFC1123() << ") t="
             << std::setprecision(4) << response.getDuration() << "s" << std::endl;
 
+        for(HTTPRequest::Parameters::const_iterator itr = request.getHeaders().begin();
+            itr != request.getHeaders().end(); 
+            ++itr)
+        {
+            OE_NOTICE << LC << "    Header: " << itr->first << " = " << itr->second << std::endl;
+        }
+
         {
             Threading::ScopedMutexLock lock(s_HTTP_DEBUG_mutex);
             s_HTTP_DEBUG_request_count++;
@@ -1347,6 +1367,9 @@
 
     if ( response.isOK() )
     {
+        if (response.getNumParts() < 1)
+            return false;
+
         unsigned int part_num = response.getNumParts() > 1? 1 : 0;
         std::istream& input_stream = response.getPartStream( part_num );
 
@@ -1402,7 +1425,7 @@
                 << ext << "; mime-type=" << response.getMimeType()
                 << ")" << std::endl;
 
-            if ( endsWith(response.getMimeType(), "xml", false) )
+            if ( endsWith(response.getMimeType(), "xml", false) && response.getNumParts() > 0 )
             {
                 OE_WARN << LC << "Content:\n" << response.getPartAsString(0) << "\n";
             }
@@ -1433,7 +1456,11 @@
 
         else
         {
-            osgDB::ReaderWriter::ReadResult rr = reader->readImage(response.getPartStream(0), options);
+            osgDB::ReaderWriter::ReadResult rr;
+
+            if (response.getNumParts() > 0)
+                rr = reader->readImage(response.getPartStream(0), options);
+
             if ( rr.validImage() )
             {
                 result = ReadResult(rr.takeImage());
@@ -1461,25 +1488,30 @@
     else
     {
         result = ReadResult(
-            response.isCancelled()                           ? ReadResult::RESULT_CANCELED :
-            response.getCode() == HTTPResponse::NOT_FOUND    ? ReadResult::RESULT_NOT_FOUND :
-            response.getCode() == HTTPResponse::SERVER_ERROR ? ReadResult::RESULT_SERVER_ERROR :
+            response.isCancelled() ? ReadResult::RESULT_CANCELED :
+            response.getCode() == HTTPResponse::NOT_FOUND ? ReadResult::RESULT_NOT_FOUND :
             response.getCode() == HTTPResponse::NOT_MODIFIED ? ReadResult::RESULT_NOT_MODIFIED :
-                                                               ReadResult::RESULT_UNKNOWN_ERROR );
+            response.getCodeCategory() == HTTPResponse::CATEGORY_SERVER_ERROR ? ReadResult::RESULT_SERVER_ERROR :
+            ReadResult::RESULT_UNKNOWN_ERROR);
 
         //If we have an error but it's recoverable, like a server error or timeout then set the callback to retry.
         if (HTTPClient::isRecoverable( result.code() ) )
         {
             if (callback)
             {
+                callback->cancel();
+
                 if ( s_HTTP_DEBUG )
                 {
                     if (response.isCancelled())
+                    {
                         OE_NOTICE << LC << "Request was cancelled" << std::endl;
+                    }
                     else
-                        OE_NOTICE << LC << "Error in HTTPClient for " << request.getURL() << " but it's recoverable" << std::endl;
+                    {
+                        OE_NOTICE << LC << "Recoverable error in HTTPClient for " << request.getURL() << std::endl;
+                    }
                 }
-                callback->setNeedsRetry( true );
             }
         }
     }
@@ -1515,7 +1547,11 @@
 
         else
         {
-            osgDB::ReaderWriter::ReadResult rr = reader->readNode(response.getPartStream(0), options);
+            osgDB::ReaderWriter::ReadResult rr;
+            
+            if (response.getNumParts() > 0)
+                rr = reader->readNode(response.getPartStream(0), options);
+
             if ( rr.validNode() )
             {
                 result = ReadResult(rr.takeNode());
@@ -1540,25 +1576,30 @@
     else
     {
         result = ReadResult(
-            response.isCancelled()                           ? ReadResult::RESULT_CANCELED :
-            response.getCode() == HTTPResponse::NOT_FOUND    ? ReadResult::RESULT_NOT_FOUND :
-            response.getCode() == HTTPResponse::SERVER_ERROR ? ReadResult::RESULT_SERVER_ERROR :
+            response.isCancelled() ? ReadResult::RESULT_CANCELED :
+            response.getCode() == HTTPResponse::NOT_FOUND ? ReadResult::RESULT_NOT_FOUND :
             response.getCode() == HTTPResponse::NOT_MODIFIED ? ReadResult::RESULT_NOT_MODIFIED :
-                                                               ReadResult::RESULT_UNKNOWN_ERROR );
+            response.getCodeCategory() == HTTPResponse::CATEGORY_SERVER_ERROR ? ReadResult::RESULT_SERVER_ERROR :
+            ReadResult::RESULT_UNKNOWN_ERROR);
 
         //If we have an error but it's recoverable, like a server error or timeout then set the callback to retry.
         if (HTTPClient::isRecoverable( result.code() ) )
         {
             if (callback)
             {
+                callback->cancel();
+
                 if ( s_HTTP_DEBUG )
                 {
                     if (response.isCancelled())
+                    {
                         OE_NOTICE << LC << "Request was cancelled" << std::endl;
+                    }
                     else
-                        OE_NOTICE << LC << "Error in HTTPClient for " << request.getURL() << " but it's recoverable" << std::endl;
+                    {
+                        OE_NOTICE << LC << "Recoverable error in HTTPClient for " << request.getURL() << std::endl;
+                    }
                 }
-                callback->setNeedsRetry( true );
             }
         }
     }
@@ -1590,7 +1631,11 @@
 
         else
         {
-            osgDB::ReaderWriter::ReadResult rr = reader->readObject(response.getPartStream(0), options);
+            osgDB::ReaderWriter::ReadResult rr;
+            
+            if (response.getNumParts() > 0 )
+                rr = reader->readObject(response.getPartStream(0), options);
+
             if ( rr.validObject() )
             {
                 result = ReadResult(rr.takeObject());
@@ -1617,23 +1662,28 @@
         result = ReadResult(
             response.isCancelled() ? ReadResult::RESULT_CANCELED :
             response.getCode() == HTTPResponse::NOT_FOUND ? ReadResult::RESULT_NOT_FOUND :
-            response.getCode() == HTTPResponse::SERVER_ERROR ? ReadResult::RESULT_SERVER_ERROR :
             response.getCode() == HTTPResponse::NOT_MODIFIED ? ReadResult::RESULT_NOT_MODIFIED :
-            ReadResult::RESULT_UNKNOWN_ERROR );
+            response.getCodeCategory() == HTTPResponse::CATEGORY_SERVER_ERROR ? ReadResult::RESULT_SERVER_ERROR :
+            ReadResult::RESULT_UNKNOWN_ERROR);
 
         //If we have an error but it's recoverable, like a server error or timeout then set the callback to retry.
         if (HTTPClient::isRecoverable( result.code() ) )
         {
             if (callback)
             {
+                callback->cancel();
+
                 if ( s_HTTP_DEBUG )
                 {
                     if (response.isCancelled())
+                    {
                         OE_NOTICE << LC << "Request was cancelled" << std::endl;
+                    }
                     else
-                        OE_NOTICE << LC << "Error in HTTPClient for " << request.getURL() << " but it's recoverable" << std::endl;
+                    {
+                        OE_NOTICE << LC << "Recoverable error in HTTPClient for " << request.getURL() << std::endl;
+                    }
                 }
-                callback->setNeedsRetry( true );
             }
         }
     }
@@ -1654,42 +1704,44 @@
     ReadResult result;
 
     HTTPResponse response = this->doGet( request, options, callback );
-    if ( response.isOK() )
+    if ( response.isOK() && response.getNumParts() > 0 )
     {
         result = ReadResult( new StringObject(response.getPartAsString(0)) );
     }
-
-    else if ( response.getCode() >= 400 && response.getCode() < 500 && response.getCode() != 404 )
-    {
-        // for request errors, return an error result with the part data intact
-        // so the user can parse it as needed. We only do this for readString.
-        result = ReadResult(
-            ReadResult::RESULT_SERVER_ERROR,
-            new StringObject(response.getPartAsString(0)) );
-    }
-
     else
     {
         result = ReadResult(
-            response.isCancelled() ?                           ReadResult::RESULT_CANCELED :
-            response.getCode() == HTTPResponse::NOT_FOUND    ? ReadResult::RESULT_NOT_FOUND :
-            response.getCode() == HTTPResponse::SERVER_ERROR ? ReadResult::RESULT_SERVER_ERROR :
+            response.isCancelled() ? ReadResult::RESULT_CANCELED :
+            response.getCode() == HTTPResponse::NOT_FOUND ? ReadResult::RESULT_NOT_FOUND :
             response.getCode() == HTTPResponse::NOT_MODIFIED ? ReadResult::RESULT_NOT_MODIFIED :
-                                                               ReadResult::RESULT_UNKNOWN_ERROR );
+            response.getCodeCategory() == HTTPResponse::CATEGORY_SERVER_ERROR ? ReadResult::RESULT_SERVER_ERROR :
+            ReadResult::RESULT_UNKNOWN_ERROR);
+        
+        // for request errors, return an error result with the part data intact
+        // so the user can parse it as needed. We only do this for readString.
+        if (response.getNumParts() > 0u)
+        {
+            result.setErrorDetail(response.getPartAsString(0));
+        }
 
         //If we have an error but it's recoverable, like a server error or timeout then set the callback to retry.
         if (HTTPClient::isRecoverable( result.code() ) )
         {
             if (callback)
             {
+                callback->cancel();
+
                 if ( s_HTTP_DEBUG )
                 {
                     if (response.isCancelled())
-                        OE_NOTICE << LC << "Request was cancelled" << std::endl;
+                    {
+                        OE_NOTICE << LC << "HTTP request was cancelled" << std::endl;
+                    }
                     else
-                        OE_NOTICE << LC << "Error in HTTPClient for " << request.getURL() << " but it's recoverable" << std::endl;
+                    {
+                        OE_NOTICE << LC << "Recoverable error in HTTPClient for " << request.getURL() << std::endl;
+                    }
                 }
-                callback->setNeedsRetry( true );
             }
         }
     }
@@ -1698,7 +1750,7 @@
     result.setMetadata( response.getHeadersAsConfig() );
 
     // last-modified (file time)
-    result.setLastModifiedTime( response._lastModified ); //getCurlFileTime(_curl_handle) );
+    result.setLastModifiedTime( response._lastModified );
 
     return result;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ImageLayer osgearth-2.10.2+dfsg/src/osgEarth/ImageLayer
--- osgearth-2.9.0+dfsg/src/osgEarth/ImageLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ImageLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -54,18 +54,6 @@
 
 
     public: // properties
-        
-        /**
-         * The initial minimum camera range at which this layer is visible.
-         */
-        optional<float>& minVisibleRange() { return _minRange; }
-        const optional<float>& minVisibleRange() const { return _minRange; }
-
-        /**
-         * The initial maximum camera range at which this layer is visible.
-         */
-        optional<float>& maxVisibleRange() { return _maxRange; }
-        const optional<float>& maxVisibleRange() const { return _maxRange; }
 
         /**
          * Gets or sets the nodata image for this MapLayer
@@ -128,6 +116,12 @@
         optional<osg::Texture::InternalFormatMode>& textureCompression() { return _texcomp; }
         const optional<osg::Texture::InternalFormatMode>& textureCompression() const { return _texcomp; }
 
+        /**
+         * Render this layer at the given altitude (default=0) if the engine supports it
+         */
+        optional<Distance>& altitude() { return _altitude; }
+        const optional<Distance>& altitude() const { return _altitude; }
+
         /** For shared layer, name of hte texture sampler uniform. */
         optional<std::string>& shareTexUniformName() { return _shareTexUniformName; }
         const optional<std::string>& shareTexUniformName() const { return _shareTexUniformName; }
@@ -145,9 +139,6 @@
         void fromConfig( const Config& conf );
         void setDefaults();
 
-        //optional<float>       _opacity;
-        optional<float>       _minRange;
-        optional<float>       _maxRange;
         optional<osg::Vec4ub> _transparentColor;
         optional<URI>         _noDataImageFilename;
         ColorFilterChain      _colorFilters;
@@ -157,12 +148,16 @@
         optional<osg::Texture::FilterMode> _minFilter;
         optional<osg::Texture::FilterMode> _magFilter;
         optional<osg::Texture::InternalFormatMode> _texcomp;
+        optional<Distance>    _altitude;
         optional<std::string> _shareTexUniformName;
         optional<std::string> _shareTexMatUniformName;
     };
+}
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::ImageLayerOptions);
 
-    //--------------------------------------------------------------------
 
+namespace osgEarth
+{
     /**
      * Internal utility class for post-processing image tiles that come from 
      * a TileSource
@@ -192,6 +187,7 @@
         //virtual void onOpacityChanged(class ImageLayer* layer) { }
         virtual void onVisibleRangeChanged(class ImageLayer* layer) { }
         virtual void onColorFiltersChanged(class ImageLayer* layer) { }
+        virtual void onAltitudeChanged(class ImageLayer* layer) { }
 
         typedef void (ImageLayerCallback::*MethodPtr)(class ImageLayer* layer);
     };
@@ -203,7 +199,7 @@
     class OSGEARTH_EXPORT ImageLayer : public TerrainLayer
     {
     public:
-        META_Layer(osgEarth, ImageLayer, ImageLayerOptions);
+        META_Layer(osgEarth, ImageLayer, ImageLayerOptions, image);
 
         /**
          * Construct a new ImageLayer. Use the options() to configure it
@@ -250,19 +246,11 @@
          */
         const ColorFilterChain& getColorFilters() const;
 
-    public: // runtime properties
+        //! Sets the altitude
+        void setAltitude(const Distance& value);
+        const Distance& getAltitude() const { return options().altitude().get(); }
 
-        /**
-         * Minimum camera range at which this image layer is visible 
-         */
-        float getMinVisibleRange() const;
-        void setMinVisibleRange( float minVisibleRange );
-        
-        /**
-         * Maximum camera range at which this image layer is visible 
-         */
-        float getMaxVisibleRange() const;
-        void setMaxVisibleRange( float maxVisibleRange );
+    public: // runtime properties
 
         /**
          * Whether this layer is marked for render sharing
@@ -299,9 +287,6 @@
 
     public: // methods
 
-        virtual bool createTextureSupported() const { return false; }
-        virtual osg::Texture* createTexture(const TileKey& key, ProgressCallback* progress, osg::Matrixf& textureMatrix) { return 0L; }
-
         /**
          * Creates a GeoImage from this layer corresponding to the provided key. The
          * image is in the profile of the key and will be reprojected, mosaiced and
@@ -321,6 +306,17 @@
        
         typedef ImageLayerCallback Callback;
 
+
+    public: // Texture support
+            
+        //! Whether to use createTexture to create data for this layer
+        //! instead of createImage and a TileSource driver
+        bool useCreateTexture() const { return _useCreateTexture; }
+
+        //! Override to create the texture when useCreateTexture is true
+        virtual osg::Texture* createTexture(const TileKey& key, ProgressCallback* progress, osg::Matrixf& textureMatrix) { return 0L; }
+
+
     public: // Layer
         
         virtual const Status& open();
@@ -329,6 +325,10 @@
         //! by calling setTileSourceExpected(false).
         virtual GeoImage createImageImplementation(const TileKey&, ProgressCallback* progress);
 
+        //! Modify the bbox if an altitude is set (for culling)
+        virtual void modifyTileBoundingBox(const TileKey& key, osg::BoundingBox& box) const;
+
+
     protected: // Layer
             
         virtual void init();
@@ -341,6 +341,10 @@
         // Constructor for a subclass that owns the layer options structure
         ImageLayer(ImageLayerOptions* optionsPtr);
 
+        //! Configure the layer to create textures via createTexture instead of
+        //! using a createImage driver
+        void setUseCreateTexture();
+
     private:
 
         // Creates an image that's in the same profile as the provided key.
@@ -361,6 +365,7 @@
         optional<int>                            _shareImageUnit;
         optional<std::string>                    _shareTexUniformName;
         optional<std::string>                    _shareTexMatUniformName;
+        bool                                     _useCreateTexture;
 
         virtual void fireCallback(ImageLayerCallback::MethodPtr method);
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ImageLayer.cpp osgearth-2.10.2+dfsg/src/osgEarth/ImageLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ImageLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ImageLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,22 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/ImageLayer>
-#include <osgEarth/ColorFilter>
-#include <osgEarth/TileSource>
 #include <osgEarth/ImageMosaic>
-#include <osgEarth/ImageUtils>
 #include <osgEarth/Registry>
-#include <osgEarth/StringUtils>
 #include <osgEarth/Progress>
-#include <osgEarth/URI>
-#include <osgEarth/MemCache>
-#include <osgEarth/Registry>
 #include <osgEarth/Capabilities>
 #include <osgEarth/Metrics>
-#include <osg/Version>
-#include <osgDB/WriteFile>
-#include <memory.h>
-#include <limits.h>
 
 using namespace osgEarth;
 using namespace OpenThreads;
@@ -81,8 +70,6 @@
 ImageLayerOptions::setDefaults()
 {
     _transparentColor.init( osg::Vec4ub(0,0,0,0) );
-    _minRange.init( 0.0 );
-    _maxRange.init( FLT_MAX );
     _featherPixels.init( false );
     _minFilter.init( osg::Texture::LINEAR_MIPMAP_LINEAR );
     _magFilter.init( osg::Texture::LINEAR );
@@ -101,12 +88,11 @@
 void
 ImageLayerOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet( "nodata_image",   _noDataImageFilename );
-    conf.getIfSet( "min_range",      _minRange );
-    conf.getIfSet( "max_range",      _maxRange );
-    conf.getIfSet( "shared",         _shared );
-    conf.getIfSet( "coverage",       _coverage );
-    conf.getIfSet( "feather_pixels", _featherPixels);
+    conf.get( "nodata_image",   _noDataImageFilename );
+    conf.get( "shared",         _shared );
+    conf.get( "coverage",       _coverage );
+    conf.get( "feather_pixels", _featherPixels);
+    conf.get( "altitude",       _altitude );
 
     if ( conf.hasValue( "transparent_color" ) )
         _transparentColor = stringToColor( conf.value( "transparent_color" ), osg::Vec4ub(0,0,0,0));
@@ -117,41 +103,39 @@
         ColorFilterRegistry::instance()->readChain( conf.child("color_filters"), _colorFilters );
     }
 
-    conf.getIfSet("mag_filter","LINEAR",                _magFilter,osg::Texture::LINEAR);
-    conf.getIfSet("mag_filter","LINEAR_MIPMAP_LINEAR",  _magFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
-    conf.getIfSet("mag_filter","LINEAR_MIPMAP_NEAREST", _magFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
-    conf.getIfSet("mag_filter","NEAREST",               _magFilter,osg::Texture::NEAREST);
-    conf.getIfSet("mag_filter","NEAREST_MIPMAP_LINEAR", _magFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
-    conf.getIfSet("mag_filter","NEAREST_MIPMAP_NEAREST",_magFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
-    conf.getIfSet("min_filter","LINEAR",                _minFilter,osg::Texture::LINEAR);
-    conf.getIfSet("min_filter","LINEAR_MIPMAP_LINEAR",  _minFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
-    conf.getIfSet("min_filter","LINEAR_MIPMAP_NEAREST", _minFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
-    conf.getIfSet("min_filter","NEAREST",               _minFilter,osg::Texture::NEAREST);
-    conf.getIfSet("min_filter","NEAREST_MIPMAP_LINEAR", _minFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
-    conf.getIfSet("min_filter","NEAREST_MIPMAP_NEAREST",_minFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
-
-    conf.getIfSet("texture_compression", "none", _texcomp, osg::Texture::USE_IMAGE_DATA_FORMAT);
-    conf.getIfSet("texture_compression", "auto", _texcomp, (osg::Texture::InternalFormatMode)~0);
-    conf.getIfSet("texture_compression", "fastdxt", _texcomp, (osg::Texture::InternalFormatMode)(~0 - 1));
+    conf.get("mag_filter","LINEAR",                _magFilter,osg::Texture::LINEAR);
+    conf.get("mag_filter","LINEAR_MIPMAP_LINEAR",  _magFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
+    conf.get("mag_filter","LINEAR_MIPMAP_NEAREST", _magFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
+    conf.get("mag_filter","NEAREST",               _magFilter,osg::Texture::NEAREST);
+    conf.get("mag_filter","NEAREST_MIPMAP_LINEAR", _magFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
+    conf.get("mag_filter","NEAREST_MIPMAP_NEAREST",_magFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
+    conf.get("min_filter","LINEAR",                _minFilter,osg::Texture::LINEAR);
+    conf.get("min_filter","LINEAR_MIPMAP_LINEAR",  _minFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
+    conf.get("min_filter","LINEAR_MIPMAP_NEAREST", _minFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
+    conf.get("min_filter","NEAREST",               _minFilter,osg::Texture::NEAREST);
+    conf.get("min_filter","NEAREST_MIPMAP_LINEAR", _minFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
+    conf.get("min_filter","NEAREST_MIPMAP_NEAREST",_minFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
+
+    conf.get("texture_compression", "none", _texcomp, osg::Texture::USE_IMAGE_DATA_FORMAT);
+    conf.get("texture_compression", "auto", _texcomp, (osg::Texture::InternalFormatMode)~0);
+    conf.get("texture_compression", "fastdxt", _texcomp, (osg::Texture::InternalFormatMode)(~0 - 1));
     //TODO add all the enums
 
     // uniform names
-    conf.getIfSet("shared_sampler", _shareTexUniformName);
-    conf.getIfSet("shared_matrix",  _shareTexMatUniformName);
+    conf.get("shared_sampler", _shareTexUniformName);
+    conf.get("shared_matrix",  _shareTexMatUniformName);
 }
 
 Config
 ImageLayerOptions::getConfig() const
 {
     Config conf = TerrainLayerOptions::getConfig();
-    conf.key() = "image";
 
     conf.set( "nodata_image",   _noDataImageFilename );
-    conf.set( "min_range",      _minRange );
-    conf.set( "max_range",      _maxRange );
     conf.set( "shared",         _shared );
     conf.set( "coverage",       _coverage );
     conf.set( "feather_pixels", _featherPixels );
+    conf.set( "altitude",       _altitude );
 
     if (_transparentColor.isSet())
         conf.set("transparent_color", colorToString( _transparentColor.value()));
@@ -161,7 +145,7 @@
         Config filtersConf("color_filters");
         if ( ColorFilterRegistry::instance()->writeChain( _colorFilters, filtersConf ) )
         {
-            conf.update( filtersConf );
+            conf.set( filtersConf );
         }
     }
 
@@ -351,7 +335,7 @@
 
     // If we are using createTexture to make image tiles,
     // we don't need to load a tile source plugin.
-    if (createTextureSupported())
+    if (useCreateTexture())
     {
         setTileSourceExpected(false);
     }
@@ -364,44 +348,56 @@
 {
     TerrainLayer::init();
 
+    _useCreateTexture = false;
+
     // image layers render as a terrain texture.
-    setRenderType(RENDERTYPE_TILE);
-}
+    setRenderType(RENDERTYPE_TERRAIN_SURFACE);
 
-void
-ImageLayer::fireCallback(ImageLayerCallback::MethodPtr method)
-{
-    for(CallbackVector::const_iterator i = _callbacks.begin(); i != _callbacks.end(); ++i)
+    if (options().altitude().isSet())
     {
-        ImageLayerCallback* cb = dynamic_cast<ImageLayerCallback*>(i->get());
-        if (cb) (cb->*method)( this );
+        setAltitude(options().altitude().get());
     }
 }
 
 void
-ImageLayer::setMinVisibleRange( float minVisibleRange )
+ImageLayer::setAltitude(const Distance& value)
 {
-    options().minVisibleRange() = minVisibleRange;
-    fireCallback( &ImageLayerCallback::onVisibleRangeChanged );
-}
+    options().altitude() = value;
 
-float
-ImageLayer::getMinVisibleRange() const
-{
-    return options().minVisibleRange().get();
+    if (value != 0.0)
+    {
+        osg::StateSet* stateSet = getOrCreateStateSet();
+
+        stateSet->addUniform(
+            new osg::Uniform("oe_terrain_altitude", (float)options().altitude()->as(Units::METERS)),
+            osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+
+        stateSet->setMode(GL_CULL_FACE, 0);
+    }
+    else
+    {
+        osg::StateSet* stateSet = getOrCreateStateSet();
+        getOrCreateStateSet()->removeUniform("oe_terrain_altitude");
+        stateSet->removeMode(GL_CULL_FACE);
+    }
+    fireCallback( &ImageLayerCallback::onAltitudeChanged );
 }
 
 void
-ImageLayer::setMaxVisibleRange( float maxVisibleRange )
+ImageLayer::fireCallback(ImageLayerCallback::MethodPtr method)
 {
-    options().maxVisibleRange() = maxVisibleRange;
-    fireCallback( &ImageLayerCallback::onVisibleRangeChanged );
+    for(CallbackVector::const_iterator i = _callbacks.begin(); i != _callbacks.end(); ++i)
+    {
+        ImageLayerCallback* cb = dynamic_cast<ImageLayerCallback*>(i->get());
+        if (cb) (cb->*method)( this );
+    }
 }
 
-float
-ImageLayer::getMaxVisibleRange() const
+void
+ImageLayer::setUseCreateTexture()
 {
-    return options().maxVisibleRange().get();
+    _useCreateTexture = true;
+    setTileSourceExpected(false);
 }
 
 bool
@@ -590,7 +586,10 @@
         << key.getExtent().toString() << std::endl;
 
     // the cache key combines the Key and the horizontal profile.
-    std::string cacheKey = Stringify() << key.str() << "_" << key.getProfile()->getHorizSignature();
+    std::string cacheKey = Cache::makeCacheKey(
+        Stringify() << key.str() << "-" << key.getProfile()->getHorizSignature(),
+        "image");
+
     const CachePolicy& policy = getCacheSettings()->cachePolicy().get();
     
     // Check the layer L2 cache first
@@ -683,6 +682,12 @@
         ImageUtils::fixInternalFormat( result.getImage() );
     }
 
+    // Check for cancelation before writing to a cache:
+    if (progress && progress->isCanceled())
+    {
+        return GeoImage::INVALID;
+    }
+
     // memory cache first:
     if ( result.valid() && _memCache.valid() )
     {
@@ -775,13 +780,17 @@
     // blacklist this tile for future requests.
     if (result == 0L)
     {
-        if ( progress == 0L ||
-             ( !progress->isCanceled() && !progress->needsRetry() ) )
+        if ( progress == 0L || !progress->isCanceled() )
         {
             source->getBlacklist()->add( key );
         }
     }
 
+    if (progress && progress->isCanceled())
+    {
+        return GeoImage::INVALID;
+    }
+
     return GeoImage(result.get(), key.getExtent());
 }
 
@@ -858,7 +867,7 @@
                 // the tile source did not return a tile, so make a note of it.
                 failedKeys.push_back( *k );
 
-                if (progress && (progress->isCanceled() || progress->needsRetry()))
+                if (progress && progress->isCanceled())
                 {
                     retry = true;
                     break;
@@ -866,16 +875,19 @@
             }
         }
 
-        if ( mosaic.getImages().empty() || retry )
+        // Fail is: a) we got no data and the LOD is greater than zero; or
+        // b) the operation was canceled mid-stream.
+        if ( (mosaic.getImages().empty() && key.getLOD() > 0) || retry)
         {
-            // if we didn't get any data, fail.
+            // if we didn't get any data at LOD>0, fail.
             OE_DEBUG << LC << "Couldn't create image for ImageMosaic " << std::endl;
             return GeoImage::INVALID;
         }
 
-        // We got at least one good tile, so go through the bad ones and try to fall back on
-        // lower resolution data to fill in the gaps. The entire mosaic must be populated or
-        // this qualifies as a bad tile.
+        // We got at least one good tile, OR we got nothing but since the LOD==0 we have to
+        // fall back on a lower resolution.
+        // So now we go through the failed keys and try to fall back on lower resolution data
+        // to fill in the gaps. The entire mosaic must be populated or this qualifies as a bad tile.
         for(std::vector<TileKey>::iterator k = failedKeys.begin(); k != failedKeys.end(); ++k)
         {
             GeoImage image;
@@ -949,8 +961,7 @@
         result = mosaicedImage.reproject( 
             key.getProfile()->getSRS(),
             &key.getExtent(), 
-            options().reprojectedTileSize().get(),
-            options().reprojectedTileSize().get(),
+            getTileSize(), getTileSize(),
             options().driver()->bilinearReprojection().get());
     }
 
@@ -962,6 +973,11 @@
         ImageUtils::featherAlphaRegions( result.getImage() );
     }
 
+    if (progress && progress->isCanceled())
+    {
+        return GeoImage::INVALID;
+    }
+
     return result;
 }
 
@@ -1042,3 +1058,17 @@
         tex->setInternalFormatMode(options().textureCompression().get());
     }
 }
+
+
+void
+ImageLayer::modifyTileBoundingBox(const TileKey& key, osg::BoundingBox& box) const
+{
+    if (options().altitude().isSet())
+    {
+        if (options().altitude()->as(Units::METERS) > box.zMax())
+        {
+            box.zMax() = options().altitude()->as(Units::METERS);
+        }
+    }
+    TerrainLayer::modifyTileBoundingBox(key, box);
+}
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ImageMosaic osgearth-2.10.2+dfsg/src/osgEarth/ImageMosaic
--- osgearth-2.9.0+dfsg/src/osgEarth/ImageMosaic	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ImageMosaic	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ImageMosaic.cpp osgearth-2.10.2+dfsg/src/osgEarth/ImageMosaic.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ImageMosaic.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ImageMosaic.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,11 +18,6 @@
  */
 
 #include <osgEarth/ImageMosaic>
-#include <osgEarth/ImageUtils>
-#include <osgEarth/HeightFieldUtils>
-#include <osg/Notify>
-#include <osg/Timer>
-#include <osg/io_utils>
 
 #define LC "[ImageMosaic] "
 
@@ -70,7 +65,7 @@
 {
     if (_images.size() == 0)
     {
-        OE_NOTICE << "ImageMosaic has no images..." << std::endl;
+        OE_INFO << "ImageMosaic has no images..." << std::endl;
         return 0;
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ImageToHeightFieldConverter osgearth-2.10.2+dfsg/src/osgEarth/ImageToHeightFieldConverter
--- osgearth-2.9.0+dfsg/src/osgEarth/ImageToHeightFieldConverter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ImageToHeightFieldConverter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -60,6 +60,8 @@
         */
         osg::Image* convert(const osg::HeightField* hf, int pixelSize = 32);
 
+        osg::Image* convertToR16F(const osg::HeightField* hf) const;
+
         osg::Image* convertToR32F(const osg::HeightField* hf) const;
 
     private:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ImageToHeightFieldConverter.cpp osgearth-2.10.2+dfsg/src/osgEarth/ImageToHeightFieldConverter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ImageToHeightFieldConverter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ImageToHeightFieldConverter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -22,10 +22,9 @@
 
 #include <osgEarth/ImageToHeightFieldConverter>
 #include <osgEarth/GeoCommon>
-#include <osg/Notify>
+
+// not needed for GL Core. Only for GL_R32F
 #include <osg/Texture>
-#include <limits.h>
-#include <string.h>
 
 using namespace osgEarth;
 
@@ -190,28 +189,30 @@
 
 osg::Image* ImageToHeightFieldConverter::convertToR32F(const osg::HeightField* hf) const
 {
-    if ( !hf ) {
-    return NULL;
-  }
+    if (!hf) {
+        return NULL;
+    }
 
-  osg::Image* image = new osg::Image();
-  image->allocateImage(hf->getNumColumns(), hf->getNumRows(), 1, GL_RED, GL_FLOAT); //GL_LUMINANCE, GL_SHORT);
-  image->setInternalTextureFormat(GL_R32F);
+    osg::Image* image = new osg::Image();
+    image->allocateImage(hf->getNumColumns(), hf->getNumRows(), 1, GL_RED, GL_FLOAT);
+    image->setInternalTextureFormat(GL_R32F);
+    memcpy(image->data(), &hf->getFloatArray()->front(), sizeof(float) * hf->getFloatArray()->size());
 
-  const osg::FloatArray* floats = hf->getFloatArray();
+    return image;
+}
 
-  for( unsigned int i = 0; i < floats->size(); ++i  ) {
-      float h = floats->at( i );
-      *(float*)image->data(i) = h;
-      // Set NO_DATA_VALUE to a valid short value.
-      //if (h == NO_DATA_VALUE)
-      //{        
-      //    h = -SHRT_MAX;
-      //}
-      //*(short*)image->data(i) = (short)h;
-  }
+osg::Image* ImageToHeightFieldConverter::convertToR16F(const osg::HeightField* hf) const
+{
+    if (!hf) {
+        return NULL;
+    }
 
-  return image;
+    osg::Image* image = new osg::Image();
+    image->allocateImage(hf->getNumColumns(), hf->getNumRows(), 1, GL_RED, GL_FLOAT);
+    image->setInternalTextureFormat(GL_R16F);
+    memcpy(image->data(), &hf->getFloatArray()->front(), sizeof(float) * hf->getFloatArray()->size());
+
+    return image;
 }
 
 osg::Image* ImageToHeightFieldConverter::convert32(const osg::HeightField* hf) const {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ImageUtils osgearth-2.10.2+dfsg/src/osgEarth/ImageUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/ImageUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ImageUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -547,8 +547,6 @@
 
     public: // osg::NodeVisitor
         virtual void apply(osg::Node& node);
-        virtual void apply(osg::Geode& geode);
-        virtual void apply(osg::Drawable& drawable);
         virtual void apply(osg::StateSet& stateSet);
     };
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ImageUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/ImageUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ImageUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ImageUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,19 +18,12 @@
  */
 
 #include <osgEarth/ImageUtils>
-#include <osgEarth/ThreadingUtils>
 #include <osgEarth/Registry>
 #include <osgEarth/Capabilities>
 #include <osgEarth/Random>
-#include <osgEarth/GeoCommon>
-#include <osg/Notify>
-#include <osg/Texture>
-#include <osg/ImageSequence>
-#include <osg/Timer>
-#include <osg/ValueObject>
 #include <osgDB/Registry>
-#include <string.h>
-#include <memory.h>
+
+#include <osg/ValueObject>
 
 #define LC "[ImageUtils] "
 
@@ -321,11 +314,11 @@
                         // nearest neighbor:
                         int col = (input_col-(int)input_col) <= (ceil(input_col)-input_col) ?
                             (int)input_col :
-                            std::min( 1+(int)input_col, (int)in_s-1 );
+                            osg::minimum( 1+(int)input_col, (int)in_s-1 );
 
                         int row = (input_row-(int)input_row) <= (ceil(input_row)-input_row) ?
                             (int)input_row :
-                            std::min( 1+(int)input_row, (int)in_t-1 );
+                            osg::minimum( 1+(int)input_row, (int)in_t-1 );
 
                         color = read(col, row, layer); // read pixel from mip level 0.
 
@@ -426,8 +419,8 @@
         for (int t = 0; t < target->t(); )
         {
             int offset = (s-1) % stride; // the minus1 accounts for the border
-            int s0 = std::max(s - offset, 0);
-            int s1 = std::min(s0 + (int)stride, target->s()-1);
+            int s0 = osg::maximum(s - offset, 0);
+            int s1 = osg::minimum(s0 + (int)stride, target->s()-1);
             double mu = (double)offset / (double)(s1-s0);
             osg::Vec4 p1 = readTarget(s0, t);
             osg::Vec4 p2 = readTarget(s1, t);
@@ -445,8 +438,8 @@
         for (int t = 2; t<target->t()-2; t += 2)
         {
             int offset = (t-1) % stride; // the minus1 accounts for the border
-            int t0 = std::max(t - offset, 0);
-            int t1 = std::min(t0 + (int)stride, target->t()-1);
+            int t0 = osg::maximum(t - offset, 0);
+            int t1 = osg::minimum(t0 + (int)stride, target->t()-1);
             double mu = (double)offset / double(t1-t0);
 
             osg::Vec4 p1 = readTarget(s, t0);
@@ -465,12 +458,12 @@
         for (int t = 2; t<target->t()-2; t += 2)
         {
             int s_offset = (s-1) % stride;
-            int s0 = std::max(s - s_offset, 0);
-            int s1 = std::min(s0 + (int)stride, target->s()-1);
+            int s0 = osg::maximum(s - s_offset, 0);
+            int s1 = osg::minimum(s0 + (int)stride, target->s()-1);
 
             int t_offset = (t-1) % stride;
-            int t0 = std::max(t - t_offset, 0);
-            int t1 = std::min(t0 + (int)stride, target->t()-1);
+            int t0 = osg::maximum(t - t_offset, 0);
+            int t1 = osg::minimum(t0 + (int)stride, target->t()-1);
 
             double mu, mu2;
 
@@ -491,90 +484,6 @@
             writeTarget(v, s, t);
         }
     }
-
-
-#if 0
-    // first copy and expand the source quadrant by copying every
-    // even-numbered pixel.
-    for (int s=0; s<=source->s()/2; ++s)
-    {
-        for (int t=0; t<=source->t()/2; ++t)
-        {
-            osg::Vec4 value = readSource(s_off+s, t_off+t);
-            unsigned out_s = s*2, out_t = t*2;
-            writeTarget(value, s*2, t*2);
-        }
-    }
-
-    // next interpolate the odd numbered columns, based on the stride.
-    for (int s = 1; s<target->s()-1; s += 2)
-    {
-        for (int t = 0; t < target->t(); t += 2)
-        {
-            int offset = s % stride;
-            int s0 = std::max(s - offset, 0);
-            int s1 = std::min(s0 + (int)stride, target->s()-1);
-            float mu = (float)offset / (float)(s1-s0);
-
-            osg::Vec4 p1 = readTarget(s0, t);
-            osg::Vec4 p2 = readTarget(s1, t);
-            float mu2 = (1.0 - cosf(mu*osg::PI))*0.5;
-            osg::Vec4 v = (p1*(1.0-mu2)) + (p2*mu2);
-            writeTarget(v, s, t);
-        }
-    }
-
-    // next interpolate the odd numbered rows
-    for (int s = 0; s < target->s(); s += 2)
-    {
-        for (int t = 1; t<target->t()-1; t += 2)
-        {
-            int offset = t % stride;
-            int t0 = std::max(t - offset, 0);
-            int t1 = std::min(t0 + (int)stride, target->t()-1);
-            float mu = (float)offset / float(t1-t0);
-
-            osg::Vec4 p1 = readTarget(s, t0);
-            osg::Vec4 p2 = readTarget(s, t1);
-            float mu2 = (1.0 - cosf(mu*osg::PI))*0.5;
-            osg::Vec4 v = (p1*(1.0-mu2)) + (p2*mu2);
-            writeTarget(v, s, t);
-        }
-    }
-
-    // then interpolate the centers
-    for (int s = 1; s<target->s()-1; s += 2)
-    {
-        for (int t = 1; t<target->t()-1; t += 2)
-        {
-            int s_offset = s % stride;
-            int s0 = std::max(s - s_offset, 0);
-            int s1 = std::min(s0 + (int)stride, target->s()-1);
-
-            int t_offset = t % stride;
-            int t0 = std::max(t - t_offset, 0);
-            int t1 = std::min(t0 + (int)stride, target->t()-1);
-
-            float mu, mu2;
-
-            osg::Vec4 p1 = readTarget(s0, t);
-            osg::Vec4 p2 = readTarget(s1, t);
-            mu = (float)s_offset / (float)(s1-s0);
-            mu2 = (1.0 - cosf(mu*osg::PI))*0.5;
-            osg::Vec4 v1 = (p1*(1.0-mu2)) + (p2*mu2);
-            
-            osg::Vec4 p3 = readTarget(s, t0);
-            osg::Vec4 p4 = readTarget(s, t1);
-            mu = (float)t_offset / (float)(t1-t0);
-            mu2 = (1.0 - cosf(mu*osg::PI))*0.5;
-            osg::Vec4 v2 = (p3*(1.0-mu2)) + (p4*mu2);
-
-            osg::Vec4 v = (v1+v2)*0.5;
-
-            writeTarget(v, s, t);
-        }
-    }
-#endif
     
     return true;
 }
@@ -1126,7 +1035,7 @@
 
     const Capabilities& caps = Registry::capabilities();
 
-#if defined(OSG_GLES2_AVAILABLE) && defined(OSG_GLES3_AVAILABLE)
+#if !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GLES3_AVAILABLE)
 
     if (image->getPixelFormat() == GL_RGBA && image->getPixelSizeInBits() == 32) 
     {
@@ -1980,6 +1889,8 @@
             return &ColorReader<GL_UNSIGNED_SHORT_5_5_5_1, GLushort>::read;
         case GL_UNSIGNED_BYTE_3_3_2:
             return &ColorReader<GL_UNSIGNED_BYTE_3_3_2, GLubyte>::read;
+        case GL_UNSIGNED_INT_8_8_8_8_REV:
+            return &ColorReader<GLFormat, GLubyte>::read;
         default:
             return &ColorReader<0, GLbyte>::read;
         }
@@ -2071,12 +1982,12 @@
          double s = u * sizeS;
          double t = v * sizeT;
 
-         double s0 = std::max(floorf(s), 0.0f);
-         double s1 = std::min(s0+1.0f, sizeS);
+         double s0 = osg::maximum(floorf(s), 0.0f);
+         double s1 = osg::minimum(s0+1.0f, sizeS);
          double smix = s0 < s1 ? (s-s0)/(s1-s0) : 0.0f;
 
-         double t0 = std::max(floorf(t), 0.0f);
-         double t1 = std::min(t0+1.0f, sizeT);
+         double t0 = osg::maximum(floorf(t), 0.0f);
+         double t1 = osg::minimum(t0+1.0f, sizeT);
          double tmix = t0 < t1 ? (t-t0)/(t1-t0) : 0.0f;
 
          osg::Vec4 UL = (*_reader)(this, (int)s0, (int)t0, r, m); // upper left
@@ -2229,30 +2140,6 @@
 }
 
 void
-TextureAndImageVisitor::apply(osg::Geode& geode)
-{
-    if (geode.getStateSet())
-        apply(*geode.getStateSet());
-
-    for (unsigned i = 0; i < geode.getNumDrawables(); ++i) {
-        apply(*geode.getDrawable(i));
-        //if (geode.getDrawable(i) && geode.getDrawable(i)->getStateSet())
-        //    apply(*geode.getDrawable(i)->getStateSet());
-    }
-
-    //traverse(geode);
-}
-
-void
-TextureAndImageVisitor::apply(osg::Drawable& drawable)
-{
-    if (drawable.getStateSet())
-        apply(*drawable.getStateSet());
-
-    //traverse(drawable);
-}
-
-void
 TextureAndImageVisitor::apply(osg::StateSet& stateSet)
 {
     osg::StateSet::TextureAttributeList& a = stateSet.getTextureAttributeList();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/IntersectionPicker osgearth-2.10.2+dfsg/src/osgEarth/IntersectionPicker
--- osgearth-2.9.0+dfsg/src/osgEarth/IntersectionPicker	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/IntersectionPicker	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/IntersectionPicker.cpp osgearth-2.10.2+dfsg/src/osgEarth/IntersectionPicker.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/IntersectionPicker.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/IntersectionPicker.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/IntersectionPicker>
-#include <osgEarth/PrimitiveIntersector>
 #include <osgEarth/Registry>
 
 #define LC "[Picker] "
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/IOTypes osgearth-2.10.2+dfsg/src/osgEarth/IOTypes
--- osgearth-2.9.0+dfsg/src/osgEarth/IOTypes	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/IOTypes	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -90,6 +90,10 @@
         ReadResult( Code code =RESULT_NOT_FOUND )
             : _code(code), _fromCache(false), _lmt(0), _duration_s(0.0) { }
 
+        /** Construct a result with an error message */
+        ReadResult(const std::string& error)
+            : _code(RESULT_NOT_FOUND), _fromCache(false), _lmt(0), _duration_s(0.0), _detail(error) { }
+
         /** Construct a result with code and data */
         ReadResult( Code code, osg::Object* result )
             : _code(code), _result(result), _fromCache(false), _lmt(0), _duration_s(0.0) { }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/IOTypes.cpp osgearth-2.10.2+dfsg/src/osgEarth/IOTypes.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/IOTypes.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/IOTypes.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
  */
 #include <osgEarth/IOTypes>
 #include <osgEarth/URI>
-#include <osgEarth/XmlUtils>
 #include <osgDB/FileNameUtils>
-#include <osgDB/ReaderWriter>
 #include <osgDB/Registry>
 
 using namespace osgEarth;
@@ -69,7 +67,7 @@
  * that means that StringObject instances can be read/written to an .osgb
  * file. We use this for caching string data (XML, JSON files for example).
  */
-namespace
+namespace osgEarth { namespace Serializers { namespace StringObject
 {
     REGISTER_OBJECT_WRAPPER(StringObject,
                             new osgEarth::StringObject,
@@ -78,7 +76,7 @@
     {
         ADD_STRING_SERIALIZER( String, "" );  // _str
     }
-}
+} } }
 
 //------------------------------------------------------------------------
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/JsonUtils osgearth-2.10.2+dfsg/src/osgEarth/JsonUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/JsonUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/JsonUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -504,7 +504,7 @@
 
    /** \brief Experimental and untested: represents an element of the "path" to access a node.
     */
-   class PathArgument
+   class JSON_API PathArgument
    {
    public:
       friend class Path;
@@ -537,7 +537,7 @@
     * - ".%" => member name is provided as parameter
     * - ".[%]" => index is provied as parameter
     */
-   class Path
+   class JSON_API Path
    {
    public:
       Path( const std::string &path,
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/JsonUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/JsonUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/JsonUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/JsonUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -25,12 +25,11 @@
  */
 
 #include <osgEarth/JsonUtils>
-#include <osg/Notify>
+
+#include <sstream>
 
 #include <string.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <sstream>
 
 #if _MSC_VER >= 1400 // VC++ 8.0
 #pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LandCover osgearth-2.10.2+dfsg/src/osgEarth/LandCover
--- osgearth-2.9.0+dfsg/src/osgEarth/LandCover	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LandCover	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -106,7 +106,7 @@
     class OSGEARTH_EXPORT LandCoverDictionary : public Layer
     {
     public:
-        META_Layer(osgEarth, LandCoverDictionary, LandCoverDictionaryOptions);
+        META_Layer(osgEarth, LandCoverDictionary, LandCoverDictionaryOptions, land_cover_dictionary);
 
         //! Constructs an empty dictionary */
         LandCoverDictionary();
@@ -220,7 +220,7 @@
     class OSGEARTH_EXPORT LandCoverCoverageLayer : public ImageLayer
     {
     public:
-        META_Layer(osgEarth, LandCoverCoverageLayer, LandCoverCoverageLayerOptions);
+        META_Layer(osgEarth, LandCoverCoverageLayer, LandCoverCoverageLayerOptions, coverage);
 
         /** Construct an empty land cover coverage layer. */
         LandCoverCoverageLayer();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LandCover.cpp osgearth-2.10.2+dfsg/src/osgEarth/LandCover.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/LandCover.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LandCover.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
  */
 #include <osgEarth/LandCover>
 #include <osgEarth/XmlUtils>
-#include <osgEarth/Registry>
 
 #define LC "[LandCover] "
 
@@ -99,7 +98,7 @@
 LandCoverDictionaryOptions::getConfig() const
 {
     Config conf = LayerOptions::getConfig();
-    conf.key() = "land_cover_dictionary";
+
     if (!classes().empty())
     {
         Config classes("classes");
@@ -220,16 +219,16 @@
 void
 LandCoverValueMapping::fromConfig(const Config& conf)
 {
-    conf.getIfSet("value", _value);
-    conf.getIfSet("class", _lcClassName);
+    conf.get("value", _value);
+    conf.get("class", _lcClassName);
 }
 
 Config
 LandCoverValueMapping::getConfig() const
 {
     Config conf("mapping");
-    conf.addIfSet("value", _value);
-    conf.addIfSet("class", _lcClassName);
+    conf.set("value", _value);
+    conf.set("class", _lcClassName);
     return conf;
 }
 
@@ -242,6 +241,14 @@
 ImageLayerOptions(co),
 _warp(0.0f)
 {
+    // By default, a CoverageLayer must disable all interpolation
+    // since the values contain actual data.
+    // (TODO: because of an architectural vestige, both the ImageLayerOptions
+    // and the TileSourceOptions have a "coverage" property -- so we must set
+    // them both. Someday fix this.)
+    coverage().init(true);
+    driver()->coverage().init(true);
+
     fromConfig(_conf);
 }
 
@@ -255,7 +262,7 @@
         _valueMappings.push_back(mapping.get());
     }
 
-    conf.getIfSet("warp", _warp);
+    conf.get("warp", _warp);
 }
 
 Config
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LandCoverLayer osgearth-2.10.2+dfsg/src/osgEarth/LandCoverLayer
--- osgearth-2.9.0+dfsg/src/osgEarth/LandCoverLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LandCoverLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -75,7 +75,7 @@
     class OSGEARTH_EXPORT LandCoverLayer : public ImageLayer
     {
     public:
-        META_Layer(osgEarth, LandCoverLayer, LandCoverLayerOptions);
+        META_Layer(osgEarth, LandCoverLayer, LandCoverLayerOptions, land_cover);
 
         /** Construct an emptry land cover layer. Use options() to configure */
         LandCoverLayer();
@@ -101,6 +101,15 @@
         virtual TileSource* createTileSource();
 
         osg::ref_ptr<LandCoverDictionary> _lcDictionary;
+
+        struct MetaImageComponent {
+            MetaImageComponent() : pixel(0L) { }
+            osg::ref_ptr<osg::Image> image;
+            osg::Matrix scaleBias;
+            ImageUtils::PixelReader pixel;
+        };
+        typedef std::map<TileKey, MetaImageComponent> MetaImage;
+        bool readMetaImage(MetaImage&, const TileKey&, double, double, osg::Vec4f& output, ProgressCallback*);
     };
 
 } // namespace osgEarth
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LandCoverLayer.cpp osgearth-2.10.2+dfsg/src/osgEarth/LandCoverLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/LandCoverLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LandCoverLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,12 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/LandCoverLayer>
-#include <osgEarth/ImageUtils>
 #include <osgEarth/Registry>
 #include <osgEarth/Map>
-#include <osgEarth/MetaTile>
 #include <osgEarth/SimplexNoise>
-#include <osgEarth/ThreadingUtils>
 #include <osgEarth/Progress>
 
 using namespace osgEarth;
@@ -100,7 +97,7 @@
         {
             if (sourceLayer->getEnabled() && 
                 sourceLayer->isKeyInLegalRange(key) &&
-                sourceLayer->mayHaveDataInExtent(key.getExtent()))
+                sourceLayer->mayHaveData(key))
             {
                 for(TileKey k = key; k.valid() && !image.valid(); k = k.createParentKey())
                 {
@@ -239,7 +236,9 @@
             if (coverageOptions.enabled() == false)
                 continue;
 
-            coverageOptions.cachePolicy() = CachePolicy::NO_CACHE; // TODO: yes? no?
+            // We never want to cache data from a coverage, because the "parent" layer
+            // will be caching the entire result of a multi-coverage composite.
+            coverageOptions.cachePolicy() = CachePolicy::NO_CACHE;
 
             // Create the coverage layer:
             LandCoverCoverageLayer* layer = new LandCoverCoverageLayer( coverageOptions );
@@ -263,7 +262,21 @@
             const DataExtentList& de = layer->getDataExtents();
             for(DataExtentList::const_iterator dei = de.begin(); dei != de.end(); ++dei)
             {
-                getDataExtents().push_back(*dei);
+                if (!profile || dei->getSRS()->isHorizEquivalentTo(profile->getSRS()))
+                {
+                    getDataExtents().push_back(*dei);
+                }
+                else
+                {
+                    // Transform the data extents to the layer profile
+                    GeoExtent ep = dei->transform(profile->getSRS());
+                    DataExtent de(ep);
+                    if (dei->minLevel().isSet())
+                        de.minLevel() = profile->getEquivalentLOD(layer->getProfile(), dei->minLevel().get());
+                    if (dei->maxLevel().isSet())
+                        de.maxLevel() = profile->getEquivalentLOD(layer->getProfile(), dei->maxLevel().get());
+                    getDataExtents().push_back(de);
+                }
             }
         }
 
@@ -297,7 +310,7 @@
         ImageUtils::markAsUnNormalized(out.get(), true);
 
         // Allocate a suitable format:
-        GLint internalFormat = GL_LUMINANCE32F_ARB;
+        GLint internalFormat = GL_R16F;
 
         int tilesize = getPixelsPerTile();
 
@@ -311,11 +324,7 @@
         float du = 1.0f / (float)(out->s()-1);
         float dv = 1.0f / (float)(out->t()-1);
 
-        osg::Vec4 nodata;
-        if (internalFormat == GL_LUMINANCE16F_ARB)
-            nodata.set(-32768, -32768, -32768, -32768);
-        else
-            nodata.set(NO_DATA_VALUE, NO_DATA_VALUE, NO_DATA_VALUE, NO_DATA_VALUE);
+        osg::Vec4 nodata(NO_DATA_VALUE, NO_DATA_VALUE, NO_DATA_VALUE, NO_DATA_VALUE);
 
         unsigned pixelsWritten = 0u;
 
@@ -327,7 +336,10 @@
                 for(int L = layers.size()-1; L >= 0 && !wrotePixel; --L)
                 {
                     if (progress && progress->isCanceled())
+                    {
+                        OE_DEBUG << LC << key.str() << " canceled" << std::endl;
                         return 0L;
+                    }
 
                     ILayer& layer = layers[L];
                     if ( !layer.valid )
@@ -412,8 +424,8 @@
 void
 LandCoverLayerOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet("warp", _warp);
-    conf.getIfSet("noise_lod", _noiseLOD);
+    conf.get("warp", _warp);
+    conf.get("noise_lod", _noiseLOD);
 
     ConfigSet layerConfs = conf.child("coverages").children("coverage");
     for (ConfigSet::const_iterator i = layerConfs.begin(); i != layerConfs.end(); ++i)
@@ -426,10 +438,9 @@
 LandCoverLayerOptions::getConfig() const
 {
     Config conf = ImageLayerOptions::getConfig();
-    conf.key() = "land_cover";
 
-    conf.addIfSet("warp", _warp);
-    conf.addIfSet("noise_lod", _noiseLOD);
+    conf.set("warp", _warp);
+    conf.set("noise_lod", _noiseLOD);
 
     if (_coverages.size() > 0)
     {
@@ -440,7 +451,7 @@
         {
             images.add("coverage", i->getConfig());
         }
-        conf.update(images);
+        conf.set(images);
     }
 
     return conf;
@@ -501,121 +512,173 @@
     return new LandCoverTileSource(options());
 }
 
-GeoImage
-LandCoverLayer::createImageImplementation(const TileKey& key, ProgressCallback* progress)
+bool
+LandCoverLayer::readMetaImage(MetaImage& metaImage, const TileKey& key, double u, double v, osg::Vec4f& output, ProgressCallback* progress)
 {
-    if (true) // warping enabled
+    // Find the key containing the uv coordinates.
+    int x = int(floor(u));
+    int y = int(floor(v));
+    TileKey actualKey = (x != 0 || y != 0)? key.createNeighborKey(x, -y) : key;
+
+    if (actualKey.valid())
     {
-        MetaImage metaImage;
+        // Transform the uv to be relative to the tile it's actually in.
+        // Don't forget: stupid computer requires us to handle negatives by hand.
+        u = u >= 0.0 ? fmod(u, 1.0) : 1.0+fmod(u, 1.0);
+        v = v >= 0.0 ? fmod(v, 1.0) : 1.0+fmod(v, 1.0);
 
-        for (int x = -1; x <= 1; ++x)
+        MetaImageComponent* comp = 0L;
+
+        MetaImage::iterator i = metaImage.find(actualKey);
+        if (i != metaImage.end())
         {
-            for (int y = -1; y <= 1; ++y)
-            {
-                if (progress && progress->isCanceled())
-                    return GeoImage::INVALID;
+            comp = &i->second;
+        }
+        else
+        {
+            // compute the closest ancestor key with actual data for the neighbor key:
+            TileKey bestkey = getBestAvailableTileKey(actualKey);
 
-                // compute the neighoring key:
-                TileKey subkey = key.createNeighborKey(x, y);
-                if (subkey.valid())
+            // should not need this fallback loop but let's do it anyway
+            GeoImage tile;
+            while (bestkey.valid() && !tile.valid())
+            {
+                // load the image and store it to the metaimage.
+                tile = ImageLayer::createImageImplementation(bestkey, progress);
+                if (tile.valid())
                 {
-                    // compute the closest ancestor key with actual data for the neighbor key:
-                    TileKey bestkey = getBestAvailableTileKey(subkey);
-                    if (bestkey.valid())
-                    {
-                        // load the image and store it to the metaimage.
-                        GeoImage tile = ImageLayer::createImageImplementation(bestkey, progress);
-                        if (tile.valid())
-                        {
-                            osg::Matrix scaleBias;
-                            subkey.getExtent().createScaleBias(bestkey.getExtent(), scaleBias);
-                            metaImage.setImage(x, y, tile.getImage(), scaleBias);
-                        }
-                    }
+                    comp = &metaImage[actualKey];
+                    comp->image = tile.getImage();
+                    actualKey.getExtent().createScaleBias(bestkey.getExtent(), comp->scaleBias);
+                    comp->pixel.setImage(comp->image.get());
+                    comp->pixel.setBilinear(false);
+                }
+                else
+                {
+                    bestkey = bestkey.createParentKey();
                 }
+
+                if (progress && progress->isCanceled())
+                    return false;
             }
         }
 
-        const osg::Image* mainImage = metaImage.getImage(0, 0);
-        if ( !mainImage)
-            return GeoImage::INVALID;
-
-        // new image for the warped data:
-        osg::ref_ptr<osg::Image> image = new osg::Image();
-        image->allocateImage(
-            mainImage->s(),
-            mainImage->t(),
-            mainImage->r(),
-            mainImage->getPixelFormat(),
-            mainImage->getDataType(),
-            mainImage->getPacking());
-        image->setInternalTextureFormat(mainImage->getInternalTextureFormat());
-        ImageUtils::markAsUnNormalized(image.get(), true);
-
-        ImageUtils::PixelWriter write(image.get());
-
-        // Configure the noise function:
-        SimplexNoise noiseGen;
-        noiseGen.setNormalize(true);
-        noiseGen.setRange(0.0, 1.0);
-        noiseGen.setFrequency(4.0);
-        noiseGen.setPersistence(0.8);
-        noiseGen.setLacunarity(2.2);
-        noiseGen.setOctaves(8);
-
-        osg::Vec2d cov;
-        osg::Vec2 noiseCoords;
-        osg::Vec4 pixel;
-        osg::Vec4 nodata(NO_DATA_VALUE, NO_DATA_VALUE, NO_DATA_VALUE, NO_DATA_VALUE);
+        if (comp)
+        {
+            // scale/bias to this tile's extent and sample the image.
+            u = u * comp->scaleBias(0, 0) + comp->scaleBias(3, 0);
+            v = v * comp->scaleBias(1, 1) + comp->scaleBias(3, 1);
+            output = comp->pixel(u, v);
+            return true;
+        }
+    }
+    return false;
+}
+
+GeoImage
+LandCoverLayer::createImageImplementation(const TileKey& key, ProgressCallback* progress)
+{
+    MetaImage metaImage;
+
+    // Grab a test sample to see what the output parameters should be:
+    osg::Vec4f dummy;
+    if (!readMetaImage(metaImage, getBestAvailableTileKey(key), 0.5, 0.5, dummy, progress))
+        return GeoImage::INVALID;
+    osg::Image* mainImage = metaImage.begin()->second.image.get();
+        
+    // Allocate the output image:
+    osg::ref_ptr<osg::Image> output = new osg::Image();
+    output->allocateImage(
+        mainImage->s(),
+        mainImage->t(),
+        mainImage->r(),
+        mainImage->getPixelFormat(),
+        mainImage->getDataType(),
+        mainImage->getPacking());
+    output->setInternalTextureFormat(mainImage->getInternalTextureFormat());
+    ImageUtils::markAsUnNormalized(output.get(), true);
+    ImageUtils::PixelWriter write(output.get());
+
+    // Configure the noise function:
+    SimplexNoise noiseGen;
+    noiseGen.setNormalize(true);
+    noiseGen.setRange(0.0, 1.0);
+    noiseGen.setFrequency(4.0);
+    noiseGen.setPersistence(0.8);
+    noiseGen.setLacunarity(2.2);
+    noiseGen.setOctaves(8);
+
+    osg::Vec2d cov;
+    osg::Vec2 noiseCoords;
+    osg::Vec4 pixel;
+    osg::Vec4 warpedPixel;
+    osg::Vec4 nodata(NO_DATA_VALUE, NO_DATA_VALUE, NO_DATA_VALUE, NO_DATA_VALUE);
         
-        float pdL = pow(2, (float)key.getLOD() - options().noiseLOD().get());
+    // scales the key's LOD to the noise function's LOD:
+    float pdL = pow(2, (float)key.getLOD() - options().noiseLOD().get());
 
-        for (int t = 0; t < image->t(); ++t)
+    // loop over the pixels and write each one.
+    for (int t = 0; t < output->t(); ++t)
+    {
+        double v = (double)t / (double)(output->t() - 1);
+        for (int s = 0; s < output->s(); ++s)
         {
-            double v = (double)t / (double)(image->t() - 1);
-            for (int s = 0; s < image->s(); ++s)
-            {
-                double u = (double)s / (double)(image->s() - 1);
-                
-                if (progress && progress->isCanceled())
-                    return GeoImage::INVALID;
+            double u = (double)s / (double)(output->s() - 1);
 
-                cov.set(u, v);
+            // coverage sampling coordinates:
+            cov.set(u, v);
 
-                // first read the unwarped pixel to get the warping value.
-                // (warp is stored in pixel.g)
-                metaImage.read(cov.x(), cov.y(), pixel);
+            // first read the unwarped pixel to get the warping value.
+            // (warp is stored in pixel.g)
+            bool wrotePixel = false;
+            if (readMetaImage(metaImage, key, u, v, pixel, progress) &&
+                pixel.g() != NO_DATA_VALUE)
+            {
                 float warp = pixel.g() * pdL;
-
-                noiseCoords = getSplatCoords(key, options().noiseLOD().get(), cov);
-                double noise = getNoise(noiseGen, noiseCoords);
-                cov = warpCoverageCoords(cov, noise, warp);
-
-                if (metaImage.read(cov.x(), cov.y(), pixel))
+                if (warp != 0.0)
                 {
-                    // only apply the warping if the location of the warped pixel
-                    // came from the same source layer. Otherwise you will get some
-                    // unsavory speckling. (Layer index is stored in pixel.b)
-                    osg::Vec4 unwarpedPixel;
-                    if (metaImage.read(u, v, unwarpedPixel) && pixel.b() != unwarpedPixel.b())
-                        write(unwarpedPixel, s, t);
-                    else
-                        write(pixel, s, t);
+                    // use the noise function to warp the uv coordinates:
+                    noiseCoords = getSplatCoords(key, options().noiseLOD().get(), cov);
+                    double noise = getNoise(noiseGen, noiseCoords);
+                    cov = warpCoverageCoords(cov, noise, warp);
+
+                    // now read the pixel at the warped location:
+                    if (readMetaImage(metaImage, key, cov.x(), cov.y(), warpedPixel, progress) &&
+                        warpedPixel.b() != NO_DATA_VALUE)
+                    {
+                        // only apply the warping if the location of the warped pixel
+                        // came from the same source layer. Otherwise you will get some
+                        // unsavory speckling. (Layer index is stored in pixel.b)
+                        if (pixel.b() == warpedPixel.b())
+                            write(warpedPixel, s, t);
+                        else
+                            write(pixel, s, t);
+
+                        wrotePixel = true;
+                    }
                 }
                 else
                 {
-                    write(nodata, s, t);
+                    write(pixel, s, t);
+                    wrotePixel = true;
                 }
             }
-        }
 
-        return GeoImage(image.get(), key.getExtent());
+            // if we didn't get a coverage value, just write NODATA
+            if (!wrotePixel)
+            {
+                write(nodata, s, t);
+            }            
+                
+            if (progress && progress->isCanceled())
+            {
+                OE_DEBUG << LC << key.str() << " canceled" << std::endl;
+                return GeoImage::INVALID;
+            }
+        }
     }
 
-    else
-    {
-        return ImageLayer::createImageImplementation(key, progress);
-    }
+    return GeoImage(output.get(), key.getExtent());
 }
 
 const LandCoverClass*
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Layer osgearth-2.10.2+dfsg/src/osgEarth/Layer
--- osgearth-2.9.0+dfsg/src/osgEarth/Layer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Layer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -28,7 +28,10 @@
 #include <osgEarth/CachePolicy>
 #include <osgEarth/TerrainResources>
 #include <osgEarth/Cache>
+#include <osgEarth/SceneGraphCallback>
+#include <osgEarth/LayerShader>
 #include <osg/BoundingBox>
+#include <osg/Callback>
 #include <osg/StateSet>
 #include <osgDB/Options>
 #include <vector>
@@ -85,8 +88,21 @@
         /**
          * Shader snippet(s) to inject into this layer's stateset.
          */
-        optional<std::string>& shader() { return _shader; }
-        const optional<std::string>& shader() const { return _shader; }
+        optional<ShaderOptions>& shader() { return _shader; }
+        const optional<ShaderOptions>& shader() const { return _shader; }
+
+        /**
+         * Whether this layer should be treated as part of the terrain
+         * for the purposes of elevation queries, clamping, etc.
+         */
+        optional<bool>& terrainPatch() { return _terrainPatch; }
+        const optional<bool>& terrainPatch() const { return _terrainPatch; }
+
+        /**
+         * The attribution to be displayed for this layer
+         */
+        optional<std::string>& attribution() { return _attribution; }
+        const optional<std::string>& attribution() const { return _attribution; }
 
     public:
         LayerOptions();
@@ -104,20 +120,25 @@
         optional<std::string> _cacheId;
         optional<CachePolicy> _cachePolicy;
         optional<std::string> _shaderDefine;
-        optional<std::string> _shader;
+        optional<ShaderOptions> _shader;
+        optional<bool> _terrainPatch;
+        optional<std::string> _attribution;
     };
 
 
     /**
      * Base callback for all Layer types
      */
-    class LayerCallback : public osg::Referenced
+    struct LayerCallback : public osg::Referenced
     {
-        //NOP
+        //! Called after Layer::setEnabled changes the enabled state
+        virtual void onEnabledChanged(class Layer* layer) { }
+
+        typedef void (LayerCallback::*MethodPtr)(class Layer* layer);
     };
 
 
-#define META_Layer(LIBRARY, TYPE, OPTIONS) \
+#define META_Layer(LIBRARY, TYPE, OPTIONS, SLUG) \
     private: \
         OPTIONS * _options; \
         OPTIONS   _optionsConcrete; \
@@ -125,137 +146,112 @@
     public: \
         META_Object(LIBRARY, TYPE); \
         OPTIONS& options() { return *_options; } \
-        const OPTIONS& options() const { return *_options; }
-
+        const OPTIONS& options() const { return *_options; } \
+        virtual const char* getConfigKey() const { return #SLUG ; }
 
     /**
-     * Base class for all Map layers. 
+     * Base class for all Map layers.
      */
     class OSGEARTH_EXPORT Layer : public osg::Object
     {
     public:
-        META_Layer(osgEarth, Layer, LayerOptions);
+        META_Layer(osgEarth, Layer, LayerOptions, layer);
 
-        /**
-         * Constructs a map layer
-         */
+        //! Constructs a map layer
         Layer();
 
-        /**
-         * Constructs a map layer by deserializing options. 
-         */
+        //! Constructs a map layer by deserializing options.
         Layer(LayerOptions* options);
 
-        /**
-         * This layer's unique ID.
-         * This value is generated automatically at runtime and is not
-         * guaranteed to be the same from one run to the next.
-         */
+        //! This layer's unique ID.
+        //! This value is generated automatically at runtime and is not
+        //! guaranteed to be the same from one run to the next.        
         UID getUID() const { return _uid; }
 
-        /**
-         * Sets the osgDB read options for this Layer.
-         */
+        //! osgDB read options for this Layer.
         virtual void setReadOptions(const osgDB::Options* options);
+
+        //! osgDB read options for this Layer.
         const osgDB::Options* getReadOptions() const { return _readOptions.get(); }
 
-        /**
-         * Open a layer and return the status.
-         * The layer options are applied in open().
-         */
+        //! Open a layer and return the status.
         virtual const Status& open();
 
-        /**
-         * Gets the status of this layer.
-         */
+        //! Close this layer.
+        virtual void close();
+
+        //! Gets the status of this layer
         const Status& getStatus() const { return _status; }
 
-        /**
-         * @deprecated
-         * Sequence controller if the layer has one.
-         */
+        //! @deprecated (remove after 2.10)
+        //! Sequence controller if the layer has one.
         virtual SequenceControl* getSequenceControl() { return 0L; }
 
-        /**
-         * Returns a Config object serializing this layer, if applicable.
-         */
+        //! Serialize this layer into a Config object (if applicable)
         virtual Config getConfig() const;
 
-        /**
-         * Whether the layer is enabled (used in the map). This will return
-         * false if the layer is set to disabled OR if getStatus returns an error.
-         */
-        virtual bool getEnabled() const;
+        //! Whether the layer is used in the map.
+        virtual void setEnabled(bool value);
 
-        /**
-         * Gets a optional scene graph provided by the layer (default is NULL).
-         * When this layer is added to a Map, the MapNode will call this method and
-         * add the return value to its scene graph; and remove it when the Layer
-         * is removed from the Map.
-         */
-        virtual osg::Node* getOrCreateNode() { return 0L; }
+        //! Whether the layer is used in the map.
+        //! This will return false if the layer is set to disabled OR if getStatus returns an error.
+        virtual bool getEnabled() const;
 
-        /**
-         * Extent of this layer's data. 
-         * This method may return GeoExtent::INVALID which just means that the
-         * information is unavailable.
-         */
+        //! Gets a optional scene graph provided by the layer.
+        //! When this layer is added to a Map, the MapNode will call this method and
+        //! add the return value to its scene graph; and remove it when the Layer
+        //! is removed from the Map.
+        virtual osg::Node* getNode() const { return 0L; }
+
+        //! Extent of this layer's data.
+        //! This method may return GeoExtent::INVALID which just means that the
+        //!information is unavailable.        
         virtual const GeoExtent& getExtent() const;
 
-        /**
-         * Returns or generates a caching ID for this layer
-         */
+        //! Caching ID for this layer
         virtual std::string getCacheID() const;
 
-    public:
-
-        /** Adds a property notification callback to this layer */
-        void addCallback(LayerCallback* cb);
-
-        /** Removes a property notification callback from this layer */
-        void removeCallback(LayerCallback* cb);
-
+        //! SceneGraphCallbacks that one can use to detect scene graph changes
+        SceneGraphCallbacks* getSceneGraphCallbacks() const;
 
     public:
 
-        /**
-         * Access the layer's stateset, creating it is necessary
-         */
+        //! Layer's stateset, creating it is necessary
         osg::StateSet* getOrCreateStateSet();
 
-        /**
-         * Layer's stateset, or NULL if none exists
-         */
-        osg::StateSet* getStateSet() const {
-            return _stateSet.get();
-        }
+        //! Layer's stateset, or NULL if none exists
+        osg::StateSet* getStateSet() const;
 
-        /**
-         * How (and if) to use this layer when rendering terrain tiles.
-         */
+        //! How (and if) to use this layer when rendering terrain tiles.
         enum RenderType
         {
-            // Layer does not require its own terrain rendering pass (model layers, elevation layers)
-            RENDERTYPE_NONE, 
+            // Layer does not draw anything (directly)
+            RENDERTYPE_NONE,
 
-            // Layer requires a terrain rendering pass that draws terrain tile geometry
-            RENDERTYPE_TILE,
+            // Layer requires a terrain rendering pass that draws terrain tiles with texturing
+            RENDERTYPE_TERRAIN_SURFACE,
 
             // Layer requires a terrain rendering pass that emits terrian patches or
             // invokes a custom drawing function
-            RENDERTYPE_PATCH
+            RENDERTYPE_TERRAIN_PATCH,
+
+            // Layer that renders its own node graph or other geometry (no terrain)
+            RENDERTYPE_CUSTOM = RENDERTYPE_NONE,
+
+            // @deprecated Backwards compatibility
+            RENDERTYPE_TILE = RENDERTYPE_TERRAIN_SURFACE
         };
 
+        //! Rendering type of this layer
         RenderType getRenderType() const { return _renderType; }
 
+        //! Rendering type of this layer
         void setRenderType(RenderType value) { _renderType = value; }
 
-        virtual void modifyTileBoundingBox(const TileKey& key, osg::BoundingBox& box) const { }
+        //! Callback that modifies the layer's bounding box for a given tile key
+        virtual void modifyTileBoundingBox(const TileKey& key, osg::BoundingBox& box) const;
 
-        /**
-         * Return the class type name without namespace. For example if the leaf class type
-         * is osgEarth::ImageLayer, this method returns "ImageLayer".
-         */
+        //! Class type name without namespace. For example if the leaf class type
         const char* getTypeName() const;
 
         //! Map will call this function when this Layer is added to a Map.
@@ -265,43 +261,83 @@
         virtual void removedFromMap(const class Map*) { }
 
         //! MapNode will call this function when terrain resources are available.
-        virtual void setTerrainResources(TerrainResources*) { }
+        virtual void setTerrainResources(TerrainResources*);
+
+        //! Attribution to be displayed by the application
+        virtual std::string getAttribution() const;
+        
+        //! Attribution to be displayed by the application
+		virtual void setAttribution(const std::string& attribution);
 
+    public:
 
-    public: // Experimental
+        //! Traversal callback
+        class OSGEARTH_EXPORT TraversalCallback : public osg::Callback
+        {
+        public:
+            virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) const =0;
+        protected:
+            void traverse(osg::Node* node, osg::NodeVisitor* nv) const;
+        };
 
-        //! Called before culling this layer - return false to reject.
-        virtual bool cull(const osgUtil::CullVisitor*, osg::State::StateSetStack& stateSetStack) const;
+        //! Callback invoked by the terrain engine on this layer before applying
+        void setCullCallback(TraversalCallback* tc);
+        const TraversalCallback* getCullCallback() const;
 
+        //! Called to traverse this layer
+        void apply(osg::Node* node, osg::NodeVisitor* nv) const;
 
     public: // osg::Object
 
         virtual void setName(const std::string& name);
 
+        virtual void resizeGLObjectBuffers(unsigned maxSize);
 
-    public: // Loading a layer from a plugin
-        
+        virtual void releaseGLObjects(osg::State* state) const;
+
+
+    public: // Public internal methods
+
+        //! Creates a layer from serialized data - internal use
         static Layer* create(const ConfigOptions& options);
-        static Layer* create(const std::string& driver, const ConfigOptions& options);
 
+        //! Extracts config options from a DB options - internal use
         static const ConfigOptions& getConfigOptions(const osgDB::Options*);
+        
+        //! Adds a property notification callback to this layer
+        void addCallback(LayerCallback* cb);
+
+        //! Removes a property notification callback from this layer
+        void removeCallback(LayerCallback* cb);
+
 
     protected:
 
-        /** dtor */
+        //! DTOR
         virtual ~Layer();
 
-        // post-ctor initialization, chain to subclasses.
+        //! post-ctor initialization, chain to subclasses.
         virtual void init();
 
+        //! Sets the status for this layer - internal
         const Status& setStatus(const Status& status) { _status = status; return _status; }
-        const Status& setStatus(const Status::Code& statusCode, const std::string& message) { return setStatus(Status(statusCode, message)); }
+        
+        //! Sets the status for this layer with a message - internal
+        const Status& setStatus(const Status::Code& statusCode, const std::string& message) { 
+            return setStatus(Status(statusCode, message));
+        }
+
+        //! invoke layer callbacks
+        void fireCallback(LayerCallback::MethodPtr);
 
     private:
         UID _uid;
         osg::ref_ptr<osg::StateSet> _stateSet;
         RenderType _renderType;
         Status _status;
+        osg::ref_ptr<SceneGraphCallbacks> _sceneGraphCallbacks;
+        osg::ref_ptr<TraversalCallback> _traversalCallback;
+        osg::ref_ptr<LayerShader> _shader;
 
     protected:
         typedef std::vector<osg::ref_ptr<LayerCallback> > CallbackVector;
@@ -315,11 +351,11 @@
 
     typedef std::vector< osg::ref_ptr<Layer> > LayerVector;
 
-    
+
 #define REGISTER_OSGEARTH_LAYER(NAME,CLASS) \
     extern "C" void osgdb_##NAME(void) {} \
     static osgEarth::RegisterPluginLoader< osgEarth::PluginLoader<CLASS, osgEarth::Layer> > g_proxy_##CLASS_##NAME( #NAME );
-    
+
 #define USE_OSGEARTH_LAYER(NAME) \
     extern "C" void osgdb_##NAME(void); \
     static osgDB::PluginFunctionProxy proxy_osgearth_layer_##NAME(osgdb_##NAME);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Layer.cpp osgearth-2.10.2+dfsg/src/osgEarth/Layer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Layer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Layer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,7 @@
+
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,8 +20,6 @@
 #include <osgEarth/Layer>
 #include <osgEarth/Registry>
 #include <osgEarth/ShaderLoader>
-#include <osgDB/Registry>
-#include <osgUtil/CullVisitor>
 
 using namespace osgEarth;
 
@@ -40,6 +39,13 @@
     fromConfig(_conf);
 }
 
+void
+LayerOptions::setDefaults()
+{
+    _enabled.init(true);
+    _terrainPatch.init(false);
+}
+
 Config LayerOptions::getConfig() const
 {
     Config conf = ConfigOptions::getConfig();
@@ -47,21 +53,24 @@
     conf.set("enabled", _enabled);
     conf.set("cacheid", _cacheId);
     if (_cachePolicy.isSet() && !_cachePolicy->empty())
-        conf.setObj("cache_policy", _cachePolicy);
+        conf.set("cache_policy", _cachePolicy);
     conf.set("shader_define", _shaderDefine);
     conf.set("shader", _shader);
+    conf.set("attribution", _attribution);
+    conf.set("terrain", _terrainPatch);
     return conf;
 }
 
 void LayerOptions::fromConfig(const Config& conf)
 {
-    _enabled.init(true);
+    setDefaults();
 
-    conf.getIfSet("name", _name);
-    conf.getIfSet("enabled", _enabled);
-    conf.getIfSet("cache_id", _cacheId); // compat
-    conf.getIfSet("cacheid", _cacheId);
-    conf.getObjIfSet("cache_policy", _cachePolicy);
+    conf.get("name", _name);
+    conf.get("enabled", _enabled);
+    conf.get("cache_id", _cacheId); // compat
+    conf.get("cacheid", _cacheId);
+    conf.get("attribution", _attribution);
+    conf.get("cache_policy", _cachePolicy);
 
     // legacy support:
     if (!_cachePolicy.isSet())
@@ -71,8 +80,11 @@
         if ( conf.value<bool>( "cache_enabled", true ) == false )
             _cachePolicy->usage() = CachePolicy::USAGE_NO_CACHE;
     }
-    conf.getIfSet("shader_define", _shaderDefine);
-    conf.getIfSet("shader", _shader);
+    conf.get("shader_define", _shaderDefine);
+    conf.get("shader", _shader);
+
+    conf.get("terrain", _terrainPatch);
+    conf.get("patch", _terrainPatch);
 }
 
 void LayerOptions::mergeConfig(const Config& conf)
@@ -83,6 +95,14 @@
 
 //.................................................................
 
+void
+Layer::TraversalCallback::traverse(osg::Node* node, osg::NodeVisitor* nv) const
+{
+    node->accept(*nv);
+}
+
+//.................................................................
+
 Layer::Layer() :
 _options(&_optionsConcrete)
 {
@@ -107,12 +127,6 @@
     OE_DEBUG << LC << "~Layer\n";
 }
 
-//void
-//Layer::setReadOptions(const osgDB::Options* options)
-//{
-//    _readOptions = Registry::cloneOrCreateOptions(options);
-//}
-
 void
 Layer::setReadOptions(const osgDB::Options* readOptions)
 {
@@ -173,7 +187,9 @@
 Config
 Layer::getConfig() const
 {
-    return options().getConfig();
+    Config conf = options().getConfig();
+    conf.key() = getConfigKey();
+    return conf;
 }
 
 bool
@@ -183,8 +199,21 @@
 }
 
 void
+Layer::setEnabled(bool value)
+{
+    if (getStatus().isOK() && value != options().enabled().value())
+    {
+        options().enabled() = value;
+        fireCallback(&LayerCallback::onEnabledChanged);
+    }
+}
+
+void
 Layer::init()
 {
+    // For detecting scene graph changes at runtime
+    _sceneGraphCallbacks = new SceneGraphCallbacks(this);
+
     // Copy the layer options name into the Object name.
     // This happens here AND in open.
     if (options().name().isSet())
@@ -201,7 +230,7 @@
     {
         osg::Object::setName(options().name().get());
     }
-    
+
     // Install any shader #defines
     if (options().shaderDefine().isSet() && !options().shaderDefine()->empty())
     {
@@ -209,17 +238,25 @@
         getOrCreateStateSet()->setDefine(options().shaderDefine().get());
     }
 
-    // Load any user defined shaders
-    if (options().shader().isSet() && !options().shader()->empty())
+    return _status;
+}
+
+void
+Layer::close()
+{
+    setStatus(Status::OK());
+}
+
+void
+Layer::setTerrainResources(TerrainResources* res)
+{
+    // Install an earth-file shader if necessary (once)
+    if (options().shader().isSet() && !_shader.valid())
     {
-        OE_INFO << LC << "Installing inline shader code\n";
-        VirtualProgram* vp = VirtualProgram::getOrCreate(this->getOrCreateStateSet());
-        ShaderPackage package;
-        package.add("", options().shader().get());
-        package.loadAll(vp, getReadOptions());
+        OE_INFO << LC << "Installing inline shader code" << std::endl;
+        _shader = new LayerShader(options().shader().get());
+        _shader->install(this, res);
     }
-
-    return _status;
 }
 
 void
@@ -240,12 +277,8 @@
 Layer*
 Layer::create(const ConfigOptions& options)
 {
-    return create(options.getConfig().key(), options);
-}
+    std::string name = options.getConfig().key();
 
-Layer*
-Layer::create(const std::string& name, const ConfigOptions& options)
-{
     if ( name.empty() )
     {
         OE_WARN << "[Layer] ILLEGAL- Layer::create requires a plugin name" << std::endl;
@@ -289,6 +322,12 @@
     return data ? *static_cast<const ConfigOptions*>(data) : s_default;
 }
 
+SceneGraphCallbacks*
+Layer::getSceneGraphCallbacks() const
+{
+    return _sceneGraphCallbacks.get();
+}
+
 void
 Layer::addCallback(LayerCallback* cb)
 {
@@ -299,16 +338,33 @@
 Layer::removeCallback(LayerCallback* cb)
 {
     CallbackVector::iterator i = std::find( _callbacks.begin(), _callbacks.end(), cb );
-    if ( i != _callbacks.end() ) 
+    if ( i != _callbacks.end() )
         _callbacks.erase( i );
 }
 
-bool
-Layer::cull(const osgUtil::CullVisitor* cv, osg::State::StateSetStack& stateSetStack) const
+void
+Layer::apply(osg::Node* node, osg::NodeVisitor* nv) const
 {
-    //if (getStateSet())
-    //    cv->pushStateSet(getStateSet());
-    return true;
+    if (_traversalCallback.valid())
+    {
+        _traversalCallback->operator()(node, nv);
+    }
+    else
+    {
+        node->accept(*nv);
+    }
+}
+
+void
+Layer::setCullCallback(TraversalCallback* cb)
+{
+    _traversalCallback = cb;
+}
+
+const Layer::TraversalCallback*
+Layer::getCullCallback() const
+{
+    return _traversalCallback.get();
 }
 
 const GeoExtent&
@@ -327,4 +383,63 @@
         _stateSet->setName("Layer");
     }
     return _stateSet.get();
-}
\ No newline at end of file
+}
+
+osg::StateSet*
+Layer::getStateSet() const
+{
+    return _stateSet.get();
+}
+
+void
+Layer::fireCallback(LayerCallback::MethodPtr method)
+{
+    for (CallbackVector::iterator i = _callbacks.begin(); i != _callbacks.end(); ++i)
+    {
+        LayerCallback* cb = dynamic_cast<LayerCallback*>(i->get());
+        if (cb) (cb->*method)(this);
+    }
+}
+
+std::string
+Layer::getAttribution() const
+{
+    // Get the attribution from the layer if it's set.
+    if (_options->attribution().isSet())
+    {
+        return *_options->attribution();
+    }
+    return "";
+}
+
+void
+Layer::setAttribution(const std::string& attribution)
+{
+    _options->attribution() = attribution;
+}
+
+void
+Layer::resizeGLObjectBuffers(unsigned maxSize)
+{
+    osg::Object::resizeGLObjectBuffers(maxSize);
+    if (getNode())
+        getNode()->resizeGLObjectBuffers(maxSize);
+    if (getStateSet())
+        getStateSet()->resizeGLObjectBuffers(maxSize);
+}
+
+void
+Layer::releaseGLObjects(osg::State* state) const
+{
+    osg::Object::releaseGLObjects(state);
+    if (getNode())
+        getNode()->releaseGLObjects(state);
+    if (getStateSet())
+        getStateSet()->releaseGLObjects(state);
+}
+
+void
+Layer::modifyTileBoundingBox(const TileKey& key, osg::BoundingBox& box) const
+{
+    //NOP
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LayerListener osgearth-2.10.2+dfsg/src/osgEarth/LayerListener
--- osgearth-2.9.0+dfsg/src/osgEarth/LayerListener	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LayerListener	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LayerShader osgearth-2.10.2+dfsg/src/osgEarth/LayerShader
--- osgearth-2.9.0+dfsg/src/osgEarth/LayerShader	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LayerShader	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,100 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_LAYER_SHADER_H
+#define OSGEARTH_LAYER_SHADER_H 1
+
+#include <osgEarth/Config>
+#include <osgEarth/URI>
+#include <osgEarth/TerrainResources>
+#include <osgDB/Options>
+#include <vector>
+#include <string>
+
+namespace osg {
+    class StateSet;
+}
+
+namespace osgEarth
+{
+    class Layer;
+
+    //! Serializable shader that supports samplers and uniforms
+    //! in an earth file.
+    class OSGEARTH_EXPORT ShaderOptions : public ConfigOptions
+    {
+    public:
+        META_ConfigOptions(osgEarth, ShaderOptions, ConfigOptions);
+
+        struct Sampler
+        {
+            std::string      _name;
+            std::vector<URI> _uris;
+        };
+
+        struct Uniform
+        {
+            std::string     _name;
+            optional<float> _value;
+        };
+
+        void apply(osg::StateSet*, Layer*, TerrainResources*, const osgDB::Options*);
+
+    public:
+        std::string& code() { return _code; }
+        const std::string& code() const { return _code; }
+
+        std::vector<Sampler>& samplers() { return _samplers; }
+        const std::vector<Sampler>& samplers() const { return _samplers; }
+
+        std::vector<Uniform>& uniforms() { return _uniforms; }
+        const std::vector<Uniform>& uniforms() const { return _uniforms; }
+
+    public:
+        virtual Config getConfig() const;
+
+    private:
+        void fromConfig(const Config& conf);
+
+    private:
+        std::string _code;
+        std::vector<Sampler> _samplers;
+        std::vector<Uniform>  _uniforms;
+    };
+
+    //! Encapsulates a shader attached to a Layer (or other object).
+    /* internal */ class LayerShader : public osg::Referenced
+    {
+    public:
+        LayerShader(const ShaderOptions& options);
+
+        void install(Layer* layer, TerrainResources* res);
+
+    protected:
+        virtual ~LayerShader();
+
+    private:
+        const ShaderOptions _options;
+        std::vector<TextureImageUnitReservation> _reservations;
+    };
+
+} // namespace osgEarth
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::ShaderOptions);
+
+#endif // OSGEARTH_LAYER_SHADER_H
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LayerShader.cpp osgearth-2.10.2+dfsg/src/osgEarth/LayerShader.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/LayerShader.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LayerShader.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,221 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include <osgEarth/LayerShader>
+#include <osgEarth/ShaderLoader>
+#include <osgEarth/VirtualProgram>
+#include <osgEarth/Layer>
+#include <osg/Texture2D>
+#include <osg/Texture2DArray>
+
+#undef  LC
+#define LC "[LayerShader] "
+
+using namespace osgEarth;
+
+//...................................................................
+
+Config
+ShaderOptions::getConfig() const
+{
+    Config conf = ConfigOptions::getConfig();
+
+    if (!_code.empty())
+    {
+        conf.setValue(_code);
+    }
+
+    conf.remove("sampler");
+    for (unsigned i = 0; i < _samplers.size(); ++i) {
+        Config c("sampler");
+        c.add("name", _samplers[i]._name);
+        if (_samplers[i]._uris.size() > 1) {
+            Config urlarray("array");
+            c.add(urlarray);
+            for (std::vector<URI>::const_iterator j = _samplers[i]._uris.begin(); j != _samplers[i]._uris.end(); ++j) {
+                urlarray.add(j->getConfig());
+            }
+        }
+        else if (_samplers[i]._uris.size() == 1) {
+            c.add("url", _samplers[i]._uris.back().getConfig());
+        }
+        conf.add(c);
+    }
+
+    conf.remove("uniform");
+    for (unsigned i = 0; i < _uniforms.size(); ++i) {
+        Config c("uniform");
+        c.set("name", _uniforms[i]._name);
+        c.set("value", _uniforms[i]._value);
+        conf.add(c);
+    }
+
+    return conf;
+}
+
+void
+ShaderOptions::fromConfig(const Config& conf)
+{
+    _code = conf.value();
+
+    _samplers.clear();
+    ConfigSet s = conf.children("sampler");
+    for (ConfigSet::const_iterator i = s.begin(); i != s.end(); ++i) {
+        _samplers.push_back(Sampler());
+        _samplers.back()._name = i->value("name");
+        const Config* urlarray = i->find("array");
+        if (urlarray) {
+            ConfigSet uris = urlarray->children("url");
+            for (ConfigSet::const_iterator j = uris.begin(); j != uris.end(); ++j) {
+                URI uri(j->value(), URIContext(conf.referrer()));
+                _samplers.back()._uris.push_back(uri);
+            }
+        }
+        else {
+            optional<URI> uri;
+            i->get("url", uri);
+            if (uri.isSet())
+                _samplers.back()._uris.push_back(uri.get());
+        }
+    }
+
+    s = conf.children("uniform");
+    for (ConfigSet::const_iterator i = s.begin(); i != s.end(); ++i) {
+        _uniforms.push_back(Uniform());
+        _uniforms.back()._name = i->value("name");
+        i->get("value", _uniforms.back()._value);
+    }
+}
+
+//...................................................................
+
+LayerShader::LayerShader(const ShaderOptions& options) :
+_options(options)
+{
+    //nop
+}
+
+LayerShader::~LayerShader()
+{
+    //nop
+}
+
+void
+LayerShader::install(Layer* layer, TerrainResources* res)
+{
+    if (!layer || !res)
+        return;
+
+    osg::StateSet* stateset = layer->getOrCreateStateSet();
+
+    VirtualProgram* vp = VirtualProgram::getOrCreate(stateset);
+    ShaderPackage package;
+    package.add("", _options.code());
+    package.loadAll(vp, layer->getReadOptions());
+
+    for (int i = 0; i < _options.samplers().size(); ++i)
+    {
+        const ShaderOptions::Sampler& sampler = _options.samplers()[i];
+        if (!sampler._name.empty())
+        {
+            _reservations.push_back(TextureImageUnitReservation());
+            TextureImageUnitReservation& reservation = _reservations.back();
+
+            if (sampler._uris.size() == 1) // Texture2D
+            {
+                if (res->reserveTextureImageUnitForLayer(reservation, layer, "User shader sampler"))
+                {
+                    osg::Image* image = sampler._uris[0].getImage(layer->getReadOptions());
+                    if (image)
+                    {
+                        osg::Texture2D* tex = new osg::Texture2D(image);
+                        tex->setFilter(tex->MIN_FILTER, tex->NEAREST_MIPMAP_LINEAR);
+                        tex->setFilter(tex->MAG_FILTER, tex->LINEAR);
+                        tex->setWrap(tex->WRAP_S, tex->REPEAT);
+                        tex->setWrap(tex->WRAP_T, tex->REPEAT);
+                        tex->setUnRefImageDataAfterApply(true);
+                        tex->setMaxAnisotropy(4.0);
+                        tex->setResizeNonPowerOfTwoHint(false);
+
+                        stateset->setTextureAttribute(reservation.unit(), tex);
+                        stateset->addUniform(new osg::Uniform(sampler._name.c_str(), reservation.unit()));
+                    }
+                }
+                else
+                {
+                    OE_WARN << LC << "Failed to allocate a texture image unit for this terrain shader sampler!\n";
+                }
+            }
+
+            else if (sampler._uris.size() > 1) // Texture2DArray
+            {
+                if (res->reserveTextureImageUnitForLayer(reservation, layer, "User shader sampler array"))
+                {
+                    int sizeX = 0, sizeY = 0;
+                    osg::Texture2DArray* tex = new osg::Texture2DArray();
+                    tex->setTextureSize(512, 512, sampler._uris.size());
+                    tex->setTextureDepth(sampler._uris.size());
+
+                    for (int j = 0; j < sampler._uris.size(); ++j)
+                    {
+                        const URI& uri = sampler._uris[j];
+
+                        osg::ref_ptr<osg::Image> image = uri.getImage(layer->getReadOptions());
+                        if (image)
+                        {
+                            OE_INFO << LC << "   Added image from \"" << uri.full() << "\"\n";
+                            tex->setImage(i, image);
+                            tex->setFilter(tex->MIN_FILTER, tex->NEAREST_MIPMAP_LINEAR);
+                            tex->setFilter(tex->MAG_FILTER, tex->LINEAR);
+                            tex->setWrap(tex->WRAP_S, tex->CLAMP_TO_EDGE);
+                            tex->setWrap(tex->WRAP_T, tex->CLAMP_TO_EDGE);
+                            tex->setUnRefImageDataAfterApply(true);
+                            tex->setResizeNonPowerOfTwoHint(false);
+
+                            stateset->setTextureAttribute(reservation.unit(), tex);
+                            stateset->addUniform(new osg::Uniform(sampler._name.c_str(), reservation.unit()));
+
+                            if (sizeX == 0)
+                            {
+                                sizeX = image->s();
+                                sizeY = image->t();
+                                tex->setTextureSize(sizeX, sizeY, sampler._uris.size());
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    OE_WARN << LC << "Failed to allocate a texture image unit for this terrain shader sampler!\n";
+                }
+            }
+        }
+    }
+
+    for (int i = 0; i < _options.uniforms().size(); ++i)
+    {
+        const ShaderOptions::Uniform& uniform = _options.uniforms()[i];
+        if (!uniform._name.empty() && uniform._value.isSet())
+        {
+            osg::Uniform* u = new osg::Uniform(uniform._name.c_str(), (float)uniform._value.get());
+            stateset->addUniform(u);
+        }
+    }
+}
+
+//...................................................................
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Lighting osgearth-2.10.2+dfsg/src/osgEarth/Lighting
--- osgearth-2.9.0+dfsg/src/osgEarth/Lighting	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Lighting	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2015 Pelican Mapping
 * http://osgearth.org
 *
@@ -24,6 +24,7 @@
 #define OSGEARTH_LIGHTING_H 1
 
 #include <osgEarth/Common>
+#include <osgEarth/ThreadingUtils>
 #include <osg/Node>
 #include <osg/NodeVisitor>
 #include <osg/LightSource>
@@ -36,6 +37,15 @@
 
 namespace osgEarth
 {
+    struct OSGEARTH_EXPORT Lighting
+    {
+        //! Sets the lighting mode on a stateset
+        static void set(osg::StateSet* stateSet, osg::StateAttribute::OverrideValue value);
+
+        //! Removed the lighting mode from a stateset
+        static void remove(osg::StateSet* stateSet);
+    };
+
     /**
      * Traverses a graph, looking for Lights and Materials, and generates either static
      * uniforms or dynamic cull callbacks for them so they will work with core profile
@@ -131,6 +141,14 @@
     public: // osg::NodeCallback
 
         bool run(osg::Object* obj, osg::Object* data);
+
+    public: // osg::Object
+
+        void resizeGLBufferObjects(unsigned maxSize);
+        void releaseGLObjects(osg::State* state) const;
+
+        mutable std::vector<osg::ref_ptr<osg::StateSet> > _statesets;
+        mutable Threading::Mutex _statesetsMutex;
     };
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Lighting.cpp osgearth-2.10.2+dfsg/src/osgEarth/Lighting.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Lighting.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Lighting.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2015 Pelican Mapping
 * http://osgearth.org
 *
@@ -20,12 +20,10 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/Lighting>
-#include <osg/Program>
 #include <osgUtil/CullVisitor>
 #include <osgDB/ObjectWrapper>
-#include <osgDB/InputStream>
-#include <osgDB/OutputStream>
 #include <osgEarth/StringUtils>
+#include <osgEarth/GLUtils>
 
 using namespace osgEarth;
 
@@ -34,6 +32,21 @@
 // prefix to use for uniforms.
 #define UPREFIX "osg_"
 
+
+//............................................................................
+
+void
+Lighting::set(osg::StateSet* stateSet, osg::StateAttribute::OverrideValue value)
+{
+    GLUtils::setLighting(stateSet, value);
+}
+
+void
+Lighting::remove(osg::StateSet* stateSet)
+{
+    GLUtils::remove(stateSet, GL_LIGHTING);
+}
+
 //............................................................................
 
 GenerateGL3LightingUniforms::GenerateGL3LightingUniforms() :
@@ -145,8 +158,13 @@
         // Place these uniforms at the root stateset so they affect the entire graph:
         osg::StateSet* ss = cv->getCurrentRenderStage()->getStateSet();
         if (ss == 0L)
+        {
             cv->getCurrentRenderStage()->setStateSet(ss = new osg::StateSet());
 
+            Threading::ScopedMutexLock lock(_statesetsMutex);
+            _statesets.push_back(ss);
+        }
+
         ss->getOrCreateUniform(prefix + "ambient", osg::Uniform::FLOAT_VEC4)->set(light->getAmbient());
         ss->getOrCreateUniform(prefix + "diffuse", osg::Uniform::FLOAT_VEC4)->set(light->getDiffuse());
         ss->getOrCreateUniform(prefix + "specular", osg::Uniform::FLOAT_VEC4)->set(light->getSpecular());
@@ -192,6 +210,23 @@
     return traverse(obj, data);
 }
 
+void
+LightSourceGL3UniformGenerator::resizeGLBufferObjects(unsigned maxSize)
+{
+    Threading::ScopedMutexLock lock(_statesetsMutex);
+    for(unsigned i=0; i<_statesets.size(); ++i)
+        _statesets[i]->resizeGLObjectBuffers(maxSize);
+}
+
+void
+LightSourceGL3UniformGenerator::releaseGLObjects(osg::State* state) const
+{
+    Threading::ScopedMutexLock lock(_statesetsMutex);
+    for(unsigned i=0; i<_statesets.size(); ++i)
+        _statesets[i]->releaseGLObjects(state);
+    _statesets.clear();
+}
+
 //............................................................................
 void MaterialCallback::operator() (osg::StateAttribute* attr, osg::NodeVisitor* nv)
 {
@@ -229,7 +264,7 @@
 // Serializer for LightGL3.
 // The odd namespace name is here because this macro cannot be used more than once
 // in the same namespace in the same cpp file.
-namespace osgEarth_TEMP1
+namespace osgEarth { namespace Serializers { namespace LightGL3
 {
     REGISTER_OBJECT_WRAPPER(
         LightGL3,
@@ -239,7 +274,7 @@
     {
         ADD_BOOL_SERIALIZER(Enabled, true);
     }
-}
+} } }
 
 //............................................................................
 
@@ -248,17 +283,19 @@
 {
 #ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
     osg::Material::apply(state);
+#else
+    state.Color(_diffuseFront.r(), _diffuseFront.g(), _diffuseFront.b(), _diffuseFront.a());
 #endif
 }
 
 // Serializer for MaterialGL3.
 // The odd namespace name is here because this macro cannot be used more than once
 // in the same namespace in the same cpp file.
-namespace osgEarth_TEMP2
+namespace osgEarth { namespace Serializers { namespace MaterialGL3
 {
     REGISTER_OBJECT_WRAPPER(
         MaterialGL3,
         new osgEarth::MaterialGL3,
         osgEarth::MaterialGL3,
         "osg::Object osg::StateAttribute osg::Material osgEarth::MaterialGL3") { }
-}
\ No newline at end of file
+} } }
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LineDrawable osgearth-2.10.2+dfsg/src/osgEarth/LineDrawable
--- osgearth-2.9.0+dfsg/src/osgEarth/LineDrawable	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LineDrawable	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,279 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_LINEDRAWABLE_H
+#define OSGEARTH_LINEDRAWABLE_H 1
+
+#include <osgEarth/Common>
+#include <osg/Array>
+#include <osg/Geometry>
+#include <osg/Version>
+#include <osg/Geode>
+
+namespace osgEarth
+{
+    /**
+     * Drawable that renders lines using the GPU. It will fall back on rendering
+     * OpenGL lines when shader-based rendering is unavailable.
+     *
+     * Note: If you use this class you must have the oe_ViewportSize
+     * uniform set. MapNode sets it automatically so any LineDrawable under
+     * a MapNode is fine. Otherwise, use the osgEarth::InstallViewportSizeUniform
+     * callback on your scene graph.
+     *
+     * Note: Use the provided functions whenever possible. Do not access the
+     * underlying Geometry arrays directly. The implementation uses special
+     * formatting internally and accessing the arrays directly will probably
+     * cause trouble.
+     */
+    class OSGEARTH_EXPORT LineDrawable : public osg::Geometry
+    {
+    public:
+
+        //! Create new LineDrawable in GL_LINE_STRIP mode
+        LineDrawable();
+
+        //! Create a new LineDrawable.
+        //! @param[in ] mode GL line mode: GL_LINE_STRIP or GL_LINE_LOOP
+        LineDrawable(GLenum mode);
+
+        //! Copy constructor
+        LineDrawable(const LineDrawable& rhs, const osg::CopyOp& copy);
+
+        //! Width in pixels of the line
+        void setLineWidth(float width_pixels);
+        float getLineWidth() const { return _width; }
+
+        //! Stippling pattern for the line (default is 0xFFFF)
+        void setStipplePattern(GLushort pattern);
+        GLushort getStipplePattern() const { return _pattern; }
+
+        //! Stippling factor for the line (default is 1)
+        void setStippleFactor(GLint factor);
+        GLint getStippleFactor() const { return _factor; }
+
+        //! Line smoothing (antialiasing)
+        void setLineSmooth(bool value);
+        bool getLineSmooth() const { return _smooth; }
+
+        //! Sets the overall color of the line
+        void setColor(const osg::Vec4& color);
+        const osg::Vec4& getColor() const { return _color; }
+        
+        //! Append a vertex to the line
+        void pushVertex(const osg::Vec3& vert);
+
+        //! Set the value of a vertex at index i
+        void setVertex(unsigned i, const osg::Vec3& vert);
+
+        //! Gets the vertex at index i
+        const osg::Vec3& getVertex(unsigned i) const;
+
+        //! Sets the color of a vertex at index i
+        void setColor(unsigned i, const osg::Vec4& color);
+
+        //! Copy a vertex array into the drawable
+        void importVertexArray(const osg::Vec3Array* verts);
+        
+        //! Copy a vertex attribute array into the drawable
+        template<typename T>
+        void importVertexAttribArray(unsigned location, const T* data);
+        
+        //! Allocate space for vertices
+        void allocate(unsigned numVerts);
+
+        //! Clears all data
+        void clear();
+
+        //! Number of vertices in the drawable
+        unsigned getNumVerts() const;
+
+        //! Number of vertices in the drawable
+        unsigned size() const { return getNumVerts(); }
+
+        //! Appends a vertex to an attribute array. Use this instead of adding
+        //! to the array directly!
+        template<typename T>
+        void pushVertexAttrib(T* vaa, const typename T::ElementDataType& value);
+
+        //! Gets the value of the vertex attribute from an array at index i
+        template<typename T>
+        const typename T::ElementDataType& getVertexAttrib(const T* vaa, unsigned i) const;
+
+        //! Pre-allocate space for vertices
+        void reserve(unsigned size);
+
+        //! Index of the first vertex to draw (default = 0)
+        void setFirst(unsigned index);
+        unsigned getFirst() const;
+
+        //! Number of vertices to draw (default = 0, which means draw to the
+        //! end of the line
+        void setCount(unsigned count);
+        unsigned getCount() const;
+
+        //! Rebuild the primitive sets for this drawable. You MUST call this
+        //! after adding new data to the drawable!
+        void dirty();
+        void finish() { dirty(); }
+
+        //! Sets a line width on a custom stateset that will apply to
+        //! all LineDrawables used with that state set.
+        static void setLineWidth(osg::StateSet* stateSet, float value, int overrideFlags=osg::StateAttribute::ON);
+
+    public:
+
+        //! Binding location for "previous" vertex attribute (default = 9)
+        static int PreviousVertexAttrLocation;
+
+        //! Binding location for "next" vertex attribute (default = 10)
+        static int NextVertexAttrLocation;
+
+    public: // osg::Node
+
+        //! Replace methods from META_Node so we can override accept
+        virtual osg::Object* cloneType() const { return new LineDrawable(); }
+        virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new LineDrawable(*this,copyop); }
+        virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const LineDrawable*>(obj)!=NULL; }
+        virtual const char* className() const { return "LineDrawable"; }
+        virtual const char* libraryName() const { return "osgEarth"; }
+
+        //! Override Node::accept to include the singleton GPU statset
+        virtual void accept(osg::NodeVisitor& nv);
+
+    public: // osg::Object
+
+        virtual void resizeGLObjectBuffers(unsigned maxSize);
+        virtual void releaseGLObjects(osg::State* state) const;
+
+    public:
+            
+        //! GL mode (for serializer only; do not use)
+        void setMode(GLenum mode);
+        GLenum getMode() const { return _mode; }
+
+    protected:
+
+        //! destructor
+        virtual ~LineDrawable();
+
+    private:
+        GLenum _mode;
+        bool _gpu;
+        osg::Vec4 _color;
+        GLint _factor;
+        GLushort _pattern;
+        float _width;
+        bool _smooth;
+        unsigned _first;
+        unsigned _count;
+        osg::Vec3Array* _current;
+        osg::Vec3Array* _previous;
+        osg::Vec3Array* _next;
+        osg::Vec4Array* _colors;
+
+        void initialize();
+        void setupShaders();
+
+        friend class LineGroup;
+
+        unsigned actualVertsPerVirtualVert(unsigned) const;
+        unsigned numVirtualVerts(const osg::Array*) const;
+        unsigned getRealIndex(unsigned) const;
+        void updateFirstCount();
+
+        static osg::observer_ptr<osg::StateSet> s_gpuStateSet;
+        osg::ref_ptr<osg::StateSet> _gpuStateSet;
+    };
+
+
+    /**
+     * Group for importing LineDrawables from osg::Geometry or for
+     * optimizing multiple LineDrawables for performance.
+     *
+     * Note: LineGroup inherits from Geode (for now) to maintain support for
+     * the OSG 3.4 MergeGeometryVisitor (which only works on Geodes). Once we
+     * make OSG 3.6 the minimum supported version, we can change this to Group.
+     */
+    class OSGEARTH_EXPORT LineGroup : public osg::Geode
+    {
+    public:
+        META_Node(osgEarth, LineGroup);
+
+        //! Construct a new line group
+        LineGroup();
+
+        //! Copy constructor
+        LineGroup(const LineGroup& rhs, const osg::CopyOp& copy);
+
+        //! Imports any GL line drawables from a node graph, converts them
+        //! to LineDrawables, and adds them to this LineGroup. If will detect
+        //! and set any LineWidth or LineStipple attributes it finds, but will not
+        //! find any attributes that occur in the graph above the imported node.
+        //!
+        //! If you set removePrimitiveSets to true, it will remove all line-based
+        //! primitive sets from the node after import.
+        //!
+        //! This method is for quickly importing legacy scene graphs; if you are
+        //! writing new code, use the LineDrawable API directly instead!
+        void import(osg::Node* node, bool removePrimitiveSets =false);
+        
+        //! Optimize the LineDrawables under this group for performance.
+        //! Only call this after you finish adding drawables to your group.
+        //! It will attempt to combine drawables and state sets, but it will also
+        //! render the graph henceforth immutable.
+        void optimize();
+
+        //! Get child i as a LineDrawable
+        LineDrawable* getLineDrawable(unsigned i);
+
+    protected:
+        //! destructor
+        virtual ~LineGroup();
+    };
+
+    
+    // Template implementations ..........................................
+
+    template<typename T>
+    void LineDrawable::pushVertexAttrib(T* vaa, const typename T::ElementDataType& value)
+    {
+        unsigned nvv = numVirtualVerts(vaa);
+        unsigned num = actualVertsPerVirtualVert(nvv);
+        for (unsigned i = 0; i<num; ++i)
+            vaa->push_back(value);
+    }
+
+    template<typename T>
+    const typename T::ElementDataType& LineDrawable::getVertexAttrib(const T* vaa, unsigned i) const
+    {
+        return (*vaa)[getRealIndex(i)];
+    }
+
+    template<typename T>
+    void LineDrawable::importVertexAttribArray(unsigned location, const T* data)
+    {
+        T* vaa = osg::cloneType(data);
+        setVertexAttribArray(location, vaa);
+        for (unsigned i=0; i < data->getNumElements(); ++i)
+            pushVertexAttrib(vaa, (*data)[i]);
+    }
+
+} // namespace osgEarth
+
+#endif // OSGEARTH_LINEDRAWABLE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LineDrawable.cpp osgearth-2.10.2+dfsg/src/osgEarth/LineDrawable.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/LineDrawable.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LineDrawable.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,1255 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include <osgEarth/LineDrawable>
+#include <osgEarth/Shaders>
+#include <osgEarth/Registry>
+#include <osgEarth/Capabilities>
+#include <osgEarth/LineFunctor>
+#include <osgEarth/GLUtils>
+#include <osgEarth/CullingUtils>
+
+#include <osg/LineStipple>
+#include <osg/LineWidth>
+#include <osgUtil/Optimizer>
+
+#include <osgDB/ObjectWrapper>
+
+
+#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)
+#define OE_GLES_AVAILABLE
+#endif
+
+using namespace osgEarth;
+
+
+// References:
+// https://mattdesl.svbtle.com/drawing-lines-is-hard
+// https://github.com/mattdesl/webgl-lines
+
+
+#define LC "[LineGroup] "
+
+// Comment this out to test the non-GLSL path
+#define USE_GPU
+
+namespace osgEarth { namespace Serializers { namespace LineGroup
+{
+    REGISTER_OBJECT_WRAPPER(
+        LineGroup,
+        new osgEarth::LineGroup,
+        osgEarth::LineGroup,
+        "osg::Object osg::Node osg::Group osg::Geode osgEarth::LineGroup")
+    {
+        // no properties
+    }
+} } }
+
+LineGroup::LineGroup()
+{
+    //nop
+}
+
+LineGroup::LineGroup(const LineGroup& rhs, const osg::CopyOp& copy) :
+osg::Geode(rhs, copy)
+{
+    //nop
+}
+
+LineGroup::~LineGroup()
+{
+    //nop
+}
+
+namespace
+{
+    struct ImportLinesOperator
+    {
+        osg::Vec3Array* _verts;
+        osg::Vec4Array* _colors;
+        LineGroup* _group;
+        LineDrawable* _drawable;
+
+        virtual void setGeometry(osg::Geometry* geom)
+        {
+            _verts = dynamic_cast<osg::Vec3Array*>(geom->getVertexArray());
+            _colors = dynamic_cast<osg::Vec4Array*>(geom->getColorArray());
+        }
+
+        void line(unsigned i1, unsigned i2)
+        {
+            if (_verts)
+            {
+                _drawable->pushVertex((*_verts)[i1]);
+                _drawable->pushVertex((*_verts)[i2]);
+                if (_colors && _colors->size() == _verts->size())
+                {
+                    _drawable->setColor(_drawable->getNumVerts()-2, (*_colors)[_colors->size()-2]);
+                    _drawable->setColor(_drawable->getNumVerts()-1, (*_colors)[_colors->size()-1]);
+                }
+            }
+        }
+    };
+
+    typedef LineIndexFunctor<ImportLinesOperator> ImportLinesFunctorBase;
+
+    struct ImportLinesFunctor : public ImportLinesFunctorBase
+    {
+        osg::LineWidth* _width;
+        osg::LineStipple* _stipple;
+
+        ImportLinesFunctor(osg::Geometry* input, LineGroup* group, osg::LineWidth* width, osg::LineStipple* stipple)
+        {
+            setGeometry(input);
+            _group = group;
+            _drawable = 0L;
+            _width = width;
+            _stipple = stipple;
+        }
+
+        void emit()
+        {
+            if (_colors && _colors->getBinding() == osg::Array::BIND_OVERALL && _colors->size() > 0)
+            {
+                _drawable->setColor((*_colors)[0]);
+            }
+
+            _drawable->dirty();
+
+            if (_width)
+            {
+                _drawable->setLineWidth(_width->getWidth());
+            }
+
+            if (_stipple)
+            {
+                _drawable->setStipplePattern(_stipple->getPattern());
+                _drawable->setStippleFactor(_stipple->getFactor());
+            }
+
+            _group->addChild(_drawable);
+        }
+
+        virtual void drawArrays(GLenum mode,GLint first,GLsizei count)
+        {
+            if (mode == GL_LINES || mode == GL_LINE_STRIP || mode == GL_LINE_LOOP)
+            {
+                _drawable = new LineDrawable(GL_LINES);
+                ImportLinesFunctorBase::drawArrays(mode, first, count);
+                emit();
+            }
+        }
+
+        virtual void drawElements(GLenum mode,GLsizei count,const GLubyte* indices)
+        {
+            if (mode == GL_LINES || mode == GL_LINE_STRIP || mode == GL_LINE_LOOP)
+            {
+                _drawable = new LineDrawable(GL_LINES);
+                ImportLinesFunctorBase::drawElements(mode, count, indices);
+                emit();
+            }
+        }
+
+        virtual void drawElements(GLenum mode,GLsizei count,const GLushort* indices)
+        {
+            if (mode == GL_LINES || mode == GL_LINE_STRIP || mode == GL_LINE_LOOP)
+            {
+                _drawable = new LineDrawable(GL_LINES);
+                ImportLinesFunctorBase::drawElements(mode, count, indices);
+                emit();
+            }
+        }
+
+        virtual void drawElements(GLenum mode,GLsizei count,const GLuint* indices)
+        {
+            if (mode == GL_LINES || mode == GL_LINE_STRIP || mode == GL_LINE_LOOP)
+            {
+                _drawable = new LineDrawable(GL_LINES);
+                ImportLinesFunctorBase::drawElements(mode, count, indices);
+                emit();
+            }
+        }
+    };
+
+    
+
+    struct ImportLinesVisitor : public osg::NodeVisitor
+    {
+        LineGroup* _group;
+        bool _removePrimSets;
+        typedef std::pair<osg::Node*, osg::LineWidth*> Width;
+        typedef std::pair<osg::Node*, osg::LineStipple*> Stipple;
+        std::stack<Width> _width;
+        std::stack<Stipple> _stipple;
+
+        ImportLinesVisitor(LineGroup* group, bool removePrimSets) : _group(group), _removePrimSets(removePrimSets)
+        {
+            setTraversalMode(TRAVERSE_ALL_CHILDREN);
+            setNodeMaskOverride(~0);
+        }
+
+        void apply(osg::Node& node)
+        {
+            pushState(node);
+            traverse(node);
+            popState(node);
+        }
+
+        void apply(osg::Drawable& drawable)
+        {
+            pushState(drawable);
+            osg::Geometry* geom = drawable.asGeometry();
+            if (geom)
+            {
+                ImportLinesFunctor import(
+                    geom,
+                    _group,
+                    _width.empty() ? 0L : _width.top().second,
+                    _stipple.empty() ? 0L : _stipple.top().second);
+
+                drawable.accept(import);
+
+                if (_removePrimSets)
+                {
+                    for (int i = 0; i < (int)geom->getNumPrimitiveSets(); ++i)
+                    {
+                        GLenum mode = geom->getPrimitiveSet(i)->getMode();
+                        if (mode == GL_LINES || mode == GL_LINE_STRIP || mode == GL_LINE_LOOP)
+                        {
+                            geom->removePrimitiveSet(i--);
+                        }
+                    }
+                }
+            }
+            popState(drawable);
+        }
+
+        void pushState(osg::Node& node)
+        {
+            osg::StateSet* ss = node.getStateSet();
+            if (ss)
+            {
+                osg::LineWidth* width = dynamic_cast<osg::LineWidth*>(ss->getAttribute(osg::StateAttribute::LINEWIDTH));
+                if (width)
+                {
+                    _width.push(std::make_pair(&node, width));
+                }
+                osg::LineStipple* stipple = dynamic_cast<osg::LineStipple*>(ss->getAttribute(osg::StateAttribute::LINESTIPPLE));
+                if (stipple)
+                {
+                    _stipple.push(std::make_pair(&node, stipple));
+                }
+            }
+        }
+
+        void popState(osg::Node& node)
+        {
+            if (!_width.empty() && _width.top().first == &node)
+                _width.pop();
+            if (!_stipple.empty() && _stipple.top().first == &node)
+                _stipple.pop();
+        }
+    };
+}
+
+void
+LineGroup::import(osg::Node* node, bool removePrimitiveSets)
+{
+    if (node)
+    {
+        ImportLinesVisitor visitor(this, removePrimitiveSets);
+        node->accept(visitor);
+    }
+}
+
+void
+LineGroup::optimize()
+{
+    // Optimize state sharing so the MergeGeometryVisitor can work better.
+    // Without this step, the #defines used for width and stippling will
+    // hold up the merge.
+    osg::ref_ptr<StateSetCache> cache = new StateSetCache();
+    cache->optimize(this);
+
+    // Merge all non-dynamic drawables to reduce the total number of 
+    // OpenGL calls.
+    osgUtil::Optimizer::MergeGeometryVisitor mg;
+    mg.setTargetMaximumNumberOfVertices(65536);
+    accept(mg);
+}
+
+LineDrawable*
+LineGroup::getLineDrawable(unsigned i)
+{
+    return i < getNumChildren() ? dynamic_cast<LineDrawable*>(getChild(i)) : 0L;
+}
+
+//...................................................................
+
+#undef  LC
+#define LC "[LineDrawable] "
+
+
+namespace osgEarth { namespace Serializers { namespace LineDrawable
+{
+    REGISTER_OBJECT_WRAPPER(
+        LineDrawable,
+        new osgEarth::LineDrawable,
+        osgEarth::LineDrawable,
+        "osg::Object osg::Node osg::Drawable osg::Geometry osgEarth::LineDrawable")
+    {
+        ADD_UINT_SERIALIZER( Mode, GL_LINE_STRIP );
+        ADD_INT_SERIALIZER( StippleFactor, 1 );
+        ADD_USHORT_SERIALIZER( StipplePattern, 0xFFFF );
+        ADD_VEC4_SERIALIZER( Color, osg::Vec4(1,1,1,1) );
+        ADD_FLOAT_SERIALIZER( LineWidth, 1.0f );
+        ADD_UINT_SERIALIZER( First, 0u );
+        ADD_UINT_SERIALIZER( Count, 0u );
+    }
+} } }
+
+// static attribute binding locations. Changable by the user.
+int LineDrawable::PreviousVertexAttrLocation = 9;
+int LineDrawable::NextVertexAttrLocation = 10;
+
+LineDrawable::LineDrawable() :
+osg::Geometry(),
+_mode(GL_LINE_STRIP),
+_gpu(false),
+_factor(1),
+_pattern(0xFFFF),
+_color(1, 1, 1, 1),
+_width(1.0f),
+_smooth(false),
+_first(0u),
+_count(0u),
+_current(NULL),
+_previous(NULL),
+_next(NULL),
+_colors(NULL)
+{
+#ifdef USE_GPU
+    _gpu = Registry::capabilities().supportsGLSL();
+    setupShaders();
+#endif
+}
+
+LineDrawable::LineDrawable(GLenum mode) :
+osg::Geometry(),
+_mode(mode),
+_gpu(false),
+_factor(1),
+_pattern(0xFFFF),
+_color(1,1,1,1),
+_width(1.0f),
+_smooth(false),
+_first(0u),
+_count(0u),
+_current(NULL),
+_previous(NULL),
+_next(NULL),
+_colors(NULL)
+{
+#ifdef USE_GPU
+    _gpu = 
+        Registry::capabilities().supportsGLSL() &&
+        (_mode == GL_LINES || _mode == GL_LINE_STRIP || _mode == GL_LINE_LOOP);
+
+    setupShaders();
+#endif
+}
+
+LineDrawable::LineDrawable(const LineDrawable& rhs, const osg::CopyOp& copy) :
+osg::Geometry(rhs, copy),
+_mode(rhs._mode),
+_gpu(rhs._gpu),
+_color(rhs._color),
+_factor(rhs._factor),
+_pattern(rhs._pattern),
+_width(rhs._width),
+_smooth(rhs._smooth),
+_first(rhs._first),
+_count(rhs._count),
+_current(NULL),
+_previous(NULL),
+_next(NULL),
+_colors(NULL)
+{
+    _current = static_cast<osg::Vec3Array*>(getVertexArray());
+
+    if (_gpu)
+    {
+        _previous = static_cast<osg::Vec3Array*>(getVertexAttribArray(PreviousVertexAttrLocation));
+        _next = static_cast<osg::Vec3Array*>(getVertexAttribArray(NextVertexAttrLocation));
+    }
+
+    setupShaders();
+}
+
+LineDrawable::~LineDrawable()
+{
+    //nop
+}
+
+void
+LineDrawable::initialize()
+{
+    // Already initialized?
+    if (_current)
+        return;
+
+    // See if the arrays already exist:
+    _current = static_cast<osg::Vec3Array*>(getVertexArray());
+    if (_gpu)
+    {
+        _previous = static_cast<osg::Vec3Array*>(getVertexAttribArray(PreviousVertexAttrLocation));
+        _next = static_cast<osg::Vec3Array*>(getVertexAttribArray(NextVertexAttrLocation));
+    }
+
+    setUseVertexBufferObjects(_supportsVertexBufferObjects);
+    setUseDisplayList(false);
+
+    if (!_current)
+    {
+        _current = new osg::Vec3Array();
+        _current->setBinding(osg::Array::BIND_PER_VERTEX);
+        setVertexArray(_current);
+
+        _colors = new osg::Vec4Array();
+        _colors->setBinding(osg::Array::BIND_PER_VERTEX);
+        setColorArray(_colors);
+
+        if (_gpu)
+        {
+            _previous = new osg::Vec3Array();
+            _previous->setBinding(osg::Array::BIND_PER_VERTEX);
+            _previous->setNormalize(false);
+            setVertexAttribArray(PreviousVertexAttrLocation, _previous);  
+
+            _next = new osg::Vec3Array();
+            _next->setBinding(osg::Array::BIND_PER_VERTEX);
+            _next->setNormalize(false);
+            setVertexAttribArray(NextVertexAttrLocation, _next);
+        }
+    }
+}
+
+void
+LineDrawable::setMode(GLenum mode)
+{
+    if (_mode != mode)
+    {
+        _mode = mode;
+    }
+}
+
+void
+LineDrawable::setLineWidth(float value)
+{
+    if (_width != value)
+    {
+        _width = value;
+        GLUtils::setLineWidth(getOrCreateStateSet(), value, 1);
+    }
+}
+
+void
+LineDrawable::setLineWidth(osg::StateSet* stateSet, float value, int overrideFlags)
+{
+    GLUtils::setLineWidth(stateSet, value, overrideFlags);
+}
+
+void
+LineDrawable::setStipplePattern(GLushort pattern)
+{
+    //if (_pattern != pattern)
+    {
+        _pattern = pattern;
+        GLUtils::setLineStipple(getOrCreateStateSet(), _factor, _pattern, 1);
+    }
+}
+
+void
+LineDrawable::setStippleFactor(GLint factor)
+{
+    if (_factor != factor)
+    {
+        _factor = factor;
+        GLUtils::setLineStipple(getOrCreateStateSet(), _factor, _pattern, 1);
+    }
+}
+
+void
+LineDrawable::setLineSmooth(bool value)
+{
+    if (_smooth != value)
+    {
+        _smooth = value;
+        GLUtils::setLineSmooth(getOrCreateStateSet(), _smooth? 1 : 0);
+    }
+}
+
+void
+LineDrawable::setColor(const osg::Vec4& color)
+{
+    if (_color != color)
+    {
+        initialize();
+
+        _color = color;
+        if (_colors && !_colors->empty())
+        {
+            _colors->assign(_colors->size(), _color);
+            _colors->dirty();
+        }
+    }
+}
+
+void
+LineDrawable::setColor(unsigned vi, const osg::Vec4& color)
+{
+    if (_gpu)
+    {
+        if (_mode == GL_LINE_STRIP || _mode == GL_LINE_LOOP)
+        {
+            if (vi == 0)
+            {
+                for (unsigned i=0; i<2; ++i)
+                    (*_colors)[i] = color;
+                for (unsigned i=_colors->size()-2; i<_colors->size(); ++i)
+                    (*_colors)[i] = color;
+            }
+            else
+                for (unsigned i=vi*4-2; i<vi*4+2; ++i)
+                    (*_colors)[i] = color;
+        }
+        else
+        {
+            (*_colors)[vi*2u] = color;
+            (*_colors)[vi*2u+1] = color;
+        }
+    }
+    else
+    {
+        (*_colors)[vi] = color;
+    }
+    _colors->dirty();
+}
+
+void
+LineDrawable::setFirst(unsigned value)
+{
+    _first = value;
+    updateFirstCount();
+}
+
+unsigned
+LineDrawable::getFirst() const
+{
+    return _first;
+}
+
+void
+LineDrawable::setCount(unsigned value)
+{
+    _count = value;
+    updateFirstCount();
+}
+
+unsigned
+LineDrawable::getCount() const
+{
+    return _count;
+}
+
+void
+LineDrawable::updateFirstCount()
+{
+    if (_gpu)
+    {
+        osg::StateSet* ss = getOrCreateStateSet();
+        ss->setDataVariance(ss->DYNAMIC);
+
+        osg::Uniform* u = ss->getUniform("oe_LineDrawable_limits");
+        if (!u)
+        {
+            u = new osg::Uniform(osg::Uniform::FLOAT_VEC2, "oe_LineDrawable_limits");
+            ss->addUniform(u, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+        }
+
+        if (_mode == GL_LINE_STRIP)
+        {
+            u->set(osg::Vec2(4u*_first + 2u, 4u*(_first+_count-1u)+1u));
+        }
+        else if (_mode == GL_LINES)
+        {
+            u->set(osg::Vec2(2u * _first, _count > 1u ? 2u * (_first + _count) - 1u : 0u));
+        }
+    }
+    else
+    {
+        if (getNumPrimitiveSets() > 0)
+        {
+            osg::DrawArrays* da = dynamic_cast<osg::DrawArrays*>(getPrimitiveSet(0));
+            if (da)
+            {
+                da->setFirst(_first);
+                da->dirty();
+            }
+        }
+    }
+}
+
+void
+LineDrawable::pushVertex(const osg::Vec3& vert)
+{
+    initialize();
+
+    if (_gpu)
+    {
+        if (_mode == GL_LINE_STRIP)
+        {
+            bool first = _current->empty();
+
+            _previous->push_back(first ? vert : _current->back());
+            _previous->push_back(first ? vert : _current->back());
+            _previous->push_back(first ? vert : _current->back());
+            _previous->push_back(first ? vert : _current->back());
+
+            if (!first)
+            {
+                *(_next->end() - 4) = vert;
+                *(_next->end() - 3) = vert;
+                *(_next->end() - 2) = vert;
+                *(_next->end() - 1) = vert;
+            }
+
+            _current->push_back(vert);
+            _current->push_back(vert);
+            _current->push_back(vert);
+            _current->push_back(vert);
+
+            _next->push_back(vert);
+            _next->push_back(vert);
+            _next->push_back(vert);
+            _next->push_back(vert);
+
+            _colors->push_back(_color);
+            _colors->push_back(_color);
+            _colors->push_back(_color);
+            _colors->push_back(_color);
+        }
+
+        else if (_mode == GL_LINE_LOOP)
+        {
+            bool first = _current->empty();
+
+            _previous->push_back(first ? vert : _current->back());
+            _previous->push_back(first ? vert : _current->back());
+            _previous->push_back(first ? vert : _current->back());
+            _previous->push_back(first ? vert : _current->back());
+
+            if (!first)
+            {
+                *(_next->end() - 4) = vert;
+                *(_next->end() - 3) = vert;
+                *(_next->end() - 2) = vert;
+                *(_next->end() - 1) = vert;
+
+                (*_previous)[0] = vert;
+                (*_previous)[1] = vert;
+                (*_previous)[2] = vert;
+                (*_previous)[3] = vert;
+            }
+
+            _current->push_back(vert);
+            _current->push_back(vert);
+            _current->push_back(vert);
+            _current->push_back(vert);
+
+            _next->push_back(_current->front());
+            _next->push_back(_current->front());
+            _next->push_back(_current->front());
+            _next->push_back(_current->front());
+
+            _colors->push_back(_color);
+            _colors->push_back(_color);
+            _colors->push_back(_color);
+            _colors->push_back(_color);
+        }
+
+        else if (_mode == GL_LINES)
+        {
+            bool first = ((_current->size() / 2) & 0x01) == 0;
+
+            if (first)
+            {
+                _previous->push_back(vert);
+                _previous->push_back(vert);
+
+                _next->push_back(vert);
+                _next->push_back(vert);
+            }
+            else
+            {
+                _previous->push_back(_current->back());
+                _previous->push_back(_current->back());
+
+                *(_next->end() - 2) = vert;
+                *(_next->end() - 1) = vert;
+
+                _next->push_back(vert);
+                _next->push_back(vert);
+            }
+
+            _current->push_back(vert);
+            _current->push_back(vert);
+
+            _colors->push_back(_color);
+            _colors->push_back(_color);
+        }
+
+        _previous->dirty();
+        _next->dirty();
+    }
+
+    else
+    {
+        _current->push_back(vert);
+        _colors->push_back(_color);
+    }
+
+    _current->dirty();
+    _colors->dirty();
+}
+
+void
+LineDrawable::setVertex(unsigned vi, const osg::Vec3& vert)
+{
+    initialize();
+
+    // if we've already called dirty() that means we are editing a completed
+    // drawable and therefore need dynamic variance.
+    if (getNumPrimitiveSets() > 0u && getDataVariance() != DYNAMIC)
+    {
+        setDataVariance(DYNAMIC);
+    }
+
+    unsigned size = _current->size();
+    unsigned numVerts = getNumVerts();
+    
+    // "vi" = virtual index, "ri" = real index.
+
+    if (vi < numVerts)
+    {
+        if (_gpu)
+        {
+            if (_mode == GL_LINE_STRIP)
+            {
+                unsigned ri = vi*4u;
+                unsigned rnum = 4u; // number of real verts to set
+
+                // update the main verts:
+                for (unsigned n = ri; n < ri+rnum; ++n)
+                {
+                    (*_current)[n] = vert;
+                }
+                _current->dirty();
+
+                // update next/previous verts:
+                if (numVerts == 1u)
+                {
+                    for(unsigned i=0; i<4; ++i)
+                    {
+                        (*_next)[i] = (*_previous)[i] = vert;
+                    }
+                    _next->dirty();
+                    _previous->dirty();
+                }
+                else 
+                {
+                    if (vi > 0u)
+                    {
+                        unsigned rni = ri-4u;
+                        for (unsigned n = 0; n < rnum; ++n)
+                        {
+                            (*_next)[rni + n] = vert;
+                        }
+                        _next->dirty();
+                    }
+                    else // if vi == 0
+                    {
+                        for (unsigned n = 0; n < rnum; ++n)
+                        {
+                            (*_previous)[n] = vert;
+                        }
+                        _previous->dirty();
+                    }
+
+                    if (vi < numVerts-1)
+                    {
+                        unsigned rpi = ri+4u;
+                        for (unsigned n = 0; n < rnum; ++n)
+                        {
+                            (*_previous)[rpi + n] = vert;
+                        }
+                        _previous->dirty();
+                    }
+                    else // if (vi == numVerts-1)
+                    {
+                        for (unsigned n = 0; n < rnum; ++n)
+                        {
+                            (*_next)[ri+n] = vert;
+                        }
+                        _next->dirty();
+                    }
+                }
+            }
+
+            else if (_mode == GL_LINE_LOOP)
+            {
+                unsigned ri = vi*4u; // starting real index
+                unsigned rnum = 4u; // number of real verts to set
+
+                // update the main verts:
+                for (unsigned n = ri; n < ri+rnum; ++n)
+                {
+                    (*_current)[n] = vert;
+                }
+                _current->dirty();
+
+                // update next/previous verts:
+                if (numVerts == 1u)
+                {
+                    for(unsigned i=0; i<4; ++i)
+                    {
+                        (*_next)[i] = (*_previous)[i] = vert;
+                    }
+                }
+                else 
+                {
+                    unsigned rni = vi==0u? numVerts-4u : ri-4u;
+                    unsigned rpi = vi==numVerts-1u ? 0u : ri+4u;
+
+                    for(unsigned n=0; n<rnum; ++n)
+                    {
+                        (*_next)[rni+n] = vert;
+                        (*_previous)[rpi+n] = vert;
+                    }
+                }
+                
+                _next->dirty();
+                _previous->dirty();
+            }
+
+            else if (_mode == GL_LINES)
+            {
+                unsigned ri = vi * 2u;
+
+                (*_current)[ri] = vert;
+                (*_current)[ri + 1] = vert;
+                _current->dirty();
+
+                bool first = (vi & 0x01) == 0;
+                if (first)
+                {
+                    (*_previous)[ri] = vert;
+                    (*_previous)[ri+1] = vert;
+                    (*_previous)[ri+2] = vert;
+                    (*_previous)[ri+3] = vert;
+                    _previous->dirty();
+                }
+                else
+                {
+                    (*_next)[ri+1] = vert;
+                    (*_next)[ri] = vert;
+                    (*_next)[ri-1] = vert;
+                    (*_next)[ri-2] = vert;
+                    _next->dirty();
+                }
+            }
+        }
+
+        else
+        {
+            (*_current)[vi] = vert;
+            _current->dirty();
+        }
+
+        dirtyBound();
+    }
+}
+
+const osg::Vec3&
+LineDrawable::getVertex(unsigned index) const
+{
+    return (*_current)[getRealIndex(index)];
+}
+
+unsigned
+LineDrawable::getRealIndex(unsigned index) const
+{
+    if (_gpu)
+        return (_mode == GL_LINE_STRIP || _mode == GL_LINE_LOOP) ? index*4u : index*2u;
+    else
+        return index;
+}
+
+void
+LineDrawable::importVertexArray(const osg::Vec3Array* verts)
+{
+    initialize();
+
+    _current->clear();
+    _colors->clear();
+    if (verts && verts->size() > 0)
+    {
+        if (_gpu)
+        {
+            _previous->clear();
+            _next->clear();
+        }
+
+        reserve(verts->size());
+
+        for (osg::Vec3Array::const_iterator i = verts->begin(); i != verts->end(); ++i)
+        {
+            pushVertex(*i);
+        }
+    }
+
+    dirty();
+}
+
+void
+LineDrawable::allocate(unsigned numVerts)
+{
+    initialize();
+
+    unsigned num = getNumVerts();
+    if (numVerts >= num)
+    {
+        for (unsigned i = num; i < numVerts; ++i)
+        {
+            pushVertex(osg::Vec3(0,0,0));
+        }
+    }
+    else
+    {
+        clear();
+        for (unsigned i = 0; i < numVerts; ++i)
+        {
+            pushVertex(osg::Vec3(0,0,0));
+        }
+    }
+
+    dirty();
+}
+
+// Calculates the "virtual" number of vertices in this drawable.
+// The actual number of vertices depends on the GL mode.
+unsigned
+LineDrawable::getNumVerts() const
+{
+    if (!_current || _current->empty())
+        return 0u;
+
+    if (_gpu)
+    {
+        if (_mode == GL_LINE_STRIP || _mode == GL_LINE_LOOP)
+            return _current->size()/4; //_current->size() == 2 ? 1 : (_current->size()+2)/4;
+        else
+            return _current->size()/2;
+    }
+    else
+    {
+        return _current->size();
+    }
+}
+
+unsigned
+LineDrawable::actualVertsPerVirtualVert(unsigned index) const
+{
+    if (_gpu)
+        if (_mode == GL_LINE_STRIP || _mode == GL_LINE_LOOP)
+            return 4u; //index == 0u? 2u : 4u;
+        else 
+            return 2u;
+    else
+        return 1u;
+}
+
+unsigned
+LineDrawable::numVirtualVerts(const osg::Array* a) const
+{
+    unsigned n = a->getNumElements();
+    if (n == 0u)
+        return 0u;
+
+    if (_gpu)
+        if (_mode == GL_LINE_STRIP || _mode == GL_LINE_LOOP)
+            return n/4u; //n == 2u ? 1u : (n+2u)/4u;
+        else
+            return n/2u;
+    else
+        return n;
+}
+
+void
+LineDrawable::reserve(unsigned size)
+{
+    initialize();
+
+    unsigned actualSize = size;
+    if (_gpu)
+    {
+        actualSize = (_mode == GL_LINE_STRIP || _mode == GL_LINE_LOOP) ? size*4u : size*2u;
+    }
+
+    if (actualSize > _current->size())
+    {
+        ArrayList arrays;
+        getArrayList(arrays);
+        for (ArrayList::iterator i = arrays.begin(); i != arrays.end(); ++i)
+            i->get()->reserveArray(actualSize);
+    }
+}
+
+void
+LineDrawable::clear()
+{
+    initialize();
+
+    unsigned n = getNumVerts();
+    if (n > 0u)
+    {
+        ArrayList arrays;
+        getArrayList(arrays);
+        for (ArrayList::iterator i = arrays.begin(); i != arrays.end(); ++i)
+        {
+            i->get()->resizeArray(0);
+        }
+        reserve(n);
+    }
+}
+
+namespace
+{
+    osg::DrawElements* makeDE(unsigned size)
+    {
+        osg::DrawElements* de =
+#ifndef OE_GLES_AVAILABLE
+            size > 0xFFFF ? (osg::DrawElements*)new osg::DrawElementsUInt(GL_TRIANGLES) :
+#endif
+            size > 0xFF ?   (osg::DrawElements*)new osg::DrawElementsUShort(GL_TRIANGLES) :
+                            (osg::DrawElements*)new osg::DrawElementsUByte(GL_TRIANGLES);
+        de->reserveElements(size);
+        return de;
+    }
+}
+
+void
+LineDrawable::dirty()
+{
+    initialize();
+
+    dirtyBound();
+
+    _current->dirty();
+
+    if (_gpu)
+    {
+        _previous->dirty();
+        _next->dirty();
+    }
+
+    // rebuild primitive sets.
+    if (getNumPrimitiveSets() > 0)
+    {
+        removePrimitiveSet(0, 1);
+    }
+
+    if (_gpu && _current->size() >= 4)
+    {
+        // IMPORTANT!
+        // Don't change the order of the elements! Because of the way
+        // GPU line stippling works, it is critical that the provoking vertex
+        // be at the beginning of each line segment. In this case we are using
+        // GL_TRIANGLES and thus the provoking vertex (PV) is the FINAL vert
+        // in each triangle.
+
+        if (_mode == GL_LINE_STRIP)
+        {
+            unsigned numEls = (getNumVerts()-1)*6;
+            osg::DrawElements* els = makeDE(numEls);  
+
+            for (int e = 2; e < _current->size() - 2; e += 4)
+            {
+                els->addElement(e+3);
+                els->addElement(e+1);
+                els->addElement(e+0); // PV
+                els->addElement(e+2);
+                els->addElement(e+3);
+                els->addElement(e+0); // PV
+            }
+            
+            addPrimitiveSet(els);
+        }
+
+        else if (_mode == GL_LINE_LOOP)
+        {
+            unsigned numEls = getNumVerts()*6;
+            osg::DrawElements* els = makeDE(numEls); 
+
+            int e;
+            for (e = 2; e < _current->size() - 2; e += 4)
+            {
+                els->addElement(e+3);
+                els->addElement(e+1);
+                els->addElement(e+0); // PV
+                els->addElement(e+2);
+                els->addElement(e+3);
+                els->addElement(e+0); // PV
+            }
+
+            els->addElement(1);
+            els->addElement(e+1);
+            els->addElement(e+0); // PV
+            els->addElement(0);
+            els->addElement(1);
+            els->addElement(e+0); // PV
+            
+            addPrimitiveSet(els);
+        }
+
+        else if (_mode == GL_LINES)
+        {
+            // if there are an odd number of verts, ignore the last one.
+            unsigned numVerts = getNumVerts();
+            if (numVerts & 0x01) --numVerts;
+
+            if (numVerts > 0u)
+            {
+                unsigned numEls = (numVerts/2)*6;
+                osg::DrawElements* els = makeDE(numEls);  
+
+                for(unsigned e=0; e<numVerts*2u; e += 4)
+                {
+                //for (int e = 0; e < _current->size(); e += 4)
+                    els->addElement(e+3);
+                    els->addElement(e+1);
+                    els->addElement(e+0); // PV
+                    els->addElement(e+2);
+                    els->addElement(e+3);
+                    els->addElement(e+0); // PV
+                }
+
+                addPrimitiveSet(els);
+            }
+        }
+    }
+
+    else
+    {
+        ArrayList arrays;
+        getArrayList(arrays);
+        for (unsigned i = 0; i<arrays.size(); ++i)
+            arrays[i]->dirty();
+
+        addPrimitiveSet(new osg::DrawArrays(_mode, _first, _count > 0u? _count : _current->size()));
+    }
+}
+
+osg::observer_ptr<osg::StateSet> LineDrawable::s_gpuStateSet;
+
+void
+LineDrawable::setupShaders()
+{
+    // Create the singleton state set for the line shader. This stateset will be
+    // shared by all LineDrawable instances so OSG will sort them together.
+    if (_gpu && !_gpuStateSet.valid())
+    {
+        if (s_gpuStateSet.lock(_gpuStateSet) == false)
+        {
+            // serialize access and double-check:
+            static Threading::Mutex s_mutex;
+            Threading::ScopedMutexLock lock(s_mutex);
+
+            if (s_gpuStateSet.lock(_gpuStateSet) == false)
+            {
+                s_gpuStateSet = _gpuStateSet = new osg::StateSet();
+
+                VirtualProgram* vp = VirtualProgram::getOrCreate(s_gpuStateSet.get());
+                vp->setName("osgEarth::LineDrawable");
+                Shaders shaders;
+                shaders.load(vp, shaders.LineDrawable);
+                vp->addBindAttribLocation("oe_LineDrawable_prev", LineDrawable::PreviousVertexAttrLocation);
+                vp->addBindAttribLocation("oe_LineDrawable_next", LineDrawable::NextVertexAttrLocation);
+                s_gpuStateSet->getOrCreateUniform("oe_LineDrawable_limits", osg::Uniform::FLOAT_VEC2)->set(osg::Vec2f(-1, -1));
+                s_gpuStateSet->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE | osg::StateAttribute::PROTECTED);
+            }
+        }
+    }
+}
+
+void
+LineDrawable::accept(osg::NodeVisitor& nv)
+{
+    if (nv.validNodeMask(*this))
+    { 
+        // Only push the shader if necessary.
+        // The reason for this approach is go we can inject the singleton 
+        // LineDrawable shader yet still allow the user to customize 
+        // the node's StateSet.
+        bool shade =
+            _gpu &&
+            nv.getVisitorType() == nv.CULL_VISITOR &&
+            _gpuStateSet.valid();
+
+        osgUtil::CullVisitor* cv = shade? Culling::asCullVisitor(nv) : 0L;
+
+        nv.pushOntoNodePath(this);
+
+        if (cv)
+            cv->pushStateSet(_gpuStateSet.get());
+
+        nv.apply(*this); 
+
+        if (cv)
+            cv->popStateSet();
+
+        nv.popFromNodePath();
+    }
+}
+
+
+void
+LineDrawable::resizeGLObjectBuffers(unsigned maxSize)
+{
+    osg::Geometry::resizeGLObjectBuffers(maxSize);
+    if (_gpuStateSet.valid())
+        _gpuStateSet->resizeGLObjectBuffers(maxSize);
+}
+
+void
+LineDrawable::releaseGLObjects(osg::State* state) const
+{
+    osg::Geometry::releaseGLObjects(state);
+    if (_gpuStateSet.valid())
+        _gpuStateSet->releaseGLObjects(state);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LineDrawable.glsl osgearth-2.10.2+dfsg/src/osgEarth/LineDrawable.glsl
--- osgearth-2.9.0+dfsg/src/osgEarth/LineDrawable.glsl	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LineDrawable.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,270 @@
+#version $GLSL_VERSION_STR
+$GLSL_DEFAULT_PRECISION_FLOAT
+#pragma vp_name GPU Lines Screen Projected Model
+#pragma vp_entryPoint oe_LineDrawable_VS_VIEW
+#pragma vp_location vertex_view
+#pragma vp_order last
+
+uniform vec2 oe_LineDrawable_limits;
+flat out int oe_LineDrawable_draw;
+
+// Input attributes for adjacent points
+in vec3 oe_LineDrawable_prev;
+in vec3 oe_LineDrawable_next;
+
+// Shared stage globals
+vec4 oe_LineDrawable_prevView;
+vec4 oe_LineDrawable_nextView;
+
+void oe_LineDrawable_VS_VIEW(inout vec4 currView)
+{
+    oe_LineDrawable_draw = 1;
+    int first = int(oe_LineDrawable_limits[0]);
+    int last = int(oe_LineDrawable_limits[1]);
+    if (first >= 0)
+    {
+        if (gl_VertexID < first || (last > 0 && gl_VertexID > last))
+        {
+            oe_LineDrawable_draw = 0;
+        }
+    }
+
+    // Compute the change in the view vertex so that we can apply the same
+    // delta to the prev and next vectors. (An example would be if the verts
+    // were GPU-clamped or otherwise permuted in another shader component.)
+    vec4 originalView = gl_ModelViewMatrix * gl_Vertex;
+    vec4 deltaView = currView - originalView;
+
+    // calculate prev/next points in post-transform view space:
+    oe_LineDrawable_prevView = gl_ModelViewMatrix * vec4(oe_LineDrawable_prev,1) + deltaView;
+    oe_LineDrawable_nextView = gl_ModelViewMatrix * vec4(oe_LineDrawable_next,1) + deltaView;
+
+    // clamp the current vertex to the near clip plane (or at least to Z=0)
+    // to prevent clip space coordinate freakouts! (only in perspective camera)
+    if (currView.z > 0.0 && gl_ProjectionMatrix[3][3] == 0.0)
+    {
+        if (oe_LineDrawable_prevView != currView)
+        {
+            vec3 v = currView.xyz-oe_LineDrawable_prevView.xyz;
+            float r = -oe_LineDrawable_prevView.z / v.z;
+            currView.xyz = oe_LineDrawable_prevView.xyz + v*r;
+        }
+        else
+        {
+            vec3 v = oe_LineDrawable_nextView.xyz-currView.xyz;
+            float r = currView.z / -v.z;
+            currView.xyz += v*r;
+        }
+    }
+}
+
+
+
+[break]
+
+#version $GLSL_VERSION_STR
+$GLSL_DEFAULT_PRECISION_FLOAT
+#pragma vp_name GPU Lines Screen Projected Clip
+#pragma vp_entryPoint oe_LineDrawable_VS_CLIP
+#pragma vp_location vertex_clip
+#pragma import_defines(OE_LINE_SMOOTH)
+
+// Set by the InstallViewportUniform callback
+uniform vec2 oe_ViewportSize;
+
+// Set by GLUtils methods
+uniform float oe_GL_LineWidth;
+uniform int oe_GL_LineStipplePattern;
+
+// Input attributes for adjacent points
+in vec3 oe_LineDrawable_prev;
+in vec3 oe_LineDrawable_next;
+
+flat out int oe_LineDrawable_draw;
+flat out vec2 oe_LineDrawable_rv;
+
+// Shared stage globals
+vec4 oe_LineDrawable_prevView;
+vec4 oe_LineDrawable_nextView;
+
+#ifdef OE_LINE_SMOOTH
+out float oe_LineDrawable_lateral;
+#else
+float oe_LineDrawable_lateral;
+#endif
+
+void oe_LineDrawable_VS_CLIP(inout vec4 currClip)
+{
+    if (oe_LineDrawable_draw == 0)
+        return;
+
+    // Transform the prev and next points in clip space.
+    vec4 prevClip = gl_ProjectionMatrix * oe_LineDrawable_prevView;
+    vec4 nextClip = gl_ProjectionMatrix * oe_LineDrawable_nextView;
+
+    // Transform all points into pixel space
+    vec2 prevPixel = ((prevClip.xy/prevClip.w)+1.0) * 0.5*oe_ViewportSize;
+    vec2 currPixel = ((currClip.xy/currClip.w)+1.0) * 0.5*oe_ViewportSize;
+    vec2 nextPixel = ((nextClip.xy/nextClip.w)+1.0) * 0.5*oe_ViewportSize;
+
+#ifdef OE_LINE_SMOOTH
+    float thickness = floor(oe_GL_LineWidth + 1.0);
+#else
+    float thickness = max(0.5, floor(oe_GL_LineWidth));
+#endif
+
+    float len = thickness;
+    int code = (gl_VertexID+2) & 3; // gl_VertexID % 4
+    bool isStart = code <= 1;
+    bool isRight = code==0 || code==2;
+
+    oe_LineDrawable_lateral = isRight? -1.0 : 1.0;
+
+    vec2 dir = vec2(0.0);
+
+    // We will use this to calculate stippling data:
+    vec2 stippleDir;
+
+    // The following vertex comparisons must be done in model 
+    // space because the equivalency gets mashed after projection.
+
+    // starting point uses (next - current)
+    if (gl_Vertex.xyz == oe_LineDrawable_prev)
+    {
+        dir = normalize(nextPixel - currPixel);
+        stippleDir = dir;
+    }
+    
+    // ending point uses (current - previous)
+    else if (gl_Vertex.xyz == oe_LineDrawable_next)
+    {
+        dir = normalize(currPixel - prevPixel);
+        stippleDir = dir;
+    }
+
+    else
+    {
+        vec2 dirIn  = normalize(currPixel - prevPixel);
+        vec2 dirOut = normalize(nextPixel - currPixel);
+
+        if (dot(dirIn,dirOut) < -0.999999)
+        {
+            dir = isStart? dirOut : dirIn;
+        }
+        else
+        {
+            vec2 tangent = normalize(dirIn+dirOut);
+            vec2 perp = vec2(-dirIn.y, dirIn.x);
+            vec2 miter = vec2(-tangent.y, tangent.x);
+            dir = tangent;
+            len = thickness / dot(miter, perp);
+
+            // limit the length of a mitered corner, to prevent unsightly spikes
+            const float limit = 2.0;
+            if (len > thickness*limit)
+            {
+                len = thickness;
+                dir = isStart? dirOut : dirIn;
+            }
+        }
+
+        stippleDir = dirOut;
+    }
+
+    // calculate the extrusion vector in pixels
+    // note: seems like it should be len/2, BUT remember we are in [-w..w] space
+    vec2 extrudePixel = vec2(-dir.y, dir.x) * len;
+
+    // and convert to unit space:
+    vec2 extrudeUnit = extrudePixel / oe_ViewportSize;
+        
+    // calculate the offset in clip space and apply it.
+    vec2 offset = extrudeUnit * oe_LineDrawable_lateral * currClip.w;
+    currClip.xy += offset;
+
+    // prepare for stippling:
+    if (oe_GL_LineStipplePattern != 0xffff)
+    {
+        // Line creation is done. Now, calculate a rotation angle
+        // for use by out fragment shader to do GPU stippling. 
+        // This "rotates" the fragment coordinate onto the X axis so that
+        // we can apply stippling along the direction of the line.
+        // Note: this depends on the GLSL "provoking vertex" being at the 
+        // beginning of the line segment!
+
+        // flip the vector so stippling always proceedes from left to right
+        // regardless of the direction of the segment
+        stippleDir = normalize(stippleDir.x < 0.0 ? -stippleDir : stippleDir);
+
+        // calculate the rotation angle that will project the
+        // fragment coord onto the X-axis for stipple pattern sampling.
+        float way = sign(cross(vec3(1, 0, 0), vec3(stippleDir, 0)).z);
+        float angle = acos(dot(vec2(1, 0), stippleDir)) * way;
+
+        // quantize the rotation angle to mitigate precision problems
+        // when connecting segments with slightly different vectors
+        const float pi = 3.14159265359;
+        const float q = pi/8.0;
+        angle = floor(angle/q) * q;
+
+        // send it to the fragment shader.
+        oe_LineDrawable_rv = vec2(cos(angle), sin(angle));
+    }
+}
+
+
+[break]
+
+#version $GLSL_VERSION_STR
+$GLSL_DEFAULT_PRECISION_FLOAT
+
+#pragma vp_name GPU Lines Screen Projected FS
+#pragma vp_entryPoint oe_LineDrawable_Stippler_FS
+#pragma vp_location fragment_coloring
+#pragma import_defines(OE_LINE_SMOOTH)
+
+uniform int oe_GL_LineStippleFactor;
+uniform int oe_GL_LineStipplePattern;
+
+flat in vec2 oe_LineDrawable_rv;
+flat in int oe_LineDrawable_draw;
+
+#ifdef OE_LINE_SMOOTH
+in float oe_LineDrawable_lateral;
+#endif
+
+void oe_LineDrawable_Stippler_FS(inout vec4 color)
+{
+    if (oe_LineDrawable_draw == 0)
+        discard;
+
+    if (oe_GL_LineStipplePattern != 0xffff)
+    {
+        // coordinate of the fragment, shifted to 0:
+        vec2 coord = (gl_FragCoord.xy - 0.5);
+
+        // rotate the frag coord onto the X-axis so we can sample the 
+        // stipple pattern:
+        vec2 coordProj =
+            mat2(oe_LineDrawable_rv.x, -oe_LineDrawable_rv.y,
+                 oe_LineDrawable_rv.y,  oe_LineDrawable_rv.x)
+            * coord;
+
+        // sample the stippling pattern (16-bits repeating)
+        int ci = int(mod(coordProj.x, 16.0 * float(oe_GL_LineStippleFactor))) / oe_GL_LineStippleFactor;
+        int pattern16 = 0xffff & (oe_GL_LineStipplePattern & (1 << ci));
+        if (pattern16 == 0)
+            discard; 
+
+        // uncomment to debug stipple direction vectors
+        //color.b = 0;
+        //color.r = oe_LineDrawable_rv.x;
+        //color.g = oe_LineDrawable_rv.y;
+    }
+
+#ifdef OE_LINE_SMOOTH
+    // anti-aliasing
+    float L = abs(oe_LineDrawable_lateral);
+    color.a = color.a * smoothstep(0.0, 1.0, 1.0-(L*L));
+#endif
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LineFunctor osgearth-2.10.2+dfsg/src/osgEarth/LineFunctor
--- osgearth-2.9.0+dfsg/src/osgEarth/LineFunctor	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LineFunctor	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -1478,6 +1478,480 @@
         std::vector<GLuint>  _indexCache;
     };
 
+
+    template<typename T>
+    class PointIndexFunctor : public osg::PrimitiveIndexFunctor, public T
+    {
+    public:
+
+
+        virtual void setVertexArray(unsigned int,const osg::Vec2*) 
+        {
+        }
+
+        virtual void setVertexArray(unsigned int ,const osg::Vec3* )
+        {
+        }
+
+        virtual void setVertexArray(unsigned int,const osg::Vec4* ) 
+        {
+        }
+
+        virtual void setVertexArray(unsigned int,const osg::Vec2d*) 
+        {
+        }
+
+        virtual void setVertexArray(unsigned int ,const osg::Vec3d* )
+        {
+        }
+
+        virtual void setVertexArray(unsigned int,const osg::Vec4d* ) 
+        {
+        }
+
+        virtual void begin(GLenum mode)
+        {
+            _modeCache = mode;
+            _indexCache.clear();
+        }
+
+        virtual void vertex(unsigned int vert)
+        {
+            _indexCache.push_back(vert);
+        }
+
+        virtual void end()
+        {
+            if (!_indexCache.empty())
+            {
+                drawElements(_modeCache,_indexCache.size(),&_indexCache.front());
+            }
+        }
+
+        // simulate triangles
+        void operator()(GLuint i0, GLuint i1, GLuint i2)
+        {
+            T::point(i0);
+            T::point(i1);
+            T::point(i2);
+        }
+        void operator()(GLushort i0, GLushort i1, GLushort i2)
+        {
+            T::point(i0);
+            T::point(i1);
+            T::point(i2);
+        }
+        void operator()(GLubyte i0, GLubyte i1, GLubyte i2)
+        {
+            T::point(i0);
+            T::point(i1);
+            T::point(i2);
+        }
+
+        // simulate lines
+        void operator()(GLuint i0, GLuint i1)
+        {
+            T::point(i0);
+            T::point(i1);
+        }
+        void operator()(GLushort i0, GLushort i1)
+        {
+            T::point(i0);
+            T::point(i1);
+        }
+        void operator()(GLubyte i0, GLubyte i1)
+        {
+            T::point(i0);
+            T::point(i1);
+        }
+
+        virtual void drawArrays(GLenum mode,GLint first,GLsizei count)
+        {
+            switch(mode)
+            {
+                case(GL_TRIANGLES):
+                {
+                    unsigned int pos=first;
+                    for(GLsizei i=2;i<count;i+=3,pos+=3)
+                    {
+                        this->operator()(pos,pos+1,pos+2);
+                    }
+                    break;
+                }
+                case(GL_TRIANGLE_STRIP):
+                 {
+                    unsigned int pos=first;
+                    for(GLsizei i=2;i<count;++i,++pos)
+                    {
+                        if ((i%2)) this->operator()(pos,pos+2,pos+1);
+                        else       this->operator()(pos,pos+1,pos+2);
+                    }
+                    break;
+                }
+                case(GL_QUADS):
+                {
+                    unsigned int pos=first;
+                    for(GLsizei i=3;i<count;i+=4,pos+=4)
+                    {
+                        this->operator()(pos,pos+1,pos+2);
+                        this->operator()(pos,pos+2,pos+3);
+                    }
+                    break;
+                }
+                case(GL_QUAD_STRIP):
+                {
+                    unsigned int pos=first;
+                    for(GLsizei i=3;i<count;i+=2,pos+=2)
+                    {
+                        this->operator()(pos,pos+1,pos+2);
+                        this->operator()(pos+1,pos+3,pos+2);
+                    }
+                    break;
+                }
+                case(GL_POLYGON): // treat polygons as GL_TRIANGLE_FAN
+                case(GL_TRIANGLE_FAN):
+                {
+                    unsigned int pos=first+1;
+                    for(GLsizei i=2;i<count;++i,++pos)
+                    {
+                        this->operator()(first,pos,pos+1);
+                    }
+                    break;
+                }
+                case(GL_LINES):
+                {
+                    unsigned pos=first;
+                    for(GLsizei i=1;i<count;i+=2,pos+=2)
+                    {
+                        this->operator()(pos,pos+1);
+                    }
+                    break;
+                }
+                case(GL_LINE_STRIP):
+                {
+                    unsigned pos=first;
+                    for(GLsizei i=1;i<count;i+=1,pos+=1)
+                    {
+                        this->operator()(pos,pos+1);
+                    }
+                    break;
+                }
+                case(GL_LINE_LOOP):
+                {
+                    unsigned pos=first;
+                    for(GLsizei i=1; i<count; i+=1, pos+=1)
+                    {
+                        this->operator()(pos,pos+1);
+                    }
+                    if (count > 0 )
+                    {
+                        this->operator()(pos,first);
+                    }
+                    break;
+                }
+                case(GL_POINTS):
+                default:
+                    T::point(first);
+                    break;
+            }
+        }
+
+        virtual void drawElements(GLenum mode,GLsizei count,const GLubyte* indices)
+        {
+            if (indices==0 || count==0) return;
+
+            typedef GLubyte Index;
+            typedef const Index* IndexPointer;
+
+            switch(mode)
+            {
+                case(GL_TRIANGLES):
+                {
+                    IndexPointer ilast = &indices[count];
+                    for(IndexPointer  iptr=indices;iptr<ilast;iptr+=3)
+                        this->operator()(*iptr,*(iptr+1),*(iptr+2));
+                    break;
+                }
+                case(GL_TRIANGLE_STRIP):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=2;i<count;++i,++iptr)
+                    {
+                        if ((i%2)) this->operator()(*(iptr),*(iptr+2),*(iptr+1));
+                        else       this->operator()(*(iptr),*(iptr+1),*(iptr+2));
+                    }
+                    break;
+                }
+                case(GL_QUADS):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=3;i<count;i+=4,iptr+=4)
+                    {
+                        this->operator()(*(iptr),*(iptr+1),*(iptr+2));
+                        this->operator()(*(iptr),*(iptr+2),*(iptr+3));
+                    }
+                    break;
+                }
+                case(GL_QUAD_STRIP):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=3;i<count;i+=2,iptr+=2)
+                    {
+                        this->operator()(*(iptr),*(iptr+1),*(iptr+2));
+                        this->operator()(*(iptr+1),*(iptr+3),*(iptr+2));
+                    }
+                    break;
+                }
+                case(GL_POLYGON): // treat polygons as GL_TRIANGLE_FAN
+                case(GL_TRIANGLE_FAN):
+                {
+                    IndexPointer iptr = indices;
+                    Index first = *iptr;
+                    ++iptr;
+                    for(GLsizei i=2;i<count;++i,++iptr)
+                    {
+                        this->operator()(first,*(iptr),*(iptr+1));
+                    }
+                    break;
+                }
+                case(GL_LINES):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=1;i<count;i+=2,iptr+=2)
+                    {
+                        this->operator()(*iptr,*(iptr+1));
+                    }
+                    break;
+                }
+                case(GL_LINE_STRIP):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=1;i<count;i+=1,++iptr)
+                    {
+                        this->operator()(*iptr,*(iptr+1));
+                    }
+                    break;
+                }
+                case(GL_LINE_LOOP):
+                {
+                    IndexPointer iptr = indices;
+                    Index first = *iptr;
+                    for(GLsizei i=1;i<count;i+=1,++iptr)
+                    {
+                        this->operator()(*iptr,*(iptr+1));
+                    }
+                    this->operator()(*iptr,first);
+                    break;
+                }
+
+                case(GL_POINTS):
+                default:
+                    // can't be converted into to triangles.
+                    IndexPointer iptr = indices;
+                    T::point(*iptr);
+                    break;
+            }
+        }    
+
+        virtual void drawElements(GLenum mode,GLsizei count,const GLushort* indices)
+        {
+            if (indices==0 || count==0) return;
+
+            typedef GLushort Index;
+            typedef const Index* IndexPointer;
+        
+
+            switch(mode)
+            {
+                case(GL_TRIANGLES):
+                {
+                    IndexPointer ilast = &indices[count];
+                    for(IndexPointer  iptr=indices;iptr<ilast;iptr+=3)
+                        this->operator()(*iptr,*(iptr+1),*(iptr+2));
+                    break;
+                }
+                case(GL_TRIANGLE_STRIP):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=2;i<count;++i,++iptr)
+                    {
+                        if ((i%2)) this->operator()(*(iptr),*(iptr+2),*(iptr+1));
+                        else       this->operator()(*(iptr),*(iptr+1),*(iptr+2));
+                    }
+                    break;
+                }
+                case(GL_QUADS):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=3;i<count;i+=4,iptr+=4)
+                    {
+                        this->operator()(*(iptr),*(iptr+1),*(iptr+2));
+                        this->operator()(*(iptr),*(iptr+2),*(iptr+3));
+                    }
+                    break;
+                }
+                case(GL_QUAD_STRIP):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=3;i<count;i+=2,iptr+=2)
+                    {
+                        this->operator()(*(iptr),*(iptr+1),*(iptr+2));
+                        this->operator()(*(iptr+1),*(iptr+3),*(iptr+2));
+                    }
+                    break;
+                }
+                case(GL_POLYGON): // treat polygons as GL_TRIANGLE_FAN
+                case(GL_TRIANGLE_FAN):
+                {
+                    IndexPointer iptr = indices;
+                    Index first = *iptr;
+                    ++iptr;
+                    for(GLsizei i=2;i<count;++i,++iptr)
+                    {
+                        this->operator()(first,*(iptr),*(iptr+1));
+                    }
+                    break;
+                }
+                case(GL_LINES):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=1;i<count;i+=2,iptr+=2)
+                    {
+                        this->operator()(*iptr,*(iptr+1));
+                    }
+                    break;
+                }
+                case(GL_LINE_STRIP):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=1;i<count;i+=1,++iptr)
+                    {
+                        this->operator()(*iptr,*(iptr+1));
+                    }
+                    break;
+                }
+                case(GL_LINE_LOOP):
+                {
+                    IndexPointer iptr = indices;
+                    Index first = *iptr;
+                    for(GLsizei i=1;i<count;i+=1,++iptr)
+                    {
+                        this->operator()(*iptr,*(iptr+1));
+                    }
+                    this->operator()(*iptr,first);
+                    break;
+                }
+
+                case(GL_POINTS):
+                default:
+                    IndexPointer iptr = indices;
+                    T::point(*iptr);
+                    break;
+            }
+        }    
+
+        virtual void drawElements(GLenum mode,GLsizei count,const GLuint* indices)
+        {
+            if (indices==0 || count==0) return;
+        
+            typedef GLuint Index;
+            typedef const Index* IndexPointer;
+        
+
+            switch(mode)
+            {
+                case(GL_TRIANGLES):
+                {
+                    IndexPointer ilast = &indices[count];
+                    for(IndexPointer  iptr=indices;iptr<ilast;iptr+=3)
+                        this->operator()(*iptr,*(iptr+1),*(iptr+2));
+                    break;
+                }
+                case(GL_TRIANGLE_STRIP):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=2;i<count;++i,++iptr)
+                    {
+                        if ((i%2)) this->operator()(*(iptr),*(iptr+2),*(iptr+1));
+                        else       this->operator()(*(iptr),*(iptr+1),*(iptr+2));
+                    }
+                    break;
+                }
+                case(GL_QUADS):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=3;i<count;i+=4,iptr+=4)
+                    {
+                        this->operator()(*(iptr),*(iptr+1),*(iptr+2));
+                        this->operator()(*(iptr),*(iptr+2),*(iptr+3));
+                    }
+                    break;
+                }
+                case(GL_QUAD_STRIP):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=3;i<count;i+=2,iptr+=2)
+                    {
+                        this->operator()(*(iptr),*(iptr+1),*(iptr+2));
+                        this->operator()(*(iptr+1),*(iptr+3),*(iptr+2));
+                    }
+                    break;
+                }
+                case(GL_POLYGON): // treat polygons as GL_TRIANGLE_FAN
+                case(GL_TRIANGLE_FAN):
+                {
+                    IndexPointer iptr = indices;
+                    Index first = *iptr;
+                    ++iptr;
+                    for(GLsizei i=2;i<count;++i,++iptr)
+                    {
+                        this->operator()(first,*(iptr),*(iptr+1));
+                    }
+                    break;
+                }
+                case(GL_LINES):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=1;i<count;i+=2,iptr+=2)
+                    {
+                        this->operator()(*iptr,*(iptr+1));
+                    }
+                    break;
+                }
+                case(GL_LINE_STRIP):
+                case(GL_POINTS):
+                {
+                    IndexPointer iptr = indices;
+                    for(GLsizei i=1;i<count;i+=1,++iptr)
+                    {
+                        this->operator()(*iptr,*(iptr+1));
+                    }
+                    break;
+                }
+                case(GL_LINE_LOOP):
+                {
+                    IndexPointer iptr = indices;
+                    Index first = *iptr;
+                    for(GLsizei i=1;i<count;i+=1,++iptr)
+                    {
+                        this->operator()(*iptr,*(iptr+1));
+                    }
+                    this->operator()(*iptr,first);
+                    break;
+                }
+
+                default:
+                    IndexPointer iptr = indices;
+                    T::point(*iptr);
+                    break;
+            }
+        }    
+
+        GLenum               _modeCache;
+        std::vector<GLuint>  _indexCache;
+    };
+
+
 } // namespace osgEarth
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LocalTangentPlane osgearth-2.10.2+dfsg/src/osgEarth/LocalTangentPlane
--- osgearth-2.9.0+dfsg/src/osgEarth/LocalTangentPlane	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LocalTangentPlane	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/LocalTangentPlane.cpp osgearth-2.10.2+dfsg/src/osgEarth/LocalTangentPlane.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/LocalTangentPlane.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/LocalTangentPlane.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,10 +18,6 @@
  */
 
 #include <osgEarth/LocalTangentPlane>
-#include <osg/Math>
-#include <osg/Notify>
-#include <sstream>
-#include <algorithm>
 
 using namespace osgEarth;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Locators osgearth-2.10.2+dfsg/src/osgEarth/Locators
--- osgearth-2.9.0+dfsg/src/osgEarth/Locators	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Locators	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Locators.cpp osgearth-2.10.2+dfsg/src/osgEarth/Locators.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Locators.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Locators.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
  */
 #include <osgEarth/Locators>
 #include <osgEarth/TileKey>
-#include <osgEarth/Registry>
 #include <osgEarth/MapInfo>
-#include <osg/Notify>
 
 using namespace osgEarth;
 
@@ -87,8 +85,7 @@
 
     // A locator will place the tile on the globe:
     GeoLocator* locator = extent.getSRS()->createLocator(
-        extent.xMin(), extent.yMin(), extent.xMax(), extent.yMax(),
-        map.isPlateCarre() );
+        extent.xMin(), extent.yMin(), extent.xMax(), extent.yMax());
 
     if ( map.isGeocentric() )
         locator->setCoordinateSystemType( osgTerrain::Locator::GEOCENTRIC );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Map osgearth-2.10.2+dfsg/src/osgEarth/Map
--- osgearth-2.9.0+dfsg/src/osgEarth/Map	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Map	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -52,7 +52,7 @@
 
     public:
         /**
-         * Gets this Map's unique ID 
+         * Gets this Map's unique ID
          */
         UID getUID() const { return _uid; }
 
@@ -82,7 +82,7 @@
         const SpatialReference* getWorldSRS() const;
 
         /**
-         * Adds a Layer to the map. 
+         * Adds a Layer to the map.
          */
         void addLayer(Layer* layer);
 
@@ -150,7 +150,7 @@
         Revision getLayers(osg::MixinVector< osg::ref_ptr<T> >& output) const;
 
         /**
-         * Gets the first layer of the specified type. This is useful when you 
+         * Gets the first layer of the specified type. This is useful when you
          * know there in only one layer of the type you are looking for.
          */
         template<typename T> T* getLayer() const;
@@ -203,11 +203,11 @@
          */
         void setMapName( const std::string& name );
 
-        /** 
+        /**
          * Gets the readable name of this map.
          */
         const std::string& getMapName() const { return _name; }
-              
+
         /**
          * Sets the Cache for this Map. Set to NULL for no cache.
          */
@@ -232,13 +232,6 @@
         bool isGeocentric() const;
 
         /**
-         * Synronizes a map frame to the current revision of the map's data model.
-         * Returns true if new Map model data was available and a sync occurred;
-         * returns false if nothing changed.
-         */    
-        bool sync( class MapFrame& frame ) const;
-
-        /**
          * Gets the database options associated with this map.
          */
         const osgDB::Options* getReadOptions() const { return _readOptions.get(); }
@@ -253,6 +246,17 @@
          */
         ElevationPool* getElevationPool() const;
 
+        /**
+         * Returns true if data for the given tile key and layers is likely
+         * to generate data quickly. This is used for pager thread pool shunting.
+         */
+        bool isFast(const TileKey& key, const LayerVector& layers) const;
+
+        /**
+         * List of attribution strings to be displayed by the application
+         */
+        void getAttributions(StringSet& attributions) const;
+
     protected:
 
         virtual ~Map();
@@ -275,15 +279,28 @@
         osg::ref_ptr<osgDB::Options> _readOptions;
         osg::ref_ptr<ElevationPool> _elevationPool;
 
-        struct ElevationLayerCB : public VisibleLayerCallback {
+        struct VisibleLayerCB : public VisibleLayerCallback {
             osg::observer_ptr<Map> _map;
-            ElevationLayerCB(Map*);
+            VisibleLayerCB(Map*);
             void onVisibleChanged(VisibleLayer* layer);
         };
-        osg::ref_ptr<ElevationLayerCB> _elevationLayerCB;
-        friend struct ElevationLayerCB;
+        osg::ref_ptr<VisibleLayerCB> _visibleLayerCB;
+        friend struct VisibleLayerCB;
+        void notifyLayerVisibleChanged(VisibleLayer*);
 
-        void notifyElevationLayerVisibleChanged(VisibleLayer*);
+        struct LayerCB : public LayerCallback {
+            LayerCB(Map*);
+            osg::observer_ptr<Map> _map;
+            void onEnabledChanged(Layer* layer);
+        };
+        osg::ref_ptr<LayerCallback> _layerCB;
+        friend struct LayerCB;
+        void notifyOnLayerEnabledChanged(Layer*);
+
+        void installLayerCallbacks(Layer*);
+        void uninstallLayerCallbacks(Layer*);
+        void openLayer(Layer*);
+        void closeLayer(Layer*);
 
 
     private:
@@ -291,25 +308,8 @@
         void calculateProfile();
 
         friend class MapInfo;
-
-
-    public: // deprecated functions (for backwards compatibility)
-        void addImageLayer(class ImageLayer* layer);
-        void insertImageLayer(class ImageLayer* layer, unsigned index);
-        void removeImageLayer(class ImageLayer* layer);
-        void moveImageLayer(class ImageLayer* layer, unsigned newIndex);
-        void addElevationLayer(class ElevationLayer* layer);
-        void removeElevationLayer(class ElevationLayer* layer);
-        void moveElevationLayer(class ElevationLayer* layer, unsigned newIndex);
-        void addModelLayer(class ModelLayer* layer);
-        void insertModelLayer(class ModelLayer* layer, unsigned index);
-        void removeModelLayer(class ModelLayer* layer);
-        void moveModelLayer(class ModelLayer* layer, unsigned newIndex);
-        void addTerrainMaskLayer(class MaskLayer* layer);
-        void removeTerrainMaskLayer(class MaskLayer* layer);
-
     };
-    
+
 
 
 
@@ -329,6 +329,7 @@
 
     template<typename T>
     Revision Map::getLayers(std::vector< osg::ref_ptr<T> >& output) const {
+        Threading::ScopedReadLock lock(_mapDataMutex);
         for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i) {
             T* obj = dynamic_cast<T*>(i->get());
             if (obj) output.push_back(obj);
@@ -338,6 +339,7 @@
 
     template<typename T>
     Revision Map::getLayers(osg::MixinVector< osg::ref_ptr<T> >& output) const {
+        Threading::ScopedReadLock lock(_mapDataMutex);
         for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i) {
             T* obj = dynamic_cast<T*>(i->get());
             if (obj) output.push_back(obj);
@@ -345,7 +347,8 @@
         return _dataModelRevision;
     }
 
-    template<typename T> T* Map::getLayer() const {
+    template<typename T> T* Map::getLayer() const {        
+        Threading::ScopedReadLock lock(_mapDataMutex);
         for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i) {
             T* obj = dynamic_cast<T*>(i->get());
             if (obj) return obj;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapCallback osgearth-2.10.2+dfsg/src/osgEarth/MapCallback
--- osgearth-2.9.0+dfsg/src/osgEarth/MapCallback	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapCallback	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -28,10 +28,6 @@
 {
     class MapInfo;
     class Layer;
-    class ImageLayer;
-    class ElevationLayer;
-    class ModelLayer;
-    class MaskLayer;
     struct MapModelChange;
 
     /**
@@ -54,41 +50,19 @@
         virtual void onMapModelChanged(const MapModelChange& change);
 
         //! Invoked when a layer is added to a Map.
-        virtual void onLayerAdded(Layer* layer, unsigned index);
+        virtual void onLayerAdded(Layer* layer, unsigned index) { }
 
         //! Invoked when a layer is removed from a Map.
-        virtual void onLayerRemoved(Layer* layer, unsigned index);
+        virtual void onLayerRemoved(Layer* layer, unsigned index) { }
 
         //! Invoked when a layer is re-ordered within a Map.
-        virtual void onLayerMoved(Layer* layer, unsigned oldIndex, unsigned newIndex);
+        virtual void onLayerMoved(Layer* layer, unsigned oldIndex, unsigned newIndex) { }
 
-    public: // Deprecated functions
+        //! Invoked when a layer is enabled
+        virtual void onLayerEnabled(Layer* layer) { }
 
-        // @deprecated Use onLayerAdded
-        virtual void onImageLayerAdded( ImageLayer* layer, unsigned int index ) { }
-        // @deprecated Use onLayerRemoved
-        virtual void onImageLayerRemoved( ImageLayer* layer, unsigned int index ) { }
-        // @deprecated Use onLayerMoved
-        virtual void onImageLayerMoved( ImageLayer* layer, unsigned int oldIndex, unsigned int newIndex ) { }
-
-        // @deprecated Use onLayerAdded
-        virtual void onElevationLayerAdded( ElevationLayer* layer, unsigned int index ) { }
-        // @deprecated Use onLayerRemoved
-        virtual void onElevationLayerRemoved( ElevationLayer* layer, unsigned int index ) { }
-        // @deprecated Use onLayerMoved
-        virtual void onElevationLayerMoved( ElevationLayer* layer, unsigned int oldIndex, unsigned int newIndex ) { }
-
-        // @deprecated Use onLayerAdded
-        virtual void onModelLayerAdded( ModelLayer* layer, unsigned int index ) { }
-        // @deprecated Use onLayerRemoved
-        virtual void onModelLayerRemoved( ModelLayer* layer, unsigned int index ) { }
-        // @deprecated Use onLayerMoved
-        virtual void onModelLayerMoved( ModelLayer* layer, unsigned int oldIndex, unsigned int newIndex ) { }
-
-        // @deprecated Use onLayerAdded
-        virtual void onMaskLayerAdded( MaskLayer* mask ) { }
-        // @deprecated Use onLayerRemoved
-        virtual void onMaskLayerRemoved( MaskLayer* mask ) { }
+        //! Invoked when a layer is disabled
+        virtual void onLayerDisabled(Layer* layer) { }
 
     public:
         /** dtor */
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapCallback.cpp osgearth-2.10.2+dfsg/src/osgEarth/MapCallback.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MapCallback.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapCallback.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,10 +18,6 @@
  */
 #include <osgEarth/MapCallback>
 #include <osgEarth/MapModelChange>
-#include <osgEarth/ImageLayer>
-#include <osgEarth/ElevationLayer>
-#include <osgEarth/ModelLayer>
-#include <osgEarth/MaskLayer>
 #include <osgEarth/Map>
 
 #define LC "[MapCallback] "
@@ -45,6 +41,22 @@
         onLayerMoved(change.getLayer(), change.getFirstIndex(), change.getSecondIndex());
         break;
 
+    case MapModelChange::ENABLE_LAYER:
+        onLayerEnabled(change.getLayer());
+        break;
+
+    case MapModelChange::DISABLE_LAYER:
+        onLayerDisabled(change.getLayer());
+        break;
+
+    case MapModelChange::BEGIN_BATCH_UPDATE:
+	onBeginUpdate();
+	break;
+
+    case MapModelChange::END_BATCH_UPDATE:
+	onEndUpdate();
+	break;
+
     default: 
         break;
     }
@@ -79,40 +91,3 @@
         onEndUpdate();
     }
 }
-
-void
-MapCallback::onLayerAdded(Layer* layer, unsigned index)
-{
-    if (dynamic_cast<ImageLayer*>(layer))
-        onImageLayerAdded(static_cast<ImageLayer*>(layer), index);
-    else if (dynamic_cast<ElevationLayer*>(layer))
-        onElevationLayerAdded(static_cast<ElevationLayer*>(layer), index);
-    else if (dynamic_cast<ModelLayer*>(layer))
-        onModelLayerAdded(static_cast<ModelLayer*>(layer), index);
-    else if (dynamic_cast<MaskLayer*>(layer))
-        onMaskLayerAdded(static_cast<MaskLayer*>(layer));
-}
-
-void 
-MapCallback::onLayerRemoved(Layer* layer, unsigned index)
-{
-    if (dynamic_cast<ImageLayer*>(layer))
-        onImageLayerRemoved(static_cast<ImageLayer*>(layer), index);
-    else if (dynamic_cast<ElevationLayer*>(layer))
-        onElevationLayerRemoved(static_cast<ElevationLayer*>(layer), index);
-    else if (dynamic_cast<ModelLayer*>(layer))
-        onModelLayerRemoved(static_cast<ModelLayer*>(layer), index);
-    else if (dynamic_cast<MaskLayer*>(layer))
-        onMaskLayerRemoved(static_cast<MaskLayer*>(layer));
-}
-
-void
-MapCallback::onLayerMoved(Layer* layer, unsigned oldIndex, unsigned newIndex)
-{
-    if (dynamic_cast<ImageLayer*>(layer))
-        onImageLayerMoved(static_cast<ImageLayer*>(layer), oldIndex, newIndex);
-    else if (dynamic_cast<ElevationLayer*>(layer))
-        onElevationLayerMoved(static_cast<ElevationLayer*>(layer), oldIndex, newIndex);
-    else if (dynamic_cast<ModelLayer*>(layer))
-        onModelLayerMoved(static_cast<ModelLayer*>(layer), oldIndex, newIndex);
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Map.cpp osgearth-2.10.2+dfsg/src/osgEarth/Map.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Map.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Map.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,15 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/Map>
-#include <osgEarth/MapFrame>
 #include <osgEarth/MapModelChange>
 #include <osgEarth/Registry>
-#include <osgEarth/TileSource>
-#include <osgEarth/HeightFieldUtils>
-#include <osgEarth/URI>
-#include <osgEarth/ElevationPool>
 #include <osgEarth/Utils>
-#include <iterator>
 
 using namespace osgEarth;
 
@@ -33,20 +27,20 @@
 
 //------------------------------------------------------------------------
 
-Map::ElevationLayerCB::ElevationLayerCB(Map* map) :
-_map(map)
-{
-    //nop
-}
+Map::VisibleLayerCB::VisibleLayerCB(Map* map) : _map(map) { }
 
-void
-Map::ElevationLayerCB::onVisibleChanged(VisibleLayer* layer)
-{
+void Map::VisibleLayerCB::onVisibleChanged(VisibleLayer* layer) {
     osg::ref_ptr<Map> map;
     if ( _map.lock(map) )
-    {
-        _map->notifyElevationLayerVisibleChanged(layer);
-    }
+        _map->notifyLayerVisibleChanged(layer);
+}
+
+Map::LayerCB::LayerCB(Map* map) : _map(map) { }
+
+void Map::LayerCB::onEnabledChanged(Layer* layer) {
+    osg::ref_ptr<Map> map;
+    if (_map.lock(map))
+        map->notifyOnLayerEnabledChanged(layer);
 }
 
 //------------------------------------------------------------------------
@@ -121,9 +115,11 @@
     // encode this map in the read options.
     OptionsData<const Map>::set(_readOptions.get(), "osgEarth.Map", this);
 
-    // set up a callback that the Map will use to detect Elevation Layer
-    // visibility changes
-    _elevationLayerCB = new ElevationLayerCB(this);
+    // set up a callback that the Map will use to detect Layer visibility changes
+    _visibleLayerCB = new VisibleLayerCB(this);
+
+    // create a callback that the Map will use to detect setEnabled calls
+    _layerCB = new LayerCB(this);
 
     // elevation sampling
     _elevationPool = new ElevationPool();
@@ -133,7 +129,6 @@
 Map::~Map()
 {
     OE_DEBUG << LC << "~Map" << std::endl;
-    clear();
 }
 
 ElevationPool*
@@ -143,23 +138,66 @@
 }
 
 void
-Map::notifyElevationLayerVisibleChanged(VisibleLayer* layer)
+Map::notifyLayerVisibleChanged(VisibleLayer* layer)
+{
+    // bump the revision safely:
+    Revision newRevision;
+    {
+        Threading::ScopedWriteLock lock(_mapDataMutex);
+        newRevision = ++_dataModelRevision;
+    }
+
+    ElevationLayer* elevationLayer = dynamic_cast<ElevationLayer*>(layer);
+    if (elevationLayer)
+    {
+        // reinitialize the elevation pool:
+        _elevationPool->clear();
+    }
+
+    MapModelChange change(
+        MapModelChange::TOGGLE_LAYER,
+        newRevision,
+        layer);
+
+    for( MapCallbackList::iterator i = _mapCallbacks.begin(); i != _mapCallbacks.end(); i++ )
+    {
+        i->get()->onMapModelChanged(change);
+    }
+}
+
+void
+Map::notifyOnLayerEnabledChanged(Layer* layer)
 {
     // bump the revision safely:
     Revision newRevision;
     {
-        Threading::ScopedWriteLock lock( const_cast<Map*>(this)->_mapDataMutex );
+        Threading::ScopedWriteLock lock(_mapDataMutex);
         newRevision = ++_dataModelRevision;
     }
 
     // reinitialize the elevation pool:
-    _elevationPool->clear();
+    if (dynamic_cast<ElevationLayer*>(layer))
+    {
+        _elevationPool->clear();
+    }
+
+    if (layer->getEnabled())
+    {
+        openLayer(layer);
+    }
+    else
+    {
+        closeLayer(layer);
+    }
+
+    MapModelChange change(
+        layer->getEnabled() ? MapModelChange::ENABLE_LAYER : MapModelChange::DISABLE_LAYER,
+        newRevision,
+        layer);
 
-    // a separate block b/c we don't need the mutex
     for( MapCallbackList::iterator i = _mapCallbacks.begin(); i != _mapCallbacks.end(); i++ )
     {
-        i->get()->onMapModelChanged( MapModelChange(
-            MapModelChange::TOGGLE_ELEVATION_LAYER, newRevision, layer) );
+        i->get()->onMapModelChanged(change);
     }
 }
 
@@ -219,6 +257,29 @@
         cacheSettings->setCache(cache);
 }
 
+void
+Map::getAttributions(StringSet& attributions) const
+{
+    LayerVector layers;
+    getLayers(layers);
+
+    for (LayerVector::const_iterator itr = layers.begin(); itr != layers.end(); ++itr)
+    {
+        if (itr->get()->getEnabled())
+        {
+            VisibleLayer* visibleLayer = dynamic_cast<VisibleLayer*>(itr->get());
+            if (!visibleLayer || visibleLayer->getVisible())
+            {
+                std::string attribution = itr->get()->getAttribution();
+                if (!attribution.empty())
+                {
+                    attributions.insert(attribution);
+                }
+            }
+        }
+    }
+}
+
 MapCallback*
 Map::addMapCallback(MapCallback* cb) const
 {
@@ -262,40 +323,23 @@
 void
 Map::addLayer(Layer* layer)
 {
+    // Store in a ref_ptr for scope to ensure callbacks don't accidentally delete while adding
+    osg::ref_ptr<Layer> layerRef( layer );
     osgEarth::Registry::instance()->clearBlacklist();
     if ( layer )
     {
+        // Set up callbacks
+        installLayerCallbacks(layer);
+
+        // Open the layer if it's enabled:
         if (layer->getEnabled())
         {
-            // Pass along the Read Options (including the cache settings, etc.) to the layer:
-            layer->setReadOptions(_readOptions.get());
-            
-            // If this is a terrain layer, tell it about the Map profile.
-            TerrainLayer* terrainLayer = dynamic_cast<TerrainLayer*>(layer);
-            if (terrainLayer && _profile.valid())
-            {
-                terrainLayer->setTargetProfileHint( _profile.get() );
-            }            
-
-            // Attempt to open the layer. Don't check the status here.
-            layer->open();
-
-            // If this is an elevation layer, install a callback so we know when
-            // it's visibility changes:
-            ElevationLayer* elevationLayer = dynamic_cast<ElevationLayer*>(layer);
-            if (elevationLayer)
-            {
-                elevationLayer->addCallback(_elevationLayerCB.get());
-
-                // invalidate the elevation pool
-                getElevationPool()->clear();
-            }
+            openLayer(layer);
         }
 
+        // Add the layer to our stack.
         int newRevision;
         unsigned index = -1;
-
-        // Add the layer to our stack.
         {
             Threading::ScopedWriteLock lock( _mapDataMutex );
 
@@ -305,7 +349,7 @@
         }
 
         // tell the layer it was just added.
-        layer->addedToMap(this);
+        //layer->addedToMap(this);
 
         // a separate block b/c we don't need the mutex
         for( MapCallbackList::iterator i = _mapCallbacks.begin(); i != _mapCallbacks.end(); i++ )
@@ -322,36 +366,17 @@
     osgEarth::Registry::instance()->clearBlacklist();
     if ( layer )
     {
+        // Set up callbacks
+        installLayerCallbacks(layer);
+
+        // Open the layer if it's enabled:
         if (layer->getEnabled())
         {
-            // Pass along the Read Options (including the cache settings, etc.) to the layer:
-            layer->setReadOptions(_readOptions.get());
-            
-            // If this is a terrain layer, tell it about the Map profile.
-            TerrainLayer* terrainLayer = dynamic_cast<TerrainLayer*>(layer);
-            if (terrainLayer && _profile.valid())
-            {
-                terrainLayer->setTargetProfileHint( _profile.get() );
-            }            
-
-            // Attempt to open the layer. Don't check the status here.
-            layer->open();
-
-            // If this is an elevation layer, install a callback so we know when
-            // it's visibility changes:
-            ElevationLayer* elevationLayer = dynamic_cast<ElevationLayer*>(layer);
-            if (elevationLayer)
-            {
-                elevationLayer->addCallback(_elevationLayerCB.get());
-
-                // invalidate the elevation pool
-                getElevationPool()->clear();
-            }
+            openLayer(layer);
         }
 
-        int newRevision;
-
         // Add the layer to our stack.
+        int newRevision;
         {
             Threading::ScopedWriteLock lock( _mapDataMutex );
 
@@ -364,7 +389,7 @@
         }
 
         // tell the layer it was just added.
-        layer->addedToMap(this);
+        //layer->addedToMap(this);
 
         // a separate block b/c we don't need the mutex
         for( MapCallbackList::iterator i = _mapCallbacks.begin(); i != _mapCallbacks.end(); i++ )
@@ -387,6 +412,8 @@
     osg::ref_ptr<Layer> layerToRemove = layer;
     Revision newRevision;
 
+    closeLayer(layer);
+
     if ( layerToRemove.get() )
     {
         Threading::ScopedWriteLock lock( _mapDataMutex );
@@ -402,20 +429,13 @@
         }
 
         // tell the layer it was just removed.
-        layerToRemove->removedFromMap(this);
+        //layerToRemove->removedFromMap(this);
     }
 
-    ElevationLayer* elevationLayer = dynamic_cast<ElevationLayer*>(layerToRemove.get());
-    if (elevationLayer)
-    {
-        elevationLayer->removeCallback(_elevationLayerCB.get());
-
-        // invalidate the pool
-        getElevationPool()->clear();
-    }
+    uninstallLayerCallbacks(layerToRemove.get());
 
     // a separate block b/c we don't need the mutex
-    if ( newRevision >= 0 ) // layerToRemove.get() )
+    if ( newRevision >= 0 )
     {
         for( MapCallbackList::iterator i = _mapCallbacks.begin(); i != _mapCallbacks.end(); i++ )
         {
@@ -478,12 +498,83 @@
     }
 }
 
+void
+Map::installLayerCallbacks(Layer* layer)
+{
+    VisibleLayer* visibleLayer = dynamic_cast<VisibleLayer*>(layer);
+    if (visibleLayer)
+    {
+        visibleLayer->addCallback(_visibleLayerCB.get());
+    }
+
+    // If this is an elevation layer, install a callback so we know when
+    // it's visibility changes:
+    ElevationLayer* elevationLayer = dynamic_cast<ElevationLayer*>(layer);
+    if (elevationLayer)
+    {
+        // invalidate the elevation pool
+        getElevationPool()->clear();
+    }
+
+    // Callback to detect changes in "enabled"
+    layer->addCallback(_layerCB.get());
+}
+
+void
+Map::uninstallLayerCallbacks(Layer* layer)
+{
+    VisibleLayer* visibleLayer = dynamic_cast<VisibleLayer*>(layer);
+    if (visibleLayer)
+    {
+        visibleLayer->removeCallback(_visibleLayerCB.get());
+    }
+
+    // undo the things we did in prepareLayer:
+    ElevationLayer* elevationLayer = dynamic_cast<ElevationLayer*>(layer);
+    if (elevationLayer)
+    {
+        // invalidate the pool
+        getElevationPool()->clear();
+    }
+
+    layer->removeCallback(_layerCB.get());
+}
+
+void
+Map::openLayer(Layer* layer)
+{
+    // Pass along the Read Options (including the cache settings, etc.) to the layer:
+    layer->setReadOptions(_readOptions.get());
+
+    // If this is a terrain layer, tell it about the Map profile.
+    TerrainLayer* terrainLayer = dynamic_cast<TerrainLayer*>(layer);
+    if (terrainLayer && _profile.valid())
+    {
+        terrainLayer->setTargetProfileHint(_profile.get());
+    }
+
+    // Attempt to open the layer. Don't check the status here.
+    if (layer->open().isOK())
+    {
+        layer->addedToMap(this);
+    }
+}
+
+void
+Map::closeLayer(Layer* layer)
+{
+    if (layer)
+    {
+        layer->removedFromMap(this);
+    }
+}
+
 Revision
 Map::getLayers(LayerVector& out_list) const
 {
     out_list.reserve( _layers.size() );
 
-    Threading::ScopedReadLock lock( const_cast<Map*>(this)->_mapDataMutex );
+    Threading::ScopedReadLock lock(_mapDataMutex);
     for( LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i )
         out_list.push_back( i->get() );
 
@@ -493,14 +584,14 @@
 unsigned
 Map::getNumLayers() const
 {
-    Threading::ScopedReadLock lock( const_cast<Map*>(this)->_mapDataMutex );
+    Threading::ScopedReadLock lock( _mapDataMutex );
     return _layers.size();
 }
 
 Layer*
 Map::getLayerByName(const std::string& name) const
 {
-    Threading::ScopedReadLock( const_cast<Map*>(this)->_mapDataMutex );
+    Threading::ScopedReadLock lock( _mapDataMutex );
     for(LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i)
         if ( i->get()->getName() == name )
             return i->get();
@@ -510,7 +601,7 @@
 Layer*
 Map::getLayerByUID(UID layerUID) const
 {
-    Threading::ScopedReadLock( const_cast<Map*>(this)->_mapDataMutex );
+    Threading::ScopedReadLock lock( _mapDataMutex );
     for( LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i )
         if ( i->get()->getUID() == layerUID )
             return i->get();
@@ -520,7 +611,7 @@
 Layer*
 Map::getLayerAt(unsigned index) const
 {
-    Threading::ScopedReadLock( const_cast<Map*>(this)->_mapDataMutex );
+    Threading::ScopedReadLock lock( _mapDataMutex );
     if ( index >= 0 && index < (int)_layers.size() )
         return _layers[index].get();
     else
@@ -530,7 +621,7 @@
 unsigned
 Map::getIndexOfLayer(const Layer* layer) const
 {
-    Threading::ScopedReadLock( const_cast<Map*>(this)->_mapDataMutex );
+    Threading::ScopedReadLock lock( _mapDataMutex );
     unsigned index = 0;
     for (; index < _layers.size(); ++index)
     {
@@ -558,12 +649,16 @@
     // a separate block b/c we don't need the mutex
     for( MapCallbackList::iterator i = _mapCallbacks.begin(); i != _mapCallbacks.end(); i++ )
     {
+        i->get()->onBeginUpdate();
+
         for(LayerVector::iterator layer = layersRemoved.begin();
             layer != layersRemoved.end();
             ++layer)
         {
             i->get()->onMapModelChanged(MapModelChange(MapModelChange::REMOVE_LAYER, newRevision, layer->get()));
         }
+
+        i->get()->onEndUpdate();
     }
 
     // Invalidate the elevation pool.
@@ -647,13 +742,13 @@
 
         // Finally, if there is still no profile, default to global geodetic.
         if (!profile.valid())
-        {            
+        {
             profile = Registry::instance()->getGlobalGeodeticProfile();
         }
 
 
         // Set the map's profile!
-        _profile = profile.release();        
+        _profile = profile.release();
 
         // create a "proxy" profile to use when querying elevation layers with a vertical datum
         if ( _profile->getSRS()->getVerticalDatum() != 0L )
@@ -672,7 +767,7 @@
 
         for( MapCallbackList::iterator i = _mapCallbacks.begin(); i != _mapCallbacks.end(); i++ )
         {
-            i->get()->onMapInfoEstablished( MapInfo(this) );
+            //i->get()->onMapInfoEstablished( MapInfo(this) );
         }
     }
 
@@ -689,118 +784,46 @@
 const SpatialReference*
 Map::getWorldSRS() const
 {
-    return getSRS() && getSRS()->isGeographic() ? getSRS()->getECEF() : getSRS();
+    return getSRS() && getSRS()->isGeographic() ? getSRS()->getGeocentricSRS() : getSRS();
 }
 
 bool
-Map::sync(MapFrame& frame) const
+Map::isFast(const TileKey& key, const LayerVector& layers) const
 {
-    bool result = false;
+    if (getCache() == NULL)
+        return false;
 
-    if ( frame._mapDataModelRevision != _dataModelRevision || !frame._initialized )
+    for (LayerVector::const_iterator i = layers.begin(); i != layers.end(); ++i)
     {
-        // hold the read lock while copying the layer lists.
-        Threading::ScopedReadLock lock( const_cast<Map*>(this)->_mapDataMutex );
-
-        if (!frame._initialized)
-            frame._layers.reserve(_layers.size());
-
-        frame._layers.clear();
-
-        std::copy(_layers.begin(), _layers.end(), std::back_inserter(frame._layers));
-
-        // sync the revision numbers.
-        frame._initialized = true;
-        frame._mapDataModelRevision = _dataModelRevision;
-
-        result = true;
-    }
-    return result;
-}
-
-
-//......................................................................
-// @deprecated functions
-
-#include <osgEarth/ImageLayer>
-#include <osgEarth/ElevationLayer>
-#include <osgEarth/ModelLayer>
-#include <osgEarth/MaskLayer>
-
-void 
-Map::addImageLayer(class ImageLayer* layer) {
-    OE_DEPRECATED(Map::addImageLayer, Map::addLayer);
-    addLayer(layer);
-}
+        Layer* layer = i->get();
+        if (!layer)
+            continue;
 
-void 
-Map::insertImageLayer(class ImageLayer* layer, unsigned index) {
-    OE_DEPRECATED(Map::insertImageLayer, Map::insertLayer);
-    insertLayer(layer, index);
-}
-
-void 
-Map::removeImageLayer(class ImageLayer* layer) {
-    OE_DEPRECATED(Map::removeImageLayer, Map::removeLayer);
-    removeLayer(layer);
-}
-
-void 
-Map::moveImageLayer(class ImageLayer* layer, unsigned newIndex) {
-    OE_DEPRECATED(Map::moveImageLayer, Map::moveLayer);
-    moveLayer(layer, newIndex);
-}
-
-void 
-Map::addElevationLayer(class ElevationLayer* layer) {
-    OE_DEPRECATED(Map::addElevationLayer, Map::addLayer);
-    addLayer(layer);
-}
-
-void 
-Map::removeElevationLayer(class ElevationLayer* layer) {
-    OE_DEPRECATED(Map::removeElevationLayer, Map::removeLayer);
-    removeLayer(layer);
-}
-
-void 
-Map::moveElevationLayer(class ElevationLayer* layer, unsigned newIndex) {
-    OE_DEPRECATED(Map::moveElevationLayer, Map::moveLayer);
-    moveLayer(layer, newIndex);
-}
-
-void 
-Map::addModelLayer(class ModelLayer* layer) {
-    OE_DEPRECATED(Map::addModelLayer, Map::addLayer);
-    addLayer(layer);
-}
+        if (!layer->getEnabled())
+            continue;
 
-void 
-Map::insertModelLayer(class ModelLayer* layer, unsigned index) {
-    OE_DEPRECATED(Map::insertModelLayer, Map::insertLayer);
-    insertLayer(layer, index);
-}
+        TerrainLayer* terrainlayer = dynamic_cast<TerrainLayer*>(layer);
+        if (terrainlayer)
+        {
+            if (terrainlayer->getCacheSettings()->cachePolicy()->isCacheDisabled())
+              return false;
 
-void 
-Map::removeModelLayer(class ModelLayer* layer) {
-    OE_DEPRECATED(Map::removeModelLayer, Map::removeLayer);
-    removeLayer(layer);
-}
+            //If no data is available on this tile, we'll be fast
+            if (!terrainlayer->mayHaveData(key))
+                continue;
 
-void 
-Map::moveModelLayer(class ModelLayer* layer, unsigned newIndex) {
-    OE_DEPRECATED(Map::moveModelLayer, Map::moveLayer);
-    moveLayer(layer, newIndex);
-}
+            // No tile source? skip it
+            osg::ref_ptr< TileSource > source = terrainlayer->getTileSource();
+            if (!source.valid())
+                continue;
 
-void 
-Map::addTerrainMaskLayer(class MaskLayer* layer) {
-    OE_DEPRECATED(Map::addTerrainMaskLayer, Map::addLayer);
-    addLayer(layer);
-}
+            //If the tile is blacklisted, it should also be fast.
+            if (source->getBlacklist()->contains(key))
+                continue;
 
-void 
-Map::removeTerrainMaskLayer(class MaskLayer* layer) {
-    OE_DEPRECATED(Map::removeTerrainMaskLayer, Map::removeLayer);
-    removeLayer(layer);
+            if (!terrainlayer->isCached(key))
+                return false;
+        }
+    }
+    return true;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapFrame osgearth-2.10.2+dfsg/src/osgEarth/MapFrame
--- osgearth-2.9.0+dfsg/src/osgEarth/MapFrame	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapFrame	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -38,104 +38,93 @@
 
     /**
      * A "snapshot in time" of a Map model revision. Use this class to get a safe "copy" of
-     * the map model lists that you can use without worrying about the model changing underneath
-     * you from another thread.
+     * the map model lists that you can use in a multi-threaded environment 
+     * without worrying about the model changing underneath you from another thread.
+     *
+     * Note: a MapFrame can "lose sync" with the actual Map at any time, if the underlying
+     * Map is destroyed. So be sure to check return values from the methods below.
+     *
+     * @deprecated (move to MP engine driver?)
      */
     class OSGEARTH_EXPORT MapFrame
     {
     public:
-        /**
-         * Constructs a new empty map frame that's not connected to any map.
-         */
+        //! Creates a new empty map frame that's not connected to any map.
         MapFrame();
 
+        //! Copy constructor
         MapFrame(const MapFrame& rhs);
 
+        //! Creates a new map frame from an existing map
         MapFrame(const Map* map);
 
-        bool isValid() const;
-
-        /** dtor */
+        //! Destructor
         virtual ~MapFrame() { }
 
-        /**
-         * Sets the map to which this frame is connected.
-         */
+        //! Whether the frame is connected to a valid map. Note: a return value of 
+        //! false is actionable and means the frame's data is invalid. But a return
+        //! value of TRUE only indicates a momentary validity -- the frame could 
+        //! become invalid at any time!
+        bool valid() const;
+
+        //! Connect this frame to a new map object
         void setMap(const Map* map);
 
-        /**
-         * Synchronizes this frame to the last-synced map. Returns true if changes occurred.
-         */
+        //! Synchronizes this frame to the last-synced map. Returns true if changes occurred.
         bool sync();
 
-        /**
-         * True is a sync() would acquire new data.
-         */
+        //! True is a sync() would acquire new data.
         bool needsSync() const;
 
-        /** Releases any references held by this frame. Call sync() to restablish */
+        //! Releases any references held by this frame. Call sync() to restablish
         void release();
 
-        /** The source map's UID */
-        UID getUID() const;
-
-        /** Accesses the profile/rendering info about the source map. */
+        //! Accesses the profile/rendering info about the source map
         const MapInfo& getMapInfo() const { return _mapInfo; }
 
-        /** Convenience method to access the map's profile */
+        //! Convenience method to access the map's profile. This could be NULL
+        //! so be sure to check the result.
         const Profile* getProfile() const { return _mapInfo.getProfile(); }
 
+        //! Layers in the map frame
         const LayerVector& layers() const { return _layers; }
         
+        //! Copy all the layers of the template type to a vector
         template<typename T>
-        unsigned getLayers(std::vector<osg::ref_ptr<T> >& output) const {
-            for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i) {
-                T* t = dynamic_cast<T*>(i->get());
-                if (t) output.push_back(t);
-            }
-            return output.size();
-        }
+        unsigned getLayers(std::vector<osg::ref_ptr<T> >& output) const;
 
+        //! Copy all the layers of the template type to a mix-in vector
         template<typename T>
-        unsigned getLayers(osg::MixinVector< osg::ref_ptr<T> >& output) const {
-            for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i) {
-                T* obj = dynamic_cast<T*>(i->get());
-                if (obj) output.push_back(obj);
-            }
-            return output.size();
-        }
+        unsigned getLayers(osg::MixinVector< osg::ref_ptr<T> >& output) const;
 
-        /** Whether the frame contains a layer with the matching UID */
-        bool containsLayer(UID uid) const;
+        //! Whether the frame contains an enabled layer with matching UID.
+        bool containsEnabledLayer(UID uid) const;
 
+        //! Returns the first layer with a given name.
         template<typename T>
-        T* getLayerByName(const std::string& name) {
-            for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i) {
-                if (i->get()->getName() == name)
-                    return dynamic_cast<T*>(i->get());
-            }
-            return 0L;
-        }
+        T* getLayerByName(const std::string& name) const;
+
+        //! Returns the layer with the matching UID (or NULL if not found)
+        template<typename T>
+        T* getLayerByUID(const UID uid) const;
 
-        /** The elevation layer stack snapshot */
+        //! The elevation layer stack snapshot
         const ElevationLayerVector& elevationLayers() const { return _elevationLayers; }
 
-        /** Gets the map data model revision with which this frame is currently sync'd */
+        //! The the map data model revision with which this frame is currently sync'd
         Revision getRevision() const { return _mapDataModelRevision; }
 
-        /** Checks whether all the data for the specified key is cached. */
+        //! Checks whether all the data for the specified key is cached.
         bool isCached( const TileKey& key ) const;
 
-        /** Access to the map's options */
+        //! Access to the map's options
         const MapOptions& getMapOptions() const;
 
-        /** The highest set minLevel() amongst all image and elevation layers */
+        //! The highest set minLevel() amongst all image and elevation layers
         unsigned getHighestMinLevel() const { return _highestMinLevel; }
 
-        /**
-         * Equivalent to the Map::populateHeightField() method, but operates on the
-         * elevation stack snapshot in this MapFrame.
-         */
+        //! Equivalent to the Map::populateHeightField() method, but operates on the
+        //! elevation stack snapshot in this MapFrame.
         bool populateHeightField(
             osg::ref_ptr<osg::HeightField>& hf,
             const TileKey&                  key,
@@ -149,11 +138,8 @@
             bool                            expressHeightsAsHAE,
             ProgressCallback*               progress) const;
 
-        /**
-         * Gets the map's elevation pool.
-         * This returns a ref_ptr because the Map itself is held with an observer_ptr.
-         */
-        ElevationPool* getElevationPool() const;
+        //! The map's elevation pool. Could be NULL if the MapFrame has lost sync.
+        osg::ref_ptr<ElevationPool> getElevationPool() const;
 
     private:
         bool _initialized;
@@ -164,13 +150,60 @@
         LayerVector _layers;
         ElevationLayerVector _elevationLayers;
         unsigned _highestMinLevel;
-        osg::ref_ptr<osg::Referenced> _pool;
+        //osg::ref_ptr<osg::Referenced> _pool;
 
         friend class Map;
 
         void refreshComputedValues();
     };
 
+    //...............................................................
+    // template implementations
+    
+    template<typename T>
+    unsigned MapFrame::getLayers(std::vector<osg::ref_ptr<T> >& output) const
+    {
+        for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i)
+        {
+            T* t = dynamic_cast<T*>(i->get());
+            if (t) output.push_back(t);
+        }
+        return output.size();
+    }
+
+    template<typename T>
+    unsigned MapFrame::getLayers(osg::MixinVector< osg::ref_ptr<T> >& output) const
+    {
+        for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i)
+        {
+            T* obj = dynamic_cast<T*>(i->get());
+            if (obj) output.push_back(obj);
+        }
+        return output.size();
+    }
+
+    template<typename T>
+    T* MapFrame::getLayerByName(const std::string& name) const
+    {
+        for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i)
+        {
+            if (i->get()->getName() == name)
+                return dynamic_cast<T*>(i->get());
+        }
+        return 0L;
+    }
+
+    template<typename T>
+    T* MapFrame::getLayerByUID(const UID uid) const
+    {
+        for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i)
+        {
+            if (i->get()->getUID() == uid)
+                return dynamic_cast<T*>(i->get());
+        }
+        return 0L;
+    }
+
 }
 
 #endif // OSGEARTH_MAP_FRAME_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapFrame.cpp osgearth-2.10.2+dfsg/src/osgEarth/MapFrame.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MapFrame.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapFrame.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,9 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/MapFrame>
-#include <osgEarth/Cache>
 #include <osgEarth/Map>
-#include <osgEarth/ElevationPool>
 
 using namespace osgEarth;
 
@@ -39,8 +37,7 @@
 _mapInfo             ( rhs._mapInfo ),
 _highestMinLevel     ( rhs._highestMinLevel ),
 _mapDataModelRevision( rhs._mapDataModelRevision ),
-_layers              ( rhs._layers ),
-_pool                ( rhs._pool.get() )
+_layers              ( rhs._layers )
 {
     //no sync required here; we copied the arrays etc
 }
@@ -55,8 +52,9 @@
 }
 
 bool
-MapFrame::isValid() const
+MapFrame::valid() const
 {
+    // only a momentary result since this is an observer_ptr!
     return _map.valid();
 }
 
@@ -64,7 +62,6 @@
 MapFrame::setMap(const Map* map)
 {
     _layers.clear();
-    _pool = 0L;
 
     _map = map;
     if ( map )
@@ -81,10 +78,15 @@
     }
 }
 
-ElevationPool*
+osg::ref_ptr<ElevationPool>
 MapFrame::getElevationPool() const
 {
-    return static_cast<ElevationPool*>(_pool.get());
+    osg::ref_ptr<const Map> map;
+    if (_map.lock(map))
+    {
+        return osg::ref_ptr<ElevationPool>(map->getElevationPool());
+    }
+    else return 0L;
 }
 
 bool
@@ -95,12 +97,13 @@
     osg::ref_ptr<const Map> map;
     if ( _map.lock(map) )
     {
-        changed = map->sync( *this );
-        if ( changed )
+        if (map->getDataModelRevision() != _mapDataModelRevision)
         {
+            _layers.clear();
+            map->getLayers(_layers);
             refreshComputedValues();
+            _mapDataModelRevision = map->getDataModelRevision();
         }
-        _pool = map->getElevationPool();
     }
     else
     {
@@ -116,9 +119,6 @@
 bool
 MapFrame::needsSync() const
 {
-    if ( !isValid() )
-        return false;
-
     osg::ref_ptr<const Map> map;
     return 
         _map.lock(map) &&
@@ -129,27 +129,21 @@
 MapFrame::release()
 {
     _layers.clear();
-    _pool = 0L;
+    _elevationLayers.clear();
     _initialized = false;
     _highestMinLevel = 0;
 }
 
-UID
-MapFrame::getUID() const
-{
-    osg::ref_ptr<const Map> map;
-    if ( _map.lock(map) )
-        return map->getUID();
-    else
-        return (UID)0;
-}
-
 bool
-MapFrame::containsLayer(UID uid) const
+MapFrame::containsEnabledLayer(UID uid) const
 {
     for (LayerVector::const_iterator i = _layers.begin(); i != _layers.end(); ++i)
+    {
         if (i->get()->getUID() == uid)
-            return true;
+        {
+            return i->get()->getEnabled();
+        }
+    }
     return false;
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapInfo osgearth-2.10.2+dfsg/src/osgEarth/MapInfo
--- osgearth-2.9.0+dfsg/src/osgEarth/MapInfo	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapInfo	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -56,12 +56,6 @@
         //! True if the map's visualization is geocentric
         bool isGeocentric() const { return _isGeocentric; }
 
-        //! @deprecated (always false)
-        bool isCube() const { return _isCube; }
-
-        //! True if the map's SRS is a plate carre projected profile
-        bool isPlateCarre() const { return _profile->getSRS()->isPlateCarre(); }
-
         //! True if the map's SRS is projected
         bool isProjectedSRS() const { return !isGeographicSRS(); }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapInfo.cpp osgearth-2.10.2+dfsg/src/osgEarth/MapInfo.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MapInfo.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapInfo.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapModelChange osgearth-2.10.2+dfsg/src/osgEarth/MapModelChange
--- osgearth-2.9.0+dfsg/src/osgEarth/MapModelChange	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapModelChange	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 #include <osgEarth/MaskLayer>
 
 namespace osgEarth
-{    
+{
     /**
      * Conveys atomic change actions to the map data model.
      */
@@ -41,13 +41,15 @@
             ADD_LAYER,
             REMOVE_LAYER,
             MOVE_LAYER,
-            TOGGLE_ELEVATION_LAYER,     // visibilty toggle on elevation is a model change.
+            TOGGLE_LAYER,     // visibilty toggle on elevation is a model change.
+            ENABLE_LAYER,
+            DISABLE_LAYER,
             UNSPECIFIED
         };
 
         MapModelChange() : _action(UNSPECIFIED) { }
 
-        MapModelChange( ActionType action, Revision mapModeRev, Layer* layer =0L, int firstIndex =-1, int secondIndex =-1 ) 
+        MapModelChange( ActionType action, Revision mapModeRev, Layer* layer =0L, int firstIndex =-1, int secondIndex =-1 )
             : _action(action), _layer(layer), _modelRevision(mapModeRev), _firstIndex(firstIndex), _secondIndex(secondIndex) { }
 
         const ActionType& getAction() const { return _action; }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapNode osgearth-2.10.2+dfsg/src/osgEarth/MapNode
--- osgearth-2.9.0+dfsg/src/osgEarth/MapNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -38,6 +38,7 @@
     class ResourceReleaser;
     class DrapingManager;
     class ClampingManager;
+    class CascadeDrapingDecorator;
 
     /**
      * OSG Node that forms the root of an osgEarth map. This node is a "view" component
@@ -138,9 +139,6 @@
          */
         osg::Group* getLayerNodeGroup() const;
 
-        // @deprecated - use getLayerNodeGroup
-        osg::Group* getModelLayerGroup() const { return getLayerNodeGroup(); }
-
         /**
          * Accesses the root node for a specific ModelLayer.
          */
@@ -256,6 +254,7 @@
         ResourceReleaser*  _resourceReleaser;
         DrapingManager*    _drapingManager;
         ClampingManager*   _clampingManager;
+        CascadeDrapingDecorator* _cascadeDrapingDecorator;
 
         std::vector< osg::ref_ptr<Extension> > _extensions;
 
@@ -267,6 +266,10 @@
         void onLayerRemoved(Layer* layer, unsigned index);
         void onLayerMoved(Layer* layer, unsigned oldIndex, unsigned newIndex);
 
+        // internal
+        osg::Node* getDrapingDump();
+        CascadeDrapingDecorator* getCascadeDrapingDecorator() const;
+
     private:
 
         osg::ref_ptr< MapCallback > _mapCallback;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapNode.cpp osgearth-2.10.2+dfsg/src/osgEarth/MapNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MapNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,32 +20,17 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/MapNode>
-#include <osgEarth/Capabilities>
-#include <osgEarth/ClampableNode>
+#include <osgEarth/CascadeDrapingDecorator>
 #include <osgEarth/ClampingTechnique>
 #include <osgEarth/CullingUtils>
-#include <osgEarth/DrapeableNode>
 #include <osgEarth/DrapingTechnique>
-#include <osgEarth/MapNodeObserver>
-#include <osgEarth/MaskNode>
 #include <osgEarth/NodeUtils>
 #include <osgEarth/Registry>
-#include <osgEarth/ShaderFactory>
-#include <osgEarth/TraversalData>
-#include <osgEarth/VirtualProgram>
-#include <osgEarth/OverlayDecorator>
-#include <osgEarth/TerrainEngineNode>
-#include <osgEarth/TerrainResources>
-#include <osgEarth/ShaderGenerator>
-#include <osgEarth/SpatialReference>
-#include <osgEarth/MapModelChange>
-#include <osgEarth/Lighting>
 #include <osgEarth/ResourceReleaser>
-#include <osgEarth/URI>
-#include <osg/ArgumentParser>
-#include <osg/PagedLOD>
+#include <osgEarth/Lighting>
+#include <osgEarth/GLUtils>
+#include <osgEarth/HorizonClipPlane>
 #include <osgUtil/Optimizer>
-#include <typeinfo>
 
 using namespace osgEarth;
 
@@ -67,17 +52,18 @@
 
         void onLayerAdded(Layer* layer, unsigned index) {
             _node->onLayerAdded(layer, index);
-            // for backwards compat until we refactor ModelLayer to use Layer::getNode
-            MapCallback::onLayerAdded(layer, index);
         }
         void onLayerRemoved(Layer* layer, unsigned index) {
             _node->onLayerRemoved(layer, index);
-            // for backwards compat until we refactor ModelLayer to use Layer::getNode
-            MapCallback::onLayerRemoved(layer, index);
         }
         void onLayerMoved(Layer* layer, unsigned oldIndex, unsigned newIndex) {
             _node->onLayerMoved(layer, oldIndex, newIndex);
-            MapCallback::onLayerMoved(layer, oldIndex, newIndex);
+        }
+        void onLayerEnabled(Layer* layer) {
+            _node->onLayerAdded(layer, _node->getMap()->getIndexOfLayer(layer));
+        }
+        void onLayerDisabled(Layer* layer) {
+            _node->onLayerRemoved(layer, _node->getMap()->getIndexOfLayer(layer));
         }
 
         osg::observer_ptr<MapNode> _node;
@@ -89,7 +75,7 @@
     {
         MapNodeObserverInstaller( MapNode* mapNode ) : _mapNode( mapNode ) { }
 
-        virtual void onPostMergeNode(osg::Node* node)
+        virtual void onPostMergeNode(osg::Node* node, osg::Object* sender)
         {
             if ( _mapNode.valid() && node )
             {
@@ -101,6 +87,30 @@
         osg::observer_ptr<MapNode> _mapNode;
     };
 
+    // proxy cull callback for layers that have their own cull callback
+    struct LayerCullCallbackDispatch : public osg::NodeCallback
+    {
+        Layer* _layer;
+
+        LayerCullCallbackDispatch(Layer* layer) : _layer(layer) { }
+
+        virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+        {
+            if (_layer->getNode())
+            {
+                _layer->apply(_layer->getNode(), nv);
+            }
+            //if (_layer->getCullCallback() && _layer->getNode())
+            //{
+            //    _layer->apply(_layer->getNode(), nv);
+            //}
+            else
+            {
+                traverse(node, nv);
+            }
+        };
+    };
+
     typedef std::vector< osg::ref_ptr<Extension> > Extensions;
 }
 
@@ -307,10 +317,8 @@
     // initialize terrain-level lighting:
     if ( terrainOptions.enableLighting().isSet() )
     {
-        _terrainEngineContainer->getOrCreateStateSet()->setDefine(OE_LIGHTING_DEFINE, terrainOptions.enableLighting().get());
-
-        _terrainEngineContainer->getOrCreateStateSet()->setMode(
-            GL_LIGHTING,
+        GLUtils::setLighting(
+            _terrainEngineContainer->getOrCreateStateSet(),
             terrainOptions.enableLighting().value() ? 1 : 0 );
     }
 
@@ -318,35 +326,49 @@
     _overlayDecorator = new OverlayDecorator();
     _terrainEngineContainer->addChild(_overlayDecorator);
 
-    // install the Draping technique for overlays:
-    DrapingTechnique* draping = new DrapingTechnique();
-
-    const char* envOverlayTextureSize = ::getenv("OSGEARTH_OVERLAY_TEXTURE_SIZE");
-
-    if ( _mapNodeOptions.overlayBlending().isSet() )
-        draping->setOverlayBlending( *_mapNodeOptions.overlayBlending() );
-    if ( envOverlayTextureSize )
-        draping->setTextureSize( as<int>(envOverlayTextureSize, 1024) );
-    else if ( _mapNodeOptions.overlayTextureSize().isSet() )
-        draping->setTextureSize( *_mapNodeOptions.overlayTextureSize() );
-    if ( _mapNodeOptions.overlayMipMapping().isSet() )
-        draping->setMipMapping( *_mapNodeOptions.overlayMipMapping() );
-    if ( _mapNodeOptions.overlayAttachStencil().isSet() )
-        draping->setAttachStencil( *_mapNodeOptions.overlayAttachStencil() );
-    if ( _mapNodeOptions.overlayResolutionRatio().isSet() )
-        draping->setResolutionRatio( *_mapNodeOptions.overlayResolutionRatio() );
-
-    draping->reestablish( _terrainEngine );
-    _overlayDecorator->addTechnique( draping );
-    _drapingManager = &draping->getDrapingManager();
-
     // install the Clamping technique for overlays:
     ClampingTechnique* clamping = new ClampingTechnique();
     _overlayDecorator->addTechnique(clamping);
     _clampingManager = &clamping->getClampingManager();
 
+    bool envUseCascadedDraping = (::getenv("OSGEARTH_USE_CASCADE_DRAPING") != 0L);
+    if (envUseCascadedDraping || _mapNodeOptions.useCascadeDraping() == true)
+    {
+        _cascadeDrapingDecorator = new CascadeDrapingDecorator(getMapSRS(), _terrainEngine->getResources());
+        _overlayDecorator->addChild(_cascadeDrapingDecorator);
+        _drapingManager = &_cascadeDrapingDecorator->getDrapingManager();
+        _cascadeDrapingDecorator->addChild(_terrainEngine);
+    }
+
+    else
+    {
+        // simple draping - faster but less accurate
+
+        DrapingTechnique* draping = new DrapingTechnique();
+
+        const char* envOverlayTextureSize = ::getenv("OSGEARTH_OVERLAY_TEXTURE_SIZE");
+
+        if ( _mapNodeOptions.overlayBlending().isSet() )
+            draping->setOverlayBlending( *_mapNodeOptions.overlayBlending() );
+        if ( envOverlayTextureSize )
+            draping->setTextureSize( as<int>(envOverlayTextureSize, 1024) );
+        else if ( _mapNodeOptions.overlayTextureSize().isSet() )
+            draping->setTextureSize( *_mapNodeOptions.overlayTextureSize() );
+        if ( _mapNodeOptions.overlayMipMapping().isSet() )
+            draping->setMipMapping( *_mapNodeOptions.overlayMipMapping() );
+        if ( _mapNodeOptions.overlayAttachStencil().isSet() )
+            draping->setAttachStencil( *_mapNodeOptions.overlayAttachStencil() );
+        if ( _mapNodeOptions.overlayResolutionRatio().isSet() )
+            draping->setResolutionRatio( *_mapNodeOptions.overlayResolutionRatio() );
+
+        draping->reestablish( _terrainEngine );
+        _overlayDecorator->addTechnique( draping );
+        _drapingManager = &draping->getDrapingManager();
+
+        _overlayDecorator->addChild(_terrainEngine);
+    }
+
     _overlayDecorator->setTerrainEngine(_terrainEngine);
-    _overlayDecorator->addChild(_terrainEngine);
 
     // make a group for the model layers. (Sticky otherwise the osg optimizer will remove it)
     _layerNodes = new StickyGroup();
@@ -366,42 +388,22 @@
 
     if ( _mapNodeOptions.enableLighting().isSet() )
     {
-        stateset->setDefine(OE_LIGHTING_DEFINE, terrainOptions.enableLighting().get());
-
-        stateset->setMode(
-            GL_LIGHTING,
+        GLUtils::setLighting(
+            stateset,
             _mapNodeOptions.enableLighting().value() ? 1 : 0);
     }
 
     // Add in some global uniforms
-    stateset->addUniform( new osg::Uniform("oe_isGeocentric", _map->isGeocentric()) );
     if ( _map->isGeocentric() )
     {
-        OE_INFO << LC << "Adding ellipsoid uniforms.\n";
-
-        // for a geocentric map, use an ellipsoid unit-frame transform and its inverse:
-        if (_map->getSRS() != NULL && _map->getSRS()->getEllipsoid() != NULL)
-        {
-            osg::Vec3d ellipFrameInverse(
-                _map->getSRS()->getEllipsoid()->getRadiusEquator(),
-                _map->getSRS()->getEllipsoid()->getRadiusEquator(),
-                _map->getSRS()->getEllipsoid()->getRadiusPolar());
-            stateset->addUniform( new osg::Uniform("oe_ellipsoidFrameInverse", osg::Vec3f(ellipFrameInverse)) );
-
-            osg::Vec3d ellipFrame = osg::componentDivide(osg::Vec3d(1.0,1.0,1.0), ellipFrameInverse);
-            stateset->addUniform( new osg::Uniform("oe_ellipsoidFrame", osg::Vec3f(ellipFrame)) );
-        }
-        else
-        {
-            stateset->addUniform( new osg::Uniform("oe_ellipsoidFrameInverse", osg::Vec3f()) );
-            stateset->addUniform( new osg::Uniform("oe_ellipsoidFrame", osg::Vec3f()) );
-        }
+        stateset->setDefine("OE_IS_GEOCENTRIC");
     }
 
     // install a default material for everything in the map
     osg::Material* defaultMaterial = new MaterialGL3();
     defaultMaterial->setDiffuse(defaultMaterial->FRONT, osg::Vec4(1,1,1,1));
     defaultMaterial->setAmbient(defaultMaterial->FRONT, osg::Vec4(1,1,1,1));
+    //defaultMaterial->setSpecular(defaultMaterial->FRONT, osg::Vec4(1,0,0,1));
     stateset->setAttributeAndModes(defaultMaterial, 1);
     MaterialCallback().operator()(defaultMaterial, 0L);
 
@@ -410,6 +412,12 @@
     // install a callback that sets the viewport size uniform:
     this->addCullCallback(new InstallViewportSizeUniform());
 
+    // install a callback that updates a horizon object and installs a clipping plane
+    if (getMapSRS()->isGeographic())
+    {
+        this->addCullCallback(new HorizonClipPlane(getMapSRS()->getEllipsoid()));
+    }
+
     // register for event traversals so we can deal with blacklisted filenames
     ADJUST_EVENT_TRAV_COUNT( this, 1 );
 
@@ -419,18 +427,11 @@
 
 MapNode::~MapNode()
 {
+    // Remove this node's map callback first:
     _map->removeMapCallback( _mapCallback.get() );
 
+    // Then invoke "removed" on all the layers in a batch.
     _mapCallback->invokeOnLayerRemoved(_map.get());
-    //ModelLayerVector modelLayers;
-    //_map->getLayers( modelLayers );
-    ////Remove our model callback from any of the model layers in the map
-    //for (osgEarth::ModelLayerVector::iterator itr = modelLayers.begin(); itr != modelLayers.end(); ++itr)
-    //{
-    //    this->onModelLayerRemoved( itr->get() );
-    //}
-
-    _map->clear();
 
     this->clearExtensions();
 
@@ -447,8 +448,6 @@
     Config mapConf("map");
     mapConf.set("version", "2");
 
-    MapFrame mapf( _map.get() );
-
     // the map and node options:
     Config optionsConf = _map->getInitialMapOptions().getConfig();
     optionsConf.merge( getMapNodeOptions().getConfig() );
@@ -456,7 +455,7 @@
 
     // the layers
     LayerVector layers;
-    mapf.getLayers(layers);
+    _map->getLayers(layers);
 
     for (LayerVector::const_iterator i = layers.begin(); i != layers.end(); ++i)
     {
@@ -474,10 +473,8 @@
     {
         Extension* e = i->get();
         Config conf = e->getConfigOptions().getConfig();
-        if ( !conf.key().empty() )
-        {
-            mapConf.add( conf );
-        }
+        conf.key() = e->getConfigKey();
+        mapConf.add( conf );
     }
 
     Config ext = externalConfig();
@@ -615,7 +612,7 @@
 osg::Node*
 MapNode::getLayerNode(Layer* layer) const
 {
-    return layer ? layer->getOrCreateNode() : 0L;
+    return layer ? layer->getNode() : 0L;
 }
 
 
@@ -648,14 +645,18 @@
         for (LayerVector::iterator i = layers.begin(); i != layers.end(); ++i)
         {
             Layer* layer = i->get();
-            osg::Node* node = layer->getOrCreateNode();
-            if (node)
+            if (layer->getEnabled())
             {
-                osg::Group* container = new osg::Group();
-                container->setName(layer->getName());
-                container->addChild(node);
-                container->setStateSet(layer->getStateSet());
-                layerNodes->addChild(container);
+                osg::Node* node = layer->getNode();
+                if (node)
+                {
+                    osg::Group* container = new osg::Group();
+                    container->setName(layer->getName());
+                    container->addChild(node);
+                    container->setStateSet(layer->getOrCreateStateSet());
+                    container->setCullCallback(new LayerCullCallbackDispatch(layer));
+                    layerNodes->addChild(container);
+                }
             }
         }
     }
@@ -670,90 +671,59 @@
     // Communicate terrain resources to the layer:
     layer->setTerrainResources(getTerrainEngine()->getResources());
 
-    // Compatibility, until we refactor things.
-    ModelLayer* modelLayer = dynamic_cast<ModelLayer*>(layer);
-    if (modelLayer)
-    {
-        // TODO:  Why go through all the MapNodeObserver stuff when we can just pass in the MapNode here?
-        modelLayer->getOrCreateSceneGraph(_map.get(), _map->getReadOptions(), 0L);
-        // Install the MapNodeObserverInstaller so that MapNodeObservers will be notified of the MapNode.
-        modelLayer->getSceneGraphCallbacks()->add(new MapNodeObserverInstaller(this));
-    }
+    // Each layer gets a callback to change the MapNode if necessary
+    layer->getSceneGraphCallbacks()->add(new MapNodeObserverInstaller(this));
 
     // Create the layer's node, if it has one:
-    osg::Node* node = layer->getOrCreateNode();
+    osg::Node* node = layer->getNode();
     if (node)
     {
-        // Call setMapNode on any MapNodeObservers on this initial creation.
-        MapNodeReplacer replacer( this );
-        //node->accept( replacer );
+        OE_DEBUG << LC << "Adding node from layer \"" << layer->getName() << "\" to the scene graph\n";
 
-        rebuildLayerNodes(_map.get(), _layerNodes);
+        // notify before adding it to the graph:
+        layer->getSceneGraphCallbacks()->firePreMergeNode(node);
 
-        OE_DEBUG << LC << "Adding node from layer \"" << layer->getName() << "\" to the scene graph\n";
+        // update the layer-to-node table (adds the node to the graph)
+        rebuildLayerNodes(_map.get(), _layerNodes);
 
-        // TODO: move this logic into ModelLayer.
-        if (modelLayer)
-        {
-            ModelSource* ms = modelLayer->getModelSource();
-            if (ms)
-            {
-                // enfore a rendering bin if necessary:
-                if (ms->getOptions().renderOrder().isSet())
-                {
-                    osg::StateSet* mss = node->getOrCreateStateSet();
-                    mss->setRenderBinDetails(
-                        ms->getOptions().renderOrder().value(),
-                        mss->getBinName().empty() ? "DepthSortedBin" : mss->getBinName());
-                }
-                if (ms->getOptions().renderBin().isSet())
-                {
-                    osg::StateSet* mss = node->getOrCreateStateSet();
-                    mss->setRenderBinDetails(
-                        mss->getBinNumber(),
-                        ms->getOptions().renderBin().get());
-                }
-            }
-        }
+        // after putting it in the graph:
+        layer->getSceneGraphCallbacks()->firePostMergeNode(node);
     }
 }
 
 void
 MapNode::onLayerRemoved(Layer* layer, unsigned index)
 {
-    if (layer && layer->getOrCreateNode())
+    if (layer)
     {
-        rebuildLayerNodes(_map.get(), _layerNodes);
+        osg::Node* node = layer->getNode();
+        if (node)
+        {
+            layer->getSceneGraphCallbacks()->fireRemoveNode(node);
+            rebuildLayerNodes(_map.get(), _layerNodes);
+        }
     }
 }
 
 void
 MapNode::onLayerMoved(Layer* layer, unsigned oldIndex, unsigned newIndex)
 {
-    if (layer && layer->getOrCreateNode())
+    if (layer && layer->getNode())
     {
         rebuildLayerNodes(_map.get(), _layerNodes);
     }
 }
 
-namespace
+void
+MapNode::openMapLayers()
 {
-    struct MaskNodeFinder : public osg::NodeVisitor {
-        MaskNodeFinder() : osg::NodeVisitor( osg::NodeVisitor::TRAVERSE_ALL_CHILDREN ) { }
-        void apply( osg::Group& group ) {
-            if ( dynamic_cast<MaskNode*>( &group ) ) {
-                _groups.push_back( &group );
-            }
-            traverse(group);
-        }
-        std::list< osg::Group* > _groups;
-    };
-}
+    LayerVector layers;
+    _map->getLayers(layers);
 
-namespace
-{
-    template<typename T> void tryOpenLayer(T* layer)
+    for (LayerVector::const_iterator i = layers.begin(); i != layers.end(); ++i)
     {
+        Layer* layer = i->get();
+
         if (!layer->getStatus().isError())
         {
             const Status& status = layer->open();
@@ -766,19 +736,6 @@
 }
 
 void
-MapNode::openMapLayers()
-{
-    MapFrame frame(_map.get());
-
-    for (LayerVector::const_iterator i = frame.layers().begin();
-        i != frame.layers().end();
-        ++i)
-    {
-        tryOpenLayer(i->get());
-    }
-}
-
-void
 MapNode::traverse( osg::NodeVisitor& nv )
 {
     if ( nv.getVisitorType() == nv.EVENT_VISITOR )
@@ -806,31 +763,35 @@
 void
 MapNode::resizeGLObjectBuffers(unsigned maxSize)
 {
-    osg::Group::resizeGLObjectBuffers(maxSize);
-
     LayerVector layers;
     getMap()->getLayers(layers);
     for (LayerVector::const_iterator i = layers.begin(); i != layers.end(); ++i)
     {
-        if ((*i)->getStateSet()) {
-            (*i)->getStateSet()->resizeGLObjectBuffers(maxSize);
-        }
+        i->get()->resizeGLObjectBuffers(maxSize);
     }
+
+    osg::Group::resizeGLObjectBuffers(maxSize);
 }
 
 void
 MapNode::releaseGLObjects(osg::State* state) const
 {
-    osg::Group::releaseGLObjects(state);
-
     LayerVector layers;
     getMap()->getLayers(layers);
     for (LayerVector::const_iterator i = layers.begin(); i != layers.end(); ++i)
     {
-        if ((*i)->getStateSet()) {
-            (*i)->getStateSet()->releaseGLObjects(state);
-        }
+        i->get()->releaseGLObjects(state);
     }
+
+    // osg::Node doesn't release nested callbacks, oops
+    for(const osg::Callback* cc = getCullCallback(); cc; cc = cc->getNestedCallback())
+        cc->releaseGLObjects(state);
+    for(const osg::Callback* uc = getUpdateCallback(); uc; uc = uc->getNestedCallback())
+        uc->releaseGLObjects(state);
+    for(const osg::Callback* ec = getEventCallback(); ec; ec = ec->getNestedCallback())
+        ec->releaseGLObjects(state);
+
+    osg::Group::releaseGLObjects(state);
 }
 
 DrapingManager*
@@ -844,3 +805,17 @@
 {
     return _clampingManager;
 }
+
+osg::Node*
+MapNode::getDrapingDump()
+{
+    return
+        _cascadeDrapingDecorator ? _cascadeDrapingDecorator->getDump() :
+        _overlayDecorator->getDump();
+}
+
+CascadeDrapingDecorator*
+MapNode::getCascadeDrapingDecorator() const
+{
+    return _cascadeDrapingDecorator;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapNodeObserver osgearth-2.10.2+dfsg/src/osgEarth/MapNodeObserver
--- osgearth-2.9.0+dfsg/src/osgEarth/MapNodeObserver	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapNodeObserver	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -80,18 +80,6 @@
             tryApply( dynamic_cast<MapNodeObserver*>(node.getCullCallback()) );
             traverse( node );
         }
-
-        void apply( osg::Geode& geode )
-        {
-            for(unsigned d=0; d<geode.getNumDrawables(); ++d )
-            {
-                osg::Drawable* drawable = geode.getDrawable(d);
-                tryApply( dynamic_cast<MapNodeObserver*>(drawable->getEventCallback()) );
-                tryApply( dynamic_cast<MapNodeObserver*>(drawable->getUpdateCallback()) );
-                tryApply( dynamic_cast<MapNodeObserver*>(drawable->getCullCallback()) );
-            }
-            traverse( geode );
-        }
     };
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapNodeOptions osgearth-2.10.2+dfsg/src/osgEarth/MapNodeOptions
--- osgearth-2.9.0+dfsg/src/osgEarth/MapNodeOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapNodeOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -56,13 +56,6 @@
         const optional<ProxySettings>& proxySettings() const { return _proxySettings; }
 
         /**
-         * Whether the map should be run exclusively off of the cache.
-         * Default = false
-         */
-        optional<bool>& cacheOnly() { return _cacheOnly; }
-        const optional<bool>& cacheOnly() const { return _cacheOnly; }
-
-        /**
          * Whether to explicity enable or disable GL lighting on the map node.
          */
         optional<bool>& enableLighting() { return _enableLighting; }
@@ -105,6 +98,11 @@
         optional<float>& overlayResolutionRatio() { return _overlayResolutionRatio; }
         const optional<float>& overlayResolutionRatio() const { return _overlayResolutionRatio; }
 
+        //! Whether to use the cascaded draping module, which is more accurate but
+        //! uses more system resources.
+        optional<bool>& useCascadeDraping() { return _useCascadeDraping; }
+        const optional<bool>& useCascadeDraping() const { return _useCascadeDraping; }
+
         /**
          * Options to conigure the terrain engine (the component that renders the
          * terrain surface).
@@ -120,7 +118,6 @@
 
     private:            
         optional<ProxySettings> _proxySettings;
-        optional<bool> _cacheOnly;
         optional<bool> _enableLighting;
 
         optional<bool>     _overlayVertexWarping;
@@ -129,6 +126,7 @@
         optional<bool>     _overlayMipMapping;
         optional<bool>     _overlayAttachStencil;
         optional<float>    _overlayResolutionRatio;
+        optional<bool> _useCascadeDraping;
 
         optional<Config> _terrainOptionsConf;
         TerrainOptions* _terrainOptions;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapNodeOptions.cpp osgearth-2.10.2+dfsg/src/osgEarth/MapNodeOptions.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MapNodeOptions.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapNodeOptions.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/MapNodeOptions>
-#include <osg/Notify>
-#include <OpenThreads/Thread>
 
 using namespace osgEarth;
 
@@ -33,42 +31,42 @@
 MapNodeOptions::MapNodeOptions( const Config& conf ) :
 ConfigOptions          ( conf ),
 _proxySettings         ( ProxySettings() ),
-_cacheOnly             ( false ),
 _enableLighting        ( true ),
 _overlayBlending       ( true ),
 _overlayMipMapping     ( false ),
 _overlayTextureSize    ( 4096 ),
 _terrainOptions        ( 0L ),
 _overlayAttachStencil  ( false ),
-_overlayResolutionRatio( 3.0f )
+_overlayResolutionRatio( 3.0f ),
+_useCascadeDraping     ( false )
 {
     mergeConfig( conf );
 }
 
 MapNodeOptions::MapNodeOptions( const TerrainOptions& to ) :
 _proxySettings         ( ProxySettings() ),
-_cacheOnly             ( false ),
 _enableLighting        ( true ),
 _overlayBlending       ( true ),
 _overlayTextureSize    ( 4096 ),
 _overlayMipMapping     ( false ),
 _overlayAttachStencil  ( false ),
 _overlayResolutionRatio( 3.0f ),
-_terrainOptions        ( 0L )
+_terrainOptions        ( 0L ),
+_useCascadeDraping     ( false )
 {
     setTerrainOptions( to );
 }
 
 MapNodeOptions::MapNodeOptions( const MapNodeOptions& rhs ) :
 _proxySettings         ( ProxySettings() ),
-_cacheOnly             ( false ),
 _enableLighting        ( true ),
 _overlayBlending       ( true ),
 _overlayTextureSize    ( 4096 ),
 _overlayMipMapping     ( false ),
 _overlayAttachStencil  ( false ),
 _overlayResolutionRatio( 3.0f ),
-_terrainOptions        ( 0L )
+_terrainOptions        ( 0L ),
+_useCascadeDraping     ( false )
 {
     mergeConfig( rhs.getConfig() );
 }
@@ -89,16 +87,16 @@
     Config conf; // start with a fresh one since this is a FINAL object  // = ConfigOptions::getConfig();
     conf.key() = "options";
 
-    conf.setObj( "proxy",                    _proxySettings );
-    conf.updateIfSet   ( "cache_only",               _cacheOnly );
-    conf.updateIfSet   ( "lighting",                 _enableLighting );
-    conf.updateIfSet   ( "terrain",                  _terrainOptionsConf );
-    conf.updateIfSet   ( "overlay_warping",          _overlayVertexWarping );
-    conf.updateIfSet   ( "overlay_blending",         _overlayBlending );
-    conf.updateIfSet   ( "overlay_texture_size",     _overlayTextureSize );
-    conf.updateIfSet   ( "overlay_mipmapping",       _overlayMipMapping );
-    conf.updateIfSet   ( "overlay_attach_stencil",   _overlayAttachStencil );
-    conf.updateIfSet   ( "overlay_resolution_ratio", _overlayResolutionRatio );
+    conf.set( "proxy",                    _proxySettings );
+    conf.set( "lighting",                 _enableLighting );
+    conf.set( "terrain",                  _terrainOptionsConf );
+    conf.set( "overlay_warping",          _overlayVertexWarping );
+    conf.set( "overlay_blending",         _overlayBlending );
+    conf.set( "overlay_texture_size",     _overlayTextureSize );
+    conf.set( "overlay_mipmapping",       _overlayMipMapping );
+    conf.set( "overlay_attach_stencil",   _overlayAttachStencil );
+    conf.set( "overlay_resolution_ratio", _overlayResolutionRatio );
+    conf.set( "cascade_draping",          _useCascadeDraping );
 
     return conf;
 }
@@ -108,15 +106,15 @@
 {
     ConfigOptions::mergeConfig( conf );
 
-    conf.getObjIfSet( "proxy",                    _proxySettings );
-    conf.getIfSet   ( "cache_only",               _cacheOnly );
-    conf.getIfSet   ( "lighting",                 _enableLighting );
-    conf.getIfSet   ( "overlay_warping",          _overlayVertexWarping );
-    conf.getIfSet   ( "overlay_blending",         _overlayBlending );
-    conf.getIfSet   ( "overlay_texture_size",     _overlayTextureSize );
-    conf.getIfSet   ( "overlay_mipmapping",       _overlayMipMapping );
-    conf.getIfSet   ( "overlay_attach_stencil",   _overlayAttachStencil );
-    conf.getIfSet   ( "overlay_resolution_ratio", _overlayResolutionRatio );
+    conf.get( "proxy",                    _proxySettings );
+    conf.get( "lighting",                 _enableLighting );
+    conf.get( "overlay_warping",          _overlayVertexWarping );
+    conf.get( "overlay_blending",         _overlayBlending );
+    conf.get( "overlay_texture_size",     _overlayTextureSize );
+    conf.get( "overlay_mipmapping",       _overlayMipMapping );
+    conf.get( "overlay_attach_stencil",   _overlayAttachStencil );
+    conf.get( "overlay_resolution_ratio", _overlayResolutionRatio );
+    conf.get( "cascade_draping",          _useCascadeDraping );
 
     if ( conf.hasChild( "terrain" ) )
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapOptions osgearth-2.10.2+dfsg/src/osgEarth/MapOptions
--- osgearth-2.9.0+dfsg/src/osgEarth/MapOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -28,14 +28,13 @@
 #include <osgEarth/CachePolicy>
 #include <osgEarth/GeoCommon>
 #include <osgEarth/Profile>
-#include <osgEarth/TerrainOptions>
 
 namespace osgEarth
 {
     /**
      * Configuration for a runtime map.
      */
-    class OSGEARTH_EXPORT MapOptions : public ConfigOptions // no export (header-only)
+    class OSGEARTH_EXPORT MapOptions : public ConfigOptions
     {
     public:
         enum CoordinateSystemType
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MapOptions.cpp osgearth-2.10.2+dfsg/src/osgEarth/MapOptions.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MapOptions.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MapOptions.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -23,10 +23,10 @@
 void
 MapOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet   ( "name",         _name );
-    conf.getObjIfSet( "profile",      _profileOptions );
-    conf.getObjIfSet( "cache",        _cacheOptions );  
-    conf.getObjIfSet( "cache_policy", _cachePolicy );
+    conf.get( "name",         _name );
+    conf.get( "profile",      _profileOptions );
+    conf.get( "cache",        _cacheOptions );  
+    conf.get( "cache_policy", _cachePolicy );
 
     // legacy support:
     if ( conf.value<bool>( "cache_only", false ) == true )
@@ -35,16 +35,16 @@
         _cachePolicy->usage() = CachePolicy::USAGE_NO_CACHE;
 
     // all variations:
-    conf.getIfSet( "type", "geocentric", _cstype, CSTYPE_GEOCENTRIC );
-    conf.getIfSet( "type", "globe",      _cstype, CSTYPE_GEOCENTRIC );
-    conf.getIfSet( "type", "round",      _cstype, CSTYPE_GEOCENTRIC );
-    conf.getIfSet( "type", "projected",  _cstype, CSTYPE_PROJECTED );
-    conf.getIfSet( "type", "flat",       _cstype, CSTYPE_PROJECTED );
-
-    conf.getIfSet( "elevation_interpolation", "nearest",     _elevationInterpolation, INTERP_NEAREST);
-    conf.getIfSet( "elevation_interpolation", "average",     _elevationInterpolation, INTERP_AVERAGE);
-    conf.getIfSet( "elevation_interpolation", "bilinear",    _elevationInterpolation, INTERP_BILINEAR);
-    conf.getIfSet( "elevation_interpolation", "triangulate", _elevationInterpolation, INTERP_TRIANGULATE);
+    conf.get( "type", "geocentric", _cstype, CSTYPE_GEOCENTRIC );
+    conf.get( "type", "globe",      _cstype, CSTYPE_GEOCENTRIC );
+    conf.get( "type", "round",      _cstype, CSTYPE_GEOCENTRIC );
+    conf.get( "type", "projected",  _cstype, CSTYPE_PROJECTED );
+    conf.get( "type", "flat",       _cstype, CSTYPE_PROJECTED );
+
+    conf.get( "elevation_interpolation", "nearest",     _elevationInterpolation, INTERP_NEAREST);
+    conf.get( "elevation_interpolation", "average",     _elevationInterpolation, INTERP_AVERAGE);
+    conf.get( "elevation_interpolation", "bilinear",    _elevationInterpolation, INTERP_BILINEAR);
+    conf.get( "elevation_interpolation", "triangulate", _elevationInterpolation, INTERP_TRIANGULATE);
 }
 
 Config
@@ -52,10 +52,10 @@
 {
     Config conf = ConfigOptions::getConfig();
 
-    conf.updateIfSet   ( "name",         _name );
-    conf.setObj( "profile",      _profileOptions );
-    conf.setObj( "cache",        _cacheOptions );
-    conf.setObj( "cache_policy", _cachePolicy );
+    conf.set( "name",         _name );
+    conf.set( "profile",      _profileOptions );
+    conf.set( "cache",        _cacheOptions );
+    conf.set( "cache_policy", _cachePolicy );
 
     // all variations:
     conf.set( "type", "geocentric", _cstype, CSTYPE_GEOCENTRIC );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MaskLayer osgearth-2.10.2+dfsg/src/osgEarth/MaskLayer
--- osgearth-2.9.0+dfsg/src/osgEarth/MaskLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MaskLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -66,7 +66,7 @@
     class OSGEARTH_EXPORT MaskLayer : public Layer
     {
     public:
-        META_Layer(osgEarth, MaskLayer, MaskLayerOptions);
+        META_Layer(osgEarth, MaskLayer, MaskLayerOptions, mask);
 
         /**
          * Minimum terrain LOD at which masking should occur
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MaskLayer.cpp osgearth-2.10.2+dfsg/src/osgEarth/MaskLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MaskLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MaskLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/MaskLayer>
-#include <osgEarth/Map>
-#include <osgEarth/Registry>
 
 #define LC "[MaskLayer] "
 
@@ -45,14 +43,14 @@
 {
     Config conf = LayerOptions::getConfig();
     conf.key() = "mask";
-    conf.addIfSet( "min_level", _minLevel );
+    conf.set( "min_level", _minLevel );
     return conf;
 }
 
 void
 MaskLayerOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet( "min_level", _minLevel );
+    conf.get( "min_level", _minLevel );
 }
 
 void
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MaskNode osgearth-2.10.2+dfsg/src/osgEarth/MaskNode
--- osgearth-2.9.0+dfsg/src/osgEarth/MaskNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MaskNode	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#ifndef OSGEARTH_MASK_NODE_H
-#define OSGEARTH_MASK_NODE_H 1
-
-#include <osgEarthFeatures/Common>
-#include <osg/Group>
-
-namespace osgEarth
-{
-    //! @deprecated
-    class OSGEARTH_EXPORT MaskNode : public osg::Group
-    {
-    public:
-        MaskNode();
-        MaskNode( const MaskNode& rhs, const osg::CopyOp& op =osg::CopyOp::DEEP_COPY_ALL );        
-
-        META_Node(osgEarth, MaskNode);
-
-    protected:
-
-        /** dtor */
-        virtual ~MaskNode();
-    };
-}
-
-#endif // OSGEARTH_MASK_NODE_H
-
-
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MaskNode.cpp osgearth-2.10.2+dfsg/src/osgEarth/MaskNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MaskNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MaskNode.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#include <osgEarth/MaskNode>
-
-using namespace osgEarth;
-
-MaskNode::MaskNode()
-{
-    //nop
-}
-
-MaskNode::MaskNode( const MaskNode& rhs, const osg::CopyOp& op )
-: osg::Group( rhs, op )
-{
-    //nop
-}
-
-MaskNode::~MaskNode()
-{
-}
-
-
-
-
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MaskSource osgearth-2.10.2+dfsg/src/osgEarth/MaskSource
--- osgearth-2.9.0+dfsg/src/osgEarth/MaskSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MaskSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MaskSource.cpp osgearth-2.10.2+dfsg/src/osgEarth/MaskSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MaskSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MaskSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
  */
 #include <osgEarth/MaskSource>
 #include <osgEarth/Registry>
-#include <osg/Notify>
 #include <osgDB/ReadFile>
 
 using namespace osgEarth;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MemCache osgearth-2.10.2+dfsg/src/osgEarth/MemCache
--- osgearth-2.9.0+dfsg/src/osgEarth/MemCache	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MemCache	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MemCache.cpp osgearth-2.10.2+dfsg/src/osgEarth/MemCache.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MemCache.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MemCache.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,9 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/MemCache>
-#include <osgEarth/StringUtils>
-#include <osgEarth/ThreadingUtils>
-#include <osgEarth/Containers>
 
 using namespace osgEarth;
 
@@ -125,7 +122,7 @@
 //------------------------------------------------------------------------
 
 MemCache::MemCache( unsigned maxBinSize ) :
-_maxBinSize( std::max(maxBinSize, 1u) )
+_maxBinSize( osg::maximum(maxBinSize, 1u) )
 {
     //nop
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Memory osgearth-2.10.2+dfsg/src/osgEarth/Memory
--- osgearth-2.9.0+dfsg/src/osgEarth/Memory	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Memory	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Memory.cpp osgearth-2.10.2+dfsg/src/osgEarth/Memory.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Memory.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Memory.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MetaTile osgearth-2.10.2+dfsg/src/osgEarth/MetaTile
--- osgearth-2.9.0+dfsg/src/osgEarth/MetaTile	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MetaTile	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MetaTile.cpp osgearth-2.10.2+dfsg/src/osgEarth/MetaTile.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MetaTile.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MetaTile.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/MetaTile>
-#include <osgEarth/ImageLayer>
 
 using namespace osgEarth;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Metrics osgearth-2.10.2+dfsg/src/osgEarth/Metrics
--- osgearth-2.9.0+dfsg/src/osgEarth/Metrics	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Metrics	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2012 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Metrics.cpp osgearth-2.10.2+dfsg/src/osgEarth/Metrics.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Metrics.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Metrics.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2012 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/MimeTypes.cpp osgearth-2.10.2+dfsg/src/osgEarth/MimeTypes.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/MimeTypes.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/MimeTypes.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ModelLayer osgearth-2.10.2+dfsg/src/osgEarth/ModelLayer
--- osgearth-2.9.0+dfsg/src/osgEarth/ModelLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ModelLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -28,7 +28,6 @@
 #include <osgEarth/MaskSource>
 #include <osgEarth/ShaderUtils>
 #include <osgEarth/Containers>
-#include <osgEarth/SceneGraphCallback>
 #include <osg/Node>
 #include <osg/Array>
 #include <vector>
@@ -43,23 +42,16 @@
     class OSGEARTH_EXPORT ModelLayerOptions : public VisibleLayerOptions
     {
     public:        
+        //! Construct a new, empty options structure
+        ModelLayerOptions();
+
         /** Construct or deserialize new model layer options. */
-        ModelLayerOptions(
-            const ConfigOptions& options =ConfigOptions());
+        ModelLayerOptions(const ConfigOptions& options);
 
         /** Construct or deserialize new model layer options. */
         ModelLayerOptions(
-            const std::string&        name, 
-            const ModelSourceOptions& driverOptions =ModelSourceOptions() );
-
-        /** Copy ctor*/
-        ModelLayerOptions(const ModelLayerOptions& rhs);
-
-        /** dtor */
-        virtual ~ModelLayerOptions() { }
-
-        /** Assignment operator */
-        ModelLayerOptions& operator = (const ModelLayerOptions&);
+            const std::string& name, 
+            const ModelSourceOptions& driverOptions);
 
         /**
          * Options for the underlying model source driver.
@@ -87,13 +79,6 @@
         optional<unsigned>& maskMinLevel() { return _maskMinLevel; }
         const optional<unsigned>& maskMinLevel() const { return _maskMinLevel; }
 
-        /**
-         * Whether this layer should be treated as part of the terrain
-         * for the purposes of elevation queries, clamping, etc.
-         */
-        optional<bool>& terrainPatch() { return _terrainPatch; }
-        const optional<bool>& terrainPatch() const { return _terrainPatch; }
-
 
     public:
         virtual Config getConfig() const;
@@ -107,7 +92,6 @@
         optional<bool>               _lighting;
         optional<MaskSourceOptions>  _maskOptions;
         optional<unsigned>           _maskMinLevel;
-        optional<bool>               _terrainPatch;
         optional<CachePolicy>        _cachePolicy;
         optional<std::string>        _cacheId;
     };
@@ -125,7 +109,7 @@
     class OSGEARTH_EXPORT ModelLayer : public VisibleLayer
     {
     public:
-        META_Layer(osgEarth, ModelLayer, ModelLayerOptions);
+        META_Layer(osgEarth, ModelLayer, ModelLayerOptions, model);
 
         /**
          * Blank ModelLayer. Use options() to setup before calling open.
@@ -182,36 +166,6 @@
             const SpatialReference* srs,
             ProgressCallback*       progress);
 
-        /**
-         * Whether this model layer is a terrain patch for the purposes of 
-         * intersection testing. (convenience function)
-         */
-        bool isTerrainPatch() const { return options().terrainPatch().get(); }
-
-        /** Access scene graph callbacks */
-        SceneGraphCallbacks* getSceneGraphCallbacks() { return _sgCallbacks.get(); }
-
-    public:
-
-        /**
-         * Creates the scene graph representing this model layer for the given Map,
-         * or returns one that already exists.
-         */
-        osg::Node* getOrCreateSceneGraph(const Map* map, ProgressCallback* progress);
-
-        /**
-         * Gets a scene graph what was previously created with getOrCreateSceneGraph.
-         */
-        osg::Node* getSceneGraph(const UID& mapUID) const;
-
-    public: // deprecated
-        
-        /** @deprecated */
-        osg::Node* getOrCreateSceneGraph( 
-            const Map*            map, 
-            const osgDB::Options* readOptions,
-            ProgressCallback*     progress ) { return getOrCreateSceneGraph(map, progress); }
-
     public: // properties
 
         /** whether to apply lighting to the model layer's root node */
@@ -220,14 +174,17 @@
 
     public: // Layer
 
-        /** Open the layer and return its status */
+        //! Open the layer and return its status
         virtual const Status& open();
 
-        /** Serialize this layer */
-        virtual Config getConfig() const;
+        //! Called when this layer is added to a Map
+        virtual void addedToMap(const Map*);
+
+        //! Called when this layer is removed from a Map
+        virtual void removedFromMap(const Map*);
 
-        /** Node created by this model layer */
-        virtual osg::Node* getOrCreateNode();
+        //! Node created by this model layer
+        virtual osg::Node* getNode() const;
 
         //! Generate a cache ID for this layer
         virtual std::string getCacheID() const;
@@ -247,7 +204,7 @@
         Revision                      _modelSourceRev;
         osg::ref_ptr<osg::Vec3dArray> _maskBoundary;
         osg::ref_ptr<CacheSettings>   _cacheSettings;
-        osg::ref_ptr<SceneGraphCallbacks> _sgCallbacks;
+        osg::ref_ptr<osg::Group>      _root;
 
         typedef fast_map<UID, osg::ref_ptr<osg::Node> > Graphs;
         Graphs _graphs;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ModelLayer.cpp osgearth-2.10.2+dfsg/src/osgEarth/ModelLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ModelLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ModelLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,11 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/ModelLayer>
-#include <osgEarth/Map>
-#include <osgEarth/Registry>
-#include <osgEarth/Capabilities>
-#include <osgEarth/ShaderFactory>
-#include <osgEarth/Lighting>
+#include <osgEarth/GLUtils>
 #include <osg/Depth>
 
 #define LC "[ModelLayer] Layer \"" << getName() << "\" "
@@ -34,29 +30,13 @@
 
 //------------------------------------------------------------------------
 
-namespace
+ModelLayerOptions::ModelLayerOptions() :
+VisibleLayerOptions()
 {
-    /**
-     * Most basic of model sources; used to support the osg::Node* constructor to ModelLayer.
-     */
-    struct NodeModelSource : public ModelSource
-    {
-        NodeModelSource( osg::Node* node ) : _node(node) { }
-
-        Status initialize(const osgDB::Options* readOptions) {
-            return Status::OK();
-        }
-
-        osg::Node* createNodeImplementation(const Map* map, ProgressCallback* progress) {
-            return _node.get();
-        }
-
-        osg::ref_ptr<osg::Node> _node;
-    };
+    setDefaults();
+    fromConfig(_conf);
 }
 
-//------------------------------------------------------------------------
-
 ModelLayerOptions::ModelLayerOptions(const ConfigOptions& options) :
 VisibleLayerOptions( options )
 {
@@ -73,60 +53,37 @@
     name() = in_name;
 }
 
-ModelLayerOptions::ModelLayerOptions(const ModelLayerOptions& rhs) :
-VisibleLayerOptions(rhs)
-{
-    _driver = optional<ModelSourceOptions>(rhs._driver);
-    _lighting = optional<bool>(rhs._lighting);
-    _maskOptions = optional<MaskSourceOptions>(rhs._maskOptions);
-    _maskMinLevel = optional<unsigned>(rhs._maskMinLevel);
-    _terrainPatch = optional<bool>(rhs._terrainPatch);
-}
-
-ModelLayerOptions& ModelLayerOptions::operator =(const ModelLayerOptions& rhs)
-{
-    VisibleLayerOptions::operator =(rhs);
-    _driver = optional<ModelSourceOptions>(rhs._driver);
-    _lighting = optional<bool>(rhs._lighting);
-    _maskOptions = optional<MaskSourceOptions>(rhs._maskOptions);
-    _maskMinLevel = optional<unsigned>(rhs._maskMinLevel);
-    _terrainPatch = optional<bool>(rhs._terrainPatch);
-
-    return *this;
-}
-
 void
 ModelLayerOptions::setDefaults()
 {
     _lighting.init    ( true );
     _maskMinLevel.init( 0 );
-    _terrainPatch.init( false );
 }
 
 Config
 ModelLayerOptions::getConfig() const
 {
     Config conf = VisibleLayerOptions::getConfig();
-    conf.key() = "model";
 
     conf.set( "name",           _name );
     conf.set( "lighting",       _lighting );
     conf.set( "mask_min_level", _maskMinLevel );
-    conf.set( "patch",          _terrainPatch );  
 
     // Merge the MaskSource options
     if ( mask().isSet() )
         conf.set( "mask", mask()->getConfig() );
 
+    if ( driver().isSet() )
+        conf.merge(driver()->getConfig());
+
     return conf;
 }
 
 void
 ModelLayerOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet( "lighting",       _lighting );
-    conf.getIfSet( "mask_min_level", _maskMinLevel );
-    conf.getIfSet( "patch",          _terrainPatch );
+    conf.get( "lighting",       _lighting );
+    conf.get( "mask_min_level", _maskMinLevel );
 
     if ( conf.hasValue("driver") )
         driver() = ModelSourceOptions(conf);
@@ -179,10 +136,15 @@
 ModelLayer::ModelLayer(const std::string& name, osg::Node* node) :
 VisibleLayer(&_optionsConcrete),
 _options(&_optionsConcrete),
-_optionsConcrete(ModelLayerOptions(name)),
-_modelSource( new NodeModelSource(node) )
+_optionsConcrete(ModelLayerOptions())
 {
+    options().name() = name;
     init();
+    if (node)
+    {
+        _root->addChild(node);
+        setStatus(Status::OK());
+    }
 }
 
 ModelLayer::~ModelLayer()
@@ -190,27 +152,19 @@
     //nop
 }
 
-Config
-ModelLayer::getConfig() const
-{
-    Config layerConf = Layer::getConfig(); //getModelLayerOptions().getConfig();
-    layerConf.set("name", getName()); // redundant?
-    layerConf.set("driver", options().driver()->getDriver());
-    layerConf.key() = "model";
-    return layerConf;
-}
-
 void
 ModelLayer::init()
 {
     VisibleLayer::init();
-    _sgCallbacks = new SceneGraphCallbacks();
+    installDefaultOpacityShader();
+    _root = new osg::Group();
+    _root->setName(getName());
 }
 
 const Status&
 ModelLayer::open()
 {
-    if ( !_modelSource.valid() && options().driver().isSet() )
+    if ( VisibleLayer::open().isOK() && !_modelSource.valid() && options().driver().isSet() )
     {
         std::string driverName = options().driver()->getDriver();
 
@@ -260,53 +214,6 @@
     return getStatus();
 }
 
-#if 0
-void
-ModelLayer::setReadOptions(const osgDB::Options* readOptions)
-{
-    Layer::setReadOptions(readOptions);
-
-    // Create some local cache settings for this layer:
-    CacheSettings* oldSettings = CacheSettings::get(readOptions);
-    _cacheSettings = oldSettings ? new CacheSettings(*oldSettings) : new CacheSettings();
-
-    // bring in the new policy for this layer if there is one:
-    _cacheSettings->integrateCachePolicy(options().cachePolicy());
-
-    // if caching is a go, install a bin.
-    if (_cacheSettings->isCacheEnabled())
-    {
-        std::string binID;
-        if (options().cacheId().isSet() && !options().cacheId()->empty())
-        {
-            binID = options().cacheId().get();
-        }
-        else
-        {
-            Config conf = options().driver()->getConfig();
-            binID = hashToString(conf.toJSON(false));
-        }
-
-        // make our cacheing bin!
-        CacheBin* bin = _cacheSettings->getCache()->addBin(binID);
-        if (bin)
-        {
-            OE_INFO << LC << "Cache bin is [" << binID << "]\n";
-            _cacheSettings->setCacheBin( bin );
-        }
-        else
-        {
-            // failed to create the bin, so fall back on no cache mode.
-            OE_WARN << LC << "Failed to open a cache bin [" << binID << "], disabling caching\n";
-            _cacheSettings->cachePolicy() = CachePolicy::NO_CACHE;
-        }
-    }
-
-    // Store it for further propagation!
-    _cacheSettings->store(_readOptions.get());
-}
-#endif
-
 std::string
 ModelLayer::getCacheID() const
 {
@@ -324,40 +231,27 @@
     return binID;
 }
 
-osg::Node*
-ModelLayer::getSceneGraph(const UID& mapUID) const
-{
-    Threading::ScopedMutexLock lock(_mutex);
-    Graphs::const_iterator i = _graphs.find( mapUID );
-    return i == _graphs.end() ? 0L : i->second.get();
-}
-
-osg::Node*
-ModelLayer::getOrCreateSceneGraph(const Map*        map,
-                                  ProgressCallback* progress )
+void
+ModelLayer::addedToMap(const Map* map)
 {
     if (getStatus().isError())
-        return 0L;
-
-    // exclusive lock for cache lookup/update.
-    Threading::ScopedMutexLock lock( _mutex );
-
-    // There can be one node graph per Map. See if it already exists
-    // and if so, return it.
-    Graphs::iterator i = _graphs.find(map->getUID());
-    if ( i != _graphs.end() && i->second.valid() )
-        return i->second.get();
-
-    // need to create it.
-    osg::Node* node = 0L;
+        return;
 
     if ( _modelSource.valid() )
     {
-        _modelSource->setSceneGraphCallbacks(_sgCallbacks.get());
+        // reset the scene graph.
+        while (_root->getNumChildren() > 0)
+        {
+            getSceneGraphCallbacks()->fireRemoveNode(_root->getChild(0));
+            _root->removeChildren(0, 1);
+        }
 
-        node = _modelSource->createNode( map, progress );
+        // Share the scene graph callbacks with the model source:
+        _modelSource->setSceneGraphCallbacks(getSceneGraphCallbacks());
 
-        if ( node )
+        // Create the scene graph from the mode source:
+        osg::ref_ptr<osg::Node> node = _modelSource->createNode(map, 0L);
+        if (node.valid())
         {
             if ( options().lightingEnabled().isSet() )
             {
@@ -366,47 +260,51 @@
 
             _modelSource->sync( _modelSourceRev );
 
+            // Handle disabling depth testing
+            if ( _modelSource->getOptions().depthTestEnabled() == false )
+            {
+                osg::StateSet* ss = node->getOrCreateStateSet();
+                ss->setAttributeAndModes( new osg::Depth( osg::Depth::ALWAYS ) );              
+                ss->setRenderBinDetails( 99999, "RenderBin" ); //TODO: configure this bin ...
+            }
 
-            // add a parent group for shaders/effects to attach to without overwriting any model programs directly
-            osg::Group* group = new osg::Group();
-            group->addChild(node);
-
-            // assign the layer's stateset to the group.
-            osg::StateSet* groupSS = getOrCreateStateSet();
-            group->setStateSet(groupSS);
-
-            node = group;
-
-            // Toggle visibility if necessary
-            if ( options().visible().isSet() )
+            // enfore a rendering bin if necessary:
+            if (_modelSource->getOptions().renderOrder().isSet())
             {
-                node->setNodeMask( options().visible().get() ? ~0 : 0 );
+                osg::StateSet* ss = node->getOrCreateStateSet();
+                ss->setRenderBinDetails(
+                    _modelSource->getOptions().renderOrder().value(),
+                    ss->getBinName().empty() ? "DepthSortedBin" : ss->getBinName());
             }
 
-            // Handle disabling depth testing
-            if ( _modelSource->getOptions().depthTestEnabled() == false )
+            if (_modelSource->getOptions().renderBin().isSet())
             {
                 osg::StateSet* ss = node->getOrCreateStateSet();
-                ss->setAttributeAndModes( new osg::Depth( osg::Depth::ALWAYS ) );
-              
-                ss->setRenderBinDetails( 99999, "RenderBin" ); //TODO: configure this bin ...
+                ss->setRenderBinDetails(
+                    ss->getBinNumber(),
+                    _modelSource->getOptions().renderBin().get());
             }
 
-            // save it.
-            _graphs[map->getUID()] = node;
+            _root->addChild(node.get());
         }
     }
+}
 
-    return node;
+void
+ModelLayer::removedFromMap(const Map* map)
+{
+    // dispose of the scene graph.
+    while (_root->getNumChildren() > 0)
+    {
+        getSceneGraphCallbacks()->fireRemoveNode(_root->getChild(0));
+        _root->removeChildren(0, 1);
+    }
 }
 
 osg::Node*
-ModelLayer::getOrCreateNode()
+ModelLayer::getNode() const
 {
-    if (!_graphs.empty())
-        return _graphs.begin()->second.get();
-    else
-        return 0L;
+    return _root.get();
 }
 
 void
@@ -427,14 +325,10 @@
         {
             osg::StateSet* stateset = i->second->getOrCreateStateSet();
 
-            stateset->setMode( 
-                GL_LIGHTING, value ? osg::StateAttribute::ON : 
+            GLUtils::setLighting(
+                stateset,
+                value ? osg::StateAttribute::ON : 
                 (osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED) );
-
-            if ( Registry::capabilities().supportsGLSL() )
-            {
-                stateset->setDefine(OE_LIGHTING_DEFINE, value);
-            }
         }
     }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ModelSource osgearth-2.10.2+dfsg/src/osgEarth/ModelSource
--- osgearth-2.9.0+dfsg/src/osgEarth/ModelSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ModelSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ModelSource.cpp osgearth-2.10.2+dfsg/src/osgEarth/ModelSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ModelSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ModelSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
  */
 #include <osgEarth/ModelSource>
 #include <osgEarth/Registry>
-#include <osg/Notify>
 #include <osgDB/ReadFile>
-#include <OpenThreads/ScopedLock>
 
 using namespace osgEarth;
 using namespace OpenThreads;
@@ -47,11 +45,11 @@
 void
 ModelSourceOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet<float>( "min_range", _minRange );
-    conf.getIfSet<float>( "max_range", _maxRange );
-    conf.getIfSet<int>( "render_order", _renderOrder );
-    conf.getIfSet("render_bin", _renderBin );
-    conf.getIfSet<bool>( "depth_test_enabled", _depthTestEnabled );
+    conf.get<float>( "min_range", _minRange );
+    conf.get<float>( "max_range", _maxRange );
+    conf.get<int>( "render_order", _renderOrder );
+    conf.get("render_bin", _renderBin );
+    conf.get<bool>( "depth_test_enabled", _depthTestEnabled );
 }
 
 void
@@ -78,7 +76,7 @@
 ModelSource::ModelSource( const ModelSourceOptions& options ) :
 _options( options )
 {
-    _sgCallbacks = new SceneGraphCallbacks();
+    //nop
 }
 
 ModelSource::~ModelSource()
@@ -103,11 +101,14 @@
     }
 
     osg::Node* node = createNodeImplementation(map, progress);
-    if ( node )
+
+    //TODO: consider moving this logic up into MapNode.
+    if ( node && getSceneGraphCallbacks() )
     {
         getSceneGraphCallbacks()->firePreMergeNode(node);
         getSceneGraphCallbacks()->firePostMergeNode(node);
     }
+
     return node;
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/NativeProgramAdapter osgearth-2.10.2+dfsg/src/osgEarth/NativeProgramAdapter
--- osgearth-2.9.0+dfsg/src/osgEarth/NativeProgramAdapter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/NativeProgramAdapter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -25,11 +25,13 @@
 #include <osg/Referenced>
 #include <osg/MixinVector>
 #include <osgEarth/Notify>
+#include <osgEarth/Common>
 #include <vector>
 
 #undef  LC
 #define LC "[NativeProgramAdapter] "
 
+#define OE_LOCAL OE_DEBUG
 //#undef  OE_DEBUG
 //#define OE_DEBUG OE_INFO
 
@@ -43,9 +45,9 @@
     {
     public:
         /** Create a program adapter under the current state that wraps the provided glProgram handle. */
-        NativeProgramAdapter(const osg::State* state, GLint handle, const char* prefix = 0L)
+        NativeProgramAdapter(const osg::State* state, GLint handle, const char* prefix, const std::string& name)
         {
-            OE_DEBUG << LC << "Create adapter for glProgram " << handle << "\n";
+            OE_LOCAL << LC << "Create adapter for glProgram " << name << " (handle=" << handle << ")" << std::endl;
 
             _handle = handle;
             _ext    = osg::GL2Extensions::Get( state->getContextID(), true );
@@ -72,20 +74,42 @@
                         {
                             _uniformLocations[osg::Uniform::getNameID(reinterpret_cast<const char*>(name))] = loc;
                         
-                            OE_DEBUG << LC << "    Uniform = \"" << name << "\", location = " << loc << "\n";
+                            OE_LOCAL << LC << "    Uniform = \"" << name << "\", location = " << loc << std::endl;
                         }
                     }
                 }
             }
             else
             {
-                OE_DEBUG << LC << "    No uniforms found.\n";
+                OE_LOCAL << LC << "    No uniforms found." << std::endl;
             }
         }
 
         void apply(const osg::State* state)
         {
-            reinterpret_cast<const StateEx*>(state)->applyUniformsToProgram(*this);
+            bool useProgram = true;
+            for (osg::State::UniformMap::const_iterator i = state->getUniformMap().begin(); i != state->getUniformMap().end(); ++i)
+            {
+                const osg::State::UniformStack& as = i->second;
+                if (!as.uniformVec.empty())
+                {
+                    const osg::Uniform* uniform = static_cast<const osg::Uniform*>(as.uniformVec.back().first);
+                    if (apply(uniform, useProgram))
+                        useProgram = false;
+                }
+            }
+
+#if 0
+            // Apply each of the osg_*Matrix uniforms, which may be used by the native program
+            if (apply(_modelViewMatrixUniform.get(), useProgram))
+                useProgram = false;
+            if (apply(_projectionMatrixUniform.get(), useProgram))
+                useProgram = false;
+            if (apply(_modelViewProjectionMatrixUniform.get(), useProgram))
+                useProgram = false;
+            if (apply(_normalMatrixUniform.get(), useProgram))
+                useProgram = false;
+#endif
         }
 
     private:
@@ -97,7 +121,11 @@
         /** Apply the uniform to this program, optionally calling glUseProgram if necessary. */
         bool apply(const osg::Uniform* uniform, bool useProgram) const
         {
-            UniformMap::const_iterator location = _uniformLocations.find( uniform->getNameID() );
+#if OSG_VERSION_GREATER_OR_EQUAL(3,7,0)
+            UniformMap::const_iterator location = _uniformLocations.find( ((osg::UniformBase*)uniform)->getNameID() );
+#else
+            UniformMap::const_iterator location = _uniformLocations.find(uniform->getNameID());
+#endif
             if ( location != _uniformLocations.end() )
             {        
                 if ( useProgram )
@@ -107,26 +135,6 @@
             }
             else return false;
         }
-
-        struct StateEx : public osg::State 
-        {
-            void applyUniformsToProgram(const NativeProgramAdapter& adapter) const
-            {
-                bool useProgram = true;
-                for(UniformMap::const_iterator i = _uniformMap.begin(); i != _uniformMap.end(); ++i)
-                {
-                    const UniformStack& as = i->second;
-                    if ( !as.uniformVec.empty() )
-                    {                    
-                        const osg::Uniform* uniform = as.uniformVec.back().first;
-                        if (adapter.apply(uniform, useProgram))
-                            useProgram = false;
-                    }
-                }
-            }
-        };
-
-        friend struct StateEx;
     };
 
     /**
@@ -146,4 +154,4 @@
 
 #undef LC
 
-#endif // OSGEARTH_NATIVE_PROGRAM_ADAPTER
\ No newline at end of file
+#endif // OSGEARTH_NATIVE_PROGRAM_ADAPTER
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/NodeUtils osgearth-2.10.2+dfsg/src/osgEarth/NodeUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/NodeUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/NodeUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -104,7 +104,7 @@
         /** dtor */
         virtual ~PrimitiveSetTypeCounter() { }
 
-        void apply(class osg::Geode&);
+        void apply(class osg::Drawable&);
 
         unsigned _point;
         unsigned _line;
@@ -388,9 +388,12 @@
      */
 #define ADJUST_UPDATE_TRAV_COUNT( NODE, DELTA ) \
     { \
-        int oldCount = NODE ->getNumChildrenRequiringUpdateTraversal(); \
-        if ( oldCount + DELTA >= 0 ) { \
-            NODE ->setNumChildrenRequiringUpdateTraversal( (unsigned int)(oldCount + DELTA ) ); \
+        unsigned oldCount = NODE ->getNumChildrenRequiringUpdateTraversal(); \
+        unsigned newCount = (unsigned)(((int)oldCount)+(DELTA)); \
+        if ( ((DELTA) < 0 && newCount < oldCount) || ((DELTA) >= 0 && newCount >= oldCount) ) { \
+            NODE ->setNumChildrenRequiringUpdateTraversal( newCount ); \
+        } else { \
+            OE_INFO << "**INTERNAL: ADJUST_UPDATE_TRAV_COUNT wrapped around" << std::endl; \
         } \
     }
 
@@ -400,9 +403,13 @@
      */
 #define ADJUST_EVENT_TRAV_COUNT( NODE, DELTA ) \
     { \
-        int oldCount = NODE ->getNumChildrenRequiringEventTraversal(); \
-        if ( oldCount + DELTA >= 0 ) \
-            NODE ->setNumChildrenRequiringEventTraversal( (unsigned int)(oldCount + DELTA ) ); \
+        unsigned oldCount = NODE ->getNumChildrenRequiringEventTraversal(); \
+        unsigned newCount = (unsigned)(((int)oldCount)+(DELTA)); \
+        if ( ((DELTA) < 0 && newCount < oldCount) || ((DELTA) >= 0 && newCount >= oldCount) ) { \
+            NODE ->setNumChildrenRequiringEventTraversal( newCount ); \
+        } else { \
+            OE_INFO << "**INTERNAL: ADJUST_EVENT_TRAV_COUNT wrapped around" << std::endl; \
+        } \
     }
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/NodeUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/NodeUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/NodeUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/NodeUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,13 +18,7 @@
  */
 
 #include <osgEarth/NodeUtils>
-#include <osg/Geode>
 #include <osg/Geometry>
-#include <osg/CullSettings>
-#include <osg/KdTree>
-#include <osg/TriangleFunctor>
-#include <vector>
-#include <string>
 
 using namespace osgEarth;
 
@@ -151,30 +145,27 @@
 }
 
 void
-PrimitiveSetTypeCounter::apply(osg::Geode& geode)
+PrimitiveSetTypeCounter::apply(osg::Drawable& drawable)
 {
-    for(unsigned i=0; i<geode.getNumDrawables(); ++i)
+    osg::Geometry* g = drawable.asGeometry();
+    if ( g )
     {
-        osg::Geometry* g = geode.getDrawable(i)->asGeometry();
-        if ( g )
+        const osg::Geometry::PrimitiveSetList& primSets = g->getPrimitiveSetList();
+        for( osg::Geometry::PrimitiveSetList::const_iterator j = primSets.begin(); j != primSets.end(); ++j )
         {
-            const osg::Geometry::PrimitiveSetList& primSets = g->getPrimitiveSetList();
-            for( osg::Geometry::PrimitiveSetList::const_iterator j = primSets.begin(); j != primSets.end(); ++j )
+            switch( j->get()->getMode() )
             {
-                switch( j->get()->getMode() )
-                {
-                case GL_POINTS:
-                    _point++;
-                    break;
-                case GL_LINES:
-                case GL_LINE_LOOP:
-                case GL_LINE_STRIP:
-                    _line++;
-                    break;
-                default:
-                    _polygon++;
-                    break;
-                }
+            case GL_POINTS:
+                _point++;
+                break;
+            case GL_LINES:
+            case GL_LINE_LOOP:
+            case GL_LINE_STRIP:
+                _line++;
+                break;
+            default:
+                _polygon++;
+                break;
             }
         }
     }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Notify osgearth-2.10.2+dfsg/src/osgEarth/Notify
--- osgearth-2.9.0+dfsg/src/osgEarth/Notify	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Notify	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -44,7 +44,6 @@
     extern OSGEARTH_EXPORT std::ostream& notify(const osg::NotifySeverity severity);
 
     inline std::ostream& notify(void) { return osgEarth::notify(osg::INFO); }
-}
 
 #define OE_NOTIFY( X,Y ) if(osgEarth::isNotifyEnabled( X )) osgEarth::notify( X ) << Y
 #define OE_FATAL OE_NOTIFY(osg::FATAL,"[osgEarth]* ")
@@ -61,4 +60,11 @@
 
 #define OE_DEPRECATED(A, B) OE_WARN << #A << " is deprecated; please use " << #B << std::endl
 
+extern OSGEARTH_EXPORT void setNotifyHandler(osg::NotifyHandler *handler);
+
+/** Get currrent notification handler. */
+extern OSGEARTH_EXPORT osg::NotifyHandler *getNotifyHandler();
+
+}
+
 #endif // OSGEARTH_NOTIFY_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Notify.cpp osgearth-2.10.2+dfsg/src/osgEarth/Notify.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Notify.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Notify.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,143 +18,221 @@
  */
 #include <osgEarth/Notify>
 
-using namespace osgEarth;
-
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
- *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
- * (at your option) any later version.  The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * OpenSceneGraph Public License for more details.
-*/
-#include <osgEarth/Notify>
-#include <string>
-#include <stdlib.h>
+#include <osg/ApplicationUsage>
+#include <osg/ref_ptr>
+#include <sstream>
 #include <iostream>
-#include <fstream>
-#include <cctype>
-#include <iomanip>
 
-using namespace std;
+#include <stdlib.h>
 
-osg::NotifySeverity osgearth_g_NotifyLevel = osg::NOTICE;
+#define OSGEARTH_INIT_SINGLETON_PROXY(ProxyName, Func) static struct ProxyName{ ProxyName() { Func; } } s_##ProxyName;
 
-void
-osgEarth::setNotifyLevel(osg::NotifySeverity severity)
+namespace osgEarth
 {
-    osgEarth::initNotifyLevel();
-    osgearth_g_NotifyLevel = severity;
-}
 
-osg::NotifySeverity
-osgEarth::getNotifyLevel()
+class NullStreamBuffer : public std::streambuf
 {
-    osgEarth::initNotifyLevel();
-    return osgearth_g_NotifyLevel;
-}
+private:
+    std::streamsize xsputn(const std::streambuf::char_type * /*str*/, std::streamsize n)
+    {
+        return n;
+    }
+};
 
-bool
-osgEarth::initNotifyLevel()
+struct NullStream : public std::ostream
 {
-    static bool s_NotifyInit = false;
+public:
+    NullStream():
+        std::ostream(new NullStreamBuffer)
+    {
+        _buffer = static_cast<NullStreamBuffer *>(rdbuf());
+    }
 
-    if (s_NotifyInit) return true;
-    
-    // g_NotifyLevel
-    // =============
+    ~NullStream()
+    {
+        rdbuf(0);
+        delete _buffer;
+    }
 
-    osgearth_g_NotifyLevel = osg::NOTICE; // Default value
+protected:
+    NullStreamBuffer* _buffer;
+};
 
-    char* OSGNOTIFYLEVEL=getenv("OSGEARTH_NOTIFY_LEVEL");
-    if (!OSGNOTIFYLEVEL) OSGNOTIFYLEVEL=getenv("OSGEARTHNOTIFYLEVEL");
-    if(OSGNOTIFYLEVEL)
+/** Stream buffer calling notify handler when buffer is synchronized (usually on std::endl).
+ * Stream stores last notification severity to pass it to handler call.
+ */
+struct NotifyStreamBuffer : public std::stringbuf
+{
+    NotifyStreamBuffer() : _severity(osg::NOTICE)
     {
+        /* reduce the need to reallocate the std::ostream buffer behind osgEarth::Notify (causing multitreading issues) by pre-allocating 4095 bytes */
+        str(std::string(4095, 0));
+        pubseekpos(0, std::ios_base::out);
+    }
 
-        std::string stringOSGNOTIFYLEVEL(OSGNOTIFYLEVEL);
+    void setNotifyHandler(osg::NotifyHandler *handler) { _handler = handler; }
+    osg::NotifyHandler *getNotifyHandler() const { return _handler.get(); }
 
-        // Convert to upper case
-        for(std::string::iterator i=stringOSGNOTIFYLEVEL.begin();
-            i!=stringOSGNOTIFYLEVEL.end();
-            ++i)
+    /** Sets severity for next call of notify handler */
+    void setCurrentSeverity(osg::NotifySeverity severity)
+    {
+        if (_severity != severity)
         {
-            *i=toupper(*i);
+            sync();
+            _severity = severity;
         }
-
-        if(stringOSGNOTIFYLEVEL.find("ALWAYS")!=std::string::npos)          osgearth_g_NotifyLevel=osg::ALWAYS;
-        else if(stringOSGNOTIFYLEVEL.find("FATAL")!=std::string::npos)      osgearth_g_NotifyLevel=osg::FATAL;
-        else if(stringOSGNOTIFYLEVEL.find("WARN")!=std::string::npos)       osgearth_g_NotifyLevel=osg::WARN;
-        else if(stringOSGNOTIFYLEVEL.find("NOTICE")!=std::string::npos)     osgearth_g_NotifyLevel=osg::NOTICE;
-        else if(stringOSGNOTIFYLEVEL.find("DEBUG_INFO")!=std::string::npos) osgearth_g_NotifyLevel=osg::DEBUG_INFO;
-        else if(stringOSGNOTIFYLEVEL.find("DEBUG_FP")!=std::string::npos)   osgearth_g_NotifyLevel=osg::DEBUG_FP;
-        else if(stringOSGNOTIFYLEVEL.find("DEBUG")!=std::string::npos)      osgearth_g_NotifyLevel=osg::DEBUG_INFO;
-        else if(stringOSGNOTIFYLEVEL.find("INFO")!=std::string::npos)       osgearth_g_NotifyLevel=osg::INFO;
-        else std::cout << "Warning: invalid OSG_NOTIFY_LEVEL set ("<<stringOSGNOTIFYLEVEL<<")"<<std::endl;
- 
     }
 
-    s_NotifyInit = true;
+    osg::NotifySeverity getCurrentSeverity() const { return _severity; }
 
-    return true;
+private:
 
-}
+    int sync()
+    {
+        sputc(0); // string termination
+        if (_handler.valid())
+            _handler->notify(_severity, pbase());
+        pubseekpos(0, std::ios_base::out); // or str(std::string())
+        return 0;
+    }
+
+    osg::ref_ptr<osg::NotifyHandler> _handler;
+    osg::NotifySeverity _severity;
+};
 
-bool
-osgEarth::isNotifyEnabled( osg::NotifySeverity severity )
+struct NotifyStream : public std::ostream
 {
-    return severity<=getNotifyLevel();
+public:
+    NotifyStream():
+        std::ostream(new NotifyStreamBuffer)
+    {
+        _buffer = static_cast<NotifyStreamBuffer *>(rdbuf());
+    }
+
+    void setCurrentSeverity(osg::NotifySeverity severity)
+    {
+        _buffer->setCurrentSeverity(severity);
+    }
+
+    osg::NotifySeverity getCurrentSeverity() const
+    {
+        return _buffer->getCurrentSeverity();
+    }
+
+    ~NotifyStream()
+    {
+        rdbuf(0);
+        delete _buffer;
+    }
+
+protected:
+    NotifyStreamBuffer* _buffer;
+};
+
 }
 
-class NullStreamBuffer : public std::streambuf
+using namespace osgEarth;
+
+static osg::ApplicationUsageProxy Notify_e0(osg::ApplicationUsage::ENVIRONMENTAL_VARIABLE, "OSGEARTH_NOTIFY_LEVEL <mode>", "FATAL | WARN | NOTICE | DEBUG_INFO | DEBUG_FP | DEBUG | INFO | ALWAYS");
+
+struct NotifySingleton
 {
-    private:
-    
-        virtual streamsize xsputn (const char_type*, streamsize n)
+    NotifySingleton()
+    {
+        // _notifyLevel
+        // =============
+
+        _notifyLevel = osg::NOTICE; // Default value
+
+        char* OSGNOTIFYLEVEL=getenv("OSGEARTH_NOTIFY_LEVEL");
+        if (!OSGNOTIFYLEVEL) OSGNOTIFYLEVEL=getenv("OSGEARTHNOTIFYLEVEL");
+        if (OSGNOTIFYLEVEL)
         {
-            return n;
+
+            std::string stringOSGNOTIFYLEVEL(OSGNOTIFYLEVEL);
+
+            // Convert to upper case
+            for(std::string::iterator i=stringOSGNOTIFYLEVEL.begin();
+                i!=stringOSGNOTIFYLEVEL.end();
+                ++i)
+            {
+                *i=toupper(*i);
+            }
+
+            if(stringOSGNOTIFYLEVEL.find("ALWAYS")!=std::string::npos)          _notifyLevel=osg::ALWAYS;
+            else if(stringOSGNOTIFYLEVEL.find("FATAL")!=std::string::npos)      _notifyLevel=osg::FATAL;
+            else if(stringOSGNOTIFYLEVEL.find("WARN")!=std::string::npos)       _notifyLevel=osg::WARN;
+            else if(stringOSGNOTIFYLEVEL.find("NOTICE")!=std::string::npos)     _notifyLevel=osg::NOTICE;
+            else if(stringOSGNOTIFYLEVEL.find("DEBUG_INFO")!=std::string::npos) _notifyLevel=osg::DEBUG_INFO;
+            else if(stringOSGNOTIFYLEVEL.find("DEBUG_FP")!=std::string::npos)   _notifyLevel=osg::DEBUG_FP;
+            else if(stringOSGNOTIFYLEVEL.find("DEBUG")!=std::string::npos)      _notifyLevel=osg::DEBUG_INFO;
+            else if(stringOSGNOTIFYLEVEL.find("INFO")!=std::string::npos)       _notifyLevel=osg::INFO;
+            else std::cout << "Warning: invalid OSGEARTH_NOTIFY_LEVEL set ("<<stringOSGNOTIFYLEVEL<<")"<<std::endl;
+
         }
-};
 
-struct NullStream : public std::ostream
-{
-    NullStream() :
-         std::ostream(_nsb = new NullStreamBuffer) {}
-        
-    virtual ~NullStream()
-    {
-        delete rdbuf();
-        rdbuf(0);
-        //delete _nsb;
+        // Setup standard notify handler
+        NotifyStreamBuffer *buffer = dynamic_cast<NotifyStreamBuffer *>(_notifyStream.rdbuf());
+        if (buffer && !buffer->getNotifyHandler())
+            buffer->setNotifyHandler(new osg::StandardNotifyHandler);
     }
 
-    NullStreamBuffer* _nsb;
+    osg::NotifySeverity _notifyLevel;
+    NullStream     _nullStream;
+    NotifyStream   _notifyStream;
 };
 
-std::ostream&
-osgEarth::notify(const osg::NotifySeverity severity)
+static NotifySingleton& getNotifySingleton()
 {
-    // set up global notify null stream for inline notify
-    static NullStream s_NotifyNulStream;
+    static NotifySingleton s_NotifySingleton;
+    return s_NotifySingleton;
+}
 
-    static bool initialized = false;
-    if (!initialized) 
-    {
-        std::cerr<<""; // dummy op to force construction of cerr, before a reference is passed back to calling code.
-        std::cout<<""; // dummy op to force construction of cout, before a reference is passed back to calling code.
-        initialized = osgEarth::initNotifyLevel();
-    }
+bool osgEarth::initNotifyLevel()
+{
+    getNotifySingleton();
+    return true;
+}
 
-    if (severity<=osgearth_g_NotifyLevel)
+// Use a proxy to force the initialization of the NotifySingleton during static initialization
+OSGEARTH_INIT_SINGLETON_PROXY(NotifySingletonProxy, osgEarth::initNotifyLevel())
+
+void osgEarth::setNotifyLevel(osg::NotifySeverity severity)
+{
+    getNotifySingleton()._notifyLevel = severity;
+}
+
+osg::NotifySeverity osgEarth::getNotifyLevel()
+{
+    return getNotifySingleton()._notifyLevel;
+}
+
+void osgEarth::setNotifyHandler(osg::NotifyHandler *handler)
+{
+    NotifyStreamBuffer *buffer = static_cast<NotifyStreamBuffer*>(getNotifySingleton()._notifyStream.rdbuf());
+    if (buffer) buffer->setNotifyHandler(handler);
+}
+
+osg::NotifyHandler* osgEarth::getNotifyHandler()
+{
+    NotifyStreamBuffer *buffer = static_cast<NotifyStreamBuffer *>(getNotifySingleton()._notifyStream.rdbuf());
+    return buffer ? buffer->getNotifyHandler() : 0;
+}
+
+
+#ifndef OSGEARTH_NOTIFY_DISABLED
+bool osgEarth::isNotifyEnabled( osg::NotifySeverity severity )
+{
+    return severity<=getNotifySingleton()._notifyLevel;
+}
+#endif
+
+std::ostream& osgEarth::notify(const osg::NotifySeverity severity)
+{
+    if (osgEarth::isNotifyEnabled(severity))
     {
-        std::ostream* out = severity <= osg::WARN ? &std::cerr : &std::cout;
-        (*out) << std::setprecision(8);
-        return *out;
-        //if (severity<=osg::WARN) return std::cerr;
-        //else return std::cout;
+        getNotifySingleton()._notifyStream.setCurrentSeverity(severity);
+        return getNotifySingleton()._notifyStream;
     }
-    return s_NotifyNulStream;
+    return getNotifySingleton()._nullStream;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ObjectIndex osgearth-2.10.2+dfsg/src/osgEarth/ObjectIndex
--- osgearth-2.9.0+dfsg/src/osgEarth/ObjectIndex	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ObjectIndex	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ObjectIndex.cpp osgearth-2.10.2+dfsg/src/osgEarth/ObjectIndex.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ObjectIndex.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ObjectIndex.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -22,10 +22,6 @@
 
 #include <osgEarth/ObjectIndex>
 #include <osgEarth/Registry>
-#include <osgEarth/VirtualProgram>
-#include <osg/NodeVisitor>
-#include <osg/Uniform>
-#include <osg/Geode>
 #include <osg/Geometry>
 
 using namespace osgEarth;
@@ -160,13 +156,10 @@
 
     // add a new integer attributer to store the feautre ID per vertex.
     ObjectIDArray* ids = new ObjectIDArray();
-    geom->setVertexAttribArray    (_attribLocation, ids);
-    geom->setVertexAttribBinding  (_attribLocation, osg::Geometry::BIND_PER_VERTEX);
-    geom->setVertexAttribNormalize(_attribLocation, false);
-    
-#if OSG_VERSION_GREATER_OR_EQUAL(3,1,8)
+    ids->setBinding(osg::Array::BIND_PER_VERTEX);
+    ids->setNormalize(false);
+    geom->setVertexAttribArray(_attribLocation, ids);
     ids->setPreserveDataType(true);
-#endif
 
     // The tag is actually FeatureID + 1, to preserve "0" as an "empty" value.
     // TODO: use a ObjectID generator and mapping instead.
@@ -183,13 +176,10 @@
             setNodeMaskOverride(~0);
         }
 
-        void apply(osg::Geode& geode)
+        void apply(osg::Drawable& drawable)
         {
-            for(unsigned i=0; i<geode.getNumDrawables(); ++i)
-            {
-                _index->tagDrawable( geode.getDrawable(i), _id );
-            }
-            traverse( geode );
+            _index->tagDrawable(&drawable, _id);
+            traverse(drawable);
         }
 
         const ObjectIndex* _index;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/optional osgearth-2.10.2+dfsg/src/osgEarth/optional
--- osgearth-2.9.0+dfsg/src/osgEarth/optional	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/optional	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/OverlayDecorator osgearth-2.10.2+dfsg/src/osgEarth/OverlayDecorator
--- osgearth-2.9.0+dfsg/src/osgEarth/OverlayDecorator	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/OverlayDecorator	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -97,6 +97,10 @@
     public: // osg::Node
         void traverse( osg::NodeVisitor& nv );
 
+    public: // osg::Object
+        void resizeGLObjectBuffers(unsigned maxSize);
+        void releaseGLObjects(osg::State* state) const;
+
     public: // NotiferGroup listener interface
         void onGroupChanged(osg::Group* group);
 
@@ -115,11 +119,12 @@
             osg::Matrixd                  _rttProjMatrix;    // Projection matrix of RTT camera
             osg::Group*                   _group;            // contains the overlay graphics
             osg::StateSet*                _terrainStateSet;  // same object as in PerViewData (shared across techniques)
-            osg::ref_ptr<osg::Referenced> _techniqueData;    // technique sets this if needed
+            osg::ref_ptr<osg::Object>     _techniqueData;    // technique sets this if needed
             const double*                 _horizonDistance;  // points to the PVD horizon distance
             TerrainResources*             _terrainResources; // for accessing image units
             osg::Vec3d                    _eyeWorld;         // eyepoint in world coords
             osgShadow::ConvexPolyhedron   _visibleFrustumPH; // polyhedron representing the frustum
+            osg::ref_ptr<osg::Uniform>    _rttToPrimaryMatrixUniform; // xform from RTT cam to primary cam
         };
 
         // One of these per view (camera). The terrain state set
@@ -151,7 +156,7 @@
         typedef std::map<osg::Camera*, PerViewData> PerViewDataMap;
 
         PerViewDataMap _perViewData;
-        Threading::ReadWriteMutex _perViewDataMutex;
+        mutable Threading::ReadWriteMutex _perViewDataMutex;
 
         typedef std::vector< osg::ref_ptr<OverlayTechnique> > Techniques;
         Techniques _techniques;
@@ -215,6 +220,9 @@
         virtual void cullOverlayGroup(
             OverlayDecorator::TechRTTParams& params,
             osgUtil::CullVisitor*            cv ) { }
+
+        virtual void resizeGLObjectBuffers(unsigned maxSize) { }
+        virtual void releaseGLObjects(osg::State* state) const { }
     };
 
 } // namespace osgEarth
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/OverlayDecorator.cpp osgearth-2.10.2+dfsg/src/osgEarth/OverlayDecorator.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/OverlayDecorator.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/OverlayDecorator.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,21 +20,11 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/OverlayDecorator>
-#include <osgEarth/DrapingTechnique>
-#include <osgEarth/MapInfo>
 #include <osgEarth/NodeUtils>
-#include <osgEarth/Registry>
-#include <osgEarth/Capabilities>
-#include <osgEarth/CullingUtils>
 
 #include <osg/AutoTransform>
-#include <osg/ComputeBoundsVisitor>
 #include <osg/ShapeDrawable>
-#include <osgShadow/ConvexPolyhedron>
-#include <osgUtil/LineSegmentIntersector>
 
-#include <iomanip>
-#include <stack>
 
 #define LC "[OverlayDecorator] "
 
@@ -57,7 +47,7 @@
             _tope = tope;
         }
 
-        void apply(osg::Geode& node)
+        void apply(osg::Drawable& node)
         {
             const osg::BoundingSphere& bs = node.getBound();
             osg::Vec3 p = bs.center() * _matrixStack.top();
@@ -105,13 +95,13 @@
         {
             double l,r,b,t,n,f;
             m.getOrtho(l,r,b,t,n,f);
-            m.makeOrtho(l,r,b,t, std::max(n, newNear), std::min(f,newFar));
+            m.makeOrtho(l,r,b,t, osg::maximum(n, newNear), osg::minimum(f,newFar));
         }
         else
         {
             double v,a,n,f;
             m.getPerspective(v,a,n,f);
-            m.makePerspective(v,a, std::max(n, newNear), std::min(f, newFar));
+            m.makePerspective(v,a, osg::maximum(n, newNear), osg::minimum(f, newFar));
         }
     }
 
@@ -167,7 +157,7 @@
 
                 if ( t0 >= 0.0 && t1 >= 0.0 )
                 {
-                    osg::Vec3d v = d*std::min(t0,t1);
+                    osg::Vec3d v = d*osg::minimum(t0,t1);
                     dist2 = v.length2();
                 }
                 else if ( t0 >= 0.0 )
@@ -500,7 +490,7 @@
     cv->setCalculatedFarPlane( osg::maximum(zSavedFar, zFar) );
 
     // clamp the far plane (for RTT purposes) to the horizon distance.
-    double maxFar = std::min( horizonDistance, _maxHorizonDistance );
+    double maxFar = osg::minimum( horizonDistance, _maxHorizonDistance );
     cv->clampProjectionMatrix( projMatrix, zNear, maxFar );
 
     // prepare to calculate the ideal far plane for RTT extent resolution.
@@ -529,7 +519,7 @@
     // clamp down the far plane:
     if ( maxDist2 != 0.0 )
     {
-        maxFar = std::min( zNear+sqrt(maxDist2), maxFar );
+        maxFar = osg::minimum( zNear+sqrt(maxDist2), maxFar );
     }
 
     // reset the projection matrix if we changed the far:
@@ -685,7 +675,7 @@
                 // This causes problems for the draping projection matrix optimizer, so
                 // for now instead of re-doing that code we will just center the eyepoint
                 // here by using the larger of xmin and xmax. -gw.                
-                double x = std::max( fabs(xmin), fabs(xmax) );
+                double x = osg::maximum( fabs(xmin), fabs(xmax) );
                 xmin = -x, xmax = x;
             }
 
@@ -732,7 +722,7 @@
             osg::ref_ptr<osg::Node> camNode = osgDB::readRefNodeFile(fn);
             camNode->setName("camera");
 
-            // visible overlay BEFORE cutting:
+            // visible overlay BEFORE cutting:brb
             //uncutVisiblePH.dumpGeometry(0,0,0,fn,osg::Vec4(0,1,1,1),osg::Vec4(0,1,1,.25));
             //osg::ref_ptr<osg::Node> overlay = osgDB::readRefNodeFile(fn);
             //overlay->setName("overlay");
@@ -884,3 +874,54 @@
 {
     _maxHorizonDistance = horizonDistance;
 }
+
+
+void
+OverlayDecorator::resizeGLObjectBuffers(unsigned maxSize)
+{
+    osg::Group::resizeGLObjectBuffers(maxSize);
+
+    Threading::ScopedWriteLock lock(_perViewDataMutex);
+
+    for(PerViewDataMap::iterator i = _perViewData.begin(); i != _perViewData.end(); ++i)
+    {
+        PerViewData& pvd = i->second;
+        if (pvd._sharedTerrainStateSet.valid())
+            pvd._sharedTerrainStateSet->resizeGLObjectBuffers(maxSize);
+
+        for(std::vector<TechRTTParams>::iterator t = pvd._techParams.begin(); t != pvd._techParams.end(); ++t)
+        {
+            if (t->_rttCamera.valid())
+                t->_rttCamera->resizeGLObjectBuffers(maxSize);
+            if (t->_rttToPrimaryMatrixUniform.valid())
+                t->_rttToPrimaryMatrixUniform->resizeGLObjectBuffers(maxSize);
+            if (t->_techniqueData.valid())
+                t->_techniqueData->resizeGLObjectBuffers(maxSize);
+        }
+    }
+}
+
+void
+OverlayDecorator::releaseGLObjects(osg::State* state) const
+{
+    osg::Group::releaseGLObjects(state);
+
+    Threading::ScopedWriteLock lock(_perViewDataMutex);
+
+    for(PerViewDataMap::const_iterator i = _perViewData.begin(); i != _perViewData.end(); ++i)
+    {
+        const PerViewData& pvd = i->second;
+        if (pvd._sharedTerrainStateSet.valid())
+            pvd._sharedTerrainStateSet->releaseGLObjects(state);
+
+        for(std::vector<TechRTTParams>::const_iterator t = pvd._techParams.begin(); t != pvd._techParams.end(); ++t)
+        {
+            if (t->_rttCamera.valid())
+                t->_rttCamera->releaseGLObjects(state);
+            if (t->_rttToPrimaryMatrixUniform.valid())
+                t->_rttToPrimaryMatrixUniform->releaseGLObjects(state);
+            if (t->_techniqueData.valid())
+                t->_techniqueData->releaseGLObjects(state);
+        }
+    }
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PagedNode osgearth-2.10.2+dfsg/src/osgEarth/PagedNode
--- osgearth-2.9.0+dfsg/src/osgEarth/PagedNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PagedNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PagedNode.cpp osgearth-2.10.2+dfsg/src/osgEarth/PagedNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/PagedNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PagedNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PatchLayer osgearth-2.10.2+dfsg/src/osgEarth/PatchLayer
--- osgearth-2.9.0+dfsg/src/osgEarth/PatchLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PatchLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@
     class OSGEARTH_EXPORT PatchLayer : public VisibleLayer
     {
     public:
-        META_Layer(osgEarth, PatchLayer, PatchLayerOptions);
+        META_Layer(osgEarth, PatchLayer, PatchLayerOptions, patch);
 
         struct TileData : public osg::Referenced
         {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PatchLayer.cpp osgearth-2.10.2+dfsg/src/osgEarth/PatchLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/PatchLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PatchLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -36,7 +36,6 @@
 void
 PatchLayer::init()
 {
-    Layer::init();
-    
-    setRenderType(RENDERTYPE_PATCH);
+    Layer::init();    
+    setRenderType(RENDERTYPE_TERRAIN_PATCH);
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PhongLightingEffect osgearth-2.10.2+dfsg/src/osgEarth/PhongLightingEffect
--- osgearth-2.9.0+dfsg/src/osgEarth/PhongLightingEffect	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PhongLightingEffect	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -44,11 +44,6 @@
         /** is it supported by the h/w? */
         bool supported() const { return _supported; }
 
-        /** whether to create its own lighting mode uniform (default = true).
-          * Set this to false if you are creating the lighting uniform elsewhere.
-          * The lighting uniform is returned by ShaderFactory::createUniformForGLMode(GL_LIGHTING). */
-        //void setCreateLightingUniform(bool value);
-
     public:
         /** attach this effect to a stateset. */
         void attach(osg::StateSet* stateset);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PhongLightingEffect.cpp osgearth-2.10.2+dfsg/src/osgEarth/PhongLightingEffect.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/PhongLightingEffect.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PhongLightingEffect.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -22,17 +22,9 @@
 #include <osgEarth/PhongLightingEffect>
 #include <osgEarth/Registry>
 #include <osgEarth/Capabilities>
-#include <osgEarth/ShaderFactory>
-#include <osgEarth/StringUtils>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/Shaders>
 #include <osgEarth/Lighting>
 
-// GL_LIGHTING is not always defined on GLES so define it.
-#ifndef GL_LIGHTING
-    #define GL_LIGHTING 0x0B50
-#endif
-
 using namespace osgEarth;
 
 
@@ -51,22 +43,8 @@
 PhongLightingEffect::init()
 {
     _supported = Registry::capabilities().supportsGLSL();
-    // Replaced with setDefine
-    //if ( _supported )
-    //{
-    //    _lightingUniform = Registry::shaderFactory()->createUniformForGLMode( GL_LIGHTING, 1 );
-    //}
 }
 
-//void
-//PhongLightingEffect::setCreateLightingUniform(bool value)
-//{
-//    if ( !value )
-//    {        
-//        _lightingUniform = 0L;
-//    }
-//}
-
 PhongLightingEffect::~PhongLightingEffect()
 {
     detach();
@@ -87,9 +65,6 @@
 
         stateset->setDefine(OE_LIGHTING_DEFINE, osg::StateAttribute::ON);
         stateset->setDefine("OE_NUM_LIGHTS", "1");
-
-        //if ( _lightingUniform.valid() )
-        //    stateset->addUniform( _lightingUniform.get() );
     }
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PhongLighting.frag.glsl osgearth-2.10.2+dfsg/src/osgEarth/PhongLighting.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarth/PhongLighting.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PhongLighting.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -5,7 +5,8 @@
 #pragma vp_entryPoint oe_phong_fragment
 #pragma vp_location   fragment_lighting
 
-#pragma import_defines(OE_LIGHTING, OE_NUM_LIGHTS)
+#pragma import_defines(OE_LIGHTING)
+#pragma import_defines(OE_NUM_LIGHTS)
 
 #ifdef OE_LIGHTING
 
@@ -44,7 +45,6 @@
 };  
 uniform osg_MaterialParameters osg_FrontMaterial; 
 
-
 void oe_phong_fragment(inout vec4 color) 
 {
     // See:
@@ -54,37 +54,34 @@
 
     vec3 N = normalize(vp_Normal);
 
-    float shine = clamp(osg_FrontMaterial.shininess, 1.0, 128.0); 
+    float shine = clamp(osg_FrontMaterial.shininess, 1.0, 128.0);
+    vec3 surfaceSpecularity = osg_FrontMaterial.specular.rgb;
 
-    // Accumulate the lighting, starting with material emission. We are currently
-    // omitting the ambient term for now since we are not using LightModel ambience.
-    vec3 totalLighting =
-        osg_FrontMaterial.emission.rgb;
-        // + osg_FrontMaterial.ambient.rgb * osg_LightModel.ambient.rgb;
+    // Accumulate the lighting, starting with material emission.
+    vec3 totalDiffuse = vec3(0.0);
+    vec3 totalAmbient = vec3(0.0);
+    vec3 totalSpecular = vec3(0.0);
     
     int numLights = OE_NUM_LIGHTS; //min(osg_NumLights, MAX_LIGHTS);
 
     for (int i=0; i<numLights; ++i)
     {
-        const float attenuation = 1.0;
-
         if (osg_LightSource[i].enabled)
         {
             float attenuation = 1.0;
-            vec3 L; // vertex-to-light-source vector.
 
-            // directional light:
-            if (osg_LightSource[i].position.w == 0.0)
-            {
-                L = normalize(osg_LightSource[i].position.xyz);
-            }
+            // L is the normalized camera-to-light vector.
+            vec3 L = normalize(osg_LightSource[i].position.xyz);
+
+            // V is the normalized vertex-to-camera vector.
+            vec3 V = -normalize(oe_phong_vertexView3);
 
             // point or spot light:
-            else
+            if (osg_LightSource[i].position.w != 0.0)
             {
                 // calculate VL, the vertex-to-light vector:
-                vec4 V = vec4(oe_phong_vertexView3, 1.0) * osg_LightSource[i].position.w;
-                vec4 VL4 = osg_LightSource[i].position - V;
+                vec4 VL = vec4(oe_phong_vertexView3, 1.0) * osg_LightSource[i].position.w;
+                vec4 VL4 = osg_LightSource[i].position - VL;
                 L = normalize(VL4.xyz);
 
                 // calculate attenuation:
@@ -107,34 +104,42 @@
 
             vec3 ambientReflection =
                 attenuation
-                * osg_FrontMaterial.ambient.rgb
                 * osg_LightSource[i].ambient.rgb;
 
             float NdotL = max(dot(N,L), 0.0); 
 
             vec3 diffuseReflection =
                 attenuation
-                * osg_LightSource[i].diffuse.rgb * osg_FrontMaterial.diffuse.rgb
+                * osg_LightSource[i].diffuse.rgb
                 * NdotL;
                 
             vec3 specularReflection = vec3(0.0);
             if (NdotL > 0.0)
             {
                 vec3 H = reflect(-L,N); 
-                float HdotN = max(dot(H,N), 0.0); 
+                float HdotV = max(dot(H,V), 0.0); 
 
                 specularReflection =
                     attenuation
                     * osg_LightSource[i].specular.rgb
-                    * osg_FrontMaterial.specular.rgb
-                    * pow(HdotN, shine);
+                    * surfaceSpecularity
+                    * pow(HdotV, shine);
             }
 
-            totalLighting += ambientReflection + diffuseReflection + specularReflection;
+            totalDiffuse += diffuseReflection;
+            totalAmbient += ambientReflection;
+            totalSpecular += specularReflection;
         }
     }
-    
-    color.rgb *= totalLighting;
+
+    vec3 lightColor =
+        osg_FrontMaterial.emission.rgb +
+        totalDiffuse * osg_FrontMaterial.diffuse.rgb +
+        totalAmbient * osg_FrontMaterial.ambient.rgb;
+
+    color.rgb =
+        color.rgb * lightColor +
+        totalSpecular;
 }
 
 #else
@@ -142,4 +147,4 @@
 // nop
 void oe_phong_fragment(inout vec4 color) { }
 
-#endif
\ No newline at end of file
+#endif
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Picker osgearth-2.10.2+dfsg/src/osgEarth/Picker
--- osgearth-2.9.0+dfsg/src/osgEarth/Picker	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Picker	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PluginLoader osgearth-2.10.2+dfsg/src/osgEarth/PluginLoader
--- osgearth-2.9.0+dfsg/src/osgEarth/PluginLoader	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PluginLoader	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PointDrawable osgearth-2.10.2+dfsg/src/osgEarth/PointDrawable
--- osgearth-2.9.0+dfsg/src/osgEarth/PointDrawable	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PointDrawable	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,234 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_POINTDRAWABLE_H
+#define OSGEARTH_POINTDRAWABLE_H 1
+
+#include <osgEarth/Common>
+#include <osg/Array>
+#include <osg/Geometry>
+#include <osg/Version>
+#include <osg/Geode>
+
+namespace osgEarth
+{
+    /**
+     * Drawable that renders points.
+     *
+     * Note: Use the provided functions whenever possible. Do not access the
+     * underlying Geometry arrays directly. The implementation uses special
+     * formatting internally and accessing the arrays directly will probably
+     * cause trouble.
+     */
+    class OSGEARTH_EXPORT PointDrawable : public osg::Geometry
+    {
+    public:
+        //! Create new PointDrawable
+        PointDrawable();
+
+        //! Copy constructor
+        PointDrawable(const PointDrawable& rhs, const osg::CopyOp& copy);
+
+        //! Width in pixels of the point
+        void setPointSize(float width_pixels);
+        float getPointSize() const { return _width; }
+
+        //! Point smoothing (Anti-aliasing/rounding)
+        void setPointSmooth(bool value);
+        bool getPointSmooth() const { return _smooth; }
+
+        //! Sets the overall color of the drawable
+        void setColor(const osg::Vec4& color);
+        const osg::Vec4& getColor() const { return _color; }
+        
+        //! Append a vertex to the drawable
+        void pushVertex(const osg::Vec3& vert);
+
+        //! Set the value of a vertex at index i
+        void setVertex(unsigned i, const osg::Vec3& vert);
+
+        //! Gets the vertex at index i
+        const osg::Vec3& getVertex(unsigned i) const;
+
+        //! Sets the color of a vertex at index i
+        void setColor(unsigned i, const osg::Vec4& color);
+
+        //! Copy a vertex array into the drawable
+        void importVertexArray(const osg::Vec3Array* verts);
+        
+        //! Copy a vertex attribute array into the drawable
+        template<typename T>
+        void importVertexAttribArray(unsigned location, const T* data);
+        
+        //! Allocate space for vertices
+        void allocate(unsigned numVerts);
+
+        //! Clears all data
+        void clear();
+
+        //! Number of vertices in the drawable
+        unsigned getNumVerts() const;
+
+        //! Number of vertices in the drawable
+        unsigned size() const { return getNumVerts(); }
+
+        //! Appends a vertex to an attribute array. Use this instead of adding
+        //! to the array directly!
+        template<typename T>
+        void pushVertexAttrib(T* vaa, const typename T::ElementDataType& value);
+
+        //! Gets the value of the vertex attribute from an array at index i
+        template<typename T>
+        const typename T::ElementDataType& getVertexAttrib(const T* vaa, unsigned i) const;
+
+        //! Pre-allocate space for vertices
+        void reserve(unsigned size);
+
+        //! Index of the first vertex to draw (default = 0)
+        void setFirst(unsigned index);
+        unsigned getFirst() const;
+
+        //! Number of vertices to draw (default = 0, which means draw to the
+        //! end of the line
+        void setCount(unsigned count);
+        unsigned getCount() const;
+
+        //! Rebuild the primitive sets for this drawable. You MUST call this
+        //! after adding new data to the drawable!
+        void dirty();
+        void finish() { dirty(); }
+
+    public: // osg::Geometry
+
+        virtual void drawImplementation(osg::RenderInfo& ri) const;
+
+    public: // osg::Node
+
+        //! Replace methods from META_Node so we can override accept
+        virtual osg::Object* cloneType() const { return new PointDrawable(); }
+        virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new PointDrawable(*this,copyop); }
+        virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const PointDrawable*>(obj)!=NULL; }
+        virtual const char* className() const { return "PointDrawable"; }
+        virtual const char* libraryName() const { return "osgEarth"; }
+
+        //! Override Node::accept to include the singleton GPU statset
+        virtual void accept(osg::NodeVisitor& nv);
+
+    public: // osg::Object
+        
+        virtual void compileGLObjects(osg::RenderInfo& renderInfo) const;
+        virtual void resizeGLObjectBuffers(unsigned maxSize);
+        virtual void releaseGLObjects(osg::State* state) const;
+
+    protected:
+
+        //! destructor
+        virtual ~PointDrawable();
+
+    private:
+        bool _gpu;
+        osg::Vec4 _color;
+        float _width;
+        bool _smooth;
+        unsigned _first;
+        unsigned _count;
+        osg::Vec3Array* _current;
+        osg::Vec4Array* _colors;
+
+        void initialize();
+        void setupState();
+        void updateFirstCount();
+
+        static osg::observer_ptr<osg::StateSet> s_sharedStateSet;
+        osg::ref_ptr<osg::StateSet> _sharedStateSet;
+        mutable bool _sharedStateSetCompiled;
+
+        void checkSharedStateSet(osg::State*) const;
+    };
+
+
+    /**
+     * Group for importing PointDrawables from osg::Geometry or for
+     * optimizing multiple PointDrawables for performance.
+     *
+     * Note: PointGroup inherits from Geode (for now) to maintain support for
+     * the OSG 3.4 MergeGeometryVisitor (which only works on Geodes). Once we
+     * make OSG 3.6 the minimum supported version, we can change this to Group.
+     */
+    class OSGEARTH_EXPORT PointGroup : public osg::Geode
+    {
+    public:
+        META_Node(osgEarth, PointGroup);
+
+        //! Construct a new line group
+        PointGroup();
+
+        //! Copy constructor
+        PointGroup(const PointGroup& rhs, const osg::CopyOp& copy);
+
+        //! Imports any GL point drawables from a node graph, converts them
+        //! to PointDrawables, and adds them to this group. 
+        //!
+        //! If you set removePrimitiveSets to true, it will remove all line-based
+        //! primitive sets from the node after import.
+        //!
+        //! This method is for quickly importing legacy scene graphs; if you are
+        //! writing new code, use the PointDrawable API directly instead!
+        void import(osg::Node* node, bool removePrimitiveSets =false);
+        
+        //! Optimize the drawables under this group for performance.
+        //! Only call this after you finish adding drawables to your group.
+        //! It will attempt to combine drawables and state sets, but it will also
+        //! render the graph henceforth immutable.
+        void optimize();
+
+        //! Get child i as a LineDrawable
+        PointDrawable* getPointDrawable(unsigned i);
+
+    protected:
+        //! destructor
+        virtual ~PointGroup();
+    };
+
+    
+    // Template implementations ..........................................
+
+    template<typename T>
+    void PointDrawable::pushVertexAttrib(T* vaa, const typename T::ElementDataType& value)
+    {
+        vaa->push_back(value);
+    }
+
+    template<typename T>
+    const typename T::ElementDataType& PointDrawable::getVertexAttrib(const T* vaa, unsigned i) const
+    {
+        return (*vaa)[i];
+    }
+
+    template<typename T>
+    void PointDrawable::importVertexAttribArray(unsigned location, const T* data)
+    {
+        T* vaa = osg::cloneType(data);
+        setVertexAttribArray(location, vaa);
+        for (unsigned i=0; i < data->getNumElements(); ++i)
+            pushVertexAttrib(vaa, (*data)[i]);
+    }
+
+} // namespace osgEarth
+
+#endif // OSGEARTH_POINTDRAWABLE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PointDrawable.cpp osgearth-2.10.2+dfsg/src/osgEarth/PointDrawable.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/PointDrawable.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PointDrawable.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,725 @@
+
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include <osgEarth/PointDrawable>
+#include <osgEarth/Shaders>
+#include <osgEarth/Registry>
+#include <osgEarth/Capabilities>
+#include <osgEarth/GLUtils>
+#include <osgEarth/CullingUtils>
+#include <osgEarth/LineFunctor>
+#include <osg/PointSprite>
+#include <osg/Point>
+#include <osgDB/ObjectWrapper>
+#include <osgUtil/Optimizer>
+
+
+#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)
+#define OE_GLES_AVAILABLE
+#endif
+
+// Comment this out to test the non-GLSL path
+#define USE_GPU 1
+
+using namespace osgEarth;
+
+#define LC "[PointGroup] "
+
+namespace osgEarth { namespace Serializers { namespace PointGroup
+{
+    REGISTER_OBJECT_WRAPPER(
+        PointGroup,
+        new osgEarth::PointGroup,
+        osgEarth::PointGroup,
+        "osg::Object osg::Node osg::Group osg::Geode osgEarth::PointGroup")
+    {
+        // no properties
+    }
+} } }
+
+PointGroup::PointGroup()
+{
+    //nop
+}
+
+PointGroup::PointGroup(const PointGroup& rhs, const osg::CopyOp& copy) :
+osg::Geode(rhs, copy)
+{
+    //nop
+}
+
+PointGroup::~PointGroup()
+{
+    //nop
+}
+
+namespace
+{
+    struct ImportPointsOperator
+    {
+        osg::Vec3Array* _verts;
+        osg::Vec4Array* _colors;
+        PointGroup* _group;
+        PointDrawable* _drawable;
+
+        virtual void setGeometry(osg::Geometry* geom)
+        {
+            _verts = dynamic_cast<osg::Vec3Array*>(geom->getVertexArray());
+            _colors = dynamic_cast<osg::Vec4Array*>(geom->getColorArray());
+        }
+
+        void point(unsigned i1)
+        {
+            if (_verts)
+            {
+                _drawable->pushVertex((*_verts)[i1]);
+                if (_colors && _colors->size() == _verts->size())
+                {
+                    _drawable->setColor(_drawable->getNumVerts()-1, (*_colors)[_colors->size()-1]);
+                }
+            }
+        }
+    };
+
+    typedef PointIndexFunctor<ImportPointsOperator> ImportPointsFunctorBase;
+
+    struct ImportPointsFunctor : public ImportPointsFunctorBase
+    {
+        osg::Point* _size;
+
+        ImportPointsFunctor(osg::Geometry* input, PointGroup* group, osg::Point* size)
+        {
+            setGeometry(input);
+            _group = group;
+            _drawable = 0L;
+            _size = size;
+        }
+
+        void emit()
+        {
+            if (_colors && _colors->getBinding() == osg::Array::BIND_OVERALL && _colors->size() > 0)
+            {
+                _drawable->setColor((*_colors)[0]);
+            }
+
+            _drawable->dirty();
+
+            if (_size)
+            {
+                _drawable->setPointSize(_size->getSize());
+            }
+
+            _group->addChild(_drawable);
+        }
+
+        virtual void drawArrays(GLenum mode,GLint first,GLsizei count)
+        {
+            if (mode == GL_POINTS)
+            {
+                _drawable = new PointDrawable();
+                ImportPointsFunctorBase::drawArrays(mode, first, count);
+                emit();
+            }
+        }
+
+        virtual void drawElements(GLenum mode,GLsizei count,const GLubyte* indices)
+        {
+            if (mode == GL_POINTS)
+            {
+                _drawable = new PointDrawable();
+                ImportPointsFunctorBase::drawElements(mode, count, indices);
+                emit();
+            }
+        }
+
+        virtual void drawElements(GLenum mode,GLsizei count,const GLushort* indices)
+        {
+            if (mode == GL_POINTS)
+            {
+                _drawable = new PointDrawable();
+                ImportPointsFunctorBase::drawElements(mode, count, indices);
+                emit();
+            }
+        }
+
+        virtual void drawElements(GLenum mode,GLsizei count,const GLuint* indices)
+        {
+            if (mode == GL_POINTS)
+            {
+                _drawable = new PointDrawable();
+                ImportPointsFunctorBase::drawElements(mode, count, indices);
+                emit();
+            }
+        }
+    };
+
+    
+
+    struct ImportPointsVisitor : public osg::NodeVisitor
+    {
+        PointGroup* _group;
+        bool _removePrimSets;
+        typedef std::pair<osg::Node*, osg::Point*> Size;
+        std::stack<Size> _size;
+
+        ImportPointsVisitor(PointGroup* group, bool removePrimSets) : _group(group), _removePrimSets(removePrimSets)
+        {
+            setTraversalMode(TRAVERSE_ALL_CHILDREN);
+            setNodeMaskOverride(~0);
+        }
+
+        void apply(osg::Node& node)
+        {
+            pushState(node);
+            traverse(node);
+            popState(node);
+        }
+
+        void apply(osg::Drawable& drawable)
+        {
+            pushState(drawable);
+            osg::Geometry* geom = drawable.asGeometry();
+            if (geom)
+            {
+                ImportPointsFunctor import(
+                    geom,
+                    _group,
+                    _size.empty() ? 0L : _size.top().second);
+
+                drawable.accept(import);
+
+                if (_removePrimSets)
+                {
+                    for (int i = 0; i < (int)geom->getNumPrimitiveSets(); ++i)
+                    {
+                        GLenum mode = geom->getPrimitiveSet(i)->getMode();
+                        if (mode == GL_POINTS)
+                        {
+                            geom->removePrimitiveSet(i--);
+                        }
+                    }
+                }
+            }
+            popState(drawable);
+        }
+
+        void pushState(osg::Node& node)
+        {
+            osg::StateSet* ss = node.getStateSet();
+            if (ss)
+            {
+                osg::Point* size = dynamic_cast<osg::Point*>(ss->getAttribute(osg::StateAttribute::POINT));
+                if (size)
+                {
+                    _size.push(std::make_pair(&node, size));
+                }
+            }
+        }
+
+        void popState(osg::Node& node)
+        {
+            if (!_size.empty() && _size.top().first == &node)
+                _size.pop();
+        }
+    };
+}
+
+void
+PointGroup::import(osg::Node* node, bool removePrimitiveSets)
+{
+    if (node)
+    {
+        ImportPointsVisitor visitor(this, removePrimitiveSets);
+        node->accept(visitor);
+    }
+}
+
+void
+PointGroup::optimize()
+{
+    // Optimize state sharing so the MergeGeometryVisitor can work better.
+    // Without this step, the #defines used for width and stippling will
+    // hold up the merge.
+    osg::ref_ptr<StateSetCache> cache = new StateSetCache();
+    cache->optimize(this);
+
+    // Merge all non-dynamic drawables to reduce the total number of 
+    // OpenGL calls.
+    osgUtil::Optimizer::MergeGeometryVisitor mg;
+    mg.setTargetMaximumNumberOfVertices(65536);
+    accept(mg);
+}
+
+PointDrawable*
+PointGroup::getPointDrawable(unsigned i)
+{
+    return i < getNumChildren() ? dynamic_cast<PointDrawable*>(getChild(i)) : 0L;
+}
+
+//...................................................................
+
+#undef  LC
+#define LC "[PointDrawable] "
+
+
+namespace osgEarth { namespace Serializers { namespace PointDrawable
+{
+    REGISTER_OBJECT_WRAPPER(
+        PointDrawable,
+        new osgEarth::PointDrawable,
+        osgEarth::PointDrawable,
+        "osg::Object osg::Node osg::Drawable osg::Geometry osgEarth::PointDrawable")
+    {
+        ADD_VEC4_SERIALIZER( Color, osg::Vec4(1,1,1,1) );
+        ADD_FLOAT_SERIALIZER( PointSize, 1.0f );
+        ADD_UINT_SERIALIZER( First, 0u );
+        ADD_UINT_SERIALIZER( Count, 0u );
+    }
+} } }
+
+//...................................................................
+
+namespace
+{
+    static bool s_isCoreProfile;
+}
+
+PointDrawable::PointDrawable() :
+osg::Geometry(),
+_gpu(false),
+_color(1, 1, 1, 1),
+_width(1.0f),
+_smooth(false),
+_first(0u),
+_count(0u),
+_current(NULL),
+_colors(NULL),
+_sharedStateSetCompiled(false)
+{
+#ifdef USE_GPU
+    _gpu = Registry::capabilities().supportsGLSL();
+#endif
+    setupState();
+}
+
+PointDrawable::PointDrawable(const PointDrawable& rhs, const osg::CopyOp& copy) :
+osg::Geometry(rhs, copy),
+_gpu(rhs._gpu),
+_color(rhs._color),
+_width(rhs._width),
+_smooth(rhs._smooth),
+_first(rhs._first),
+_count(rhs._count),
+_current(NULL),
+_colors(NULL),
+_sharedStateSetCompiled(rhs._sharedStateSetCompiled)
+{
+    _current = static_cast<osg::Vec3Array*>(getVertexArray());
+    setupState();
+}
+
+PointDrawable::~PointDrawable()
+{
+    //nop
+}
+
+void
+PointDrawable::initialize()
+{
+    // Already initialized?
+    if (_current)
+        return;
+
+    // See if the arrays already exist:
+    _current = static_cast<osg::Vec3Array*>(getVertexArray());
+
+    setUseVertexBufferObjects(_supportsVertexBufferObjects);
+    setUseDisplayList(false);
+
+    if (!_current)
+    {
+        _current = new osg::Vec3Array();
+        _current->setBinding(osg::Array::BIND_PER_VERTEX);
+        setVertexArray(_current);
+
+        _colors = new osg::Vec4Array();
+        _colors->setBinding(osg::Array::BIND_PER_VERTEX);
+        setColorArray(_colors);
+    }
+}
+
+void
+PointDrawable::setPointSize(float value)
+{
+    if (_width != value)
+    {
+        _width = value;
+        GLUtils::setPointSize(getOrCreateStateSet(), value, 1);
+    }
+}
+
+void
+PointDrawable::setPointSmooth(bool value)
+{
+    if (_smooth != value)
+    {
+        _smooth = value;
+        GLUtils::setPointSmooth(getOrCreateStateSet(), value? 1 : 0);
+    }
+}
+
+void
+PointDrawable::setColor(const osg::Vec4& color)
+{
+    if (_color != color)
+    {
+        initialize();
+
+        _color = color;
+        if (_colors && !_colors->empty())
+        {
+            _colors->assign(_colors->size(), _color);
+            _colors->dirty();
+        }
+    }
+}
+
+void
+PointDrawable::setColor(unsigned vi, const osg::Vec4& color)
+{
+    (*_colors)[vi] = color;
+    _colors->dirty();
+}
+
+void
+PointDrawable::setFirst(unsigned value)
+{
+    _first = value;
+    updateFirstCount();
+}
+
+unsigned
+PointDrawable::getFirst() const
+{
+    return _first;
+}
+
+void
+PointDrawable::setCount(unsigned value)
+{
+    _count = value;
+    updateFirstCount();
+}
+
+unsigned
+PointDrawable::getCount() const
+{
+    return _count;
+}
+
+void
+PointDrawable::updateFirstCount()
+{
+    if (getNumPrimitiveSets() > 0)
+    {
+        osg::DrawArrays* da = dynamic_cast<osg::DrawArrays*>(getPrimitiveSet(0));
+        if (da)
+        {
+            unsigned first = _first < _current->size() ? _first : 0u;
+            unsigned count = _count <= _current->size()-first ? _count : _current->size()-first;
+            da->setFirst(first);
+            da->setCount(count);
+            da->dirty();
+        }
+    }
+}
+
+void
+PointDrawable::pushVertex(const osg::Vec3& vert)
+{
+    initialize();
+
+    _current->push_back(vert);
+    _current->dirty();
+
+    _colors->push_back(_color);
+    _colors->dirty();
+
+    dirtyBound();
+}
+
+void
+PointDrawable::setVertex(unsigned vi, const osg::Vec3& vert)
+{
+    initialize();
+
+    // if we've already called dirty() that means we are editing a completed
+    // drawable and therefore need dynamic variance.
+    if (getNumPrimitiveSets() > 0u && getDataVariance() != DYNAMIC)
+    {
+        setDataVariance(DYNAMIC);
+    }
+
+    if (vi < _current->size())
+    {
+        (*_current)[vi] = vert;
+        _current->dirty();
+    }
+
+    dirtyBound();
+}
+
+const osg::Vec3&
+PointDrawable::getVertex(unsigned index) const
+{
+    return (*_current)[index];
+}
+
+void
+PointDrawable::importVertexArray(const osg::Vec3Array* verts)
+{
+    initialize();
+
+    _current->clear();
+    _colors->clear();
+
+    if (verts && verts->size() > 0)
+    {
+        reserve(verts->size());
+
+        for (osg::Vec3Array::const_iterator i = verts->begin(); i != verts->end(); ++i)
+        {
+            pushVertex(*i);
+        }
+    }
+
+    dirty();
+}
+
+void
+PointDrawable::allocate(unsigned numVerts)
+{
+    initialize();
+
+    unsigned num = getNumVerts();
+    if (numVerts >= num)
+    {
+        for (unsigned i = num; i < numVerts; ++i)
+        {
+            pushVertex(osg::Vec3(0,0,0));
+        }
+    }
+    else
+    {
+        clear();
+        for (unsigned i = 0; i < numVerts; ++i)
+        {
+            pushVertex(osg::Vec3(0,0,0));
+        }
+    }
+
+    dirty();
+}
+
+// Calculates the "virtual" number of vertices in this drawable.
+// The actual number of vertices depends on the GL mode.
+unsigned
+PointDrawable::getNumVerts() const
+{
+    if (!_current || _current->empty())
+        return 0u;
+
+    return _current->size();
+}
+
+void
+PointDrawable::reserve(unsigned size)
+{
+    initialize();
+
+    unsigned actualSize = size;
+
+    if (actualSize > _current->size())
+    {
+        ArrayList arrays;
+        getArrayList(arrays);
+        for (ArrayList::iterator i = arrays.begin(); i != arrays.end(); ++i)
+            i->get()->reserveArray(actualSize);
+    }
+}
+
+void
+PointDrawable::clear()
+{
+    initialize();
+
+    unsigned n = getNumVerts();
+    if (n > 0u)
+    {
+        ArrayList arrays;
+        getArrayList(arrays);
+        for (ArrayList::iterator i = arrays.begin(); i != arrays.end(); ++i)
+        {
+            i->get()->resizeArray(0);
+        }
+        reserve(n);
+    }
+}
+
+void
+PointDrawable::dirty()
+{
+    initialize();
+
+    dirtyBound();
+
+    _current->dirty();
+
+    // rebuild primitive sets.
+    if (getNumPrimitiveSets() > 0)
+    {
+        removePrimitiveSet(0, 1);
+    }
+
+    ArrayList arrays;
+    getArrayList(arrays);
+    for (unsigned i = 0; i<arrays.size(); ++i)
+        arrays[i]->dirty();
+
+    addPrimitiveSet(new osg::DrawArrays(GL_POINTS, _first, _count > 0u? _count : _current->size()));
+}
+
+osg::observer_ptr<osg::StateSet> PointDrawable::s_sharedStateSet;
+
+void
+PointDrawable::setupState()
+{
+    // Create the singleton state set for the shader. This stateset will be
+    // shared by all PointDrawable instances so OSG will sort them together.
+    if (!_sharedStateSet.valid())
+    {
+        if (s_sharedStateSet.lock(_sharedStateSet) == false)
+        {
+            static Threading::Mutex s_mutex;
+            Threading::ScopedMutexLock lock(s_mutex);
+
+            if (s_sharedStateSet.lock(_sharedStateSet) == false)
+            {
+                s_sharedStateSet = _sharedStateSet = new osg::StateSet();
+
+                s_sharedStateSet->setTextureAttributeAndModes(0, new osg::PointSprite(), osg::StateAttribute::ON);
+
+                if (_gpu)
+                {
+                    VirtualProgram* vp = VirtualProgram::getOrCreate(_sharedStateSet.get());
+                    vp->setName("osgEarth::PointDrawable");
+                    Shaders shaders;
+                    shaders.load(vp, shaders.PointDrawable);
+                    _sharedStateSet->setMode(GL_PROGRAM_POINT_SIZE, 1);
+                }
+
+                s_isCoreProfile = Registry::capabilities().isCoreProfile();
+            }
+        }
+    }
+}
+
+void
+PointDrawable::drawImplementation(osg::RenderInfo& ri) const
+{
+    checkSharedStateSet(ri.getState());
+
+    // in the compatibility profile, we have to expressly enable point sprites;
+    // not sure why this doesn't happen in osg::PointSprite
+    if (!s_isCoreProfile)
+    {
+        glEnable(GL_POINT_SPRITE_ARB);
+    }
+
+    osg::Geometry::drawImplementation(ri);
+}
+
+void
+PointDrawable::checkSharedStateSet(osg::State* state) const
+{
+    if (_sharedStateSet.valid() && !_sharedStateSetCompiled)
+    {
+        static Threading::Mutex s_mutex;
+        Threading::ScopedMutexLock lock(s_mutex);
+
+        if (!_sharedStateSetCompiled)
+        {
+            osg::PointSprite* sprite = dynamic_cast<osg::PointSprite*>(
+                _sharedStateSet->getTextureAttribute(0, osg::StateAttribute::POINTSPRITE));
+
+            if (sprite)
+            {
+                sprite->checkValidityOfAssociatedModes(*state);
+            }
+
+            _sharedStateSet->compileGLObjects(*state);
+            _sharedStateSetCompiled = true;
+        }
+    }
+}
+
+void
+PointDrawable::accept(osg::NodeVisitor& nv)
+{
+    if (nv.validNodeMask(*this))
+    { 
+        osgUtil::CullVisitor* cv = Culling::asCullVisitor(nv);
+
+        nv.pushOntoNodePath(this);
+
+        // inject our shared stateset into the cull visitor.
+        if (cv)
+            cv->pushStateSet(_sharedStateSet.get());
+
+        nv.apply(*this); 
+
+        if (cv)
+            cv->popStateSet();
+
+        nv.popFromNodePath();
+    }
+}
+
+void
+PointDrawable::compileGLObjects(osg::RenderInfo& ri) const
+{
+    checkSharedStateSet(ri.getState());
+    osg::Geometry::compileGLObjects(ri);
+}
+
+void
+PointDrawable::resizeGLObjectBuffers(unsigned maxSize)
+{
+    osg::Geometry::resizeGLObjectBuffers(maxSize);
+    if (_sharedStateSet.valid())
+        _sharedStateSet->resizeGLObjectBuffers(maxSize);
+}
+
+void
+PointDrawable::releaseGLObjects(osg::State* state) const
+{
+    osg::Geometry::releaseGLObjects(state);
+    if (_sharedStateSet.valid())
+        _sharedStateSet->releaseGLObjects(state);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PointDrawable.glsl osgearth-2.10.2+dfsg/src/osgEarth/PointDrawable.glsl
--- osgearth-2.9.0+dfsg/src/osgEarth/PointDrawable.glsl	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PointDrawable.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,43 @@
+#version $GLSL_VERSION_STR
+#pragma vp_name PointDrawable
+#pragma vp_entryPoint oe_PointDrawable_VS_VIEW
+#pragma vp_location vertex_view
+#pragma vp_order last
+
+uniform float oe_GL_PointSize;
+
+void oe_PointDrawable_VS_VIEW(inout vec4 vertexView)
+{
+    gl_PointSize = oe_GL_PointSize;
+}
+
+[break]
+
+#version $GLSL_VERSION_STR
+#pragma vp_name PointDrawable FS
+#pragma vp_entryPoint oe_PointDrawable_FS
+#pragma vp_location fragment_coloring
+#pragma import_defines(OE_POINT_SMOOTH)
+
+// Some GLES impls don't have fwidth yet:
+#if !defined(GL_ES) || defined(GL_OES_standard_derivatives)
+#define HAVE_FWIDTH
+#endif
+
+void oe_PointDrawable_FS(inout vec4 color)
+{
+#ifdef OE_POINT_SMOOTH
+    vec2 c = 2.0*gl_PointCoord-1.0;
+    float r = dot(c, c);
+
+#ifdef HAVE_FWIDTH
+    float d = fwidth(r);
+    color.a = 1.0 - smoothstep(1.0 - d, 1.0 + d, r);
+#else
+    color.a = 1.0 - smoothstep(-0.1, 0.1, r - 1.0);
+#endif
+
+    if (color.a < 0.1)
+        discard;
+#endif
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PrimitiveIntersector osgearth-2.10.2+dfsg/src/osgEarth/PrimitiveIntersector
--- osgearth-2.9.0+dfsg/src/osgEarth/PrimitiveIntersector	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PrimitiveIntersector	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/PrimitiveIntersector.cpp osgearth-2.10.2+dfsg/src/osgEarth/PrimitiveIntersector.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/PrimitiveIntersector.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/PrimitiveIntersector.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,11 +18,7 @@
  */
 
 #include <osgEarth/PrimitiveIntersector>
-#include <osgEarth/StringUtils>
 #include <osgEarth/Utils>
-#include <osg/Geode>
-#include <osg/KdTree>
-#include <osg/Notify>
 #include <osg/TemplatePrimitiveFunctor>
 
 #define LC "[PrmitiveIntersector] "
@@ -445,9 +441,9 @@
 
 void PrimitiveIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Drawable* drawable)
 {
-    if (reachedLimit()) return;
+    if (reachedLimit() || !drawable) return;
 
-    osg::BoundingBox bb = Utils::getBoundingBox(drawable);
+    osg::BoundingBox bb = drawable->getBoundingBox();
 
     if (bb.valid())
         bb.expandBy(osg::BoundingSphere(bb.center(), (_thickness - _start).length()));
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Profile osgearth-2.10.2+dfsg/src/osgEarth/Profile
--- osgearth-2.9.0+dfsg/src/osgEarth/Profile	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Profile	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -87,7 +87,12 @@
         optional<int>         _numTilesWideAtLod0;
         optional<int>         _numTilesHighAtLod0;
     };
+}
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::ProfileOptions);
 
+
+namespace osgEarth
+{
     /**
      * A "profile" defines the layout of a data source. The profile conveys the
      * spatial reference system (SRS), the geospatial extents within that SRS, and
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Profile.cpp osgearth-2.10.2+dfsg/src/osgEarth/Profile.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Profile.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Profile.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,13 +20,6 @@
 #include <osgEarth/Profile>
 #include <osgEarth/Registry>
 #include <osgEarth/TileKey>
-#include <osgEarth/Cube>
-#include <osgEarth/SpatialReference>
-#include <osgEarth/StringUtils>
-#include <osgEarth/Bounds>
-#include <osgDB/FileNameUtils>
-#include <algorithm>
-#include <sstream>
 
 using namespace osgEarth;
 
@@ -68,10 +61,10 @@
     if ( !conf.value().empty() )
         _namedProfile = conf.value();
 
-    conf.getIfSet( "srs", _srsInitString );
+    conf.get( "srs", _srsInitString );
 
-    conf.getIfSet( "vdatum", _vsrsInitString );
-    conf.getIfSet( "vsrs", _vsrsInitString ); // back compat
+    conf.get( "vdatum", _vsrsInitString );
+    conf.get( "vsrs", _vsrsInitString ); // back compat
 
     if ( conf.hasValue( "xmin" ) && conf.hasValue( "ymin" ) && conf.hasValue( "xmax" ) && conf.hasValue( "ymax" ) )
     {
@@ -82,8 +75,10 @@
             conf.value<double>( "ymax", 0 ) );
     }
 
-    conf.getIfSet( "num_tiles_wide_at_lod_0", _numTilesWideAtLod0 );
-    conf.getIfSet( "num_tiles_high_at_lod_0", _numTilesHighAtLod0 );
+    conf.get( "num_tiles_wide_at_lod_0", _numTilesWideAtLod0 );
+    conf.get( "tx", _numTilesWideAtLod0 );
+    conf.get( "num_tiles_high_at_lod_0", _numTilesHighAtLod0 );
+    conf.get( "ty", _numTilesHighAtLod0 );
 }
 
 Config
@@ -92,7 +87,7 @@
     Config conf( "profile" );
     if ( _namedProfile.isSet() )
     {
-        conf.value() = _namedProfile.value();
+        conf.setValue(_namedProfile.value());
     }
     else
     {
@@ -101,10 +96,10 @@
 
         if ( _bounds.isSet() )
         {
-            conf.update( "xmin", toString(_bounds->xMin()) );
-            conf.update( "ymin", toString(_bounds->yMin()) );
-            conf.update( "xmax", toString(_bounds->xMax()) );
-            conf.update( "ymax", toString(_bounds->yMax()) );
+            conf.set( "xmin", toString(_bounds->xMin()) );
+            conf.set( "ymin", toString(_bounds->yMin()) );
+            conf.set( "xmax", toString(_bounds->xMax()) );
+            conf.set( "ymax", toString(_bounds->yMax()) );
         }
 
         conf.set( "num_tiles_wide_at_lod_0", _numTilesWideAtLod0 );
@@ -317,13 +312,12 @@
     if ( ciEquals(name, "plate-carre") || ciEquals(name, "eqc-wgs84") )
     {
         // Yes I know this is not really Plate Carre but it will stand in for now.
-        return Profile::create(
-            "+proj=eqc +units=m +no_defs",
-            -20037508, -10001966,
-             20037508,  10001966,
-            "", // vdatum
-            2, 1 );
+        osg::Vec3d ex;
+        const SpatialReference* plateCarre = SpatialReference::get("plate-carre");
+        const SpatialReference* wgs84 = SpatialReference::get("wgs84");
+        wgs84->transform(osg::Vec3d(180,90,0), plateCarre, ex);
 
+        return Profile::create(plateCarre, -ex.x(), -ex.y(), ex.x(), ex.y(), 2u, 1u);
     }
 
     else
@@ -591,6 +585,80 @@
     }
 }
 
+#if 1
+
+GeoExtent
+Profile::clampAndTransformExtent(const GeoExtent& input, bool* out_clamped) const
+{
+    // initialize the output flag
+    if ( out_clamped )
+        *out_clamped = false;
+
+    // begin by transforming the input extent to this profile's SRS.
+    GeoExtent inputInMySRS = input.transform(getSRS());
+
+    if (inputInMySRS.isValid())
+    {
+        // Compute the intersection of the two:
+        GeoExtent intersection = inputInMySRS.intersectionSameSRS(getExtent());
+
+        // expose whether clamping took place:
+        if (out_clamped != 0L)
+        {
+            *out_clamped = intersection != getExtent();
+        }
+
+        return intersection;
+    }
+
+    else
+    {
+        // The extent transformation failed, probably due to an out-of-bounds condition.
+        // Go to Plan B: attempt the operation in lat/long
+        const SpatialReference* geo_srs = getSRS()->getGeographicSRS();
+
+        // get the input in lat/long:
+        GeoExtent gcs_input =
+            input.getSRS()->isGeographic()?
+            input :
+            input.transform( geo_srs );
+
+        // bail out on a bad transform:
+        if ( !gcs_input.isValid() )
+            return GeoExtent::INVALID;
+
+        // bail out if the extent's do not intersect at all:
+        if ( !gcs_input.intersects(_latlong_extent, false) )
+            return GeoExtent::INVALID;
+
+        // clamp it to the profile's extents:
+        GeoExtent clamped_gcs_input = GeoExtent(
+            gcs_input.getSRS(),
+            osg::clampBetween( gcs_input.xMin(), _latlong_extent.xMin(), _latlong_extent.xMax() ),
+            osg::clampBetween( gcs_input.yMin(), _latlong_extent.yMin(), _latlong_extent.yMax() ),
+            osg::clampBetween( gcs_input.xMax(), _latlong_extent.xMin(), _latlong_extent.xMax() ),
+            osg::clampBetween( gcs_input.yMax(), _latlong_extent.yMin(), _latlong_extent.yMax() ) );
+
+        if ( out_clamped )
+            *out_clamped = (clamped_gcs_input != gcs_input);
+
+        // finally, transform the clamped extent into this profile's SRS and return it.
+        GeoExtent result =
+            clamped_gcs_input.getSRS()->isEquivalentTo( this->getSRS() )?
+            clamped_gcs_input :
+            clamped_gcs_input.transform( this->getSRS() );
+
+        if (result.isValid())
+        {
+            OE_DEBUG << LC << "clamp&xform: input=" << input.toString() << ", output=" << result.toString() << std::endl;
+        }
+
+        return result;
+    }    
+}
+
+#else
+
 GeoExtent
 Profile::clampAndTransformExtent( const GeoExtent& input, bool* out_clamped ) const
 {
@@ -638,6 +706,7 @@
 
     return result;
 }
+#endif
 
 namespace
 {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Profiler osgearth-2.10.2+dfsg/src/osgEarth/Profiler
--- osgearth-2.9.0+dfsg/src/osgEarth/Profiler	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Profiler	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
-* http://osgearth.org
-*
-* osgEarth is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-* IN THE SOFTWARE.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-#ifndef OSGEARTH_PROFILER_H
-#define OSGEARTH_PROFILER_H 1
-
-#include <osgEarth/Common>
-#include <osgEarth/Config>
-
-namespace osgEarth
-{
-    /**
-    * Poor man's profiler.
-    * @deprecated
-    */
-    class OSGEARTH_EXPORT Profiler
-    {
-    public:
-        /**
-        * Starts a task with the given name.
-        */
-        static void start(const std::string& name);
-
-        /**
-        * Ends a task with the given name.
-        */
-        static void end(const std::string& name);
-
-        /**
-        * Dumps the stats to the console.
-        */
-        static void dump();
-
-		/**
-		* Clears the current stats
-		*/
-		static void clear();
-    };
-
-    class /*OSGEARTH_EXPORT*/ ScopedProfiler
-    {
-    public:
-        ScopedProfiler(const std::string& name) :
-            _name(name)
-        {
-            Profiler::start(_name);
-        }
-
-        ~ScopedProfiler()
-        {
-            Profiler::end(_name);
-        }
-
-        std::string _name;
-    };
-}
-
-#endif // OSGEARTH_UNITS_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Profiler.cpp osgearth-2.10.2+dfsg/src/osgEarth/Profiler.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Profiler.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Profiler.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
-#include <osgEarth/Profiler>
-
-#include <map>
-#include <osg/Timer>
-
-using namespace osgEarth;
-
-typedef std::map< std::string, osg::Timer_t > StartTimeMap;
-static StartTimeMap S_START_TIMES;
-
-typedef std::map< std::string, double > ElapsedTimeMap;
-static ElapsedTimeMap S_ELAPSED_TIMES;
-
-typedef std::map< std::string, unsigned int > CallMap;
-static CallMap S_CALL_COUNT;
-
-void Profiler::start(const std::string& name)
-{
-    S_START_TIMES[name] = osg::Timer::instance()->tick();
-}
-
-void Profiler::end(const std::string& name)
-{
-    osg::Timer_t end = osg::Timer::instance()->tick();
-    StartTimeMap::iterator startItr = S_START_TIMES.find(name);
-    if (startItr == S_START_TIMES.end())
-    {
-        OE_WARN << "Can't find start time " << name << std::endl;
-        return;
-    }
-
-    double dt = osg::Timer::instance()->delta_s(startItr->second, end);
-    ElapsedTimeMap::iterator elapsedItr = S_ELAPSED_TIMES.find(name);
-    if (elapsedItr == S_ELAPSED_TIMES.end())
-    {
-        S_ELAPSED_TIMES[name] = 0.0;
-    }
-    S_ELAPSED_TIMES[name] += dt;
-
-    // Increment the number of calls for the task
-    CallMap::iterator callItr = S_CALL_COUNT.find(name);
-    if (callItr == S_CALL_COUNT.end())
-    {
-        S_CALL_COUNT[name] = 0;
-    }
-    S_CALL_COUNT[name] += 1;
-
-}
-
-void Profiler::dump()
-{
-    for (ElapsedTimeMap::iterator itr = S_ELAPSED_TIMES.begin(); itr != S_ELAPSED_TIMES.end(); ++itr)
-    {
-        OE_NOTICE << itr->first << ": calls=" << S_CALL_COUNT[itr->first] << "  time=" << itr->second << "s" << std::endl;
-    }
-}
-
-void Profiler::clear()
-{
-	S_ELAPSED_TIMES.clear();
-	S_CALL_COUNT.clear();
-	S_START_TIMES.clear();
-}
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Progress osgearth-2.10.2+dfsg/src/osgEarth/Progress
--- osgearth-2.9.0+dfsg/src/osgEarth/Progress	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Progress	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -26,7 +26,8 @@
 namespace osgEarth
 {
     /**
-    * ProgressCallback is a general purpose interface for functions that need to report progress.
+    * ProgressCallback is a general purpose interface for functions that need to report progress
+    * or handle cancelation of a task.
     */
     class OSGEARTH_EXPORT ProgressCallback : public osg::Referenced
     {
@@ -90,16 +91,15 @@
         virtual void cancel() { _canceled = true; }
 
         /**
-         * Whether cancelation was requested
+         * Whether the associated task was canceled for some reason.
+         * Cancelation is NOT an error condition. It means that either
+         * the results of the task are no longer required, or that a
+         * recoverable problem occurred and the task is eligible to be
+         * tried again later (e.g., HTTP timeout)
          */
         virtual bool isCanceled() { return _canceled; }
 
         /**
-         * Whether reportError was called
-         */
-        virtual bool failed() { return _failed; }
-
-        /**
          * Status/error message
          */
         std::string& message() { return _message; }
@@ -111,16 +111,6 @@
         void reset() { _canceled = false; }
 
         /**
-        *Whether or not the task should be retried.
-        */
-        bool needsRetry() const { return _needsRetry; }
-
-        /**
-         * Sets whether or not the task should be retried
-         */
-        void setNeedsRetry( bool needsRetry ) { _needsRetry = needsRetry; }
-
-        /**
          * Access user stats
          */
         typedef fast_map<std::string,double> Stats;
@@ -131,9 +121,7 @@
 
     protected:
         std::string       _message;
-        mutable  bool     _needsRetry;
         mutable  bool     _canceled;
-        mutable  bool     _failed;
         mutable  Stats    _stats;
         mutable  bool     _collectStats;
     };
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Progress.cpp osgearth-2.10.2+dfsg/src/osgEarth/Progress.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Progress.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Progress.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,15 +18,12 @@
  */
 
 #include <osgEarth/Progress>
-#include <osgEarth/Notify>
 
 using namespace osgEarth;
 
 ProgressCallback::ProgressCallback() :
 osg::Referenced( true ),
 _canceled      ( false ),
-_failed        ( false ),
-_needsRetry    ( false ),
 _collectStats  ( false )
 {
     //NOP
@@ -35,7 +32,6 @@
 void ProgressCallback::reportError(const std::string& msg)
 {
     _message = msg;
-    _failed = true;
 }
 
 bool ProgressCallback::reportProgress(double             current,
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Random osgearth-2.10.2+dfsg/src/osgEarth/Random
--- osgearth-2.9.0+dfsg/src/osgEarth/Random	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Random	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Random.cpp osgearth-2.10.2+dfsg/src/osgEarth/Random.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Random.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Random.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,6 +18,7 @@
  */
 #include <osgEarth/Random>
 #include <time.h>
+
 #include <limits.h>
 
 #define LC "[Random] "
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Registry osgearth-2.10.2+dfsg/src/osgEarth/Registry
--- osgearth-2.9.0+dfsg/src/osgEarth/Registry	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Registry	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 
 #include <osgEarth/Common>
 #include <osgEarth/CachePolicy>
-#include <osgEarth/SharedSARepo>
 #include <osgEarth/Containers>
 #include <osgEarth/TraversalData>
 #include <osgEarth/ShaderGenerator>
@@ -54,8 +53,6 @@
     class ObjectIndex;
     class Units;
 
-    typedef SharedSARepo<osg::Program> ProgramSharedRepo;
-
 
     extern OSGEARTH_EXPORT OpenThreads::ReentrantMutex& getGDALMutex();
 
@@ -65,9 +62,8 @@
     class OSGEARTH_EXPORT Registry : public osg::Referenced
     {
     public:
-        /** Access the global Registry singleton. */
-        static Registry* instance(bool erase = false);
-
+        /** Access the global Registry singleton. Pass in true to destroy it and create a new one. */
+        static Registry* instance(bool reset = false);
 
         /** Gets a well-known named profile instance. */
         const Profile* getNamedProfile( const std::string& name ) const;
@@ -81,9 +77,6 @@
         /** Gets the spherical-mercator builtin profile (mercator/sphere) */
         const Profile* getSphericalMercatorProfile() const;
 
-        /** @deprecated Gets the unified cube builtin profile */
-        const Profile* getCubeProfile() const;
-
         /** Gets a spatial reference object */
         SpatialReference* getOrCreateSRS(const SpatialReference::Key& key);
 
@@ -187,8 +180,8 @@
          * A shared cache for osg::Program objects created by the shader
          * composition subsystem (VirtualProgram).
          */
-        ProgramSharedRepo* getProgramSharedRepo();
-        static ProgramSharedRepo* programSharedRepo() { return instance()->getProgramSharedRepo(); }
+        ProgramRepo& getProgramRepo();
+        static ProgramRepo& programRepo() { return instance()->getProgramRepo(); }
 
         /**
          * Gets a reference to the global task service manager.
@@ -291,14 +284,14 @@
         * This value is useful when running in high dpi environments on high resolution displays.
         */
         void setDevicePixelRatio(float devicePixelRatio);
-
+        
+        //! Release any resources held by the registry so it can be re-used
+        void release();
 
     protected:
         virtual ~Registry();
         Registry();
 
-        void destruct();
-
         bool _gdal_registered;
 
         osg::ref_ptr<const Profile> _global_geodetic_profile;
@@ -358,7 +351,7 @@
         std::set<Activity,ActivityLess> _activities;
         mutable Threading::Mutex _activityMutex;
 
-        ProgramSharedRepo _programRepo;
+        ProgramRepo _programRepo;
 
         optional<bool> _unRefImageDataAfterApply;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Registry.cpp osgearth-2.10.2+dfsg/src/osgEarth/Registry.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Registry.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Registry.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,30 +19,16 @@
 #include <osgEarth/Registry>
 #include <osgEarth/Capabilities>
 #include <osgEarth/Cube>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/ShaderFactory>
-#include <osgEarth/ShaderGenerator>
 #include <osgEarth/TaskService>
-#include <osgEarth/IOTypes>
-#include <osgEarth/ColorFilter>
-#include <osgEarth/StateSetCache>
-#include <osgEarth/HTTPClient>
-#include <osgEarth/StringUtils>
 #include <osgEarth/TerrainEngineNode>
 #include <osgEarth/ObjectIndex>
 
-#include <osgEarth/Units>
-#include <osg/Notify>
-#include <osg/Version>
-#include <osgDB/Registry>
-#include <osgDB/Options>
 #include <osgText/Font>
 
 #include <gdal_priv.h>
+
 #include <ogr_api.h>
-#include <cpl_error.h>
-#include <stdlib.h>
-#include <locale>
 
 using namespace osgEarth;
 using namespace OpenThreads;
@@ -70,7 +56,7 @@
 _uidGen             ( 0 ),
 _caps               ( 0L ),
 _defaultFont        ( 0L ),
-_terrainEngineDriver( "mp" ),
+_terrainEngineDriver( "rex" ),
 _cacheDriver        ( "filesystem" ),
 _overrideCachePolicyInitialized( false ),
 _threadPoolSize(2u),
@@ -114,6 +100,7 @@
     //osgDB::Registry::instance()->addFileExtensionAlias( "kmz", "kml" );
 
     osgDB::Registry::instance()->addMimeTypeExtensionMapping( "application/vnd.google-earth.kml+xml", "kml" );
+    osgDB::Registry::instance()->addMimeTypeExtensionMapping( "application/vnd.google-earth.kml+xml; charset=utf8", "kml");
     osgDB::Registry::instance()->addMimeTypeExtensionMapping( "application/vnd.google-earth.kmz",     "kmz" );
     osgDB::Registry::instance()->addMimeTypeExtensionMapping( "text/plain",                           "osgb" );
     osgDB::Registry::instance()->addMimeTypeExtensionMapping( "text/xml",                             "osgb" );
@@ -187,7 +174,7 @@
 }
 
 Registry*
-Registry::instance(bool erase)
+Registry::instance(bool reset)
 {
     // Make sure the gdal mutex is created before the Registry so it will still be around when the registry is destroyed statically.
     // This is to prevent crash on exit where the gdal mutex is deleted before the registry is.
@@ -195,19 +182,38 @@
 
     static osg::ref_ptr<Registry> s_registry = new Registry;
 
-    if (erase)
+    if (reset)
     {
-        s_registry->destruct();
-        s_registry = 0;
+        s_registry->release();
+        s_registry = new Registry();
     }
 
     return s_registry.get(); // will return NULL on erase
 }
 
 void
-Registry::destruct()
+Registry::release()
 {
-    //NOP
+    // Clear out the state set cache
+    if (_stateSetCache.valid())
+    {
+        _stateSetCache->releaseGLObjects(NULL);
+        _stateSetCache->clear();
+    }
+
+    // Clear out the VirtualProgram shared program repository
+    _programRepo.lock();
+    _programRepo.releaseGLObjects(NULL);
+    _programRepo.unlock();
+    
+    // SpatialReference cache
+    _srsMutex.lock();
+    _srsCache.clear();
+    _srsMutex.unlock();
+
+    // Shared object index
+    if (_objectIndex.valid())
+        _objectIndex = new ObjectIndex();
 }
 
 OpenThreads::ReentrantMutex& osgEarth::getGDALMutex()
@@ -267,21 +273,6 @@
 }
 
 const Profile*
-Registry::getCubeProfile() const
-{
-    if ( !_cube_profile.valid() )
-    {
-        GDAL_SCOPED_LOCK;
-
-        if ( !_cube_profile.valid() ) // double-check pattern
-        {
-            const_cast<Registry*>(this)->_cube_profile = new UnifiedCubeProfile();
-        }
-    }
-    return _cube_profile.get();
-}
-
-const Profile*
 Registry::getNamedProfile( const std::string& name ) const
 {
     if ( name == STR_GLOBAL_GEODETIC )
@@ -290,8 +281,6 @@
         return getGlobalMercatorProfile();
     else if ( name == STR_SPHERICAL_MERCATOR )
         return getSphericalMercatorProfile();
-    else if ( name == STR_CUBE )
-        return getCubeProfile();
     else
         return NULL;
 }
@@ -649,10 +638,10 @@
     return _stateSetCache.get();
 }
 
-ProgramSharedRepo*
-Registry::getProgramSharedRepo()
+ProgramRepo&
+Registry::getProgramRepo()
 {
-    return &_programRepo;
+    return _programRepo;
 }
 
 ObjectIndex*
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ResourceReleaser osgearth-2.10.2+dfsg/src/osgEarth/ResourceReleaser
--- osgearth-2.9.0+dfsg/src/osgEarth/ResourceReleaser	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ResourceReleaser	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ResourceReleaser.cpp osgearth-2.10.2+dfsg/src/osgEarth/ResourceReleaser.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ResourceReleaser.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ResourceReleaser.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -18,7 +18,6 @@
  */
 #include <osgEarth/ResourceReleaser>
 #include <osgEarth/Metrics>
-#include <osg/Version>
 #if OSG_VERSION_GREATER_OR_EQUAL(3,5,0)
 #include <osg/ContextData>
 #endif
@@ -67,8 +66,6 @@
 void
 ResourceReleaser::releaseGLObjects(osg::State* state) const
 {
-    osg::Drawable::releaseGLObjects(state);
-
     if (!_toRelease.empty())
     {
         Threading::ScopedMutexLock lock(_mutex);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Revisioning osgearth-2.10.2+dfsg/src/osgEarth/Revisioning
--- osgearth-2.9.0+dfsg/src/osgEarth/Revisioning	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Revisioning	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Revisioning.cpp osgearth-2.10.2+dfsg/src/osgEarth/Revisioning.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Revisioning.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Revisioning.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/Revisioning>
-#include <algorithm>
 
 #define LC "[Revisioning] "
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/SceneGraphCallback osgearth-2.10.2+dfsg/src/osgEarth/SceneGraphCallback
--- osgearth-2.9.0+dfsg/src/osgEarth/SceneGraphCallback	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/SceneGraphCallback	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -38,17 +38,17 @@
     class SceneGraphCallback : public osg::Referenced
     {
     public:
-        // Called before a node is added to the live scene graph,
-        // possibly from a background pager thread
-        virtual void onPreMergeNode(osg::Node*) { }
-
-        // Called after a node is added to the live scene graph
-        // in the main/update thread
-        virtual void onPostMergeNode(osg::Node*) { }
-
-        // Called after a node is remoevd from the live scene graph
-        // in the main/update thread
-        virtual void onRemoveNode(osg::Node*) { }
+        //! Called before a node is added to the live scene graph, possibly from a background pager thread
+        virtual void onPreMergeNode(osg::Node* node) { }
+        virtual void onPreMergeNode(osg::Node* node, osg::Object* sender) { onPreMergeNode(node); }
+
+        //! Called after a node is added to the live scene graph in the main/update thread
+        virtual void onPostMergeNode(osg::Node* node) { }
+        virtual void onPostMergeNode(osg::Node* node, osg::Object* sender) { onPostMergeNode(node); }
+
+        //! Called after a node is remoevd from the live scene graph in the main/update thread
+        virtual void onRemoveNode(osg::Node* node) { }
+        virtual void onRemoveNode(osg::Node* node, osg::Object* sender) { onRemoveNode(node); }
     };
     typedef std::vector<osg::ref_ptr<SceneGraphCallback> > SceneGraphCallbackVector;
 
@@ -60,6 +60,9 @@
     class OSGEARTH_EXPORT SceneGraphCallbacks : public osg::Referenced
     {
     public:
+        SceneGraphCallbacks(osg::Object* sender);
+
+    public:
         //! Add a new callback
         virtual void add(SceneGraphCallback* cb);
 
@@ -78,6 +81,7 @@
     private:
         SceneGraphCallbackVector _callbacks;
         Threading::Mutex _mutex;
+        osg::observer_ptr<osg::Object> _sender;
     };
 
     /**
@@ -109,6 +113,7 @@
 
     private:
         osg::observer_ptr<SceneGraphCallbacks> _host;
+        osg::observer_ptr<osg::Object> _sender;
     };
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/SceneGraphCallback.cpp osgearth-2.10.2+dfsg/src/osgEarth/SceneGraphCallback.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/SceneGraphCallback.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/SceneGraphCallback.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -23,6 +23,14 @@
 
 using namespace osgEarth;
 
+//...................................................................
+
+SceneGraphCallbacks::SceneGraphCallbacks(osg::Object* sender) :
+_sender(sender)
+{
+    //nop
+}
+
 void
 SceneGraphCallbacks::add(SceneGraphCallback* cb)
 {
@@ -54,24 +62,31 @@
 SceneGraphCallbacks::firePreMergeNode(osg::Node* node)
 {
     Threading::ScopedMutexLock lock(_mutex);
+    osg::ref_ptr<osg::Object> sender;
+    _sender.lock(sender);
     for (SceneGraphCallbackVector::iterator i = _callbacks.begin(); i != _callbacks.end(); ++i)
-        i->get()->onPreMergeNode(node);
+        i->get()->onPreMergeNode(node, sender.get());
 }
 
 void
 SceneGraphCallbacks::firePostMergeNode(osg::Node* node)
 {
+    osg::ref_ptr<osg::Object> sender;
+    _sender.lock(sender);
     for (SceneGraphCallbackVector::iterator i = _callbacks.begin(); i != _callbacks.end(); ++i)
-        i->get()->onPostMergeNode(node);
+        i->get()->onPostMergeNode(node, sender.get());
 }
 
 void
 SceneGraphCallbacks::fireRemoveNode(osg::Node* node)
 {
+    osg::ref_ptr<osg::Object> sender;
+    _sender.lock(sender);
     for (SceneGraphCallbackVector::iterator i = _callbacks.begin(); i != _callbacks.end(); ++i)
-        i->get()->onPostMergeNode(node);
+        i->get()->onRemoveNode(node, sender.get());
 }
 
+//...................................................................
 
 PagedLODWithSceneGraphCallbacks::PagedLODWithSceneGraphCallbacks(SceneGraphCallbacks* host) :
 _host(host)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ScreenSpaceLayout osgearth-2.10.2+dfsg/src/osgEarth/ScreenSpaceLayout
--- osgearth-2.9.0+dfsg/src/osgEarth/ScreenSpaceLayout	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ScreenSpaceLayout	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -104,7 +104,7 @@
               _outAnimTime          ( 0.00f ),
               _sortByPriority       ( false ),
               _sortByDistance       ( true ),
-              _snapToPixel          ( true ),
+              _snapToPixel          ( false ),
               _maxObjects           ( INT_MAX ),
               _renderBinNumber      ( 13 )
         {
@@ -129,11 +129,11 @@
         optional<float>& outAnimationTime() { return _outAnimTime; }
         const optional<float>& outAnimationTime() const { return _outAnimTime; }
 
-        /** If set, activate the AnnotationData priority-based sorting */
+        /** If set, activate the ScreenSpaceLayoutData priority-based sorting */
         optional<bool>& sortByPriority() { return _sortByPriority; }
         const optional<bool>& sortByPriority() const { return _sortByPriority; }
 
-        /** If set, activate the AnnotationData distance-based sorting */
+        /** If set, activate the ScreenSpaceLayoutData distance-based sorting */
         optional<bool>& sortByDistance() { return _sortByDistance; }
         const optional<bool>& sortByDistance() const { return _sortByDistance; }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ScreenSpaceLayout.cpp osgearth-2.10.2+dfsg/src/osgEarth/ScreenSpaceLayout.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ScreenSpaceLayout.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ScreenSpaceLayout.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,19 +20,11 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/ScreenSpaceLayout>
-#include <osgEarth/ThreadingUtils>
-#include <osgEarth/Containers>
 #include <osgEarth/Utils>
 #include <osgEarth/VirtualProgram>
 #include <osgEarth/Extension>
 #include <osgEarthAnnotation/BboxDrawable>
-#include <osgUtil/RenderBin>
-#include <osgUtil/StateGraph>
 #include <osgText/Text>
-#include <osg/UserDataContainer>
-#include <osg/ValueObject>
-#include <set>
-#include <algorithm>
 
 #define LC "[ScreenSpaceLayout] "
 
@@ -49,7 +41,7 @@
     {
         SortContainer( DeclutterSortFunctor& f ) : _f(f) { }
         const DeclutterSortFunctor& _f;
-        bool operator()( const osgUtil::RenderLeaf* lhs, const osgUtil::RenderLeaf* rhs ) const 
+        bool operator()( const osgUtil::RenderLeaf* lhs, const osgUtil::RenderLeaf* rhs ) const
         {
             return _f(lhs, rhs);
         }
@@ -61,11 +53,12 @@
     {
         bool operator()( const osgUtil::RenderLeaf* lhs, const osgUtil::RenderLeaf* rhs ) const
         {
-            const osg::Node* lhsParentNode = lhs->getDrawable()->getParent(0);
-            if ( lhsParentNode == rhs->getDrawable()->getParent(0) )
+            if (lhs->getDrawable()->getNumParents() > 0 &&
+                rhs->getDrawable()->getNumParents() > 0 &&
+                rhs->getDrawable()->getParent(0) == lhs->getDrawable()->getParent(0))
             {
-                const osg::Geode* geode = static_cast<const osg::Geode*>(lhsParentNode);
-                return geode->getDrawableIndex(lhs->getDrawable()) > geode->getDrawableIndex(rhs->getDrawable());
+                const osg::Group* parent = static_cast<const osg::Group*>(lhs->getDrawable()->getParent(0));
+                return parent->getChildIndex(lhs->getDrawable()) > parent->getChildIndex(rhs->getDrawable());
             }
             else
             {
@@ -80,18 +73,19 @@
     {
         bool operator()( const osgUtil::RenderLeaf* lhs, const osgUtil::RenderLeaf* rhs ) const
         {
-            const osg::Node* lhsParentNode = lhs->getDrawable()->getParent(0);
-            if ( lhsParentNode == rhs->getDrawable()->getParent(0) )
+            if (lhs->getDrawable()->getNumParents() > 0 &&
+                rhs->getDrawable()->getNumParents() > 0 &&
+                rhs->getDrawable()->getParent(0) == lhs->getDrawable()->getParent(0))
             {
-                const osg::Geode* geode = static_cast<const osg::Geode*>(lhsParentNode);
-                return geode->getDrawableIndex(lhs->getDrawable()) > geode->getDrawableIndex(rhs->getDrawable());
+                const osg::Group* parent = static_cast<const osg::Group*>(lhs->getDrawable()->getParent(0));
+                return parent->getChildIndex(lhs->getDrawable()) > parent->getChildIndex(rhs->getDrawable());
             }
 
             else
-            {            
+            {
                 const ScreenSpaceLayoutData* lhsdata = dynamic_cast<const ScreenSpaceLayoutData*>(lhs->getDrawable()->getUserData());
                 float lhsPriority = lhsdata ? lhsdata->_priority : 0.0f;
-    
+
                 const ScreenSpaceLayoutData* rhsdata = dynamic_cast<const ScreenSpaceLayoutData*>(rhs->getDrawable()->getUserData());
                 float rhsPriority = rhsdata ? rhsdata->_priority : 0.0f;
 
@@ -106,7 +100,11 @@
                     return diff < 0.0f;
 
                 // then fallback on traversal order.
+#if OSG_VERSION_GREATER_THAN(3,6,0)
+                diff = float(lhs->_traversalOrderNumber) - float(rhs->_traversalOrderNumber);
+#else
                 diff = float(lhs->_traversalNumber) - float(rhs->_traversalNumber);
+#endif
                 return diff < 0.0f;
             }
         }
@@ -122,13 +120,14 @@
     // TODO: a way to clear out this list when drawables go away
     struct DrawableInfo
     {
-        DrawableInfo() : _lastAlpha(1.0f), _lastScale(1.0f), _frame(0u) { }
+        DrawableInfo() : _lastAlpha(1.0f), _lastScale(1.0f), _frame(0u), _visible(true) { }
         float _lastAlpha, _lastScale;
         unsigned _frame;
+        bool _visible;
     };
 
     typedef std::map<const osg::Drawable*, DrawableInfo> DrawableMemory;
-    
+
     typedef std::pair<const osg::Node*, osg::BoundingBox> RenderLeafBox;
 
     // Data structure stored one-per-View.
@@ -138,7 +137,7 @@
 
         // remembers the state of each drawable from the previous pass
         DrawableMemory _memory;
-        
+
         // re-usable structures (to avoid unnecessary re-allocation)
         osgUtil::RenderBin::RenderLeafList _passed;
         osgUtil::RenderBin::RenderLeafList _failed;
@@ -166,30 +165,30 @@
 void
 ScreenSpaceLayoutOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet( "min_animation_scale", _minAnimScale );
-    conf.getIfSet( "min_animation_alpha", _minAnimAlpha );
-    conf.getIfSet( "in_animation_time",   _inAnimTime );
-    conf.getIfSet( "out_animation_time",  _outAnimTime );
-    conf.getIfSet( "sort_by_priority",    _sortByPriority );
-    conf.getIfSet( "sort_by_distance",    _sortByDistance);
-    conf.getIfSet( "snap_to_pixel",       _snapToPixel );
-    conf.getIfSet( "max_objects",         _maxObjects );
-    conf.getIfSet( "render_order",        _renderBinNumber );
+    conf.get( "min_animation_scale", _minAnimScale );
+    conf.get( "min_animation_alpha", _minAnimAlpha );
+    conf.get( "in_animation_time",   _inAnimTime );
+    conf.get( "out_animation_time",  _outAnimTime );
+    conf.get( "sort_by_priority",    _sortByPriority );
+    conf.get( "sort_by_distance",    _sortByDistance);
+    conf.get( "snap_to_pixel",       _snapToPixel );
+    conf.get( "max_objects",         _maxObjects );
+    conf.get( "render_order",        _renderBinNumber );
 }
 
 Config
 ScreenSpaceLayoutOptions::getConfig() const
 {
     Config conf;
-    conf.addIfSet( "min_animation_scale", _minAnimScale );
-    conf.addIfSet( "min_animation_alpha", _minAnimAlpha );
-    conf.addIfSet( "in_animation_time",   _inAnimTime );
-    conf.addIfSet( "out_animation_time",  _outAnimTime );
-    conf.addIfSet( "sort_by_priority",    _sortByPriority );
-    conf.addIfSet( "sort_by_distance",    _sortByDistance);
-    conf.addIfSet( "snap_to_pixel",       _snapToPixel );
-    conf.addIfSet( "max_objects",         _maxObjects );
-    conf.addIfSet( "render_order",        _renderBinNumber );
+    conf.set( "min_animation_scale", _minAnimScale );
+    conf.set( "min_animation_alpha", _minAnimAlpha );
+    conf.set( "in_animation_time",   _inAnimTime );
+    conf.set( "out_animation_time",  _outAnimTime );
+    conf.set( "sort_by_priority",    _sortByPriority );
+    conf.set( "sort_by_distance",    _sortByDistance);
+    conf.set( "snap_to_pixel",       _snapToPixel );
+    conf.set( "max_objects",         _maxObjects );
+    conf.set( "render_order",        _renderBinNumber );
     return conf;
 }
 
@@ -208,7 +207,7 @@
         _a = _n+1;
         _c = 15487457u; // a very large prime
     }
-    bool hasMore() const { 
+    bool hasMore() const {
         return _index < _n;
     }
     const typename T::value_type& next() {
@@ -244,7 +243,7 @@
 
     /**
      * Constructs the new sorter.
-     * @param f Custom declutter sorting predicate. Pass NULL to use the 
+     * @param f Custom declutter sorting predicate. Pass NULL to use the
      *          default sorter (sort by distance-to-camera).
      */
     DeclutterSort( ScreenSpaceLayoutContext* context, DeclutterSortFunctor* f = 0L )
@@ -260,7 +259,7 @@
         const ScreenSpaceLayoutOptions& options = _context->_options;
 
         osgUtil::RenderBin::RenderLeafList& leaves = bin->getRenderLeafList();
-        
+
         bin->copyLeavesFromStateGraphListToRenderLeafList();
 
         // first, sort the leaves:
@@ -284,20 +283,22 @@
 
         // bail out if this camera is a master camera with no GC
         // (e.g., in a multi-screen layout)
-        if (cam == NULL || cam->getGraphicsContext() == NULL)
+        if (cam == NULL || (cam->getGraphicsContext() == NULL && !cam->isRenderToTextureCamera()))
+        {
             return;
+        }
 
         PerCamInfo& local = _perCam.get( cam );
 
         osg::Timer_t now = osg::Timer::instance()->tick();
         if (local._firstFrame)
-        {            
+        {
             local._firstFrame = false;
             local._lastTimeStamp = now;
         }
 
         // calculate the elapsed time since the previous pass; we'll use this for
-        // the animations                
+        // the animations
         float elapsedSeconds = osg::Timer::instance()->delta_s(local._lastTimeStamp, now);
         local._lastTimeStamp = now;
 
@@ -352,22 +353,20 @@
 
         // Go through each leaf and test for visibility.
         // Enforce the "max objects" limit along the way.
-        for(osgUtil::RenderBin::RenderLeafList::iterator i = leaves.begin(); 
-            i != leaves.end() && local._passed.size() < limit; 
+        for(osgUtil::RenderBin::RenderLeafList::iterator i = leaves.begin();
+            i != leaves.end() && local._passed.size() < limit;
             ++i )
-        //LCGIterator<osgUtil::RenderBin::RenderLeafList> i(leaves);
-        //while (i.hasMore() && local._passed.size() < limit)
         {
             bool visible = true;
 
             osgUtil::RenderLeaf* leaf = *i;
             const osg::Drawable* drawable = leaf->getDrawable();
-            const osg::Node*     drawableParent = drawable->getParent(0);
+            const osg::Node*     drawableParent = drawable->getNumParents()? drawable->getParent(0) : 0L;
 
             const ScreenSpaceLayoutData* layoutData = dynamic_cast<const ScreenSpaceLayoutData*>(drawable->getUserData());
 
             // transform the bounding box of the drawable into window-space.
-            osg::BoundingBox box = Utils::getBoundingBox(drawable);
+            osg::BoundingBox box = drawable->getBoundingBox();
 
             osg::Vec3f offset;
             osg::Quat rot;
@@ -382,17 +381,17 @@
                 osg::Vec3d loc = layoutData->getAnchorPoint() * camVPW;
                 osg::Vec3d proj = layoutData->getProjPoint() * camVPW;
                 proj -= loc;
-                
+
                 float angle = atan2(proj.y(), proj.x());
 
-                if ( isText && (angle < - osg::PI / 2. || angle > osg::PI / 2.) )
+                if ( isText && (angle < -osg::PI_2 || angle > osg::PI_2) )
                 {
                     // avoid the label characters to be inverted:
                     // use a symetric translation and adapt the rotation to be in the desired angles
                     offset.set( -layoutData->_pixelOffset.x() - box.xMax() - box.xMin(),
                                 -layoutData->_pixelOffset.y() - box.yMax() - box.yMin(),
                                 0.f );
-                    angle -= osg::PI;
+                    angle += angle < -osg::PI_2? osg::PI : -osg::PI; // JD #1029
                 }
                 else
                 {
@@ -408,11 +407,11 @@
                     osg::Vec3f ru = rot * ( osg::Vec3f(box.xMax(), box.yMax(), 0.) );
                     osg::Vec3f rd = rot * ( osg::Vec3f(box.xMax(), box.yMin(), 0.) );
                     if ( angle > - osg::PI / 2. && angle < osg::PI / 2.)
-                        box.set( std::min(ld.x(), lu.x()), std::min(ld.y(), rd.y()), 0,
-                            std::max(rd.x(), ru.x()), std::max(lu.y(), ru.y()), 0 );
+                        box.set( osg::minimum(ld.x(), lu.x()), osg::minimum(ld.y(), rd.y()), 0,
+                            osg::maximum(rd.x(), ru.x()), osg::maximum(lu.y(), ru.y()), 0 );
                     else
-                        box.set( std::min(ld.x(), lu.x()), std::min(lu.y(), ru.y()), 0,
-                            std::max(ld.x(), lu.x()), std::max(ld.y(), rd.y()), 0 );
+                        box.set( osg::minimum(ld.x(), lu.x()), osg::minimum(lu.y(), ru.y()), 0,
+                            osg::maximum(ld.x(), lu.x()), osg::maximum(ld.y(), rd.y()), 0 );
                 }
 
                 offset = refCamScaleMat * offset;
@@ -428,20 +427,25 @@
             osg::Matrix MVP = (*leaf->_modelview.get()) * (*leaf->_projection.get());
             osg::Vec4d clip = s_zero_w * MVP;
             osg::Vec3d clip_ndc( clip.x()/clip.w(), clip.y()/clip.w(), clip.z()/clip.w() );
-            
+
             // if we are using a reference camera (like for picking), we do the decluttering in
-            // its viewport so that they match. 
+            // its viewport so that they match.
             osg::Vec3f winPos    = clip_ndc * windowMatrix;
             osg::Vec3f refWinPos = clip_ndc * refWindowMatrix;
 
+            // Expand the box if this object is currently not visible, so that it takes a little
+            // more room for it to before visible once again.
+            DrawableInfo& info = local._memory[drawable];
+            float buffer = info._visible ? 1.0f : 3.0f;
+
             // The "declutter" box is the box we use to reserve screen space.
             // This must be unquantized regardless of whether snapToPixel is set.
             box.set(
-                floor(refWinPos.x() + box.xMin()),
-                floor(refWinPos.y() + box.yMin()),
+                floor(refWinPos.x() + box.xMin())-buffer,
+                floor(refWinPos.y() + box.yMin())-buffer,
                 refWinPos.z(),
-                ceil(refWinPos.x() + box.xMax()),
-                ceil(refWinPos.y() + box.yMax()),
+                ceil(refWinPos.x() + box.xMax())+buffer,
+                ceil(refWinPos.y() + box.yMax())+buffer,
                 refWinPos.z() );
 
             // if snapping is enabled, only snap when the camera stops moving.
@@ -464,9 +468,9 @@
                 {
                     visible = true;
                 }
-                
+
                 // if this leaf is already in a culled group, skip it.
-                else if ( culledParents.find(drawableParent) != culledParents.end() )
+                else if ( drawableParent != 0L && culledParents.find(drawableParent) != culledParents.end() )
                 {
                     visible = false;
                 }
@@ -500,7 +504,9 @@
             {
                 // passed the test, so add the leaf's bbox to the "used" list, and add the leaf
                 // to the final draw list.
-                local._used.push_back( std::make_pair(drawableParent, box) );
+                if (drawableParent)
+                    local._used.push_back( std::make_pair(drawableParent, box) );
+
                 local._passed.push_back( leaf );
             }
 
@@ -508,7 +514,9 @@
             {
                 // culled, so put the parent in the parents list so that any future leaves
                 // with the same parent will be trivially rejected
-                culledParents.insert( drawable->getParent(0) );
+                if (drawableParent)
+                    culledParents.insert(drawableParent);
+
                 local._failed.push_back( leaf );
             }
 
@@ -527,8 +535,8 @@
                 newModelView.preMultScale( leaf->_modelview->getScale() * refCamScaleMat );
                 newModelView.preMultRotate( rot );
             }
-            
-            // Leaf modelview matrixes are shared (by objects in the traversal stack) so we 
+
+            // Leaf modelview matrixes are shared (by objects in the traversal stack) so we
             // cannot just replace it unfortunately. Have to make a new one. Perhaps a nice
             // allocation pool is in order here
             leaf->_modelview = new osg::RefMatrix( newModelView );
@@ -537,14 +545,15 @@
         // copy the final draw list back into the bin, rejecting any leaves whose parents
         // are in the cull list.
         if ( s_declutteringEnabledGlobally )
-        { 
+        {
             leaves.clear();
             for( osgUtil::RenderBin::RenderLeafList::const_iterator i=local._passed.begin(); i != local._passed.end(); ++i )
             {
                 osgUtil::RenderLeaf* leaf     = *i;
                 const osg::Drawable* drawable = leaf->getDrawable();
+                const osg::Node* drawableParent = drawable->getNumParents() > 0 ? drawable->getParent(0) : 0L;
 
-                if ( culledParents.find( drawable->getParent(0) ) == culledParents.end() )
+                if ( drawableParent == 0L || culledParents.find(drawableParent) == culledParents.end() )
                 {
                     DrawableInfo& info = local._memory[drawable];
 
@@ -554,19 +563,19 @@
                     if ( info._lastScale != 1.0f )
                     {
                         fullyIn = false;
-                        info._lastScale += elapsedSeconds / std::max(*options.inAnimationTime(), 0.001f);
+                        info._lastScale += elapsedSeconds / osg::maximum(*options.inAnimationTime(), 0.001f);
                         if ( info._lastScale > 1.0f )
                             info._lastScale = 1.0f;
                     }
 
                     if ( info._lastScale != 1.0f )
                         leaf->_modelview->preMult( osg::Matrix::scale(info._lastScale,info._lastScale,1) );
-                    
+
                     // fade in until at full alpha:
                     if ( info._lastAlpha != 1.0f )
                     {
                         fullyIn = false;
-                        info._lastAlpha += elapsedSeconds / std::max(*options.inAnimationTime(), 0.001f);
+                        info._lastAlpha += elapsedSeconds / osg::maximum(*options.inAnimationTime(), 0.001f);
                         if ( info._lastAlpha > 1.0f )
                             info._lastAlpha = 1.0f;
                     }
@@ -575,6 +584,7 @@
                     leaves.push_back( leaf );
 
                     info._frame++;
+                    info._visible = true;
                 }
                 else
                 {
@@ -600,7 +610,7 @@
                     if ( info._lastScale != *options.minAnimationScale() )
                     {
                         fullyOut = false;
-                        info._lastScale -= elapsedSeconds / std::max(*options.outAnimationTime(), 0.001f);
+                        info._lastScale -= elapsedSeconds / osg::maximum(*options.outAnimationTime(), 0.001f);
                         if ( info._lastScale < *options.minAnimationScale() )
                             info._lastScale = *options.minAnimationScale();
                     }
@@ -608,7 +618,7 @@
                     if ( info._lastAlpha != *options.minAnimationAlpha() )
                     {
                         fullyOut = false;
-                        info._lastAlpha -= elapsedSeconds / std::max(*options.outAnimationTime(), 0.001f);
+                        info._lastAlpha -= elapsedSeconds / osg::maximum(*options.outAnimationTime(), 0.001f);
                         if ( info._lastAlpha < *options.minAnimationAlpha() )
                             info._lastAlpha = *options.minAnimationAlpha();
                     }
@@ -635,6 +645,7 @@
                 }
 
                 info._frame++;
+                info._visible = false;
             }
         }
     }
@@ -666,7 +677,7 @@
         /**
          * Draws a bin. Most of this code is copied from osgUtil::RenderBin::drawImplementation.
          * The modifications are (a) skipping code to render child bins, (b) setting a bin-global
-         * projection matrix in orthographic space, and (c) calling our custom "renderLeaf()" method 
+         * projection matrix in orthographic space, and (c) calling our custom "renderLeaf()" method
          * instead of RenderLeaf::render()
          */
         void drawImplementation( osgUtil::RenderBin* bin, osg::RenderInfo& renderInfo, osgUtil::RenderLeaf*& previous )
@@ -765,9 +776,9 @@
 
             // if we are using osg::Program which requires OSG's generated uniforms to track
             // modelview and projection matrices then apply them now.
-            if (state.getUseModelViewAndProjectionUniforms()) 
+            if (state.getUseModelViewAndProjectionUniforms())
                 state.applyModelViewAndProjectionUniformsIfRequired();
-        
+
             // apply the fading uniform
             const osg::Program::PerContextProgram* pcp = state.getLastAppliedProgramObject();
             if ( pcp )
@@ -776,10 +787,10 @@
                 _fade->set( s_declutteringEnabledGlobally ? leaf->_depth : 1.0f );
                 pcp->apply( *_fade.get() );
             }
-    
+
             // draw the drawable
             leaf->_drawable->draw(renderInfo);
-        
+
             if (leaf->_dynamic)
             {
                 state.decrementDynamicObjectCount();
@@ -819,8 +830,8 @@
         : osgUtil::RenderBin(rhs, copy),
         _f(rhs._f.get()),
         _context(rhs._context.get())
-    {        
-        // Set up a VP to do fading. Do it here so it doesn't happen until the first time 
+    {
+        // Set up a VP to do fading. Do it here so it doesn't happen until the first time
         // we clone the render bin. This play nicely with static initialization.
         if (!_vpInstalled)
         {
@@ -828,13 +839,14 @@
             if (!_vpInstalled)
             {
                 VirtualProgram* vp = VirtualProgram::getOrCreate(getStateSet());
+                vp->setName("ScreenSpaceLayout");
                 vp->setFunction( "oe_declutter_apply_fade", s_faderFS, ShaderComp::LOCATION_FRAGMENT_COLORING, 0.5f );
                 _vpInstalled = true;
                 OE_INFO << LC << "Decluttering VP installed\n";
             }
         }
     }
-    
+
     virtual osg::Object* clone(const osg::CopyOp& copyop) const
     {
         return new osgEarthScreenSpaceLayoutRenderBin(*this, copyop);
@@ -874,9 +886,12 @@
             binNum,
             OSGEARTH_SCREEN_SPACE_LAYOUT_BIN,
             osg::StateSet::OVERRIDE_PROTECTED_RENDERBIN_DETAILS);
-
+        
         // Force a single shared layout bin per render stage
         stateSet->setNestRenderBins( false );
+
+        // Range opacity is not supported for screen-space rendering
+        stateSet->setDefine("OE_DISABLE_RANGE_OPACITY");
     }
 }
 
@@ -937,7 +952,7 @@
         {
             ScreenSpaceLayout::setSortFunctor(new SortByPriorityPreservingGeodeTraversalOrder());
         }
-        
+
         // communicate the new options on the shared context.
         bin->_context->_options = options;
     }
@@ -978,16 +993,20 @@
                                        public ScreenSpaceLayoutOptions
     {
     public:
-        META_osgEarth_Extension(ScreenSpaceLayoutExtension);
+        META_OE_Extension(osgEarth, ScreenSpaceLayoutExtension, screen_space_layout);
+
+        ScreenSpaceLayoutExtension() { }
 
         ScreenSpaceLayoutExtension(const ConfigOptions& co) : ScreenSpaceLayoutOptions(co)
         {
             // sets the global default options.
             ScreenSpaceLayout::setOptions(*this);
         }
+
+        const ConfigOptions& getConfigOptions() const { return *this; }
     };
 
     REGISTER_OSGEARTH_EXTENSION(osgearth_screen_space_layout, ScreenSpaceLayoutExtension);
     REGISTER_OSGEARTH_EXTENSION(osgearth_decluttering,        ScreenSpaceLayoutExtension);
 }
-                                       
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/sha1.hpp osgearth-2.10.2+dfsg/src/osgEarth/sha1.hpp
--- osgearth-2.9.0+dfsg/src/osgEarth/sha1.hpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/sha1.hpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,254 @@
+#include <stdint.h>
+#include <string.h>
+
+#define SHA1_HEX_SIZE (40 + 1)
+#define SHA1_BASE64_SIZE (28 + 1)
+
+class sha1 {
+private:
+
+    void add_byte_dont_count_bits(uint8_t x){
+        buf[i++] = x;
+
+        if (i >= sizeof(buf)){
+            i = 0;
+            process_block(buf);
+        }
+    }
+
+    static uint32_t rol32(uint32_t x, uint32_t n){
+        return (x << n) | (x >> (32 - n));
+    }
+
+    static uint32_t make_word(const uint8_t *p){
+        return
+            ((uint32_t)p[0] << 3*8) |
+            ((uint32_t)p[1] << 2*8) |
+            ((uint32_t)p[2] << 1*8) |
+            ((uint32_t)p[3] << 0*8);
+    }
+
+    void process_block(const uint8_t *ptr){
+        const uint32_t c0 = 0x5a827999;
+        const uint32_t c1 = 0x6ed9eba1;
+        const uint32_t c2 = 0x8f1bbcdc;
+        const uint32_t c3 = 0xca62c1d6;
+
+        uint32_t a = state[0];
+        uint32_t b = state[1];
+        uint32_t c = state[2];
+        uint32_t d = state[3];
+        uint32_t e = state[4];
+
+        uint32_t w[16];
+
+        for (int i = 0; i < 16; i++) w[i] = make_word(ptr + i*4);
+
+#define SHA1_LOAD(i) w[i&15] = rol32(w[(i+13)&15] ^ w[(i+8)&15] ^ w[(i+2)&15] ^ w[i&15], 1);
+#define SHA1_ROUND_0(v,u,x,y,z,i)              z += ((u & (x ^ y)) ^ y) + w[i&15] + c0 + rol32(v, 5); u = rol32(u, 30);
+#define SHA1_ROUND_1(v,u,x,y,z,i) SHA1_LOAD(i) z += ((u & (x ^ y)) ^ y) + w[i&15] + c0 + rol32(v, 5); u = rol32(u, 30);
+#define SHA1_ROUND_2(v,u,x,y,z,i) SHA1_LOAD(i) z += (u ^ x ^ y) + w[i&15] + c1 + rol32(v, 5); u = rol32(u, 30);
+#define SHA1_ROUND_3(v,u,x,y,z,i) SHA1_LOAD(i) z += (((u | x) & y) | (u & x)) + w[i&15] + c2 + rol32(v, 5); u = rol32(u, 30);
+#define SHA1_ROUND_4(v,u,x,y,z,i) SHA1_LOAD(i) z += (u ^ x ^ y) + w[i&15] + c3 + rol32(v, 5); u = rol32(u, 30);
+
+        SHA1_ROUND_0(a, b, c, d, e,  0);
+        SHA1_ROUND_0(e, a, b, c, d,  1);
+        SHA1_ROUND_0(d, e, a, b, c,  2);
+        SHA1_ROUND_0(c, d, e, a, b,  3);
+        SHA1_ROUND_0(b, c, d, e, a,  4);
+        SHA1_ROUND_0(a, b, c, d, e,  5);
+        SHA1_ROUND_0(e, a, b, c, d,  6);
+        SHA1_ROUND_0(d, e, a, b, c,  7);
+        SHA1_ROUND_0(c, d, e, a, b,  8);
+        SHA1_ROUND_0(b, c, d, e, a,  9);
+        SHA1_ROUND_0(a, b, c, d, e, 10);
+        SHA1_ROUND_0(e, a, b, c, d, 11);
+        SHA1_ROUND_0(d, e, a, b, c, 12);
+        SHA1_ROUND_0(c, d, e, a, b, 13);
+        SHA1_ROUND_0(b, c, d, e, a, 14);
+        SHA1_ROUND_0(a, b, c, d, e, 15);
+        SHA1_ROUND_1(e, a, b, c, d, 16);
+        SHA1_ROUND_1(d, e, a, b, c, 17);
+        SHA1_ROUND_1(c, d, e, a, b, 18);
+        SHA1_ROUND_1(b, c, d, e, a, 19);
+        SHA1_ROUND_2(a, b, c, d, e, 20);
+        SHA1_ROUND_2(e, a, b, c, d, 21);
+        SHA1_ROUND_2(d, e, a, b, c, 22);
+        SHA1_ROUND_2(c, d, e, a, b, 23);
+        SHA1_ROUND_2(b, c, d, e, a, 24);
+        SHA1_ROUND_2(a, b, c, d, e, 25);
+        SHA1_ROUND_2(e, a, b, c, d, 26);
+        SHA1_ROUND_2(d, e, a, b, c, 27);
+        SHA1_ROUND_2(c, d, e, a, b, 28);
+        SHA1_ROUND_2(b, c, d, e, a, 29);
+        SHA1_ROUND_2(a, b, c, d, e, 30);
+        SHA1_ROUND_2(e, a, b, c, d, 31);
+        SHA1_ROUND_2(d, e, a, b, c, 32);
+        SHA1_ROUND_2(c, d, e, a, b, 33);
+        SHA1_ROUND_2(b, c, d, e, a, 34);
+        SHA1_ROUND_2(a, b, c, d, e, 35);
+        SHA1_ROUND_2(e, a, b, c, d, 36);
+        SHA1_ROUND_2(d, e, a, b, c, 37);
+        SHA1_ROUND_2(c, d, e, a, b, 38);
+        SHA1_ROUND_2(b, c, d, e, a, 39);
+        SHA1_ROUND_3(a, b, c, d, e, 40);
+        SHA1_ROUND_3(e, a, b, c, d, 41);
+        SHA1_ROUND_3(d, e, a, b, c, 42);
+        SHA1_ROUND_3(c, d, e, a, b, 43);
+        SHA1_ROUND_3(b, c, d, e, a, 44);
+        SHA1_ROUND_3(a, b, c, d, e, 45);
+        SHA1_ROUND_3(e, a, b, c, d, 46);
+        SHA1_ROUND_3(d, e, a, b, c, 47);
+        SHA1_ROUND_3(c, d, e, a, b, 48);
+        SHA1_ROUND_3(b, c, d, e, a, 49);
+        SHA1_ROUND_3(a, b, c, d, e, 50);
+        SHA1_ROUND_3(e, a, b, c, d, 51);
+        SHA1_ROUND_3(d, e, a, b, c, 52);
+        SHA1_ROUND_3(c, d, e, a, b, 53);
+        SHA1_ROUND_3(b, c, d, e, a, 54);
+        SHA1_ROUND_3(a, b, c, d, e, 55);
+        SHA1_ROUND_3(e, a, b, c, d, 56);
+        SHA1_ROUND_3(d, e, a, b, c, 57);
+        SHA1_ROUND_3(c, d, e, a, b, 58);
+        SHA1_ROUND_3(b, c, d, e, a, 59);
+        SHA1_ROUND_4(a, b, c, d, e, 60);
+        SHA1_ROUND_4(e, a, b, c, d, 61);
+        SHA1_ROUND_4(d, e, a, b, c, 62);
+        SHA1_ROUND_4(c, d, e, a, b, 63);
+        SHA1_ROUND_4(b, c, d, e, a, 64);
+        SHA1_ROUND_4(a, b, c, d, e, 65);
+        SHA1_ROUND_4(e, a, b, c, d, 66);
+        SHA1_ROUND_4(d, e, a, b, c, 67);
+        SHA1_ROUND_4(c, d, e, a, b, 68);
+        SHA1_ROUND_4(b, c, d, e, a, 69);
+        SHA1_ROUND_4(a, b, c, d, e, 70);
+        SHA1_ROUND_4(e, a, b, c, d, 71);
+        SHA1_ROUND_4(d, e, a, b, c, 72);
+        SHA1_ROUND_4(c, d, e, a, b, 73);
+        SHA1_ROUND_4(b, c, d, e, a, 74);
+        SHA1_ROUND_4(a, b, c, d, e, 75);
+        SHA1_ROUND_4(e, a, b, c, d, 76);
+        SHA1_ROUND_4(d, e, a, b, c, 77);
+        SHA1_ROUND_4(c, d, e, a, b, 78);
+        SHA1_ROUND_4(b, c, d, e, a, 79);
+
+#undef SHA1_LOAD
+#undef SHA1_ROUND_0
+#undef SHA1_ROUND_1
+#undef SHA1_ROUND_2
+#undef SHA1_ROUND_3
+#undef SHA1_ROUND_4
+
+        state[0] += a;
+        state[1] += b;
+        state[2] += c;
+        state[3] += d;
+        state[4] += e;
+    }
+
+public:
+
+    uint32_t state[5];
+    uint8_t buf[64];
+    uint32_t i;
+    uint64_t n_bits;
+
+    sha1(const char *text = NULL): i(0), n_bits(0){
+        state[0] = 0x67452301;
+        state[1] = 0xEFCDAB89;
+        state[2] = 0x98BADCFE;
+        state[3] = 0x10325476;
+        state[4] = 0xC3D2E1F0;
+        add(text);
+    }
+
+    sha1& add(uint8_t x){
+        add_byte_dont_count_bits(x);
+        n_bits += 8;
+        return *this;
+    }
+
+    sha1& add(char c){
+        return add(*(uint8_t*)&c);
+    }
+
+    sha1& add(const void *data, uint32_t n){
+        if (!data) return *this;
+
+        const uint8_t *ptr = (const uint8_t*)data;
+
+        // fill up block if not full
+        for (; n && i % sizeof(buf); n--) add(*ptr++);
+
+        // process full blocks
+        for (; n >= sizeof(buf); n -= sizeof(buf)){
+            process_block(ptr);
+            ptr += sizeof(buf);
+            n_bits += sizeof(buf) * 8;
+        }
+
+        // process remaining part of block
+        for (; n; n--) add(*ptr++);
+
+        return *this;
+    }
+
+    sha1& add(const char *text){
+        return add(text, strlen(text));
+    }
+
+    sha1& finalize(){
+        // hashed text ends with 0x80, some padding 0x00 and the length in bits
+        add_byte_dont_count_bits(0x80);
+        while (i % 64 != 56) add_byte_dont_count_bits(0x00);
+        for (int j = 7; j >= 0; j--) add_byte_dont_count_bits(n_bits >> j * 8);
+
+        return *this;
+    }
+
+    const sha1& print_hex(
+        char *hex,
+        bool zero_terminate = true,
+        const char *alphabet = "0123456789abcdef"
+    ) const {
+        // print hex
+        int k = 0;
+        for (int i = 0; i < 5; i++){
+            for (int j = 7; j >= 0; j--){
+                hex[k++] = alphabet[(state[i] >> j * 4) & 0xf];
+            }
+        }
+        if (zero_terminate) hex[k] = '\0';
+        return *this;
+    }
+
+    const sha1& print_base64(char *base64, bool zero_terminate = true) const {
+        static const uint8_t *table = (const uint8_t*)
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            "abcdefghijklmnopqrstuvwxyz"
+            "0123456789"
+            "+/";
+
+        uint32_t triples[7] = {
+            ((state[0] & 0xffffff00) >> 1*8),
+            ((state[0] & 0x000000ff) << 2*8) | ((state[1] & 0xffff0000) >> 2*8),
+            ((state[1] & 0x0000ffff) << 1*8) | ((state[2] & 0xff000000) >> 3*8),
+            ((state[2] & 0x00ffffff) << 0*8),
+            ((state[3] & 0xffffff00) >> 1*8),
+            ((state[3] & 0x000000ff) << 2*8) | ((state[4] & 0xffff0000) >> 2*8),
+            ((state[4] & 0x0000ffff) << 1*8),
+        };
+
+        for (int i = 0; i < 7; i++){
+            uint32_t x = triples[i];
+            base64[i*4 + 0] = table[(x >> 3*6) % 64];
+            base64[i*4 + 1] = table[(x >> 2*6) % 64];
+            base64[i*4 + 2] = table[(x >> 1*6) % 64];
+            base64[i*4 + 3] = table[(x >> 0*6) % 64];
+        }
+
+        base64[SHA1_BASE64_SIZE - 2] = '=';
+        if (zero_terminate) base64[SHA1_BASE64_SIZE - 1] = '\0';
+        return *this;
+    }
+};
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ShaderFactory osgearth-2.10.2+dfsg/src/osgEarth/ShaderFactory
--- osgearth-2.9.0+dfsg/src/osgEarth/ShaderFactory	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ShaderFactory	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ShaderFactory.cpp osgearth-2.10.2+dfsg/src/osgEarth/ShaderFactory.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ShaderFactory.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ShaderFactory.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,16 +18,9 @@
  */
 #include <osgEarth/ShaderFactory>
 
-#include <osgEarth/ShaderUtils>
 #include <osgEarth/ShaderLoader>
 #include <osgEarth/Registry>
 #include <osgEarth/Capabilities>
-#include <osgEarth/VirtualProgram>
-#include <osg/Shader>
-#include <osg/Program>
-#include <osg/State>
-#include <osg/Notify>
-#include <sstream>
 
 #define LC "[ShaderFactory] "
 
@@ -44,26 +37,6 @@
 using namespace osgEarth::ShaderComp;
 
 
-namespace
-{
-    void insertRangeConditionals(const Function& f, std::ostream& buf)
-    {
-        if ( f._minRange.isSet() && !f._maxRange.isSet() )
-        {
-            buf << INDENT << "if (" << RANGE << " >= float(" << f._minRange.value() << "))\n" << INDENT;
-        }
-        else if ( !f._minRange.isSet() && f._maxRange.isSet() )
-        {
-            buf << INDENT << "if (" << RANGE << " <= float(" << f._maxRange.value() << "))\n" << INDENT;
-        }
-        else if ( f._minRange.isSet() && f._maxRange.isSet() )
-        {
-            buf << INDENT << "if (" << RANGE << " >= float(" << f._minRange.value() << ") && " << RANGE << " <= float(" << f._maxRange.value() << "))\n" << INDENT;
-        }
-    }
-}
-
-
 ShaderFactory::ShaderFactory()
 {
     _fragStageOrder = FRAGMENT_STAGE_ORDER_COLORING_LIGHTING;
@@ -344,7 +317,6 @@
         {
             for( OrderedFunctionMap::const_iterator i = modelStage->begin(); i != modelStage->end(); ++i )
             {
-                //insertRangeConditionals( i->second, buf );
                 buf << INDENT << i->second._name << "(vp_Vertex); \n";
             }
         }
@@ -421,13 +393,11 @@
 
 
     //.................................................................................
-    
-#if !defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
-
+  
+#if OSG_VERSION_LESS_THAN(3,5,8)
     // for all stages EXCEPT vertex, we will switch over to the OSG aliased
-    // matrix uniforms. Why except vertex? OSG [3.4] does something internally to
-    // convert these for hte VERTEX shader stage only... and if you try to 
-    // use them anyway, they won't work :(
+    // matrix uniforms. Why except vertex? OSG<3.5.8 only replaces these
+    // in the vertex shader and not other stages.
 
     gl_ModelViewMatrix           = "osg_ModelViewMatrix",
     gl_ProjectionMatrix          = "osg_ProjectionMatrix",
@@ -442,7 +412,6 @@
         "uniform mat3 osg_NormalMatrix;\n";
 #endif
 
-
     if ( hasTCS )
     {
         stages |= ShaderComp::STAGE_TESSCONTROL;
@@ -559,14 +528,7 @@
         for(std::set<std::string>::const_iterator i = types.begin(); i != types.end(); ++i)
         {
             buf << *i << " VP_Interpolate3(" << *i << "," << *i << "," << *i << ");\n";
-        }       
-
-        //buf <<
-        //    "\n// TES user-supplied interpolators: \n"
-        //    "float VP_Interpolate3(float,float,float); \n"
-        //    "vec2  VP_Interpolate3(vec2,vec2,vec2); \n"
-        //    "vec3  VP_Interpolate3(vec3,vec3,vec3); \n"
-        //    "vec4  VP_Interpolate3(vec4,vec4,vec4); \n";
+        }
 
 #if 0
         buf <<
@@ -742,7 +704,7 @@
 
         addExtensionsToBuffer(buf, in_extensions);
 
-        buf << glMatrixUniforms << "\n";
+        //buf << glMatrixUniforms << "\n";
 
         if ( hasVS || hasTCS || hasTES )
         {
@@ -1073,22 +1035,6 @@
     return new osg::Shader(osg::Shader::FRAGMENT, bufstr);
 }
 
-
-//osg::Uniform*
-//ShaderFactory::createUniformForGLMode(osg::StateAttribute::GLMode      mode,
-//                                      osg::StateAttribute::GLModeValue value) const
-//{
-//    osg::Uniform* u = 0L;
-//
-//    if ( mode == GL_LIGHTING )
-//    {
-//        u = new osg::Uniform(osg::Uniform::BOOL, "oe_mode_GL_LIGHTING");
-//        u->set( (value & osg::StateAttribute::ON) != 0 );
-//    }
-//
-//    return u;
-//}
-
 std::string
 ShaderFactory::getRangeUniformName() const
 {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ShaderGenerator osgearth-2.10.2+dfsg/src/osgEarth/ShaderGenerator
--- osgearth-2.9.0+dfsg/src/osgEarth/ShaderGenerator	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ShaderGenerator	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2011 Pelican Mapping
  * http://osgearth.org
  *
@@ -115,13 +115,7 @@
          */
         static bool ignore(const osg::Object* object);
 
-    public: // deprecated
-
-        /**
-         * Sets the name to give any VP's we create           
-         * @deprecated Now a NO-OP. Use run(graph, name, ...) instead.
-         */
-        void setProgramName(const std::string& name) const { }
+    public:
 
         /**
          * Whether to automatically duplicate (by cloning) subgraphs with
@@ -167,10 +161,7 @@
         virtual void apply( osg::PagedLOD& );
         virtual void apply( osg::ProxyNode& );
         virtual void apply( osg::ClipNode& );
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
         virtual void apply( osg::Drawable& );
-#endif
 
     public: // types not in osg::NodeVisitor
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ShaderGenerator.cpp osgearth-2.10.2+dfsg/src/osgEarth/ShaderGenerator.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ShaderGenerator.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ShaderGenerator.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,7 +1,7 @@
 
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,36 +22,30 @@
 #include <osgEarth/Capabilities>
 #include <osgEarth/ImageUtils>
 #include <osgEarth/Registry>
-#include <osgEarth/ShaderFactory>
-#include <osgEarth/StringUtils>
 #include <osgEarth/URI>
+#include <osgEarth/Shaders>
+#include <osgEarth/GLUtils>
 #include <osgEarth/Lighting>
-#include <osgEarth/VirtualProgram>
 
-#include <osg/Drawable>
-#include <osg/Geode>
 #include <osg/PagedLOD>
 #include <osg/ProxyNode>
 #include <osg/Texture1D>
-#include <osg/Texture2D>
 #include <osg/Texture3D>
 #include <osg/TextureRectangle>
-#include <osg/Texture2DMultisample>
 #include <osg/Texture2DArray>
-#include <osg/TextureBuffer>
 #include <osg/TextureCubeMap>
-#include <osg/TexEnv>
 #include <osg/TexGen>
 #include <osg/TexMat>
 #include <osg/ClipNode>
+#include <osg/Point>
 #include <osg/PointSprite>
-#include <osg/ValueObject>
 #include <osgDB/FileNameUtils>
 #include <osgDB/FileUtils>
-#include <osgDB/ReadFile>
 #include <osgText/Text>
 #include <osgSim/LightPointNode>
 
+#include <osg/ValueObject>
+
 #define LC "[ShaderGenerator] "
 
 #define SHADERGEN_PL_EXTENSION "osgearth_shadergen"
@@ -130,7 +124,7 @@
             std::string stripped = osgDB::getNameLessExtension(filename);
 
             OE_INFO << LC << "Loading " << stripped << " from PLOD/Proxy and generating shaders." << std::endl;
-        
+
             osgEarth::ReadResult result = URI(stripped).readNode(options);
             if ( result.succeeded() && result.getNode() != 0L )
             {
@@ -195,7 +189,7 @@
         unsigned             _unit;
     };
 }
-    
+
 //------------------------------------------------------------------------
 
 namespace
@@ -265,7 +259,7 @@
             {
                 const AttributeMap& attrMap = _textureAttributeMapList[unit];
                 for(AttributeMap::const_iterator i = attrMap.begin(); i != attrMap.end(); ++i)
-                {                    
+                {
                     const AttributeStack& as = i->second;
                     if (!as.attributeVec.empty())
                     {
@@ -294,13 +288,6 @@
 #if !defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
             // No modes in non-ffp
             return true;
-#endif
-
-#if OSG_VERSION_LESS_THAN(3,3,1)
-            return
-                dynamic_cast<osg::Texture2DArray*>(sa) ||
-                dynamic_cast<osg::Texture2DMultisample*>(sa) ||
-				dynamic_cast<osg::TextureBuffer*>(sa);
 #else
             return false;
 #endif
@@ -414,7 +401,7 @@
 
 void
 ShaderGenerator::run(osg::Node*         graph,
-                     const std::string& vpName, 
+                     const std::string& vpName,
                      StateSetCache*     cache)
 {
     if ( graph )
@@ -458,14 +445,14 @@
         {
             osg::Group* parent = node.getParent(i);
             osg::Node* replicant = osg::clone(
-                &node, 
+                &node,
                 osg::CopyOp::DEEP_COPY_NODES | osg::CopyOp::DEEP_COPY_DRAWABLES | osg::CopyOp::DEEP_COPY_ARRAYS);
             parent->replaceChild(&node, replicant);
         }
     }
 }
 
-void 
+void
 ShaderGenerator::apply(osg::Node& node)
 {
     if ( !_active )
@@ -500,7 +487,7 @@
     apply( static_cast<osg::Node&>(group) );
 }
 
-void 
+void
 ShaderGenerator::apply( osg::Geode& node )
 {
     if ( !_active )
@@ -508,7 +495,7 @@
 
     if ( ignore(&node) )
         return;
-    
+
     if ( _duplicateSharedSubgraphs )
         duplicateSharedNode(node);
 
@@ -524,7 +511,7 @@
 #ifdef PROMOTE_EQUIVALENT_DRAWABLE_VP_TO_GEODE
     // This block checks whether all the geode's drawables are equivalent,
     // i.e., they are the same type (geometry or text) and none of them
-    // have their own state sets. IF that's the case, we can create a 
+    // have their own state sets. IF that's the case, we can create a
     // single shader program for the entire geode. This is an optimization.
     if ( stateset.valid() )
     {
@@ -594,7 +581,7 @@
     apply( &node );
 }
 
-void 
+void
 ShaderGenerator::apply( osg::Drawable* drawable )
 {
     if ( drawable )
@@ -647,7 +634,7 @@
 {
     if ( !_active )
         return;
-    
+
     if ( ignore(&node) )
         return;
 
@@ -656,7 +643,7 @@
         static Threading::Mutex s_mutex;
         s_mutex.lock();
         const std::string& filename = node.getFileName( i );
-        if (!filename.empty() && 
+        if (!filename.empty() &&
             osgDB::getLowerCaseFileExtension(filename).compare(SHADERGEN_PL_EXTENSION) != 0 )
         {
             node.setFileName( i, Stringify() << filename << "." << SHADERGEN_PL_EXTENSION );
@@ -684,7 +671,7 @@
         for( unsigned i=0; i<node.getNumFileNames(); ++i )
         {
             const std::string& filename = node.getFileName( i );
-            if (!filename.empty() && 
+            if (!filename.empty() &&
                 osgDB::getLowerCaseFileExtension(filename).compare(SHADERGEN_PL_EXTENSION) != 0 )
             {
                 node.setFileName( i, Stringify() << filename << "." << SHADERGEN_PL_EXTENSION );
@@ -699,25 +686,7 @@
 void
 ShaderGenerator::apply(osg::ClipNode& node)
 {
-    static const char* s_clip_source =
-        "#version " GLSL_VERSION_STR "\n"
-        GLSL_PRECISION "\n"
-        "void oe_sg_set_clipvertex(inout vec4 vertexVIEW)\n"
-        "{\n"
-        "    gl_ClipVertex = vertexVIEW; \n"
-        "}\n";
-
-    if ( !_active )
-        return;
-
-    if ( ignore(&node) )
-        return;
-
-    osg::StateSet* stateSet = cloneOrCreateStateSet(&node);
-    VirtualProgram* vp = VirtualProgram::getOrCreate(stateSet);
-    if ( vp->referenceCount() == 1 ) vp->setName( _name );
-    vp->setFunction( "oe_sg_set_clipvertex", s_clip_source, ShaderComp::LOCATION_VERTEX_VIEW, 0.95f );
-
+    // no longer needed
     apply( static_cast<osg::Group&>(node) );
 }
 
@@ -736,7 +705,7 @@
     if ( node.getPointSprite() )
     {
         osg::ref_ptr<osg::StateSet> stateset;
-        
+
         // if the node has state, clone it so we can add our temp attribute.
         stateset = node.getStateSet() ?
             osg::clone(node.getStateSet(), osg::CopyOp::SHALLOW_COPY) :
@@ -755,7 +724,7 @@
             replacement->removeTextureAttribute(0, sprite.get());
             node.setStateSet(replacement.get() );
         }
-        
+
         disableUnsupportedAttributes(stateset.get());
         _state->popStateSet();
     }
@@ -771,24 +740,29 @@
     // Capture the active current state:
     osg::ref_ptr<osg::StateSet> current = static_cast<StateEx*>(_state.get())->capture();
 
+
+    // We ignore an existing program if the version is < 3.6.0 which is when the new osg text shaders with sdf were introduced.
+#if OSG_VERSION_LESS_THAN(3,6,0)
     // check for a real osg::Program. If it exists, bail out so that OSG
     // can use the program already in the graph
     osg::StateAttribute* program = current->getAttribute(osg::StateAttribute::PROGRAM);
     if ( dynamic_cast<osg::Program*>(program) != 0L )
         return false;
+#endif
 
     // New state set. We never modify existing statesets.
     replacement = ss ? osg::clone(ss, osg::CopyOp::SHALLOW_COPY) : new osg::StateSet();
 
     // new VP:
     osg::ref_ptr<VirtualProgram> vp = VirtualProgram::cloneOrCreate(replacement.get());
-    
+
     // give the VP a name if it needs one.
     if ( vp->getName().empty() )
     {
         vp->setName( _name );
     }
 
+#if OSG_VERSION_LESS_THAN(3,6,0)
     std::string vertSrc =
         "#version " GLSL_VERSION_STR "\n" GLSL_PRECISION "\n"
         "out " MEDIUMP "vec4 " TEX_COORD_TEXT ";\n"
@@ -810,19 +784,28 @@
     vp->setFunction( VERTEX_MODEL_FUNCTION, vertSrc, ShaderComp::LOCATION_VERTEX_MODEL, 0.5f );
     vp->setFunction( FRAGMENT_FUNCTION, fragSrc, ShaderComp::LOCATION_FRAGMENT_COLORING, 0.5f );
     replacement->getOrCreateUniform( SAMPLER_TEXT, osg::Uniform::SAMPLER_2D )->set( 0 );
+#else
+    Shaders shaders;
+    shaders.load(vp.get(), shaders.TextVertex);
+    shaders.load(vp.get(), shaders.TextFragment);
+    #if defined(OSG_GL3_AVAILABLE) && !defined(OSG_GL2_AVAILABLE) && !defined(OSG_GL1_AVAILABLE)
+        replacement->setDefine("OSGTEXT_GLYPH_ALPHA_FORMAT_IS_RED");
+    #endif
+
+#endif
 
     return replacement.valid();
 }
 
 
 bool
-ShaderGenerator::processGeometry(const osg::StateSet*         original, 
+ShaderGenerator::processGeometry(const osg::StateSet*         original,
                                  osg::ref_ptr<osg::StateSet>& replacement)
 {
     // do nothing if there's no GLSL support
     if ( !_active )
         return false;
-    
+
     // capture the active current state:
     osg::ref_ptr<osg::StateSet> current = static_cast<StateEx*>(_state.get())->capture();
 
@@ -847,7 +830,7 @@
     bool needNewStateSet = false;
     bool needVertexFunction = false;
     bool needFragmentFunction = false;
-    
+
     // give the VP a name if it needs one.
     if ( vp->getName().empty() )
     {
@@ -860,9 +843,9 @@
     {
         needNewStateSet = true;
         osg::StateAttribute::GLModeValue value = current->getMode(GL_LIGHTING);
-        newStateSet->setDefine(OE_LIGHTING_DEFINE, value);
+        GLUtils::setLighting(newStateSet.get(), value);
     }
-    
+
     // start generating the shader source.
     GenBuffers buf;
     buf._stateSet = newStateSet.get();
@@ -891,7 +874,7 @@
                 osg::TexEnv* texenv = dynamic_cast<osg::TexEnv*>(current->getTextureAttribute(unit, osg::StateAttribute::TEXENV));
                 osg::TexMat* texmat = dynamic_cast<osg::TexMat*>(current->getTextureAttribute(unit, osg::StateAttribute::TEXMAT));
                 osg::PointSprite* sprite = dynamic_cast<osg::PointSprite*>(current->getTextureAttribute(unit, osg::StateAttribute::POINTSPRITE));
-                
+
                 if ( apply(tex, texgen, texenv, texmat, sprite, unit, buf) == true )
                 {
                     needNewStateSet = true;
@@ -973,7 +956,7 @@
 
 
 bool
-ShaderGenerator::apply(osg::Texture*     tex, 
+ShaderGenerator::apply(osg::Texture*     tex,
                        osg::TexGen*      texgen,
                        osg::TexEnv*      texenv,
                        osg::TexMat*      texmat,
@@ -1126,7 +1109,7 @@
         case osg::TexGen::SPHERE_MAP:
             buf._viewHead
                 << "vec3 vp_Normal; // stage global\n";
-            buf._viewBody 
+            buf._viewBody
                 << INDENT "{\n" // scope it in case there are > 1
                 << INDENT "vec3 view_vec = normalize(vertex_view.xyz/vertex_view.w); \n"
                 << INDENT "vec3 r = reflect(view_vec, vp_Normal);\n"
@@ -1160,7 +1143,7 @@
             break;
         }
     }
-    
+
     if ( genDefault )
     {
         // GLSL only supports built-in "gl_MultiTexCoord{0..7}"
@@ -1176,7 +1159,7 @@
                 << "requires a custom vertex attribute (osg_MultiTexCoord" << unit << ")."
                 << std::endl;
 
-            buf._modelBody 
+            buf._modelBody
                 << INDENT << TEX_COORD << unit << " = osg_MultiTexCoord" << unit << ";\n";
         }
     }
@@ -1246,12 +1229,12 @@
 
 bool
 ShaderGenerator::apply(osg::Texture2DArray* tex, int unit, GenBuffers& buf)
-{    
-    buf._fragHead <<  "#extension GL_EXT_texture_array : enable \n";    
+{
+    buf._fragHead <<  "#extension GL_EXT_texture_array : enable \n";
 
     buf._fragHead << "uniform sampler2DArray " SAMPLER << unit << ";\n";
     buf._fragBody << INDENT "texel = texture(" SAMPLER << unit << ", " TEX_COORD << unit << ".xyz);\n";
-    buf._stateSet->getOrCreateUniform( Stringify() << SAMPLER << unit, osg::Uniform::SAMPLER_2D_ARRAY )->set( unit );         
+    buf._stateSet->getOrCreateUniform( Stringify() << SAMPLER << unit, osg::Uniform::SAMPLER_2D_ARRAY )->set( unit );
 
     return true;
 }
@@ -1262,7 +1245,7 @@
     std::string sampler = Stringify() << SAMPLER << unit;
     buf._fragHead << "uniform samplerCube " << sampler << ";\n";
     buf._fragBody << INDENT "texel = texture(" << sampler << ", " TEX_COORD << unit << ".xyz);\n";
-    buf._stateSet->getOrCreateUniform( sampler, osg::Uniform::SAMPLER_CUBE )->set( unit );         
+    buf._stateSet->getOrCreateUniform( sampler, osg::Uniform::SAMPLER_CUBE )->set( unit );
 
     return true;
 }
@@ -1300,8 +1283,20 @@
 bool
 ShaderGenerator::apply(osg::StateAttribute* attr, GenBuffers& buf)
 {
-    // NOP for now.
-    return false;
+    bool addedSomething = false;
+
+#if defined(OSG_GLES3_AVAILABLE)
+    osg::Point* asPoint = dynamic_cast<osg::Point*>(attr);
+    if(asPoint != NULL)
+    {
+        buf._viewHead << "uniform float oe_sg_pointSize;\n";
+        buf._viewBody << INDENT << "gl_PointSize = oe_sg_pointSize;\n";
+        buf._stateSet->getOrCreateUniform( "oe_sg_pointSize", osg::Uniform::FLOAT )->set( asPoint->getSize() );
+        addedSomething = true;
+    }
+#endif
+    
+    return addedSomething;
 }
 
 void
@@ -1309,13 +1304,4 @@
 {
     if (!stateset)
         return;
-
-#if 0
-#if !defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
-    stateset->removeAttribute(osg::StateAttribute::TEXENV);
-    stateset->removeAttribute(osg::StateAttribute::TEXENVFILTER);
-    stateset->removeAttribute(osg::StateAttribute::TEXGEN);
-    stateset->removeAttribute(osg::StateAttribute::LIGHTMODEL);
-#endif
-#endif
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ShaderLoader osgearth-2.10.2+dfsg/src/osgEarth/ShaderLoader
--- osgearth-2.9.0+dfsg/src/osgEarth/ShaderLoader	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ShaderLoader	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -167,8 +167,8 @@
             const std::string& multisource,
             std::vector<std::string>& out_sources);
     };
-
 } // namespace osgEarth
 
+
 #endif // OSGEARTH_SHADER_LOADER
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ShaderLoader.cpp osgearth-2.10.2+dfsg/src/osgEarth/ShaderLoader.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ShaderLoader.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ShaderLoader.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ShaderMerger osgearth-2.10.2+dfsg/src/osgEarth/ShaderMerger
--- osgearth-2.9.0+dfsg/src/osgEarth/ShaderMerger	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ShaderMerger	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,55 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_SHADER_MERGER_H
+#define OSGEARTH_SHADER_MERGER_H 1
+
+#include <osgEarth/GLSLChunker>
+#include <osg/Shader>
+
+namespace osg {
+    class Program;
+}
+
+namespace osgEarth
+{
+    /**
+     * Merges multiple shader objects into one (per type) and installs 
+     * them in a program. Some platforms (like GLES) only support one
+     * shader object, neccesiting this function.
+     */
+    class OSGEARTH_EXPORT ShaderMerger
+    {
+    public:
+        //! Adds a shader to the merge set
+        void add(const osg::Shader* shader);
+
+        //! Merges all shaders and installs them into the provided program.
+        void merge(osg::Program* program);
+
+    private:
+        std::vector<const osg::Shader*> _shaders;
+        std::set<osg::Shader::Type> _types;
+
+        //! Merge shaders of shaders's type into shader, and returns
+        //! the number of shaders merged.
+        unsigned merge(osg::Shader* shader);
+    };
+}
+
+#endif // OSGEARTH_SHADER_MERGER_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ShaderMerger.cpp osgearth-2.10.2+dfsg/src/osgEarth/ShaderMerger.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ShaderMerger.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ShaderMerger.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,178 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include <osgEarth/ShaderMerger>
+#include <osgEarth/GLSLChunker>
+#include <osgEarth/StringUtils>
+#include <osg/Program>
+#include <sstream>
+
+using namespace osgEarth;
+
+
+void
+ShaderMerger::add(const osg::Shader* shader)
+{
+    _shaders.push_back(shader);
+    _types.insert(shader->getType());
+}
+
+void
+ShaderMerger::merge(osg::Program* program)
+{
+    for(std::set<osg::Shader::Type>::const_iterator i = _types.begin(); i != _types.end(); ++i)
+    {
+        osg::ref_ptr<osg::Shader> shader = new osg::Shader(*i);
+        if (merge(shader.get()) > 0u)
+        {
+            program->addShader(shader.get());
+        }
+    }
+}
+
+unsigned
+ShaderMerger::merge(osg::Shader* output)
+{
+    std::set<std::string> unique;
+    GLSLChunker::Chunks version;
+    GLSLChunker::Chunks extensions;
+    GLSLChunker::Chunks directives; // relocated directives, like extensions and pragmas (but not if's)
+    GLSLChunker::Chunks statements; // relocated statements (ignoring if blocks)
+    GLSLChunker::Chunks body;       // main body, including functions and if blocks
+
+    unsigned count = 0u;
+
+    for(std::vector<const osg::Shader*>::const_iterator i = _shaders.begin();
+        i != _shaders.end();
+        ++i)
+    {
+        const osg::Shader* shader = *i;
+        if (shader->getType() == output->getType())
+        {
+            ++count;
+
+            GLSLChunker chunker;
+            GLSLChunker::Chunks chunks;
+            chunker.read(shader->getShaderSource(), chunks);
+
+            for(GLSLChunker::Chunks::const_iterator c = chunks.begin();
+                c != chunks.end();
+                ++c)
+            {
+                if (c->type == c->TYPE_DIRECTIVE && c->text.substr(0, 8) == "#version")
+                {
+                    if (version.empty())
+                        version.push_back(*c);
+                }
+                else if (c->type == c->TYPE_DIRECTIVE && c->text.substr(0, 10) == "#extension")
+                {
+                    std::string normalized = trimAndCompress(c->text);
+                    if (unique.find(normalized) == unique.end())
+                    {
+                        unique.insert(normalized);
+                        extensions.push_back(*c);
+                    }
+                }
+                else if (c->type == c->TYPE_DIRECTIVE && c->text.substr(0, 7) == "#pragma")
+                {
+                    if (c->tokens.size() >= 2 && c->tokens[1].substr(0,3) != "vp_")
+                    {
+                        std::string normalized = trimAndCompress(c->text);
+                        if (unique.find(normalized) == unique.end())
+                        {
+                            unique.insert(normalized);
+                            directives.push_back(*c);
+                        }
+                    }
+                }
+                else if (c->type == c->TYPE_STATEMENT)
+                {
+                    std::string normalized = trimAndCompress(c->text);
+                    if (unique.find(normalized) == unique.end())
+                    {
+                        unique.insert(normalized);
+                        statements.push_back(*c);
+                    }
+                }
+                else if (c->type == c->TYPE_COMMENT)
+                {
+                    //nop - discard it for now
+                }
+                else
+                {
+                    body.push_back(*c);
+                }
+            }
+        }
+    }
+
+    std::stringstream buf;
+
+    if (version.empty() == false)
+    {
+#if defined(OSG_GLES3_AVAILABLE)
+    // force version numbers for gles
+    #if __ANDROID__
+        buf << "#version 310 es" << std::endl;
+    #else
+        buf << "#version 300 es" << std::endl;
+    #endif
+#else
+        buf << version[0].text << std::endl;
+#endif
+    }
+    
+    // android requires the following extension is defined
+#if defined(OSG_GLES3_AVAILABLE)
+    #if __ANDROID__
+        buf << "#extension GL_EXT_shader_io_blocks : require" << std::endl;
+    #endif
+#endif
+
+    for(GLSLChunker::Chunks::const_iterator i = extensions.begin(); 
+        i != extensions.end();
+        ++i)
+    {
+        buf << i->text << std::endl;
+    }
+
+    for(GLSLChunker::Chunks::const_iterator i = directives.begin(); 
+        i != directives.end();
+        ++i)
+    {
+        buf << i->text << std::endl;
+    }
+
+    for(GLSLChunker::Chunks::const_iterator i = statements.begin(); 
+        i != statements.end();
+        ++i)
+    {
+        buf << i->text << std::endl;
+    }
+
+    for(GLSLChunker::Chunks::const_iterator i = body.begin(); 
+        i != body.end();
+        ++i)
+    {
+        buf << i->text << std::endl;
+    }
+
+    output->setShaderSource( buf.str() );
+
+    return count;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Shaders osgearth-2.10.2+dfsg/src/osgEarth/Shaders
--- osgearth-2.9.0+dfsg/src/osgEarth/Shaders	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Shaders	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -31,11 +31,16 @@
     public:
         Shaders();
 
+        std::string CascadeDraping;
+        std::string ClipPlane;
         std::string DepthOffsetVertex;
         std::string DrapingVertex, DrapingFragment;
         std::string GPUClampingVertex, GPUClampingFragment, GPUClampingVertexLib;
         std::string InstancingVertex;
+        std::string LineDrawable;
+        std::string PointDrawable;
         std::string PhongLightingVertex, PhongLightingFragment;
+        std::string TextVertex, TextFragment, TextLegacy;
 	};	
 
 } // namespace osgEarth
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Shaders.cpp.in osgearth-2.10.2+dfsg/src/osgEarth/Shaders.cpp.in
--- osgearth-2.9.0+dfsg/src/osgEarth/Shaders.cpp.in	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Shaders.cpp.in	2019-07-11 18:30:19.000000000 +0000
@@ -6,17 +6,25 @@
 {
     Shaders::Shaders()
     {
+        // Cascade Draping
+        CascadeDraping = "CascadeDraping.glsl";
+        _sources[CascadeDraping] = "@CascadeDraping.glsl@";
+
+        // Clip Plane
+        ClipPlane = "ClipPlane.glsl";
+        _sources[ClipPlane] = "@ClipPlane.glsl@";
+
         // Depth Offset
         DepthOffsetVertex = "DepthOffset.vert.glsl";
-       _sources[DepthOffsetVertex] = "@DepthOffset.vert.glsl@";
+        _sources[DepthOffsetVertex] = "@DepthOffset.vert.glsl@";
 
 
-       // Draping
-       DrapingVertex = "Draping.vert.glsl";
-       _sources[DrapingVertex] = "@Draping.vert.glsl@";
+        // Draping
+        DrapingVertex = "Draping.vert.glsl";
+        _sources[DrapingVertex] = "@Draping.vert.glsl@";
 
-       DrapingFragment = "Draping.frag.glsl";
-       _sources[DrapingFragment] = "@Draping.frag.glsl@";
+        DrapingFragment = "Draping.frag.glsl";
+        _sources[DrapingFragment] = "@Draping.frag.glsl@";
 
 
         // GPU Clamping
@@ -34,6 +42,13 @@
         InstancingVertex = "Instancing.vert.glsl";
         _sources[InstancingVertex] = "@Instancing.vert.glsl@";
 
+        // LineDrawable
+        LineDrawable = "LineDrawable.glsl";
+        _sources[LineDrawable] = "@LineDrawable.glsl@";    
+
+        // PointDrawable
+        PointDrawable = "PointDrawable.glsl";
+        _sources[PointDrawable] = "@PointDrawable.glsl@";          
 
         // PhongLightingEffect
         PhongLightingVertex = "PhongLighting.vert.glsl";
@@ -41,5 +56,15 @@
         
         PhongLightingFragment = "PhongLighting.frag.glsl";
         _sources[PhongLightingFragment] = "@PhongLighting.frag.glsl@";
+
+		// Text
+		TextVertex = "Text.vert.glsl";
+		_sources[TextVertex] = "@Text.vert.glsl@";
+
+		TextFragment = "Text.frag.glsl";
+		_sources[TextFragment] = "@Text.frag.glsl@";
+
+        TextLegacy = "Text_legacy.glsl";
+        _sources[TextLegacy] = "@Text_legacy.glsl@";
     }
 };
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ShaderUtils osgearth-2.10.2+dfsg/src/osgEarth/ShaderUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/ShaderUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ShaderUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@
     public:
         static void run(osg::Shader* shader);
 
-        static void applySupportForNoFFP(osg::Shader* shader);
+        //static void applySupportForNoFFP(osg::Shader* shader);
     };
 
     /**
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ShaderUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/ShaderUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ShaderUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ShaderUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,16 +18,10 @@
  */
 #include <osgEarth/ShaderUtils>
 #include <osgEarth/ShaderFactory>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/Registry>
 #include <osgEarth/Capabilities>
 #include <osgEarth/CullingUtils>
-#include <osgEarth/URI>
 #include <osgEarth/GLSLChunker>
-#include <osg/ComputeBoundsVisitor>
-#include <osg/LightSource>
-#include <osgDB/FileUtils>
-#include <list>
 
 using namespace osgEarth;
 
@@ -43,68 +37,6 @@
 
 
     typedef std::list<const osg::StateSet*> StateSetStack;
-
-#if 0
-
-    static osg::StateAttribute::GLModeValue 
-    getModeValue(const StateSetStack& statesetStack, osg::StateAttribute::GLMode mode)
-    {
-        osg::StateAttribute::GLModeValue base_val = osg::StateAttribute::ON;
-
-        for(StateSetStack::const_iterator itr = statesetStack.begin();
-            itr != statesetStack.end();
-            ++itr)
-        {
-            osg::StateAttribute::GLModeValue val = (*itr)->getMode(mode);
-
-            if ( (val & osg::StateAttribute::INHERIT) == 0 )
-            {
-
-                if ((val & osg::StateAttribute::PROTECTED)!=0 ||
-                    (base_val & osg::StateAttribute::OVERRIDE)==0)
-                {
-                    base_val = val;
-                }
-            }
-        }
-        return base_val;
-    }
-#endif
-    
-#if 0
-    static const osg::Light*
-    getLightByID(const StateSetStack& statesetStack, int id)
-    {
-        const osg::Light* base_light = NULL;
-        osg::StateAttribute::GLModeValue base_val = osg::StateAttribute::ON;
-        
-        for(StateSetStack::const_iterator itr = statesetStack.begin();
-            itr != statesetStack.end();
-            ++itr)
-        {
-            
-            osg::StateAttribute::GLModeValue val = (*itr)->getMode(GL_LIGHT0+id);
-
-            //if ( (val & osg::StateAttribute::INHERIT) == 0 )
-            {
-            //    if ((val & osg::StateAttribute::PROTECTED)!=0 ||
-            //        (base_val & osg::StateAttribute::OVERRIDE)==0)
-                {
-                    base_val = val;
-                    const osg::StateAttribute* lightAtt = (*itr)->getAttribute(osg::StateAttribute::LIGHT, id);
-                    if(lightAtt){
-                        const osg::Light* asLight = dynamic_cast<const osg::Light*>(lightAtt);
-                        if(val){
-                            base_light = asLight;
-                        }
-                    }
-                }
-            }
-            
-        }
-        return base_light;
-    }
-#endif
     
     static const osg::Material*
     getFrontMaterial(const StateSetStack& statesetStack)
@@ -296,6 +228,7 @@
     }
 }
 
+#if 0
 void
 ShaderPreProcessor::applySupportForNoFFP(osg::Shader* shader)
 {
@@ -316,6 +249,7 @@
 
 #endif // !defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
 }
+#endif
 
 void
 ShaderPreProcessor::run(osg::Shader* shader)
@@ -338,7 +272,11 @@
         GLSLChunker::Chunks chunks;
         chunker.read( source, chunks );
 
-        applySupportForNoFFPImpl(chunks);
+
+        if (shader->getType() != osg::Shader::FRAGMENT)
+        {
+            //applySupportForNoFFPImpl(chunks);
+        }
 
         // Replace varyings with directives that the ShaderFactory can interpret
         // when creating interface blocks.
@@ -604,6 +542,8 @@
         VirtualProgram* vp = VirtualProgram::getOrCreate(ss);
         if ( vp )
         {
+            vp->setName("Discard Alpha");
+
             std::string code = Stringify()
                 << "#version " << GLSL_VERSION_STR << "\n"
                 << GLSL_DEFAULT_PRECISION_FLOAT << "\n"
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Shadowing osgearth-2.10.2+dfsg/src/osgEarth/Shadowing
--- osgearth-2.9.0+dfsg/src/osgEarth/Shadowing	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Shadowing	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Shadowing.cpp osgearth-2.10.2+dfsg/src/osgEarth/Shadowing.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Shadowing.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Shadowing.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/Shadowing>
-#include <osg/ValueObject>
 
 #define LC "[Shadowing] "
 
@@ -30,7 +29,9 @@
 void
 Shadowing::setIsShadowCamera(osg::Camera* camera)
 {
-    camera->getOrCreateStateSet()->setDefine("OE_IS_SHADOW_CAMERA");
+    osg::StateSet* ss = camera->getOrCreateStateSet();
+    ss->setDefine("OE_IS_SHADOW_CAMERA");
+    ss->setDefine("OE_IS_DEPTH_CAMERA");
 }
 
 bool
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/SharedSARepo osgearth-2.10.2+dfsg/src/osgEarth/SharedSARepo
--- osgearth-2.9.0+dfsg/src/osgEarth/SharedSARepo	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/SharedSARepo	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
-* http://osgearth.org
-*
-* osgEarth is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-* IN THE SOFTWARE.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-#ifndef OSGEARTH_SHARED_SA_REPO_H
-#define OSGEARTH_SHARED_SA_REPO_H 1
-
-#include <osgEarth/Common>
-#include <osgEarth/ThreadingUtils>
-#include <osg/observer_ptr>
-#include <list>
-
-namespace osgEarth
-{
-    /**
-     * A thread-safe object sharing container for osg::StateAttribute instances
-     * (or anything else implementing the compare() method). The VirtualProgram
-     * uses this to share identical Program objects.
-     *
-     * Note. This object holds observers, so there is no need to deal with
-     * releaseGLObjects et al. since it can never be the final owner.
-     */
-    template<typename T>
-    struct SharedSARepo
-    {
-    private:
-        typedef std::list< osg::observer_ptr<T> > SAUniqueSet;
-        SAUniqueSet      _set;
-        Threading::Mutex _mx;
-        bool             _enabled;
-
-    public:
-        SharedSARepo() : _enabled(true) { }
-
-        ~SharedSARepo() 
-        {
-            clear();
-        }
-
-        void setEnabled(bool value)
-        {
-            _enabled = value;
-            if ( !_enabled )
-            {
-                clear();
-            }
-        }
-
-        bool isEnabled() const
-        {
-            return _enabled;
-        }
-
-        bool share(osg::ref_ptr<T>& out)
-        {
-            if ( !_enabled )
-                return false;
-
-            _mx.lock();
-
-            bool found = false;
-            for (typename SAUniqueSet::iterator i = _set.begin(); !found && i != _set.end(); )
-            {
-                osg::ref_ptr<T> temp;
-                if ( i->lock(temp) )
-                {
-                    if ( temp->compare( *out.get() ) == 0 )
-                    {
-                        out = temp.get();
-                        //OE_DEBUG << LC << "Shared a program; repo size = " << _set.size() << std::endl;
-                        found = true;
-                    }
-                    else
-                    {
-                        ++i;
-                    }
-                }
-                else 
-                {
-                    // found an orphaned observer; prune it
-                    typename SAUniqueSet::iterator j = i++;
-                    _set.erase( j );
-                    //OE_DEBUG << LC << "Pruned a program; repo size = " << _set.size() << std::endl;
-                }
-            }
-
-            if ( !found )
-            {
-                _set.push_back(out.get());
-                //OE_DEBUG << LC << "Added a program; repo size = " << _set.size() << std::endl;
-            }
-
-            _mx.unlock();
-            return found;
-        }
-
-        void clear()
-        {
-            _mx.lock();
-            _set.clear();
-            _mx.unlock();
-        }
-    };
-}
-
-#endif // OSGEARTH_SHARED_SA_REPO_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/SimplexNoise osgearth-2.10.2+dfsg/src/osgEarth/SimplexNoise
--- osgearth-2.9.0+dfsg/src/osgEarth/SimplexNoise	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/SimplexNoise	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/SimplexNoise.cpp osgearth-2.10.2+dfsg/src/osgEarth/SimplexNoise.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/SimplexNoise.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/SimplexNoise.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include <osgEarth/SimplexNoise>
 #include <osgEarth/ImageUtils>
-#include <osg/Image>
 #include <algorithm>
 
 #define POW2(x) ((double)(x==0 ? 1 : (2 << (x-1))))
@@ -163,7 +162,7 @@
 {
     const double TwoPI = 2.0 * osg::PI;
     double freq = _freq;
-    double o = std::max(1u, _octaves);
+    double o = osg::maximum(1u, _octaves);
     double amp = 1.0;
     double maxamp = 0.0;
     double n = 0.0;
@@ -196,7 +195,7 @@
 {
     const double TwoPI = 2.0 * osg::PI;
     double freq = _freq;
-    double o = std::max(1u, _octaves);
+    double o = osg::maximum(1u, _octaves);
     double amp = 1.0;
     double maxamp = 0.0;
     double n = 0.0;
@@ -231,7 +230,7 @@
 double SimplexNoise::getValue(double xin, double yin) const
 {
     double freq = _freq;
-    double o = std::max(1u, _octaves);
+    double o = osg::maximum(1u, _octaves);
     double amp = 1.0;
     double maxamp = 0.0;
     double n = 0.0;
@@ -254,7 +253,7 @@
 double SimplexNoise::getValue(double xin, double yin, double zin) const
 {
     double freq = _freq;
-    double o = std::max(1u, _octaves);
+    double o = osg::maximum(1u, _octaves);
     double amp = 1.0;
     double maxamp = 0.0;
     double n = 0.0;
@@ -278,7 +277,7 @@
 double SimplexNoise::getValue(double xin, double yin, double zin, double win) const
 {
     double freq = _freq;
-    double o = std::max(1u, _octaves);
+    double o = osg::maximum(1u, _octaves);
     double amp = 1.0;
     double maxamp = 0.0;
     double n = 0.0;
@@ -681,8 +680,8 @@
         {
             double v = (double)t / (double)dim;
             value.r() = noise.getTiledValue(u, v);
-            minN = std::min(minN, value.r());
-            maxN = std::max(maxN, value.r());
+            minN = osg::minimum(minN, value.r());
+            maxN = osg::maximum(maxN, value.r());
             write(value, s, t);
         }        
     }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/SpatialReference osgearth-2.10.2+dfsg/src/osgEarth/SpatialReference
--- osgearth-2.9.0+dfsg/src/osgEarth/SpatialReference	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/SpatialReference	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -120,8 +120,8 @@
 
         /**
          * Transforms a point from this SRS into "world" coordinates. This normalizes
-         * the Z coordinate (according to the vertical datum) and converts to ECEF
-         * if necessary.
+         * the Z coordinate (according to the vertical datum) and converts to geocentric
+         * coordinates if necessary.
          */
         bool transformToWorld(
             const osg::Vec3d& input,
@@ -135,7 +135,7 @@
          * @param out_local
          *      Output coords in local (SRS) coords
          * @param worldIsGeocentric
-         *      Whether the incoming world coordinates are ECEF/geocentric coords
+         *      Whether the incoming world coordinates are geocentric coords
          * @param out_geodeticZ
          *      (optional) Outputs the geodetic (HAE) Z if applicable
          */
@@ -194,8 +194,8 @@
         /** True if this is a projected SRS (i.e. local coordinate system) */
         virtual bool isProjected() const;
 
-        /** True if this is an ECEF system (geocentric/meters) */
-        virtual bool isECEF() const;
+        /** True if this is a planet-centered system (geocentric/meters) */
+        virtual bool isGeocentric() const;
 
         /** Tests whether this SRS represents a Mercator projection. */
         bool isMercator() const;
@@ -222,9 +222,6 @@
         /** Tests whether this SRS is a Local Tangent Plane projection (osgEarth-internal) */
         virtual bool isLTP() const { return _is_ltp; }
 
-        /** Whether this is a geographic plate carre SRS */
-        virtual bool isPlateCarre() const { return _is_plate_carre; }
-
         /** Gets the readable name of this SRS. */
         const std::string& getName() const;
 
@@ -269,7 +266,10 @@
             which Z is expressed as height above the geodetic ellipsoid). */
         const SpatialReference* getGeodeticSRS() const;
 
-        /** Gets the ECEF reference system associated with this SRS' ellipsoid. */
+        /** Gets the geocentric reference system associated with this SRS' ellipsoid. */
+        const SpatialReference* getGeocentricSRS() const;
+
+        //! @deprecated after 2.10 - call getGeocentricSRS() instead
         const SpatialReference* getECEF() const;
 
         /** Gets the vertical datum. If null, this SRS uses a default geodetic vertical datum */
@@ -294,11 +294,6 @@
             basic tmerc (transverse mercator) above. */
         const SpatialReference* createUTMFromLonLat( const Angle& lon, const Angle& lat ) const;
 
-        /** Creates a copy of this SRS, but flags the new SRS so that it will operate in
-            Plate Carre mode for the purposes of world coordinate conversion. The SRS is
-            otherwise mathematically equivalent to its vanilla counterpart. */
-        //const SpatialReference* createPlateCarreGeographicSRS() const;
-
         /** Create an equirectangular projected SRS corresponding to the geographic SRS
             contained in this spatial reference. This is an approximation of a Plate Carre
             SRS but using equatorial meters. */
@@ -316,13 +311,8 @@
          * @param xmin, ymin, xmax, ymax
          *      Extents of the tile for which to create a locator. These should
          *      be in degrees for a geographic/geocentric scene.
-         * @param plate_carre
-         *      Set this to true for the special case in which you are using a
-         *      geographic SRS with a PROJECTED map (like flat-earth lat/long).
-         */
-        virtual GeoLocator* createLocator(
-            double xmin, double ymin, double xmax, double ymax,
-            bool plate_carre =false ) const;
+         */
+        virtual GeoLocator* createLocator(double xmin, double ymin, double xmax, double ymax) const;
 
 		/**
 		 * Gets the underlying OGRLayerH that this SpatialReference owns.
@@ -356,8 +346,7 @@
         bool _is_contiguous;
         bool _is_user_defined;
         bool _is_ltp;
-        bool _is_plate_carre;
-        bool _is_ecef;
+        bool _is_geocentric;
         unsigned _ellipsoidId;
         std::string _name;
         Key _key;
@@ -369,7 +358,7 @@
         osg::ref_ptr<osg::EllipsoidModel> _ellipsoid;
         osg::ref_ptr<SpatialReference>    _geo_srs;
         osg::ref_ptr<SpatialReference>    _geodetic_srs;  // _geo_srs with a NULL vdatum.
-        osg::ref_ptr<SpatialReference>    _ecef_srs;
+        osg::ref_ptr<SpatialReference>    _geocentric_srs;
         osg::ref_ptr<VerticalDatum>       _vdatum;
 
         typedef std::map<std::string,void*> TransformHandleCache;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/SpatialReference.cpp osgearth-2.10.2+dfsg/src/osgEarth/SpatialReference.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/SpatialReference.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/SpatialReference.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -21,12 +21,8 @@
 #include <osgEarth/Registry>
 #include <osgEarth/Cube>
 #include <osgEarth/LocalTangentPlane>
-#include <osgEarth/ECEF>
-#include <osgEarth/ThreadingUtils>
-#include <osg/Notify>
-#include <ogr_api.h>
 #include <ogr_spatialref.h>
-#include <algorithm>
+#include <cpl_conv.h>
 
 #define LC "[SpatialReference] "
 
@@ -48,7 +44,7 @@
         return "";
     } 
 
-    void geodeticToECEF(std::vector<osg::Vec3d>& points, const osg::EllipsoidModel* em)
+    void geodeticToGeocentric(std::vector<osg::Vec3d>& points, const osg::EllipsoidModel* em)
     {
         for( unsigned i=0; i<points.size(); ++i )
         {
@@ -60,7 +56,7 @@
         }
     }
 
-    void ECEFtoGeodetic(std::vector<osg::Vec3d>& points, const osg::EllipsoidModel* em)
+    void geocentricToGeodetic(std::vector<osg::Vec3d>& points, const osg::EllipsoidModel* em)
     {
         for( unsigned i=0; i<points.size(); ++i )
         {
@@ -68,6 +64,13 @@
             em->convertXYZToLatLongHeight(
                 points[i].x(), points[i].y(), points[i].z(),
                 lat, lon, alt );
+
+            // deal with bug in OSG 3.4.x in which convertXYZToLatLongHeight can return
+            // NANs when converting from (0,0,0) with a spherical ellipsoid -gw 2/5/2019
+            if (osg::isNaN(lon)) lon = 0.0;
+            if (osg::isNaN(lat)) lat = 0.0;
+            if (osg::isNaN(alt)) alt = 0.0;
+
             points[i].set( osg::RadiansToDegrees(lon), osg::RadiansToDegrees(lat), alt );
         }
     }
@@ -214,13 +217,13 @@
     }
 
     // WGS84 Plate Carre:
-    else if (key.horizLower == "plate-carre")
+    else if (key.horizLower == "plate-carre" || key.horizLower == "plate-carree")
     {
+        // https://proj4.org/operations/projections/eqc.html
         srs = createFromPROJ4(
-            "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
-            "WGS84" );
+           "+proj=eqc +lat_ts=0 +lat_0=0 +lon_0=0 +x_0=0 +y_0=0 +units=m +ellps=WGS84 +datum=WGS84 +no_defs",
+           "WGS84" );
 
-        srs->_is_plate_carre = true;
         srs->_is_geographic  = false;
     }
 
@@ -362,7 +365,7 @@
 _owns_handle    ( true ),
 _init_type      ( init_type ),
 _is_geographic  ( false ),
-_is_ecef        ( false ),
+_is_geocentric  ( false ),
 _is_mercator    ( false ),
 _is_north_polar ( false ), 
 _is_south_polar ( false ),
@@ -370,7 +373,6 @@
 _is_contiguous  ( false ),
 _is_user_defined( false ),
 _is_ltp         ( false ),
-_is_plate_carre ( false ),
 _is_spherical_mercator( false ),
 _ellipsoidId(0u)
 {
@@ -383,8 +385,7 @@
 _handle        ( handle ),
 _owns_handle   ( ownsHandle ),
 _is_ltp        ( false ),
-_is_plate_carre( false ),
-_is_ecef       ( false )
+_is_geocentric ( false )
 {
     //nop
 }
@@ -437,15 +438,15 @@
 {
     if ( !_initialized )
         const_cast<SpatialReference*>(this)->init();
-    return !_is_geographic && !_is_ecef;
+    return !_is_geographic && !_is_geocentric;
 }
 
 bool
-SpatialReference::isECEF() const 
+SpatialReference::isGeocentric() const 
 {
     if ( !_initialized )
         const_cast<SpatialReference*>(this)->init();
-    return _is_ecef;
+    return _is_geocentric;
 }
 
 const std::string&
@@ -580,7 +581,7 @@
         return false;
     }
 
-    if (isECEF() && rhs->isECEF())
+    if (isGeocentric() && rhs->isGeocentric())
         return true;
 
     if ( considerVDatum && (_vdatum.get() != rhs->_vdatum.get()) )
@@ -622,7 +623,7 @@
         return this;
 
     if ( _is_spherical_mercator )
-        return create("wgs84");
+        return get("wgs84");
 
     if ( !_geo_srs.valid() )
     {
@@ -689,19 +690,26 @@
 const SpatialReference*
 SpatialReference::getECEF() const
 {
+    OE_DEPRECATED(SpatialReference::getECEF, getGeocentricSRS);
+    return getGeocentricSRS();
+}
+
+const SpatialReference*
+SpatialReference::getGeocentricSRS() const
+{
     if ( !_initialized )
         const_cast<SpatialReference*>(this)->init();
 
-    if ( _is_ecef )
+    if ( _is_geocentric )
         return this;
 
-    if ( !_ecef_srs.valid() )
+    if ( !_geocentric_srs.valid() )
     {
         const SpatialReference* geo = getGeographicSRS(); // before the lock please.
 
         GDAL_SCOPED_LOCK;
 
-        if ( !_ecef_srs.valid() ) // double-check pattern
+        if ( !_geocentric_srs.valid() ) // double-check pattern
         {
             void* new_handle = OSRNewSpatialReference( NULL );
             int err = OSRCopyGeogCSFrom( new_handle, geo->_handle );
@@ -709,9 +717,9 @@
             {
                 // make a new geographic srs, and copy over the vertical datum
                 SpatialReference* ncthis = const_cast<SpatialReference*>(this);
-                ncthis->_ecef_srs = new SpatialReference( new_handle );
-                ncthis->_ecef_srs->_vdatum = 0L; // no vertical datum in ECEF
-                ncthis->_ecef_srs->_is_ecef = true;
+                ncthis->_geocentric_srs = new SpatialReference( new_handle );
+                ncthis->_geocentric_srs->_vdatum = 0L; // no vertical datum in ECEF
+                ncthis->_geocentric_srs->_is_geocentric = true;
             }
             else
             {
@@ -721,7 +729,7 @@
         }
     }
 
-    return _ecef_srs.get();
+    return _geocentric_srs.get();
 }
 
 const SpatialReference*
@@ -884,8 +892,7 @@
 }
 
 GeoLocator*
-SpatialReference::createLocator(double xmin, double ymin, double xmax, double ymax,
-                                bool plate_carre ) const
+SpatialReference::createLocator(double xmin, double ymin, double xmax, double ymax ) const
 {
     if ( !_initialized )
         const_cast<SpatialReference*>(this)->init();
@@ -895,7 +902,7 @@
     locator->setCoordinateSystemType( isGeographic()? osgTerrain::Locator::GEOGRAPHIC : osgTerrain::Locator::PROJECTED );
     // note: not setting the format/cs on purpose.
 
-    if ( isGeographic() && !plate_carre )
+    if ( isGeographic() )
     {
         locator->setTransform( getTransformFromExtents(
             osg::DegreesToRadians( xmin ),
@@ -913,23 +920,22 @@
 bool
 SpatialReference::createLocalToWorld(const osg::Vec3d& xyz, osg::Matrixd& out_local2world ) const
 {
-    if ( (isProjected() || _is_plate_carre) && !isCube() )
+    if ( isProjected() && !isCube() )
     {
         osg::Vec3d world;
         if ( !transformToWorld( xyz, world ) )
             return false;
         out_local2world = osg::Matrix::translate(world);
     }
-    else if ( isECEF() )
+    else if ( isGeocentric() )
     {
-        //out_local2world = ECEF::createLocalToWorld(xyz);
         _ellipsoid->computeLocalToWorldTransformFromXYZ(xyz.x(), xyz.y(), xyz.z(), out_local2world);
     }
     else
     {
         // convert to ECEF:
         osg::Vec3d ecef;
-        if ( !transform(xyz, getECEF(), ecef) )
+        if ( !transform(xyz, getGeocentricSRS(), ecef) )
             return false;
 
         // and create the matrix.
@@ -989,18 +995,18 @@
     if ( !inputSRS )
         return false;
         
-    if ( inputSRS->isECEF() && !outputSRS->isECEF() )
+    if ( inputSRS->isGeocentric() && !outputSRS->isGeocentric() )
     {
         const SpatialReference* outputGeoSRS = outputSRS->getGeodeticSRS();
-        ECEFtoGeodetic(points, outputGeoSRS->getEllipsoid());
+        geocentricToGeodetic(points, outputGeoSRS->getEllipsoid());
         return outputGeoSRS->transform(points, outputSRS);
     }
 
-    else if ( !inputSRS->isECEF() && outputSRS->isECEF() )
+    else if ( !inputSRS->isGeocentric() && outputSRS->isGeocentric() )
     {
         const SpatialReference* outputGeoSRS = outputSRS->getGeodeticSRS();
         success = inputSRS->transform(points, outputGeoSRS);
-        geodeticToECEF(points, outputGeoSRS->getEllipsoid());
+        geodeticToGeocentric(points, outputGeoSRS->getEllipsoid());
         return success;
     }
 
@@ -1117,6 +1123,8 @@
         OE_WARN << LC << "INPUT: " << getWKT() << std::endl
             << "OUTPUT: " << out_srs->getWKT() << std::endl;
 
+        OE_WARN << LC << "ERROR:  " << CPLGetLastErrorMsg() << std::endl;
+
         return false;
     }
 
@@ -1191,12 +1199,11 @@
 SpatialReference::transformToWorld(const osg::Vec3d& input,
                                    osg::Vec3d&       output ) const
 {
-    if ( (isGeographic() && !isPlateCarre()) || isCube() ) //isGeographic() && !_is_plate_carre )
+    if ( isGeographic() || isCube() )
     {
-        return transform(input, getECEF(), output);
-        //return transformToECEF(input, output);
+        return transform(input, getGeocentricSRS(), output);
     }
-    else // isProjected || _is_plate_carre
+    else // isProjected
     {
         output = input;
         if ( _vdatum.valid() )
@@ -1216,10 +1223,9 @@
                                      osg::Vec3d&       output,
                                      double*           out_haeZ ) const
 {
-    if ( (isGeographic() && !isPlateCarre()) || isCube() )
+    if ( isGeographic() || isCube() )
     {
-        //return transformFromECEF(world, output, out_haeZ);
-        bool ok = getECEF()->transform(world, this, output);
+        bool ok = getGeocentricSRS()->transform(world, this, output);
         if ( ok && out_haeZ )
         {
             if ( _vdatum.valid() )
@@ -1229,7 +1235,7 @@
         }
         return ok;
     }
-    else // isProjected || _is_plate_carre
+    else // isProjected
     {
         output = world;
 
@@ -1261,7 +1267,7 @@
         double inputDegrees = getUnits().convertTo(Units::METERS, input) / (metersPerEquatorialDegree * cos(osg::DegreesToRadians(latitude)));
         return Units::DEGREES.convertTo( outSRS->getUnits(), inputDegrees );
     }
-    else if ( this->isECEF() && outSRS->isGeographic() )
+    else if ( this->isGeocentric() && outSRS->isGeographic() )
     {
         double metersPerEquatorialDegree = (outSRS->getEllipsoid()->getRadiusEquator() * 2.0 * osg::PI) / 360.0;
         double inputDegrees = input / (metersPerEquatorialDegree * cos(osg::DegreesToRadians(latitude)));
@@ -1273,7 +1279,7 @@
         double inputMeters = getUnits().convertTo(Units::DEGREES, input) * (metersPerEquatorialDegree * cos(osg::DegreesToRadians(latitude)));
         return Units::METERS.convertTo( outSRS->getUnits(), inputMeters );
     }
-    else if ( this->isGeographic() && outSRS->isECEF() )
+    else if ( this->isGeographic() && outSRS->isGeocentric() )
     {
         double metersPerEquatorialDegree = (outSRS->getEllipsoid()->getRadiusEquator() * 2.0 * osg::PI) / 360.0;
         return getUnits().convertTo(Units::DEGREES, input) * (metersPerEquatorialDegree * cos(osg::DegreesToRadians(latitude)));
@@ -1317,23 +1323,6 @@
     if ( !_initialized )
         const_cast<SpatialReference*>(this)->init();
 
-    //Original code that checks the 4 corners of the bounds and translates them
-#if 0
-    // Transform all points and take the maximum bounding rectangle the resulting points
-    std::vector<osg::Vec3d> v;
-    v.push_back( osg::Vec3d(in_out_xmin, in_out_ymin, 0) ); // ll
-    v.push_back( osg::Vec3d(in_out_xmin, in_out_ymax, 0) ); // ul
-    v.push_back( osg::Vec3d(in_out_xmax, in_out_ymax, 0) ); // ur
-    v.push_back( osg::Vec3d(in_out_xmax, in_out_ymin, 0) ); // lr
-    if ( transform(v, to_srs) )
-    {
-        in_out_xmin = std::min( v[0].x(), v[1].x() );
-        in_out_xmax = std::max( v[2].x(), v[3].x() );
-        in_out_ymin = std::min( v[0].y(), v[3].y() );
-        in_out_ymax = std::max( v[1].y(), v[2].y() );
-        return true;
-    }
-#else
     // Transform all points and take the maximum bounding rectangle the resulting points
     std::vector<osg::Vec3d> v;
 
@@ -1378,8 +1367,6 @@
         v.push_back( osg::Vec3d(in_out_xmin + dWidth * (double)i, in_out_ymin, 0) );
     }
     
-    
-    
     if ( transform(v, to_srs) )
     {
         bool swapXValues = ( isGeographic() && in_out_xmin > in_out_xmax );
@@ -1390,10 +1377,10 @@
 
         for (unsigned int i = 0; i < v.size(); i++)
         {
-            in_out_xmin = std::min( v[i].x(), in_out_xmin );
-            in_out_ymin = std::min( v[i].y(), in_out_ymin );
-            in_out_xmax = std::max( v[i].x(), in_out_xmax );
-            in_out_ymax = std::max( v[i].y(), in_out_ymax );
+            in_out_xmin = osg::minimum( v[i].x(), in_out_xmin );
+            in_out_ymin = osg::minimum( v[i].y(), in_out_ymin );
+            in_out_xmax = osg::maximum( v[i].x(), in_out_xmax );
+            in_out_ymax = osg::maximum( v[i].y(), in_out_ymax );
         }
 
         if ( swapXValues )
@@ -1402,9 +1389,6 @@
         return true;
     }
 
-   
-#endif
-
     return false;
 }
 
@@ -1430,8 +1414,6 @@
             const double dest_y = in_ymin + fr * dy;
 
             points.push_back(osg::Vec3d(dest_x, dest_y, 0));
-            //x[pixel] = dest_x;
-            //y[pixel] = dest_y;
             pixel++;     
         }
     }
@@ -1469,7 +1451,7 @@
     _is_user_defined = false; 
     _is_contiguous = true;
     _is_cube = false;
-    if ( _is_ecef || _is_plate_carre )
+    if ( _is_geocentric )
         _is_geographic = false;
     else
         _is_geographic = OSRIsGeographic( _handle ) != 0;
@@ -1541,7 +1523,7 @@
     if ( OSRExportToProj4( _handle, &proj4buf ) == OGRERR_NONE )
     {
         _proj4 = proj4buf;
-        OGRFree( proj4buf );
+        CPLFree( proj4buf );
     }
 
     // Try to extract the OGC well-known-text (WKT) string:
@@ -1549,7 +1531,7 @@
     if ( OSRExportToWkt( _handle, &wktbuf ) == OGRERR_NONE )
     {
         _wkt = wktbuf;
-        OGRFree( wktbuf );
+        CPLFree( wktbuf );
     }
 
     // Build a 'normalized' initialization key.
@@ -1579,13 +1561,13 @@
 {
     if (isGeographic())
     {
-        bounds.set(-180.0, -90.0, 0.0, 180.0, 90.0, 0.0);
+        bounds.set(-180.0, -90.0, 180.0, 90.0);
         return true;
     }
     
     if (isMercator() || isSphericalMercator())
     {
-        bounds.set(MERC_MINX, MERC_MINY, 0.0, MERC_MAXX, MERC_MAXY, 0.0);
+        bounds.set(MERC_MINX, MERC_MINY, MERC_MAXX, MERC_MAXY);
         return true;
     }
 
@@ -1595,9 +1577,9 @@
     if (OSRGetUTMZone(_handle, &isNorth))
     {
         if (isNorth)
-            bounds.set(166000, 0, 0, 834000, 9330000, 0);
+            bounds.set(166000, 0, 834000, 9330000);
         else
-            bounds.set(166000, 1116915, 0.0, 834000, 10000000, 0);
+            bounds.set(166000, 1116915, 834000, 10000000);
         return true;
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/StateSetCache osgearth-2.10.2+dfsg/src/osgEarth/StateSetCache
--- osgearth-2.9.0+dfsg/src/osgEarth/StateSetCache	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/StateSetCache	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -125,6 +125,8 @@
 
         void dumpStats();
 
+        void releaseGLObjects(osg::State* state) const;
+
     protected: 
 
         virtual ~StateSetCache();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/StateSetCache.cpp osgearth-2.10.2+dfsg/src/osgEarth/StateSetCache.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/StateSetCache.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/StateSetCache.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
  */
 #include <osgEarth/StateSetCache>
 #include <osg/NodeVisitor>
-#include <osg/Geode>
 #include <osg/BufferIndexBinding>
 
 #define LC "[StateSetCache] "
@@ -120,27 +119,6 @@
             traverse(node);
         }
 
-        void apply(osg::Geode& geode)
-        {
-            unsigned numDrawables = geode.getNumDrawables();
-            for( unsigned i=0; i<numDrawables; ++i )
-            {
-                osg::Drawable* d = geode.getDrawable(i);
-                if (d && d->getStateSet() )
-                {
-                    // ref for thread-safety; another thread might replace this stateset
-                    // during optimization while we're looking at it.
-                    osg::ref_ptr<osg::StateSet> stateset = d->getStateSet();
-                    if (stateset.valid() &&
-                        stateset->getDataVariance() != osg::Object::DYNAMIC)
-                    {
-                        applyStateSet( stateset.get() );
-                    }
-                }
-            }
-            apply((osg::Node&)geode);
-        }
-
         // assume: stateSet is safely referenced by caller
         void applyStateSet(osg::StateSet* stateSet)
         {
@@ -214,31 +192,6 @@
             }
             traverse(node);
         }
-
-        void apply(osg::Geode& geode)
-        {
-            unsigned numDrawables = geode.getNumDrawables();
-            for( unsigned i=0; i<numDrawables; ++i )
-            {
-                osg::Drawable* d = geode.getDrawable(i);
-                if ( d && d->getStateSet())
-                {
-                    osg::ref_ptr<osg::StateSet> stateset = d->getStateSet();
-                    if (stateset.valid() && isEligible(stateset.get()))
-                    {
-                        _stateSets++;
-                        osg::ref_ptr<osg::StateSet> shared;
-                        if ( _cache->share(stateset, shared) )
-                        {
-                            d->setStateSet( shared.get() );
-                            _shares++;
-                        }
-                        //else _misses.push_back(in.get());
-                    }
-                }
-            }
-            apply((osg::Node&)geode);
-        }
     };
 }
 
@@ -262,6 +215,17 @@
 }
 
 void
+StateSetCache::releaseGLObjects(osg::State* state) const
+{
+    Threading::ScopedMutexLock lock( _mutex );
+    for(StateSetSet::const_iterator i = _stateSetCache.begin(); i != _stateSetCache.end(); ++i)
+    {
+        i->get()->releaseGLObjects(state);
+    }
+    
+}
+
+void
 StateSetCache::setMaxSize(unsigned value)
 {
     _maxSize = value;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/StateSetLOD osgearth-2.10.2+dfsg/src/osgEarth/StateSetLOD
--- osgearth-2.9.0+dfsg/src/osgEarth/StateSetLOD	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/StateSetLOD	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
-* http://osgearth.org
-*
-* osgEarth is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-* IN THE SOFTWARE.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-#ifndef OSGEARTH_STATESET_LOD
-#define OSGEARTH_STATESET_LOD
-
-#include <osgEarth/Common>
-#include <osg/Group>
-#include <osg/StateSet>
-#include <vector>
-
-namespace osgEarth
-{
-    /**
-     * Apply statesets based on value ranges. 
-     *
-     * By default, this class works like osg::LOD and uses the camera's 
-     * distance to the bounding center as the value used to select active
-     * statesets. You can change the metric by calling setGetValueFunction().
-     *
-     * @deprecated
-     */
-    class OSGEARTH_EXPORT StateSetLOD : public osg::Group
-    {
-    public:
-        StateSetLOD() { }
-
-        /** Adds a stateset to be applied within a value range. */
-        void addStateSet(osg::StateSet* stateset, float min, float max);
-        
-        /** Number of LOD ranges */
-        unsigned getNumRanges() const { return (unsigned)_ranges.size(); }
-
-        /** Set the min and max value for a particular range */
-        void setRange(unsigned index, float min, float max);
-
-        /** Gets the minimum value for a range */
-        float getMinRange(unsigned index) const { return _ranges[index].first; }
-
-        /** Gets the maximum value for a range */
-        float getMaxRange(unsigned index) const { return _ranges[index].second; }
-
-        /** Gets the state set at a range */
-        osg::StateSet* getStateSet(unsigned index) const { return _stateSets[index].get(); }
-
-    public:
-        class GetValue : public osg::Referenced 
-        {
-        public:
-            virtual float operator()(osg::NodeVisitor& nv) = 0;
-        };
-
-        /**
-         * Sets a custom value generator. By default, the value will be the 
-         * distance from the camera to the subgraph's bounding center. But you
-         * can get a custom metric by calling this method.
-         */
-        void setGetValueFunction(GetValue* c) { _getValue = c; }
-
-    public: // osg::Group
-
-        virtual void traverse(osg::NodeVisitor& nv);
-
-    protected:
-        virtual ~StateSetLOD() { }
-        
-        typedef std::pair<float, float> MinMaxPair;
-        typedef std::vector<MinMaxPair> RangeList;
-        typedef std::vector<osg::ref_ptr<osg::StateSet> > RefStateSetVector;
-        typedef RefStateSetVector StateSetList;
-
-        RangeList    _ranges;
-        StateSetList _stateSets;
-        osg::ref_ptr<GetValue> _getValue;
-    };
-
-
-} // namespace osgEarth
-
-#endif //OSGEARTH_STATESET_LOD
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/StateSetLOD.cpp osgearth-2.10.2+dfsg/src/osgEarth/StateSetLOD.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/StateSetLOD.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/StateSetLOD.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
-* http://osgearth.org
-*
-* osgEarth is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-* IN THE SOFTWARE.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-#include <osgEarth/StateSetLOD>
-#include <osgEarth/CullingUtils>
-
-using namespace osgEarth;
-
-#undef  LC
-#define LC "[StateSetLOD] "
-
-void
-StateSetLOD::addStateSet(osg::StateSet* stateSet, float min, float max)
-{
-    if ( stateSet )
-    {
-        _ranges.push_back(std::make_pair(min, max));
-        _stateSets.push_back(stateSet);
-    }
-}
-
-void
-StateSetLOD::setRange(unsigned index, float min, float max)
-{
-    if ( index < (unsigned)_ranges.size() )
-    {
-        _ranges[index].first = min;
-        _ranges[index].second = max;
-    }
-}
-
-void
-StateSetLOD::traverse(osg::NodeVisitor& nv)
-{
-    if (nv.getVisitorType() == nv.CULL_VISITOR)
-    {
-        osgUtil::CullVisitor* cv = osgEarth::Culling::asCullVisitor(nv);
-        
-        float value;
-        if ( !_getValue.valid() )
-        {
-            osg::BoundingSphere::vec_type center = getBound().center();
-            value = nv.getDistanceToViewPoint( center, true );
-        }
-        else
-        {
-            value = (*_getValue.get())(nv);
-        }
-
-        unsigned count = 0;
-        for(unsigned i=0; i<(unsigned)_ranges.size(); ++i)
-        {
-            if (_ranges[i].first <= value && value < _ranges[i].second)
-            {
-                cv->pushStateSet(_stateSets[i].get());
-                ++count;
-            }
-        }
-
-        osg::Group::traverse(nv);
-
-        for(unsigned i=0; i<count; ++i)
-        {
-            cv->popStateSet();
-        }
-    }
-    else
-    {
-        osg::Group::traverse(nv);
-    }
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Status osgearth-2.10.2+dfsg/src/osgEarth/Status
--- osgearth-2.9.0+dfsg/src/osgEarth/Status	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Status	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Status.cpp osgearth-2.10.2+dfsg/src/osgEarth/Status.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Status.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Status.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/StringUtils osgearth-2.10.2+dfsg/src/osgEarth/StringUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/StringUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/StringUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@
 #include <locale>
 #include <iomanip>
 #include <map>
+#include <set>
 #include <ctype.h>
 
 namespace osgEarth
@@ -38,17 +39,18 @@
     extern OSGEARTH_EXPORT const std::string EMPTY_STRING;
 
     typedef std::vector<std::string> StringVector;
+    typedef std::set<std::string> StringSet;
 
     /** Replaces all the instances of "pattern" with "replacement" in "in_out" */
     extern OSGEARTH_EXPORT std::string& replaceIn(
-        std::string&       in_out, 
-        const std::string& pattern, 
+        std::string&       in_out,
+        const std::string& pattern,
         const std::string& replacement );
 
     /** Replaces all the instances of "pattern" with "replacement" in "in_out" (case-insensitive) */
     extern OSGEARTH_EXPORT std::string& ciReplaceIn(
-        std::string&       in_out, 
-        const std::string& pattern, 
+        std::string&       in_out,
+        const std::string& pattern,
         const std::string& replacement );
 
     /**
@@ -61,12 +63,16 @@
      */
     extern OSGEARTH_EXPORT void trim2( std::string& str );
 
+    //! Removes leading and trailing whitespace, and replaces all other
+    //! whitespace with single spaces
+    extern OSGEARTH_EXPORT std::string trimAndCompress(const std::string& in);
+
     /**
      * True is "ref" starts with "pattern"
      */
-    extern OSGEARTH_EXPORT bool startsWith( 
-        const std::string& ref, 
-        const std::string& pattern, 
+    extern OSGEARTH_EXPORT bool startsWith(
+        const std::string& ref,
+        const std::string& pattern,
         bool               caseSensitive =true,
         const std::locale& locale        =std::locale() );
 
@@ -74,8 +80,8 @@
      * True is "ref" ends with "pattern"
      */
     extern OSGEARTH_EXPORT bool endsWith(
-        const std::string& ref, 
-        const std::string& pattern, 
+        const std::string& ref,
+        const std::string& pattern,
         bool               caseSensitive =true,
         const std::locale& locale        =std::locale() );
 
@@ -118,8 +124,8 @@
     /** Makes an HTML color ("#rrggbb" or "#rrggbbaa") from an OSG color. */
     extern OSGEARTH_EXPORT std::string vec4fToHtmlColor( const osg::Vec4f& c );
 
-    /** Makes a valid filename, hopefully, out of a string (without touching slashes) */
-    extern OSGEARTH_EXPORT std::string toLegalFileName( const std::string& input );
+    /** Makes a valid filename out of a string */
+    extern OSGEARTH_EXPORT std::string toLegalFileName( const std::string& input, bool allowSubdir=false );
 
     /** Generates a hashed integer for a string (poor man's MD5) */
     extern OSGEARTH_EXPORT unsigned hashString( const std::string& input );
@@ -136,7 +142,7 @@
     * Gets a pretty printed version of the given size in MB.
     */
     extern OSGEARTH_EXPORT std::string prettyPrintSize( double mb );
-    
+
     //------------------------------------------------------------------------
     // conversion templates
 
@@ -201,7 +207,7 @@
 
     // snips a substring and parses it.
     template<typename T> inline bool
-    as(const std::string& in, unsigned start, unsigned len, T default_value) 
+    as(const std::string& in, unsigned start, unsigned len, T default_value)
     {
         std::string buf;
         std::copy( in.begin()+start, in.begin()+start+len, std::back_inserter(buf) );
@@ -236,7 +242,7 @@
 
     /**
      * Assembles and returns an inline string using a stream-like << operator.
-     * Example: 
+     * Example:
      *     std::string str = Stringify() << "Hello, world " << variable;
      */
     struct Stringify
@@ -273,7 +279,7 @@
         buf << val.r() << " " << val.g() << " " << val.b() << " " << val.a(); return (*this); }
 
     /**
-     * Splits a string up into a vector of strings based on a set of 
+     * Splits a string up into a vector of strings based on a set of
      * delimiters, quotes, and rules.
      */
     class OSGEARTH_EXPORT StringTokenizer
@@ -299,7 +305,7 @@
         void addQuote( char delim, bool keepInToken =false );
 
         void addQuotes( const std::string& delims, bool keepInTokens =false );
-        
+
     private:
         typedef std::map<char,bool> TokenMap;
         TokenMap _delims;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/StringUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/StringUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/StringUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/StringUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,8 +18,8 @@
  */
 
 #include <osgEarth/StringUtils>
-#include <osgDB/FileNameUtils>
 #include <cctype>
+
 #include <cstring>
 
 using namespace osgEarth;
@@ -149,22 +149,27 @@
 const std::string osgEarth::EMPTY_STRING;
 
 std::string
-osgEarth::toLegalFileName( const std::string& input )
+osgEarth::toLegalFileName(const std::string& input, bool allowSubdirs)
 {
-    //const std::string legal("ABCDEFGHIJKLMNOPQRSTUVQXYZabcdefghijklmnopqrstuvwxyz_./\\");
-    static const std::string illegal("*:<>|\"\'?&");
+    // See: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_282
+    // We omit '-' so we can use it for the HEX identifier.
+    static const std::string legalWithoutSubdirs("ABCDEFGHIJKLMNOPQRSTUVQXYZabcdefghijklmnopqrstuvwxyz0123456789_.");
+    static const std::string legalWithDirs      ("ABCDEFGHIJKLMNOPQRSTUVQXYZabcdefghijklmnopqrstuvwxyz0123456789_./");
 
+    
     std::size_t pos = input.find("://");
     pos = pos == std::string::npos ? 0 : pos+3;
 
+    const std::string& legal = allowSubdirs? legalWithDirs : legalWithoutSubdirs;
+
     std::stringstream buf;
     for( ; pos < input.size(); ++pos )
     {
         std::string::const_reference c = input[pos];
-        if ( ::isprint(c) && !::isspace(c) && illegal.find(c) == std::string::npos )
+        if (legal.find(c) != std::string::npos)
             buf << c;
         else
-            buf << "{" << std::hex << static_cast<unsigned>(c) << "}";
+            buf << "-" << std::hex << static_cast<unsigned>(c) << "-";
     }
 
     std::string result;
@@ -383,6 +388,33 @@
     return str;
 }
 
+std::string
+osgEarth::trimAndCompress(const std::string& in)
+{
+    bool inwhite = true;
+    std::stringstream buf;
+    for (unsigned i = 0; i < in.length(); ++i)
+    {
+        char c = in[i];
+        if (::isspace(c))
+        {
+            if (!inwhite)
+            {
+                buf << ' ';
+                inwhite = true;
+            }
+        }
+        else
+        {
+            inwhite = false;
+            buf << c;
+        }
+    }
+    std::string r;
+    r = buf.str();
+    trim2(r);
+    return r;
+}
 
 std::string
 osgEarth::joinStrings( const StringVector& input, char delim )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TaskService osgearth-2.10.2+dfsg/src/osgEarth/TaskService
--- osgearth-2.9.0+dfsg/src/osgEarth/TaskService	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TaskService	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TaskService.cpp osgearth-2.10.2+dfsg/src/osgEarth/TaskService.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TaskService.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TaskService.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/TaskService>
-#include <osg/Notify>
-#include <osg/Math>
 
 using namespace osgEarth;
 using namespace OpenThreads;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TDTiles osgearth-2.10.2+dfsg/src/osgEarth/TDTiles
--- osgearth-2.9.0+dfsg/src/osgEarth/TDTiles	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TDTiles	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,196 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef OSGEARTH_TDTILES_H
+#define OSGEARTH_TDTILES_H
+
+#include <osgEarth/Common>
+#include <osgEarth/Config>
+#include <osgEarth/URI>
+#include <osgEarth/JsonUtils>
+#include <osgEarth/GeoData>
+#include <osg/Group>
+#include <osg/LOD>
+#include <osg/PagedLOD>
+#include <osg/MatrixTransform>
+#include <osgDB/Options>
+
+using namespace osgEarth;
+
+/**
+ * 3D Tiles
+ * https://github.com/AnalyticalGraphicsInc/3d-tiles
+ * EXPERIMENTAL
+ */
+namespace osgEarth { namespace TDTiles
+{
+    enum RefinePolicy
+    {
+        REFINE_REPLACE,
+        REFINE_ADD
+    };
+
+    struct LoadContext
+    {
+        URIContext _uc;
+        RefinePolicy _defaultRefine;
+    };
+
+    class OSGEARTH_EXPORT Asset
+    {
+        OE_OPTION(std::string, version);
+        OE_OPTION(std::string, tilesetVersion);
+
+        Asset() { }
+        Asset(const Json::Value& value) { fromJSON(value); }
+        void fromJSON(const Json::Value&);
+        Json::Value getJSON() const;
+    };
+
+    class OSGEARTH_EXPORT BoundingVolume
+    {
+        OE_OPTION(osg::BoundingBox, box);
+        OE_OPTION(osg::BoundingBox, region);
+        OE_OPTION(osg::BoundingSphere, sphere);
+
+        BoundingVolume() { }
+        BoundingVolume(const Json::Value& value) { fromJSON(value); }
+        void fromJSON(const Json::Value&);
+        Json::Value getJSON() const;
+
+        osg::BoundingSphere asBoundingSphere() const;
+    };
+
+    class OSGEARTH_EXPORT TileContent
+    {
+        OE_OPTION(BoundingVolume, boundingVolume);
+        OE_OPTION(URI, uri);
+
+        TileContent() { }
+        TileContent(const Json::Value& value, LoadContext& uc) { fromJSON(value, uc); }
+        void fromJSON(const Json::Value&, LoadContext&);
+        Json::Value getJSON() const;
+    };
+
+    class OSGEARTH_EXPORT Tile : public osg::Referenced
+    {
+    public:
+        OE_OPTION(BoundingVolume, boundingVolume);
+        OE_OPTION(BoundingVolume, viewerRequestVolume);
+        OE_OPTION(double, geometricError);
+        OE_OPTION(RefinePolicy, refine);
+        OE_OPTION(osg::Matrix, transform);
+        OE_OPTION(TileContent, content);
+        OE_OPTION_VECTOR(osg::ref_ptr<Tile>, children);
+
+        Tile() : _refine(REFINE_ADD) { }
+        Tile(const Json::Value& value, LoadContext& uc) { fromJSON(value, uc); }
+        void fromJSON(const Json::Value&, LoadContext& uc);
+        Json::Value getJSON() const;
+    };
+
+    class OSGEARTH_EXPORT Tileset : public osg::Referenced
+    {
+    public:
+        OE_OPTION(Asset, asset);
+        OE_OPTION(BoundingVolume, boundingVolume);
+        //todo: properties
+        OE_OPTION(double, geometricError);
+        OE_OPTION_REFPTR(Tile, root);
+
+        Tileset() { }
+        Tileset(const Json::Value& value, LoadContext& uc) { fromJSON(value, uc); }
+        void fromJSON(const Json::Value&, LoadContext& uc);
+        Json::Value getJSON() const;
+
+        static Tileset* create(const std::string& tilesetJSON, const URIContext& uc);
+    };
+
+    //! Object that takes a Tile and generates a node.
+    //! This object is installed by default, but you can subclass it
+    //! and replace it if you want.
+    class OSGEARTH_EXPORT ContentHandler : public osg::Referenced
+    {
+    public:
+        ContentHandler();
+        virtual osg::ref_ptr<osg::Node> createNode(Tile* tile, const osgDB::Options*) const;
+    protected:
+        virtual ~ContentHandler() { }
+    };
+
+    class OSGEARTH_EXPORT TileNode : public osg::MatrixTransform
+    {
+    public:
+        META_Node(osgEarth, TileNode);
+
+        TileNode(Tile* tile, ContentHandler* factory, const osgDB::Options*);
+        osg::ref_ptr<TDTiles::Tile> _tile;
+        osg::ref_ptr<ContentHandler> _handler;
+        osg::ref_ptr<const osgDB::Options> _readOptions;
+        osg::ref_ptr<osg::Node> loadContent() const;
+        osg::ref_ptr<osg::Node> loadChild(unsigned i) const;
+        osg::ref_ptr<osg::Node> loadChildren() const;
+
+    protected:
+        TileNode() { }
+        TileNode(const TileNode& rhs, const osg::CopyOp& op) { }
+        virtual ~TileNode() { }
+    };
+} }
+
+namespace osgEarth
+{
+    class OSGEARTH_EXPORT TDTilesetGroup : public osg::Group
+    {
+    public:
+        META_Node(osgEarth, TDTilesetGroup);
+
+        TDTilesetGroup();
+
+        TDTilesetGroup(TDTiles::ContentHandler* handler);
+
+        //! Read options for this group and its children
+        void setReadOptions(const osgDB::Options*);
+        const osgDB::Options* getReadOptions() const;
+
+        //! Content handler for 3DTiles data.
+        TDTiles::ContentHandler* getContentHandler() const;
+
+        //! Assign tile set to this group
+        void setTileset(TDTiles::Tileset* tileset);
+
+        //! Sets the URL of the root tileset to load.
+        void setTilesetURL(const URI& location);
+        const URI& getTilesetURL() const;
+
+    public:
+        // internal
+        osg::ref_ptr<osg::Node> loadRoot(TDTiles::Tileset*) const;
+
+    protected:
+        TDTilesetGroup(const TDTilesetGroup& rhs, const osg::CopyOp& op) { }
+        virtual ~TDTilesetGroup() { }
+
+        osg::ref_ptr<TDTiles::ContentHandler> _handler;
+        osg::ref_ptr<const osgDB::Options> _readOptions;
+        URI _tilesetURI;
+    };
+}
+
+#endif // OSGEARTH_TDTILES_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TDTiles.cpp osgearth-2.10.2+dfsg/src/osgEarth/TDTiles.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TDTiles.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TDTiles.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,706 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include <osgEarth/TDTiles>
+#include <osgEarth/Async>
+#include <osgEarth/Utils>
+#include <osgEarth/Registry>
+#include <osgEarth/URI>
+#include <osgDB/FileNameUtils>
+
+using namespace osgEarth;
+
+#define LC "[3DTiles] "
+
+//........................................................................
+
+#define PSEUDOLOADER_TILE_CONTENT_EXT "osgearth_3dtiles_content"
+#define PSEUDOLOADER_TILE_CHILDREN_EXT "osgearth_3dtiles_children"
+#define PSEUDOLOADER_EXTERNAL_TILESET_EXT "osgearth_3dtiles_external_tileset"
+#define TAG_INVOKER "osgEarth::TDTiles::Invoker"
+
+namespace osgEarth { namespace TDTiles
+{
+    //! Operation that loads all of a tilenode's children.
+    struct LoadChildren : public AsyncFunction
+    {
+        osg::observer_ptr<TDTiles::TileNode> _tileNode;
+        LoadChildren(TDTiles::TileNode* tileNode) : _tileNode(tileNode) { }
+        virtual ReadResult operator()() const
+        {
+            OE_DEBUG << LC << "LoadChildren" << std::endl;
+            osg::ref_ptr<TDTiles::TileNode> tileNode;
+            if (_tileNode.lock(tileNode))
+            {
+                return tileNode->loadChildren();
+            }
+            else return ReadResult(ReadResult::RESULT_NOT_FOUND);
+        }
+    };
+
+    //! Operation that loads one child of a TileNode.
+    struct LoadChild : public AsyncFunction
+    {
+        osg::observer_ptr<TDTiles::TileNode> _tileNode;
+        unsigned _index;
+        LoadChild(TDTiles::TileNode* tileNode, unsigned index) 
+            : _tileNode(tileNode), _index(index) { }
+        virtual ReadResult operator()() const
+        {
+            OE_DEBUG << LC << "LoadChild" << std::endl;
+            osg::ref_ptr<TDTiles::TileNode> tileNode;
+            if (_tileNode.lock(tileNode))
+            {
+                return tileNode->loadChild(_index);
+            }
+            else return ReadResult(ReadResult::RESULT_NOT_FOUND);
+        }
+    };
+
+    //! Operation that loads the content of a TileNode (from a URI)
+    struct LoadTileContent : public AsyncFunction
+    {
+        osg::observer_ptr<TDTiles::TileNode> _tileNode;
+        LoadTileContent(TDTiles::TileNode* tileNode) : _tileNode(tileNode) { }
+        virtual ReadResult operator()() const
+        {
+            OE_DEBUG << LC << "LoadTileContent" << std::endl;
+            osg::ref_ptr<TDTiles::TileNode> tileNode;
+            if (_tileNode.lock(tileNode))
+            {
+                return tileNode->loadContent();
+            }
+            else return ReadResult(ReadResult::RESULT_NOT_FOUND);
+        }
+    };
+
+    //! Operation that loads an external tile set
+    struct LoadExternalTileset : public AsyncFunction
+    {
+        osg::observer_ptr<TDTilesetGroup> _group;
+        LoadExternalTileset(TDTilesetGroup* group) : _group(group) { }
+        virtual ReadResult operator()() const
+        {
+            OE_DEBUG << LC << "LoadExternalTileset" << std::endl;
+            osg::ref_ptr<TDTilesetGroup> group;
+            if (_group.lock(group))
+            {
+                const URI& uri = group->getTilesetURL();
+                OE_INFO << LC << "Loading external tileset " << uri.full() << std::endl;
+
+                ReadResult r = uri.readString(group->getReadOptions());
+                if (r.succeeded())
+                {
+                    TDTiles::Tileset* tileset = TDTiles::Tileset::create(r.getString(), uri.context());
+                    if (tileset)
+                    {
+                        return group->loadRoot(tileset);
+                    }
+                    else
+                    {
+                        return ReadResult("Invalid tileset JSON");
+                    }
+                }
+                return ReadResult("Failed to load external tileset");
+            }
+            else return ReadResult();
+        }
+    };
+}}
+
+//........................................................................
+
+void
+TDTiles::Asset::fromJSON(const Json::Value& value)
+{
+    if (value.isMember("version"))
+        version() = value.get("version", "").asString();
+    if (value.isMember("tilesetVersion"))
+        tilesetVersion() = value.get("tilesetVersion", "").asString();
+}
+
+Json::Value
+TDTiles::Asset::getJSON() const
+{
+    Json::Value value(Json::objectValue);
+    if (version().isSet())
+        value["version"] = version().get();
+    if (tilesetVersion().isSet())
+        value["tilesetVersion"] = tilesetVersion().get();
+    return value;
+}
+
+//........................................................................
+
+void
+TDTiles::BoundingVolume::fromJSON(const Json::Value& value)
+{
+    if (value.isMember("region"))
+    {
+        const Json::Value& a = value["region"];
+        if (a.isArray() && a.size() == 6)
+        {
+            Json::Value::const_iterator i = a.begin();
+            region()->xMin() = (*i++).asDouble();
+            region()->yMin() = (*i++).asDouble();
+            region()->xMax() = (*i++).asDouble();
+            region()->yMax() = (*i++).asDouble();
+            region()->zMin() = (*i++).asDouble();
+            region()->zMax() = (*i++).asDouble();
+        }
+        else OE_WARN << "Invalid region array" << std::endl;
+    }
+
+    if (value.isMember("sphere"))
+    {
+        const Json::Value& a = value["sphere"];
+        if (a.isArray() && a.size() == 4)
+        {
+            Json::Value::const_iterator i = a.begin();
+            sphere()->center().x() = (*i++).asDouble();
+            sphere()->center().y() = (*i++).asDouble();
+            sphere()->center().z() = (*i++).asDouble();
+            sphere()->radius()     = (*i++).asDouble();
+        }
+    }
+    if (value.isMember("box"))
+    {
+        const Json::Value& a = value["box"];
+        if (a.isArray() && a.size() == 12)
+        {
+            Json::Value::const_iterator i = a.begin();
+            osg::Vec3 center((*i++).asDouble(), (*i++).asDouble(), (*i++).asDouble());
+            osg::Vec3 xvec((*i++).asDouble(), (*i++).asDouble(), (*i++).asDouble());
+            osg::Vec3 yvec((*i++).asDouble(), (*i++).asDouble(), (*i++).asDouble());
+            osg::Vec3 zvec((*i++).asDouble(), (*i++).asDouble(), (*i++).asDouble());
+            box()->expandBy(center+xvec);
+            box()->expandBy(center-xvec);
+            box()->expandBy(center+yvec);
+            box()->expandBy(center-yvec);
+            box()->expandBy(center+zvec);
+            box()->expandBy(center-zvec);
+        }
+        else OE_WARN << "Invalid box array" << std::endl;
+    }
+}
+
+Json::Value
+TDTiles::BoundingVolume::getJSON() const
+{
+    Json::Value value(Json::objectValue);
+
+    if (region().isSet())
+    {
+        Json::Value a(Json::arrayValue);
+        a.append(region()->xMin());
+        a.append(region()->yMin());
+        a.append(region()->xMax());
+        a.append(region()->yMax());
+        a.append(region()->zMin());
+        a.append(region()->zMax());
+        value["region"] = a;
+    }
+    else if (sphere().isSet())
+    {
+        Json::Value a(Json::arrayValue);
+        a.append(sphere()->center().x());
+        a.append(sphere()->center().y());
+        a.append(sphere()->center().z());
+        a.append(sphere()->radius());
+        value["sphere"] = a;
+    }
+    else if (box().isSet())
+    {
+        OE_WARN << LC << "box not implemented" << std::endl;
+    }
+    return value;
+}
+
+osg::BoundingSphere
+TDTiles::BoundingVolume::asBoundingSphere() const
+{
+    const SpatialReference* epsg4979 = SpatialReference::get("epsg:4979");
+    if (!epsg4979)
+        return osg::BoundingSphere();
+
+    if (region().isSet())
+    {
+        GeoExtent extent(epsg4979,
+            osg::RadiansToDegrees(region()->xMin()),
+            osg::RadiansToDegrees(region()->yMin()),
+            osg::RadiansToDegrees(region()->xMax()),
+            osg::RadiansToDegrees(region()->yMax()));
+
+        osg::BoundingSphered bs = extent.createWorldBoundingSphere(region()->zMin(), region()->zMax());
+        return osg::BoundingSphere(bs.center(), bs.radius());
+    }
+
+    else if (sphere().isSet())
+    {
+        return sphere().get();
+    }
+
+    else if (box().isSet())
+    {
+        return osg::BoundingSphere(box()->center(), box()->radius());
+    }
+
+    return osg::BoundingSphere();
+}
+
+//........................................................................
+
+void
+TDTiles::TileContent::fromJSON(const Json::Value& value, LoadContext& lc)
+{
+    if (value.isMember("boundingVolume"))
+        boundingVolume() = BoundingVolume(value.get("boundingVolume", Json::nullValue));
+    if (value.isMember("uri"))
+        uri() = URI(value.get("uri", "").asString(), lc._uc);
+    if (value.isMember("url"))
+        uri() = URI(value.get("url", "").asString(), lc._uc);
+}
+
+Json::Value
+TDTiles::TileContent::getJSON() const
+{
+    Json::Value value(Json::objectValue);
+    if (boundingVolume().isSet())
+        value["boundingVolume"] = boundingVolume()->getJSON();
+    if (uri().isSet())
+        value["uri"] = uri()->base();
+    return value;
+}
+
+//........................................................................
+
+void
+TDTiles::Tile::fromJSON(const Json::Value& value, LoadContext& uc)
+{
+    if (value.isMember("boundingVolume"))
+        boundingVolume() = value["boundingVolume"];
+    if (value.isMember("viewerRequestVolume"))
+        viewerRequestVolume() = value["viewerRequestVolume"];
+    if (value.isMember("geometricError"))
+        geometricError() = value.get("geometricError", 0.0).asDouble();
+    if (value.isMember("content"))
+        content() = TileContent(value["content"], uc);
+
+    if (value.isMember("refine"))
+    {
+        refine() = osgEarth::ciEquals(value["refine"].asString(), "add") ? REFINE_ADD : REFINE_REPLACE;
+        uc._defaultRefine = refine().get();
+    }
+    else
+    {
+        refine() = uc._defaultRefine;
+    }
+
+    if (value.isMember("transform"))
+    {
+        const Json::Value& digits = value["transform"];
+        double c[16];
+        if (digits.isArray() && digits.size() == 16)
+        {
+            unsigned k=0;
+            for(Json::Value::const_iterator i = digits.begin(); i != digits.end(); ++i)
+                c[k++] = (*i).asDouble();
+            transform() = osg::Matrix(c);
+        }
+    }
+
+    if (value.isMember("children"))
+    {
+        const Json::Value& a = value["children"];
+        if (a.isArray())
+        {
+            for (Json::Value::const_iterator i = a.begin(); i != a.end(); ++i)
+            {
+                osg::ref_ptr<Tile> tile = new Tile(*i, uc);
+                children().push_back(tile.get());
+            }
+        }
+    }
+}
+
+Json::Value
+TDTiles::Tile::getJSON() const
+{
+    Json::Value value(Json::objectValue);
+
+    if (boundingVolume().isSet())
+        value["boundingVolume"] = boundingVolume()->getJSON();
+    if (viewerRequestVolume().isSet())
+        value["viewerRequestVolume"] = viewerRequestVolume()->getJSON();
+    if (geometricError().isSet())
+        value["geometricError"] = geometricError().get();
+    if (refine().isSet())
+        value["refine"] = (refine().get() == REFINE_ADD) ? "add" : "replace";
+    if (content().isSet())
+        value["content"] = content()->getJSON();
+
+
+    if (!children().empty())
+    {
+        Json::Value collection(Json::arrayValue);
+        for(unsigned i=0; i<children().size(); ++i)
+        {
+            Tile* child = children()[i].get();
+            if (child)
+            {
+                collection.append(child->getJSON());
+            }
+        }
+        value["children"] = collection;
+    }
+
+    return value;
+}
+
+//........................................................................
+
+void
+TDTiles::Tileset::fromJSON(const Json::Value& value, LoadContext& uc)
+{
+    if (value.isMember("asset"))
+        asset() = Asset(value.get("asset", Json::nullValue));
+    if (value.isMember("boundingVolume"))
+        boundingVolume() = BoundingVolume(value.get("boundingVolume", Json::nullValue));
+    if (value.isMember("geometricError"))
+        geometricError() = value.get("geometricError", 0.0).asDouble();
+    if (value.isMember("root"))
+        root() = new Tile(value["root"], uc);
+}
+
+Json::Value
+TDTiles::Tileset::getJSON() const
+{
+    Json::Value value(Json::objectValue);
+    if (asset().isSet())
+        value["asset"] = asset()->getJSON();
+    if (boundingVolume().isSet())
+        value["boundingVolume"] = boundingVolume()->getJSON();
+    if (geometricError().isSet())
+        value["geometricError"] = geometricError().get();
+    if (root().valid())
+        value["root"] = root()->getJSON();
+    return value;
+}
+
+TDTiles::Tileset*
+TDTiles::Tileset::create(const std::string& json, const URIContext& uc)
+{
+    Json::Reader reader;
+    Json::Value root(Json::objectValue);
+    if (!reader.parse(json, root, false))
+        return NULL;
+
+    LoadContext lc;
+    lc._uc = uc;
+    lc._defaultRefine = REFINE_REPLACE;
+
+    return new TDTiles::Tileset(root, lc);
+}
+
+//........................................................................
+
+TDTiles::TileNode::TileNode(TDTiles::Tile* tile, 
+                            TDTiles::ContentHandler* handler, 
+                            const osgDB::Options* readOptions) :
+    _tile(tile),
+    _handler(handler),
+    _readOptions(readOptions)
+{
+    // the transform to localize this tile:
+    if (tile->transform().isSet())
+    {
+        setMatrix(tile->transform().get());
+    }
+
+    // install a bounding volume:
+    osg::BoundingSphere bs;
+    if (tile->boundingVolume().isSet())
+    {
+        bs = tile->boundingVolume()->asBoundingSphere();
+
+        // if both a transform and a region are set, assume the radius is
+        // fine but the center point should be localized to the transform. -gw
+        // (just guessing)
+        if (tile->transform().isSet() && tile->boundingVolume()->region().isSet())
+        {
+            bs.center().set(0,0,0);
+        }
+    }
+    // tag this object as the invoker of the paging request:
+    osg::ref_ptr<osgDB::Options> newOptions = Registry::instance()->cloneOrCreateOptions(readOptions);
+    OptionsData<TDTiles::TileNode>::set(newOptions.get(), TAG_INVOKER, this);
+
+    // aka "maximum meters per pixel for which to use me"
+    float geometricError = tile->geometricError().getOrUse(FLT_MAX);
+
+    // actual content for this tile (optional)
+    osg::ref_ptr<osg::Node> contentNode = loadContent();
+
+    if (tile->refine() == REFINE_REPLACE)
+    {
+        //osg::ref_ptr<GeometricErrorPagedLOD> plod = new GeometricErrorPagedLOD(_handler.get());
+        osg::ref_ptr<AsyncLOD> lod = new AsyncLOD();
+        lod->setMode(AsyncLOD::MODE_GEOMETRIC_ERROR);
+        lod->setPolicy(AsyncLOD::POLICY_REPLACE);
+
+        if (bs.valid())
+        {
+            lod->setCenter(bs.center());
+            lod->setRadius(bs.radius());
+        }
+
+        if (contentNode.valid())
+        {
+            lod->setName(_tile->content()->uri()->base());
+            lod->addChild(contentNode, 0.0f, FLT_MAX);
+        }
+
+        if (tile->children().size() > 0)
+        {
+            // Async children as a group. All must load before replacing child 0.
+            // TODO: consider a way to load each child asyncrhonously but still
+            // block the refinement until all are loaded.
+            lod->addChild(new LoadChildren(this), 0.0f, geometricError);
+        }
+
+        addChild(lod);
+    }
+
+    else // tile->refine() == REFINE_ADD
+    {
+        if (contentNode.valid())
+        {
+            addChild(contentNode.get());
+        }
+
+        for (unsigned i = 0; i < _tile->children().size(); ++i)
+        {
+            // Each tile gets its own async load since they don't depend on each other
+            // nor do they depend on a parent loading first.
+            osg::ref_ptr<AsyncLOD> lod = new AsyncLOD();
+            lod->setMode(AsyncLOD::MODE_GEOMETRIC_ERROR);
+            lod->setPolicy(AsyncLOD::POLICY_ACCUMULATE);
+
+            TDTiles::Tile* childTile = _tile->children()[i].get();
+
+            if (childTile->boundingVolume().isSet())
+            {
+                osg::BoundingSphere bs = childTile->boundingVolume()->asBoundingSphere();
+                if (bs.valid())
+                {
+                    lod->setCenter(bs.center());
+                    lod->setRadius(bs.radius());
+                }
+            }
+
+            // backup plan if the child's BV isn't set - use parent BV
+            else if (bs.valid())
+            {
+                lod->setCenter(bs.center());
+                lod->setRadius(bs.radius());
+            }
+
+            // Load this child asynchronously:
+            lod->addChild(new LoadChild(this, i), 0.0, geometricError);
+
+            addChild(lod);
+        }
+    }
+}
+
+osg::ref_ptr<osg::Node>
+TDTiles::TileNode::loadChildren() const
+{
+    osg::ref_ptr<osg::Group> children = new osg::Group();
+
+    for (std::vector<osg::ref_ptr<TDTiles::Tile> >::iterator i = _tile->children().begin();
+        i != _tile->children().end();
+        ++i)
+    {
+        TDTiles::Tile* childTile = i->get();
+        if (childTile)
+        {
+            // create a new TileNode:
+            TileNode* child = new TileNode(childTile, _handler.get(), _readOptions.get());
+            children->addChild(child);
+        }
+    }
+
+    return children;
+}
+
+osg::ref_ptr<osg::Node>
+TDTiles::TileNode::loadContent() const
+{
+    osg::ref_ptr<osg::Node> result;
+
+    if (osgDB::getLowerCaseFileExtension(_tile->content()->uri()->base()) == "json")
+    {
+        // external tileset reference
+        TDTilesetGroup* group = new TDTilesetGroup();
+        group->setTilesetURL(_tile->content()->uri().get());
+        result = group;
+    }
+    else if (_handler.valid())
+    {
+        // Custom handler? invoke it now
+        result = _handler->createNode(_tile.get(), _readOptions.get());
+    }
+
+    return result;
+}
+
+osg::ref_ptr<osg::Node>
+TDTiles::TileNode::loadChild(unsigned i) const
+{
+    TDTiles::Tile* child = _tile->children()[i].get();
+    osg::ref_ptr<TDTiles::TileNode> node = new TDTiles::TileNode(
+        child, _handler.get(), _readOptions.get());
+    return node;
+}
+
+//........................................................................
+
+TDTiles::ContentHandler::ContentHandler()
+{
+    //nop
+}
+
+osg::ref_ptr<osg::Node>
+TDTiles::ContentHandler::createNode(TDTiles::Tile* tile, const osgDB::Options* readOptions) const
+{
+    osg::ref_ptr<osg::Node> result;
+
+    // default action: just try to load a node using OSG
+    if (tile->content().isSet() && 
+        tile->content()->uri().isSet() &&
+        !tile->content()->uri()->empty())
+    {
+        Registry::instance()->startActivity(tile->content()->uri()->base());
+
+        osgEarth::ReadResult rr = tile->content()->uri()->readNode(readOptions);
+        if (rr.succeeded())
+        {
+            result = rr.releaseNode();
+        }
+        else
+        {
+            OE_WARN << LC << "Read error: " << rr.errorDetail() << std::endl;
+        }
+        Registry::instance()->endActivity(tile->content()->uri()->base());
+    }
+    return result;
+}
+
+//........................................................................
+
+TDTilesetGroup::TDTilesetGroup()
+{
+    _handler = new TDTiles::ContentHandler();
+}
+
+TDTilesetGroup::TDTilesetGroup(TDTiles::ContentHandler* handler) :
+    _handler(handler)
+{
+    if (!_handler.valid())
+    {
+        _handler = new TDTiles::ContentHandler();
+    }
+}
+
+void
+TDTilesetGroup::setReadOptions(const osgDB::Options* value)
+{
+    _readOptions = value;
+}
+
+const osgDB::Options*
+TDTilesetGroup::getReadOptions() const
+{
+    return _readOptions.get();
+}
+
+TDTiles::ContentHandler*
+TDTilesetGroup::getContentHandler() const
+{
+    return _handler.get();
+}
+
+osg::ref_ptr<osg::Node>
+TDTilesetGroup::loadRoot(TDTiles::Tileset* tileset) const
+{
+    osg::ref_ptr<osg::Node> result;
+
+    // Set up the root tile.
+    if (tileset->root().valid())
+    {
+        float maxMetersPerPixel = tileset->geometricError().getOrUse(FLT_MAX);
+
+        // create the root tile node and defer loading of its content:
+        osg::Node* tileNode = new TDTiles::TileNode(tileset->root().get(), _handler.get(), _readOptions.get());
+
+        AsyncLOD* lod = new AsyncLOD();
+        lod->setMode(AsyncLOD::MODE_GEOMETRIC_ERROR);
+        lod->addChild(tileNode, 0.0, maxMetersPerPixel);
+
+        result = lod;
+    }
+
+    return result;
+}
+
+void
+TDTilesetGroup::setTileset(TDTiles::Tileset* tileset)
+{
+    // clear out the node in preparation for a new tileset
+    removeChildren(0, getNumChildren());
+
+    // create the root tile node and defer loading of its content:
+    osg::ref_ptr<osg::Node> tileNode = loadRoot(tileset);
+    if (tileNode.valid())
+    {
+        addChild(tileNode);
+    }
+}
+
+void
+TDTilesetGroup::setTilesetURL(const URI& location)
+{
+    _tilesetURI = location;
+
+    // reset:
+    removeChildren(0, getNumChildren());
+
+    AsyncLOD* lod = new AsyncLOD();
+    lod->setMode(AsyncLOD::MODE_GEOMETRIC_ERROR);
+    lod->setName(location.base());
+    lod->addChild(new TDTiles::LoadExternalTileset(this), 0.0, FLT_MAX);
+
+    addChild(lod);
+}
+
+const URI&
+TDTilesetGroup::getTilesetURL() const
+{
+    return _tilesetURI;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Terrain osgearth-2.10.2+dfsg/src/osgEarth/Terrain
--- osgearth-2.9.0+dfsg/src/osgEarth/Terrain	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Terrain	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -219,12 +219,12 @@
             float       my,
             osg::Vec3d& out_world ) const;
 
-        bool getWorldCoordsUnderMouse(
-            osg::View*  view,
-            float       mx,
-            float       my,
-            osg::Vec3d& out_world,
-            osg::ref_ptr<osg::Node>& out_node ) const;
+        //bool getWorldCoordsUnderMouse(
+        //    osg::View*  view,
+        //    float       mx,
+        //    float       my,
+        //    osg::Vec3d& out_world,
+        //    osg::ref_ptr<osg::Node>& out_node ) const;
 
     public:
         /**
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Terrain.cpp osgearth-2.10.2+dfsg/src/osgEarth/Terrain.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Terrain.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Terrain.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,9 +18,6 @@
  */
 
 #include <osgEarth/Terrain>
-#include <osgUtil/LineSegmentIntersector>
-#include <osgUtil/IntersectionVisitor>
-#include <osgUtil/LineSegmentIntersector>
 #include <osgViewer/View>
 
 #define LC "[Terrain] "
@@ -112,7 +109,7 @@
     }
 
     const osg::EllipsoidModel* em = getSRS()->getEllipsoid();
-    double r = std::min( em->getRadiusEquator(), em->getRadiusPolar() );
+    double r = osg::minimum( em->getRadiusEquator(), em->getRadiusPolar() );
 
     // calculate the endpoints for an intersection test:
     osg::Vec3d start(x, y, r);
@@ -120,7 +117,7 @@
 
     if ( getSRS()->isGeographic() )
     {
-        const SpatialReference* ecef = getSRS()->getECEF();
+        const SpatialReference* ecef = getSRS()->getGeocentricSRS();
         getSRS()->transform(start, ecef, start);
         getSRS()->transform(end,   ecef, end);
     }
@@ -169,34 +166,19 @@
     if ( !view2 || !_graph.valid() )
         return false;
 
-    osgUtil::LineSegmentIntersector::Intersections intersections;
-
-    osg::NodePath nodePath;
-    nodePath.push_back( _graph.get() );
-
-#if 0
-    // Old code, uses the computeIntersections method directly but sufferes from floating point precision problems.
-    if ( view2->computeIntersections( x, y, nodePath, intersections, traversalMask ) )
-    {
-        // find the first hit under the mouse:
-        osgUtil::LineSegmentIntersector::Intersection first = *(intersections.begin());
-        out_coords = first.getWorldIntersectPoint();
-        return true;
-    }
-    return false;    
-
-#else
-    // New code, uses the code from osg::View::computeIntersections but uses our osgUtil::LineSegmentIntersector instead to get around floating point precision issues.
     float local_x, local_y = 0.0;
     const osg::Camera* camera = view2->getCameraContainingPosition(x, y, local_x, local_y);
-    if (!camera) camera = view2->getCamera();
+    if (!camera)
+        camera = view2->getCamera();
 
+    // Build a matrix that transforms from the terrain/world space
+    // to either clip or window space, depending on whether we have
+    // a viewport. Is it even possible to not have a viewport? -gw
     osg::Matrixd matrix;
-    if (nodePath.size()>1)
-    {
-        osg::NodePath prunedNodePath(nodePath.begin(),nodePath.end()-1);
-        matrix = osg::computeLocalToWorld(prunedNodePath);
-    }
+
+    // compensate for any transforms applied between terrain and camera:
+    osg::Matrix terrainRefFrame = osg::computeLocalToWorld(_graph->getParentalNodePaths()[0]);
+    matrix.postMult(terrainRefFrame);
 
     matrix.postMult(camera->getViewMatrix());
     matrix.postMult(camera->getProjectionMatrix());
@@ -206,8 +188,7 @@
     if (camera->getViewport())
     {
         matrix.postMult(camera->getViewport()->computeWindowMatrix());
-        zNear = 0.0;
-        zFar = 1.0;
+        zNear = 0.0, zFar = 1.0;
     }
 
     osg::Matrixd inverse;
@@ -216,61 +197,24 @@
     osg::Vec3d startVertex = osg::Vec3d(local_x,local_y,zNear) * inverse;
     osg::Vec3d endVertex = osg::Vec3d(local_x,local_y,zFar) * inverse;
 
-    // Use a double precision line segment intersector
-    //osg::ref_ptr< osgUtil::LineSegmentIntersector > picker = new osgUtil::LineSegmentIntersector(osgUtil::Intersector::MODEL, startVertex, endVertex);
-    osg::ref_ptr< osgUtil::LineSegmentIntersector > picker = new osgUtil::LineSegmentIntersector(osgUtil::Intersector::MODEL, startVertex, endVertex);
+    osg::ref_ptr< osgUtil::LineSegmentIntersector > picker = 
+        new osgUtil::LineSegmentIntersector(osgUtil::Intersector::MODEL, startVertex, endVertex);
 
-    // Limit it to one intersection, we only care about the first
+    // Limit it to one intersection; we only care about the nearest.
     picker->setIntersectionLimit( osgUtil::Intersector::LIMIT_NEAREST );
 
     osgUtil::IntersectionVisitor iv(picker.get());
-    nodePath.back()->accept(iv);
+    _graph->accept(iv);
 
+    bool good = false;
     if (picker->containsIntersections())
     {        
-        intersections = picker->getIntersections();
-        // find the first hit under the mouse:
-        osgUtil::LineSegmentIntersector::Intersection first = *(intersections.begin());
-        out_coords = first.getWorldIntersectPoint();        
-        return true;       
-    }
-    return false;        
-#endif
-}
-
-
-bool
-Terrain::getWorldCoordsUnderMouse(osg::View* view,
-                                  float x, float y,
-                                  osg::Vec3d& out_coords,
-                                  osg::ref_ptr<osg::Node>& out_node ) const
-{
-    osgViewer::View* view2 = dynamic_cast<osgViewer::View*>(view);
-    if ( !view2 || !_graph.valid() )
-        return false;
-
-    osgUtil::LineSegmentIntersector::Intersections results;
-
-    osg::NodePath path;
-    path.push_back( _graph.get() );
-
-    if ( view2->computeIntersections( x, y, path, results ) )
-    {
-        // find the first hit under the mouse:
-        osgUtil::LineSegmentIntersector::Intersection first = *(results.begin());
-        out_coords = first.getWorldIntersectPoint();
-        for( osg::NodePath::reverse_iterator j = first.nodePath.rbegin(); j != first.nodePath.rend(); ++j ) {
-            if ( !(*j)->getName().empty() ) {
-                out_node = (*j);
-                break;
-            }
-        }
-        return true;
+        out_coords = picker->getIntersections().begin()->getWorldIntersectPoint();
+        good = true;       
     }
-    return false;
+    return good;
 }
 
-
 void
 Terrain::addTerrainCallback( TerrainCallback* cb )
 {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainEffect osgearth-2.10.2+dfsg/src/osgEarth/TerrainEffect
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainEffect	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainEffect	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainEngineNode osgearth-2.10.2+dfsg/src/osgEarth/TerrainEngineNode
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainEngineNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainEngineNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 #define OSGEARTH_TERRAIN_ENGINE_NODE_H 1
 
 #include <osgEarth/Map>
-#include <osgEarth/MapFrame>
 #include <osgEarth/Terrain>
 #include <osgEarth/TerrainEffect>
 #include <osgEarth/TerrainTileModelFactory>
@@ -29,9 +28,11 @@
 #include <osgEarth/TerrainResources>
 #include <osgEarth/ShaderUtils>
 #include <osgEarth/Progress>
+#include <osgEarth/TileKey>
 #include <osg/CoordinateSystemNode>
 #include <osg/Geode>
 #include <osg/NodeCallback>
+#include <osg/BoundingBox>
 #include <osgUtil/RenderBin>
 #include <set>
 
@@ -82,7 +83,7 @@
          * @param progress Optional progress/stats tracking callback
          */
         virtual TerrainTileModel* createTileModel(
-            const MapFrame&              frame,
+            const Map*                   map,
             const TileKey&               key,
             const CreateTileModelFilter& filter,
             ProgressCallback*            progress ) =0;
@@ -179,12 +180,20 @@
         // Request that the terrain tiles be rebuilt.
         virtual void dirtyTerrain();
 
+    public:
+        class OSGEARTH_EXPORT ModifyTileBoundingBoxCallback : public osg::Referenced
+        {
+        public:
+            virtual void modifyBoundingBox(const TileKey& key, osg::BoundingBox& box) const =0;
+        };
 
+        void addModifyTileBoundingBoxCallback(ModifyTileBoundingBoxCallback* callback);
+        void removeModifyTileBoundingBoxCallback(ModifyTileBoundingBoxCallback* callback);
 
     public: // TerrainEngine
 
         TerrainTileModel* createTileModel(
-            const MapFrame&              frame,
+            const Map*                   map,
             const TileKey&               key,
             const CreateTileModelFilter& filter,
             ProgressCallback*            progress);
@@ -250,6 +259,8 @@
         bool _requireParentTextures;
         bool _requireElevationBorder;
         bool _requireFullDataAtFirstLOD;
+        
+        osg::ref_ptr<const Map> _map;
 
         // called by addTileNodeCallback to notify any already-existing nodes
         // of the new callback.
@@ -302,17 +313,15 @@
         
         struct ImageLayerController : public ImageLayerCallback
         {
-            ImageLayerController( const Map* map, TerrainEngineNode* engine );
+            ImageLayerController( TerrainEngineNode* engine );
             void onColorFiltersChanged( ImageLayer* layer ); 
 
         private:
-            MapFrame           _mapf;
             TerrainEngineNode* _engine;
             friend class TerrainEngineNode;
         };
 
         osg::ref_ptr<ImageLayerController> _imageLayerController;
-        osg::ref_ptr<const Map>            _map;
         bool                               _redrawRequired;
         float                              _verticalScale;
         osg::ref_ptr<Terrain>              _terrainInterface;
@@ -336,11 +345,17 @@
         typedef std::vector<osg::ref_ptr<CreateTileModelCallback> > CreateTileModelCallbacks;
         CreateTileModelCallbacks _createTileModelCallbacks;
         mutable Threading::ReadWriteMutex _createTileModelCallbacksMutex;
+        
+        typedef std::vector<osg::ref_ptr<ModifyTileBoundingBoxCallback> > ModifyTileBoundingBoxCallbacks;
+        ModifyTileBoundingBoxCallbacks _modifyTileBoundingBoxCallbacks;
 
         osg::ref_ptr<TerrainTileModelFactory> _tileModelFactory;
 
         osg::ref_ptr<ComputeRangeCallback> _computeRangeCallback;
 
+    public:
+
+        void fireModifyTileBoundingBoxCallbacks(const TileKey& key, osg::BoundingBox& box);
 
     public:
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainEngineNode.cpp osgearth-2.10.2+dfsg/src/osgEarth/TerrainEngineNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainEngineNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainEngineNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,18 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/TerrainEngineNode>
-#include <osgEarth/Capabilities>
-#include <osgEarth/CullingUtils>
 #include <osgEarth/Registry>
-#include <osgEarth/TerrainResources>
-#include <osgEarth/NodeUtils>
 #include <osgEarth/MapModelChange>
-#include <osgEarth/TerrainTileModelFactory>
-#include <osgEarth/TraversalData>
-#include <osgDB/ReadFile>
-#include <osg/CullFace>
-#include <osg/PolygonOffset>
-#include <osgViewer/View>
 
 #define LC "[TerrainEngineNode] "
 
@@ -64,9 +54,7 @@
 //------------------------------------------------------------------------
 
 
-TerrainEngineNode::ImageLayerController::ImageLayerController(const Map*         map,
-                                                              TerrainEngineNode* engine) :
-_mapf  ( map ),
+TerrainEngineNode::ImageLayerController::ImageLayerController(TerrainEngineNode* engine) :
 _engine( engine )
 {    
     //nop
@@ -141,9 +129,8 @@
     //Remove any callbacks added to the image layers
     if (_map.valid())
     {
-        MapFrame mapf( _map.get() );        
         ImageLayerVector imageLayers;
-        mapf.getLayers(imageLayers);
+        _map->getLayers(imageLayers);
 
         for( ImageLayerVector::const_iterator i = imageLayers.begin(); i != imageLayers.end(); ++i )
         {
@@ -236,13 +223,11 @@
 
     // Create a layer controller. This object affects the uniforms
     // that control layer appearance properties
-    _imageLayerController = new ImageLayerController(_map.get(), this);
+    _imageLayerController = new ImageLayerController(this);
 
     // register the layer Controller it with all pre-existing image layers:
-    MapFrame mapf(_map.get());
     ImageLayerVector imageLayers;
-    mapf.getLayers(imageLayers);
-
+    _map->getLayers(imageLayers);
     for (ImageLayerVector::const_iterator i = imageLayers.begin(); i != imageLayers.end(); ++i)
     {
         i->get()->addCallback(_imageLayerController.get());
@@ -256,7 +241,7 @@
 {
     if ( getEllipsoidModel() )
     {
-        double maxRad = std::max(
+        double maxRad = osg::maximum(
             getEllipsoidModel()->getRadiusEquator(),
             getEllipsoidModel()->getRadiusPolar());
 
@@ -303,17 +288,16 @@
 }
 
 TerrainTileModel*
-TerrainEngineNode::createTileModel(const MapFrame&              frame,
+TerrainEngineNode::createTileModel(const Map*                   map,
                                    const TileKey&               key,
                                    const CreateTileModelFilter& filter,
-                                   ProgressCallback*            progress
-    )
+                                   ProgressCallback*            progress)
 {
     TerrainEngineRequirements* requirements = this;
 
     // Ask the factory to create a new tile model:
     osg::ref_ptr<TerrainTileModel> model = _tileModelFactory->createTileModel(
-        frame, 
+        map, 
         key, 
         filter,
         requirements,         
@@ -355,6 +339,40 @@
     }
 }
 
+void
+TerrainEngineNode::addModifyTileBoundingBoxCallback(ModifyTileBoundingBoxCallback* callback)
+{
+    Threading::ScopedWriteLock exclusiveLock(_createTileModelCallbacksMutex);
+    _modifyTileBoundingBoxCallbacks.push_back(callback);
+}
+
+void
+TerrainEngineNode::removeModifyTileBoundingBoxCallback(ModifyTileBoundingBoxCallback* callback)
+{
+    Threading::ScopedWriteLock exclusiveLock(_createTileModelCallbacksMutex);
+    for (ModifyTileBoundingBoxCallbacks::iterator i = _modifyTileBoundingBoxCallbacks.begin();
+        i != _modifyTileBoundingBoxCallbacks.end();
+        ++i)
+    {
+        if (i->get() == callback)
+        {
+            _modifyTileBoundingBoxCallbacks.erase(i);
+            break;
+        }
+    }
+}
+
+void
+TerrainEngineNode::fireModifyTileBoundingBoxCallbacks(const TileKey& key, osg::BoundingBox& box)
+{
+    Threading::ScopedReadLock sharedLock(_createTileModelCallbacksMutex);
+    for (ModifyTileBoundingBoxCallbacks::iterator i = _modifyTileBoundingBoxCallbacks.begin();
+        i != _modifyTileBoundingBoxCallbacks.end();
+        ++i)
+    {
+        i->get()->modifyBoundingBox(key, box);
+    }
+}
 
 namespace
 {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainEngineRequirements osgearth-2.10.2+dfsg/src/osgEarth/TerrainEngineRequirements
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainEngineRequirements	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainEngineRequirements	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainLayer osgearth-2.10.2+dfsg/src/osgEarth/TerrainLayer
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -144,16 +144,15 @@
         optional<float>& maxValidValue() { return _maxValidValue; }
         const optional<float>& maxValidValue() const { return _maxValidValue; }
 
-
     public:
-        virtual Config getConfig() const; // { return getConfig(false); }
-        //virtual Config getConfig( bool isolate ) const;
+        virtual Config getConfig() const;
+
         virtual void mergeConfig( const Config& conf );
 
     private:
         void setDefaults();
         void fromConfig( const Config& conf );
-       
+
         optional<std::string>       _vertDatum;
         optional<TileSourceOptions> _driver;
         optional<unsigned>          _minLevel;
@@ -183,7 +182,7 @@
     class OSGEARTH_EXPORT TerrainLayer : public VisibleLayer
     {
     public:
-        META_Layer(osgEarth, TerrainLayer, TerrainLayerOptions);
+        META_Layer(osgEarth, TerrainLayer, TerrainLayerOptions, terrain);
 
     protected:
         //! Construct from subclass with a pointer to the concerete options structure.
@@ -203,10 +202,6 @@
         //! Cache ID for this layer
         virtual std::string getCacheID() const;
 
-    public: // VisibleLayer
-
-        //! Override the opacity setter
-        virtual void setOpacity(float value);
 
     public:
 
@@ -225,20 +220,23 @@
          * data for this layer.
          */
         virtual unsigned getTileSize() const;
-        
+
         /**
          * Whether the layer represents dynamic data, i.e. it generates data that requires
          * an update traversal.
          */
         virtual bool isDynamic() const;
 
-        /** 
+        /** Attribution to be displayed by the application */
+        virtual std::string getAttribution() const;
+
+        /**
          * Whether the data for the specified tile key is in the cache.
          */
         virtual bool isCached(const TileKey& key) const;
-        
+
         /**
-         * Gives the terrain layer a hint as to what the target profile of 
+         * Gives the terrain layer a hint as to what the target profile of
          * images will be. This is optional, but it may allow the layer to enable
          * certain optimizations since it has more information as to how the
          * data will be used.
@@ -269,15 +267,6 @@
         virtual TileKey getBestAvailableTileKey(const TileKey& key) const;
 
         /**
-         * Whether the layer possibly has data in the provided extent.
-         * Best guess given available information.
-         *
-         * @param extent Extent for which to test for data availability
-         * @return True or false
-         */
-        virtual bool mayHaveDataInExtent(const GeoExtent& e) const;
-
-        /**
          * Whether the layer possibly has real data for the provided TileKey.
          * Best guess given available information.
          */
@@ -291,6 +280,12 @@
         virtual bool isKeyInLegalRange(const TileKey& key) const;
 
         /**
+         * Same as isKeyInLegalRange, but ignores the "maxDataLevel" setting
+         * since that does NOT affect visibility of a tile.
+         */
+        virtual bool isKeyInVisualRange(const TileKey& key) const;
+
+        /**
          * Data Extents reported for this layer are copied into output.
          * Returns true on success, false is there are no extents to report.
          */
@@ -319,7 +314,7 @@
         virtual SequenceControl* getSequenceControl();
 
     public:
-        
+
         /**
          * Metadata about the terrain layer that is stored in the cache, and read
          * when the cache is opened.
@@ -339,7 +334,7 @@
             bool                     _valid;
             optional<std::string>    _cacheBinId;
             optional<std::string>    _sourceName;
-            optional<std::string>    _sourceDriver;   
+            optional<std::string>    _sourceDriver;
             optional<int>            _sourceTileSize;
             optional<ProfileOptions> _sourceProfile;
             optional<ProfileOptions> _cacheProfile;
@@ -348,7 +343,7 @@
         };
 
         /**
-         * Access to information about the cache 
+         * Access to information about the cache
          */
         CacheBinMetadata* getCacheBinMetadata(const Profile* profile);
 
@@ -386,7 +381,7 @@
     protected:
 
         osg::ref_ptr<const Profile>    _targetProfileHint;
-        unsigned                       _tileSize;  
+        unsigned                       _tileSize;
         osg::ref_ptr<MemCache>         _memCache;
         bool _openCalled;
 
@@ -419,8 +414,8 @@
         // The cache ID used at runtime. This will either be the cacheId found in
         // the TerrainLayerOptions, or a dynamic cacheID generated at runtime.
         std::string _runtimeCacheId;
-        
-        // cache policy that may be automatically set by the layer and will 
+
+        // cache policy that may be automatically set by the layer and will
         // override the runtime options policy if set.
         optional<CachePolicy> _runtimeCachePolicy;
 
@@ -431,11 +426,8 @@
 
         mutable osg::ref_ptr<CacheSettings> _cacheSettings;
 
-        void fireCallback(TerrainLayerCallback::MethodPtr method);
-
         // methods accesible by Map:
         friend class Map;
-        void initializeCachePolicy( const osgDB::Options* );
         void storeProxySettings( osgDB::Options* );
 
         // read the tile source's cache policy hint and apply as necessary
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainLayer.cpp osgearth-2.10.2+dfsg/src/osgEarth/TerrainLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,17 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/TerrainLayer>
-#include <osgEarth/TileSource>
 #include <osgEarth/Registry>
-#include <osgEarth/StringUtils>
 #include <osgEarth/TimeControl>
 #include <osgEarth/URI>
-#include <osgEarth/MemCache>
-#include <osgEarth/CacheBin>
-#include <osgDB/WriteFile>
-#include <osg/Version>
-#include <OpenThreads/ScopedLock>
-#include <memory.h>
 
 using namespace osgEarth;
 using namespace OpenThreads;
@@ -91,7 +83,7 @@
     conf.set( "edge_buffer_ratio", _edgeBufferRatio);
     conf.set( "reprojected_tilesize", _reprojectedTileSize);
     conf.set( "vdatum", _vertDatum );
-    conf.setObj( "proxy", _proxySettings );
+    conf.set( "proxy", _proxySettings );
     conf.set("no_data_value", _noDataValue);
     conf.set("min_valid_value", _minValidValue);
     conf.set("max_valid_value", _maxValidValue);
@@ -103,21 +95,21 @@
 void
 TerrainLayerOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet( "min_level", _minLevel );
-    conf.getIfSet( "max_level", _maxLevel );        
-    conf.getIfSet( "min_resolution", _minResolution );
-    conf.getIfSet( "max_resolution", _maxResolution );
-    conf.getIfSet( "max_data_level", _maxDataLevel );
-    conf.getIfSet( "edge_buffer_ratio", _edgeBufferRatio);    
-    conf.getIfSet( "reprojected_tilesize", _reprojectedTileSize);
-    conf.getIfSet( "vdatum", _vertDatum );
-    conf.getIfSet( "vsrs", _vertDatum );    // back compat
-    conf.getObjIfSet( "proxy",        _proxySettings );
-    conf.getIfSet("no_data_value", _noDataValue);
-    conf.getIfSet("nodata_value", _noDataValue); // back compat
-    conf.getIfSet("min_valid_value", _minValidValue);
-    conf.getIfSet("max_valid_value", _maxValidValue);
-    conf.getIfSet( "tile_size", _tileSize);
+    conf.get( "min_level", _minLevel );
+    conf.get( "max_level", _maxLevel );
+    conf.get( "min_resolution", _minResolution );
+    conf.get( "max_resolution", _maxResolution );
+    conf.get( "max_data_level", _maxDataLevel );
+    conf.get( "edge_buffer_ratio", _edgeBufferRatio);
+    conf.get( "reprojected_tilesize", _reprojectedTileSize);
+    conf.get( "vdatum", _vertDatum );
+    conf.get( "vsrs", _vertDatum );    // back compat
+    conf.get( "proxy",        _proxySettings );
+    conf.get("no_data_value", _noDataValue);
+    conf.get("nodata_value", _noDataValue); // back compat
+    conf.get("min_valid_value", _minValidValue);
+    conf.get("max_valid_value", _maxValidValue);
+    conf.get( "tile_size", _tileSize);
 
     if (conf.hasValue("driver"))
         driver() = TileSourceOptions(conf);
@@ -145,7 +137,7 @@
 _sourceDriver   ( rhs._sourceDriver ),
 _sourceTileSize ( rhs._sourceTileSize ),
 _sourceProfile  ( rhs._sourceProfile ),
-_cacheProfile   ( rhs._cacheProfile ),   
+_cacheProfile   ( rhs._cacheProfile ),
 _cacheCreateTime( rhs._cacheCreateTime )
 {
     //nop
@@ -155,13 +147,13 @@
 {
     _valid = !conf.empty();
 
-    conf.getIfSet("cachebin_id", _cacheBinId);
-    conf.getIfSet("source_name", _sourceName);
-    conf.getIfSet("source_driver", _sourceDriver);
-    conf.getIfSet("source_tile_size", _sourceTileSize);
-    conf.getObjIfSet("source_profile", _sourceProfile);
-    conf.getObjIfSet("cache_profile", _cacheProfile);
-    conf.getIfSet("cache_create_time", _cacheCreateTime);
+    conf.get("cachebin_id", _cacheBinId);
+    conf.get("source_name", _sourceName);
+    conf.get("source_driver", _sourceDriver);
+    conf.get("source_tile_size", _sourceTileSize);
+    conf.get("source_profile", _sourceProfile);
+    conf.get("cache_profile", _cacheProfile);
+    conf.get("cache_create_time", _cacheCreateTime);
 
     const Config* extentsRoot = conf.child_ptr("extents");
     if ( extentsRoot )
@@ -173,14 +165,14 @@
             std::string srsString;
             double xmin, ymin, xmax, ymax;
             optional<unsigned> minLevel, maxLevel;
-        
+
             srsString = i->value("srs");
             xmin = i->value("xmin", 0.0f);
             ymin = i->value("ymin", 0.0f);
             xmax = i->value("xmax", 0.0f);
             ymax = i->value("ymax", 0.0f);
-            i->getIfSet("minlevel", minLevel);
-            i->getIfSet("maxlevel", maxLevel);
+            i->get("minlevel", minLevel);
+            i->get("maxlevel", maxLevel);
 
             const SpatialReference* srs = SpatialReference::get(srsString);
             DataExtent e( GeoExtent(srs, xmin,  ymin, xmax, ymax) );
@@ -206,17 +198,17 @@
     }
 }
 
-Config 
+Config
 TerrainLayer::CacheBinMetadata::getConfig() const
 {
     Config conf("osgearth_terrainlayer_cachebin");
-    conf.addIfSet("cachebin_id", _cacheBinId);
-    conf.addIfSet("source_name", _sourceName);
-    conf.addIfSet("source_driver", _sourceDriver);
-    conf.addIfSet("source_tile_size", _sourceTileSize);
-    conf.addObjIfSet("source_profile", _sourceProfile);
-    conf.addObjIfSet("cache_profile", _cacheProfile);
-    conf.addIfSet("cache_create_time", _cacheCreateTime);
+    conf.set("cachebin_id", _cacheBinId);
+    conf.set("source_name", _sourceName);
+    conf.set("source_driver", _sourceDriver);
+    conf.set("source_tile_size", _sourceTileSize);
+    conf.set("source_profile", _sourceProfile);
+    conf.set("cache_profile", _cacheProfile);
+    conf.set("cache_create_time", _cacheCreateTime);
 
     if (!_dataExtents.empty())
     {
@@ -229,8 +221,9 @@
             extent.set("ymin", i->yMin());
             extent.set("xmax", i->xMax());
             extent.set("ymax", i->yMax());
-            extent.addIfSet("minlevel", i->minLevel());
-            extent.addIfSet("maxlevel", i->maxLevel());
+            extent.set("minlevel", i->minLevel());
+            extent.set("maxlevel", i->maxLevel());
+
             extents.add("extent", extent);
         }
         conf.add("extents", extents);
@@ -267,7 +260,7 @@
 
 void
 TerrainLayer::init()
-{    
+{
     Layer::init();
 
     // intiailize our read-options, which store caching and IO information.
@@ -291,7 +284,7 @@
         // Create an L2 mem cache that sits atop the main cache, if necessary.
         // For now: use the same L2 cache size at the driver.
         int l2CacheSize = options().driver()->L2CacheSize().get();
-    
+
         // See if it was overridden with an env var.
         char const* l2env = ::getenv( "OSGEARTH_L2_CACHE_SIZE" );
         if ( l2env )
@@ -400,7 +393,7 @@
 
         // Done!
         _openCalled = true;
-                        
+
     }
 
     return getStatus();
@@ -430,16 +423,6 @@
 }
 
 void
-TerrainLayer::setOpacity(float value)
-{
-    // For terrain layers, we don't want to install the transparency program
-    // nor mess with the rendering bins. The terrain engine will handle
-    // opacity on its own
-    options().opacity() = value;
-    VisibleLayer::fireCallback(&VisibleLayerCallback::onOpacityChanged);
-}
-
-void
 TerrainLayer::setTargetProfileHint( const Profile* profile )
 {
     _targetProfileHint = profile;
@@ -489,6 +472,27 @@
 }
 
 std::string
+TerrainLayer::getAttribution() const
+{
+    // Get the attribution from the layer if it's set.
+    if (_options->attribution().isSet())
+    {
+        return *_options->attribution();
+    }
+
+    // Get it from the tilesource if it's not set on the layer.
+    TileSource* ts = getTileSource();
+    if (ts)
+    {
+        return ts->getAttribution();
+    }
+    else
+    {
+        return "";
+    }
+}
+
+std::string
 TerrainLayer::getMetadataKey(const Profile* profile) const
 {
     if (profile)
@@ -529,7 +533,7 @@
 
         // read the metadata record from the cache bin:
         ReadResult rr = bin->readString(metaKey, _readOptions.get());
-            
+
         osg::ref_ptr<CacheBinMetadata> meta;
         bool metadataOK = false;
 
@@ -549,8 +553,8 @@
                 {
                     //todo: check the profile too
                     if ( meta->_sourceDriver.get() != getTileSource()->getOptions().getDriver() )
-                    {                     
-                        OE_WARN << LC 
+                    {
+                        OE_WARN << LC
                             << "Layer \"" << getName() << "\" is requesting a \""
                             << getTileSource()->getOptions().getDriver() << "\" cache, but a \""
                             << meta->_sourceDriver.get() << "\" cache exists at the specified location. "
@@ -559,7 +563,7 @@
                         cacheSettings->cachePolicy() = CachePolicy::NO_CACHE;
                         return 0L;
                     }
-                }   
+                }
 
                 // if not, see if we're in cache-only mode and still need a profile:
                 else if (cacheSettings->cachePolicy()->isCacheOnly() && !_profile.valid())
@@ -602,7 +606,7 @@
                 // store it in the cache bin.
                 std::string data = meta->getConfig().toJSON(false);
                 osg::ref_ptr<StringObject> temp = new StringObject(data);
-                bin->write(metaKey, temp.get(), _readOptions.get());                   
+                bin->write(metaKey, temp.get(), _readOptions.get());
 
                 bin->setMetadata(meta.get());
             }
@@ -662,7 +666,7 @@
 
 TileSource*
 TerrainLayer::createTileSource()
-{    
+{
     if (options().driver().isSet())
     {
         OE_INFO << LC << "Creating \"" << options().driver()->getDriver() << "\" driver\n";
@@ -714,6 +718,20 @@
             _readOptions->setOptionString( s );
         }
 
+        // If we're setting any custom options, do so now before opening:
+        if (options().tileSize().isSet())
+            ts->setPixelsPerTile(options().tileSize().get());
+
+        if (options().noDataValue().isSet())
+            ts->setNoDataValue(options().noDataValue().get());
+
+        if (options().minValidValue().isSet())
+            ts->setMinValidValue(options().minValidValue().get());
+
+        if (options().maxValidValue().isSet())
+            ts->setMaxValidValue(options().maxValidValue().get());
+
+
         // report on a manual override profile:
         if ( ts->getProfile() )
         {
@@ -723,7 +741,7 @@
         // Now that the tile source exists, set up the cache.
         if (_cacheSettings->isCacheEnabled())
         {
-            // read the cache policy hint from the tile source unless user expressly set 
+            // read the cache policy hint from the tile source unless user expressly set
             // a policy in the initialization options. In other words, the hint takes
             // ultimate priority (even over the Registry override) unless expressly
             // overridden in the layer options!
@@ -740,7 +758,7 @@
                 _cacheSettings->cachePolicy()->minTime() = ts->getLastModifiedTime();
                 OE_INFO << LC << "driver says min valid timestamp = " << DateTime(*cp.minTime()).asRFC1123() << "\n";
             }
-            
+
             CacheBin* bin = _cacheSettings->getCache()->addBin(_runtimeCacheId);
             if (bin)
             {
@@ -760,20 +778,8 @@
         // properties to and fro.
         if ( tileSourceStatus.isOK() )
         {
-            if (options().tileSize().isSet())
-                ts->setPixelsPerTile(options().tileSize().get());
-
             if (!ts->getDataExtents().empty())
                 _dataExtents = ts->getDataExtents();
-
-            if (options().noDataValue().isSet())
-                ts->setNoDataValue(options().noDataValue().get());
-
-            if (options().minValidValue().isSet())
-                ts->setMinValidValue(options().minValidValue().get());
-
-            if (options().maxValidValue().isSet())
-                ts->setMaxValidValue(options().maxValidValue().get());
         }
         else
         {
@@ -800,15 +806,16 @@
         }
     }
 
-    // Otherwise, force cache-only mode (since there is no tilesource). The layer will try to 
+    // Otherwise, force cache-only mode (since there is no tilesource). The layer will try to
     // establish a profile from the metadata in the cache instead.
-    else if (!tileSourceStatus.isError() && getCacheSettings()->isCacheEnabled())
+    else if (getCacheSettings()->isCacheEnabled() && options().cacheId().isSet())
     {
-        OE_NOTICE << LC << "Failed to create \"" << options().driver()->getDriver() << "\" driver, but a cache may exist, so falling back on cache-only mode." << std::endl;
+        OE_WARN << LC << tileSourceStatus.message() << std::endl;
+        OE_WARN << LC << "will attempt to use the cache as a fallback data source" << std::endl;
         getCacheSettings()->cachePolicy() = CachePolicy::CACHE_ONLY;
     }
 
-    // Finally: if we could not open a TileSource, and there's no cache available, 
+    // Finally: if we could not open a TileSource, and there's no cache available,
     // just disable the layer.
     else
     {
@@ -843,6 +850,7 @@
     }
 }
 
+#if 0
 bool
 TerrainLayer::mayHaveDataInExtent(const GeoExtent& ex) const
 {
@@ -851,7 +859,7 @@
         // bad extent; no data
         return false;
     }
-    
+
     const DataExtentList& de = getDataExtents();
     if (de.empty())
     {
@@ -886,10 +894,11 @@
     // definite no.
     return false;
 }
+#endif
 
 bool
 TerrainLayer::isKeyInLegalRange(const TileKey& key) const
-{    
+{
     if ( !key.valid() )
     {
         return false;
@@ -943,6 +952,55 @@
 }
 
 bool
+TerrainLayer::isKeyInVisualRange(const TileKey& key) const
+{
+    if (!key.valid())
+    {
+        return false;
+    }
+
+    // We must use the equivalent lod b/c the input key can be in any profile.
+    unsigned localLOD = getProfile() ?
+        getProfile()->getEquivalentLOD(key.getProfile(), key.getLOD()) :
+        key.getLOD();
+
+
+    // First check the key against the min/max level limits, it they are set.
+    if ((options().maxLevel().isSet() && localLOD > options().maxLevel().value()) ||
+        (options().minLevel().isSet() && localLOD < options().minLevel().value()))
+    {
+        return false;
+    }
+
+    // Next, check against resolution limits (based on the source tile size).
+    if (options().minResolution().isSet() || options().maxResolution().isSet())
+    {
+        const Profile* profile = getProfile();
+        if (profile)
+        {
+            // calculate the resolution in the layer's profile, which can
+            // be different that the key's profile.
+            double resKey = key.getExtent().width() / (double)getTileSize();
+            double resLayer = key.getProfile()->getSRS()->transformUnits(resKey, profile->getSRS());
+
+            if (options().maxResolution().isSet() &&
+                options().maxResolution().value() > resLayer)
+            {
+                return false;
+            }
+
+            if (options().minResolution().isSet() &&
+                options().minResolution().value() < resLayer)
+            {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+bool
 TerrainLayer::isCached(const TileKey& key) const
 {
     // first consult the policy:
@@ -956,7 +1014,7 @@
     CacheBin* bin = const_cast<TerrainLayer*>(this)->getCacheBin( key.getProfile() );
     if ( !bin )
         return false;
-    
+
     return bin->getRecordStatus( key.str() ) == CacheBin::STATUS_OK;
 }
 
@@ -969,7 +1027,7 @@
 
     // store HTTP proxy settings in the options:
     storeProxySettings( _readOptions.get() );
-    
+
     // store the referrer for relative-path resolution
     URIContext( options().referrer() ).store( _readOptions.get() );
 
@@ -994,7 +1052,7 @@
 
     else if (!_cacheBinMetadata.empty())
     {
-        // There are extents in the cache bin, so use those. 
+        // There are extents in the cache bin, so use those.
         // The DE's are the same regardless of profile so just use the first one in there.
         return _cacheBinMetadata.begin()->second->_dataExtents;
     }
@@ -1005,6 +1063,12 @@
     }
 }
 
+DataExtentList&
+TerrainLayer::dataExtents()
+{
+    return const_cast<DataExtentList&>(getDataExtents());
+}
+
 void
 TerrainLayer::dirtyDataExtents()
 {
@@ -1046,7 +1110,7 @@
 {
     //Store the proxy settings in the options structure.
     if (options().proxySettings().isSet())
-    {        
+    {
         options().proxySettings()->apply( readOptions );
     }
 }
@@ -1111,20 +1175,23 @@
         return localLOD > MDL ? key.createAncestorKey(MDL) : key;
     }
 
+    // Transform the key's extent to the layer's extent
+    GeoExtent localKeyExtent = getProfile()->clampAndTransformExtent(key.getExtent());
+
     // Reject if the extents don't overlap at all.
-    if (!getDataExtentsUnion().intersects(key.getExtent()))
+    if (!getDataExtentsUnion().intersects(localKeyExtent))
     {
         return TileKey::INVALID;
     }
 
     bool     intersects = false;
     unsigned highestLOD = 0;
-    
+
     // Check each data extent in turn:
     for (DataExtentList::const_iterator itr = de.begin(); itr != de.end(); ++itr)
     {
         // check for 2D intersection:
-        if (key.getExtent().intersects(*itr))
+        if (itr->intersects(localKeyExtent))
         {
             // check that the extent isn't higher-resolution than our key:
             if ( !itr->minLevel().isSet() || localLOD >= (int)itr->minLevel().get() )
@@ -1158,7 +1225,7 @@
 
     if ( intersects )
     {
-        return key.createAncestorKey(std::min(highestLOD, MDL));
+        return key.createAncestorKey(osg::minimum(key.getLOD(), osg::minimum(highestLOD, MDL)));
     }
 
     return TileKey::INVALID;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainOptions osgearth-2.10.2+dfsg/src/osgEarth/TerrainOptions
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -73,19 +73,13 @@
         const optional<float>& minTileRangeFactor() const { return _minTileRangeFactor; }
 
         /**
-         * Distance (m) over which to ramp min_range and max_range blending
-         * Default = 0.
+         * Distance (m) over which to ramp min_range and max_range blending; Default = 0.
+         * @deprecated (remove after 2.10) Use VisibleLayer::attenuation instead.
          */
         optional<float>& attenuationDistance() { return _attenuationDistance; }
         const optional<float>& attenuationDistance() const { return _attenuationDistance; }
 
         /**
-         * Transition time, in seconds, for tile image fade-in when LOD blending is enabled
-         */
-        optional<float>& lodTransitionTime() { return _lodTransitionTimeSeconds; }
-        const optional<float>& lodTransitionTime() const { return _lodTransitionTimeSeconds; }
-
-        /**
          * Whether cluster culling is enabled on terrain tiles (default = true)
          */
         optional<bool>& clusterCulling() { return _clusterCulling; }
@@ -123,25 +117,7 @@
          * Whether to explicity enable or disable GL lighting on the map node.
          */
         optional<bool>& enableLighting() { return _enableLighting; }
-        const optional<bool>& enableLighting() const { return _enableLighting; }  
-    
-        /**
-         * Whether to enable mipmaping and mipmap generation on textures
-         */
-        optional<bool>& enableMipmapping() { return _enableMipmapping; }
-        const optional<bool>& enableMipmapping() const { return _enableMipmapping; }
-
-        /**
-         * The min filter to be applied to textures
-         */
-        optional<osg::Texture::FilterMode>& minFilter() { return _minFilter;}
-        const optional<osg::Texture::FilterMode>& minFilter() const { return _minFilter;}
-
-        /**
-         * The mag filter to be applied to textures
-         */
-        optional<osg::Texture::FilterMode>& magFilter() { return _magFilter;}
-        const optional<osg::Texture::FilterMode>& magFilter() const { return _magFilter;}
+        const optional<bool>& enableLighting() const { return _enableLighting; }
             
         /**
          * Whether to enable blending on the terrain. Default is true.
@@ -150,10 +126,17 @@
         const optional<bool>& enableBlending() const { return _enableBlending; }
 
         /**
+         * Whether to compress the normal map
+         */
+        optional<bool>& compressNormalMaps() { return _compressNormalMaps; }
+        const optional<bool>& compressNormalMaps() const { return _compressNormalMaps; }
+
+        /**
          * Whether to enable the "fast path" for spherical Mercator image layers
          * Default = true. If enabled, Mercator image tiles will be rendered on a
          * geocentric map with no reprojection. The trade-off is higher texture
          * memory usage and NPOT texture usage.
+         * @deprecated (remove after 2.10)
          */
         optional<bool>& enableMercatorFastPath() { return _mercatorFastPath; }
         const optional<bool>& enableMercatorFastPath() const { return _mercatorFastPath; }
@@ -197,7 +180,8 @@
         optional<bool>& castShadows() { return _castShadows; }
         const optional<bool>& castShadows() const { return _castShadows; }
 
-        /** Mode to use when calculating LOD switching distances */
+        /** Mode to use when calculating LOD switching distances.
+         *  Choices are DISTANCE_FROM_EYE_POINT (default) or PIXEL_SIZE_ON_SCREEN */
         optional<osg::LOD::RangeMode>& rangeMode() { return _rangeMode;}
         const optional<osg::LOD::RangeMode>& rangeMode() const { return _rangeMode;}
 
@@ -221,22 +205,16 @@
         optional<float> _verticalOffset;
         optional<int>   _tileSize;
         optional<float> _minTileRangeFactor;        
-        optional<bool> _combineLayers;
         optional<unsigned> _minLOD;
         optional<unsigned> _maxLOD;
         optional<unsigned> _firstLOD;
         optional<bool> _enableLighting;
         optional<float> _attenuationDistance;
-        optional<float> _lodTransitionTimeSeconds;
-        optional<bool>  _enableMipmapping;
         optional<bool> _clusterCulling;
         optional<bool> _enableBlending;
+        optional<bool> _compressNormalMaps;
         optional<bool> _mercatorFastPath;
-        optional<osg::Texture::FilterMode> _magFilter;
-        optional<osg::Texture::FilterMode> _minFilter;
         optional<ElevationInterpolation> _elevationInterpolation;
-        optional<unsigned> _primaryTraversalMask;
-        optional<unsigned> _secondaryTraversalMask;
         optional<unsigned> _minNormalMapLOD;
         optional<bool> _gpuTessellation;
         optional<bool> _debug;
@@ -245,8 +223,8 @@
         optional<double> _minExpiryTime;
         optional<bool> _castShadows;
         optional<osg::LOD::RangeMode> _rangeMode;
-        optional<float>               _tilePixelSize;
+        optional<float> _tilePixelSize;
     };
 }
 
-#endif // OSGEARTH_MAP_ENGINE_PROPERTIES_H
+#endif // OSGEARTH_TERRAIN_OPTIONS_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainOptions.cpp osgearth-2.10.2+dfsg/src/osgEarth/TerrainOptions.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainOptions.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainOptions.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,8 +18,6 @@
  */
 
 #include <osgEarth/TerrainOptions>
-#include <osg/Notify>
-#include <OpenThreads/Thread>
 
 using namespace osgEarth;
 
@@ -31,24 +29,20 @@
 _verticalScale( 1.0f ),
 _verticalOffset( 0.0f ),
 _minTileRangeFactor( 7.0 ),
-_combineLayers( true ),
 _maxLOD( 23 ),
 _minLOD( 0 ),
 _firstLOD( 0 ),
 _enableLighting( false ),
-_attenuationDistance( 0.0f ),
-_lodTransitionTimeSeconds( 0.5f ),
-_enableMipmapping( true ),
+_attenuationDistance( 10000.0f ),
 _clusterCulling( true ),
 _enableBlending( true ),
-_mercatorFastPath( true ),
-_minFilter( osg::Texture::LINEAR_MIPMAP_LINEAR ),
-_magFilter( osg::Texture::LINEAR),
+_compressNormalMaps( false ),
+_mercatorFastPath( false ),
 _minNormalMapLOD( 0u ),
 _gpuTessellation( false ),
 _debug( false ),
 _binNumber( 0 ),
-_castShadows(false),
+_castShadows(true),
 _rangeMode(osg::LOD::DISTANCE_FROM_EYE_POINT),
 _tilePixelSize(256)
 {
@@ -71,10 +65,9 @@
     conf.set( "first_lod", _firstLOD );
     conf.set( "lighting", _enableLighting );
     conf.set( "attenuation_distance", _attenuationDistance );
-    conf.set( "lod_transition_time", _lodTransitionTimeSeconds );
-    conf.set( "mipmapping", _enableMipmapping );
     conf.set( "cluster_culling", _clusterCulling );
     conf.set( "blending", _enableBlending );
+    conf.set( "compress_normal_maps", _compressNormalMaps);
     conf.set( "mercator_fast_path", _mercatorFastPath );
     conf.set( "min_normal_map_lod", _minNormalMapLOD );
     conf.set( "gpu_tessellation", _gpuTessellation );
@@ -82,24 +75,10 @@
     conf.set( "bin_number", _binNumber );
     conf.set( "min_expiry_time", _minExpiryTime);
     conf.set( "min_expiry_frames", _minExpiryFrames);
-    conf.set("cast_shadows", _castShadows);
-    conf.set("tile_pixel_size", _tilePixelSize);
-    conf.set("range_mode", "PIXEL_SIZE_ON_SCREEN", _rangeMode, osg::LOD::PIXEL_SIZE_ON_SCREEN);
-    conf.set("range_mode", "DISTANCE_FROM_EYE_POINT", _rangeMode, osg::LOD::DISTANCE_FROM_EYE_POINT);
-
-    //Save the filter settings
-	conf.set("mag_filter","LINEAR",                _magFilter,osg::Texture::LINEAR);
-    conf.set("mag_filter","LINEAR_MIPMAP_LINEAR",  _magFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
-    conf.set("mag_filter","LINEAR_MIPMAP_NEAREST", _magFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
-    conf.set("mag_filter","NEAREST",               _magFilter,osg::Texture::NEAREST);
-    conf.set("mag_filter","NEAREST_MIPMAP_LINEAR", _magFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
-    conf.set("mag_filter","NEAREST_MIPMAP_NEAREST",_magFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
-    conf.set("min_filter","LINEAR",                _minFilter,osg::Texture::LINEAR);
-    conf.set("min_filter","LINEAR_MIPMAP_LINEAR",  _minFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
-    conf.set("min_filter","LINEAR_MIPMAP_NEAREST", _minFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
-    conf.set("min_filter","NEAREST",               _minFilter,osg::Texture::NEAREST);
-    conf.set("min_filter","NEAREST_MIPMAP_LINEAR", _minFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
-    conf.set("min_filter","NEAREST_MIPMAP_NEAREST",_minFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
+    conf.set( "cast_shadows", _castShadows);
+    conf.set( "tile_pixel_size", _tilePixelSize);
+    conf.set( "range_mode", "PIXEL_SIZE_ON_SCREEN", _rangeMode, osg::LOD::PIXEL_SIZE_ON_SCREEN);
+    conf.set( "range_mode", "DISTANCE_FROM_EYE_POINT", _rangeMode, osg::LOD::DISTANCE_FROM_EYE_POINT);
 
     return conf;
 }
@@ -107,43 +86,28 @@
 void
 TerrainOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet( "tile_size", _tileSize );
-    conf.getIfSet( "vertical_scale", _verticalScale );
-    conf.getIfSet( "vertical_offset", _verticalOffset );
-    conf.getIfSet( "min_tile_range_factor", _minTileRangeFactor );   
-    conf.getIfSet( "range_factor", _minTileRangeFactor );   
-    conf.getIfSet( "max_lod", _maxLOD ); conf.getIfSet( "max_level", _maxLOD );
-    conf.getIfSet( "min_lod", _minLOD ); conf.getIfSet( "min_level", _minLOD );
-    conf.getIfSet( "first_lod", _firstLOD ); conf.getIfSet( "first_level", _firstLOD );
-    conf.getIfSet( "lighting", _enableLighting );
-    conf.getIfSet( "attenuation_distance", _attenuationDistance );
-    conf.getIfSet( "lod_transition_time", _lodTransitionTimeSeconds );
-    conf.getIfSet( "mipmapping", _enableMipmapping );
-    conf.getIfSet( "cluster_culling", _clusterCulling );
-    conf.getIfSet( "blending", _enableBlending );
-    conf.getIfSet( "mercator_fast_path", _mercatorFastPath );
-    conf.getIfSet( "min_normal_map_lod", _minNormalMapLOD );
-    conf.getIfSet( "gpu_tessellation", _gpuTessellation );
-    conf.getIfSet( "debug", _debug );
-    conf.getIfSet( "bin_number", _binNumber );
-    conf.getIfSet( "min_expiry_time", _minExpiryTime);
-    conf.getIfSet( "min_expiry_frames", _minExpiryFrames);
-    conf.getIfSet("cast_shadows", _castShadows);
-    conf.getIfSet("tile_pixel_size", _tilePixelSize);
-    conf.getIfSet("range_mode", "PIXEL_SIZE_ON_SCREEN", _rangeMode, osg::LOD::PIXEL_SIZE_ON_SCREEN);
-    conf.getIfSet("range_mode", "DISTANCE_FROM_EYE_POINT", _rangeMode, osg::LOD::DISTANCE_FROM_EYE_POINT);
-
-    //Load the filter settings
-	conf.getIfSet("mag_filter","LINEAR",                _magFilter,osg::Texture::LINEAR);
-    conf.getIfSet("mag_filter","LINEAR_MIPMAP_LINEAR",  _magFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
-    conf.getIfSet("mag_filter","LINEAR_MIPMAP_NEAREST", _magFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
-    conf.getIfSet("mag_filter","NEAREST",               _magFilter,osg::Texture::NEAREST);
-    conf.getIfSet("mag_filter","NEAREST_MIPMAP_LINEAR", _magFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
-    conf.getIfSet("mag_filter","NEAREST_MIPMAP_NEAREST",_magFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
-    conf.getIfSet("min_filter","LINEAR",                _minFilter,osg::Texture::LINEAR);
-    conf.getIfSet("min_filter","LINEAR_MIPMAP_LINEAR",  _minFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
-    conf.getIfSet("min_filter","LINEAR_MIPMAP_NEAREST", _minFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
-    conf.getIfSet("min_filter","NEAREST",               _minFilter,osg::Texture::NEAREST);
-    conf.getIfSet("min_filter","NEAREST_MIPMAP_LINEAR", _minFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
-    conf.getIfSet("min_filter","NEAREST_MIPMAP_NEAREST",_minFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
+    conf.get( "tile_size", _tileSize );
+    conf.get( "vertical_scale", _verticalScale );
+    conf.get( "vertical_offset", _verticalOffset );
+    conf.get( "min_tile_range_factor", _minTileRangeFactor );   
+    conf.get( "range_factor", _minTileRangeFactor );   
+    conf.get( "max_lod", _maxLOD ); conf.get( "max_level", _maxLOD );
+    conf.get( "min_lod", _minLOD ); conf.get( "min_level", _minLOD );
+    conf.get( "first_lod", _firstLOD ); conf.get( "first_level", _firstLOD );
+    conf.get( "lighting", _enableLighting );
+    conf.get( "attenuation_distance", _attenuationDistance );
+    conf.get( "cluster_culling", _clusterCulling );
+    conf.get( "blending", _enableBlending );
+    conf.get( "compress_normal_maps", _compressNormalMaps);
+    conf.get( "mercator_fast_path", _mercatorFastPath );
+    conf.get( "min_normal_map_lod", _minNormalMapLOD );
+    conf.get( "gpu_tessellation", _gpuTessellation );
+    conf.get( "debug", _debug );
+    conf.get( "bin_number", _binNumber );
+    conf.get( "min_expiry_time", _minExpiryTime);
+    conf.get( "min_expiry_frames", _minExpiryFrames);
+    conf.get( "cast_shadows", _castShadows);
+    conf.get( "tile_pixel_size", _tilePixelSize);
+    conf.get( "range_mode", "PIXEL_SIZE_ON_SCREEN", _rangeMode, osg::LOD::PIXEL_SIZE_ON_SCREEN);
+    conf.get( "range_mode", "DISTANCE_FROM_EYE_POINT", _rangeMode, osg::LOD::DISTANCE_FROM_EYE_POINT);
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainResources osgearth-2.10.2+dfsg/src/osgEarth/TerrainResources
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainResources	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainResources	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -51,19 +51,6 @@
         bool reserveTextureImageUnit(
             int&        out_unit,
             const char* requestor =0L );
-
-        /**
-         * Requests a texture image unit that is not in use, and marks is as reserved
-         * for the specified Layer. The unit will still be available for reservation
-         * by other layers (but not globally).
-         * You must release the reserved texture image unit by calling releaseTextureImageUnit().
-         * @param out_unit  Reserved unit is written to this variable.
-         * @param requestor Optional requestor string (for information purposes only)
-         */
-        bool reserveTextureImageUnit(
-            int& out_unit,
-            const Layer* layer,
-            const char* requestor =0L);
         
         /**
          * Requests a texture image unit that is not in use, and marks is as reserved.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainResources.cpp osgearth-2.10.2+dfsg/src/osgEarth/TerrainResources.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainResources.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainResources.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -60,48 +60,7 @@
             out_unit = i;
             if ( requestor )
             {
-                OE_INFO << LC << "Texture unit " << i << " reserved for " << requestor << "\n";
-            }
-            return true;
-        }
-    }
-    return false;
-}
-
-bool
-TerrainResources::reserveTextureImageUnit(int&         out_unit,
-                                          const Layer* layer,
-                                          const char*  requestor)
-{
-    OE_DEPRECATED(reserveTextureImageUnit, reserveTextureImageUnitForLayer) << std::endl;
-
-    if (layer == 0L)
-    {
-        return reserveTextureImageUnit(out_unit, requestor);
-    }
-
-    out_unit = -1;
-    unsigned maxUnits = osgEarth::Registry::instance()->getCapabilities().getMaxGPUTextureUnits();
-    
-    Threading::ScopedMutexLock exclusiveLock( _reservedUnitsMutex );
-    
-    // first collect a list of units that are already in use.
-    std::set<int> taken;
-    taken.insert(_globallyReservedUnits.begin(), _globallyReservedUnits.end());
-    ReservedUnits& layerUnits = _perLayerReservedUnits[layer];
-    taken.insert(layerUnits.begin(), layerUnits.end());
-
-    // now find the first unused one.
-    for( unsigned i=0; i<maxUnits; ++i )
-    {
-        if (taken.find(i) == taken.end())
-        {
-            layerUnits.insert( i );
-            out_unit = i;
-            if ( requestor )
-            {
-                OE_INFO << LC << "Texture unit " << i << " reserved by Layer "
-                    << layer->getName() << " for " << requestor << "\n";
+                OE_INFO << LC << "Texture unit " << i << " reserved for " << requestor << std::endl;
             }
             return true;
         }
@@ -138,7 +97,7 @@
             reservation._res = this;
             if ( requestor )
             {
-                OE_INFO << LC << "Texture unit " << i << " reserved for " << requestor << "\n";
+                OE_INFO << LC << "Texture unit " << i << " reserved for " << requestor << std::endl;
             }
             return true;
         }
@@ -179,7 +138,7 @@
             if ( requestor )
             {
                 OE_INFO << LC << "Texture unit " << i << " reserved (on layer "
-                    << layer->getName() << ") for " << requestor << "\n";
+                    << layer->getName() << ") for " << requestor << std::endl;
             }
             return true;
         }
@@ -214,7 +173,7 @@
             _perLayerReservedUnits.erase(i);
         }
 
-        OE_INFO << LC << "Texture unit " << unit << " released (by layer " << layer->getName() << ")\n";
+        OE_INFO << LC << "Texture unit " << unit << " released (by layer " << layer->getName() << ")" << std::endl;
     }
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainTileModel osgearth-2.10.2+dfsg/src/osgEarth/TerrainTileModel
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainTileModel	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainTileModel	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -27,62 +27,11 @@
 #include <osgEarth/MapInfo>
 #include <osgEarth/Locators>
 #include <osgEarth/HeightFieldUtils>
-#include <osgEarth/TileKeyDataStore>
 #include <osg/Texture>
 #include <osg/Matrix>
 
 namespace osgEarth
 {
-    //! @deprecated
-    class TerrainData : public osg::Referenced
-    {
-    public:
-        enum Type 
-        {
-            TYPE_IMAGE,
-            TYPE_ELEVATION,
-            TYPE_NORMAL,
-            TYPE_MATERIAL,
-            TYPE_VECTOR,
-            TYPE_UNKNOWN
-        };
-
-        void setType(Type type) { _type = type; }
-        const Type& getType() const { return _type; }
-
-    protected:
-        Type _type;
-
-        TerrainData() : _type(TYPE_UNKNOWN) { }
-        virtual ~TerrainData() { }
-    };
-
-    
-    //! @deprecated
-    class OSGEARTH_EXPORT TerrainRaster : public TerrainData
-    {
-    public:
-        TerrainRaster() : TerrainData() { }
-
-        /** Raster image. */
-        void setImage(osg::Image* image) { _image = image; }
-        osg::Image* getImage() const { return _image.get(); }
-
-        void setLayer(Layer* layer) { _layer = layer; }
-        Layer* getLayer() const { return _layer.get(); }
-
-    protected:
-        virtual ~TerrainRaster() { }
-
-        osg::ref_ptr<osg::Image> _image;
-        osg::ref_ptr<Layer>      _layer;
-    };
-
-
-
-    //...start old stuff
-
-
     /**
      * Data model backing an individual layer of a terrain tile.
      */
@@ -253,6 +202,9 @@
         osg::Texture* getElevationTexture() const;
         osg::RefMatrixf* getElevationTextureMatrix() const;
 
+    public:
+        void compileGLObjects(class osg::State& state) const;
+
     protected:
         TileKey                                 _key;
         Revision                                _revision;
@@ -264,11 +216,6 @@
         HeightFieldNeighborhood                 _heightFields;
         bool                                    _requiresUpdateTraverse;
     };
-
-    /**
-     * Data store that references TerrainTileModel by TileKey.
-     */
-    typedef TileKeyDataStore<const TerrainTileModel> TerrainTileModelStore;
 }
 
 #endif // OSGEARTH_TERRAIN_TILE_MODEL_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainTileModel.cpp osgearth-2.10.2+dfsg/src/osgEarth/TerrainTileModel.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainTileModel.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainTileModel.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -17,11 +17,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/TerrainTileModel>
-#include <osgEarth/ImageLayer>
-#include <osgEarth/ImageUtils>
-#include <osgEarth/ImageToHeightFieldConverter>
-#include <osgEarth/Registry>
-#include <osg/Texture2D>
 
 using namespace osgEarth;
 
@@ -54,51 +49,6 @@
     //NOP
 }
 
-//const TerrainTileImageLayerModel*
-//TerrainTileModel::findSharedLayerByName(const std::string& name) const
-//{
-//    for(TerrainTileImageLayerModelVector::const_iterator i = _sharedLayers.begin();
-//        i != _sharedLayers.end();
-//        ++i)
-//    {
-//        if ( i->get()->getName() == name )
-//        {
-//            return i->get();
-//        }
-//    }
-//    return 0L;
-//}
-//
-//const TerrainTileImageLayerModel*
-//TerrainTileModel::findSharedLayerByUID(const UID& uid) const
-//{
-//    for(TerrainTileImageLayerModelVector::const_iterator i = _sharedLayers.begin();
-//        i != _sharedLayers.end();
-//        ++i)
-//    {
-//        if ( i->get()->getImageLayer() && i->get()->getImageLayer()->getUID() == uid )
-//        {
-//            return i->get();
-//        }
-//    }
-//    return 0L;
-//}
-//
-//const TerrainTileImageLayerModel*
-//TerrainTileModel::findColorLayerByUID(const UID& uid) const
-//{
-//    for(TerrainTileImageLayerModelVector::const_iterator i = _colorLayers.begin();
-//        i != _colorLayers.end();
-//        ++i)
-//    {
-//        if ( i->get()->getImageLayer() && i->get()->getImageLayer()->getUID() == uid )
-//        {
-//            return i->get();
-//        }
-//    }
-//    return 0L;
-//}
-
 osg::Texture* 
 TerrainTileModel::getNormalTexture() const
 {
@@ -122,3 +72,24 @@
 {
     return _elevationLayer.valid() ? _elevationLayer->getMatrix() : 0L;
 }
+
+void
+TerrainTileModel::compileGLObjects(osg::State& state) const
+{
+    for (TerrainTileColorLayerModelVector::const_iterator i = _colorLayers.begin();
+        i != _colorLayers.end();
+        ++i)
+    {
+        if (i->get()->getTexture())
+            i->get()->getTexture()->compileGLObjects(state);
+    }
+
+    // since non-core shared layers are ALSO in the colorLayers vector,
+    // there is no need to iterator over them.
+
+    if (getNormalTexture())
+        getNormalTexture()->compileGLObjects(state);
+
+    if (getElevationTexture())
+        getElevationTexture()->compileGLObjects(state);
+}
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainTileModelFactory osgearth-2.10.2+dfsg/src/osgEarth/TerrainTileModelFactory
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainTileModelFactory	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainTileModelFactory	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -28,8 +28,6 @@
 
 namespace osgEarth
 {
-    class MapFrame;
-
     /**
      * Filter you can pass to TerrainTileModelFactory::createTileModel
      */
@@ -83,7 +81,7 @@
          * @param progress     Progress tracking callback
          */
         virtual TerrainTileModel* createTileModel(
-            const MapFrame&                  frame,
+            const Map*                       map,
             const TileKey&                   key,
             const CreateTileModelFilter&     filter,
             const TerrainEngineRequirements* requirements,
@@ -91,17 +89,9 @@
 
     protected:
 
-        virtual void addImageLayers(
-            TerrainTileModel*                model,
-            const MapFrame&                  frame,
-            const TerrainEngineRequirements* reqs,
-            const TileKey&                   key,
-            const CreateTileModelFilter&     filter,
-            ProgressCallback*                progress);
-
         virtual void addColorLayers(
             TerrainTileModel*                model,
-            const MapFrame&                  frame,
+            const Map*                       map,
             const TerrainEngineRequirements* reqs,
             const TileKey&                   key,
             const CreateTileModelFilter&     filter,
@@ -109,21 +99,15 @@
 
         virtual void addElevation(
             TerrainTileModel*            model,
-            const MapFrame&              frame,
+            const Map*                   map,
             const TileKey&               key,
             const CreateTileModelFilter& filter,
             unsigned                     border,
             ProgressCallback*            progress);
 
-        virtual void addNormalMap(
-            TerrainTileModel*            model,
-            const MapFrame&              frame,
-            const TileKey&               key,
-            ProgressCallback*            progress);
-
         virtual void addPatchLayers(
             TerrainTileModel*            model,
-            const MapFrame&              frame,
+            const Map*                   map,
             const TileKey&               key,
             const CreateTileModelFilter& filter,
             ProgressCallback*            progress);
@@ -132,7 +116,7 @@
 
         /** Find a heightfield in the cache, or fetch it from the source. */
         bool getOrCreateHeightField(
-            const MapFrame&                 frame,
+            const Map*                      map,
             const TileKey&                  key,
             ElevationSamplePolicy           samplePolicy,
             ElevationInterpolation          interpolation,
@@ -153,9 +137,11 @@
             osg::Image* image) const;
 
         osg::Texture* createNormalTexture(
-            osg::Image* image) const;
+            osg::Image* image,
+            bool compress
+            ) const;
 
-        const TerrainOptions& _options;
+        const TerrainOptions _options;
         
 
         /** Key into the height field cache */
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainTileModelFactory.cpp osgearth-2.10.2+dfsg/src/osgEarth/TerrainTileModelFactory.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainTileModelFactory.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainTileModelFactory.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -17,12 +17,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/TerrainTileModelFactory>
-#include <osgEarth/Registry>
-#include <osgEarth/ImageUtils>
 #include <osgEarth/ImageToHeightFieldConverter>
-#include <osgEarth/PatchLayer>
-#include <osgEarth/MapOptions>
-#include <osgEarth/MapFrame>
+#include <osgEarth/Map>
+#include <osgEarth/Metrics>
 
 #include <osg/Texture2D>
 
@@ -43,7 +40,7 @@
 }
 
 TerrainTileModel*
-TerrainTileModelFactory::createTileModel(const MapFrame&                  frame,
+TerrainTileModelFactory::createTileModel(const Map*                       map,
                                          const TileKey&                   key,
                                          const CreateTileModelFilter&     filter,
                                          const TerrainEngineRequirements* requirements,
@@ -52,35 +49,27 @@
     // Make a new model:
     osg::ref_ptr<TerrainTileModel> model = new TerrainTileModel(
         key,
-        frame.getRevision() );
+        map->getDataModelRevision() );
 
     // assemble all the components:
-    //addImageLayers(model.get(), frame, requirements, key, filter, progress);
-    addColorLayers(model.get(), frame, requirements, key, filter, progress);
+    addColorLayers(model.get(), map, requirements, key, filter, progress);
 
-    addPatchLayers(model.get(), frame, key, filter, progress);
+    addPatchLayers(model.get(), map, key, filter, progress);
 
     if ( requirements == 0L || requirements->elevationTexturesRequired() )
     {
         unsigned border = requirements->elevationBorderRequired() ? 1u : 0u;
 
-        addElevation( model.get(), frame, key, filter, border, progress );
+        addElevation( model.get(), map, key, filter, border, progress );
     }
 
-#if 0
-    if ( requirements == 0L || requirements->normalTexturesRequired() )
-    {
-        addNormalMap( model.get(), frame, key, progress );
-    }
-#endif
-
     // done.
     return model.release();
 }
 
 void
 TerrainTileModelFactory::addColorLayers(TerrainTileModel* model,
-                                        const MapFrame&   frame,
+                                        const Map* map,
                                         const TerrainEngineRequirements* reqs,
                                         const TileKey&    key,
                                         const CreateTileModelFilter& filter,
@@ -90,13 +79,14 @@
 
     int order = 0;
 
-    for (LayerVector::const_iterator i = frame.layers().begin();
-        i != frame.layers().end();
-        ++i)
+    LayerVector layers;
+    map->getLayers(layers);
+
+    for (LayerVector::const_iterator i = layers.begin(); i != layers.end(); ++i)
     {
         Layer* layer = i->get();
 
-        if (layer->getRenderType() != layer->RENDERTYPE_TILE)
+        if (layer->getRenderType() != layer->RENDERTYPE_TERRAIN_SURFACE)
             continue;
 
         if (!layer->getEnabled())
@@ -111,9 +101,9 @@
             osg::Texture* tex = 0L;
             osg::Matrixf textureMatrix;
 
-            if (imageLayer->isKeyInLegalRange(key) && imageLayer->mayHaveDataInExtent(key.getExtent()))
+            if (imageLayer->isKeyInLegalRange(key) && imageLayer->mayHaveData(key))
             {
-                if (imageLayer->createTextureSupported())
+                if (imageLayer->useCreateTexture())
                 {
                     tex = imageLayer->createTexture( key, progress, textureMatrix );
                 }
@@ -143,6 +133,8 @@
          
             if (tex)
             {
+                tex->setName(model->getKey().str());
+
                 TerrainTileImageLayerModel* layerModel = new TerrainTileImageLayerModel();
 
                 layerModel->setImageLayer(imageLayer);
@@ -153,10 +145,14 @@
                 model->colorLayers().push_back(layerModel);
 
                 if (imageLayer->isShared())
+                {
                     model->sharedLayers().push_back(layerModel);
+                }
 
                 if (imageLayer->isDynamic())
+                {
                     model->setRequiresUpdateTraverse(true);
+                }
             }
         }
 
@@ -172,93 +168,10 @@
         progress->stats()["fetch_imagery_time"] += OE_STOP_TIMER(fetch_image_layers);
 }
 
-void
-TerrainTileModelFactory::addImageLayers(TerrainTileModel* model,
-                                        const MapFrame&   frame,
-                                        const TerrainEngineRequirements* reqs,
-                                        const TileKey&    key,
-                                        const CreateTileModelFilter& filter,
-                                        ProgressCallback* progress)
-{
-    OE_START_TIMER(fetch_image_layers);
-
-    int order = 0;
-
-    ImageLayerVector imageLayers;
-    frame.getLayers(imageLayers);
-
-    for(ImageLayerVector::const_iterator i = imageLayers.begin();
-        i != imageLayers.end();
-        ++i, ++order )
-    {
-        ImageLayer* layer = i->get();
-
-        if (!filter.accept(layer))
-            continue;
-
-        if (!layer->getEnabled())
-            continue;
-
-        osg::Texture* tex = 0L;
-        osg::Matrixf textureMatrix;
-
-        if (layer->isKeyInLegalRange(key) && layer->mayHaveDataInExtent(key.getExtent()))
-        {
-            if (layer->createTextureSupported())
-            {
-                tex = layer->createTexture( key, progress, textureMatrix );
-            }
-
-            else
-            {
-                GeoImage geoImage = layer->createImage( key, progress );
-
-                if ( geoImage.valid() )
-                {
-                    if ( layer->isCoverage() )
-                        tex = createCoverageTexture(geoImage.getImage(), layer);
-                    else
-                        tex = createImageTexture(geoImage.getImage(), layer);
-                }
-            }
-        }
-
-        // if this is the first LOD, and the engine requires that the first LOD
-        // be populated, make an empty texture if we didn't get one.
-        if (tex == 0L &&
-            _options.firstLOD() == key.getLOD() &&
-            reqs && reqs->fullDataAtFirstLodRequired())
-        {
-            tex = _emptyTexture.get();
-        }
-
-        if (tex)
-        {
-            TerrainTileImageLayerModel* layerModel = new TerrainTileImageLayerModel();
-
-            layerModel->setImageLayer(layer);
-
-            layerModel->setTexture(tex);
-            layerModel->setMatrix(new osg::RefMatrixf(textureMatrix));
-
-            model->colorLayers().push_back(layerModel);
-
-            if (layer->isShared())
-                model->sharedLayers().push_back(layerModel);
-
-            if (layer->isDynamic())
-                model->setRequiresUpdateTraverse(true);
-        }
-    }
-
-    if (progress)
-        progress->stats()["fetch_imagery_time"] += OE_STOP_TIMER(fetch_image_layers);
-}
-
 
 void
 TerrainTileModelFactory::addPatchLayers(TerrainTileModel* model,
-                                        const MapFrame&   frame,
+                                        const Map* map,
                                         const TileKey&    key,
                                         const CreateTileModelFilter& filter,
                                         ProgressCallback* progress)
@@ -266,12 +179,13 @@
     OE_START_TIMER(fetch_patch_layers);
 
     PatchLayerVector patchLayers;
-    frame.getLayers(patchLayers);
+    map->getLayers(patchLayers);
 
     for(PatchLayerVector::const_iterator i = patchLayers.begin();
         i != patchLayers.end();
         ++i )
     {
+
         PatchLayer* layer = i->get();
 
         if (!filter.accept(layer))
@@ -301,7 +215,7 @@
 
 void
 TerrainTileModelFactory::addElevation(TerrainTileModel*            model,
-                                      const MapFrame&              frame,
+                                      const Map*                   map,
                                       const TileKey&               key,
                                       const CreateTileModelFilter& filter,
                                       unsigned                     border,
@@ -313,16 +227,14 @@
     if (!filter.empty() && !filter.elevation().isSetTo(true))
         return;
 
-    const MapInfo& mapInfo = frame.getMapInfo();
-
     const osgEarth::ElevationInterpolation& interp =
-        frame.getMapOptions().elevationInterpolation().get();
+        map->getMapOptions().elevationInterpolation().get();
 
     // Request a heightfield from the map.
     osg::ref_ptr<osg::HeightField> mainHF;
     osg::ref_ptr<NormalMap> normalMap;
 
-    bool hfOK = getOrCreateHeightField(frame, key, SAMPLE_FIRST_VALID, interp, border, mainHF, normalMap, progress) && mainHF.valid();
+    bool hfOK = getOrCreateHeightField(map, key, SAMPLE_FIRST_VALID, interp, border, mainHF, normalMap, progress) && mainHF.valid();
 
     if (hfOK == false && key.getLOD() == _options.firstLOD().get())
     {
@@ -372,7 +284,7 @@
             layerModel->setName( "oe_normal_map" );
 
             // Made an image, so store this as a texture with no matrix.
-            osg::Texture* texture = createNormalTexture(normalMap.get());
+            osg::Texture* texture = createNormalTexture(normalMap.get(), *_options.compressNormalMaps());
             layerModel->setTexture( texture );
             model->normalModel() = layerModel;
         }
@@ -382,42 +294,8 @@
         progress->stats()["fetch_elevation_time"] += OE_STOP_TIMER(fetch_elevation);
 }
 
-void
-TerrainTileModelFactory::addNormalMap(TerrainTileModel* model,
-                                      const MapFrame&   frame,
-                                      const TileKey&    key,
-                                      ProgressCallback* progress)
-{
-    OE_START_TIMER(fetch_normalmap);
-
-    if (model->elevationModel().valid())
-    {
-        const osgEarth::ElevationInterpolation& interp =
-            frame.getMapOptions().elevationInterpolation().get();
-
-        // Can only generate the normal map if the center heightfield was built:
-        osg::ref_ptr<osg::Image> image = HeightFieldUtils::convertToNormalMap(
-            model->heightFields(),
-            key.getProfile()->getSRS() );
-
-        if (image.valid())
-        {
-            TerrainTileImageLayerModel* layerModel = new TerrainTileImageLayerModel();
-            layerModel->setName( "oe_normal_map" );
-
-            // Made an image, so store this as a texture with no matrix.
-            osg::Texture* texture = createNormalTexture( image.get() );
-            layerModel->setTexture( texture );
-            model->normalModel() = layerModel;
-        }
-    }
-
-    if (progress)
-        progress->stats()["fetch_normalmap_time"] += OE_STOP_TIMER(fetch_normalmap);
-}
-
 bool
-TerrainTileModelFactory::getOrCreateHeightField(const MapFrame&                 frame,
+TerrainTileModelFactory::getOrCreateHeightField(const Map*                      map,
                                                 const TileKey&                  key,
                                                 ElevationSamplePolicy           samplePolicy,
                                                 ElevationInterpolation          interpolation,
@@ -429,7 +307,7 @@
     // check the quick cache.
     HFCacheKey cachekey;
     cachekey._key          = key;
-    cachekey._revision     = frame.getRevision();
+    cachekey._revision     = map->getDataModelRevision();
     cachekey._samplePolicy = samplePolicy;
 
     if (progress)
@@ -466,11 +344,15 @@
         out_normalMap = new NormalMap(257, 257); // ImageUtils::createEmptyImage(257, 257);
     }
 
-    bool populated = frame.populateHeightFieldAndNormalMap(
-        out_hf,
-        out_normalMap,
+    ElevationLayerVector layers;
+    map->getLayers(layers);
+
+    bool populated = layers.populateHeightFieldAndNormalMap(
+        out_hf.get(),
+        out_normalMap.get(),
         key,
-        true, // convertToHAE
+        map->getProfileNoVDatum(), // convertToHAE,
+        INTERP_BILINEAR,
         progress );
 
 #ifdef TREAT_ALL_ZEROS_AS_MISSING_TILE
@@ -495,14 +377,6 @@
 
     if ( populated )
     {
-        // Treat Plate Carre specially by scaling the height values. (There is no need
-        // to do this with an empty heightfield)
-        const MapInfo& mapInfo = frame.getMapInfo();
-        if ( mapInfo.isPlateCarre() )
-        {
-            HeightFieldUtils::scaleHeightFieldToDegrees( out_hf.get() );
-        }
-
         // cache it.
         if (_heightFieldCacheEnabled )
         {
@@ -582,15 +456,34 @@
 }
 
 osg::Texture*
-TerrainTileModelFactory::createNormalTexture(osg::Image* image) const
+TerrainTileModelFactory::createNormalTexture(osg::Image* image, bool compress) const
 {
-    osg::Texture2D* tex = new osg::Texture2D( image );
+    if (compress)
+    {            
+        // Only compress the image if it's not already compressed.
+        if (image->getPixelFormat() != GL_COMPRESSED_RED_GREEN_RGTC2_EXT)
+        {
+            METRIC_SCOPED("normalmap compression");
+            // See if we have a CPU compressor generator:
+            osgDB::ImageProcessor* ip = osgDB::Registry::instance()->getImageProcessor();
+            if (ip)
+            {
+                ip->compress(*image, osg::Texture::USE_RGTC2_COMPRESSION, true, true, osgDB::ImageProcessor::USE_CPU, osgDB::ImageProcessor::NORMAL);
+            }
+            else
+            {
+                OE_NOTICE << LC << "Failed to get image processor, cannot compress normal map" << std::endl;
+            }
+        }
+    }    
+
+    osg::Texture2D* tex = new osg::Texture2D(image);
     tex->setInternalFormatMode(osg::Texture::USE_IMAGE_DATA_FORMAT);
-    tex->setFilter( osg::Texture::MAG_FILTER, osg::Texture::LINEAR );
-    tex->setFilter( osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR );
-    tex->setWrap  ( osg::Texture::WRAP_S,     osg::Texture::CLAMP_TO_EDGE );
-    tex->setWrap  ( osg::Texture::WRAP_T,     osg::Texture::CLAMP_TO_EDGE );
-    tex->setResizeNonPowerOfTwoHint( false );
-    tex->setMaxAnisotropy( 1.0f );
+    tex->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+    tex->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
+    tex->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+    tex->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+    tex->setResizeNonPowerOfTwoHint(false);
+    tex->setMaxAnisotropy(1.0f);
     return tex;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TerrainTileNode osgearth-2.10.2+dfsg/src/osgEarth/TerrainTileNode
--- osgearth-2.9.0+dfsg/src/osgEarth/TerrainTileNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TerrainTileNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Tessellator osgearth-2.10.2+dfsg/src/osgEarth/Tessellator
--- osgearth-2.9.0+dfsg/src/osgEarth/Tessellator	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Tessellator	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Tessellator.cpp osgearth-2.10.2+dfsg/src/osgEarth/Tessellator.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Tessellator.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Tessellator.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -19,10 +19,36 @@
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
+#include <iterator>
 #include <limits.h>
 
 #include <osgEarth/Tessellator>
 
+#ifdef OSGEARTH_CXX11
+
+#include <osgEarth/earcut.hpp>
+namespace mapbox {
+    namespace util {
+        template <>
+        struct nth<0, osg::Vec2> {
+            inline static float get(const osg::Vec2 &t) {
+                return t.x();
+            };
+        };
+
+        template <>
+        struct nth<1, osg::Vec2> {
+            inline static float get(const osg::Vec2 &t) {
+                return t.y();
+            };
+        };
+    }
+}
+
+#define USE_EARCUT
+
+#endif
+
 using namespace osgEarth;
 
 
@@ -124,9 +150,11 @@
 
 }
 
+
 bool
 Tessellator::tessellateGeometry(osg::Geometry &geom)
 {
+#ifndef USE_EARCUT
     osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(geom.getVertexArray());
 
     if (!vertices || vertices->empty() || geom.getPrimitiveSetList().empty()) return false;
@@ -194,8 +222,42 @@
             //
         }
     }
-
     return success;
+#else
+    // Create array
+    std::vector< std::vector< osg::Vec2 > > polygon;
+    osg::Vec3Array* verts = static_cast<osg::Vec3Array*>(geom.getVertexArray());
+
+    for (unsigned int i = 0; i < geom.getNumPrimitiveSets(); i++)
+    {
+        std::vector< osg::Vec2 > ring;
+        osg::PrimitiveSet* pset = geom.getPrimitiveSet(i);
+        if (pset->getType() == osg::PrimitiveSet::DrawArraysPrimitiveType)
+        {
+            osg::DrawArrays* drawArray = static_cast<osg::DrawArrays*>(pset);
+            unsigned int first = drawArray->getFirst();
+            unsigned int last = first + drawArray->getCount();
+            ring.reserve(drawArray->getCount());
+            for (unsigned int j = first; j < last; j++)
+            {
+                const osg::Vec3& v = verts->at(j);
+                ring.push_back(osg::Vec2(v.x(), v.y()));
+            }
+        }
+        polygon.push_back(ring);
+    }
+
+    // The index type. Defaults to uint32_t, but you can also pass uint16_t if you know that your
+    // data won't have more than 65536 vertices.
+    std::vector<uint32_t> indices = mapbox::earcut<uint32_t>(polygon);
+    // Remove the existing primitive sets
+    geom.removePrimitiveSet(0, geom.getNumPrimitiveSets());
+    osg::DrawElementsUInt* drawElements = new osg::DrawElementsUInt(GL_TRIANGLES);
+    drawElements->reserve(indices.size());
+    std::copy(indices.begin(), indices.end(), std::back_inserter(*drawElements));
+    geom.addPrimitiveSet(drawElements);
+    return true;
+#endif
 }
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Text osgearth-2.10.2+dfsg/src/osgEarth/Text
--- osgearth-2.9.0+dfsg/src/osgEarth/Text	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Text	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,51 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_TEXT_H
+#define OSGEARTH_TEXT_H 1
+
+#include <osgEarth/Common>
+#include <osgText/Text>
+
+namespace osgEarth
+{
+    /**
+     * Text implementaiton that handles differences between pre-3.6 and post-3.6
+     * osgText and adds support for virtual program composition
+     */
+    class OSGEARTH_EXPORT Text : public osgText::Text
+    {
+    public:
+        Text();
+        Text(const Text& rhs, const osg::CopyOp& copy =osg::CopyOp::SHALLOW_COPY);
+        Text(const std::string& str);
+        
+        virtual osg::Object* cloneType() const { return new osgEarth::Text(); }
+        virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new osgEarth::Text(*this,copyop); }
+        virtual bool isSameKindAs(const osg::Object* obj) const { return dynamic_cast<const osgEarth::Text*>(obj)!=NULL; }
+        virtual const char* libraryName() const { return "osgEarth"; }
+        
+        virtual void setFont(osg::ref_ptr<osgText::Font>); // <= OSG 3.5.7
+
+    protected:
+        virtual ~Text();
+        virtual osg::StateSet* createStateSet(); // >= OSG 3.5.8
+    };
+}
+
+#endif // OSGEARTH_TEXT_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Text.cpp osgearth-2.10.2+dfsg/src/osgEarth/Text.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Text.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Text.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,263 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include <osgEarth/Text>
+#include <osgEarth/VirtualProgram>
+#include <osgEarth/Lighting>
+#include <osgEarth/Shaders>
+#include <osgEarth/Registry>
+#include <osg/Version>
+#include <osgText/Font>
+#include <sstream>
+#include <iomanip>
+
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+using namespace osgEarth;
+
+#define LC "[Text] "
+
+//....................................................................
+
+REGISTER_OBJECT_WRAPPER( osgEarth_Text,
+                         new osgEarth::Text,
+                         osgEarth::Text,
+                         "osg::Object osg::Node osg::Drawable osgText::TextBase osgText::Text osgEarth::Text" )
+{
+    //nop
+}
+
+//....................................................................
+
+Text::Text() : 
+osgText::Text()
+{
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,8)
+    if (osg::DisplaySettings::instance()->getTextShaderTechnique().empty())
+    {
+        setShaderTechnique(osgText::ALL_FEATURES);
+    }
+#endif
+}
+
+Text::Text(const std::string& str) :
+osgText::Text()
+{
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,8)
+    if (osg::DisplaySettings::instance()->getTextShaderTechnique().empty())
+    {
+        setShaderTechnique(osgText::ALL_FEATURES);
+    }
+#endif
+
+    setText(str);
+}
+
+Text::Text(const Text& rhs, const osg::CopyOp& copy) :
+osgText::Text(rhs, copy)
+{
+    //nop
+}
+
+Text::~Text()
+{
+    //nop
+}
+
+osg::StateSet*
+Text::createStateSet()
+{
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,8)
+    // NOTE: Most of this is copied from the parent class, except for the 
+    // added osgEarth defines and the VirtualProgram in place of the Program.
+    osgText::Font* activeFont = getActiveFont();
+    if (!activeFont) return 0;
+
+    osgText::Font::StateSets& statesets = activeFont->getCachedStateSets();
+
+    std::stringstream ss;
+    ss<<std::fixed<<std::setprecision(3);
+
+    osg::StateSet::DefineList defineList;
+    if (_backdropType!=NONE)
+    {
+        ss.str("");
+        ss << "vec4("<<_backdropColor.r()<<", "<<_backdropColor.g()<<", "<<_backdropColor.b()<<", "<<_backdropColor.a()<<")";
+
+        defineList["BACKDROP_COLOR"] = osg::StateSet::DefinePair(ss.str(), osg::StateAttribute::ON);
+
+
+        if (_backdropType==OUTLINE)
+        {
+            ss.str("");
+            ss <<_backdropHorizontalOffset;
+            defineList["OUTLINE"] = osg::StateSet::DefinePair(ss.str(), osg::StateAttribute::ON);
+        }
+        else
+        {
+            osg::Vec2 offset(_backdropHorizontalOffset, _backdropVerticalOffset);
+            switch(_backdropType)
+            {
+                case(DROP_SHADOW_BOTTOM_RIGHT) :    offset.set(_backdropHorizontalOffset, -_backdropVerticalOffset); break;
+                case(DROP_SHADOW_CENTER_RIGHT) :    offset.set(_backdropHorizontalOffset, 0.0f); break;
+                case(DROP_SHADOW_TOP_RIGHT) :       offset.set(_backdropHorizontalOffset, _backdropVerticalOffset); break;
+                case(DROP_SHADOW_BOTTOM_CENTER) :   offset.set(0.0f, -_backdropVerticalOffset); break;
+                case(DROP_SHADOW_TOP_CENTER) :      offset.set(0.0f, _backdropVerticalOffset); break;
+                case(DROP_SHADOW_BOTTOM_LEFT) :     offset.set(-_backdropHorizontalOffset, -_backdropVerticalOffset); break;
+                case(DROP_SHADOW_CENTER_LEFT) :     offset.set(-_backdropHorizontalOffset, 0.0f); break;
+                case(DROP_SHADOW_TOP_LEFT) :        offset.set(-_backdropHorizontalOffset, _backdropVerticalOffset); break;
+                default : break;
+            }
+
+            ss.str("");
+            ss << "vec2("<<offset.x()<<", "<<offset.y()<<")";
+
+            defineList["SHADOW"] = osg::StateSet::DefinePair(ss.str(), osg::StateAttribute::ON);
+        }
+    }
+
+    {
+        ss<<std::fixed<<std::setprecision(1);
+
+        ss.str("");
+        ss << float(_fontSize.second);
+
+        defineList["GLYPH_DIMENSION"] = osg::StateSet::DefinePair(ss.str(), osg::StateAttribute::ON);
+
+        ss.str("");
+        ss << float(activeFont->getTextureWidthHint());
+        defineList["TEXTURE_DIMENSION"] = osg::StateSet::DefinePair(ss.str(), osg::StateAttribute::ON);
+    }
+
+    if (_shaderTechnique>osgText::GREYSCALE)
+    {
+        defineList["SIGNED_DISTANCE_FIELD"] = osg::StateSet::DefinePair("1", osg::StateAttribute::ON);
+    }
+
+#if 0
+    OSG_NOTICE<<"Text::createStateSet() defines:"<<defineList.size()<<std::endl;
+    for(osg::StateSet::DefineList::iterator itr = defineList.begin();
+        itr != defineList.end();
+        ++itr)
+    {
+        OSG_NOTICE<<"   define["<<itr->first<<"] = "<<itr->second.first<<std::endl;
+    }
+#endif
+
+    // osgEarth:: add defines
+#if defined(OSG_GL3_AVAILABLE) && !defined(OSG_GL2_AVAILABLE) && !defined(OSG_GL1_AVAILABLE)
+    defineList["OSGTEXT_GLYPH_ALPHA_FORMAT_IS_RED"] = osg::StateSet::DefinePair("1", osg::StateAttribute::ON);
+#endif
+    defineList[OE_LIGHTING_DEFINE] = osg::StateSet::DefinePair("", osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
+
+    // The remaining of this method is exclusive so we don't corrupt the
+    // stateset cache when creating text objects from multiple threads. -gw
+    static Threading::Mutex mutex;
+    Threading::ScopedMutexLock lock(mutex);
+
+    if (!statesets.empty())
+    {
+        for(osgText::Font::StateSets::iterator itr = statesets.begin();
+            itr != statesets.end();
+            ++itr)
+        {
+            if ((*itr)->getDefineList()==defineList)
+            {
+                // OSG_NOTICE<<"Text::createStateSet() : Matched DefineList, return StateSet "<<itr->get()<<std::endl;
+                return itr->get();
+            }
+            else
+            {
+            }
+        }
+    }
+
+    osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+
+    stateset->setDefineList(defineList);
+
+    statesets.push_back(stateset.get());
+
+    stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
+    stateset->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    stateset->setMode(GL_BLEND, osg::StateAttribute::ON);
+
+
+#if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
+    osg::DisplaySettings::ShaderHint shaderHint = osg::DisplaySettings::instance()->getShaderHint();
+    if (_shaderTechnique==osgText::NO_TEXT_SHADER && shaderHint==osg::DisplaySettings::SHADER_NONE)
+    {
+        stateset->setTextureMode(0, GL_TEXTURE_2D, osg::StateAttribute::ON);
+        return stateset.release();
+    }
+#endif
+
+    // set up the StateSet to use shaders
+    stateset->addUniform(new osg::Uniform("glyphTexture", 0));
+    
+    // osgEarth: add shaders
+    VirtualProgram* vp = VirtualProgram::getOrCreate(stateset.get());
+    vp->setName("osgEarth::Text");
+    osgEarth::Shaders coreShaders;
+    coreShaders.load(vp, coreShaders.TextVertex);
+    coreShaders.load(vp, coreShaders.TextFragment);
+
+    return stateset.release();
+#else
+    return 0L;
+#endif
+}
+
+void
+Text::setFont(osg::ref_ptr<osgText::Font> font)
+{
+    if (_font.get() == font.get())
+        return;
+
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,8)
+    osgText::Text::setFont(font);
+#else
+    static Threading::Mutex mutex;
+    Threading::ScopedMutexLock lock(mutex);
+
+    osg::StateSet* previousFontStateSet = _font.valid() ? _font->getStateSet() : osgText::Font::getDefaultFont()->getStateSet();
+    osg::StateSet* newFontStateSet = font.valid() ? font->getStateSet() : osgText::Font::getDefaultFont()->getStateSet();
+    //if (getStateSet() == previousFontStateSet)
+    {
+        if (newFontStateSet && VirtualProgram::get(newFontStateSet) == 0L)
+        {
+            VirtualProgram* vp = VirtualProgram::getOrCreate(newFontStateSet);
+            vp->setName("osgEarth::Text");
+            osgEarth::Shaders coreShaders;
+            coreShaders.load(vp, coreShaders.TextLegacy);
+#if defined(OSG_GL3_AVAILABLE) && !defined(OSG_GL2_AVAILABLE) && !defined(OSG_GL1_AVAILABLE)
+            newFontStateSet->setDefine("OSGTEXT_GLYPH_ALPHA_FORMAT_IS_RED");
+#endif
+            Lighting::set(newFontStateSet, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
+
+            OE_INFO << LC << "Installed VPs on a font" << std::endl;
+        }
+
+        setStateSet( newFontStateSet );
+    }
+
+    osgText::TextBase::setFont(font);
+#endif
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Text.frag.glsl osgearth-2.10.2+dfsg/src/osgEarth/Text.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarth/Text.frag.glsl	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Text.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,271 @@
+#version $GLSL_VERSION_STR
+
+#ifdef GL_ES
+    #extension GL_OES_standard_derivatives : enable
+    #ifndef GL_OES_standard_derivatives
+        #undef SIGNED_DISTANCE_FIELD
+    #endif
+#endif
+
+#if !defined(GL_ES)
+    #if __VERSION__>=400
+        #define osg_TextureQueryLOD textureQueryLod
+    #else
+        #extension GL_ARB_texture_query_lod : enable
+        #ifdef GL_ARB_texture_query_lod
+            #define osg_TextureQueryLOD textureQueryLOD
+        #endif
+    #endif
+#endif
+
+#pragma vp_entryPoint oe_Text_FS
+#pragma vp_location   fragment_coloring
+
+#pragma import_defines(BACKDROP_COLOR, SHADOW, OUTLINE)
+#pragma import_defines(SIGNED_DISTANCE_FIELD, TEXTURE_DIMENSION, GLYPH_DIMENSION)
+#pragma import_defines(OSGTEXT_GLYPH_ALPHA_FORMAT_IS_RED)
+
+#if __VERSION__>=130
+    #define TEXTURE texture
+    #define TEXTURELOD textureLod
+#else
+    #define TEXTURE texture2D
+    #define TEXTURELOD texture2DLod
+#endif
+
+
+//#if !defined(GL_ES) && __VERSION__>=130
+#ifdef OSGTEXT_GLYPH_ALPHA_FORMAT_IS_RED
+    #define ALPHA r
+    #define SDF g
+#else
+    #define ALPHA a
+    #define SDF r
+#endif
+
+
+uniform sampler2D glyphTexture;
+
+in vec2 oe_Text_texCoord;
+vec4 vertexColor;
+
+#ifndef TEXTURE_DIMENSION
+    #define TEXTURE_DIMENSION float(1024.0)
+#endif
+
+#ifndef GLYPH_DIMENSION
+    #define GLYPH_DIMENSION float(32.0)
+#endif
+
+#ifdef SIGNED_DISTANCE_FIELD
+
+float distanceFromEdge(vec2 tc)
+{
+    float center_alpha = TEXTURELOD(glyphTexture, tc, 0.0).SDF;
+    if (center_alpha==0.0) return -1.0;
+
+    //float distance_scale = (1.0/4.0)*1.41;
+    float distance_scale = (1.0/6.0)*1.41;
+    //float distance_scale = (1.0/8.0)*1.41;
+
+    return (center_alpha-0.5)*distance_scale;
+}
+
+vec4 distanceFieldColorSample(float edge_distance, float blend_width, float  blend_half_width)
+{
+#ifdef OUTLINE
+    float outline_width = OUTLINE*0.5;
+    if (edge_distance>blend_half_width)
+    {
+        return vertexColor;
+    }
+    else if (edge_distance>-blend_half_width)
+    {
+        return mix(vertexColor, vec4(BACKDROP_COLOR.rgb, BACKDROP_COLOR.a*vertexColor.a), smoothstep(0.0, 1.0, (blend_half_width-edge_distance)/(blend_width)));
+    }
+    else if (edge_distance>(blend_half_width-outline_width))
+    {
+        return vec4(BACKDROP_COLOR.rgb, BACKDROP_COLOR.a*vertexColor.a);
+    }
+    else if (edge_distance>-(outline_width+blend_half_width))
+    {
+        return vec4(BACKDROP_COLOR.rgb, vertexColor.a * ((blend_half_width+outline_width+edge_distance)/blend_width));
+    }
+    else
+    {
+        return vec4(0.0, 0.0, 0.0, 0.0);
+    }
+#else
+    if (edge_distance>blend_half_width)
+    {
+        return vertexColor;
+    }
+    else if (edge_distance>-blend_half_width)
+    {
+        return vec4(vertexColor.rgb, vertexColor.a * smoothstep(1.0, 0.0, (blend_half_width-edge_distance)/(blend_width)));
+    }
+    else
+    {
+        return vec4(0.0, 0.0, 0.0, 0.0);
+    }
+#endif
+}
+
+vec4 textColor(vec2 src_texCoord)
+{
+    float sample_distance_scale = 0.75;
+    vec2 dx = dFdx(src_texCoord)*sample_distance_scale;
+    vec2 dy = dFdy(src_texCoord)*sample_distance_scale;
+
+
+    float distance_across_pixel = length(dx+dy)*(TEXTURE_DIMENSION/GLYPH_DIMENSION);
+
+    // compute the appropriate number of samples required to avoid aliasing.
+    int maxNumSamplesAcrossSide = 4;
+
+    int numSamplesX = int(TEXTURE_DIMENSION * length(dx));
+    int numSamplesY = int(TEXTURE_DIMENSION * length(dy));
+    if (numSamplesX<2) numSamplesX = 2;
+    if (numSamplesY<2) numSamplesY = 2;
+    if (numSamplesX>maxNumSamplesAcrossSide) numSamplesX = maxNumSamplesAcrossSide;
+    if (numSamplesY>maxNumSamplesAcrossSide) numSamplesY = maxNumSamplesAcrossSide;
+
+
+    vec2 delta_tx = dx/float(numSamplesX-1);
+    vec2 delta_ty = dy/float(numSamplesY-1);
+
+    float numSamples = float(numSamplesX)*float(numSamplesY);
+    float scale = 1.0/numSamples;
+    vec4 total_color = vec4(0.0,0.0,0.0,0.0);
+
+    float blend_width = 1.5*distance_across_pixel/numSamples;
+    float blend_half_width = blend_width*0.5;
+
+    // check whether fragment is wholly within or outwith glyph body+outline
+    float cd = distanceFromEdge(src_texCoord); // central distance (distance from center to edge)
+    if (cd-blend_half_width>distance_across_pixel) return vertexColor; // pixel fully within glyph body
+
+    #ifdef OUTLINE
+    float outline_width = OUTLINE*0.5;
+    if ((-cd-outline_width-blend_half_width)>distance_across_pixel) return vec4(0.0, 0.0, 0.0, 0.0); // pixel fully outside outline+glyph body
+    #else
+    if (-cd-blend_half_width>distance_across_pixel) return vec4(0.0, 0.0, 0.0, 0.0); // pixel fully outside glyph body
+    #endif
+
+
+    // use multi-sampling to provide high quality antialised fragments
+    vec2 origin = src_texCoord - dx*0.5 - dy*0.5;
+    for(;numSamplesY>0; --numSamplesY)
+    {
+        vec2 pos = origin;
+        int numX = numSamplesX;
+        for(;numX>0; --numX)
+        {
+            vec4 c = distanceFieldColorSample(distanceFromEdge(pos), blend_width, blend_half_width);
+            total_color = total_color + c * c.a;
+            pos += delta_tx;
+        }
+        origin += delta_ty;
+    }
+
+    total_color.rgb /= total_color.a;
+    total_color.a *= scale;
+
+    return total_color;
+}
+
+#else
+
+vec4 textColor(vec2 src_texCoord)
+{
+
+#ifdef OUTLINE
+
+    float alpha = TEXTURE(glyphTexture, src_texCoord).ALPHA;
+    float delta_tc = 1.6*OUTLINE*GLYPH_DIMENSION/TEXTURE_DIMENSION;
+
+    float outline_alpha = alpha;
+    vec2 origin = src_texCoord-vec2(delta_tc*0.5, delta_tc*0.5);
+
+    float numSamples = 3.0;
+    delta_tc = delta_tc/(numSamples-1.0);
+
+    float background_alpha = 1.0;
+
+    for(float i=0.0; i<numSamples; ++i)
+    {
+        for(float j=0.0; j<numSamples; ++j)
+        {
+            float local_alpha = TEXTURE(glyphTexture, origin + vec2(i*delta_tc, j*delta_tc)).ALPHA;
+            outline_alpha = max(outline_alpha, local_alpha);
+            background_alpha = background_alpha * (1.0-local_alpha);
+        }
+    }
+
+    #ifdef osg_TextureQueryLOD
+        float mipmapLevel = osg_TextureQueryLOD(glyphTexture, src_texCoord).x;
+        if (mipmapLevel<1.0)
+        {
+            outline_alpha = mix(1.0-background_alpha, outline_alpha, mipmapLevel/1.0);
+        }
+    #endif
+
+    if (outline_alpha<alpha) outline_alpha = alpha;
+    if (outline_alpha>1.0) outline_alpha = 1.0;
+
+    if (outline_alpha==0.0) return vec4(0.0, 0.0, 0.0, 0.0); // outside glyph and outline
+
+    vec4 color = mix(BACKDROP_COLOR, vertexColor, smoothstep(0.0, 1.0, alpha));
+    color.a = vertexColor.a * smoothstep(0.0, 1.0, outline_alpha);
+
+    return color;
+
+#else
+
+    float alpha = TEXTURE(glyphTexture, src_texCoord).ALPHA;
+    if (alpha==0.0) vec4(0.0, 0.0, 0.0, 0.0);
+    return vec4(vertexColor.rgb, vertexColor.a * alpha);
+
+#endif
+}
+
+#endif
+
+void oe_Text_FS(inout vec4 color)
+{
+    float originalAlpha = color.a;
+    vertexColor = vec4(color.rgb, 1.0);
+
+    if (oe_Text_texCoord.x<0.0 && oe_Text_texCoord.y<0.0)
+    {
+        return;
+    }
+
+#ifdef SHADOW
+    float scale = -1.0*GLYPH_DIMENSION/TEXTURE_DIMENSION;
+    vec2 delta_tc = SHADOW*scale;
+    vec4 shadow_color = textColor(oe_Text_texCoord+delta_tc);
+    shadow_color.rgb = BACKDROP_COLOR.rgb;
+
+    vec4 glyph_color = textColor(oe_Text_texCoord);
+
+    // lower the alpha_power value the greater the saturation, no need to be so aggressive with SDF than GREYSCALE
+    #if SIGNED_DISTANCE_FIELD
+        float alpha_power = 0.6;
+    #else
+        float alpha_power = 0.5;
+    #endif
+
+    // over saturate the alpha values to make sure the font and it's shadow are clear
+    shadow_color.a = pow(shadow_color.a, alpha_power);
+    glyph_color.a = pow(glyph_color.a, alpha_power);
+    vec4 clr = mix(shadow_color, glyph_color, glyph_color.a);
+#else
+    vec4 clr = textColor(oe_Text_texCoord);
+#endif
+
+    if (clr.a==0.0) discard;
+
+    color = clr;
+    color.a *= originalAlpha;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Text_legacy.glsl osgearth-2.10.2+dfsg/src/osgEarth/Text_legacy.glsl
--- osgearth-2.9.0+dfsg/src/osgEarth/Text_legacy.glsl	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Text_legacy.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,28 @@
+#version $GLSL_VERSION_STR
+#pragma vp_entryPoint oe_Text_VS
+#pragma vp_location   vertex_view
+
+out vec2 oe_Text_texcoord;
+
+void oe_Text_VS(inout vec4 position)
+{
+    oe_Text_texcoord = gl_MultiTexCoord0.xy;
+
+#if !defined(GL_ES) && __VERSION__<140
+    gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;
+#endif
+}
+
+[break]
+
+#version $GLSL_VERSION_STR
+#pragma vp_entryPoint oe_Text_FS
+#pragma vp_location   fragment_coloring
+
+uniform sampler2D glyphTexture;
+in vec2 oe_Text_texcoord;
+
+void oe_Text_FS(inout vec4 color)
+{
+    color.a *= texture(glyphTexture, oe_Text_texcoord).a;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TextureBufferSerializer.cpp osgearth-2.10.2+dfsg/src/osgEarth/TextureBufferSerializer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TextureBufferSerializer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TextureBufferSerializer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -28,7 +28,7 @@
 #include <osgDB/InputStream>
 #include <osgDB/OutputStream>
 
-namespace
+namespace osgEarth { namespace Serializers { namespace TextureBuffer
 {
     REGISTER_OBJECT_WRAPPER( TextureBuffer,
                              new osg::TextureBuffer,
@@ -38,7 +38,7 @@
         ADD_IMAGE_SERIALIZER( Image, osg::Image, NULL );  // _image
         ADD_INT_SERIALIZER( TextureWidth, 0 );  // _textureWidth
     }
-}
+} } }
 
 #elif OSG_VERSION_LESS_THAN(3,5,6)
 
@@ -47,13 +47,16 @@
 #include <osgDB/InputStream>
 #include <osgDB/OutputStream>
 
-REGISTER_OBJECT_WRAPPER( TextureBuffer,
-                         new osg::TextureBuffer,
-                         osg::TextureBuffer,
-                         "osg::Object osg::StateAttribute osg::Texture osg::TextureBuffer" )
+namespace osgEarth { namespace Serializers { namespace TextureBuffer
 {
-    ADD_INT_SERIALIZER( TextureWidth, 0 );                       // _textureWidth
-    ADD_OBJECT_SERIALIZER( BufferData, osg::BufferData, NULL );  // _bufferData
-}
+    REGISTER_OBJECT_WRAPPER( TextureBuffer,
+                            new osg::TextureBuffer,
+                            osg::TextureBuffer,
+                            "osg::Object osg::StateAttribute osg::Texture osg::TextureBuffer" )
+    {
+        ADD_INT_SERIALIZER( TextureWidth, 0 );                       // _textureWidth
+        ADD_OBJECT_SERIALIZER( BufferData, osg::BufferData, NULL );  // _bufferData
+    }
+} } }
 
 #endif
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Text.vert.glsl osgearth-2.10.2+dfsg/src/osgEarth/Text.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarth/Text.vert.glsl	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Text.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,11 @@
+#version $GLSL_VERSION_STR
+
+out vec2 oe_Text_texCoord;
+
+#pragma vp_entryPoint oe_Text_VS
+#pragma vp_location   vertex_view
+
+void oe_Text_VS(inout vec4 position)
+{
+    oe_Text_texCoord = gl_MultiTexCoord0.xy;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ThreadingUtils osgearth-2.10.2+dfsg/src/osgEarth/ThreadingUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/ThreadingUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ThreadingUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/ThreadingUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/ThreadingUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/ThreadingUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/ThreadingUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 
 #ifdef _WIN32
     extern "C" unsigned long __stdcall GetCurrentThreadId();
-#elif defined(__APPLE__) || defined(__LINUX__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#elif defined(__APPLE__) || defined(__LINUX__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__ANDROID__)
 #   include <unistd.h>
 #   include <sys/syscall.h>
 #else
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileHandler osgearth-2.10.2+dfsg/src/osgEarth/TileHandler
--- osgearth-2.9.0+dfsg/src/osgEarth/TileHandler	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileHandler	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileHandler.cpp osgearth-2.10.2+dfsg/src/osgEarth/TileHandler.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TileHandler.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileHandler.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarth/TileHandler>
-#include <osgEarth/TileVisitor>
 
 
 using namespace osgEarth;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileKey osgearth-2.10.2+dfsg/src/osgEarth/TileKey
--- osgearth-2.9.0+dfsg/src/osgEarth/TileKey	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileKey	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileKey.cpp osgearth-2.10.2+dfsg/src/osgEarth/TileKey.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TileKey.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileKey.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
  */
 
 #include <osgEarth/TileKey>
-#include <osgEarth/StringUtils>
 
 using namespace osgEarth;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileKeyDataStore osgearth-2.10.2+dfsg/src/osgEarth/TileKeyDataStore
--- osgearth-2.9.0+dfsg/src/osgEarth/TileKeyDataStore	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileKeyDataStore	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2008-2014 Pelican Mapping
-* http://osgearth.org
-*
-* osgEarth is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-#ifndef OSGEARTH_TILEKEY_DATA_STORE
-#define OSGEARTH_TILEKEY_DATA_STORE 1
-
-#include <osgEarth/TileKey>
-#include <osg/ref_ptr>
-
-namespace osgEarth
-{
-    /**
-     * Interface that provides access to a registry of in-memory
-     * tile nodes managed by a terrain engine.
-     * @deprecated
-     */
-    template<typename T>
-    class /*header-only*/ TileKeyDataStore
-    {
-    public:
-        /** Finds a piece of referenced data in the registry */
-        virtual bool get(const TileKey& key, osg::ref_ptr<T>& out_data) const =0;
-    };
-}
-
-#endif // OSGEARTH_TILEKEY_DATA_STORE
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileRasterizer osgearth-2.10.2+dfsg/src/osgEarth/TileRasterizer
--- osgearth-2.9.0+dfsg/src/osgEarth/TileRasterizer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileRasterizer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -74,6 +74,8 @@
 
     public: // osg::Node
 
+        void accept(osg::NodeVisitor&);
+
         void traverse(osg::NodeVisitor&);
 
     private:
@@ -95,6 +97,7 @@
             osg::ref_ptr<ReadbackImage> _image;
             osg::ref_ptr<osg::PixelBufferObject> _imagePBO;
             Threading::Promise<osg::Image> _imagePromise;
+            GLuint _fragmentsWritten;
         };
 
         mutable Threading::Mutex _mutex;
@@ -104,6 +107,7 @@
         mutable JobQueue _finishedJobs; // queue for jobs waiting for the promise to resolve
 
         //osg::ref_ptr<osg::Uniform> _distortionU;
+        mutable osg::buffered_object<GLuint> _samplesQuery;
 
     public: // internal
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileRasterizer.cpp osgearth-2.10.2+dfsg/src/osgEarth/TileRasterizer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TileRasterizer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileRasterizer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,13 +19,14 @@
 #include <osgEarth/TileRasterizer>
 #include <osgEarth/NodeUtils>
 #include <osgEarth/VirtualProgram>
-#include <osgEarth/Registry>
-#include <osg/MatrixTransform>
-#include <osg/FrameBufferObject>
-#include <osgDB/ReadFile>
+#include <osgEarth/GLUtils>
 
 #define LC "[TileRasterizer] "
 
+#ifndef GL_ANY_SAMPLES_PASSED
+#define GL_ANY_SAMPLES_PASSED 0x8C2F
+#endif
+
 using namespace osgEarth;
 
 namespace
@@ -67,7 +68,7 @@
 osg::Camera()
 {
     // active an update traversal.
-    setNumChildrenRequiringUpdateTraversal(1);
+    ADJUST_EVENT_TRAV_COUNT(this, +1);
     setCullingActive(false);
 
     // set up the RTT camera.
@@ -82,11 +83,10 @@
     setViewMatrix(osg::Matrix::identity());
 
     osg::StateSet* ss = getOrCreateStateSet();
-    //ss->setAttribute(new osg::Program(), osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
 
     ss->setMode(GL_BLEND, 1);
-    ss->setMode(GL_LIGHTING, 0);
     ss->setMode(GL_CULL_FACE, 0);
+    GLUtils::setLighting(ss, 0);
     
     this->setPreDrawCallback(new PreDrawRouter<TileRasterizer>(this));
     this->setPostDrawCallback(new PostDrawRouter<TileRasterizer>(this));
@@ -109,6 +109,7 @@
     setReadBuffer(GL_FRONT);
 
     VirtualProgram* vp = VirtualProgram::getOrCreate(ss);
+    vp->setName("TileRasterizer");
     vp->setInheritShaders(false);
 
     // Someday we might need this to undistort rasterizer cells. We'll see
@@ -117,6 +118,9 @@
     _distortionU = new osg::Uniform("oe_rasterizer_f", 1.0f);
     ss->addUniform(_distortionU.get());
 #endif
+
+    _samplesQuery.resize(64u);
+    _samplesQuery.setAllElementsTo(INT_MAX);
 }
 
 TileRasterizer::~TileRasterizer()
@@ -153,6 +157,7 @@
     }
     else
     {
+        // synchronous:
         glReadPixels(x, y, width, height, getPixelFormat(), getDataType(), _data);
     }
 }
@@ -180,9 +185,23 @@
 }
 
 void
+TileRasterizer::accept(osg::NodeVisitor& nv)
+{
+    if (nv.getVisitorType() == nv.CULL_VISITOR && getBufferAttachmentMap().empty())
+    {
+        return;
+    }
+    else
+    {
+        osg::Camera::accept(nv);
+    }
+}
+
+
+void
 TileRasterizer::traverse(osg::NodeVisitor& nv)
 {
-    if (nv.getVisitorType() == nv.UPDATE_VISITOR)
+    if (nv.getVisitorType() == nv.EVENT_VISITOR)
     {
         Threading::ScopedMutexLock lock(_mutex);
 
@@ -190,7 +209,13 @@
         {
             Job& job = _finishedJobs.front();
             removeChild(job._node.get());
-            job._imagePromise.resolve(job._image.get());
+
+            // If the job didn't write any fragments, return a NULL image.
+            if (job._fragmentsWritten > 0)
+                job._imagePromise.resolve(job._image.get());
+            else
+                job._imagePromise.resolve(0L);
+
             _finishedJobs.pop(); 
             detach(osg::Camera::COLOR_BUFFER);
             dirtyAttachmentMap();
@@ -245,7 +270,10 @@
     //if (!getBufferAttachmentMap().empty())
     else if (nv.getVisitorType() == nv.CULL_VISITOR)
     {
-        osg::Camera::traverse(nv);
+        if (!getBufferAttachmentMap().empty())
+        {
+            osg::Camera::traverse(nv);
+        }
     }
 }
 
@@ -263,6 +291,18 @@
             {
                 job._image.get()->_ri = &ri;
             }
+
+            // allocate a query on demand for this GC:
+            osg::GLExtensions* ext = osg::GLExtensions::Get(ri.getContextID(),true);
+            GLuint& query = _samplesQuery[ri.getContextID()];
+            if (query == INT_MAX)
+            {
+                ext->glGenQueries(1, &query);
+            }
+
+            // initiate a query for samples passing the fragment shader
+            // to see whether we drew anything.
+            ext->glBeginQuery(GL_ANY_SAMPLES_PASSED, query);
         }
     }
 }
@@ -277,6 +317,14 @@
         if (!_readbackJobs.empty()) // double check!
         {
             Job& job = _readbackJobs.front();
+
+            // get the results of the query and store the
+            // # of fragments generated in the job.
+            osg::GLExtensions* ext = osg::GLExtensions::Get(ri.getContextID(), true);
+            GLuint query = _samplesQuery[ri.getContextID()];
+            ext->glEndQuery(GL_ANY_SAMPLES_PASSED);
+            ext->glGetQueryObjectuiv(query, GL_QUERY_RESULT, &job._fragmentsWritten);
+
             _finishedJobs.push(job);
             _readbackJobs.pop();
         }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileSource osgearth-2.10.2+dfsg/src/osgEarth/TileSource
--- osgearth-2.9.0+dfsg/src/osgEarth/TileSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -49,7 +49,6 @@
 {
     class ProgressCallback;
     class Map;
-    class MapFrame;
 
     /**
      * Configuration options for a tile source driver.
@@ -105,8 +104,11 @@
         optional<bool>           _coverage;
         optional<std::string>    _osgOptionString;
     };
+}
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::TileSourceOptions);
 
-
+namespace osgEarth
+{
     /**
      * A collection of tiles that should be considered blacklisted
      */
@@ -177,8 +179,8 @@
         typedef unsigned Mode;
 
         /** Open for reading only */
-        static const Mode MODE_READ;  
-        
+        static const Mode MODE_READ;
+
         /** Open for writing */
         static const Mode MODE_WRITE;
 
@@ -231,6 +233,9 @@
         float getMaxValidValue() const { return _maxValidValue; }
         void setMaxValidValue(float value) { _maxValidValue = value; }
 
+        //! The attribution string to be displayed for this TileSource
+        virtual std::string getAttribution() const { return ""; }
+
         /**
          * Creates an image for the given TileKey. The TileKey's profile must match
          * the profile of the TileSource.
@@ -264,7 +269,7 @@
          * image with one 32-bit channel and call storeImage.)
          */
         virtual bool storeHeightField(const TileKey&    key,
-                                      osg::HeightField* hf,
+                                      const osg::HeightField* hf,
                                       ProgressCallback* progress);
 
     public:
@@ -278,7 +283,7 @@
 
         /**
          * TimeStamp indicating the last time the data at this source changed
-         * Default is 0, i.e. the beginning of time itself (1970). It is up to 
+         * Default is 0, i.e. the beginning of time itself (1970). It is up to
          * the TileSource implementation whether to populate this field. The
          * Map engine can use it for per-session caching purposes.
          */
@@ -290,13 +295,7 @@
         virtual const Profile* getProfile() const;
 
         /**
-         * Gets the preferred extension for this TileSource
-         * @deprecated No longer used
-         */
-        virtual std::string getExtension() const {return "png";}
-
-        /**
-         *Gets the blacklist for this TileSource
+         * Gets the blacklist for this TileSource
          */
         TileBlacklist* getBlacklist();
         const TileBlacklist* getBlacklist() const;
@@ -313,7 +312,7 @@
          * cache if one is configured. But a TileSource can report that caching should
          * not be used (for whatever reason) by returning CachePolicy::NO_CACHE.
          */
-        virtual CachePolicy getCachePolicyHint(const Profile* targetProfile) const 
+        virtual CachePolicy getCachePolicyHint(const Profile* targetProfile) const
             { return CachePolicy::DEFAULT; }
 
         /**
@@ -327,7 +326,7 @@
         const TileSourceOptions& getOptions() const { return _options; }
 
         /**
-         * Set the L2 cache size default (if the size was not set in 
+         * Set the L2 cache size default (if the size was not set in
          * the options or environment). Must call this before open().
          */
         void setDefaultL2CacheSize(int size);
@@ -351,8 +350,6 @@
          * intialization succeeded (in which case the owning layer will become enabled)
          * or failed (in which case the owning layer will become disabled.
          *
-         * This method replaces the now-deprecated initialize method below.
-         *
          * The Subclass should override this to report a correct initialization status.
          * The default implementation reports STATUS_OK (for compatibility).
          */
@@ -375,11 +372,11 @@
             ProgressCallback*     progress );
 
     protected:
-        
+
         virtual ~TileSource();
 
         /**
-         * Subclass can call this to set a Profile after opening the 
+         * Subclass can call this to set a Profile after opening the
          * data store.
          */
         void setProfile( const Profile* profile );
@@ -391,29 +388,9 @@
          */
         void setStatus(const Status& value) { _status = value; }
 
-        /**
-         * Accesses the map frame that synchronizes with a map if one is set.
-         * Note; the map frame might be empty/invalid.
-         */
-        MapFrame& getMapFrame() const;
-
         //! Compat - do not override
         unsigned getTileSize() const { return getPixelsPerTile(); }
 
-
-    protected: // deprecated
-
-        /**
-         * @deprecated
-         * Initializes the TileSource. This is the old initialize method; it will exists
-         * for backwards compatibility with older user-defined TileSource implementations.
-         * Consider updating to the new initialize() method above since it properly
-         * reports the results of the initialization.
-         */
-        virtual void initialize(
-            const osgDB::Options* dbOptions,
-            const Profile*        overrideProfile ) { }
-
     private:
 
         osg::ref_ptr<const Profile> _profile;
@@ -432,7 +409,7 @@
         DataExtentList  _dataExtents;
         Status          _status;
         Mode            _mode;
-        unsigned        _tileSize;     
+        unsigned        _tileSize;
         float           _noDataValue;
         float           _minValidValue;
         float           _maxValidValue;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileSource.cpp osgearth-2.10.2+dfsg/src/osgEarth/TileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,17 +20,10 @@
 
 #include <osgEarth/TileSource>
 #include <osgEarth/ImageToHeightFieldConverter>
-#include <osgEarth/ImageUtils>
-#include <osgEarth/FileUtils>
 #include <osgEarth/Registry>
-#include <osgEarth/ThreadingUtils>
-#include <osgEarth/MemCache>
-#include <osgEarth/MapFrame>
 #include <osgEarth/Progress>
 #include <osgDB/FileUtils>
 #include <osgDB/FileNameUtils>
-#include <osgDB/ReadFile>
-#include <osgDB/WriteFile>
 
 #define LC "[TileSource] "
 
@@ -110,7 +103,7 @@
 
 void
 TileBlacklist::write(const std::string &filename) const
-{ 
+{
     std::string path = osgDB::getFilePath(filename);
     if (!path.empty() && !osgDB::fileExists(path) && !osgDB::makeDirectory(path))
     {
@@ -147,12 +140,12 @@
 _L2CacheSize          ( 16 ),
 _bilinearReprojection ( true ),
 _coverage             ( false )
-{ 
+{
     fromConfig( _conf );
 }
 
 
-Config 
+Config
 TileSourceOptions::getConfig() const
 {
     Config conf = DriverConfigOptions::getConfig();
@@ -161,7 +154,7 @@
     conf.set( "bilinear_reprojection", _bilinearReprojection );
     conf.set( "coverage", _coverage );
     conf.set( "osg_option_string", _osgOptionString );
-    conf.setObj( "profile", _profileOptions );
+    conf.set( "profile", _profileOptions );
     return conf;
 }
 
@@ -177,12 +170,12 @@
 void
 TileSourceOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet( "blacklist_filename", _blacklistFilename);
-    conf.getIfSet( "l2_cache_size", _L2CacheSize );
-    conf.getIfSet( "bilinear_reprojection", _bilinearReprojection );
-    conf.getIfSet( "coverage", _coverage );
-    conf.getIfSet( "osg_option_string", _osgOptionString );
-    conf.getObjIfSet( "profile", _profileOptions );
+    conf.get( "blacklist_filename", _blacklistFilename);
+    conf.get( "l2_cache_size", _L2CacheSize );
+    conf.get( "bilinear_reprojection", _bilinearReprojection );
+    conf.get( "coverage", _coverage );
+    conf.get( "osg_option_string", _osgOptionString );
+    conf.get( "profile", _profileOptions );
 }
 
 
@@ -212,7 +205,7 @@
         _blacklistFilename = _options.blacklistFilename().value();
     }
 
-    
+
     if (!_blacklistFilename.empty() && osgDB::fileExists(_blacklistFilename))
     {
         _blacklist = TileBlacklist::read(_blacklistFilename);
@@ -288,7 +281,7 @@
             {
                 _status = status;
             }
-            else 
+            else
             {
                 _status = Status::Error("No profile available");
             }
@@ -318,7 +311,7 @@
 
 osg::Image*
 TileSource::createImage(const TileKey&        key,
-                        ImageOperation*       prepOp, 
+                        ImageOperation*       prepOp,
                         ProgressCallback*     progress )
 {
     if (getStatus().isError())
@@ -335,7 +328,7 @@
     osg::ref_ptr<osg::Image> newImage = createImage(key, progress);
 
     // Check for cancelation. The TileSource implementation should do this
-    // internally but we check here once last time just in case the 
+    // internally but we check here once last time just in case the
     // implementation does not.
     if (progress && progress->isCanceled())
     {
@@ -357,7 +350,7 @@
 
 osg::HeightField*
 TileSource::createHeightField(const TileKey&        key,
-                              HeightFieldOperation* prepOp, 
+                              HeightFieldOperation* prepOp,
                               ProgressCallback*     progress )
 {
     if (getStatus().isError())
@@ -374,9 +367,9 @@
     }
 
     osg::ref_ptr<osg::HeightField> newHF = createHeightField( key, progress );
-    
+
     // Check for cancelation. The TileSource implementation should do this
-    // internally but we check here once last time just in case the 
+    // internally but we check here once last time just in case the
     // implementation does not.
     if (progress && progress->isCanceled())
     {
@@ -414,14 +407,14 @@
     {
         ImageToHeightFieldConverter conv;
         hf = conv.convert( image.get() );
-    }      
+    }
     return hf;
 }
 
 bool
 TileSource::storeHeightField(const TileKey&     key,
-                             osg::HeightField*  hf,
-                              ProgressCallback* progress)
+                             const osg::HeightField*  hf,
+                             ProgressCallback* progress)
 {
     if (getStatus().isError() || hf == 0L )
         return 0L;
@@ -436,7 +429,7 @@
 }
 
 bool
-TileSource::isOK() const 
+TileSource::isOK() const
 {
     return _status.isOK();
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileVisitor osgearth-2.10.2+dfsg/src/osgEarth/TileVisitor
--- osgearth-2.9.0+dfsg/src/osgEarth/TileVisitor	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileVisitor	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TileVisitor.cpp osgearth-2.10.2+dfsg/src/osgEarth/TileVisitor.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TileVisitor.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TileVisitor.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,13 +20,20 @@
 #include <osgEarth/CacheEstimator>
 #include <osgEarth/FileUtils>
 
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,10)
+#include <osg/os_utils>
+#define OS_SYSTEM osg_system
+#else
+#define OS_SYSTEM system
+#endif
+
 using namespace osgEarth;
 
 TileVisitor::TileVisitor():
 _total(0),
 _processed(0),
 _minLevel(0),
-_maxLevel(5)
+_maxLevel(99)
 {
 }
 
@@ -36,7 +43,7 @@
 _total(0),
 _processed(0),
 _minLevel(0),
-_maxLevel(5)
+_maxLevel(99)
 {
 }
 
@@ -424,7 +431,7 @@
 
       virtual void operator()(ProgressCallback* progress )
       {         
-          system(_command.c_str());     
+          OS_SYSTEM(_command.c_str());     
 
           // Cleanup the temp files and increment the progress on the visitor.
           cleanupTempFiles();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TimeControl osgearth-2.10.2+dfsg/src/osgEarth/TimeControl
--- osgearth-2.9.0+dfsg/src/osgEarth/TimeControl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TimeControl	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TimeControl.cpp osgearth-2.10.2+dfsg/src/osgEarth/TimeControl.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TimeControl.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TimeControl.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TraversalData osgearth-2.10.2+dfsg/src/osgEarth/TraversalData
--- osgearth-2.9.0+dfsg/src/osgEarth/TraversalData	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TraversalData	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/TraversalData.cpp osgearth-2.10.2+dfsg/src/osgEarth/TraversalData.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/TraversalData.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/TraversalData.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
  */
 #include <osgEarth/TraversalData>
 #include <osgEarth/Registry>
-#include <osg/ValueObject>
 
 using namespace osgEarth;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Units osgearth-2.10.2+dfsg/src/osgEarth/Units
--- osgearth-2.9.0+dfsg/src/osgEarth/Units	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Units	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -51,6 +51,7 @@
         static const Units DEGREES;
         static const Units NATO_MILS; // http://www.convertworld.com/en/angle/Mil+(NATO).html
         static const Units RADIANS;
+        static const Units DECIMAL_HOURS;
 
         // temporal
         static const Units DAYS;
@@ -344,17 +345,17 @@
     
 
     // Config specializations:
-
-    template <> inline
-    void Config::addIfSet<Distance>( const std::string& key, const optional<Distance>& opt ) {
-        if ( opt.isSet() ) { add(key, opt->asParseableString()); }
+    
+    template<> inline
+    void Config::set<Distance>( const std::string& key, const Distance& obj ) {
+        set(key, obj.asParseableString());
     }
     template<> inline
-    void Config::updateIfSet<Distance>( const std::string& key, const optional<Distance>& opt ) {
-        if ( opt.isSet() ) { update(key, opt->asParseableString()); }
+    void Config::set<Distance>( const std::string& key, const optional<Distance>& opt ) {
+        if ( opt.isSet() ) { set(key, opt.get()); }
     }
     template<> inline
-    bool Config::getIfSet<Distance>( const std::string& key, optional<Distance>& output ) const {
+    bool Config::get<Distance>( const std::string& key, optional<Distance>& output ) const {
         if ( hasValue(key) ) { output = Distance(value(key)); return true; }
         else return false;
     }
@@ -368,17 +369,17 @@
             return default_value;
     }
     
-
-    template <> inline
-    void Config::addIfSet<Angle>( const std::string& key, const optional<Angle>& opt ) {
-        if ( opt.isSet() ) { add(key, opt->asParseableString()); }
+    
+    template<> inline
+    void Config::set<Angle>( const std::string& key, const Angle& opt ) {
+        set(key, opt.asParseableString());
     }
     template<> inline
-    void Config::updateIfSet<Angle>( const std::string& key, const optional<Angle>& opt ) {
-        if ( opt.isSet() ) { update(key, opt->asParseableString()); }
+    void Config::set<Angle>( const std::string& key, const optional<Angle>& opt ) {
+        if ( opt.isSet() ) { set(key, opt.get()); }
     }
     template<> inline
-    bool Config::getIfSet<Angle>( const std::string& key, optional<Angle>& output ) const {
+    bool Config::get<Angle>( const std::string& key, optional<Angle>& output ) const {
         if ( hasValue(key) ) { output = Angle(value(key)); return true; }
         else return false;
     }
@@ -392,18 +393,18 @@
             return default_value;
     }
 
-    template <> inline
-    void Config::addIfSet<Duration>( const std::string& key, const optional<Duration>& opt ) {
-        if ( opt.isSet() ) { add(key, opt->asParseableString()); }
+    
+    template<> inline
+    void Config::set<Duration>( const std::string& key, const Duration& opt ) {
+        set(key, opt.asParseableString());
     }
-
     template<> inline
-    void Config::updateIfSet<Duration>( const std::string& key, const optional<Duration>& opt ) {
-        if ( opt.isSet() ) { update(key, opt->asParseableString()); }
+    void Config::set<Duration>( const std::string& key, const optional<Duration>& opt ) {
+        if ( opt.isSet() ) { set(key, opt.get()); }
     }
 
     template<> inline
-    bool Config::getIfSet<Duration>( const std::string& key, optional<Duration>& output ) const {
+    bool Config::get<Duration>( const std::string& key, optional<Duration>& output ) const {
         if ( hasValue(key) ) { output = Duration(value(key)); return true; }
         else return false;
     }
@@ -417,18 +418,16 @@
             return default_value;
     }
 
-    template <> inline
-    void Config::addIfSet<Speed>( const std::string& key, const optional<Speed>& opt ) {
-        if ( opt.isSet() ) { add(key, opt->asParseableString()); }
+    template<> inline
+    void Config::set<Speed>( const std::string& key, const Speed& opt ) {
+        set(key, opt.asParseableString());
     }
-
     template<> inline
-    void Config::updateIfSet<Speed>( const std::string& key, const optional<Speed>& opt ) {
-        if ( opt.isSet() ) { update(key, opt->asParseableString()); }
+    void Config::set<Speed>( const std::string& key, const optional<Speed>& opt ) {
+        if ( opt.isSet() ) { set(key, opt.get()); }
     }
-
     template<> inline
-    bool Config::getIfSet<Speed>( const std::string& key, optional<Speed>& output ) const {
+    bool Config::get<Speed>( const std::string& key, optional<Speed>& output ) const {
         if ( hasValue(key) ) { output = Speed(value(key)); return true; }
         else return false;
     }
@@ -441,19 +440,17 @@
         else
             return default_value;
     }
-
-    template <> inline
-    void Config::addIfSet<ScreenSize>( const std::string& key, const optional<ScreenSize>& opt ) {
-        if ( opt.isSet() ) { add(key, opt->asParseableString()); }
+    
+    template<> inline
+    void Config::set<ScreenSize>( const std::string& key, const ScreenSize& opt ) {
+        set(key, opt.asParseableString());
     }
-
     template<> inline
-    void Config::updateIfSet<ScreenSize>( const std::string& key, const optional<ScreenSize>& opt ) {
-        if ( opt.isSet() ) { update(key, opt->asParseableString()); }
+    void Config::set<ScreenSize>( const std::string& key, const optional<ScreenSize>& opt ) {
+        if ( opt.isSet() ) { set(key, opt.get()); }
     }
-
     template<> inline
-    bool Config::getIfSet<ScreenSize>( const std::string& key, optional<ScreenSize>& output ) const {
+    bool Config::get<ScreenSize>( const std::string& key, optional<ScreenSize>& output ) const {
         if ( hasValue(key) ) { output = ScreenSize(value(key)); return true; }
         else return false;
     }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Units.cpp osgearth-2.10.2+dfsg/src/osgEarth/Units.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Units.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Units.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,9 +19,6 @@
 
 #include <osgEarth/Units>
 #include <osgEarth/Registry>
-#include <osg/Math>
-#include <algorithm>
-#include <cctype>
 
 using namespace osgEarth;
 
@@ -166,6 +163,7 @@
     r->registerUnits( &Units::RADIANS );
     r->registerUnits( &Units::BAM );
     r->registerUnits( &Units::NATO_MILS );
+    r->registerUnits( &Units::DECIMAL_HOURS );
 
     r->registerUnits( &Units::DAYS );
     r->registerUnits( &Units::HOURS );
@@ -209,6 +207,7 @@
 const Units Units::RADIANS           ( "radians",        "rad", Units::TYPE_ANGULAR, 1.0 );
 const Units Units::BAM               ( "BAM",            "bam", Units::TYPE_ANGULAR, 6.283185307179586476925286766559 );
 const Units Units::NATO_MILS         ( "mils",           "mil", Units::TYPE_ANGULAR, 9.8174770424681038701957605727484e-4 );
+const Units Units::DECIMAL_HOURS     ( "hours",          "h",   Units::TYPE_ANGULAR, 15.0*0.017453292519943295 );
 
 // Factor convert unit into SECONDS:
 const Units Units::DAYS              ( "days",           "d",   Units::TYPE_TEMPORAL, 86400.0 );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/URI osgearth-2.10.2+dfsg/src/osgEarth/URI
--- osgearth-2.9.0+dfsg/src/osgEarth/URI	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/URI	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 #include <osgEarth/CachePolicy>
 #include <osgEarth/Containers>
 #include <osgEarth/IOTypes>
+#include <osgEarth/HTTPClient>
 #include <osg/Image>
 #include <osg/Node>
 #include <osgDB/ReaderWriter>
@@ -53,13 +54,13 @@
     {
     public:
         /** Creates an empty context. */
-        URIContext() { }
+        URIContext();
 
         /** Creates a context that specifies a referring object. */
-        URIContext( const std::string& referrer ) : _referrer(referrer) { }
+        URIContext(const std::string& referrer);
 
         /** Copy constructor. */
-        URIContext( const URIContext& rhs ) : _referrer(rhs._referrer) { }
+        URIContext(const URIContext& rhs);
 
         /** dtor */
         virtual ~URIContext() { }
@@ -88,9 +89,20 @@
         /** creates a string suitable for passing to an osgDB::ReaderWriter implementation */
         std::string getOSGPath( const std::string& target ) const;
 
+        //! Add a header name/value pair to use when requesting a remote URL
+        void addHeader(const std::string& name, const std::string& value);
+
+        //! Headers in this URIContext
+        const Headers& getHeaders() const;
+
+        //! Headers in this URIContext
+        Headers& getHeaders();
+
+
     private:
         friend class URI;
         std::string _referrer;
+        Headers _headers;
     };
 
 //--------------------------------------------------------------------
@@ -101,7 +113,7 @@
     class OSGEARTH_EXPORT URIStream
     {
     public:
-        URIStream( const URI& uri );
+        URIStream(const URI& uri, std::ios_base::openmode mode =std::ios_base::in);
 
         virtual ~URIStream();
 
@@ -111,8 +123,7 @@
 
     protected:
         friend class URI;
-        std::istream*     _fileStream;
-        std::stringstream _bufStream;
+        std::istream* _instream;
     };
 
 //--------------------------------------------------------------------
@@ -199,7 +210,6 @@
         /** Sets a cache key. By default the cache key is the full URI, but you can override that. */
         void setCacheKey( const std::string& key ) { _cacheKey = key; }
 
-
     public: // read methods return a ReadResult object
 
         ReadResult readObject(
@@ -255,19 +265,9 @@
 
     public: // config methods
 
-        Config getConfig() const
-        {
-            Config conf("uri", base());
-            conf.addIfSet("option_string", _optionString);
-            conf.setReferrer( context().referrer() );
-            conf.setIsLocation( true );
-            return conf;
-        }
+        Config getConfig() const;
 
-        void mergeConfig(const Config& conf)
-        {
-            conf.getIfSet("option_string", _optionString);
-        }
+        void mergeConfig(const Config& conf);
 
     public: // Static convenience methods
 
@@ -416,38 +416,33 @@
 
     // Config specialization for URI:
 
-    template <> inline
-    void Config::addIfSet<URI>( const std::string& key, const optional<URI>& opt ) {
-        if ( opt.isSet() ) {
-            Config c = opt->getConfig();
-            c.key() = key;
-            add( c );
-        }
-    }
-
     template<> inline
-    void Config::updateIfSet<URI>( const std::string& key, const optional<URI>& opt ) {
+    void Config::set<URI>( const std::string& key, const optional<URI>& opt ) {
         if ( opt.isSet() ) {
             remove(key);
-            add( key, opt->getConfig() );
+            set( key, opt->getConfig() );
         }
     }
 
     template<> inline
-    bool Config::getIfSet<URI>( const std::string& key, optional<URI>& output ) const {
-        if ( hasValue(key) ) {
-            output = URI( value(key), referrer(key) );
-            output->mergeConfig(*this);
-            return true;
+    bool Config::get<URI>( const std::string& key, optional<URI>& output ) const {
+        if ( hasChild(key) ) {
+            const Config& uriconf = child(key);
+            if (!uriconf.value().empty()) {
+                output = URI(uriconf.value(), uriconf.referrer());
+                output->mergeConfig(uriconf);
+                return true;
+            }
+            else return false;
         }
-        else
-            return false;
+        else return false;
     }
 
     // Config specialization for URIAliasMap
 
     template <> inline
-    void Config::addIfSet<URIAliasMap>( const std::string& key, const optional<URIAliasMap>& map ) {
+    void Config::set<URIAliasMap>( const std::string& key, const optional<URIAliasMap>& map ) {
+        remove( key );
         if ( map.isSet() ) {
             Config conf( key );
             for( std::map<std::string,std::string>::const_iterator i = map->_map.begin(); i != map->_map.end(); ++i ) {
@@ -456,20 +451,12 @@
                 alias.add( "target", i->second );
                 conf.add( alias );
             }
-            add(conf);
-        }
-    }
-
-    template <> inline
-    void Config::updateIfSet<URIAliasMap>( const std::string& key, const optional<URIAliasMap>& map ) {
-        if ( map.isSet() ) {
-            remove( key );
-            addIfSet( key, map );
+            set(conf);
         }
     }
 
     template <> inline
-    bool Config::getIfSet<URIAliasMap>( const std::string& key, optional<URIAliasMap>& output ) const {
+    bool Config::get<URIAliasMap>( const std::string& key, optional<URIAliasMap>& output ) const {
         Config alias = child(key);
         if ( !alias.empty() ) {
             for( ConfigSet::const_iterator i = alias.children().begin(); i != alias.children().end(); ++i ) {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/URI.cpp osgearth-2.10.2+dfsg/src/osgEarth/URI.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/URI.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/URI.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,17 +18,12 @@
  */
 #include <osgEarth/URI>
 #include <osgEarth/Cache>
-#include <osgEarth/CacheBin>
-#include <osgEarth/HTTPClient>
 #include <osgEarth/Registry>
-#include <osgEarth/Progress>
 #include <osgEarth/FileUtils>
+#include <osgEarth/Progress>
 #include <osgDB/FileNameUtils>
 #include <osgDB/ReadFile>
-#include <osgDB/ReaderWriter>
 #include <osgDB/Archive>
-#include <fstream>
-#include <sstream>
 
 #define LC "[URI] "
 
@@ -62,8 +57,8 @@
 
 //------------------------------------------------------------------------
 
-URIStream::URIStream( const URI& uri ) :
-_fileStream( 0L )
+URIStream::URIStream(const URI& uri, std::ios_base::openmode mode) :
+_instream( 0L )
 {
     if ( osgDB::containsServerAddress(uri.full()) )
     {
@@ -71,39 +66,73 @@
         if ( res.isOK() )
         {
             std::string buf = res.getPartAsString(0);
-            _bufStream.str(buf);
+            _instream = new std::istringstream(buf);
         }
     }
     else
     {
-        _fileStream = new std::ifstream( uri.full().c_str() );
+        _instream = new std::ifstream(uri.full().c_str(), mode);
     }
 }
 
 URIStream::~URIStream()
 {
-    if ( _fileStream )
-        delete _fileStream;
+    if (_instream)
+        delete _instream;
 }
 
 URIStream::operator std::istream& ()
 {
     static std::istringstream s_nullStream;
 
-    if ( _fileStream )
-        return *_fileStream;
+    if ( _instream )
+        return *_instream;
     else
-        return _bufStream;
+        return s_nullStream;
 }
 
 //------------------------------------------------------------------------
 
+URIContext::URIContext()
+{
+}
+
+URIContext::URIContext(const std::string& referrer) :
+    _referrer(referrer)
+{
+}
+
+URIContext::URIContext(const URIContext& rhs) :
+    _referrer(rhs._referrer),
+    _headers(rhs._headers)
+{
+}
+
 std::string
 URIContext::getOSGPath( const std::string& target ) const
 {
     return osgEarth::getFullPath( _referrer, target );
 }
 
+void
+URIContext::addHeader(const std::string& name, const std::string& value)
+{
+    _headers[name] = value;
+}
+
+const Headers&
+URIContext::getHeaders() const
+{
+    return _headers;
+}
+
+Headers&
+URIContext::getHeaders()
+{
+    return _headers;
+}
+
+
 URIContext
 URIContext::add( const URIContext& sub ) const
 {
@@ -198,11 +227,7 @@
 void
 URI::ctorCacheKey()
 {
-    std::string temp = Stringify() << std::hex << std::setw(8) << std::setfill('0') << osgEarth::hashString(_fullURI);
-    _cacheKey
-        .append(temp.substr(0, 3)).append("/")
-        .append(temp.substr(3, 3)).append("/")
-        .append(temp.substr(6));
+    _cacheKey = Cache::makeCacheKey(_fullURI, "uri");
 }
 
 bool
@@ -211,6 +236,47 @@
     return osgDB::containsServerAddress( _fullURI );
 }
 
+Config
+URI::getConfig() const
+{
+    Config conf("uri", base());
+    conf.set("option_string", _optionString);
+    conf.setReferrer(context().referrer());
+    conf.setIsLocation(true);
+
+    const Headers& headers = context().getHeaders();
+    if (!headers.empty())
+    {
+        Config headersconf("headers");
+        for(Headers::const_iterator i = headers.begin(); i != headers.end(); ++i)
+        {
+            if (!i->first.empty() && !i->second.empty())
+            {
+                headersconf.add(Config(i->first, i->second));
+            }
+        }
+        conf.add(headersconf);
+    }
+
+    return conf;
+}
+
+void
+URI::mergeConfig(const Config& conf)
+{    
+    conf.get("option_string", _optionString);
+
+    const ConfigSet headers = conf.child("headers").children();
+    for (ConfigSet::const_iterator i = headers.begin(); i != headers.end(); ++i)
+    {
+        const Config& header = *i;
+        if (!header.key().empty() && !header.value().empty())
+        {
+            _context.addHeader(header.key(), header.value());
+        }
+    }
+}
+
 namespace
 {
     // convert an osgDB::ReaderWriter::ReadResult to an osgEarth::ReadResult
@@ -240,12 +306,12 @@
                 osgDB::ReaderWriter::ReadResult result = osgDB::Registry::instance()->openArchiveImplementation(
                     archiveName, osgDB::ReaderWriter::READ, 4096, opt );
 
-                if (!result.validArchive()) 
+                if (!result.validArchive())
                     return ReadResult(); // error
 
                 osgDB::Archive* archive = result.getArchive();
 
-                osg::ref_ptr<osgDB::ReaderWriter::Options> options = opt ? opt->cloneOptions() : 
+                osg::ref_ptr<osgDB::ReaderWriter::Options> options = opt ? opt->cloneOptions() :
                     Registry::instance()->cloneOrCreateOptions();
 
                 options->setDatabasePath(archiveName);
@@ -291,9 +357,10 @@
         bool callbackRequestsCaching( URIReadCallback* cb ) const { return !cb || ((cb->cachingSupport() & URIReadCallback::CACHE_OBJECTS) != 0); }
         ReadResult fromCallback( URIReadCallback* cb, const std::string& uri, const osgDB::Options* opt ) { return cb->readObject(uri, opt); }
         ReadResult fromCache( CacheBin* bin, const std::string& key) { return bin->readObject(key, 0L); }
-        ReadResult fromHTTP( const std::string& uri, const osgDB::Options* opt, ProgressCallback* p, TimeStamp lastModified )
+        ReadResult fromHTTP( const URI& uri, const osgDB::Options* opt, ProgressCallback* p, TimeStamp lastModified )
         {
-            HTTPRequest req(uri);            
+            HTTPRequest req(uri.full());
+            req.getHeaders() = uri.context().getHeaders();
             if (lastModified > 0)
             {
                 req.setLastModified(lastModified);
@@ -310,9 +377,10 @@
         bool callbackRequestsCaching( URIReadCallback* cb ) const { return !cb || ((cb->cachingSupport() & URIReadCallback::CACHE_NODES) != 0); }
         ReadResult fromCallback( URIReadCallback* cb, const std::string& uri, const osgDB::Options* opt ) { return cb->readNode(uri, opt); }
         ReadResult fromCache( CacheBin* bin, const std::string& key ) { return bin->readObject(key, 0L); }
-        ReadResult fromHTTP( const std::string& uri, const osgDB::Options* opt, ProgressCallback* p, TimeStamp lastModified )
+        ReadResult fromHTTP(const URI& uri, const osgDB::Options* opt, ProgressCallback* p, TimeStamp lastModified )
         {
-            HTTPRequest req(uri);            
+            HTTPRequest req(uri.full());
+            req.getHeaders() = uri.context().getHeaders();
             if (lastModified > 0)
             {
                 req.setLastModified(lastModified);
@@ -326,30 +394,32 @@
 
     struct ReadImage
     {
-        bool callbackRequestsCaching( URIReadCallback* cb ) const { 
-            return !cb || ((cb->cachingSupport() & URIReadCallback::CACHE_IMAGES) != 0); 
+        bool callbackRequestsCaching( URIReadCallback* cb ) const {
+            return !cb || ((cb->cachingSupport() & URIReadCallback::CACHE_IMAGES) != 0);
         }
-        ReadResult fromCallback( URIReadCallback* cb, const std::string& uri, const osgDB::Options* opt ) { 
+        ReadResult fromCallback( URIReadCallback* cb, const std::string& uri, const osgDB::Options* opt ) {
             ReadResult r = cb->readImage(uri, opt);
             if ( r.getImage() ) r.getImage()->setFileName(uri);
             return r;
-        }                
-        ReadResult fromCache( CacheBin* bin, const std::string& key) { 
+        }
+        ReadResult fromCache( CacheBin* bin, const std::string& key) {
             ReadResult r = bin->readImage(key, 0L);
             if ( r.getImage() ) r.getImage()->setFileName( key );
             return r;
         }
-        ReadResult fromHTTP( const std::string& uri, const osgDB::Options* opt, ProgressCallback* p, TimeStamp lastModified ) { 
-            HTTPRequest req(uri);            
+        ReadResult fromHTTP(const URI& uri, const osgDB::Options* opt, ProgressCallback* p, TimeStamp lastModified ) {
+            HTTPRequest req(uri.full());
+            req.getHeaders() = uri.context().getHeaders();
+
             if (lastModified > 0)
             {
                 req.setLastModified(lastModified);
             }
             ReadResult r = HTTPClient::readImage(req, opt, p);
-            if ( r.getImage() ) r.getImage()->setFileName( uri );
+            if ( r.getImage() ) r.getImage()->setFileName( uri.full() );
             return r;
         }
-        ReadResult fromFile( const std::string& uri, const osgDB::Options* opt ) { 
+        ReadResult fromFile( const std::string& uri, const osgDB::Options* opt ) {
             ReadResult r = ReadResult(osgDB::readRefImageFile(uri, opt));
             if ( r.getImage() ) r.getImage()->setFileName( uri );
             return r;
@@ -358,19 +428,28 @@
 
     struct ReadString
     {
-        bool callbackRequestsCaching( URIReadCallback* cb ) const { return !cb || ((cb->cachingSupport() & URIReadCallback::CACHE_STRINGS) != 0); }
-        ReadResult fromCallback( URIReadCallback* cb, const std::string& uri, const osgDB::Options* opt ) { return cb->readString(uri, opt); }
-        ReadResult fromCache( CacheBin* bin, const std::string& key) { return bin->readString(key, 0L); }
-        ReadResult fromHTTP( const std::string& uri, const osgDB::Options* opt, ProgressCallback* p, TimeStamp lastModified )
+        bool callbackRequestsCaching( URIReadCallback* cb ) const {
+            return !cb || ((cb->cachingSupport() & URIReadCallback::CACHE_STRINGS) != 0);
+        }
+        ReadResult fromCallback( URIReadCallback* cb, const std::string& uri, const osgDB::Options* opt ) { 
+            return cb->readString(uri, opt);
+        }
+        ReadResult fromCache( CacheBin* bin, const std::string& key) { 
+            return bin->readString(key, 0L);
+        }
+        ReadResult fromHTTP(const URI& uri, const osgDB::Options* opt, ProgressCallback* p, TimeStamp lastModified )
         {
-            HTTPRequest req(uri);            
+            HTTPRequest req(uri.full());
+            req.getHeaders() = uri.context().getHeaders();
             if (lastModified > 0)
             {
                 req.setLastModified(lastModified);
             }
             return HTTPClient::readString(req, opt, p);
         }
-        ReadResult fromFile( const std::string& uri, const osgDB::Options* opt ) { return readStringFile(uri, opt); }
+        ReadResult fromFile( const std::string& uri, const osgDB::Options* opt ) {
+            return readStringFile(uri, opt);
+        }
     };
 
     //--------------------------------------------------------------------
@@ -382,11 +461,16 @@
         const URI&            inputURI,
         const osgDB::Options* dbOptions,
         ProgressCallback*     progress)
-    {        
+    {
         //osg::Timer_t startTime = osg::Timer::instance()->tick();
 
         ReadResult result;
 
+        if (osgEarth::Registry::instance()->isBlacklisted(inputURI.full()))
+        {
+            return result;
+        }
+
         if ( !inputURI.empty() )
         {
             // establish our IO options:
@@ -467,25 +551,25 @@
                         cp = cacheSettings->cachePolicy();
                         if (cp->isCacheEnabled() && callbackCachingOK)
                         {
-                            bin = cacheSettings->getCacheBin(); 
+                            bin = cacheSettings->getCacheBin();
                         }
                     }
 
                     bool expired = false;
                     // first try to go to the cache if there is one:
                     if ( bin && cp->isCacheReadable() )
-                    {                                                
-                        result = reader.fromCache( bin.get(), uri.cacheKey() );                        
+                    {
+                        result = reader.fromCache( bin.get(), uri.cacheKey() );
                         if ( result.succeeded() )
-                        {                                        
+                        {
                             expired = cp->isExpired(result.lastModifiedTime());
                             result.setIsFromCache(true);
                         }
                     }
 
-                    // If it's not cached, or it is cached but is expired then try to hit the server.                    
+                    // If it's not cached, or it is cached but is expired then try to hit the server.
                     if ( result.empty() || expired )
-                    {                        
+                    {
                         // Need to do this to support nested PLODs and Proxynodes.
                         osg::ref_ptr<osgDB::Options> remoteOptions =
                             Registry::instance()->cloneOrCreateOptions( localOptions.get() );
@@ -496,7 +580,7 @@
 
                         // try to use the callback if it's set. Callback ignores the caching policy.
                         if ( cb )
-                        {                
+                        {
                             result = reader.fromCallback( cb, uri.full(), remoteOptions.get() );
 
                             if ( result.code() != ReadResult::RESULT_NOT_IMPLEMENTED )
@@ -507,13 +591,13 @@
                         }
 
                         if ( !gotResultFromCallback )
-                        {                            
+                        {
                             // still no data, go to the source:
                             if ( (result.empty() || expired) && cp->usage() != CachePolicy::USAGE_CACHE_ONLY )
-                            {                                
-                                ReadResult remoteResult = reader.fromHTTP( uri.full(), remoteOptions.get(), progress, result.lastModifiedTime() );
+                            {
+                                ReadResult remoteResult = reader.fromHTTP( uri, remoteOptions.get(), progress, result.lastModifiedTime() );
                                 if (remoteResult.code() == ReadResult::RESULT_NOT_MODIFIED)
-                                {                                    
+                                {
                                     OE_DEBUG << LC << uri.full() << " not modified, using cached result" << std::endl;
                                     // Touch the cached item to update it's last modified timestamp so it doesn't expire again immediately.
                                     if (bin)
@@ -522,10 +606,16 @@
                                 else
                                 {
                                     OE_DEBUG << LC << "Got remote result for " << uri.full() << std::endl;
-                                    result = remoteResult;                                    
+                                    result = remoteResult;
                                 }
                             }
 
+                            // Check for cancelation before a cache write
+                            if (progress && progress->isCanceled())
+                            {
+                                return 0L;
+                            }
+
                             // write the result to the cache if possible:
                             if ( result.succeeded() && !result.isFromCache() && bin && cp->isCacheWriteable() && bin )
                             {
@@ -536,8 +626,13 @@
                     }
                 }
 
+                // Check for cancelation before a potential cache write
+                if (progress && progress->isCanceled())
+                {
+                    return 0L;
+                }
 
-                if ( result.getObject() && !gotResultFromCallback )
+                if (result.getObject() && !gotResultFromCallback)
                 {
                     result.getObject()->setName( uri.base() );
 
@@ -546,6 +641,13 @@
                         memCache->insert( uri, result );
                     }
                 }
+
+                // If the request failed with an unrecoverable error,
+                // blacklist so we don't waste time on it again
+                if (result.failed())
+                {
+                    osgEarth::Registry::instance()->blacklist(inputURI.full());
+                }
             }
 
             OE_TEST << LC
@@ -622,8 +724,8 @@
 
 
 URIAliasMapReadCallback::URIAliasMapReadCallback(const URIAliasMap& aliasMap,
-                                                 const URIContext&  context ) : 
-_aliasMap( aliasMap ), 
+                                                 const URIContext&  context ) :
+_aliasMap( aliasMap ),
 _context ( context )
 {
     //nop
@@ -636,14 +738,14 @@
     else return osgDB::Registry::instance()->openArchive(_aliasMap.resolve(filename,_context), status, indexBlockSizeHint, useObjectCache);
 }
 
-osgDB::ReaderWriter::ReadResult 
+osgDB::ReaderWriter::ReadResult
 URIAliasMapReadCallback::readObject(const std::string& filename, const osgDB::Options* options)
 {
     if (osgDB::Registry::instance()->getReadFileCallback()) return osgDB::Registry::instance()->getReadFileCallback()->readObject(_aliasMap.resolve(filename,_context),options);
     else return osgDB::Registry::instance()->readObjectImplementation(_aliasMap.resolve(filename,_context),options);
 }
 
-osgDB::ReaderWriter::ReadResult 
+osgDB::ReaderWriter::ReadResult
 URIAliasMapReadCallback::readImage(const std::string& filename, const osgDB::Options* options)
 {
     OE_INFO << LC << "Map: " << filename << " to " << _aliasMap.resolve(filename,_context) << std::endl;
@@ -651,21 +753,21 @@
     else return osgDB::Registry::instance()->readImageImplementation(_aliasMap.resolve(filename,_context),options);
 }
 
-osgDB::ReaderWriter::ReadResult 
+osgDB::ReaderWriter::ReadResult
 URIAliasMapReadCallback::readHeightField(const std::string& filename, const osgDB::Options* options)
 {
     if (osgDB::Registry::instance()->getReadFileCallback()) return osgDB::Registry::instance()->getReadFileCallback()->readHeightField(_aliasMap.resolve(filename,_context),options);
     else return osgDB::Registry::instance()->readHeightFieldImplementation(_aliasMap.resolve(filename,_context),options);
 }
 
-osgDB::ReaderWriter::ReadResult 
+osgDB::ReaderWriter::ReadResult
 URIAliasMapReadCallback::readNode(const std::string& filename, const osgDB::Options* options)
 {
     if (osgDB::Registry::instance()->getReadFileCallback()) return osgDB::Registry::instance()->getReadFileCallback()->readNode(_aliasMap.resolve(filename,_context),options);
     else return osgDB::Registry::instance()->readNodeImplementation(_aliasMap.resolve(filename,_context),options);
 }
 
-osgDB::ReaderWriter::ReadResult 
+osgDB::ReaderWriter::ReadResult
 URIAliasMapReadCallback::readShader(const std::string& filename, const osgDB::Options* options)
 {
     if (osgDB::Registry::instance()->getReadFileCallback()) return osgDB::Registry::instance()->getReadFileCallback()->readShader(_aliasMap.resolve(filename,_context),options);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Utils osgearth-2.10.2+dfsg/src/osgEarth/Utils
--- osgearth-2.9.0+dfsg/src/osgEarth/Utils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Utils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -62,6 +62,11 @@
             const OptionsData<T>* data = dynamic_cast<const OptionsData<T>*>(osg::getUserObject(o, name));
             return data ? data->_obj.lock(out) : false;
         }
+        static osg::ref_ptr<T> get(const osg::Object* o, const std::string& name) {
+            osg::ref_ptr<T> result;
+            bool ok = lock(o, name, result);
+            return result;
+        }
     public:
         META_Object(osgEarth,OptionsData);
         OptionsData(const std::string& name, T* obj) : _obj(obj) { setName(name); }
@@ -71,7 +76,6 @@
         osg::observer_ptr<T> _obj;
     };
 
-
     struct Utils
     {
         /**
@@ -82,108 +86,7 @@
             float vr = (osg::clampBetween(v, vmin, vmax)-vmin)/(vmax-vmin);
             return r0 + vr * (r1-r0);
         }
-        
-
-        // Polyfill
-        // @deprecated (since we require OSG 3.4.x now)
-        static const osg::BoundingBox& getBoundingBox(const osg::Drawable* d) {
-            return d->getBoundingBox();
-        }
-    };
-
-    /**
-     * Removes the given event handler from the view.
-     * This is the equivalent of osgViewer::View::removeEventHandler which is not available
-     * in older versions of OSG
-     * @deprecated
-     */
-    extern OSGEARTH_EXPORT void removeEventHandler(osgViewer::View* view, osgGA::GUIEventHandler* handler);
-
-    // utility: functor for traversing a target node
-    // @deprecated
-    template<typename T> struct TraverseFunctor {
-        T* _target;
-        TraverseFunctor(T* target) : _target(target) { }
-        void operator()(osg::NodeVisitor& nv) { _target->T::traverse(nv); }
-    };
-
-    // utility: node that traverses another node via a functor
-    // @deprecated
-    template<typename T>
-    struct TraverseNode : public osg::Node {
-        TraverseFunctor<T> _tf;
-        TraverseNode(TraverseFunctor<T>& tf) : _tf(tf) { }
-        TraverseNode(T* target) : _tf(TraverseFunctor<T>(target)) { }
-        void traverse(osg::NodeVisitor& nv) { _tf(nv); }
-        osg::BoundingSphere computeBound() const { return _tf._target->getBound(); }
-    };
-
-    // utility: cull callback that traverses another node
-    // @deprecated
-    struct TraverseNodeCallback : public osg::NodeCallback {
-        osg::ref_ptr<osg::Node> _node;
-        TraverseNodeCallback(osg::Node* node) : _node(node) { }
-        void operator()(osg::Node* node, osg::NodeVisitor* nv) {
-            _node->accept(*nv);
-            traverse(node, nv);
-        }
-    };
-
-#if OSG_VERSION_LESS_THAN(3,5,6)
-#define OE_HAVE_PIXEL_AUTO_TRANSFORM 1
-    /**
-     * A pixel-based AutoTransform variant.
-     * NOTE: AutoTransform was refactored for OSG 3.5.6 and this class does
-     * not work with the new version.
-     */
-    class OSGEARTH_EXPORT PixelAutoTransform : public osg::AutoTransform
-    {
-    public:
-        PixelAutoTransform();
-
-        /** 
-         * Sets the minimim width of the object, in pixels, when the scale
-         * factor is 1.0.
-         */
-        void setMinPixelWidthAtScaleOne( double pixels ) { _minPixels = pixels; }
-
-        /**
-         * Sets the node to use to calculate the screen size. If this is NULL,
-         * it will use the size of the first child node.
-         */
-        void setSizingNode( osg::Node* node ) { _sizingNode = node; dirty(); }
-
-        /**
-         * Forces a recalculation of the autoscale on the next traversal
-         * (this usually doesn't happen unless the camera moves)
-         */
-        void dirty();
-
-        /**
-         * Set up the transform to orient the node based on a 2D screen-space
-         * rotation.
-         */
-        void setRotateInScreenSpace(bool value) { _rotateInScreenSpace = value; }
-        bool getRotateInScreenSpace() const { return _rotateInScreenSpace; }
-        
-        /**
-         * If setRotateInScreenSpace is true, this is the value of the 2D rotation
-         * in radians.
-         */
-        void setScreenSpaceRotation(double radians) { _screenSpaceRotationRadians = radians; }
-        double getScreenSpaceRotation() const { return _screenSpaceRotationRadians; }
-
-    public: // override
-        virtual void accept( osg::NodeVisitor& nv );
-
-    protected:
-        double _minPixels;
-        bool   _dirty;
-        bool   _rotateInScreenSpace;
-        double _screenSpaceRotationRadians;
-        osg::observer_ptr<osg::Node> _sizingNode;
     };
-#endif // OSG_VERSION_LESS_THAN(3,5,6)
 
     /**
      * Proxy class that registers a custom render bin's prototype with the
@@ -221,7 +124,7 @@
     {
         VertexCacheOptimizer();
         virtual ~VertexCacheOptimizer() { }
-        void apply( osg::Geode& node );
+        void apply(osg::Drawable& drawable);
     };
 
     /**
@@ -231,7 +134,7 @@
     {
         SetDataVarianceVisitor(osg::Object::DataVariance value);
         virtual ~SetDataVarianceVisitor() { }
-        void apply( osg::Geode& node );
+        void apply(osg::Drawable& drawable);
         osg::Object::DataVariance _value;
     };
 
@@ -241,7 +144,7 @@
     struct OSGEARTH_EXPORT GeometryValidator : public osg::NodeVisitor
     {
         GeometryValidator();
-        void apply(osg::Geode& geode);
+        void apply(osg::Group& group);
         void apply(osg::Geometry& geom);
     };
 
@@ -253,7 +156,7 @@
     public:
         AllocateAndMergeBufferObjectsVisitor();
         virtual ~AllocateAndMergeBufferObjectsVisitor() { }
-        void apply(osg::Geode& geode);
+        void apply(osg::Drawable& drawable);
     };
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Utils.cpp osgearth-2.10.2+dfsg/src/osgEarth/Utils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Utils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Utils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,28 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/Utils>
-#include <osgEarth/ECEF>
-#include <osgEarth/CullingUtils>
-#include <osg/Version>
-#include <osg/CoordinateSystemNode>
-#include <osg/MatrixTransform>
 #include <osgUtil/MeshOptimizers>
 
 using namespace osgEarth;
 
 //------------------------------------------------------------------------
 
-void osgEarth::removeEventHandler(osgViewer::View* view, osgGA::GUIEventHandler* handler)
-{
-    osgViewer::View::EventHandlers::iterator itr = std::find(view->getEventHandlers().begin(), view->getEventHandlers().end(), handler);
-    if (itr != view->getEventHandlers().end())
-    {
-        view->getEventHandlers().erase(itr);
-    }
-}
-
-//------------------------------------------------------------------------
-
 #ifdef OE_HAVE_PIXEL_AUTO_TRANSFORM
 
 #undef LC
@@ -341,38 +325,35 @@
 }
 
 void
-VertexCacheOptimizer::apply(osg::Geode& geode)
+VertexCacheOptimizer::apply(osg::Drawable& drawable)
 {
-    if (geode.getDataVariance() == osg::Object::DYNAMIC)
+    if (drawable.getDataVariance() == osg::Object::DYNAMIC)
         return;
 
-    for(unsigned i=0; i<geode.getNumDrawables(); ++i )
-    {
-        osg::Geometry* geom = geode.getDrawable(i)->asGeometry();
+    osg::Geometry* geom = drawable.asGeometry();
 
-        if ( geom )
-        {
-            if ( geom->getDataVariance() == osg::Object::DYNAMIC )
-                return;
+    if ( geom )
+    {
+        if ( geom->getDataVariance() == osg::Object::DYNAMIC )
+            return;
 
-            // vertex cache optimizations currently only support surface geometries.
-            // all or nothing in the geode.
-            osg::Geometry::PrimitiveSetList& psets = geom->getPrimitiveSetList();
-            for( osg::Geometry::PrimitiveSetList::iterator i = psets.begin(); i != psets.end(); ++i )
-            {
-                switch( (*i)->getMode() )
-                {
-                case GL_TRIANGLES:
-                case GL_TRIANGLE_FAN:
-                case GL_TRIANGLE_STRIP:
-                case GL_QUADS:
-                case GL_QUAD_STRIP:
-                case GL_POLYGON:
-                    break;
+        // vertex cache optimizations currently only support surface geometries.
+        // all or nothing in the geode.
+        osg::Geometry::PrimitiveSetList& psets = geom->getPrimitiveSetList();
+        for( osg::Geometry::PrimitiveSetList::iterator i = psets.begin(); i != psets.end(); ++i )
+        {
+            switch( (*i)->getMode() )
+            {
+            case GL_TRIANGLES:
+            case GL_TRIANGLE_FAN:
+            case GL_TRIANGLE_STRIP:
+            case GL_QUADS:
+            case GL_QUAD_STRIP:
+            case GL_POLYGON:
+                break;
 
-                default:
-                    return;
-                }
+            default:
+                return;
             }
         }
     }
@@ -381,14 +362,14 @@
 
     // passed the test; run the optimizer.
     osgUtil::VertexCacheVisitor vcv;
-    geode.accept( vcv );
+    drawable.accept( vcv );
     vcv.optimizeVertices();
 
     osgUtil::VertexAccessOrderVisitor vaov;
-    geode.accept( vaov );
+    drawable.accept( vaov );
     vaov.optimizeOrder();
 
-    traverse( geode );
+    traverse( drawable );
 }
 
 //-----------------------------------------------------------------------------
@@ -404,16 +385,10 @@
 }
 
 void
-SetDataVarianceVisitor::apply(osg::Geode& geode)
+SetDataVarianceVisitor::apply(osg::Drawable& drawable)
 {
-    for(unsigned i=0; i<geode.getNumDrawables(); ++i)
-    {
-        osg::Drawable* d = geode.getDrawable(i);
-        if ( d )
-            d->setDataVariance( _value );
-    }
-
-    traverse(geode);
+    drawable.setDataVariance(_value);
+    traverse(drawable);
 }
 
 //-----------------------------------------------------------------------------
@@ -572,19 +547,18 @@
 }
 
 void
-GeometryValidator::apply(osg::Geode& geode)
+GeometryValidator::apply(osg::Group& group)
 {
-    for(unsigned i=0; i<geode.getNumDrawables(); ++i)
+    for(unsigned i=0; i<group.getNumChildren(); ++i)
     {
-        osg::Geometry* geom = geode.getDrawable(i)->asGeometry();
+        osg::Geometry* geom = group.getChild(i)->asGeometry();
         if ( geom )
         {
             apply( *geom );
-
             if ( geom->getVertexArray() == 0L )
             {
                 OE_NOTICE << "removing " << geom->getName() << " b/c of null vertex array\n";
-                geode.removeDrawable( geom );
+                group.removeChild(geom);
                 --i;
             }
         }
@@ -600,20 +574,17 @@
 }
 
 void
-AllocateAndMergeBufferObjectsVisitor::apply(osg::Geode& geode)
+AllocateAndMergeBufferObjectsVisitor::apply(osg::Drawable& drawable)
 {
-    for(unsigned i=0; i<geode.getNumDrawables(); ++i)
+    osg::Geometry* geom = drawable.asGeometry();
+    if ( geom )
     {
-        osg::Geometry* geom = geode.getDrawable(i)->asGeometry();
-        if ( geom )
-        {
-            // We disable vbo's and then re-enable them to enable sharing of all the arrays.
-            geom->setUseDisplayList( false );
-            geom->setUseVertexBufferObjects( false );
-            geom->setUseVertexBufferObjects( true );
-        }
+        // We disable vbo's and then re-enable them to enable sharing of all the arrays.
+        geom->setUseDisplayList( false );
+        geom->setUseVertexBufferObjects( false );
+        geom->setUseVertexBufferObjects( true );
     }
-    traverse(geode);
+    traverse(drawable);
 }
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Version osgearth-2.10.2+dfsg/src/osgEarth/Version
--- osgearth-2.9.0+dfsg/src/osgEarth/Version	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Version	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -28,11 +28,11 @@
 extern "C" {
 
 #define OSGEARTH_MAJOR_VERSION    2
-#define OSGEARTH_MINOR_VERSION    9
-#define OSGEARTH_PATCH_VERSION    0
+#define OSGEARTH_MINOR_VERSION    10
+#define OSGEARTH_PATCH_VERSION    2
 #define OSGEARTH_SOVERSION        0
 #define OSGEARTH_RC_VERSION       0
-#define OSGEARTH_DEVEL_VERSION    0     // 0 = release; >0 = interim devel version
+#define OSGEARTH_DEVEL_VERSION    0    // 0 = release; >0 = interim devel version
 
 /* Convenience macro that can be used to decide whether a feature is present or not i.e.
  * #if OSGEARTH_MIN_VERSION_REQUIRED(1,4,0)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Version.cpp osgearth-2.10.2+dfsg/src/osgEarth/Version.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Version.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Version.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include <osgEarth/Common>
 #include <osgEarth/Version>
-#include <string>
+
 #include <stdio.h>
 
 #ifdef OSGEARTH_EMBED_GIT_SHA
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/VerticalDatum osgearth-2.10.2+dfsg/src/osgEarth/VerticalDatum
--- osgearth-2.9.0+dfsg/src/osgEarth/VerticalDatum	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/VerticalDatum	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/VerticalDatum.cpp osgearth-2.10.2+dfsg/src/osgEarth/VerticalDatum.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/VerticalDatum.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/VerticalDatum.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,12 +18,10 @@
  */
 
 #include <osgEarth/VerticalDatum>
-#include <osgEarth/StringUtils>
 #include <osgEarth/ThreadingUtils>
 #include <osgEarth/GeoData>
 
 #include <osgDB/ReadFile>
-#include <osgDB/ReaderWriter>
 
 using namespace osgEarth;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/VideoLayer osgearth-2.10.2+dfsg/src/osgEarth/VideoLayer
--- osgearth-2.9.0+dfsg/src/osgEarth/VideoLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/VideoLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -70,19 +70,21 @@
     class OSGEARTH_EXPORT VideoLayer : public osgEarth::ImageLayer
     {
     public:
-        META_Layer(osgEarth, VideoLayer, VideoLayerOptions);
+        META_Layer(osgEarth, VideoLayer, VideoLayerOptions, video);
 
         VideoLayer();        
         
         VideoLayer( const VideoLayerOptions& options );
 
-        const Status& open();
+        osg::Texture2D* getTexture() const { return _texture.get(); }
 
-        virtual bool createTextureSupported() const { return true; }
+    public: // ImageLayer:
 
-        virtual osg::Texture* createTexture(const TileKey& key, ProgressCallback* progress, osg::Matrixf& textureMatrix);
+        void init();
 
-        osg::Texture2D* getTexture() const { return _texture.get(); }
+        const Status& open();
+
+        virtual osg::Texture* createTexture(const TileKey& key, ProgressCallback* progress, osg::Matrixf& textureMatrix);
 
     protected:
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/VideoLayer.cpp osgearth-2.10.2+dfsg/src/osgEarth/VideoLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/VideoLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/VideoLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -54,17 +54,14 @@
 VideoLayerOptions::getConfig() const
 {
     Config conf = ImageLayerOptions::getConfig();
-    conf.key() = "video";
-
     conf.set("url", _url);
-
     return conf;
 }
 
 void
 VideoLayerOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet("url", _url );
+    conf.get("url", _url );
 }
 
 void
@@ -88,12 +85,20 @@
     init();    
 }
 
+void
+VideoLayer::init()
+{
+    ImageLayer::init();
+    
+    // Configure the layer to use createTexture() to return data
+    setUseCreateTexture();
+}
+
 const Status&
 VideoLayer::open()
 {
     if ( !_openCalled )
     {
-
         if (!options().url().isSet())
         {
             return setStatus(Status::Error(Status::ConfigurationError, "Missing required url"));
@@ -136,20 +141,12 @@
 }
 
 osg::Texture* VideoLayer::createTexture(const TileKey& key, ProgressCallback* progress, osg::Matrixf& textureMatrix)
-{    
-    if (key.getLOD() > 0) return 0;
-
-    bool flip = _texture->getImage()->getOrigin()==osg::Image::TOP_LEFT;
-    osg::Matrixf scale = osg::Matrixf::scale(0.5, flip? -1.0 : 1.0, 1.0);         
-
-    if (key.getTileX() == 0)
+{   
+    bool flip = _texture->getImage()->getOrigin() == osg::Image::TOP_LEFT;    
+    key.getExtent().createScaleBias(key.getProfile()->getExtent(), textureMatrix);
+    if (flip)
     {
-        textureMatrix = scale;
-    }
-    else if (key.getTileX() == 1)
-    {
-        textureMatrix =  scale * osg::Matrixf::translate(0.5, 0.0, 0.0);
-    }
-
+        textureMatrix *= osg::Matrixf::scale(1.0, flip ? -1.0 : 1.0, 1.0);
+    }  
     return _texture.get();
 }
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Viewpoint osgearth-2.10.2+dfsg/src/osgEarth/Viewpoint
--- osgearth-2.9.0+dfsg/src/osgEarth/Viewpoint	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Viewpoint	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -80,9 +80,12 @@
          * Node will not serialize into a Config.
          */
         void setNode(osg::Node* value)                    { _node = value; }
-        bool getNode(osg::ref_ptr<osg::Node>& safe) const { return _node.lock(safe); }
+        osg::ref_ptr<osg::Node> getNode() const;
         bool nodeIsSet() const                            { return _node.valid(); }
 
+        //! @deprecated - use getNode() instead
+        bool getNode(osg::ref_ptr<osg::Node>& safe) const { return _node.lock(safe); }
+
         /**
          * Heading (in degrees) of the camera relative to the focal point.
          */
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/Viewpoint.cpp osgearth-2.10.2+dfsg/src/osgEarth/Viewpoint.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/Viewpoint.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/Viewpoint.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarth/Viewpoint>
-#include <sstream>
 
 using namespace osgEarth;
 
@@ -53,10 +52,10 @@
 
 Viewpoint::Viewpoint(const Config& conf)
 {
-    conf.getIfSet( "name",    _name );
-    conf.getIfSet( "heading", _heading );
-    conf.getIfSet( "pitch",   _pitch );
-    conf.getIfSet( "range",   _range );
+    conf.get( "name",    _name );
+    conf.get( "heading", _heading );
+    conf.get( "pitch",   _pitch );
+    conf.get( "range",   _range );
 
     // piecewise point.
     std::string horiz = conf.value("srs");
@@ -97,6 +96,14 @@
     }
 }
 
+osg::ref_ptr<osg::Node>
+Viewpoint::getNode() const
+{
+    osg::ref_ptr<osg::Node> node;
+    _node.lock(node);
+    return node;
+}
+
 #define CONF_STR Stringify() << std::fixed << std::setprecision(4)
 
 Config
@@ -104,10 +111,10 @@
 {
     Config conf( "viewpoint" );
 
-    conf.addIfSet( "name",    _name );
-    conf.addIfSet( "heading", _heading );
-    conf.addIfSet( "pitch",   _pitch );
-    conf.addIfSet( "range",   _range );
+    conf.set( "name",    _name );
+    conf.set( "heading", _heading );
+    conf.set( "pitch",   _pitch );
+    conf.set( "range",   _range );
     
     if ( _point.isSet() )
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/VirtualProgram osgearth-2.10.2+dfsg/src/osgEarth/VirtualProgram
--- osgearth-2.9.0+dfsg/src/osgEarth/VirtualProgram	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/VirtualProgram	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -36,11 +36,11 @@
 #if defined(OSG_GLES2_AVAILABLE)
 #    define GLSL_VERSION                 100
 #    define GLSL_VERSION_STR             "100"
-#    define GLSL_DEFAULT_PRECISION_FLOAT "precision highp float;"
+#    define GLSL_DEFAULT_PRECISION_FLOAT "precision highp float;\nprecision highp int;"
 #elif defined(OSG_GLES3_AVAILABLE)
 #    define GLSL_VERSION                 300
 #    define GLSL_VERSION_STR             "300 es"
-#    define GLSL_DEFAULT_PRECISION_FLOAT "precision highp float;"
+#    define GLSL_DEFAULT_PRECISION_FLOAT "precision highp float;\nprecision highp int;"
 #elif defined(OSG_GL3_AVAILABLE)
 #    define GLSL_VERSION                 330
 #    define GLSL_VERSION_STR             "330"
@@ -93,6 +93,7 @@
         /**
          * Callback that accepts a user-injected shader function (set with
          * setFunction) for inclusing in the program at render time.
+         * @deprecated (remove after user support)
          */
         class AcceptCallback : public osg::Referenced
         {
@@ -107,10 +108,9 @@
         struct Function
         {
             std::string                  _name;
-            osg::ref_ptr<AcceptCallback> _accept;
-            optional<float>              _minRange;
-            optional<float>              _maxRange;
+            osg::ref_ptr<AcceptCallback> _accept; // @deprecated (remove after user support)
             
+            // @dperecated (remove after user support)
             bool accept(const osg::State& state) const {
                 return (!_accept.valid()) || (_accept->operator()(state) == true);
             }
@@ -178,12 +178,12 @@
         /** Generates the shaders. */
         void prepare();
 
-    public:
         /** Called from the draw context to resize shader buffers as necessary (OSG) */
-        void resizeGLObjectBuffers(unsigned maxSize);
+        virtual void resizeGLObjectBuffers(unsigned maxSize);
 
-        /** Called by OSG to release GPu memory associated with the object */
-        void releaseGLObjects(osg::State* state) const;
+        virtual void releaseGLObjects(osg::State* state) const;
+
+        static PolyShader * lookUpShader(const std::string & functionName, const std::string & shaderSource, ShaderComp::FunctionLocation location);
 
     protected:
         virtual ~PolyShader() { }
@@ -203,9 +203,62 @@
         osg::ref_ptr<osg::Shader>    _tessevalShader;
 
         bool                         _dirty;
+
+        static Threading::Mutex _cacheMutex;
+        typedef std::map<std::pair<std::string, std::string>, osg::ref_ptr<PolyShader> > PolyShaderCache;
+        static PolyShaderCache _polyShaderCache;
+
     };
 
-    typedef std::vector< osg::ref_ptr<PolyShader> > ProgramKey;
+    //typedef std::vector< osg::ref_ptr<PolyShader> > ProgramKey;
+    typedef std::vector<PolyShader*> ProgramKey;
+
+
+    class /*internal*/ ProgramRepo : public osg::Referenced
+    {
+    public:
+
+        // Referenced, b/c more than one ProgramKey can point to the same Entry
+        // (shared program)
+        struct Entry : public osg::Referenced
+        {
+            osg::ref_ptr<osg::Program> _program;
+            unsigned                   _frameLastUsed;
+            std::set<UID>              _users;
+        };
+
+        typedef std::map<ProgramKey, osg::ref_ptr<Entry> > ProgramMap;
+
+        //! Exclusive lock on the repo - enclose any calls to this object
+        //! with a lock/unlock pair
+        void lock();
+
+        //! unlock the repo
+        void unlock();
+
+        //! Search for a program matching the key and return it, adding the user
+        //! to its users list and updating the frame number.
+        osg::ref_ptr<osg::Program> use(const ProgramKey& key, unsigned frameNumber, UID user);
+
+        //! Insert a new program into the repo
+        void add(const ProgramKey& key, osg::ref_ptr<osg::Program>& inOut, unsigned frameNumber, UID user);
+
+        //! Release anything used by this user
+        void release(UID user, osg::State* state);
+
+        //! Prune expired data
+        void prune(unsigned frameNumber, osg::State* state);
+
+        void resizeGLObjectBuffers(unsigned maxSize);
+
+        void releaseGLObjects(osg::State* state) const;
+
+        ~ProgramRepo();
+
+    private:
+        mutable ProgramMap _db;
+        mutable Threading::Mutex _m;
+    };
 
 
     /**
@@ -281,14 +334,10 @@
             ShaderComp::AcceptCallback*  acceptCallback,
             float                        order =1.0f );
 
-        /**
-         * Sets the minimum active range for a named function. The function must already
-         * exist in the VirtualProgram. For this to work, there must to a uniform in the
-         * scene graph that conveys the current range; use the VirtualProgramRangeCallback
-         * to activate this.
-         */
+        /** @deprecated and NOOP (remove after 2.10) */
         void setFunctionMinRange(const std::string& name, float minRange);
 
+        /** @deprecated and NOOP (remove after 2.10) */
         void setFunctionMaxRange(const std::string& name, float maxRange);
 
         /**
@@ -350,9 +399,7 @@
             osg::Shader*                       shader,
             osg::StateAttribute::OverrideValue ov         =osg::StateAttribute::ON );
 
-        /**
-         * Removes a shader from the local VP.
-         */
+        /** Removes a shader from the local VP. */
         void removeShader( const std::string& shaderID );
 
         /** Add an attribute location binding. */
@@ -372,13 +419,15 @@
         /** Enable logging to the console, for debugging. */
         void setShaderLogging( bool log );
 
-        /** Enable logging to a file, for deugging. */
+        /** Enable logging to a file, for debugging. */
         void setShaderLogging( bool log, const std::string& filepath );
 
-        /** Gets whether the accept callbacks vary per frame */
+        /** Gets whether the accept callbacks vary per frame
+          * @deprecated (remove after user support */
         bool getAcceptCallbacksVaryPerFrame() const;
 
-        /** Sets whether the accept callbacks vary per frame */
+        /** Sets whether the accept callbacks vary per frame
+          * @deprecated (remove after user support) */
         void setAcceptCallbacksVaryPerFrame(bool acceptCallbacksVaryPerFrame);
 
         /** Inheritance mask */
@@ -408,16 +457,10 @@
             bool accept(const osg::State& state) const;
             osg::ref_ptr<PolyShader>                 _shader;
             osg::StateAttribute::OverrideValue       _overrideValue;
-            osg::ref_ptr<ShaderComp::AcceptCallback> _accept;
+            osg::ref_ptr<ShaderComp::AcceptCallback> _accept; // @deprecated
             bool operator < (const ShaderEntry& rhs) const;
         };
 
-        struct ProgramEntry
-        {
-            osg::ref_ptr<osg::Program> _program;
-            unsigned                   _frameLastUsed;
-        };
-
         typedef unsigned                              ShaderID;
         typedef vector_map<ShaderID, ShaderEntry>     ShaderMap;
         typedef std::set<std::string>                 ExtensionsSet;
@@ -425,7 +468,7 @@
         typedef std::pair< std::string, std::string > AttribAlias;
         typedef std::vector< AttribAlias >            AttribAliasVector;
 
-        typedef osgEarth::fast_map< ProgramKey, ProgramEntry > ProgramMap;
+        //typedef osgEarth::fast_map< ProgramKey, ProgramEntry > ProgramMap;
         typedef std::pair< const osg::StateAttribute*, osg::StateAttribute::OverrideValue > AttributePair;
         typedef std::vector< AttributePair > AttrStack;
 
@@ -499,9 +542,6 @@
         // The program cache holds an osg::Program instance for each collection of shaders
         // that comprises this VP. There can be multiple programs in the cache if the VP is
         // shared in the scene graph.
-        mutable ProgramMap       _programCache;
-        mutable Threading::Mutex _programCacheMutex;
-
         mutable optional<bool> _active;
         bool _inheritSet;
 
@@ -510,10 +550,14 @@
 
         bool _isAbstract;
 
+        UID _id;
+
         AttribAliasMap _attribAliases;
 
         bool _acceptCallbacksVaryPerFrame;
 
+        mutable osg::buffered_object< osg::ref_ptr<osg::Program> > _lastUsedProgram;
+
         // Mechnism for remembering whether a VP has been applied during the same frame
         // and with the same attribute stack.
         struct AttrStackMemory
@@ -547,15 +591,6 @@
             AttribBindingList& accumAttribBindings,
             AttribAliasMap&    accumAttribAliases,
             bool&              acceptCallbacksPresent);
-        
-        bool readProgramCache(
-            const ProgramKey& key,
-            unsigned frameNumber,
-            osg::ref_ptr<osg::Program>& program);
-
-        void removeExpiredProgramsFromCache(
-            osg::State& state,
-            unsigned frameNumber);
 
         bool checkSharing();
     };
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/VirtualProgram.cpp osgearth-2.10.2+dfsg/src/osgEarth/VirtualProgram.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/VirtualProgram.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/VirtualProgram.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,6 +22,7 @@
 #include <osgEarth/Capabilities>
 #include <osgEarth/ShaderFactory>
 #include <osgEarth/ShaderUtils>
+#include <osgEarth/ShaderMerger>
 #include <osgEarth/StringUtils>
 #include <osgEarth/Containers>
 #include <osg/Shader>
@@ -35,8 +36,6 @@
 #include <sstream>
 #include <OpenThreads/Thread>
 
-#define LC "[VirtualProgram] "
-
 using namespace osgEarth;
 using namespace osgEarth::ShaderComp;
 
@@ -46,16 +45,32 @@
 //#define DEBUG_APPLY_COUNTS
 //#define DEBUG_ACCUMULATION
 
-#define USE_STACK_MEMORY 1
+#define MAX_CONTEXTS 16
 
 #define MAX_PROGRAM_CACHE_SIZE 128
 
-#define PREALLOCATE_APPLY_VARS 1
+//#define USE_STACK_MEMORY
 
-#define MAX_CONTEXTS 16
+#define PREALLOCATE_APPLY_VARS
+
+#define USE_PROGRAM_REPO
+
+// Without a program repo, we need to store a refptr to the actual Program somewhere.
+#ifndef USE_PROGRAM_REPO
+    #define USE_LAST_USED_PROGRAM
+#endif
+
+// Don't use this until we make it safe (combine with ProgramRepo or something) -gw
+//#define USE_POLYSHADER_CACHE
 
 #define MAKE_SHADER_ID(X) osgEarth::hashString( X )
 
+
+#ifdef USE_POLYSHADER_CACHE
+Threading::Mutex PolyShader::_cacheMutex;
+PolyShader::PolyShaderCache PolyShader::_polyShaderCache;
+#endif
+
 //------------------------------------------------------------------------
 
 namespace
@@ -83,10 +98,162 @@
 
 //------------------------------------------------------------------------
 
+#undef  LC
+#define LC "[ProgramRepo] "
+
+ProgramRepo::~ProgramRepo()
+{
+    releaseGLObjects(NULL);
+}
+
+void
+ProgramRepo::lock()
+{
+    _m.lock();
+}
+
+void ProgramRepo::unlock()
+{
+    _m.unlock();
+}
+
+osg::ref_ptr<osg::Program>
+ProgramRepo::use(const ProgramKey& key, unsigned frameNumber, UID user)
+{
+    ProgramMap::iterator i = _db.find( key );
+    if ( i != _db.end() )
+    {
+        Entry* e = i->second.get();
+        e->_frameLastUsed = frameNumber;
+        e->_users.insert(user);
+
+        //OE_TEST << LC << "PR USE prog=" << e->_program.get() << " user=" << (user) << " total=" << e->_users.size() << std::endl;
+
+        return e->_program;
+    }
+    return 0L;
+}
+
+void
+ProgramRepo::release(UID user, osg::State* state)
+{
+    if (!user)
+        return;
+
+    for(ProgramMap::iterator i = _db.begin(); i != _db.end(); )
+    {
+        Entry* e = i->second.get();
+        bool increment = true;
+
+        if (e->_users.find(user) != e->_users.end())
+        {
+            // remove "user" from the users list:
+            e->_users.erase(user);
+            
+            //OE_TEST << LC << "PR REL prog=" << (e->_program.get()) << " user=" << (user) << " total=" << e->_users.size() << std::endl;
+
+            if (e->_users.empty())
+            {
+                // release the GL memory
+                e->_program->releaseGLObjects(state);
+               
+                OE_TEST << LC << "Released program " << e->_program->getName() << "; dbsize=" << _db.size()-1 << std::endl;
+
+                // remove from the repo
+                _db.erase(i++);
+                increment = false;
+            }            
+        }
+
+        if (increment)
+            ++i;
+    }
+}
+
+void
+ProgramRepo::add(const ProgramKey& key, osg::ref_ptr<osg::Program>& in_out, unsigned frameNumber, UID user)
+{
+    // First try to find an entry with an equivalent program:
+    for(ProgramMap::iterator i = _db.begin(); i != _db.end(); ++i)
+    {
+        osg::ref_ptr<Entry>& e = i->second;
+
+        // same pointer? do nothing but update the user
+        if (e->_program.get() == in_out.get())
+        {
+            osg::ref_ptr<Entry>& newEntry = _db[key];
+            newEntry = e.get();
+            in_out = e->_program.get();
+            e->_users.insert(user);
+            
+            OE_TEST << LC << "PR SHR1 prog=" << e->_program.get() << " user=" << (user) << " total=" << e->_users.size() << std::endl;
+
+            return;
+        }
+
+        // different pointer but equivalent? replace input with output
+        // and let input go out of scope
+        else if (e->_program->compare(*in_out.get()) == 0)
+        {
+            osg::ref_ptr<Entry>& newEntry = _db[key];
+            newEntry = e.get();
+            in_out = e->_program.get();
+            e->_users.insert(user);
+
+            OE_TEST << LC << "PR SHR2 prog=" << e->_program.get() << " user=" << (user) << " total=" << e->_users.size() << std::endl;
+        
+            return;
+        }
+    }
+
+    osg::ref_ptr<Entry>& newEntry = _db[key];    
+    newEntry = new Entry();
+    newEntry->_program = in_out.get();
+    newEntry->_frameLastUsed = frameNumber;
+    newEntry->_users.insert(user);
+}
+
+void
+ProgramRepo::prune(unsigned frameNumber, osg::State* state)
+{
+    //todo
+}
+
+void
+ProgramRepo::resizeGLObjectBuffers(unsigned maxSize)
+{
+    for (ProgramMap::iterator i = _db.begin(); i != _db.end(); ++i)
+    {
+        i->second->_program->resizeGLObjectBuffers(maxSize);
+    }
+}
+
+void
+ProgramRepo::releaseGLObjects(osg::State* state) const
+{
+    OE_TEST << LC << "Main release, size=" << _db.size() << std::endl;
+    // First try to find an entry with an equivalent program:
+    for(ProgramMap::iterator i = _db.begin(); i != _db.end(); ++i)
+    {
+        osg::ref_ptr<Entry>& e = i->second;
+        e->_program->releaseGLObjects(state);
+        OE_TEST << LC << "...released program " << e->_program->getName() << std::endl;
+    }
+    _db.clear();
+}
+
+//------------------------------------------------------------------------
+
+#undef  LC
+#define LC "[VirtualProgram] "
+
 // environment variable control
 #define OSGEARTH_DUMP_SHADERS  "OSGEARTH_DUMP_SHADERS"
 #define OSGEARTH_MERGE_SHADERS "OSGEARTH_MERGE_SHADERS"
 
+#define OSGEARTH_DISABLE_GLRELEASE "OSGEARTH_VP_DISABLE_GL_RELEASE"
+static bool s_disableVPRelease = false;
+
 namespace
 {
 #if defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)
@@ -144,96 +311,6 @@
         return r;
     }
 
-
-    void parseShaderForMerging( const std::string& source, unsigned& version, std::string& subversion, HeaderMap& precisions, HeaderMap& headers, std::stringstream& body )
-    {
-    
-        // types we consider declarations
-        std::string dectypesarray[] = {"void", "uniform", "in", "out", "varying", "bool", "int", "float", "vec2", "vec3", "vec4", "bvec2", "bvec3", "bvec4", "ivec2", "ivec3", "ivec4", "mat2", "mat3", "mat4", "sampler2D", "samplerCube", "lowp", "mediump", "highp", "struct", "attribute", "#extension", "#define"};
-        std::vector<std::string> dectypes (dectypesarray, dectypesarray + sizeof(dectypesarray) / sizeof(dectypesarray[0]) );
-        
-        // break into lines:
-        StringVector lines;
-        StringTokenizer( source, lines, "\n", "", true, false );
-
-        // keep track of brackets and if we're in global scope indent==0
-        int indent = 0;
-
-        for( StringVector::const_iterator line_iter = lines.begin(); line_iter != lines.end(); ++line_iter )
-        {
-            std::string line = trimAndCompress(*line_iter);
-
-            if ( line.size() > 0 )
-            {
-                StringVector tokens;
-                StringTokenizer( line, tokens, " \t", "", false, true );
-                
-                indent += std::count(line.begin(), line.end(), '{');
-                indent -= std::count(line.begin(), line.end(), '}');
-                
-                // we say it's a declaration if it starts with one of the dectyps, has a ; at the end and is in the global scope
-                bool isdec = (std::find(dectypes.begin(), dectypes.end(), tokens[0]) != dectypes.end() && line[line.size()-1] == ';' && indent == 0) || (tokens[0] == "#extension" || tokens[0] == "#define");
-                
-                // discard forward declarations of functions, we know it's a declaration so just see if it has brackets (should be safe)
-                bool isfunc = isdec && (line.find("(") != std::string::npos && line.find(")") != std::string::npos);
-                if(isfunc) continue;
-
-                if (tokens[0] == "#version")
-                {
-                    // find the highest version number.
-                    if ( tokens.size() > 1 )
-                    {
-                        unsigned newVersion = osgEarth::as<unsigned>(tokens[1], 0);
-                        if ( newVersion > version )
-                        {
-                            version = newVersion;
-                            if(tokens.size() > 2)
-                            {
-                                subversion = tokens[2];
-                            }
-                        }
-                    }
-                }
-                
-                else if(tokens[0] == "precision") {
-                    // precision stored in map of value type to current highest value precision
-                    // dec should be keyword valueprecision type, precision highp float
-                    if(tokens.size() < 3) continue;
-                    std::string& currentlevel = precisions[tokens[2]];
-                    
-                    // see if it's higher
-                    if(currentlevel.empty() || (currentlevel == "lowp" && (tokens[1] == "mediump" || tokens[1] == "highp"))) currentlevel = tokens[1];
-                    if(currentlevel == "mediump" && tokens[1] == "highp") currentlevel = tokens[1];
-                }
-
-                else if (isdec
-                    /*tokens[0] == "#extension"   ||
-                    tokens[0] == "#define"      ||
-                    tokens[0] == "precision"    ||
-                    tokens[0] == "struct"       ||
-                    tokens[0] == "varying"      ||
-                    tokens[0] == "uniform"      ||
-                    tokens[0] == "attribute"*/)
-                {
-                    std::string& header = headers[line];
-                    header = line;
-                }
-
-                else
-                {
-                    body << (*line_iter) << "\n";
-                }
-            }
-        }
-        
-#if defined(OSG_GLES3_AVAILABLE)
-        // just force gles 3 to use correct version number as shaders in earth files might include a version
-        version = 300;
-        subversion = "es";
-#endif
-    }
-
-
     bool s_attribAliasSortFunc(const std::pair<std::string,std::string>& a, const std::pair<std::string,std::string>& b) {
         return a.first.size() > b.first.size();
     }
@@ -325,6 +402,16 @@
         return false;
     }
 
+    std::string getNameForType(osg::Shader::Type type)
+    {
+        return
+            type == osg::Shader::VERTEX ? "VERTEX" :
+            type == osg::Shader::FRAGMENT ? "FRAGMENT" :
+            type == osg::Shader::GEOMETRY ? "GEOMETRY" :
+            type == osg::Shader::TESSCONTROL ? "TESSCONTROL" :
+            "TESSEVAL";
+    }
+
     /**
     * Populates the specified Program with passed-in shaders.
     */
@@ -349,98 +436,33 @@
         }
 #endif
 
-        // merge the shaders if necessary.
-        if ( s_mergeShaders )
+        if (s_mergeShaders)
         {
-            unsigned          vertVersion = 0;
-            std::string       vertSubversion = "";
-            HeaderMap         vertPrecisions;
-            HeaderMap         vertHeaders;
-            std::stringstream vertBody;
-
-            unsigned          fragVersion = 0;
-            std::string       fragSubversion = "";
-            HeaderMap         fragPrecisions;
-            HeaderMap         fragHeaders;
-            std::stringstream fragBody;
+            ShaderMerger merger;
 
-            // parse the shaders, combining header lines and finding the highest version:
-            for( VirtualProgram::ShaderVector::const_iterator i = shaders.begin(); i != shaders.end(); ++i )
+            for(VirtualProgram::ShaderVector::const_iterator i = shaders.begin();
+                i != shaders.end();
+                ++i)
             {
-                osg::Shader* s = i->get();
-                if ( shaderInStageMask(s, stages) )
+                if (shaderInStageMask(i->get(), stages))
                 {
-                    if ( s->getType() == osg::Shader::VERTEX )
-                    {
-                        parseShaderForMerging( s->getShaderSource(), vertVersion, vertSubversion, vertPrecisions, vertHeaders, vertBody );
-                    }
-                    else if ( s->getType() == osg::Shader::FRAGMENT )
-                    {
-                        parseShaderForMerging( s->getShaderSource(), fragVersion, fragSubversion, fragPrecisions, fragHeaders, fragBody );
-                    }
+                    merger.add(i->get());
                 }
             }
 
-            // write out the merged shader code:
-            std::string vertBodyText;
-            vertBodyText = vertBody.str();
-            std::stringstream vertShaderBuf;
-            if ( vertVersion > 0 ) {
-                vertShaderBuf << "#version " << vertVersion;
-                if(vertSubversion.size() > 0)
-                   vertShaderBuf << " " << vertSubversion;
-                vertShaderBuf << "\n";
-            }
+            merger.merge(program);
 
-            if(vertPrecisions.size() > 0) {
-                for(HeaderMap::iterator pitr = vertPrecisions.begin(); pitr != vertPrecisions.end(); ++pitr) {
-                    vertShaderBuf << "precision " << pitr->second << " " << pitr->first << "\n";
-                }
-            }
-
-            for( HeaderMap::const_iterator h = vertHeaders.begin(); h != vertHeaders.end(); ++h )
-                vertShaderBuf << h->second << "\n";
-            vertShaderBuf << vertBodyText << "\n";
-            vertBodyText = vertShaderBuf.str();
-
-
-
-            std::string fragBodyText;
-            fragBodyText = fragBody.str();
-            std::stringstream fragShaderBuf;
-            if ( fragVersion > 0 ) {
-                fragShaderBuf << "#version " << fragVersion;
-                if(fragSubversion.size() > 0)
-                    fragShaderBuf << " " << fragSubversion;
-                fragShaderBuf << "\n";
-            }
-
-#if defined(OSG_GLES3_AVAILABLE)
-            // ensure there's a default for floats in the frag shader
-            std::string& defaultFragFloat = fragPrecisions["float;"];
-            if(defaultFragFloat.size() == 0) defaultFragFloat = "highp";
-#endif
-            if(fragPrecisions.size() > 0) {
-                for(HeaderMap::iterator pitr = fragPrecisions.begin(); pitr != fragPrecisions.end(); ++pitr) {
-                    fragShaderBuf << "precision " << pitr->second << " " << pitr->first << "\n";
-                }
-            }
-
-            for( HeaderMap::const_iterator h = fragHeaders.begin(); h != fragHeaders.end(); ++h )
-                fragShaderBuf << h->second << "\n";
-            fragShaderBuf << fragBodyText << "\n";
-            fragBodyText = fragShaderBuf.str();
-
-
-            // add them to the program.
-            program->addShader( new osg::Shader(osg::Shader::VERTEX, vertBodyText) );
-            program->addShader( new osg::Shader(osg::Shader::FRAGMENT, fragBodyText) );
-
-            if ( s_dumpShaders )
+            if (s_dumpShaders)
             {
-                OE_NOTICE << LC
-                    << "\nMERGED VERTEX SHADER: \n\n" << vertBodyText << "\n\n"
-                    << "MERGED FRAGMENT SHADER: \n\n" << fragBodyText << "\n" << std::endl;
+                for(unsigned i=0; i<program->getNumShaders(); ++i)
+                {
+                    osg::Shader* shader = program->getShader(i);
+                    OE_NOTICE << "\n---------MERGED "
+                        << getNameForType(shader->getType())
+                        << " SHADER------------\n"
+                        << shader->getShaderSource()
+                        << std::endl;
+                }
             }
         }
         else
@@ -555,7 +577,7 @@
         buildVector.reserve( accumShaderMap.size() + mains.size() );
 
         for(ProgramKey::iterator i = outputKey.begin(); i != outputKey.end(); ++i)
-            buildVector.push_back( i->get()->getShader(stages) );
+            buildVector.push_back( (*i)->getShader(stages) );
 
         buildVector.insert( buildVector.end(), mains.begin(), mains.end() );
 
@@ -741,7 +763,6 @@
 
 //------------------------------------------------------------------------
 
-
 VirtualProgram::VirtualProgram( unsigned mask ) : 
 _mask              ( mask ),
 _active            ( true ),
@@ -755,6 +776,8 @@
     // Note: we cannot set _active here. Wait until apply().
     // It will cause a conflict in the Registry.
 
+    _id = osgEarth::Registry::instance()->createUID();
+
     // check the the dump env var
     if ( ::getenv(OSGEARTH_DUMP_SHADERS) != 0L )
     {
@@ -767,10 +790,20 @@
         s_mergeShaders = true;
     }
 
+    if ( ::getenv(OSGEARTH_DISABLE_GLRELEASE) != 0L)
+    {
+        s_disableVPRelease = true;
+    }
+
     // a template object to hold program data (so we don't have to dupliate all the 
     // osg::Program methods..)
     _template = new osg::Program();
 
+
+#ifdef USE_LAST_USED_PROGRAM
+    _lastUsedProgram.resize(MAX_CONTEXTS);
+#endif
+
 #ifdef PREALLOCATE_APPLY_VARS
     _apply.resize(MAX_CONTEXTS);
 #endif
@@ -794,12 +827,19 @@
 _acceptCallbacksVaryPerFrame( rhs._acceptCallbacksVaryPerFrame ),
 _isAbstract        ( rhs._isAbstract )
 {    
+    _id = osgEarth::Registry::instance()->createUID();
+
     // Attribute bindings.
     const osg::Program::AttribBindingList &abl = rhs.getAttribBindingList();
     for( osg::Program::AttribBindingList::const_iterator attribute = abl.begin(); attribute != abl.end(); ++attribute )
     {
         addBindAttribLocation( attribute->first, attribute->second );
     }
+
+
+#ifdef USE_LAST_USED_PROGRAM
+    _lastUsedProgram.resize(MAX_CONTEXTS);
+#endif
     
 #ifdef PREALLOCATE_APPLY_VARS
     _apply.resize(MAX_CONTEXTS);
@@ -812,7 +852,16 @@
 
 VirtualProgram::~VirtualProgram()
 {
-    //NOP
+#ifdef USE_PROGRAM_REPO
+    if (Registry::instance())
+    {
+        Registry::programRepo().lock();
+        Registry::programRepo().release(_id, 0L);
+        Registry::programRepo().unlock();
+    }
+#endif
+
+    OE_TEST << LC << "~VP (" << _id << ") " << getName() << std::endl;
 }
 
 int
@@ -900,6 +949,8 @@
 void
 VirtualProgram::compileGLObjects(osg::State& state) const
 {
+    //OE_INFO << LC << "VirtualProgram::compileGLObjects (" << (this) << ")" << std::endl;
+
     // Don't do this here. compileGLObjects() runs from a pre-compilation visitor,
     // and the state is not complete enough to create fully formed programs; so
     // this is not only pointless but can result in shader linkage errors 
@@ -910,50 +961,55 @@
 void
 VirtualProgram::resizeGLObjectBuffers(unsigned maxSize)
 {
-    osg::StateAttribute::resizeGLObjectBuffers(maxSize);
-
-    _programCacheMutex.lock();
-
-    for (ProgramMap::iterator i = _programCache.begin(); i != _programCache.end(); ++i)
-    {
-        i->second._program->resizeGLObjectBuffers(maxSize);
-    }
+#ifdef USE_PROGRAM_REPO
+    Registry::programRepo().lock();
+    Registry::programRepo().resizeGLObjectBuffers(maxSize);
+    Registry::programRepo().unlock();
+#endif
 
     // Resize shaders in the PolyShader
     for( ShaderMap::iterator i = _shaderMap.begin(); i != _shaderMap.end(); ++i )
     {
         if (i->data()._shader.valid())
         {
-            i->data()._shader->resizeGLObjectBuffers(maxSize );
+            i->data()._shader->resizeGLObjectBuffers(maxSize);
         }
     }
-
-    _programCacheMutex.unlock();
 }
 
 void
 VirtualProgram::releaseGLObjects(osg::State* state) const
 {
-    osg::StateAttribute::releaseGLObjects(state);
+    if (s_disableVPRelease)
+        return;
 
-    _programCacheMutex.lock();
+    OE_TEST << LC << "VP::RGLO (" << _id << ") " << getName() << " (" << (_lastUsedProgram[0].get()) << ") state=" << (uintptr_t)state << std::endl;
+    
+#ifdef USE_PROGRAM_REPO
+    Registry::programRepo().lock();
+    Registry::programRepo().release(_id, state);
+    Registry::programRepo().unlock();
+#endif
 
-    for (ProgramMap::const_iterator i = _programCache.begin(); i != _programCache.end(); ++i)
+#ifdef USE_LAST_USED_PROGRAM
+    if (state)
     {
-        i->second._program->releaseGLObjects(state);
+        const osg::Program* p = _lastUsedProgram[state->getContextID()].get();
+        if (p)
+            p->releaseGLObjects(state);
     }
-
-    for (ShaderMap::const_iterator i = _shaderMap.begin(); i != _shaderMap.end(); ++i)
+    else
     {
-        if (i->data()._shader.valid())
+        for(unsigned i=0; i<_lastUsedProgram.size(); ++i)
         {
-            i->data()._shader->releaseGLObjects(state);
+            const osg::Program* p = _lastUsedProgram[i].get();
+            if (p)
+                p->releaseGLObjects(state);
         }
     }
+    _lastUsedProgram.setAllElementsTo(NULL);
 
-    _programCache.clear();
-
-    _programCacheMutex.unlock();
+#endif
 }
 
 PolyShader*
@@ -1096,17 +1152,9 @@
         function._accept = accept;
         ofm.insert( OrderedFunction(ordering, function) );
 
-        // Remove any quotes in the shader source (illegal)
-        std::string source(shaderSource);
-        osgEarth::replaceIn(source, "\"", " ");
-
-        // assemble the poly shader.
-        PolyShader* shader = new PolyShader();
-        shader->setName( functionName );
-        shader->setLocation( location );
-        shader->setShaderSource( source );
-        shader->prepare();
-
+        // assemble the poly shader. but check a map first for existing shaders.
+        PolyShader* shader = PolyShader::lookUpShader(functionName, shaderSource, location);
+      
         ShaderEntry& entry = _shaderMap[MAKE_SHADER_ID(functionName)];
         entry._shader        = shader;
         entry._overrideValue = osg::StateAttribute::ON;
@@ -1120,58 +1168,42 @@
 void 
 VirtualProgram::setFunctionMinRange(const std::string& name, float minRange)
 {
-    // lock the functions map while making changes:
-    _dataModelMutex.lock();
-
-    checkSharing();
-
-    ShaderComp::Function* function;
-    if ( findFunction(name, _functions, &function) )
-    {
-        function->_minRange = minRange;
-    }
-
-    _dataModelMutex.unlock();
+    OE_DEPRECATED(VirtualProgram::setFunctionMinRange, shaders) << std::endl;
 }
 
 void 
 VirtualProgram::setFunctionMaxRange(const std::string& name, float maxRange)
 {
-    // lock the functions map while making changes:
-    _dataModelMutex.lock();
-
-    checkSharing();
-
-    ShaderComp::Function* function;
-    if ( findFunction(name, _functions, &function) )
-    {
-        function->_maxRange = maxRange;
-    }
-
-    _dataModelMutex.unlock();
+    OE_DEPRECATED(VirtualProgram::setFunctionMaxRange, shaders) << std::endl;
 }
 
-bool VirtualProgram::addGLSLExtension(const std::string& extension)
+bool
+VirtualProgram::addGLSLExtension(const std::string& extension)
 {
    _dataModelMutex.lock();
    std::pair<std::set<std::string>::const_iterator, bool> insertPair = _globalExtensions.insert(extension);
    _dataModelMutex.unlock();
    return insertPair.second;
 }
-bool VirtualProgram::hasGLSLExtension(const std::string& extension) const
+
+bool
+VirtualProgram::hasGLSLExtension(const std::string& extension) const
 {
    _dataModelMutex.lock();
    bool doesHave = _globalExtensions.find(extension)!=_globalExtensions.end();
    _dataModelMutex.unlock();
    return doesHave;
 }
-bool VirtualProgram::removeGLSLExtension(const std::string& extension)
+
+bool
+VirtualProgram::removeGLSLExtension(const std::string& extension)
 {
    _dataModelMutex.lock();
    int erased = _globalExtensions.erase(extension);
    _dataModelMutex.unlock();
    return erased > 0;
 }
+
 void
 VirtualProgram::removeShader( const std::string& shaderID )
 {
@@ -1209,12 +1241,14 @@
     {
         _inherit = value;
 
+#ifdef USE_PROGRAM_REPO
         // clear the program cache please
         {
-            _programCacheMutex.lock();
-            _programCache.clear();
-            _programCacheMutex.unlock();
+            Registry::programRepo().lock();
+            Registry::programRepo().release(_id, 0L);
+            Registry::programRepo().unlock();
         }
+#endif
 
         _inheritSet = true;
     }
@@ -1224,6 +1258,8 @@
 void
 VirtualProgram::apply( osg::State& state ) const
 {
+    OE_TEST << LC << "Applying (" << this << ") " << getName() << std::endl;
+
     if (_active.isSetTo(false))
     {
         return;
@@ -1317,7 +1353,6 @@
         
         // Next, add the shaders from this VP.
         {
-            //Threading::ScopedReadLock readonly(_dataModelMutex);
             _dataModelMutex.lock();
 
             for( ShaderMap::const_iterator i = _shaderMap.begin(); i != _shaderMap.end(); ++i )
@@ -1353,85 +1388,72 @@
         // current frame number, for shader program expiry.
         unsigned frameNumber = state.getFrameStamp() ? state.getFrameStamp()->getFrameNumber() : 0;
 
-        // look up the program:
-        {
-            _programCacheMutex.lock();
-            const_cast<VirtualProgram*>(this)->readProgramCache(local.programKey, frameNumber, program);
-            _programCacheMutex.unlock();
-        }
+#ifdef USE_PROGRAM_REPO
+        // LOCK the program repo to look up the program.
+        Registry::programRepo().lock();
+
+        program = Registry::programRepo().use(local.programKey, frameNumber, _id);
+#endif
 
-        // if not found, lock and build it:
-        if ( !program.valid() )
+        if (!program.valid())
         {
             // build a new set of accumulated functions, to support the creation of main()
             ShaderComp::FunctionLocationMap accumFunctions;
             accumulateFunctions( state, accumFunctions );
 
-            // now double-check the program cache, and failing that, build the
-            // new shader Program.
-            {
-                Threading::ScopedMutexLock lock(_programCacheMutex);
+            local.programKey.clear();
 
-                // double-check: look again to negate race conditions
-                const_cast<VirtualProgram*>(this)->readProgramCache(local.programKey, frameNumber, program);
-                if ( !program.valid() )
-                {
-                    local.programKey.clear();
+            //OE_NOTICE << LC << "Building new Program for VP " << getName() << std::endl;
 
-                    //OE_NOTICE << LC << "Building new Program for VP " << getName() << std::endl;
+            program = buildProgram(
+                getName(),
+                state,
+                accumFunctions,
+                local.accumShaderMap,
+                _globalExtensions,
+                local.accumAttribBindings,
+                local.accumAttribAliases,
+                _template.get(),
+                local.programKey);
 
-                    program = buildProgram(
-                        getName(),
-                        state,
-                        accumFunctions,
-                        local.accumShaderMap, 
-                        _globalExtensions,
-                        local.accumAttribBindings, 
-                        local.accumAttribAliases, 
-                        _template.get(),
-                        local.programKey);
+            if (_logShaders && program.valid())
+            {
+                std::stringstream buf;
+                for (unsigned i = 0; i < program->getNumShaders(); i++)
+                {
+                    buf << program->getShader(i)->getShaderSource() << std::endl << std::endl;
+                }
 
-                    if ( _logShaders && program.valid() )
+                if (_logPath.length() > 0)
+                {
+                    std::fstream outStream;
+                    outStream.open(_logPath.c_str(), std::ios::out);
+                    if (outStream.fail())
                     {
-                        std::stringstream buf;
-                        for (unsigned i=0; i < program->getNumShaders(); i++)
-                        {
-                            buf << program->getShader(i)->getShaderSource() << std::endl << std::endl;
-                        }
-
-                        if ( _logPath.length() > 0 )
-                        {
-                            std::fstream outStream;
-                            outStream.open(_logPath.c_str(), std::ios::out);
-                            if (outStream.fail())
-                            {
-                                OE_WARN << LC << "Unable to open " << _logPath << " for logging shaders." << std::endl;
-                            }
-                            else
-                            {
-                                outStream << buf.str();
-                                outStream.close();
-                            }
-                        }
-                        else
-                        {
-                          OE_NOTICE << LC << "Shader source: " << getName() << std::endl << "===============" << std::endl << buf.str() << std::endl << "===============" << std::endl;
-                        }
+                        OE_WARN << LC << "Unable to open " << _logPath << " for logging shaders." << std::endl;
+                    }
+                    else
+                    {
+                        outStream << buf.str();
+                        outStream.close();
                     }
-
-                    // global sharing.
-                    Registry::programSharedRepo()->share( program );
-
-                    // finally, put own new program in the cache.
-                    ProgramEntry& pe = _programCache[local.programKey];
-                    pe._program = program.get();
-                    pe._frameLastUsed = frameNumber;
-
-                    // purge expired programs.
-                    const_cast<VirtualProgram*>(this)->removeExpiredProgramsFromCache(state, frameNumber);
+                }
+                else
+                {
+                    OE_NOTICE << LC << "Shader source: " << getName() << std::endl << "===============" << std::endl << buf.str() << std::endl << "===============" << std::endl;
                 }
             }
+
+#ifdef USE_PROGRAM_REPO
+            // Adds this program to the repo, or finds an equivalent pre-existing program
+            // in the repo and associates this program key with it.
+            Registry::programRepo().add(local.programKey, program, frameNumber, _id);
+
+            // purge expired programs.
+            Registry::programRepo().prune(frameNumber, &state);
+#endif
         }
+        Registry::programRepo().unlock();
     }
 
     // finally, apply the program attribute.
@@ -1451,11 +1473,8 @@
 
         osg::Program::PerContextProgram* pcp;
 
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,4)
         pcp = program->getPCP( state );
-#else
-        pcp = program->getPCP( contextID );
-#endif
+
         bool useProgram = state.getLastAppliedProgramObject() != pcp;
 
 #ifdef DEBUG_APPLY_COUNTS
@@ -1510,57 +1529,27 @@
             }
         }
 
-        //program->apply( state );
-
 #if 0 // test code for detecting race conditions
         for(int i=0; i<10000; ++i) {
             state.setLastAppliedProgramObject(0L);
             program->apply( state );
         }
 #endif
-    }
-}
 
-void
-VirtualProgram::removeExpiredProgramsFromCache(osg::State& state, unsigned frameNumber)
-{
-    if ( frameNumber > 0 && _programCache.size() > MAX_PROGRAM_CACHE_SIZE )
-    {
-        // ASSUME a mutex lock on the cache.
-        for(ProgramMap::iterator k=_programCache.begin(); k!=_programCache.end(); )
+#ifdef USE_LAST_USED_PROGRAM
+        _lastUsedProgram[contextID] = program.get();
+#endif
+
+#if 0 // breakpoint for testing
+        if (state.checkGLErrors(this))
         {
-            if ( frameNumber - k->second._frameLastUsed > 2 )
-            {
-                if ( k->second._program->referenceCount() == 1 )
-                {
-                    k->second._program->releaseGLObjects(&state);
-                }
-                k = _programCache.erase(k);
-            }
-            else
-            {
-                ++k;
-            }
+            int x=0;
         }
+#endif
     }
 }
 
 bool
-VirtualProgram::readProgramCache(const ProgramKey& vec, unsigned frameNumber, osg::ref_ptr<osg::Program>& program)
-//VirtualProgram::readProgramCache(const ShaderVector& vec, unsigned frameNumber, osg::ref_ptr<osg::Program>& program)
-{
-    ProgramMap::iterator p = _programCache.find( vec );
-    if ( p != _programCache.end() )
-    {
-        // update as current..
-        p->second._frameLastUsed = frameNumber;
-        program = p->second._program.get();
-    }
-    return program.valid();
-}
-
-
-bool
 VirtualProgram::checkSharing()
 {
   if ( ::getenv("OSGEARTH_SHARED_VP_WARNING") && getNumParents() > 1)
@@ -1957,20 +1946,60 @@
 
 void PolyShader::releaseGLObjects(osg::State* state) const
 {
-    if (_nominalShader.valid())
-    {
-        _nominalShader->releaseGLObjects(state);
-    }
+   if (_nominalShader.valid())
+   {
+      _nominalShader->releaseGLObjects(state);
+   }
+
+   if (_geomShader.valid())
+   {
+      _geomShader->releaseGLObjects(state);
+   }
+
+   if (_tessevalShader.valid())
+   {
+      _tessevalShader->releaseGLObjects(state);
+   }
+}
 
-    if (_geomShader.valid())
-    {
-        _geomShader->releaseGLObjects(state);
-    }
+PolyShader*
+PolyShader::lookUpShader(const std::string& functionName, const std::string& shaderSource, ShaderComp::FunctionLocation location)
+{
+   PolyShader* shader = NULL;
+   
+#ifdef USE_POLYSHADER_CACHE
+
+   Threading::ScopedMutexLock lock(_cacheMutex);
+
+   std::pair<std::string, std::string> hashKey = std::pair<std::string, std::string>(functionName, shaderSource);
+
+   PolyShaderCache::iterator iter = _polyShaderCache.find(hashKey);
+ 
+   if (iter != _polyShaderCache.end())
+   {
+      shader = iter->second.get();
+   }
+#endif
 
-    if (_tessevalShader.valid())
-    {
-        _tessevalShader->releaseGLObjects(state);
-    }
+   if (!shader)
+   {
+
+      // Remove any quotes in the shader source (illegal)
+      std::string source(shaderSource);
+      osgEarth::replaceIn(source, "\"", " ");
+
+      shader = new PolyShader();
+      shader->setName(functionName);
+      shader->setLocation(location);
+      shader->setShaderSource(source);
+      shader->prepare();
+
+#ifdef USE_POLYSHADER_CACHE
+      _polyShaderCache[hashKey] = shader;
+#endif
+   }
+
+   return shader;
 }
 
 //.......................................................................
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/VisibleLayer osgearth-2.10.2+dfsg/src/osgEarth/VisibleLayer
--- osgearth-2.9.0+dfsg/src/osgEarth/VisibleLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/VisibleLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -30,6 +30,12 @@
     class OSGEARTH_EXPORT VisibleLayerOptions : public LayerOptions
     {
     public:
+        enum Blend {
+            BLEND_INTERPOLATE,
+            BLEND_MODULATE
+        };
+
+    public:
         VisibleLayerOptions();
         VisibleLayerOptions(const ConfigOptions& options);
 
@@ -43,6 +49,22 @@
         /** Opacity of the visible layer [0..1] */
         optional<float>& opacity() { return _opacity; }
         const optional<float>& opacity() const { return _opacity; }
+        
+        //! The initial minimum camera range at which this layer is visible.
+        optional<float>& minVisibleRange() { return _minRange; }
+        const optional<float>& minVisibleRange() const { return _minRange; }
+
+        //! The initial maximum camera range at which this layer is visible.
+        optional<float>& maxVisibleRange() { return _maxRange; }
+        const optional<float>& maxVisibleRange() const { return _maxRange; }
+
+        //! Distance (m) over which to ramp min and max range blending
+        optional<float>& attenuationRange() { return _attenuationRange; }
+        const optional<float>& attenuationRange() const { return _attenuationRange; }
+
+        //! Blending function (default = interpolate)
+        optional<Blend>& blend() { return _blend; }
+        const optional<Blend>& blend() const { return _blend; }
 
     public:
         virtual Config getConfig() const;
@@ -53,6 +75,10 @@
         void setDefaults();       
         optional<bool> _visible;
         optional<float> _opacity;
+        optional<float> _minRange;
+        optional<float> _maxRange;
+        optional<float> _attenuationRange;
+        optional<Blend> _blend;
     };
 
 
@@ -60,6 +86,7 @@
     {
         virtual void onVisibleChanged(class VisibleLayer* layer) { }
         virtual void onOpacityChanged(class VisibleLayer* layer) { }
+        virtual void onVisibleRangeChanged(class VisibleLayer* layer) { }
         typedef void (VisibleLayerCallback::*MethodPtr)(class VisibleLayer* layer);
     };
 
@@ -70,7 +97,7 @@
     class OSGEARTH_EXPORT VisibleLayer : public Layer
     {
     public:
-        META_Layer(osgEarth, VisibleLayer, VisibleLayerOptions);
+        META_Layer(osgEarth, VisibleLayer, VisibleLayerOptions, visible_layer);
 
     protected:
         // Construcable from a base class only.
@@ -87,6 +114,18 @@
         virtual void setOpacity(float value);
         float getOpacity() const;
 
+        //! Minimum camera range at which this image layer is visible (if supported)
+        float getMinVisibleRange() const;
+        void setMinVisibleRange( float minVisibleRange );
+        
+        //! Maximum camera range at which this image layer is visible (if supported)
+        float getMaxVisibleRange() const;
+        void setMaxVisibleRange( float maxVisibleRange );
+        
+        //! Distance (m) over which to ramp min and max range blending
+        float getAttenuationRange() const;
+        void setAttenuationRange( float value );
+
     public: // Layer
 
         virtual const Status& open();
@@ -97,8 +136,15 @@
 
         void fireCallback(VisibleLayerCallback::MethodPtr);
 
+        //! Subclass can call this to install a default shader for applying
+        //! opacity when the layer doesn't handle it itself
+        void installDefaultOpacityShader();
+
     private: 
         osg::ref_ptr<osg::Uniform> _opacityU;
+        osg::ref_ptr<osg::Uniform> _rangeU;
+        void initializeBlending();
+        void initializeMinMaxRangeOpacity();
     };
 
     typedef std::vector< osg::ref_ptr<VisibleLayer> > VisibleLayerVector;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/VisibleLayer.cpp osgearth-2.10.2+dfsg/src/osgEarth/VisibleLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/VisibleLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/VisibleLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,6 +18,7 @@
  */
 #include <osgEarth/VisibleLayer>
 #include <osgEarth/VirtualProgram>
+#include <osg/BlendFunc>
 
 using namespace osgEarth;
 
@@ -44,22 +45,36 @@
 {
     _visible.init( true );
     _opacity.init( 1.0f );
+    _minRange.init( 0.0 );
+    _maxRange.init( FLT_MAX );
+    _attenuationRange.init(0.0f);
+    _blend.init( BLEND_INTERPOLATE );
 }
 
 Config
 VisibleLayerOptions::getConfig() const
 {
     Config conf = LayerOptions::getConfig();
-    conf.set("visible", _visible);
-    conf.set("opacity", _opacity);
+    conf.set( "visible", _visible);
+    conf.set( "opacity", _opacity);
+    conf.set( "min_range", _minRange );
+    conf.set( "max_range", _maxRange );
+    conf.set( "attenuation_range", _attenuationRange );
+    conf.set( "blend", "interpolate", _blend, BLEND_INTERPOLATE );
+    conf.set( "blend", "modulate", _blend, BLEND_MODULATE );
     return conf;
 }
 
 void
 VisibleLayerOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet( "visible", _visible );
-    conf.getIfSet("opacity", _opacity);
+    conf.get( "visible", _visible );
+    conf.get( "opacity", _opacity);
+    conf.get( "min_range", _minRange );
+    conf.get( "max_range", _maxRange );
+    conf.get( "attenuation_range", _attenuationRange );
+    conf.get( "blend", "interpolate", _blend, BLEND_INTERPOLATE );
+    conf.get( "blend", "modulate", _blend, BLEND_MODULATE );
 }
 
 void
@@ -96,10 +111,14 @@
     {
         setVisible(options().visible().get());
     }
-    if (options().opacity().isSet())
+
+    initializeBlending();
+
+    if (options().minVisibleRange().isSet() || options().maxVisibleRange().isSet())
     {
-        setOpacity(options().opacity().get());
+        initializeMinMaxRangeOpacity();
     }
+
     return Layer::open();
 }
 
@@ -109,7 +128,7 @@
     options().visible() = value;
 
     // if this layer has a scene graph node, toggle its node mask
-    osg::Node* node = getOrCreateNode();
+    osg::Node* node = getNode();
     if (node)
         node->setNodeMask(value? ~0 : 0);
 
@@ -124,39 +143,148 @@
 
 namespace
 {
-    const char* opacityFS =
+    // Shader that just copies the uniform value into a stage global/output
+    const char* opacityVS =
         "#version " GLSL_VERSION_STR "\n"
-        "uniform float oe_visibleLayer_opacity; \n"
-        "void oe_visibleLayer_setOpacity(inout vec4 color) { \n"
-        "    color.a *= oe_visibleLayer_opacity; \n"
+        GLSL_DEFAULT_PRECISION_FLOAT "\n"
+        "uniform float oe_VisibleLayer_opacityUniform; \n"
+        "out float oe_layer_opacity; \n"
+        "void oe_VisibleLayer_initOpacity(inout vec4 vertex) \n"
+        "{ \n"
+        "    oe_layer_opacity = oe_VisibleLayer_opacityUniform; \n"
+        "} \n";
+
+    // Shader that incorporates range-based opacity (min/max range with attenuation)
+    const char* rangeOpacityVS =
+        "#version " GLSL_VERSION_STR "\n"
+        GLSL_DEFAULT_PRECISION_FLOAT "\n"
+        "#pragma import_defines(OE_DISABLE_RANGE_OPACITY) \n"
+        "uniform vec3 oe_VisibleLayer_ranges; \n"
+        "float oe_layer_opacity; \n"
+        
+        "void oe_VisibleLayer_applyMinMaxRange(inout vec4 vertexView) \n"
+        "{ \n"
+        "  #ifndef OE_DISABLE_RANGE_OPACITY \n"
+        "    float minRange = oe_VisibleLayer_ranges[0]; \n"
+        "    float maxRange = oe_VisibleLayer_ranges[1]; \n"
+        "    float attRange = oe_VisibleLayer_ranges[2]; \n"
+
+        "    float range = max(-vertexView.z, 0.0); \n"
+
+        "    float maxOpaqueRange = maxRange-attRange; \n"
+        "    float minOpaqueRange = minRange+attRange; \n"
+        "    float rangeOpacity = \n"
+        "        minRange >= maxRange ? 1.0 : \n"
+        "        range >= maxRange || range <= minRange ? 0.0 : \n"
+        "        range > maxOpaqueRange ? 1.0-((range-maxOpaqueRange)/(maxRange-maxOpaqueRange)) : \n"
+        "        range < minOpaqueRange && minRange > 0.0 ? ((range-minRange)/(minOpaqueRange-minRange)) : \n"
+        "        1.0; \n"
+
+        //atten as a factor instead of a range:
+        //"    float maxOpaqueRange = maxRange-((maxRange-minRange)*attenFactor); \n"
+        //"    float minOpaqueRange = minRange+(minRange*attenFactor); \n"
+        //"    float rangeOpacity = \n"
+        //"        minRange >= maxRange ? 1.0 : \n"
+        //"        range >= maxRange || range <= minRange ? 0.0 : \n"
+        //"        range > maxOpaqueRange && maxRange < MAX_MAX_RANGE ? 1.0-((range-maxOpaqueRange)/(maxRange-maxOpaqueRange)) : \n"
+        //"        range < minOpaqueRange && minRange > 0.0 ? ((range-minRange)/(minOpaqueRange-minRange)) : \n"
+        //"        1.0; \n"
+
+        "    oe_layer_opacity *= rangeOpacity; \n"
+        "  #endif \n"
+        "} \n";
+
+    // Shader that calculates a modulation color based on the "opacity", i.e. intensity
+    const char* opacityInterpolateFS =
+        "#version " GLSL_VERSION_STR "\n"
+        GLSL_DEFAULT_PRECISION_FLOAT "\n"
+        "in float oe_layer_opacity; \n"
+        "void oe_VisibleLayer_setOpacity(inout vec4 color) \n"
+        "{ \n"
+        "    color.a *= oe_layer_opacity; \n"
+        "} \n";
+
+    // Shader that calculates a modulation color based on the "opacity", i.e. intensity
+    const char* opacityModulateFS =
+        "#version " GLSL_VERSION_STR "\n"
+        GLSL_DEFAULT_PRECISION_FLOAT "\n"
+        "#define OE_MODULATION_EXPOSURE 2.35 \n"
+        "in float oe_layer_opacity; \n"
+        "void oe_VisibleLayer_setOpacity(inout vec4 color) \n"
+        "{ \n"
+        "    vec3 rgbHi = oe_layer_opacity > 0.0? color.rgb * float( OE_MODULATION_EXPOSURE )/oe_layer_opacity : vec3(1); \n"
+        "    color.rgb = mix(vec3(1), rgbHi, oe_layer_opacity); \n"
+        "    color.a = 1.0; \n"
+        "    oe_layer_opacity = 1.0; \n"
         "} \n";
 }
 
 void
-VisibleLayer::setOpacity(float value)
+VisibleLayer::initializeBlending()
 {
-    options().opacity() = value;
-
-    // On-demand installation of the opacity shader and rendering hint,
-    // since they do incur a small performance penalty.
-    if (value < 1.0f)
+    if (!_opacityU.valid())
     {
-        if (!_opacityU.valid())
+        osg::StateSet* stateSet = getOrCreateStateSet();
+
+        _opacityU = new osg::Uniform("oe_VisibleLayer_opacityUniform", (float)options().opacity().get());
+        stateSet->addUniform(_opacityU.get());
+
+        VirtualProgram* vp = VirtualProgram::getOrCreate(stateSet);
+        vp->setName("VisibleLayer");
+
+        vp->setFunction("oe_VisibleLayer_initOpacity", opacityVS, ShaderComp::LOCATION_VERTEX_MODEL);
+
+        if (options().blend() == VisibleLayerOptions::BLEND_MODULATE)
         {
-            osg::StateSet* stateSet = getOrCreateStateSet();
-            _opacityU = new osg::Uniform("oe_visibleLayer_opacity", value);
-            stateSet->addUniform(_opacityU.get());
-            VirtualProgram* vp = VirtualProgram::getOrCreate(stateSet);
-            vp->setFunction("oe_visibleLayer_setOpacity", opacityFS, ShaderComp::LOCATION_FRAGMENT_COLORING, 1.1f);
-            // NOTE: do not alter the render bin here - it will screw up terrain rendering order!
+            vp->setFunction("oe_VisibleLayer_setOpacity", opacityModulateFS, ShaderComp::LOCATION_FRAGMENT_COLORING, 1.1f);
+
+            stateSet->setAttributeAndModes(
+                new osg::BlendFunc(GL_DST_COLOR, GL_ZERO),
+                osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
         }
+        else
+        {
+            // In this case the fragment shader of the layer is responsible for
+            // incorporating the final value of oe_layer_opacity.
+            if (options().blend().isSetTo(options().BLEND_INTERPOLATE))
+            {
+                stateSet->setAttributeAndModes(
+                    new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA),
+                    osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE );
+            }
+        }        
     }
-    
-    if (_opacityU.valid())
+}
+
+void
+VisibleLayer::initializeMinMaxRangeOpacity()
+{
+    initializeBlending();
+
+    if (!_rangeU.valid())
     {
-        _opacityU->set(value);
+        osg::StateSet* stateSet = getOrCreateStateSet();
+
+        VirtualProgram* vp = VirtualProgram::getOrCreate(stateSet);
+        vp->setName("VisibleLayer");
+
+        vp->setFunction("oe_VisibleLayer_applyMinMaxRange", rangeOpacityVS, ShaderComp::LOCATION_VERTEX_VIEW);
+
+        _rangeU = new osg::Uniform("oe_VisibleLayer_ranges", osg::Vec3f(
+            (float)options().minVisibleRange().get(),
+            (float)options().maxVisibleRange().get(),
+            (float)options().attenuationRange().get()));
+
+        stateSet->addUniform(_rangeU.get());
     }
+}
 
+void
+VisibleLayer::setOpacity(float value)
+{
+    options().opacity() = value;
+    initializeBlending();
+    _opacityU->set(value);
     fireCallback(&VisibleLayerCallback::onOpacityChanged);
 }
 
@@ -167,6 +295,59 @@
 }
 
 void
+VisibleLayer::setMinVisibleRange( float minVisibleRange )
+{
+    initializeMinMaxRangeOpacity();
+    options().minVisibleRange() = minVisibleRange;
+    _rangeU->set(osg::Vec3f(
+        (float)options().minVisibleRange().get(),
+        (float)options().maxVisibleRange().get(),
+        (float)options().attenuationRange().get()));
+    fireCallback( &VisibleLayerCallback::onVisibleRangeChanged );
+}
+
+float
+VisibleLayer::getMinVisibleRange() const
+{
+    return options().minVisibleRange().get();
+}
+
+void
+VisibleLayer::setMaxVisibleRange( float maxVisibleRange )
+{
+    initializeMinMaxRangeOpacity();
+    options().maxVisibleRange() = maxVisibleRange;
+    _rangeU->set(osg::Vec3f(
+        (float)options().minVisibleRange().get(),
+        (float)options().maxVisibleRange().get(),
+        (float)options().attenuationRange().get()));
+    fireCallback( &VisibleLayerCallback::onVisibleRangeChanged );
+}
+
+float
+VisibleLayer::getMaxVisibleRange() const
+{
+    return options().maxVisibleRange().get();
+}
+
+void
+VisibleLayer::setAttenuationRange(float value)
+{
+    initializeMinMaxRangeOpacity();
+    options().attenuationRange() = value;
+    _rangeU->set(osg::Vec3f(
+        (float)options().minVisibleRange().get(),
+        (float)options().maxVisibleRange().get(),
+        (float)options().attenuationRange().get()));
+}
+
+float
+VisibleLayer::getAttenuationRange() const
+{
+    return options().attenuationRange().get();
+}
+
+void
 VisibleLayer::fireCallback(VisibleLayerCallback::MethodPtr method)
 {
     for (CallbackVector::iterator i = _callbacks.begin(); i != _callbacks.end(); ++i)
@@ -175,3 +356,14 @@
         if (cb) (cb->*method)(this);
     }
 }
+
+void
+VisibleLayer::installDefaultOpacityShader()
+{
+    if (options().blend() == options().BLEND_INTERPOLATE)
+    {
+        VirtualProgram* vp = VirtualProgram::getOrCreate(getOrCreateStateSet());
+        vp->setName("VisibleLayer");
+        vp->setFunction("oe_VisibleLayer_setOpacity", opacityInterpolateFS, ShaderComp::LOCATION_FRAGMENT_COLORING, 1.1f);
+    }
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/WrapperLayer osgearth-2.10.2+dfsg/src/osgEarth/WrapperLayer
--- osgearth-2.9.0+dfsg/src/osgEarth/WrapperLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/WrapperLayer	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#ifndef OSGEARTH_WRAPPER_LAYER
-#define OSGEARTH_WRAPPER_LAYER 1
-
-#include <osgEarth/Layer>
-
-namespace osgEarth
-{
-    /** Template to support the Wrapper Layer template
-      * @deprecated
-      */
-    template<typename OPTIONS>
-    class WrapperLayerOptions : public LayerOptions
-    {
-    public:
-        WrapperLayerOptions(const ConfigOptions& co = ConfigOptions()) : LayerOptions(co) {
-            _data = co;
-        }
-
-        Config getConfig() const {
-            return _data->getConfig();
-        }
-
-        optional<OPTIONS>& data() { return _data; }
-        const optional<OPTIONS>& data() const { return _data; }
-
-        optional<OPTIONS> _data;
-    };
-
-    /** Template for creating a Map Layer that holds a single serializable resource object. */
-    /** @deprecated */
-    template<typename OPTIONS>
-    class WrapperLayer : public Layer
-    {
-    public:
-        WrapperLayer(const OPTIONS& options) :
-            Layer(&_optionsConcrete),
-            _options(&_optionsConcrete),
-            _optionsConcrete(options)
-        {
-            setRenderType(RENDERTYPE_NONE);
-            Layer::init();
-        }
-
-        virtual Config getConfig() const { return options().getConfig(); }
-
-    private:
-        OPTIONS* _options;
-        OPTIONS  _optionsConcrete;
-
-    protected:
-        const OPTIONS& options() const { return *_options; }
-        OPTIONS& mutableOptions() { return *_options; }
-    };
-}
-
-#endif // OSGEARTH_WRAPPER_LAYER
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/XmlUtils osgearth-2.10.2+dfsg/src/osgEarth/XmlUtils
--- osgearth-2.9.0+dfsg/src/osgEarth/XmlUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/XmlUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -93,8 +93,6 @@
 
         void addSubElement(const std::string& tag, const std::string& text);
 
-        void addSubElement(const std::string& tag, const Properties& attrs, const std::string& text);
-
         virtual Config getConfig(const std::string& sourceURI) const;
 
     public: // XmlNode
diff -Nru osgearth-2.9.0+dfsg/src/osgEarth/XmlUtils.cpp osgearth-2.10.2+dfsg/src/osgEarth/XmlUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarth/XmlUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarth/XmlUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,13 +18,8 @@
  */
 
 #include <osgEarth/XmlUtils>
-#include <osgEarth/StringUtils>
-#include <osg/Notify>
 
 #include "tinyxml.h"
-#include <algorithm>
-#include <sstream>
-#include <iomanip>
 
 
 using namespace osgEarth;
@@ -61,7 +56,8 @@
 
         if ( !conf.value().empty() )
         {
-            children.push_back( new XmlText(conf.value()) );
+            XmlText* xt = new XmlText(conf.value());
+            children.push_back( xt );
         }
 
         for( ConfigSet::const_iterator j = conf.children().begin(); j != conf.children().end(); j++ )
@@ -230,16 +226,6 @@
     children.push_back(ele);
 }
 
-void
-XmlElement::addSubElement(const std::string& tag, const Properties& attrs, const std::string& text)
-{
-    XmlElement* ele = new XmlElement(tag);
-    for( Properties::const_iterator i = attrs.begin(); i != attrs.end(); i++ )
-        ele->attrs[i->first] = i->second;
-    ele->getChildren().push_back(new XmlText(text));
-    children.push_back(ele);
-}
-
 Config
 XmlElement::getConfig(const std::string& referrer) const
 {
@@ -289,7 +275,7 @@
 				conf.add( static_cast<const XmlElement*>(n)->getConfig(referrer) );
 		}
 
-		conf.value() = getText();
+		conf.setValue(getText());
 		//else 
 		//    conf.value() = trim( static_cast<const XmlText*>(n)->getValue() );
 		return conf;
@@ -513,7 +499,22 @@
     else if (node->isText())
     {
         XmlText* t = (XmlText*)node;
-        parent->LinkEndChild( new TiXmlText( t->getValue().c_str() ) );
+        std::string value = t->getValue();
+
+        std::string encodedValue;
+		TiXmlBase::EncodeString(value, &encodedValue);
+        bool needCDATA = !encodedValue.empty() && encodedValue != value;
+
+        TiXmlText* tNode = new TiXmlText(value.c_str());
+        if (needCDATA)
+        {
+            // XML should be normalized to LF (no CRLF)
+            value = osgEarth::replaceIn(value, "\r\n", "\n");
+            tNode->SetValue(value.c_str());
+            tNode->SetCDATA(true);
+        }
+
+        parent->LinkEndChild(tNode);
     }
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationData osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationData
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationData	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationData	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationData.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationData.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationData.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationData.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationEditing osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationEditing
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationEditing	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationEditing	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -26,10 +26,12 @@
 #include <osgEarthAnnotation/EllipseNode>
 #include <osgEarthAnnotation/RectangleNode>
 #include <osgEarthAnnotation/Draggers>
-#include <osgEarth/MapNode>
 
 namespace osgEarth { namespace Annotation
 {
+    /**
+     * @deprecated (remove or refactor as example after 2.10)
+     */
     class OSGEARTHANNO_EXPORT AnnotationEditor : public osg::Group
     {
     protected:
@@ -39,7 +41,8 @@
     };
 
      /**
-     * An editor node that allows you to move the position of LocalizedNode annotations    
+     * An editor node that allows you to move the position of LocalizedNode annotations 
+     * @deprecated (remove or refactor as example after 2.10)   
      */
     class OSGEARTHANNO_EXPORT GeoPositionNodeEditor : public AnnotationEditor
     {
@@ -63,7 +66,10 @@
         osg::ref_ptr< GeoPositionNode > _node;
         Dragger* _dragger;
     };
-
+    
+    /**
+     * @deprecated (remove or refactor as example after 2.10)   
+     */
     class OSGEARTHANNO_EXPORT CircleNodeEditor : public GeoPositionNodeEditor
     {
     public:
@@ -88,7 +94,10 @@
 
         Dragger* _radiusDragger;
     };
-
+    
+    /**
+     * @deprecated (remove or refactor as example after 2.10)   
+     */
     class OSGEARTHANNO_EXPORT EllipseNodeEditor : public GeoPositionNodeEditor
     {
     public:
@@ -106,7 +115,10 @@
         Dragger* _majorDragger;
         Dragger* _minorDragger;
     };
-
+    
+    /**
+     * @deprecated (remove or refactor as example after 2.10)   
+     */
     class OSGEARTHANNO_EXPORT RectangleNodeEditor : public GeoPositionNodeEditor
     {
     public:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationEditing.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationEditing.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationEditing.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationEditing.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -174,7 +174,7 @@
 CircleNodeEditor::updateDraggers()
 {
     GeoPositionNodeEditor::updateDraggers();
-    if (_radiusDragger)
+    if (_radiusDragger && _node->getMapNode())
     {
         const osg::EllipsoidModel* em = _node->getMapNode()->getMapSRS()->getEllipsoid();
         
@@ -218,6 +218,9 @@
 
       virtual void onPositionChanged(const Dragger* sender, const osgEarth::GeoPoint& position)
       {
+          if (!_node->getMapNode())
+              return;
+
           const osg::EllipsoidModel* em = _node->getMapNode()->getMapSRS()->getEllipsoid();
 
           //Figure out the distance between the center of the circle and this new location
@@ -282,7 +285,7 @@
 EllipseNodeEditor::updateDraggers()
 {
     GeoPositionNodeEditor::updateDraggers();
-    if (_majorDragger && _minorDragger)
+    if (_majorDragger && _minorDragger && _node->getMapNode())
     {
         const osg::EllipsoidModel* em = _node->getMapNode()->getMap()->getProfile()->getSRS()->getEllipsoid();
         
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationLayer osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationLayer
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -26,8 +26,10 @@
 {
     using namespace osgEarth;
 
+    class AnnotationNode;
+
     /**
-     * Configuration options for the geodetic graticule.
+     * Configuration options for AnnotationLayer
      */
     class AnnotationLayerOptions : public VisibleLayerOptions
     {
@@ -39,33 +41,31 @@
     public:
         virtual Config getConfig() const {
             Config conf = VisibleLayerOptions::getConfig();
-            conf.key() = "annotations";
             return conf;
         }
 
-        virtual void fromConfig(const Config& conf) {
-            //nop
-        }
-
     protected:
 
-        void mergeConfig(const Config& conf) {
+        virtual void mergeConfig(const Config& conf) {
             VisibleLayerOptions::mergeConfig(conf);
             fromConfig(conf);
         }
+
+        void fromConfig(const Config& conf) {
+            //nop
+        }
     };
 
     /**
      * Layer that holds annotation nodes.
      *
      * Use with the options structure is intended for loading from an earth file.
-     * To use from the API, you can just call getOrCreateNode(), cast to a Group,
-     * and add your annotations there.
+     * To use from the API, you can just call getGroup() and add Annotations there.
      */
     class OSGEARTHANNO_EXPORT AnnotationLayer : public VisibleLayer
     {
     public:
-        META_Layer(osgEarthAnnotation, AnnotationLayer, AnnotationLayerOptions);
+        META_Layer(osgEarthAnnotation, AnnotationLayer, AnnotationLayerOptions, annotations);
 
         //! Construct a default layer
         AnnotationLayer();
@@ -73,12 +73,15 @@
         //! Construct a layer with custom options
         AnnotationLayer(const AnnotationLayerOptions& options);
 
-        //! Call to refresh after setting an option
-        void dirty();
+        //! Adds an annotation to the layer
+        void addChild(AnnotationNode*);
+
+        //! Gets the group to which you can add annotations
+        osg::Group* getGroup() const;
 
     public: // Layer
         
-        virtual osg::Node* getOrCreateNode();
+        virtual osg::Node* getNode() const;
 
         virtual void init();
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -44,21 +44,30 @@
 AnnotationLayer::init()
 {
     VisibleLayer::init();
+
+    _root = new osg::Group();
+    deserialize();
 }
 
 osg::Node*
-AnnotationLayer::getOrCreateNode()
+AnnotationLayer::getNode() const
 {
-    if (_root.valid() == false)
-    {
-        _root = new osg::Group();
-        deserialize();
-    }
+    return _root.get();
+}
 
+osg::Group*
+AnnotationLayer::getGroup() const
+{
     return _root.get();
 }
 
 void
+AnnotationLayer::addChild(AnnotationNode* node)
+{
+    _root->addChild(node);
+}
+
+void
 AnnotationLayer::deserialize()
 {
     // reset:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -72,8 +72,6 @@
     public:
 
         const std::string& getName() const { return osg::Group::getName(); }
-
-        void traverse(osg::NodeVisitor& nv);
         
         /**
          * Priority of the item. A negative Priority means "never occlude me".
@@ -99,6 +97,9 @@
         MapNode* getMapNode() { return _mapNode.get(); }
         const MapNode* getMapNode() const { return _mapNode.get(); }
 
+    public: // osg::Node
+        
+        void traverse(osg::NodeVisitor& nv);
 
     public: // Style functions
 
@@ -129,15 +130,15 @@
         virtual void setDepthAdjustment( bool value );
 
         /**
-         * Sets a lighting override but only if lighting is not already set.
+         * Sets a lighting default, which the user can override
          */
-        void setLightingIfNotSet( bool lighting );
+        void setDefaultLighting( bool lighting );
 
         // hidden default ctor
         AnnotationNode();
 
         // hidden config ctor
-        AnnotationNode(const Config& conf );
+        AnnotationNode(const Config& conf, const osgDB::Options* options);
 
         // hidden copy ctor
         AnnotationNode(const AnnotationNode& rhs, const osg::CopyOp& op=osg::CopyOp::DEEP_COPY_ALL) : osg::Group(rhs, op) { }
@@ -154,6 +155,9 @@
         osg::observer_ptr<MapNode> _mapNode;
         static Style s_emptyStyle;
         bool _mapNodeRequired;
+        osg::NodeCallback* _altCallback;
+
+        void construct();
 
     public:
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -28,50 +28,57 @@
 #include <osgEarth/MapNode>
 #include <osgEarth/NodeUtils>
 #include <osgEarth/ShaderUtils>
-#include <osgEarth/Lighting>
+#include <osgEarth/GLUtils>
+#include <osgEarth/CullingUtils>
 
 #include <osg/PolygonOffset>
 #include <osg/Depth>
 
+#ifndef GL_CLIP_DISTANCE0
+#define GL_CLIP_DISTANCE0 0x3000
+#endif
+
 using namespace osgEarth;
 using namespace osgEarth::Annotation;
 
+#define LC "[AnnotationNode] "
+
 //-------------------------------------------------------------------
 
 Style AnnotationNode::s_emptyStyle;
 
 //-------------------------------------------------------------------
 
-AnnotationNode::AnnotationNode() :
-_dynamic    ( false ),
-_depthAdj   ( false ),
-_priority   ( 0.0f )
+AnnotationNode::AnnotationNode()
 {
-    // always blend.
-    this->getOrCreateStateSet()->setMode( GL_BLEND, osg::StateAttribute::ON );
-    // always draw after the terrain.
-    this->getOrCreateStateSet()->setRenderBinDetails( 1, "DepthSortedBin" );
-    
-    _horizonCuller = new HorizonCullCallback();
-    this->addCullCallback( _horizonCuller.get() );
+    construct();
+}
 
-    _mapNodeRequired = true;
-    ADJUST_UPDATE_TRAV_COUNT(this, +1);
+AnnotationNode::AnnotationNode(const Config& conf, const osgDB::Options*)
+{
+    construct();
+
+    setName(conf.value("name"));
 }
 
-AnnotationNode::AnnotationNode(const Config& conf) :
-_dynamic    ( false ),
-_depthAdj   ( false ),
-_priority   ( 0.0f )
+void
+AnnotationNode::construct()
 {
+    _dynamic = false;
+    _depthAdj = false;
+    _priority = false;
+
     this->getOrCreateStateSet()->setMode( GL_BLEND, osg::StateAttribute::ON );
+
     // always draw after the terrain.
     this->getOrCreateStateSet()->setRenderBinDetails( 1, "DepthSortedBin" );
+
+    _altCallback = new AltitudeCullCallback();
+    this->addCullCallback(_altCallback);
+
     _horizonCuller = new HorizonCullCallback();
     this->addCullCallback( _horizonCuller.get() );
 
-    this->setName( conf.value("name") );
-
     _mapNodeRequired = true;
     ADJUST_UPDATE_TRAV_COUNT(this, +1);
 }
@@ -109,16 +116,12 @@
 }
 
 void
-AnnotationNode::setLightingIfNotSet( bool lighting )
+AnnotationNode::setDefaultLighting( bool lighting )
 {
-    osg::StateSet* ss = this->getOrCreateStateSet();
-
-    if ( ss->getMode(GL_LIGHTING) == osg::StateAttribute::INHERIT )
-    {
-        this->getOrCreateStateSet()->setMode(GL_LIGHTING,
-            lighting ? osg::StateAttribute::ON | osg::StateAttribute::PROTECTED :
-                       osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED );
-    }
+    GLUtils::setLighting(
+        getOrCreateStateSet(),
+        lighting ? osg::StateAttribute::ON | osg::StateAttribute::PROTECTED :
+                   osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
 }
 
 void
@@ -134,6 +137,8 @@
                 _horizonCuller->setHorizon( new Horizon(mapNode->getMapSRS()) );
             else
                 _horizonCuller->setEnabled( false );
+
+            static_cast<AltitudeCullCallback*>(_altCallback)->srs() = mapNode->getMapSRS();
         }
 
 		applyStyle( this->getStyle() );
@@ -210,12 +215,9 @@
 
         if ( render->lighting().isSet() )
         {
-            getOrCreateStateSet()->setDefine(
-                OE_LIGHTING_DEFINE,
+            GLUtils::setLighting(
+                getOrCreateStateSet(),
                 (render->lighting() == true? osg::StateAttribute::ON : osg::StateAttribute::OFF) | osg::StateAttribute::OVERRIDE );
-            //getOrCreateStateSet()->setMode(
-            //    GL_LIGHTING,
-            //    (render->lighting() == true? osg::StateAttribute::ON : osg::StateAttribute::OFF) | osg::StateAttribute::OVERRIDE );
         }
 
         if ( render->depthOffset().isSet() )
@@ -231,10 +233,10 @@
                 (render->backfaceCulling() == true? osg::StateAttribute::ON : osg::StateAttribute::OFF) | osg::StateAttribute::OVERRIDE );
         }
 
-#if !( defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE) || defined(OSG_GL3_AVAILABLE) )
+#if !( defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE) )
         if ( render->clipPlane().isSet() )
         {
-            GLenum mode = GL_CLIP_PLANE0 + render->clipPlane().value();
+            GLenum mode = GL_CLIP_DISTANCE0 + render->clipPlane().value();
             getOrCreateStateSet()->setMode(mode, 1);
         }
 #endif
@@ -269,5 +271,16 @@
             getOrCreateStateSet()->setAttributeAndModes(
                 new osg::Depth(osg::Depth::LEQUAL, 0, 1, false));
         }
+
+        if (render->maxAltitude().isSet())
+        {
+            AltitudeCullCallback* cc = static_cast<AltitudeCullCallback*>(_altCallback);
+            cc->maxAltitude() = render->maxAltitude()->as(Units::METERS);
+        }
+        else
+        {
+            AltitudeCullCallback* cc = static_cast<AltitudeCullCallback*>(_altCallback);
+            cc->maxAltitude().unset();
+        }
     }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationRegistry osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationRegistry
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationRegistry	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationRegistry	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -92,8 +92,7 @@
     // (used by OSGEARTH_REGISTER_ANNOTATION macro)
     class AnnotationFactory {
     public:
-        virtual AnnotationNode* create(
-            MapNode*              mapNode, 
+        virtual AnnotationNode* create( 
             const Config&         conf, 
             const osgDB::Options* dbOptions) const =0;
 
@@ -104,7 +103,7 @@
     template<typename T>
     struct AnnotationRegistrationProxy : public AnnotationFactory {
         AnnotationRegistrationProxy(const std::string& key) { AnnotationRegistry::instance()->add(key, this); }
-        AnnotationNode* create(MapNode* mapNode, const Config& conf, const osgDB::Options* options) const { return new T(mapNode, conf, options); }
+        AnnotationNode* create(const Config& conf, const osgDB::Options* options) const { return new T(conf, options); }
     };
 
 } } // namespace osgEarth::Annotation
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationRegistry.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationRegistry.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationRegistry.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationRegistry.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -132,9 +132,12 @@
     FactoryMap::const_iterator f = _factories.find( conf.key() );
     if ( f != _factories.end() && f->second != 0L )
     {
-        AnnotationNode* anno = f->second->create(mapNode, conf, options);
+        AnnotationNode* anno = f->second->create(conf, options);
         if ( anno )
         {
+            if (mapNode)
+                anno->setMapNode(mapNode);
+
             Registry::objectIndex()->tagNode( anno, anno );
             return anno;
         }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationSettings osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationSettings
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationSettings	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationSettings	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -34,43 +34,15 @@
     {
     public:
         /**
-         * Whether to apply automatic re-clamping of CLAMP_TO_TERRAIN geometry
-         * whenever a terrain tile under the geometry changes due to paging
-         * DEFAULT: true
-         */
-        static void setContinuousClamping( bool value ) { _continuousClamping = value; }
-        static bool getContinuousClamping() { return _continuousClamping; }
-
-        /**
-         * Whether to apply a depth-adjustment program to any line geometry in an 
-         * AnnotationNode that is created with a CLAMP_TO_TERRAIN altitude symbol. 
-         * The depth adjustment will mitigate z-fighting for clamped lines in many cases.
-         * DEFAULT: true
-         */
-        static void setApplyDepthOffsetToClampedLines( bool value ) { _autoDepthOffset = value; }
-        static bool getApplyDepthOffsetToClampedLines() { return _autoDepthOffset; }
-
-        /**
          * Gets or sets the max camera altitude at which the occlusion culling callback is applied.
          * DEFAULT: 200000.0 meters
          */
         static void setOcclusionCullingMaxAltitude( double value ) { _occlusionCullingMaxAltitude = value; }
         static double getOcclusionCullingMaxAltitude() { return _occlusionCullingMaxAltitude; }
 
-        /**
-         * Gets or sets the adjustment factor, in meters, for the occlusion culling callback.
-         * This adjusts the target world point "up" by this factor to avoid being very aggressive with the culling
-         * if items are very close to the ground.
-         */
-        static void setOcclusionCullingHeightAdjustment( double value ) { _occlusionCullingHeightAdjustment = value; }
-        static double getOcclusionCullingHeightAdjustment() { return _occlusionCullingHeightAdjustment; }
-
 
     private:
         static double _occlusionCullingMaxAltitude;
-        static double _occlusionCullingHeightAdjustment;
-        static bool _continuousClamping;
-        static bool _autoDepthOffset;
     };
 
 } } // namespace osgEarth::Annotation
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationSettings.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationSettings.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationSettings.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationSettings.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -27,7 +27,4 @@
 //---------------------------------------------------------------------------
 
 // static defaults
-bool AnnotationSettings::_continuousClamping = true;
-bool AnnotationSettings::_autoDepthOffset = true;
 double AnnotationSettings::_occlusionCullingMaxAltitude = 200000.0;
-double AnnotationSettings::_occlusionCullingHeightAdjustment = 5.0;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationUtils osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationUtils
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #include <osg/CullStack>
 #include <osg/Drawable>
 #include <osg/Geometry>
-#include <osgText/TextBase>
+#include <osgText/Text>
 #include <osgUtil/CullVisitor>
 
 namespace osgEarth { namespace Annotation
@@ -42,18 +42,11 @@
      */
     struct OSGEARTHANNO_EXPORT AnnotationUtils
     {
-        static const std::string& UNIFORM_HIGHLIGHT();
-
-        static const std::string& UNIFORM_IS_TEXT();
-
-        static const std::string& UNIFORM_FADE();
-
-        static const std::string& PROGRAM_NAME();
-
         /**
          * Convert a symbology encoding enum to an osgText enum
          */
-        static osgText::String::Encoding convertTextSymbolEncoding(const TextSymbol::Encoding encoding);
+        static osgText::String::Encoding convertTextSymbolEncoding(
+            const TextSymbol::Encoding encoding);
 
         /**
          * Creates a drawable representing a symbolized text label in pixel space.
@@ -62,7 +55,7 @@
          * of RIGHT_TOP, that means the text origin is at the upper-right corner of
          * the box.
          */
-        static osg::Drawable* createTextDrawable(
+        static osgText::Text* createTextDrawable(
             const std::string& text,
             const TextSymbol*  symbol,
             const osg::BoundingBox& alignmentBox);
@@ -87,17 +80,6 @@
             double            scale );
 
         /**
-         * Creates a fading uniform that the decluttering engine can use
-         * to adjust the alpha of annotation drawables.
-         */
-        static osg::Uniform* createFadeUniform();
-
-        /**
-         * Creates a boolean uniform used to indicate a hightlighted state.
-         */
-        static osg::Uniform* createHighlightUniform();
-
-        /**
          * Builds a graph on top of the specified that that implements a 2-pass
          * rendering scheme for self-occluding or self-intersecting geometies that
          * would not otherwise properly blend. The scheme renders the back faces
@@ -110,14 +92,12 @@
          */
         static bool styleRequiresAlphaBlending( const Style& style );
 
-        // some geometry creation utilities
-        static osg::Drawable* create2DQuad( const osg::BoundingBox& box, float padding, const osg::Vec4& color );
-
-        static osg::Drawable* create2DOutline( const osg::BoundingBox& box, float padding, const osg::Vec4& color );
-
+        //! Creates a full-screen quad for rtt
+        //! TODO: DEPRECATE / move to function that uses it
         static osg::Node* createFullScreenQuad( const osg::Vec4& color );
 
         /**
+         * TODO: DEPRECATE / move to app that uses this
          * Builds a sphere geometry.
          * @param r        Radius
          * @param color    Color
@@ -126,6 +106,7 @@
         static osg::Node* createSphere( float r, const osg::Vec4& color, float maxAngle =15.0f );
 
         /**
+         * TODO: DEPRECATE / move to app that uses this
          * Builds a hemisphere geometry.
          * @param r        Radius
          * @param color    Color
@@ -134,12 +115,14 @@
         static osg::Node* createHemisphere( float r, const osg::Vec4& color, float maxAngle =15.0f );
 
         /**
+         * TODO: DEPRECATE / move to app that uses this
          * Builds the geometry for an ellipsoid.
          */
         static osg::Geometry* createEllipsoidGeometry( 
             float xr, float yr, float zr, const osg::Vec4& color, float maxAngle =10.0f,
             float minLat =-90.0, float maxLat=90.0, float minLon=-180.0, float maxLon=180.0);
         
+        //! TODO: DEPRECATE / move to app that uses this
         static osg::Node* createEllipsoid( 
             float xr, float yr, float zr, const osg::Vec4& color, float maxAngle =10.0f,
             float minLat =-90.0, float maxLat=90.0, float minLon=-180.0, float maxLon=180.0);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationUtils.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/AnnotationUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/AnnotationUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -23,13 +23,15 @@
 #include <osgEarthAnnotation/AnnotationUtils>
 #include <osgEarthSymbology/Color>
 #include <osgEarthSymbology/MeshSubdivider>
+#include <osgEarthFeatures/TextSymbolizer>
 #include <osgEarth/ThreadingUtils>
 #include <osgEarth/Registry>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/Capabilities>
 #include <osgEarth/CullingUtils>
 #include <osgEarth/DrapeableNode>
 #include <osgEarth/ClampableNode>
+#include <osgEarth/GLUtils>
+#include <osgEarth/Text>
 
 #include <osgText/Text>
 #include <osg/Depth>
@@ -41,35 +43,7 @@
 
 using namespace osgEarth;
 using namespace osgEarth::Annotation;
-
-const std::string&
-AnnotationUtils::PROGRAM_NAME()
-{
-  static std::string s = "osgEarthAnnotation::Program";
-  return s;
-}
-
-const std::string&
-AnnotationUtils::UNIFORM_HIGHLIGHT()
-{
-   static std::string s = "oeAnno_highlight";
-   return s;
-}
-
-
-const std::string&
-AnnotationUtils::UNIFORM_IS_TEXT()
-{
-  static std::string s = "oeAnno_isText";
-  return s;
-}
-
-const std::string&
-AnnotationUtils::UNIFORM_FADE()
-{
-  static std::string s ="oeAnno_fade";
-  return s;
-}
+using namespace osgEarth::Features;
 
 osgText::String::Encoding
 AnnotationUtils::convertTextSymbolEncoding (const TextSymbol::Encoding encoding) {
@@ -101,12 +75,12 @@
     }
 }
 
-osg::Drawable*
+osgText::Text*
 AnnotationUtils::createTextDrawable(const std::string& text,
                                     const TextSymbol*  symbol,
                                     const osg::BoundingBox& box)
 {
-    osgText::Text* t = new osgText::Text();
+    osgText::Text* drawable = new osgEarth::Text();
 
     osgText::String::Encoding text_encoding = osgText::String::ENCODING_UNDEFINED;
     if ( symbol && symbol->encoding().isSet() )
@@ -114,164 +88,15 @@
         text_encoding = convertTextSymbolEncoding(symbol->encoding().value());
     }
 
-    t->setText( text, text_encoding );
-
-    // osgText::Text turns on depth writing by default, even if you turned it off.
-    t->setEnableDepthWrites( false );
-
-    if ( symbol && symbol->layout().isSet() )
-    {
-        if(symbol->layout().value() == TextSymbol::LAYOUT_RIGHT_TO_LEFT)
-        {
-            t->setLayout(osgText::TextBase::RIGHT_TO_LEFT);
-        }
-        else if(symbol->layout().value() == TextSymbol::LAYOUT_LEFT_TO_RIGHT)
-        {
-            t->setLayout(osgText::TextBase::LEFT_TO_RIGHT);
-        }
-        else if(symbol->layout().value() == TextSymbol::LAYOUT_VERTICAL)
-        {
-            t->setLayout(osgText::TextBase::VERTICAL);
-        }
-    }
-
-    // calculate the text position relative to the alignment box.
-    osg::Vec3f pos;
-
-    osgText::Text::AlignmentType align = osgText::Text::CENTER_CENTER;
-    if ( symbol )
-    {
-        // they're the same enum, but we need to apply the BBOX offsets.
-        align = (osgText::Text::AlignmentType)symbol->alignment().value();
-    }
-
-    switch( align )
-    {
-    case osgText::Text::LEFT_TOP:
-        pos.x() = box.xMax();
-        pos.y() = box.yMin();
-        break;
-    case osgText::Text::LEFT_CENTER:
-        pos.x() = box.xMax();
-        pos.y() = box.center().y();
-        break;
-    case osgText::Text::LEFT_BOTTOM:
-    case osgText::Text::LEFT_BOTTOM_BASE_LINE:
-    case osgText::Text::LEFT_BASE_LINE:
-        pos.x() = box.xMax();
-        pos.y() = box.yMax();
-        break;
-
-    case osgText::Text::RIGHT_TOP:
-        pos.x() = box.xMin();
-        pos.y() = box.yMin();
-        break;
-    case osgText::Text::RIGHT_CENTER:
-        pos.x() = box.xMin();
-        pos.y() = box.center().y();
-        break;
-    case osgText::Text::RIGHT_BOTTOM:
-    case osgText::Text::RIGHT_BOTTOM_BASE_LINE:
-    case osgText::Text::RIGHT_BASE_LINE:
-        pos.x() = box.xMin();
-        pos.y() = box.yMax();
-        break;
-
-    case osgText::Text::CENTER_TOP:
-        pos.x() = box.center().x();
-        pos.y() = box.yMin();
-        break;
-    case osgText::Text::CENTER_BOTTOM:
-    case osgText::Text::CENTER_BOTTOM_BASE_LINE:
-    case osgText::Text::CENTER_BASE_LINE:
-        pos.x() = box.center().x();
-        pos.y() = box.yMax();
-        break;
-    case osgText::Text::CENTER_CENTER:
-    default:
-        pos = box.center();
-        break;
-    }
-
-    t->setPosition( pos );
-    t->setAlignment( align );
-
-    t->setAutoRotateToScreen(false);
+    drawable->setText( text, text_encoding );
 
-    t->setCullingActive(false);
+    TextSymbolizer symbolizer(symbol);
+    symbolizer.apply(drawable, 0L, 0L, &box);
 
-    t->setCharacterSizeMode( osgText::Text::OBJECT_COORDS );
+    // osgText::Text turns on depth writing by default, even if you turned it off.
+    drawable->setEnableDepthWrites( false );
     
-    float size = symbol && symbol->size().isSet() ? (float)(symbol->size()->eval()) : 16.0f;    
-
-    t->setCharacterSize( size * Registry::instance()->getDevicePixelRatio() );
-    t->setColor( symbol && symbol->fill().isSet() ? symbol->fill()->color() : Color::White );
-
-    osg::ref_ptr<osgText::Font> font;
-    if ( symbol && symbol->font().isSet() )
-    {
-        font = osgText::readRefFontFile( *symbol->font() );
-    }
-    if ( !font )
-        font = Registry::instance()->getDefaultFont();
-
-    if ( font )
-    {
-        t->setFont( font );
-
-        
-#if OSG_VERSION_LESS_THAN(3,5,8)
-        // mitigates mipmapping issues that cause rendering artifacts for some fonts/placement
-        font->setGlyphImageMargin( 2 );
-#endif
-
-        // OSG 3.4.1+ adds a program, so we remove it since we're using VPs.
-        t->setStateSet(0L);
-    }
-
-    float resFactor = 2.0f;
-    int res = nextPowerOf2((int)(size*resFactor));
-    t->setFontResolution(res, res);
-    float offsetFactor = 1.0f / (resFactor*256.0f);
-    t->setBackdropOffset( (float)t->getFontWidth() * offsetFactor, (float)t->getFontHeight() * offsetFactor );
-
-    if ( symbol && symbol->halo().isSet() )
-    {
-        t->setBackdropColor( symbol->halo()->color() );
-        if ( symbol->haloBackdropType().isSet() )
-        {
-            t->setBackdropType( *symbol->haloBackdropType() );
-        }
-        else
-        {
-            t->setBackdropType( osgText::Text::OUTLINE );
-        }
-
-        if ( symbol->haloImplementation().isSet() )
-        {
-            t->setBackdropImplementation( *symbol->haloImplementation() );
-        }
-
-        if ( symbol->haloOffset().isSet() )
-        {
-            t->setBackdropOffset( *symbol->haloOffset(), *symbol->haloOffset() );
-        }
-    }
-    else if ( !symbol )
-    {
-        // if no symbol at all is provided, default to using a black halo.
-        t->setBackdropColor( osg::Vec4(.3,.3,.3,1) );
-        t->setBackdropType( osgText::Text::OUTLINE );
-    }
-
-    // this disables the default rendering bin set by osgText::Font. Necessary if we're
-    // going to do decluttering.
-    // TODO: verify that it's still OK to share the font stateset (think so) or does it
-    // need to be marked DYNAMIC
-    if ( t->getStateSet() )
-      t->getStateSet()->setRenderBinToInherit();
-
-    return t;
+    return drawable;
 }
 
 osg::Geometry*
@@ -292,9 +117,10 @@
 
     // set up the decoration.
     osg::StateSet* dstate = new osg::StateSet;
+    dstate->setDataVariance(osg::Object::DYNAMIC);
     dstate->setMode(GL_CULL_FACE,osg::StateAttribute::OFF);
-    dstate->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
-    dstate->setTextureAttributeAndModes(0, texture,osg::StateAttribute::ON);
+    GLUtils::setLighting(dstate, osg::StateAttribute::OFF);
+    dstate->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
 
     // set up the geoset.
     osg::Geometry* geom = new osg::Geometry();
@@ -324,17 +150,18 @@
     }
     geom->setVertexArray(verts);
 
-    osg::Vec2Array* tcoords = new osg::Vec2Array(4);
-    (*tcoords)[0].set(0, 0);
-    (*tcoords)[1].set(1, 0);
-    (*tcoords)[2].set(1, 1);
-    (*tcoords)[3].set(0, 1);
+    bool flip = image->getOrigin() == osg::Image::TOP_LEFT;
+    
+    osg::Vec2Array* tcoords = new osg::Vec2Array(4);    
+    (*tcoords)[0].set(0.0, flip? 1.0: 0.0);
+    (*tcoords)[1].set(1.0, flip? 1.0: 0.0);
+    (*tcoords)[2].set(1.0, flip? 0.0: 1.0);
+    (*tcoords)[3].set(0.0, flip? 0.0: 1.0);
     geom->setTexCoordArray(textureUnit,tcoords);
 
-    osg::Vec4Array* colors = new osg::Vec4Array(1);
+    osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
     (*colors)[0].set(1.0f,1.0f,1.0,1.0f);
     geom->setColorArray(colors);
-    geom->setColorBinding(osg::Geometry::BIND_OVERALL);
 
     GLushort indices[] = {0,1,2,0,2,3};
     geom->addPrimitiveSet( new osg::DrawElementsUShort( GL_TRIANGLES, 6, indices ) );
@@ -342,22 +169,6 @@
     return geom;
 }
 
-osg::Uniform*
-AnnotationUtils::createFadeUniform()
-{
-    osg::Uniform* u = new osg::Uniform(osg::Uniform::FLOAT, UNIFORM_FADE());
-    u->set( 1.0f );
-    return u;
-}
-
-osg::Uniform*
-AnnotationUtils::createHighlightUniform()
-{
-    osg::Uniform* u = new osg::Uniform(osg::Uniform::BOOL, UNIFORM_HIGHLIGHT());
-    u->set( false );
-    return u;
-}
-
 osg::Node*
 AnnotationUtils::createSphere( float r, const osg::Vec4& color, float maxAngle )
 {
@@ -388,7 +199,7 @@
     b->push_back(1); b->push_back(5); b->push_back(2);
     geom->addPrimitiveSet( b );
 
-    osg::Vec3Array* n = new osg::Vec3Array();
+    osg::Vec3Array* n = new osg::Vec3Array(osg::Array::BIND_PER_VERTEX);
     n->reserve(6);
     n->push_back( osg::Vec3( 0, 0, 1) );
     n->push_back( osg::Vec3( 0, 0,-1) );
@@ -397,15 +208,13 @@
     n->push_back( osg::Vec3( 0, 1, 0) );
     n->push_back( osg::Vec3( 0,-1, 0) );
     geom->setNormalArray(n);
-    geom->setNormalBinding( osg::Geometry::BIND_PER_VERTEX );
 
     MeshSubdivider ms;
     ms.run( *geom, osg::DegreesToRadians(maxAngle), GEOINTERP_GREAT_CIRCLE );
 
-    osg::Vec4Array* c = new osg::Vec4Array(1);
+    osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
     (*c)[0] = color;
     geom->setColorArray( c );
-    geom->setColorBinding( osg::Geometry::BIND_OVERALL );
 
     osg::Geode* geode = new osg::Geode();
     geode->addDrawable( geom );
@@ -442,7 +251,7 @@
     b->push_back(0); b->push_back(4); b->push_back(2);
     geom->addPrimitiveSet( b );
 
-    osg::Vec3Array* n = new osg::Vec3Array();
+    osg::Vec3Array* n = new osg::Vec3Array(osg::Array::BIND_PER_VERTEX);
     n->reserve(5);
     n->push_back( osg::Vec3(0,0,1) );
     n->push_back( osg::Vec3(-1,0,0) );
@@ -450,15 +259,13 @@
     n->push_back( osg::Vec3(0,1,0) );
     n->push_back( osg::Vec3(0,-1,0) );
     geom->setNormalArray(n);
-    geom->setNormalBinding( osg::Geometry::BIND_PER_VERTEX );
 
     MeshSubdivider ms;
     ms.run( *geom, osg::DegreesToRadians(maxAngle), GEOINTERP_GREAT_CIRCLE );
 
-    osg::Vec4Array* c = new osg::Vec4Array(1);
+    osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
     (*c)[0] = color;
     geom->setColorArray( c );
-    geom->setColorBinding( osg::Geometry::BIND_OVERALL );
 
     osg::Geode* geode = new osg::Geode();
     geode->addDrawable( geom );
@@ -489,8 +296,8 @@
     float lonSpan = maxLon - minLon;
     float aspectRatio = lonSpan/latSpan;
 
-    int latSegments = std::max( 6, (int)ceil(latSpan / maxAngle) );
-    int lonSegments = std::max( 3, (int)ceil(latSegments * aspectRatio) );
+    int latSegments = osg::maximum( 6, (int)ceil(latSpan / maxAngle) );
+    int lonSegments = osg::maximum( 3, (int)ceil(latSegments * aspectRatio) );
 
     float segmentSize = latSpan/latSegments; // degrees
 
@@ -508,10 +315,9 @@
     }
 #endif
 
-    osg::Vec3Array* normals = new osg::Vec3Array();
+    osg::Vec3Array* normals = new osg::Vec3Array(osg::Array::BIND_PER_VERTEX);
     normals->reserve( latSegments * lonSegments );
     geom->setNormalArray( normals );
-    geom->setNormalBinding(osg::Geometry::BIND_PER_VERTEX );
 
     osg::DrawElementsUShort* el = new osg::DrawElementsUShort( GL_TRIANGLES );
     el->reserve( latSegments * lonSegments * 6 );
@@ -561,10 +367,9 @@
         }
     }
 
-    osg::Vec4Array* c = new osg::Vec4Array(1);
+    osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
     (*c)[0] = color;
     geom->setColorArray( c );
-    geom->setColorBinding( osg::Geometry::BIND_OVERALL );
 
     geom->setVertexArray( verts );
     geom->addPrimitiveSet( el );
@@ -629,17 +434,15 @@
     b->push_back(2); b->push_back(3); b->push_back(0);
     geom->addPrimitiveSet( b );
 
-    osg::Vec4Array* c = new osg::Vec4Array(1);
+    osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
     (*c)[0] = color;
     geom->setColorArray( c );
-    geom->setColorBinding( osg::Geometry::BIND_OVERALL );
 
     osg::Geode* geode = new osg::Geode();
     geode->addDrawable( geom );
 
     osg::StateSet* s = geom->getOrCreateStateSet();
-    s->setMode(GL_LIGHTING,0);
-    //s->setMode(GL_BLEND,1); // redundant. AnnotationNode sets blend.
+    GLUtils::setLighting(s, 0);
     s->setMode(GL_DEPTH_TEST,0);
     s->setMode(GL_CULL_FACE,0);
     s->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1 );
@@ -654,76 +457,6 @@
     return proj;
 }
 
-osg::Drawable*
-AnnotationUtils::create2DQuad( const osg::BoundingBox& box, float padding, const osg::Vec4& color )
-{
-    osg::Geometry* geom = new osg::Geometry();
-    geom->setUseVertexBufferObjects(true);
-
-    osg::Vec3Array* v = new osg::Vec3Array();
-    v->reserve(4);
-    v->push_back( osg::Vec3(box.xMin()-padding, box.yMin()-padding, 0) );
-    v->push_back( osg::Vec3(box.xMax()+padding, box.yMin()-padding, 0) );
-    v->push_back( osg::Vec3(box.xMax()+padding, box.yMax()+padding, 0) );
-    v->push_back( osg::Vec3(box.xMin()-padding, box.yMax()+padding, 0) );
-    geom->setVertexArray(v);
-    if ( v->getVertexBufferObject() )
-        v->getVertexBufferObject()->setUsage(GL_STATIC_DRAW_ARB);
-
-    osg::DrawElementsUByte* b = new osg::DrawElementsUByte(GL_TRIANGLES);
-    b->reserve(6);
-    b->push_back(0); b->push_back(1); b->push_back(2);
-    b->push_back(2); b->push_back(3); b->push_back(0);
-    geom->addPrimitiveSet( b );
-
-    osg::Vec4Array* c = new osg::Vec4Array(1);
-    (*c)[0] = color;
-    geom->setColorArray( c );
-    geom->setColorBinding( osg::Geometry::BIND_OVERALL );
-
-    // add the static "isText=true" uniform; this is a hint for the annotation shaders
-    // if they get installed.
-    static osg::ref_ptr<osg::Uniform> s_isTextUniform = new osg::Uniform(osg::Uniform::BOOL, UNIFORM_IS_TEXT());
-    s_isTextUniform->set( false );
-    geom->getOrCreateStateSet()->addUniform( s_isTextUniform.get() );
-
-    return geom;
-}
-
-osg::Drawable*
-AnnotationUtils::create2DOutline( const osg::BoundingBox& box, float padding, const osg::Vec4& color )
-{
-    osg::Geometry* geom = new osg::Geometry();
-    geom->setUseVertexBufferObjects(true);
-
-    osg::Vec3Array* v = new osg::Vec3Array();
-    v->reserve(4);
-    v->push_back( osg::Vec3(box.xMin()-padding, box.yMin()-padding, 0) );
-    v->push_back( osg::Vec3(box.xMax()+padding, box.yMin()-padding, 0) );
-    v->push_back( osg::Vec3(box.xMax()+padding, box.yMax()+padding, 0) );
-    v->push_back( osg::Vec3(box.xMin()-padding, box.yMax()+padding, 0) );
-    geom->setVertexArray(v);
-    if ( v->getVertexBufferObject() )
-        v->getVertexBufferObject()->setUsage(GL_STATIC_DRAW_ARB);
-
-    osg::DrawElementsUByte* b = new osg::DrawElementsUByte(GL_LINE_LOOP);
-    b->reserve(4);
-    b->push_back(0); b->push_back(1); b->push_back(2); b->push_back(3);
-    geom->addPrimitiveSet( b );
-
-    osg::Vec4Array* c = new osg::Vec4Array(1);
-    (*c)[0] = color;
-    geom->setColorArray( c );
-    geom->setColorBinding( osg::Geometry::BIND_OVERALL );
-
-    static osg::ref_ptr<osg::Uniform> s_isNotTextUniform = new osg::Uniform(osg::Uniform::BOOL, UNIFORM_IS_TEXT());
-    s_isNotTextUniform->set( false );
-    geom->getOrCreateStateSet()->addUniform( s_isNotTextUniform.get() );
-
-    return geom;
-}
-
-
 osg::Node*
 AnnotationUtils::installTwoPassAlpha(osg::Node* node)
 {
@@ -732,10 +465,12 @@
   g1->getOrCreateStateSet()->setRenderingHint( osg::StateSet::TRANSPARENT_BIN );
   g1->getOrCreateStateSet()->setAttributeAndModes( new osg::BlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA), 1);
 
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
   // for semi-transpareny items, we want the lighting to "shine through"
   osg::LightModel* lm = new osg::LightModel();
   lm->setTwoSided( true );
   g1->getOrCreateStateSet()->setAttributeAndModes( lm );
+#endif
 
   // next start a traversal order bin so we draw in the proper order:
   osg::Group* g2 = new osg::Group();
@@ -813,8 +548,7 @@
                 out.draping       = alt->technique() == AltitudeSymbol::TECHNIQUE_DRAPE;
 
                 // for instance/markers, GPU clamping falls back on SCENE clamping.
-                if (out.gpuClamping &&
-                    (style.has<InstanceSymbol>() || style.has<MarkerSymbol>()))
+                if (out.gpuClamping && style.has<InstanceSymbol>())
                 {
                     out.gpuClamping   = false;
                     out.sceneClamping = true;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/BboxDrawable osgearth-2.10.2+dfsg/src/osgEarthAnnotation/BboxDrawable
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/BboxDrawable	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/BboxDrawable	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -35,11 +35,8 @@
      */
     class OSGEARTHANNO_EXPORT BboxDrawable : public osg::Geometry
     {
-
     public:
-
-        BboxDrawable( const osg::BoundingBox& box, const BBoxSymbol &bboxSymbol );
-
+        BboxDrawable( const osg::BoundingBox& box, const BBoxSymbol& boxSymbol );
     };
 
 } } // namespace osgEarth::Annotation
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/BboxDrawable.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/BboxDrawable.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/BboxDrawable.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/BboxDrawable.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -50,11 +50,17 @@
     if ( v->getVertexBufferObject() )
         v->getVertexBufferObject()->setUsage(GL_STATIC_DRAW_ARB);
 
-    osg::Vec4Array* c = new osg::Vec4Array();
+    osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_PER_PRIMITIVE_SET);
     if ( bboxSymbol.fill().isSet() )
     {
         c->push_back( bboxSymbol.fill()->color() );
-        addPrimitiveSet( new osg::DrawArrays(GL_POLYGON, 0, v->getNumElements()) );
+        osg::DrawElements* de = new osg::DrawElementsUByte(GL_TRIANGLE_STRIP);
+        de->addElement(0);
+        de->addElement(1);
+        de->addElement(3);
+        de->addElement(2);
+        addPrimitiveSet(de);
+        //addPrimitiveSet( new osg::DrawArrays(GL_POLYGON, 0, v->getNumElements()) );
     }
 
     if ( bboxSymbol.border().isSet() )
@@ -66,13 +72,6 @@
     }
 
     setColorArray( c );
-    setColorBinding( osg::Geometry::BIND_PER_PRIMITIVE_SET );
-
-    // add the static "isText=true" uniform; this is a hint for the annotation shaders
-    // if they get installed.
-    static osg::ref_ptr<osg::Uniform> s_isTextUniform = new osg::Uniform(osg::Uniform::BOOL, AnnotationUtils::UNIFORM_IS_TEXT());
-    s_isTextUniform->set( false );
-    getOrCreateStateSet()->addUniform( s_isTextUniform.get() );
 
     // Disable culling since this bounding box will eventually be drawn in screen space.
     setCullingActive(false);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/CircleNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/CircleNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/CircleNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/CircleNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -41,6 +41,8 @@
     public:
         META_AnnotationNode( osgEarthAnnotation, CircleNode );
 
+        CircleNode();
+
         /**
          * Constructs a new circle annotation.
          *
@@ -52,8 +54,7 @@
          * @param arcStop     Optional end of arc (default to 360.0 degrees)
          * @param pie         Optionally make pie shape instead of arc
          */
-        CircleNode(
-            MapNode*          mapNode,
+        void set(
             const GeoPoint&   position,
             const Distance&   radius,
             const Style&      style,
@@ -65,7 +66,6 @@
          * Constructs a circle node from its serialized form
          */
         CircleNode(
-            MapNode*              mapNode,
             const Config&         conf,
             const osgDB::Options* dbOptions);
 
@@ -128,14 +128,12 @@
 
         virtual Config getConfig() const;
 
-
     private:
-        CircleNode() { }
         CircleNode(const CircleNode& rhs, const osg::CopyOp& op) { }
 
-        void rebuildGeometry();
+        void construct();
 
-        void initCircleNode();
+        void buildGeometry();
 
         unsigned       _numSegments;
         Distance       _radius;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/CircleNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/CircleNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/CircleNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/CircleNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -37,32 +37,41 @@
 using namespace osgEarth::Symbology;
 
 
-CircleNode::CircleNode(MapNode*           mapNode,
-                       const GeoPoint&    position,
-                       const Linear&      radius,
-                       const Style&       style,
-                       const Angle&       arcStart,
-                       const Angle&       arcEnd,
-                       const bool         pie):
-
-LocalGeometryNode(mapNode),
-_radius      ( radius ),
-_arcStart    ( arcStart ),
-_arcEnd      ( arcEnd ),
-_pie         ( pie ),
-_numSegments ( 0 )
+CircleNode::CircleNode() :
+LocalGeometryNode()
 {
-    initCircleNode();
-    setStyle( style );
-    setPosition( position );
+    construct();
 }
 
+void
+CircleNode::set(const GeoPoint&    position,
+                const Distance&    radius,
+                const Style&       style,
+                const Angle&       arcStart,
+                const Angle&       arcEnd,
+                const bool         pie)
+{
+    _radius = radius;
+    _arcStart = arcStart;
+    _arcEnd = arcEnd;
+    _pie = pie;
+    _style = style;
+
+    setPosition(position);
+
+    buildGeometry();
+}
 
 void
-CircleNode::initCircleNode()
+CircleNode::construct()
 {
     setName("Circle");
-    rebuildGeometry();
+
+    _radius.set(1.0, Units::KILOMETERS);
+    _arcStart.set(0.0, Units::RADIANS);
+    _arcEnd.set(2.0*osg::PI, Units::RADIANS);
+    _pie = false;
+    _numSegments = 0;
 }
 
 const Linear&
@@ -77,7 +86,7 @@
     if (_radius != radius )
     {
         _radius = radius;
-        rebuildGeometry();
+        buildGeometry();
     }
 }
 
@@ -93,7 +102,7 @@
     if (_numSegments != numSegments )
     {
         _numSegments = numSegments;
-        rebuildGeometry();
+        buildGeometry();
     }
 }
 
@@ -107,7 +116,7 @@
 CircleNode::setArcStart(const Angle& arcStart)
 {
 	_arcStart = arcStart;
-	rebuildGeometry();
+	buildGeometry();
 }
 
 const Angle&
@@ -120,7 +129,7 @@
 CircleNode::setArcEnd(const Angle& arcEnd)
 {
 	_arcEnd = arcEnd;
-	rebuildGeometry();
+	buildGeometry();
 }
 
 const bool&
@@ -133,15 +142,15 @@
 CircleNode::setPie(const bool& pie)
 {
     _pie = pie;
-    rebuildGeometry();
+    buildGeometry();
 }
 
 void
-CircleNode::rebuildGeometry()
+CircleNode::buildGeometry()
 {
     // construct a local-origin circle.
     GeometryFactory factory;
-    Geometry* geom = NULL;
+    osg::ref_ptr<Geometry> geom;
     if (std::abs(_arcEnd.as(Units::DEGREES) - _arcStart.as(Units::DEGREES)) >= 360.0)
     {
         geom = factory.createCircle(osg::Vec3d(0,0,0), _radius, _numSegments);
@@ -151,9 +160,9 @@
         geom = factory.createArc(osg::Vec3d(0,0,0), _radius, _arcStart, _arcEnd, _numSegments, 0L, _pie);
     }
 
-    if ( geom )
+    if ( geom.valid() )
     {
-        setGeometry( geom );        
+        setGeometry(geom.get());
     }
 }
 
@@ -163,16 +172,16 @@
 OSGEARTH_REGISTER_ANNOTATION( circle, osgEarth::Annotation::CircleNode );
 
 
-CircleNode::CircleNode(MapNode*              mapNode,
-                       const Config&         conf,
+CircleNode::CircleNode(const Config&         conf,
                        const osgDB::Options* dbOptions) :
-LocalGeometryNode( mapNode, conf, dbOptions ),
-_radius      ( 1.0, Units::KILOMETERS ),
-_numSegments ( 0 )
-{
-    conf.getObjIfSet( "radius",       _radius );
-    conf.getIfSet   ( "num_segments", _numSegments );
-    initCircleNode();
+LocalGeometryNode(conf, dbOptions)
+{
+    construct();
+
+    conf.get( "radius",       _radius );
+    conf.get( "num_segments", _numSegments );
+
+    buildGeometry();
 }
 
 Config
@@ -181,7 +190,7 @@
     Config conf = LocalGeometryNode::getConfig();
     conf.key() = "circle";
 
-    conf.addObj( "radius", _radius );
+    conf.set( "radius", _radius );
 
     if ( _numSegments != 0 )
         conf.add( "num_segments", _numSegments );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthAnnotation/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -22,8 +22,8 @@
     Draggers
     EllipseNode
     Export
-    FeatureNode
     FeatureEditing
+    FeatureNode
     GeoPositionNode
     GeoPositionNodeAutoScaler
     LocalGeometryNode
@@ -48,8 +48,8 @@
     CircleNode.cpp
     Draggers.cpp
     EllipseNode.cpp
-    FeatureNode.cpp
     FeatureEditing.cpp
+    FeatureNode.cpp
     GeoPositionNode.cpp
     GeoPositionNodeAutoScaler.cpp
     LocalGeometryNode.cpp
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/Common osgearth-2.10.2+dfsg/src/osgEarthAnnotation/Common
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/Common	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/Draggers osgearth-2.10.2+dfsg/src/osgEarthAnnotation/Draggers
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/Draggers	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/Draggers	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/Draggers.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/Draggers.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/Draggers.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/Draggers.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 #include <osgEarth/MapNode>
 #include <osgEarth/GeometryClamper>
 #include <osgEarth/IntersectionPicker>
+#include <osgEarth/GLUtils>
 
 #include <osg/AutoTransform>
 #include <osgViewer/View>
@@ -45,7 +46,7 @@
 /**********************************************************/
 
 Dragger::Dragger( MapNode* mapNode, int modKeyMask, const DragMode& defaultMode ):
-GeoPositionNode( mapNode ),
+GeoPositionNode(),
 _dragging(false),
 _hovered(false),
 _modKeyMask(modKeyMask),
@@ -55,12 +56,11 @@
 {    
     setNumChildrenRequiringEventTraversal( 1 );
 
-    //_clampCallback = new ClampDraggerCallback( this );
     _projector = new osgManipulator::LineProjector;
 
-    //setMapNode( mapNode );
-
     this->getOrCreateStateSet()->setRenderBinDetails(50, "DepthSortedBin");
+
+    setMapNode(mapNode);
 }
 
 Dragger::~Dragger()
@@ -371,7 +371,7 @@
     geode->addDrawable( _shapeDrawable );          
 
     geode->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-    geode->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    GLUtils::setLighting(geode->getOrCreateStateSet(), osg::StateAttribute::OFF);
 
     getPositionAttitudeTransform()->addChild( geode );
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/EllipseNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/EllipseNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/EllipseNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/EllipseNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -41,21 +41,19 @@
     public:
         META_AnnotationNode( osgEarthAnnotation, EllipseNode );
 
-        /**
-         * Constructs a new ellipse annotation.
-         *
-         * @param mapNode     Map on which the annotation will appear
-         * @param position    Location of the annotation, in map coordinates
-         * @param radiusMajor Length of 1/2 the major axis of the ellipse
-         * @param radiusMinor Length of 1/2 the minor axis of the ellipse
-         * @param rotation    Rotation angle of the ellipse
-         * @param style       Style defining how the annotation will look
-         * @param arcStart    Optional start of arc (default to 0.0 degrees)
-         * @param arcStop     Optional end of arc (default to 360.0 degrees)
-         * @param pie         Optionally make pie shape instead of arc
-         */
-        EllipseNode( 
-            MapNode*                mapNode,
+        //! Constuct a new default ellipsoid.
+        EllipseNode();
+
+        //! Set all the parameters together
+        //! @param position    Location of the annotation, in map coordinates
+        //! @param radiusMajor Length of 1/2 the major axis of the ellipse
+        //! @param radiusMinor Length of 1/2 the minor axis of the ellipse
+        //! @param rotation    Rotation angle of the ellipse
+        //! @param style       Style defining how the annotation will look
+        //! @param arcStart    Optional start of arc (default to 0.0 degrees)
+        //! @param arcStop     Optional end of arc (default to 360.0 degrees)
+        //! @param pie         Optionally make pie shape instead of arc
+        void set(
             const GeoPoint&         position,
             const Distance&         radiusMajor,
             const Distance&         radiusMinor,
@@ -65,8 +63,6 @@
             const Angle&            arcEnd = Angle(360.0, Units::DEGREES),
             const bool              pie = false);
 
-        virtual ~EllipseNode() { }
-
         /**
          * Gets the major radius
          */
@@ -144,17 +140,20 @@
 
     public:
 
-        EllipseNode(MapNode* mapNode, const Config& conf, const osgDB::Options* dbOptions);
+        EllipseNode(const Config& conf, const osgDB::Options* dbOptions);
+
         virtual Config getConfig() const;
 
+    protected:
+
+        virtual ~EllipseNode() { }
 
     private:
-        EllipseNode() { }
         EllipseNode(const EllipseNode& rhs, const osg::CopyOp& op) { }
 
-        void rebuildGeometry();
+        void construct();
 
-        void initEllipseNode();
+        void buildGeometry();
         
         Angle _rotationAngle;
         Distance _radiusMajor;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/EllipseNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/EllipseNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/EllipseNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/EllipseNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -34,33 +34,46 @@
 using namespace osgEarth::Symbology;
 
 
-EllipseNode::EllipseNode(MapNode*          mapNode,
-                         const GeoPoint&   position,
-                         const Linear&     radiusMajor,
-                         const Linear&     radiusMinor,
-                         const Angular&    rotationAngle,
-                         const Style&      style,
-                         const Angle&      arcStart,
-                         const Angle&      arcEnd,
-                         const bool        pie) :
-LocalGeometryNode( mapNode ),
-_radiusMajor  ( radiusMajor ),
-_radiusMinor  ( radiusMinor ),
-_rotationAngle( rotationAngle ),
-_arcStart     ( arcStart ),
-_arcEnd       ( arcEnd ),
-_pie          ( pie ),
-_numSegments  ( 0 )
-{
-    initEllipseNode();
-    setStyle( style );
-    setPosition( position );
+EllipseNode::EllipseNode() :
+LocalGeometryNode()
+{
+    construct();
+}
+
+void
+EllipseNode::construct()
+{
+    _radiusMajor.set(1.0, Units::KILOMETERS);
+    _radiusMinor.set(0.5, Units::KILOMETERS);
+    _rotationAngle = 0.0;
+    _arcStart.set(0.0, Units::RADIANS);
+    _arcEnd.set(2.0*osg::PI, Units::RADIANS);
+    _pie = false;
+    _numSegments = 0;
 }
 
 void
-EllipseNode::initEllipseNode()
+EllipseNode::set(const GeoPoint& position,
+                 const Distance& radiusMajor,
+                 const Distance& radiusMinor,
+                 const Angle&    rotationAngle,
+                 const Style&    style,
+                 const Angle&    arcStart,
+                 const Angle&    arcEnd,
+                 const bool      pie)
 {
-    rebuildGeometry();
+    _radiusMajor = radiusMajor;
+    _radiusMinor = radiusMinor;
+    _rotationAngle = rotationAngle;
+    _arcStart = arcStart;
+    _arcEnd = arcEnd;
+    _pie = pie;
+
+    _style = style;
+
+    setPosition(position);
+
+    buildGeometry();
 }
 
 unsigned int
@@ -70,12 +83,12 @@
 }
 
 void
-EllipseNode::setNumSegments(unsigned int numSegments )
+EllipseNode::setNumSegments(unsigned numSegments)
 {
     if (_numSegments != numSegments )
     {
         _numSegments = numSegments;
-        rebuildGeometry();
+        buildGeometry();
     }
 }
 
@@ -112,7 +125,7 @@
     {
         _radiusMajor = radiusMajor;
         _radiusMinor = radiusMinor;
-        rebuildGeometry();
+        buildGeometry();
     }
 }
 
@@ -128,50 +141,50 @@
     if (_rotationAngle != rotationAngle)
     {
         _rotationAngle = rotationAngle;
-        rebuildGeometry();
+        buildGeometry();
     }
 }
 const Angle&
 EllipseNode::getArcStart(void) const
 {
-    return (_arcStart);
+    return _arcStart;
 }
 
 void
 EllipseNode::setArcStart(const Angle& arcStart)
 {
     _arcStart = arcStart;
-    rebuildGeometry();
+    buildGeometry();
 }
 
 const Angle&
 EllipseNode::getArcEnd(void) const
 {
-    return (_arcEnd);
+    return _arcEnd;
 }
 
 void
 EllipseNode::setArcEnd(const Angle& arcEnd)
 {
     _arcEnd = arcEnd;
-    rebuildGeometry();
+    buildGeometry();
 }
 
 const bool&
 EllipseNode::getPie(void) const
 {
-	return (_pie);
+	return _pie;
 }
 
 void
 EllipseNode::setPie(const bool& pie)
 {
 	_pie = pie;
-	rebuildGeometry();
+	buildGeometry();
 }
 
 void
-EllipseNode::rebuildGeometry()
+EllipseNode::buildGeometry()
 {
     // construct a local-origin ellipse.
     GeometryFactory factory;
@@ -186,6 +199,7 @@
     {
         geom = factory.createEllipticalArc(osg::Vec3d(0,0,0), _radiusMajor, _radiusMinor, _rotationAngle, _arcStart, _arcEnd, _numSegments, 0L, _pie);
     }
+
     if ( geom.valid() )
     {
         setGeometry( geom.get() );
@@ -199,18 +213,18 @@
 OSGEARTH_REGISTER_ANNOTATION( ellipse, osgEarth::Annotation::EllipseNode );
 
 
-EllipseNode::EllipseNode(MapNode*              mapNode,
-                         const Config&         conf,
+EllipseNode::EllipseNode(const Config&         conf,
                          const osgDB::Options* dbOptions) :
-LocalGeometryNode(mapNode, conf, dbOptions),
-_numSegments ( 0 )
+LocalGeometryNode(conf, dbOptions)
 {
-    conf.getObjIfSet( "radius_major", _radiusMajor );
-    conf.getObjIfSet( "radius_minor", _radiusMinor );
-    conf.getObjIfSet( "rotation", _rotationAngle );
-    conf.getIfSet   ( "num_segments", _numSegments );
+    construct();
+
+    conf.get( "radius_major", _radiusMajor );
+    conf.get( "radius_minor", _radiusMinor );
+    conf.get( "rotation", _rotationAngle );
+    conf.get( "num_segments", _numSegments );
 
-    initEllipseNode();
+    buildGeometry();
 }
 
 Config
@@ -219,12 +233,12 @@
     Config conf = LocalGeometryNode::getConfig();
     conf.key() = "ellipse";
 
-    conf.addObj( "radius_major", _radiusMajor );
-    conf.addObj( "radius_minor", _radiusMinor );
-    conf.addObj( "rotation", _rotationAngle );
+    conf.set( "radius_major", _radiusMajor );
+    conf.set( "radius_minor", _radiusMinor );
+    conf.set( "rotation", _rotationAngle );
 
     if ( _numSegments != 0 )
-        conf.add( "num_segments", _numSegments );
+        conf.set( "num_segments", _numSegments );
 
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/Export osgearth-2.10.2+dfsg/src/osgEarthAnnotation/Export
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/Export	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/Export	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -24,11 +24,6 @@
 #ifndef OSGEARTH_ANNOTATION_EXPORT_H
 #define OSGEARTH_ANNOTATION_EXPORT_H 1
 
-// define USE_DEPRECATED_API is used to include in API which is being fazed out
-// if you can compile your apps with this turned off you are
-// well placed for compatibility with future versions.
-#define USE_DEPRECATED_API
-
 #if defined(_MSC_VER)
     #pragma warning( disable : 4244 )
     #pragma warning( disable : 4251 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/FeatureEditing osgearth-2.10.2+dfsg/src/osgEarthAnnotation/FeatureEditing
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/FeatureEditing	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/FeatureEditing	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@
 {    
     /**
      * AddPointHandler is a GUIEventHandler that allows you to append points to a Feature's Geometry
+     * @deprecated (remove or refactor as example after 2.10)
      */
     struct OSGEARTHANNO_EXPORT AddPointHandler : public osgGA::GUIEventHandler 
     {
@@ -73,6 +74,7 @@
     
     /**
      * Node you can add to your scene graph to edit the verts of a Feature's Geometry
+     * @deprecated (remove or refactor as example after 2.10)
      */
     class OSGEARTHANNO_EXPORT FeatureEditor : public AnnotationEditor
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/FeatureEditing.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/FeatureEditing.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/FeatureEditing.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/FeatureEditing.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/FeatureNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/FeatureNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/FeatureNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/FeatureNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@
         /**
          * Construct a new FeatureNode from a single Feature.
          */
-        FeatureNode( 
+        FeatureNode(
             Feature* feature,
             const Style& style = Style(),
             const GeometryCompilerOptions& options = GeometryCompilerOptions(),
@@ -61,7 +61,7 @@
         FeatureNode(
             const FeatureList& features,
             const Style& style = Style(),
-            const GeometryCompilerOptions& options = GeometryCompilerOptions(), 
+            const GeometryCompilerOptions& options = GeometryCompilerOptions(),
             StyleSheet* styleSheet = 0);
 
          /**
@@ -90,39 +90,23 @@
         void setStyleSheet(StyleSheet* styleSheet);
 
         /**
-         * Call init to force a rebuild of this FeatureNode.  If you modify the features in the features list or add/remove features
-         * call this function to rebuild the node.
+         * Gets the FeatureIndexBuilder
          */
-        void init();
-        void dirty() { init(); }
-
-    public: // older constructors that take a MapNode
+        FeatureIndexBuilder* getIndex();
 
         /**
-         * Constructs a new FeatureNode from a single Feature and a MapNode.
-         * You can use this variant if you the FeatureNode will not be a
-         * descendant of the MapNode.
-         * NOTE: candidate for deprecation
-         */
-        FeatureNode( 
-            MapNode* mapNode, 
-            Feature* feature,
-            const Style& style = Style(),
-            const GeometryCompilerOptions& options = GeometryCompilerOptions(),
-            StyleSheet* styleSheet = 0);
+        * Sets the FeatureIndexBuilder
+        */
+        void setIndex(FeatureIndexBuilder* index);
 
         /**
-         * Constructs a new FeatureNode from a FeatureList and a MapNode.
-         * You can use this variant if you the FeatureNode will not be a
-         * descendant of the MapNode.
-         * NOTE: candidate for deprecation
+         * Call init to force a rebuild of this FeatureNode.  If you modify the features in the features list or add/remove features
+         * call this function to rebuild the node.
          */
-        FeatureNode( 
-            MapNode* mapNode, 
-            const FeatureList& features,
-            const Style& style = Style(),
-            const GeometryCompilerOptions& options = GeometryCompilerOptions(), 
-            StyleSheet* styleSheet = 0);
+        void dirty();
+
+        //! @deprecated backwards compatiblity (remove after 2.10)
+        void init() { dirty(); }
 
     public: // AnnotationNode
 
@@ -132,7 +116,7 @@
         virtual const Style& getStyle() const;
 
         /**
-         * Sets the style for this FeatureNode.  
+         * Sets the style for this FeatureNode.
          * Note:  Do NOT use embedded feature styles if you need to change the style of the FeatureNode at runtime using this method.
          *        You will need to set the style of the features themselves and call init on this FeatureNode if you use embedded styles.
          */
@@ -148,7 +132,7 @@
 
     public:
 
-        FeatureNode(MapNode* mapNode, const Config& conf, const osgDB::Options* options);
+        FeatureNode(const Config& conf, const osgDB::Options* options);
         virtual Config getConfig() const;
 
     protected:
@@ -166,23 +150,28 @@
         typedef TerrainCallbackAdapter<FeatureNode> ClampCallback;
         osg::ref_ptr<ClampCallback> _clampCallback;
         bool _clampDirty;
+        GeometryClamper::LocalData _clamperData;
 
         osg::ref_ptr< osg::Node >    _compiled;
 
         osg::ref_ptr< StyleSheet >   _styleSheet;
 
+        FeatureIndexBuilder* _index;
+
         FeatureNode() { }
         FeatureNode(const FeatureNode& rhs, const osg::CopyOp& op) { }
-        
+
         void clamp(osg::Node* graph, const Terrain* terrain);
 
         void build();
 
+        //void construct();
+
     public:
 
         void onTileAdded(
-            const TileKey&          key, 
-            osg::Node*              graph, 
+            const TileKey&          key,
+            osg::Node*              graph,
             TerrainCallbackContext& context);
     };
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/FeatureNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/FeatureNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/FeatureNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/FeatureNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -58,7 +58,8 @@
 _options           ( options ),
 _needsRebuild      ( true ),
 _styleSheet        ( styleSheet ),
-_clampDirty        (false)
+_clampDirty        (false),
+_index             ( 0 )
 {
     _features.push_back( feature );
 
@@ -79,52 +80,13 @@
 _options        ( options ),
 _needsRebuild   ( true ),
 _styleSheet     ( styleSheet ),
-_clampDirty     ( false )
+_clampDirty     ( false ),
+_index          ( 0 )
 {
     _features.insert( _features.end(), features.begin(), features.end() );
     setStyle( style );
 }
 
-FeatureNode::FeatureNode(MapNode* mapNode,
-                         Feature* feature,
-                         const Style& in_style,
-                         const GeometryCompilerOptions& options,
-                         StyleSheet* styleSheet) :
-AnnotationNode(),
-_options           ( options ),
-_needsRebuild      ( true ),
-_styleSheet        ( styleSheet ),
-_clampDirty        (false)
-{
-    _features.push_back( feature );
-
-    FeatureNode::setMapNode( mapNode );
-
-    Style style = in_style;
-    if (style.empty() && feature->style().isSet())
-    {
-        style = *feature->style();
-    }
-
-    setStyle( style );
-}
-
-FeatureNode::FeatureNode(MapNode* mapNode,
-                         const FeatureList& features,
-                         const Style& style,
-                         const GeometryCompilerOptions& options,
-                         StyleSheet* styleSheet):
-AnnotationNode(),
-_options        ( options ),
-_needsRebuild   ( true ),
-_styleSheet     ( styleSheet ),
-_clampDirty     ( false )
-{
-    _features.insert( _features.end(), features.begin(), features.end() );
-    FeatureNode::setMapNode( mapNode );
-    setStyle( style );
-}
-
 void
 FeatureNode::build()
 {
@@ -158,6 +120,7 @@
         options.ignoreAltitudeSymbol() = true;
     }
 
+    _clamperData.clear();
 
     osg::Node* node = _compiled.get();
     if (_needsRebuild || !_compiled.valid() )
@@ -187,7 +150,7 @@
         GeometryCompiler compiler( options );
         Session* session = new Session( getMapNode()->getMap(), _styleSheet.get() );
 
-        FilterContext context( session, new FeatureProfile( _extent ), _extent );
+        FilterContext context( session, new FeatureProfile( _extent ), _extent, _index);
 
         _compiled = compiler.compile( clone, style, context );
         node = _compiled.get();
@@ -238,9 +201,7 @@
             this->addChild( _attachPoint );
 
             // set default lighting based on whether we are extruding:
-            setLightingIfNotSet( style.has<ExtrusionSymbol>() );
-
-            //applyRenderSymbology( style );
+            setDefaultLighting( style.has<ExtrusionSymbol>() );
         }
 
         applyRenderSymbology(style);
@@ -249,8 +210,12 @@
         {
             if ( ap.sceneClamping )
             {
-                getMapNode()->getTerrain()->addTerrainCallback( _clampCallback.get() );
-                clamp( getMapNode()->getTerrain()->getGraph(), getMapNode()->getTerrain() );
+                // Need dynamic data variance since scene clamping will change the verts
+                SetDataVarianceVisitor sdv(osg::Object::DYNAMIC);
+                this->accept(sdv);
+
+                getMapNode()->getTerrain()->addTerrainCallback(_clampCallback.get());
+                clamp(getMapNode()->getTerrain()->getGraph(), getMapNode()->getTerrain());
             }
             else
             {
@@ -301,6 +266,21 @@
     _styleSheet = styleSheet;
 }
 
+FeatureIndexBuilder* FeatureNode::getIndex()
+{
+    return _index;
+}
+
+void FeatureNode::setIndex(FeatureIndexBuilder* index)
+{
+    if (_index != index)
+    {
+        _index = index;
+        _needsRebuild = true;
+        build();
+    }
+}
+
 Feature* FeatureNode::getFeature()
 {
     if (_features.size() == 1)
@@ -321,7 +301,7 @@
     build();
 }
 
-void FeatureNode::init()
+void FeatureNode::dirty()
 {
     _needsRebuild = true;
     build();
@@ -371,10 +351,10 @@
         bool relative = alt && alt->clamping() == alt->CLAMP_RELATIVE_TO_TERRAIN && alt->technique() == alt->TECHNIQUE_SCENE;
         float offset = alt ? alt->verticalOffset()->eval() : 0.0f;
 
-        GeometryClamper clamper;
+        GeometryClamper clamper(_clamperData);
         clamper.setTerrainPatch( graph );
         clamper.setTerrainSRS( terrain->getSRS() );
-        clamper.setPreserveZ( relative );
+        clamper.setUseVertexZ( relative );
         clamper.setOffset( offset );
 
         this->accept( clamper );
@@ -405,11 +385,11 @@
 OSGEARTH_REGISTER_ANNOTATION( feature, osgEarth::Annotation::FeatureNode );
 
 
-FeatureNode::FeatureNode(MapNode*              mapNode,
-                         const Config&         conf,
-                         const osgDB::Options* dbOptions ) :
-AnnotationNode(conf),
-_clampDirty(false)
+FeatureNode::FeatureNode(const Config&         conf,
+                         const osgDB::Options* readOptions ) :
+AnnotationNode(conf, readOptions),
+_clampDirty(false),
+_index(0)
 {
     osg::ref_ptr<Geometry> geom;
     if ( conf.hasChild("geometry") )
@@ -427,18 +407,19 @@
 
     optional<GeoInterpolation> geoInterp;
 
-    conf.getObjIfSet( "style", _style );
+    conf.get( "style", _style );
 
-    FeatureNode::setMapNode( mapNode );
+    //FeatureNode::setMapNode( mapNode );
 
     if ( srs.valid() && geom.valid() )
     {
         Feature* feature = new Feature(geom.get(), srs.get() );
 
-        conf.getIfSet( "geointerp", "greatcircle", feature->geoInterp(), GEOINTERP_GREAT_CIRCLE );
-        conf.getIfSet( "geointerp", "rhumbline",   feature->geoInterp(), GEOINTERP_RHUMB_LINE );
+        conf.get( "geointerp", "greatcircle", feature->geoInterp(), GEOINTERP_GREAT_CIRCLE );
+        conf.get( "geointerp", "rhumbline",   feature->geoInterp(), GEOINTERP_RHUMB_LINE );
 
         _features.push_back( feature );
+
         build();
     }
 }
@@ -457,7 +438,7 @@
         conf.set("name", getName());
 
         Config geomConf("geometry");
-        geomConf.value() = GeometryUtils::geometryToWKT( feature->getGeometry() );
+        geomConf.setValue(GeometryUtils::geometryToWKT( feature->getGeometry() ));
         conf.add(geomConf);
 
         std::string srs = feature->getSRS() ? feature->getSRS()->getHorizInitString() : "";
@@ -472,7 +453,7 @@
 
     if (!_style.empty() )
     {
-        conf.addObj( "style", _style );
+        conf.set( "style", _style );
     }
 
     return conf;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/GeoPositionNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/GeoPositionNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/GeoPositionNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/GeoPositionNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -47,18 +47,6 @@
         GeoPositionNode();
 
         /**
-         * Constructs a positional with initial with a MapNode
-         */
-        GeoPositionNode(MapNode* mapNode);
-
-        /**
-         * Constructs an positional node that resides at an absolute position on the map
-         * @param mapNode  MapNode used to referenced the ortho node
-         * @param position Starting position
-         */
-        GeoPositionNode(MapNode* mapNode, const GeoPoint& position);
-
-        /**
          * The anchor position of this node.
          * If the annotation also has a style that contains an AltitudeSymbol,
          * any clamping properties in the symbol will take precedence over
@@ -69,7 +57,7 @@
         const GeoPoint& getPosition() const { return _geoxform->getPosition(); }
 
         /** Local XYZ offset */
-        virtual void setLocalOffset(const osg::Vec3f& pos) { _paxform->setPosition(pos); dirty(); }
+        virtual void setLocalOffset(const osg::Vec3d& pos) { _paxform->setPosition(pos); dirty(); }
         const osg::Vec3d& getLocalOffset() const           { return _paxform->getPosition(); }
 
         /** Local rotation */
@@ -123,6 +111,8 @@
 
         virtual void setConfig(const Config&);
 
+        //virtual void init(const osgDB::Options*);
+
     private:
         GeoTransform*                   _geoxform;
         osg::PositionAttitudeTransform* _paxform;
@@ -133,13 +123,13 @@
         osg::ref_ptr< HorizonCullCallback >      _horizonCuller;
         osg::ref_ptr< OcclusionCullingCallback > _occlusionCuller;
 
-        void init();
+        void construct();
 
     protected:
-        GeoPositionNode(MapNode* mapNode, const Config& conf);
+        GeoPositionNode(const Config& conf, const osgDB::Options*);
 
         // required by META_Node, but this object is not cloneable
-        GeoPositionNode(const GeoPositionNode& rhs, const osg::CopyOp& op =osg::CopyOp::DEEP_COPY_ALL);
+        GeoPositionNode(const GeoPositionNode& rhs, const osg::CopyOp& op =osg::CopyOp::DEEP_COPY_ALL) { }
     };
 
 } } // namespace osgEarth::Annotation
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/GeoPositionNodeAutoScaler osgearth-2.10.2+dfsg/src/osgEarthAnnotation/GeoPositionNodeAutoScaler
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/GeoPositionNodeAutoScaler	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/GeoPositionNodeAutoScaler	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@
      * Important: ONLY install this on a GeoPositionNode, or else you will
      * get a crash -- it does NO type checking.
      *
-     * geoPosNode->setCullCallback( new GeoPositionNodeAutoScaler() );
+     * geoPosNode->addCullCallback( new GeoPositionNodeAutoScaler() );
      */
     class OSGEARTHANNO_EXPORT GeoPositionNodeAutoScaler : public osg::NodeCallback
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/GeoPositionNodeAutoScaler.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/GeoPositionNodeAutoScaler.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/GeoPositionNodeAutoScaler.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/GeoPositionNodeAutoScaler.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/GeoPositionNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/GeoPositionNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/GeoPositionNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/GeoPositionNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 #include <osgEarth/CullingUtils>
 #include <osgEarth/MapNode>
 #include <osgEarth/TerrainEngineNode>
+#include <osgEarth/GLUtils>
 
 #include <osgText/Text>
 #include <osg/ComputeBoundsVisitor>
@@ -46,51 +47,27 @@
 #define DEFAULT_HORIZON_CULLING true
 
 GeoPositionNode::GeoPositionNode() :
-AnnotationNode(),
-_geoxform(0L),
-_paxform(0L),
-_occlusionCullingRequested( DEFAULT_OCCLUSION_CULLING ),
-_horizonCullingRequested( DEFAULT_HORIZON_CULLING )
-{
-    init();
-}
-
-GeoPositionNode::GeoPositionNode(MapNode* mapNode) :
-AnnotationNode(),
-_geoxform(0L),
-_paxform(0L),
-_occlusionCullingRequested( DEFAULT_OCCLUSION_CULLING ),
-_horizonCullingRequested( DEFAULT_HORIZON_CULLING )
-{
-    init();
-    GeoPositionNode::setMapNode( mapNode );
-}
-
-GeoPositionNode::GeoPositionNode(MapNode* mapNode, const GeoPoint& position ) :
-AnnotationNode(),
-_geoxform(0L),
-_paxform(0L),
-_occlusionCullingRequested( DEFAULT_OCCLUSION_CULLING ),
-_horizonCullingRequested( DEFAULT_HORIZON_CULLING )
-{
-    init();
-    GeoPositionNode::setMapNode( mapNode );
-    _geoxform->setPosition( position );
-}
-
-GeoPositionNode::GeoPositionNode(const GeoPositionNode& rhs, const osg::CopyOp& copy) :
-AnnotationNode(rhs, copy),
-_geoxform(0L),
-_paxform(0L),
-_occlusionCullingRequested( DEFAULT_OCCLUSION_CULLING ),
-_horizonCullingRequested( DEFAULT_HORIZON_CULLING )
+AnnotationNode()
 {
-    //nop - UNUSED
+    construct();
+}
+
+GeoPositionNode::GeoPositionNode(const Config& conf, const osgDB::Options* options) :
+AnnotationNode( conf, options )
+{
+    construct();
+    setConfig(conf);
 }
 
 void
-GeoPositionNode::init()
+GeoPositionNode::construct()
 {
+    _geoxform = 0L;
+    _paxform = 0L;
+
+    _occlusionCullingRequested = DEFAULT_OCCLUSION_CULLING;
+    _horizonCullingRequested = DEFAULT_HORIZON_CULLING;
+
     this->removeChildren(0, this->getNumChildren());
 
     _geoxform = new GeoTransform();
@@ -98,15 +75,12 @@
 
     _paxform = new osg::PositionAttitudeTransform();
     _geoxform->addChild( _paxform );
-    
-    this->getOrCreateStateSet()->setMode( GL_LIGHTING, 0 );
 }
 
 void
 GeoPositionNode::setMapNode( MapNode* mapNode )
 {
-    MapNode* oldMapNode = getMapNode();
-    if ( oldMapNode != mapNode )
+    if (mapNode != getMapNode())
     {
         AnnotationNode::setMapNode( mapNode );
 
@@ -173,28 +147,7 @@
 void
 GeoPositionNode::setPosition(const GeoPoint& pos)
 {
-    GeoPoint pos2 = pos;
-
-    // The altitude symbol, if there is one, overrides the incoming GeoPoint:
-    const AltitudeSymbol* alt = getStyle().get<AltitudeSymbol>();
-    if (alt)
-    {
-        if (alt->clamping() == alt->CLAMP_TO_TERRAIN)
-        {
-            pos2.z() = 0;
-            pos2.altitudeMode() = ALTMODE_RELATIVE;
-        }
-        else if (alt->clamping() == alt->CLAMP_RELATIVE_TO_TERRAIN)
-        {
-            pos2.altitudeMode() = ALTMODE_RELATIVE;
-        }
-        else if (alt->clamping() == alt->CLAMP_NONE)
-        {
-            pos2.altitudeMode() = ALTMODE_ABSOLUTE;
-        }
-    }
-    _geoxform->setPosition( pos2 );
-    dirty();
+    _geoxform->setPosition(pos);
 }
 
 bool
@@ -243,21 +196,11 @@
     }
 }
 
-
-GeoPositionNode::GeoPositionNode(MapNode* mapNode, const Config& conf) :
-AnnotationNode            ( conf ),
-_occlusionCullingRequested( DEFAULT_OCCLUSION_CULLING ),
-_horizonCullingRequested  ( DEFAULT_HORIZON_CULLING )
-{
-    init();
-    GeoPositionNode::setMapNode( mapNode );
-    setConfig(conf);
-}
-
 void
 GeoPositionNode::setConfig(const Config& conf)
 {
     //AnnotationNode::setConfig(conf);
+
     if (conf.hasValue("name"))
     {
         setName(conf.value("name"));
@@ -303,16 +246,16 @@
 {
     Config conf = AnnotationNode::getConfig();
 
-    conf.addObj( "position", getGeoTransform()->getPosition() );
+    conf.set( "position", getGeoTransform()->getPosition() );
 
     const osg::Vec3d& scale = getPositionAttitudeTransform()->getScale();
     if ( scale.x() != 1.0f || scale.y() != 1.0f || scale.z() != 1.0f )
     {
         Config c( "scale" );
-        c.add( "x", scale.x() );
-        c.add( "y", scale.y() );
-        c.add( "z", scale.z() );
-        conf.add( c );
+        c.set( "x", scale.x() );
+        c.set( "y", scale.y() );
+        c.set( "z", scale.z() );
+        conf.set( c );
     }
 
     const osg::Vec3d& offset = getPositionAttitudeTransform()->getPosition();
@@ -322,7 +265,7 @@
         c.set( "x", offset.x() );
         c.set( "y", offset.y() );
         c.set( "z", offset.z() );
-        conf.add( c );
+        conf.set( c );
     }
 
     const osg::Quat& rot = getPositionAttitudeTransform()->getAttitude();
@@ -333,7 +276,7 @@
         c.set( "y", rot.y() );
         c.set( "z", rot.z() );
         c.set( "w", rot.w() );
-        conf.add( c );
+        conf.set( c );
     }
 
     return conf;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ImageOverlay osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ImageOverlay
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ImageOverlay	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ImageOverlay	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 #include <osgEarth/Units>
 #include <osgEarth/URI>
 #include <osgEarth/Terrain>
+#include <osgEarth/VirtualProgram>
 
 #include <osgEarthFeatures/Feature>
 
@@ -36,6 +37,9 @@
 {
     using namespace osgEarth;
 
+    /**
+     * ImageOverlay drapes a rectangular texture on the terrain.
+     */
     class OSGEARTHANNO_EXPORT ImageOverlay : public AnnotationNode
     {
     public:
@@ -58,7 +62,7 @@
         /**
          * Construcs an image overlay annotation from a serialized representation
          */
-        ImageOverlay(MapNode* mapNode, const Config& conf, const osgDB::Options* dbOptions);
+        ImageOverlay(const Config& conf, const osgDB::Options* dbOptions);
 
         virtual ~ImageOverlay() { }
 
@@ -130,9 +134,6 @@
         /** Serialize the contents of this node */
         Config getConfig() const;
 
-    public: // AnnotationNode
-        
-        //virtual void reclamp( const TileKey& key, osg::Node* tile, const Terrain* );
 
     public: // MapNodeObserver
 
@@ -153,15 +154,14 @@
     private:
         void fireCallback(ImageOverlay::ControlPoint point, const osg::Vec2d& location);
 
-        void postCTOR();
-        void init();
+        void construct();
+        void compile();
         void clampLatitudes();
 
         void updateFilters();
 
         osg::Node* createNode(osgEarth::Features::Feature* feature, bool split);
 
-
         osg::Vec2d _lowerLeft;
         osg::Vec2d _lowerRight;
         osg::Vec2d _upperRight;
@@ -186,12 +186,12 @@
 
         bool _updateScheduled;
 
-        osg::ref_ptr< TerrainCallbackAdapter<ImageOverlay> > _clampCallback;
-        
-        void clamp(osg::Node* patch, const Terrain* terrain);
 
         ImageOverlay() { }
         ImageOverlay(const ImageOverlay&, const osg::CopyOp&) { }
+
+    private:
+        static osg::ref_ptr<VirtualProgram> _program;
     };
 
 } } // namespace osgEarth::Annotation
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ImageOverlay.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ImageOverlay.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ImageOverlay.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ImageOverlay.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -23,15 +23,11 @@
 #include <osgEarthAnnotation/AnnotationRegistry>
 #include <osgEarthSymbology/MeshSubdivider>
 #include <osgEarthFeatures/GeometryUtils>
-#include <osgEarth/GeometryClamper>
 #include <osgEarth/MapNode>
 #include <osgEarth/NodeUtils>
 #include <osgEarth/ImageUtils>
 #include <osgEarth/DrapeableNode>
 #include <osgEarth/VirtualProgram>
-#include <osgEarth/Registry>
-#include <osgEarth/Capabilities>
-#include <osgEarth/ShaderGenerator>
 #include <osg/Geode>
 #include <osg/ShapeDrawable>
 #include <osg/Texture2D>
@@ -56,14 +52,34 @@
     }    
 
     static Distance default_geometryResolution(5.0, Units::DEGREES);
+
+    const char* imageVS =
+        "#version " GLSL_VERSION_STR "\n"
+        "out vec2 oe_ImageOverlay_texcoord; \n"
+        "void oe_ImageOverlay_VS(inout vec4 vertex) { \n"
+        "    oe_ImageOverlay_texcoord = gl_MultiTexCoord0.st; \n"
+        "} \n";
+
+    const char* imageFS =
+        "#version " GLSL_VERSION_STR "\n"
+        "in vec2 oe_ImageOverlay_texcoord; \n"
+        "uniform sampler2D oe_ImageOverlay_tex; \n"
+        "uniform float oe_ImageOverlay_alpha; \n"
+        "void oe_ImageOverlay_FS(inout vec4 color) { \n"
+        "    color = texture(oe_ImageOverlay_tex, oe_ImageOverlay_texcoord);\n"
+        "    color.a *= oe_ImageOverlay_alpha; \n"
+        "} \n";
+
 }
 
 //---------------------------------------------------------------------------
 
 OSGEARTH_REGISTER_ANNOTATION( imageoverlay, osgEarth::Annotation::ImageOverlay );
 
-ImageOverlay::ImageOverlay(MapNode* mapNode, const Config& conf, const osgDB::Options* dbOptions) :
-AnnotationNode(conf),
+osg::ref_ptr<VirtualProgram> ImageOverlay::_program;
+
+ImageOverlay::ImageOverlay(const Config& conf, const osgDB::Options* readOptions) :
+AnnotationNode(conf, readOptions),
 _lowerLeft    (10, 10),
 _lowerRight   (20, 10),
 _upperRight   (20, 20),
@@ -76,13 +92,15 @@
 _geometryResolution(default_geometryResolution),
 _draped(true)
 {
-    conf.getIfSet( "url",   _imageURI );
+    construct();
+
+    conf.get( "url",   _imageURI );
     if ( _imageURI.isSet() )
     {
-        setImage( _imageURI->getImage(dbOptions) );
+        setImage( _imageURI->getImage(readOptions) );
     }
 
-    conf.getIfSet( "alpha", _alpha );
+    conf.get( "alpha", _alpha );
     
     osg::ref_ptr<Geometry> geom;
     if ( conf.hasChild("geometry") )
@@ -105,20 +123,20 @@
 
 
     //Load the filter settings
-    conf.getIfSet("mag_filter","LINEAR",                _magFilter,osg::Texture::LINEAR);
-    conf.getIfSet("mag_filter","LINEAR_MIPMAP_LINEAR",  _magFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
-    conf.getIfSet("mag_filter","LINEAR_MIPMAP_NEAREST", _magFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
-    conf.getIfSet("mag_filter","NEAREST",               _magFilter,osg::Texture::NEAREST);
-    conf.getIfSet("mag_filter","NEAREST_MIPMAP_LINEAR", _magFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
-    conf.getIfSet("mag_filter","NEAREST_MIPMAP_NEAREST",_magFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
-    conf.getIfSet("min_filter","LINEAR",                _minFilter,osg::Texture::LINEAR);
-    conf.getIfSet("min_filter","LINEAR_MIPMAP_LINEAR",  _minFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
-    conf.getIfSet("min_filter","LINEAR_MIPMAP_NEAREST", _minFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
-    conf.getIfSet("min_filter","NEAREST",               _minFilter,osg::Texture::NEAREST);
-    conf.getIfSet("min_filter","NEAREST_MIPMAP_LINEAR", _minFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
-    conf.getIfSet("min_filter","NEAREST_MIPMAP_NEAREST",_minFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
+    conf.get("mag_filter","LINEAR",                _magFilter,osg::Texture::LINEAR);
+    conf.get("mag_filter","LINEAR_MIPMAP_LINEAR",  _magFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
+    conf.get("mag_filter","LINEAR_MIPMAP_NEAREST", _magFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
+    conf.get("mag_filter","NEAREST",               _magFilter,osg::Texture::NEAREST);
+    conf.get("mag_filter","NEAREST_MIPMAP_LINEAR", _magFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
+    conf.get("mag_filter","NEAREST_MIPMAP_NEAREST",_magFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
+    conf.get("min_filter","LINEAR",                _minFilter,osg::Texture::LINEAR);
+    conf.get("min_filter","LINEAR_MIPMAP_LINEAR",  _minFilter,osg::Texture::LINEAR_MIPMAP_LINEAR);
+    conf.get("min_filter","LINEAR_MIPMAP_NEAREST", _minFilter,osg::Texture::LINEAR_MIPMAP_NEAREST);
+    conf.get("min_filter","NEAREST",               _minFilter,osg::Texture::NEAREST);
+    conf.get("min_filter","NEAREST_MIPMAP_LINEAR", _minFilter,osg::Texture::NEAREST_MIPMAP_LINEAR);
+    conf.get("min_filter","NEAREST_MIPMAP_NEAREST",_minFilter,osg::Texture::NEAREST_MIPMAP_NEAREST);
 
-    conf.getIfSet("draped", _draped);
+    conf.get("draped", _draped);
 
     if (conf.hasValue("geometry_resolution"))
     {
@@ -127,8 +145,8 @@
             _geometryResolution.set(value, units);
     }
 
-    postCTOR();
-    ImageOverlay::setMapNode( mapNode );
+    compile();
+    //ImageOverlay::setMapNode( mapNode );
 }
 
 Config
@@ -139,16 +157,16 @@
 
     if ( _imageURI.isSet() )
     {
-        conf.addIfSet("url", _imageURI );
+        conf.set("url", _imageURI );
     }
     else if ( _image.valid() && !_image->getFileName().empty() )
     {
         optional<URI> temp;
         temp = URI(_image->getFileName());
-        conf.addIfSet("url", temp);
+        conf.set("url", temp);
     }
 
-    conf.addIfSet("alpha", _alpha);
+    conf.set("alpha", _alpha);
 
     osg::ref_ptr<Geometry> g = new Polygon();
     g->push_back( osg::Vec3d(_lowerLeft.x(),  _lowerLeft.y(), 0) );
@@ -157,7 +175,7 @@
     g->push_back( osg::Vec3d(_upperLeft.x(),  _upperLeft.y(),  0) );
 
     Config geomConf("geometry");
-    geomConf.value() = GeometryUtils::geometryToWKT( g.get() );
+    geomConf.setValue(GeometryUtils::geometryToWKT( g.get() ));
     conf.add( geomConf );
 
     //Save the filter settings
@@ -178,7 +196,7 @@
 
     if (_geometryResolution != default_geometryResolution)
     {
-        conf.update("geometry_resolution", _geometryResolution.asParseableString());
+        conf.set("geometry_resolution", _geometryResolution.asParseableString());
     }
 
     return conf;
@@ -199,33 +217,53 @@
 _minFilter    (osg::Texture::LINEAR_MIPMAP_LINEAR),
 _magFilter    (osg::Texture::LINEAR),
 _texture      (0),
-_geometryResolution(default_geometryResolution)
+_geometryResolution(default_geometryResolution),
+_draped(true)
 {        
-    postCTOR();
+    construct();
+
     ImageOverlay::setMapNode(mapNode);
+
+    compile();
 }
 
 void
-ImageOverlay::postCTOR()
+ImageOverlay::construct()
 {
     _updateScheduled = false;
 
-    _root = new osg::Group;
-
     // place the geometry under a drapeable node so it will project onto the terrain    
     DrapeableNode* d = new DrapeableNode();
     d->setDrapingEnabled(*_draped);
     addChild( d );
-
+    
+    if (!_program.valid())
+    {
+        static Threading::Mutex mutex;
+        mutex.lock();
+        if (_program.valid() == false)
+        {
+            _program = new VirtualProgram;
+            _program->setInheritShaders(true);
+            _program->setFunction("oe_ImageOverlay_VS", imageVS, ShaderComp::LOCATION_VERTEX_MODEL);
+            _program->setFunction("oe_ImageOverlay_FS", imageFS, ShaderComp::LOCATION_FRAGMENT_COLORING);
+        }
+        mutex.unlock();
+    }
+
+    _root = new osg::Group();
+    osg::StateSet *ss = _root->getOrCreateStateSet();
+    ss->setAttributeAndModes(_program.get(), osg::StateAttribute::ON);
+    ss->addUniform(new osg::Uniform("oe_ImageOverlay_tex", 0));
+    ss->addUniform(new osg::Uniform("oe_ImageOverlay_alpha", *_alpha));
+    ss->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
     d->addChild( _root );
 
-    init();
-
     ADJUST_EVENT_TRAV_COUNT(this, 1);
 }
 
 void
-ImageOverlay::init()
+ImageOverlay::compile()
 {
     OpenThreads::ScopedLock< OpenThreads::Mutex > lock(_mutex);
 
@@ -234,30 +272,50 @@
         _root->removeChildren(0, _root->getNumChildren());
     }
 
-    if ( !_clampCallback.valid() )
-    {
-        _clampCallback = new TerrainCallbackAdapter<ImageOverlay>(this);
-    }
-
     if ( getMapNode() )
     {                
         const SpatialReference* mapSRS = getMapNode()->getMapSRS();
 
-        // calculate a bounding polytope in world space (for mesh clamping):
         osg::ref_ptr<Feature> f = new Feature( new Polygon(), mapSRS->getGeodeticSRS() );
         Geometry* g = f->getGeometry();
         g->push_back( osg::Vec3d(_lowerLeft.x(),  _lowerLeft.y(), 0) );
         g->push_back( osg::Vec3d(_lowerRight.x(), _lowerRight.y(), 0) );
         g->push_back( osg::Vec3d(_upperRight.x(), _upperRight.y(), 0) );
         g->push_back( osg::Vec3d(_upperLeft.x(),  _upperLeft.y(),  0) );
-        
-        f->getWorldBoundingPolytope( getMapNode()->getMapSRS(), _boundingPolytope );
+
+        osgEarth::Bounds bounds = getBounds();
 
         FeatureList features;
         if (!mapSRS->isGeographic())        
         {
             f->splitAcrossDateLine(features);
         }
+        // The width of the image overlay is >= 180 degrees so split it into two chunks of < 180 degrees
+        // so the MeshSubdivider will work.
+        else if (bounds.width() > 180.0)
+        {
+            Bounds boundsA(bounds.xMin(), bounds.yMin(), bounds.xMin() + 180.0, bounds.yMax());
+            Bounds boundsB(bounds.xMin() + 180.0, bounds.yMin(), bounds.xMax(), bounds.yMax());
+            
+            osg::ref_ptr< Geometry > geomA;
+            if (f->getGeometry()->crop(boundsA, geomA))
+            {
+                osg::ref_ptr< Feature > croppedFeature = new Feature(*f);
+                // Make sure the feature is wound correctly.
+                geomA->rewind(osgEarth::Symbology::Geometry::ORIENTATION_CCW);
+                croppedFeature->setGeometry(geomA.get());
+                features.push_back(croppedFeature);
+            }
+            osg::ref_ptr< Geometry > geomB;
+            if (f->getGeometry()->crop(boundsB, geomB))
+            {
+                osg::ref_ptr< Feature > croppedFeature = new Feature(*f);
+                // Make sure the feature is wound correctly.
+                geomA->rewind(osgEarth::Symbology::Geometry::ORIENTATION_CCW);
+                croppedFeature->setGeometry(geomB.get());
+                features.push_back(croppedFeature);
+            }
+        }
         else
         {
             features.push_back( f );
@@ -269,17 +327,9 @@
         }
 
         _dirty = false;
-        
-        // Set the annotation up for auto-clamping. We always need to auto-clamp a draped image
-        // so that the mesh roughly conforms with the surface, otherwise the draping routine
-        // might clip it.
-        Style style;
-        style.getOrCreate<AltitudeSymbol>()->clamping() = AltitudeSymbol::CLAMP_RELATIVE_TO_TERRAIN;
-        applyStyle( style );
-        setLightingIfNotSet( false );
 
-        getMapNode()->getTerrain()->addTerrainCallback( _clampCallback.get() );
-        clamp( getMapNode()->getTerrain()->getGraph(), getMapNode()->getTerrain() );
+        // image overlay is unlit by default.
+        setDefaultLighting(false);
     }
 }
 
@@ -289,7 +339,7 @@
     if ( getMapNode() != mapNode )
     {
         AnnotationNode::setMapNode( mapNode );
-        init();
+        compile();
     }
 }
 
@@ -353,14 +403,12 @@
 
     osg::MatrixTransform* transform = new osg::MatrixTransform;
     
-    osg::Geode* geode = new osg::Geode;
-    // Disable depth test
-    geode->getOrCreateStateSet()->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
-    transform->addChild(geode);
+    //osg::Geode* geode = new osg::Geode;
+    //transform->addChild(geode);
 
     osg::Geometry* geometry = new osg::Geometry();     
     geometry->setUseVertexBufferObjects(true);
-    geode->addDrawable( geometry );
+    transform->addChild(geometry);
 
     // next, convert to world coords and create the geometry:
     osg::Vec3Array* verts = new osg::Vec3Array();
@@ -384,12 +432,6 @@
     if ( verts->getVertexBufferObject() )
         verts->getVertexBufferObject()->setUsage(GL_STATIC_DRAW_ARB);
 
-    osg::Vec4Array* colors = new osg::Vec4Array(1);
-    (*colors)[0] = osg::Vec4(1,1,1,*_alpha);
-
-    geometry->setColorArray( colors );
-    geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
-
     GLushort tris[6] = { 0, 1, 2,
         0, 2, 3
     };        
@@ -404,7 +446,7 @@
         _texture->setWrap(_texture->WRAP_T, _texture->CLAMP_TO_EDGE);
         _texture->setResizeNonPowerOfTwoHint(false);
         updateFilters();
-        geode->getOrCreateStateSet()->setTextureAttributeAndModes(0, _texture, osg::StateAttribute::ON);    
+        transform->getOrCreateStateSet()->setTextureAttributeAndModes(0, _texture, osg::StateAttribute::ON);    
         flip = _image->getOrigin()==osg::Image::TOP_LEFT;
     }
 
@@ -451,12 +493,6 @@
     {
         MeshSubdivider ms(osg::Matrixd::inverse(transform->getMatrix()), transform->getMatrix());
         ms.run(*geometry, _geometryResolution.as(Units::RADIANS), GEOINTERP_RHUMB_LINE);
-    } 
-
-    if ( Registry::capabilities().supportsGLSL() )
-    {
-        //OE_WARN << LC << "ShaderGen RUNNING" << std::endl;
-        Registry::shaderGenerator().run( geode, "osgEarth.ImageOverlay" );
     }
 
     return transform;
@@ -509,7 +545,7 @@
     if (*_alpha != alpha)
     {
         _alpha = osg::clampBetween(alpha, 0.0f, 1.0f);
-        dirty();
+        _root->getOrCreateStateSet()->getOrCreateUniform("oe_ImageOverlay_alpha", osg::Uniform::FLOAT)->set(*_alpha);
     }
 }
 
@@ -777,7 +813,7 @@
     {
         if (_dirty)
         {
-            init();
+            compile();
         }
 
         if (_updateScheduled)
@@ -819,29 +855,3 @@
         _callbacks.erase( i );
     }    
 }
-
-void
-ImageOverlay::clamp(osg::Node* graph, const Terrain* terrain)
-{
-    if ( terrain && graph )
-    {
-        GeometryClamper clamper;
-        clamper.setTerrainPatch( graph );
-        clamper.setTerrainSRS( terrain->getSRS() );
-
-        this->accept( clamper );
-        this->dirtyBound();
-    }
-}
-
-void
-ImageOverlay::onTileAdded(const TileKey&          key, 
-                          osg::Node*              graph, 
-                          TerrainCallbackContext& context)
-{
-    if ( graph == 0L || !key.valid() || _boundingPolytope.contains(graph->getBound()) )
-    {
-        clamp( graph, context.getTerrain() );
-    }
-}
-
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ImageOverlayEditor osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ImageOverlayEditor
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ImageOverlayEditor	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ImageOverlayEditor	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ImageOverlayEditor.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ImageOverlayEditor.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ImageOverlayEditor.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ImageOverlayEditor.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/LabelNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/LabelNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/LabelNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/LabelNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -42,63 +42,23 @@
     public:
         META_AnnotationNode( osgEarthAnnotation, LabelNode );
 
-        /**
-         * Constructs a label node that is positioned relative to a map.
-         */
-        LabelNode(
-            MapNode*                mapNode,
-            const GeoPoint&         position,
-            const std::string&      text,
-            const Style&            style =Style() );
+        //! Construct a new empty label node.
+        LabelNode();
 
-        /**
-         * Constructs a label node that is positioned relative to a map.
-         */
-        LabelNode(
-            MapNode*                mapNode,
-            const GeoPoint&         position,
-            const std::string&      text,
-            const TextSymbol*       symbol );
-
-        /** 
-         * Construct a label node purely from the style. The text string
-         * must be in the text symbol
-         */
-        LabelNode(
-            MapNode*                mapNode,
-            const GeoPoint&         position,
-            const Style&            style );
+        //! Construct new node with text content and default styling.
+        LabelNode(const std::string& text,
+                  const Style&       style =Style());
 
-        /**
-         * Construct a label node with just a style
-         */
-        LabelNode(
-            MapNode*                mapNode,
-            const Style&            style );
+        LabelNode(const GeoPoint&    position,
+                  const std::string& text  ="",
+                  const Style&       style =Style());
 
-        /**
-         * Constructs a label node that is positioned some other way,
-         * typically by being in a subgraph under another transform
-         * somewhere.
-         */
+        //! Deserialize a label node
         LabelNode(
-            const std::string& text   ="",
-            const Style&       style =Style() );
-
-        /**
-         * Deserializes a label
-         */
-        LabelNode(
-            MapNode*              mapNode,
-            const Config&         conf,
+            const Config& conf,
             const osgDB::Options* dbOptions );
 
         /**
-         * Destructor
-         */
-        virtual ~LabelNode() { }
-
-        /**
          * Sets the text content.
          */
         void setText( const std::string& text );
@@ -130,7 +90,8 @@
         virtual bool supportsRenderBinDetails() const { return false; }
 
     protected:
-        void init(const Style& style);
+
+        virtual ~LabelNode() { }
 
         std::string              _text;
         Style                    _style;
@@ -144,9 +105,15 @@
         GeoPoint                 _geoPointProj;
 
         /** Copy constructor */
-        LabelNode(const LabelNode& rhs, const osg::CopyOp& op = osg::CopyOp::DEEP_COPY_ALL);
+        LabelNode(const LabelNode& rhs, const osg::CopyOp& op = osg::CopyOp::DEEP_COPY_ALL) { }
 
         void updateLayoutData();
+
+    private:
+        static osg::observer_ptr<osg::StateSet> s_geodeStateSet;
+        void construct();
+        void compile();
+
     };
 
 } } // namespace osgEarth::Annotation
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/LabelNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/LabelNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/LabelNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/LabelNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -26,12 +26,12 @@
 #include <osgEarthAnnotation/BboxDrawable>
 #include <osgEarthSymbology/Color>
 #include <osgEarthSymbology/BBoxSymbol>
-#include <osgEarth/Registry>
 #include <osgEarth/ShaderGenerator>
 #include <osgEarth/GeoMath>
 #include <osgEarth/Utils>
 #include <osgEarth/ScreenSpaceLayout>
 #include <osgEarth/Lighting>
+#include <osgEarth/Shaders>
 #include <osgText/Text>
 #include <osg/Depth>
 #include <osgUtil/IntersectionVisitor>
@@ -46,96 +46,81 @@
 
 //-------------------------------------------------------------------
 
-LabelNode::LabelNode(MapNode*            mapNode,
-                     const GeoPoint&     position,
-                     const std::string&  text,
-                     const Style&        style ) :
+// Globally shared stateset for LabelNode geometry
+osg::observer_ptr<osg::StateSet> LabelNode::s_geodeStateSet;
 
-GeoPositionNode( mapNode ),
-_text             ( text ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
+LabelNode::LabelNode() :
+GeoPositionNode()
 {
-    init( style );
-    setPosition( position );
+    construct();
+    compile();
 }
 
-LabelNode::LabelNode(MapNode*            mapNode,
-                     const GeoPoint&     position,
-                     const std::string&  text,
-                     const TextSymbol*   symbol ) :
-
-GeoPositionNode( mapNode ),
-_text             ( text ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
+LabelNode::LabelNode(const std::string& text,
+                     const Style& style) :
+GeoPositionNode()
 {
-    Style style;
-    style.add( const_cast<TextSymbol*>(symbol) );
-    init( style );
-    setPosition( position );
-}
+    construct();
 
-LabelNode::LabelNode(const std::string&  text,
-                     const Style&        style ) :
-GeoPositionNode(),
-_text             ( text ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
-{
-    init( style );
-}
+    _text = text;
+    _style = style;
 
-LabelNode::LabelNode(MapNode*            mapNode,
-                     const GeoPoint&     position,
-                     const Style&        style ) :
-GeoPositionNode   ( mapNode ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
-{
-    init( style );
-    setPosition( position );
+    compile();
 }
 
-LabelNode::LabelNode(MapNode*            mapNode,
-                     const Style&        style ) :
-GeoPositionNode   ( mapNode, GeoPoint::INVALID ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
+LabelNode::LabelNode(const GeoPoint& position,
+                     const std::string& text,
+                     const Style& style) :
+GeoPositionNode()
 {
-    init( style );
-}
+    construct();
 
-LabelNode::LabelNode(const LabelNode& rhs, const osg::CopyOp& op) :
-GeoPositionNode(rhs, op),
-_labelRotationRad(0.),
-_followFixedCourse(false)
-{
-    //nop - unused
+    _text = text;
+    _style = style;
+    setPosition(position);
+
+    compile();
 }
 
 void
-LabelNode::init( const Style& style )
+LabelNode::construct()
 {
-    osg::StateSet* ss = this->getOrCreateStateSet();
+    _labelRotationRad = 0.0f;
+    _followFixedCourse = false;
 
-    ScreenSpaceLayout::activate(ss);
-    
-    // Disable lighting for place nodes by default
-    ss->setDefine(OE_LIGHTING_DEFINE, osg::StateAttribute::OFF);
+    // This class makes its own shaders
+    ShaderGenerator::setIgnoreHint(this, true);
+
+    // Initialize the shared stateset as necessary
+    osg::ref_ptr<osg::StateSet> geodeStateSet;
+    if (s_geodeStateSet.lock(geodeStateSet) == false)
+    {
+        static Threading::Mutex s_mutex;
+        Threading::ScopedMutexLock lock(s_mutex);
+
+        if (s_geodeStateSet.lock(geodeStateSet) == false)
+        {
+            s_geodeStateSet = geodeStateSet = new osg::StateSet();
+
+            // draw in the screen-space bin
+            ScreenSpaceLayout::activate(geodeStateSet.get());
+
+            // completely disable depth buffer
+            geodeStateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1 ); 
+
+            // Disable lighting for place label bbox
+            geodeStateSet->setDefine(OE_LIGHTING_DEFINE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
+        }
+    }
 
     _geode = new osg::Geode();
+    _geode->setStateSet(geodeStateSet.get());
 
     // ensure that (0,0,0) is the bounding sphere control/center point.
     // useful for things like horizon culling.
     _geode->setComputeBoundingSphereCallback(new ControlPointCallback());
 
     getPositionAttitudeTransform()->addChild( _geode.get() );
-
-    osg::StateSet* stateSet = _geode->getOrCreateStateSet();
-    stateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1 );    
-
-    setStyle( style );
 }
 
 void
@@ -147,9 +132,9 @@
         return;
     }
 
-    for (unsigned int i=0; i < _geode->getNumDrawables(); i++)
+    for (unsigned int i=0; i < _geode->getNumChildren(); i++)
     {
-        osgText::Text* d = dynamic_cast<osgText::Text*>(_geode->getDrawable(i));
+        osgText::Text* d = dynamic_cast<osgText::Text*>(_geode->getChild(i));
         if ( d )
         {
             const TextSymbol* symbol = _style.get<TextSymbol>();
@@ -162,7 +147,6 @@
 
             d->setText(text, textEncoding);
 
-            d->dirtyDisplayList();
             _text = text;
             return;
         }
@@ -170,17 +154,9 @@
 }
 
 void
-LabelNode::setStyle( const Style& style )
+LabelNode::compile()
 {
-    if ( !_dynamic && getNumParents() > 0 )
-    {
-        OE_WARN << LC << "Illegal state: cannot change a LabelNode that is not dynamic" << std::endl;
-        return;
-    }
-
-    _geode->removeDrawables( 0, _geode->getNumDrawables() );
-
-    _style = style;
+    _geode->removeChildren(0, _geode->getNumChildren());
 
     const TextSymbol* symbol = _style.get<TextSymbol>();
 
@@ -210,27 +186,43 @@
     const BBoxSymbol* bboxsymbol = _style.get<BBoxSymbol>();
     if ( bboxsymbol && text )
     {
-        osg::Drawable* bboxGeom = new BboxDrawable( Utils::getBoundingBox(text), *bboxsymbol );
-        _geode->addDrawable(bboxGeom);
+        osg::Drawable* bboxGeom = new BboxDrawable(text->getBoundingBox(), *bboxsymbol );
+        if (bboxGeom)
+        {
+            _geode->addDrawable(bboxGeom);
+        }
     }
 
-    _geode->addDrawable(text);
-    _geode->setCullingActive(false);
+    if (text)
+    {
+        if (_dynamic)
+        {
+            text->setDataVariance(osg::Object::DYNAMIC);
+        }
+        _geode->addDrawable(text);
+    }
 
     applyStyle( _style );
 
-    setLightingIfNotSet( false );
-
-    Registry::shaderGenerator().run(
-        this,
-        "osgEarth.LabelNode",
-        Registry::stateSetCache() );
-
     updateLayoutData();
     dirty();
 }
 
 void
+LabelNode::setStyle( const Style& style )
+{
+    if ( !_dynamic && getNumParents() > 0 )
+    {
+        OE_WARN << LC << "Illegal state: cannot change a LabelNode that is not dynamic" << std::endl;
+        return;
+    }
+
+    _style = style;
+
+    compile();
+}
+
+void
 LabelNode::dirty()
 {
     GeoPositionNode::dirty();
@@ -253,9 +245,9 @@
     }
 
     // re-apply annotation drawable-level stuff as neccesary.
-    for (unsigned i = 0; i < _geode->getNumDrawables(); ++i)
+    for (unsigned i = 0; i < _geode->getNumChildren(); ++i)
     {
-        _geode->getDrawable(i)->setUserData(_dataLayout.get());
+        _geode->getChild(i)->setUserData(_dataLayout.get());
     }
     
     _dataLayout->setPriority(getPriority());
@@ -305,11 +297,17 @@
 {
     GeoPositionNode::setDynamic( dynamic );
 
-    osgText::Text* d = dynamic_cast<osgText::Text*>(_geode->getDrawable(0));
-    if ( d )
+    if (_geode.valid())
     {
-        d->setDataVariance( dynamic ? osg::Object::DYNAMIC : osg::Object::STATIC );
-    }    
+        for(unsigned i=0; i<_geode->getNumChildren(); ++i)
+        {
+            osg::Node* node = _geode->getChild(i);
+            if (node)
+            {
+                node->setDataVariance(dynamic ? osg::Object::DYNAMIC : osg::Object::STATIC);
+            }
+        }
+    }
 }
 
 //-------------------------------------------------------------------
@@ -317,29 +315,24 @@
 OSGEARTH_REGISTER_ANNOTATION( label, osgEarth::Annotation::LabelNode );
 
 
-LabelNode::LabelNode(MapNode*              mapNode,
-                     const Config&         conf,
+LabelNode::LabelNode(const Config&         conf,
                      const osgDB::Options* dbOptions ) :
-GeoPositionNode( mapNode, conf ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
+GeoPositionNode( conf, dbOptions )
 {
-    optional<Style> style;
-
-    conf.getObjIfSet( "style", style );
-    conf.getIfSet   ( "text",  _text );
+    construct();
 
-    init( *style );
+    conf.get("style", _style);
+    conf.get("text", _text);
 
-    setPosition(getPosition());
+    compile();
 }
 
 Config
 LabelNode::getConfig() const
 {
-    Config conf( "label" );
-    conf.add   ( "text",   _text );
-    conf.addObj( "style",  _style );
-
+    Config conf = GeoPositionNode::getConfig();
+    conf.key() = "label";
+    conf.set( "text",   _text );
+    conf.set( "style",  _style );
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/LocalGeometryNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/LocalGeometryNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/LocalGeometryNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/LocalGeometryNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 
 #include <osgEarthAnnotation/GeoPositionNode>
 #include <osgEarth/MapNode>
+#include <osgEarth/GeometryClamper>
 #include <osgEarthSymbology/Geometry>
 #include <osgEarthSymbology/Style>
 
@@ -36,36 +37,23 @@
      * Simple node that renders geometry into a scene graph node. The geometry
      * is in a local tangent plane that may be positioned somewhere on the 
      * Map's surface.
+     *
+     * As a GeoPositionNode, the LGN's main location is controlled by the 
+     * setPosition method. Terrain following is controlled by using a GeoPoint
+     * with an altitude value relative to the terrain.
      */
     class OSGEARTHANNO_EXPORT LocalGeometryNode : public GeoPositionNode
     {
     public:
-        /**
-         * Constructs a new localized node that renders a Geometry
-         */
+        //! Construct a new empty LocalGeometryNode
+        LocalGeometryNode();
+        
+        //! Construct a new empty LocalGeometryNode and assign it a geoemtry and style
         LocalGeometryNode( 
-            MapNode*     mapNode,
             Geometry*    geom, 
             const Style& style );
 
         /**
-         * Construcst a new localized node that renders a pre-built
-         * node (in a local cartesian space)
-         */
-        LocalGeometryNode( 
-            MapNode*     mapNode,
-            osg::Node*   node, 
-            const Style& style  =Style() );
-
-        /**
-         * Construct an LGN connected to a mapnode.
-         */
-        LocalGeometryNode( MapNode* node );
-
-
-        virtual ~LocalGeometryNode() { }
-
-        /**
          * Gets the Style used to create thenode.
          */
         const Style& getStyle() const { return _style; }
@@ -85,19 +73,12 @@
          */
         void setGeometry( Geometry* geom );
 
-        /**
-         * Gets the external node attached to this annotation (if applicable)
-         */
-        osg::Node* getNode() { return _node.get(); }
 
-        /**
-         * Sets an external node to attach to this annotation
-         */
-        void setNode( osg::Node* node );
+    public: // GeoPositionNode
 
-    public:
+        virtual void setPosition(const GeoPoint&);
 
-        virtual void setLocalOffset(const osg::Vec3f& pos);
+    public: // AnnotationNode
 
         virtual void setMapNode(MapNode*);
 
@@ -107,40 +88,32 @@
          * Constructs an LGN from a serialized Config.
          */
         LocalGeometryNode(
-            MapNode*              mapNode,
             const Config&         conf,
-            const osgDB::Options* dbOptions );
+            const osgDB::Options* dbOptions);
 
         virtual Config getConfig() const;
 
     public: // osg::Node
 
-        //virtual osg::BoundingSphere computeBound() const;
-
         virtual void traverse(osg::NodeVisitor&);
 
-    protected: // GeoPositionNode
-
-        virtual void dirty();
-
     protected:
-        LocalGeometryNode();
+
+        virtual ~LocalGeometryNode() { }
 
         Style                        _style;
         osg::ref_ptr<osg::Node>      _node;
         osg::ref_ptr<Geometry>       _geom;
-        bool                         _clampDirty;
+        bool                         _clampInUpdateTraversal;
+        bool                         _perVertexClampingEnabled;
         
         typedef TerrainCallbackAdapter<LocalGeometryNode> ClampCallback;
         osg::ref_ptr<ClampCallback> _clampCallback;
-        bool _clampRelative;
-        //mutable osg::Polytope _boundingPT;
-
-        void initNode();
-        void initGeometry(const osgDB::Options*);
-        void init(const osgDB::Options*);
+        GeometryClamper::LocalData _clamperData;
 
-        void applyAltitudeSymbology(const Style&);
+        void compileGeometry();
+        void togglePerVertexClamping();
+        void reclamp();
 
     public:
         void onTileAdded(
@@ -151,6 +124,12 @@
         virtual void clamp(
             osg::Node*     graph,
             const Terrain* terrain);
+
+    private:
+
+        void construct();
+
+        GeoPoint _lastPosition;
     };
 
 } } // namespace osgEarth::Annotation
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/LocalGeometryNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/LocalGeometryNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/LocalGeometryNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/LocalGeometryNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -38,54 +38,26 @@
 
 
 LocalGeometryNode::LocalGeometryNode() :
-GeoPositionNode(),
-_clampRelative(false),
-_clampDirty(false)
+GeoPositionNode()
 {
-    //nop - unused
+    construct();
 }
 
-LocalGeometryNode::LocalGeometryNode(MapNode* mapNode) :
-GeoPositionNode(),
-_clampRelative(false),
-_clampDirty(false)
-{
-    LocalGeometryNode::setMapNode( mapNode );
-    init( 0L );
-}
-
-LocalGeometryNode::LocalGeometryNode(MapNode*     mapNode,
-                                     Geometry*    geom,
-                                     const Style& style) :
-GeoPositionNode(),
-_geom    ( geom ),
-_style   ( style ),
-_clampRelative(false),
-_clampDirty(false)
-{
-    LocalGeometryNode::setMapNode( mapNode );
-    init( 0L );
-}
-
-
-LocalGeometryNode::LocalGeometryNode(MapNode*     mapNode,
-                                     osg::Node*   node,
+LocalGeometryNode::LocalGeometryNode(Geometry*    geom,
                                      const Style& style) :
-GeoPositionNode(),
-_node    ( node ),
-_style   ( style ),
-_clampRelative(false),
-_clampDirty(false)
+GeoPositionNode()
 {
-    LocalGeometryNode::setMapNode( mapNode );
-    init( 0L );
+    construct();
+    setStyle(style);
+    setGeometry(geom);
 }
 
 void
-LocalGeometryNode::setLocalOffset(const osg::Vec3f& pos)
+LocalGeometryNode::construct()
 {
-    GeoPositionNode::setLocalOffset(pos);
-    dirty();
+    _geom = 0L;
+    _clampInUpdateTraversal = false;
+    _perVertexClampingEnabled = false;
 }
 
 void
@@ -94,139 +66,150 @@
     if ( mapNode != getMapNode() )
     {
         GeoPositionNode::setMapNode( mapNode );
-        init(0L);
+        compileGeometry();
     }
 }
 
 void
-LocalGeometryNode::initNode()
+LocalGeometryNode::compileGeometry()
 {
-    osgEarth::clearChildren( getPositionAttitudeTransform() );
-
-    if ( _node.valid() )
+    // clear out existing geometry first
+    if (_node.valid())
     {
-        _node = AnnotationUtils::installOverlayParent( _node.get(), _style );
-
-        getPositionAttitudeTransform()->addChild( _node.get() );
-
-        applyRenderSymbology( getStyle() );
-
-        setLightingIfNotSet( getStyle().has<ExtrusionSymbol>() );
+        getPositionAttitudeTransform()->removeChild(_node.get());
     }
-}
-
-
-void
-LocalGeometryNode::initGeometry(const osgDB::Options* dbOptions)
-{
-    osgEarth::clearChildren( getPositionAttitudeTransform() );
 
+    // any old clamping data is out of date, so clear it
+    _clamperData.clear();
+    _perVertexClampingEnabled = false;
+    
     if ( _geom.valid() )
     {
         osg::ref_ptr<Session> session;
         if ( getMapNode() )
-            session = new Session(getMapNode()->getMap(), 0L, 0L, dbOptions);
-        
-        GeometryCompiler gc;
-        osg::ref_ptr<osg::Node> node = gc.compile( _geom.get(), getStyle(), FilterContext(session.get()) );
-        if ( node.valid() )
         {
-            node = AnnotationUtils::installOverlayParent( node.get(), getStyle() );
-
-            getPositionAttitudeTransform()->addChild( node.get() );
+            session = new Session(getMapNode()->getMap(), 0L);
+        }
 
-            applyRenderSymbology( getStyle() );
+        AltitudeSymbol* alt = _style.get<AltitudeSymbol>();
 
-            applyAltitudeSymbology( getStyle() );
+        GeometryCompilerOptions options;
+        if (alt == NULL ||
+            alt->technique().isSet() == false ||
+            alt->technique().isSetTo(alt->TECHNIQUE_SCENE))
+        {        
+            options.ignoreAltitudeSymbol() = true;
         }
-    }
-}
 
+        GeometryCompiler gc(options);
 
-void 
-LocalGeometryNode::init(const osgDB::Options* options)
-{    
-    if ( _node.valid() )
-    {
-        initNode();
-    }
-    else
-    {
-        initGeometry( options );
+        _node = gc.compile( _geom.get(), getStyle(), FilterContext(session.get()) );
+        if ( _node.valid() )
+        {
+            // deal with draping or gpu-clamping settings
+            _node = AnnotationUtils::installOverlayParent( _node.get(), getStyle() );
+
+            // install the new geometry under the geotransforms
+            getPositionAttitudeTransform()->addChild( _node.get() );
+
+            // re-assess support for per vertex clamping
+            togglePerVertexClamping();
+
+            // apply current style
+            setDefaultLighting( getStyle().has<ExtrusionSymbol>() );
+            applyRenderSymbology( getStyle() );
+        }
     }
 }
 
-
 void
 LocalGeometryNode::setStyle( const Style& style )
 {
     _style = style;
-    init( 0L );
+    compileGeometry();
 }
 
-
 void
-LocalGeometryNode::setNode( osg::Node* node )
+LocalGeometryNode::setGeometry( Geometry* geom )
 {
-    _node = node;
-    _geom = 0L;
-    initNode();
+    _geom = geom;
+    compileGeometry();
 }
 
-
+// GeoPositionNode override
 void
-LocalGeometryNode::setGeometry( Geometry* geom )
+LocalGeometryNode::setPosition(const GeoPoint& pos)
 {
-    _geom = geom;
-    _node = 0L;
-    initGeometry(0L);
+    GeoPositionNode::setPosition(pos);
+
+    // detect a position change because it will require a re-clamp
+    // if per-vertex clamping is enabled.
+    bool posXYchanged = false;
+
+    if (_lastPosition.x() != getPosition().x() ||
+        _lastPosition.y() != getPosition().y())
+    {
+        posXYchanged = true;
+    }
+
+    _lastPosition = getPosition();
+
+    // since the altitude mode may have changed, assess whether
+    // to toggle the per-vertex clamping
+    togglePerVertexClamping();
+
+    if (posXYchanged)
+    {
+        reclamp();
+    }
 }
 
 void
-LocalGeometryNode::applyAltitudeSymbology(const Style& style)
+LocalGeometryNode::togglePerVertexClamping()
 {
-    // deal with scene clamping symbology.
-    if ( getMapNode() )
-    {
-        if ( _clampCallback.valid() )
+    const AltitudeSymbol* alt = _style.get<AltitudeSymbol>();
+    bool needPVC =
+        alt &&
+        alt->binding() == alt->BINDING_VERTEX &&
+        (alt->technique().isSet() == false || alt->technique() == alt->TECHNIQUE_SCENE) &&
+        getPosition().altitudeMode() == ALTMODE_RELATIVE;
+
+    if (needPVC && !_perVertexClampingEnabled)
+    {    
+        osg::ref_ptr<Terrain> terrain = getGeoTransform()->getTerrain();
+        if (terrain.valid())
         {
-            getMapNode()->getTerrain()->removeTerrainCallback( _clampCallback.get() );
-            _clampCallback = 0L;
+            if (!_clampCallback.valid())
+                _clampCallback = new ClampCallback(this);
+
+            if (_clampCallback->referenceCount() == 1)
+                terrain->addTerrainCallback(_clampCallback.get());
+
+            // all drawables must be dynamic since we are altering the verts
+            SetDataVarianceVisitor sdv(osg::Object::DYNAMIC);
+            this->accept(sdv);
+
+            _perVertexClampingEnabled = true;
+
+            reclamp();
         }
+    }
 
-        const AltitudeSymbol* alt = style.get<AltitudeSymbol>();
-        if ( alt && alt->technique() == alt->TECHNIQUE_SCENE )
+    else if (!needPVC && _perVertexClampingEnabled)
+    {
+        osg::ref_ptr<Terrain> terrain = getGeoTransform()->getTerrain();
+        if (terrain.valid())
         {
-            if ( alt->binding() == alt->BINDING_CENTROID )
-            {
-                // centroid scene clamping? let GeoTransform do its thing.
-                getGeoTransform()->setAutoRecomputeHeights( true );
-            }
-
-            else if ( alt->binding() == alt->BINDING_VERTEX )
-            {
-                // per vertex clamping? disable the GeoTransform's clamping and take over.
-                getGeoTransform()->setAutoRecomputeHeights( false );
-
-                if ( !_clampCallback.valid() )
-                {
-                    _clampCallback = new ClampCallback(this);
-                }
-
-                if ( alt->clamping() == alt->CLAMP_TO_TERRAIN )
-                {
-                    _clampRelative = false;
-                    getMapNode()->getTerrain()->addTerrainCallback( _clampCallback.get() );
-                }
-
-                else if ( alt->clamping() == alt->CLAMP_RELATIVE_TO_TERRAIN )
-                {
-                    _clampRelative = true;
-                    getMapNode()->getTerrain()->addTerrainCallback( _clampCallback.get() );
-                }
-            }
+            if (_clampCallback.valid())
+                terrain->removeTerrainCallback(_clampCallback.get());
+
+            // revert to original vertex array if necessary:
+            GeometryClamper clamper(_clamperData);
+            clamper.setRevert(true);
+            this->accept(clamper);
+
+            _perVertexClampingEnabled = false;
         }
-        dirty();
     }
 }
 
@@ -236,21 +219,18 @@
                                TerrainCallbackContext& context)
 {
     // If we are already set to clamp, ignore this
-    if (_clampDirty)
+    if (_clampInUpdateTraversal)
         return;
 
     bool needsClamp;
 
-    // This was faster, but less precise and resulted in a lot of unnecessary clamp attempts:
-    //if ( _boundingPT.contains(patch->getBound()) )
-
     // Does the tile key's polytope intersect the world bounds or this object?
     // (taking getParent(0) gives the world-tranformed bounds vs. local bounds)
     if (key.valid())
     {
         osg::Polytope tope;
         key.getExtent().createPolytope(tope);
-        needsClamp = tope.contains(this->getParent(0)->getBound());
+        needsClamp = tope.contains(getBound());
     }
     else
     {
@@ -260,27 +240,45 @@
 
     if (needsClamp)
     {
-        //clamp(graph, context.getTerrain());
-        _clampDirty = true;
+        _clampInUpdateTraversal = true;
         ADJUST_UPDATE_TRAV_COUNT(this, +1);
+
         OE_DEBUG << LC << "LGN: clamp requested b/c of key " << key.str() << std::endl;
     }
 }
 
 void
+LocalGeometryNode::reclamp()
+{
+    if (_perVertexClampingEnabled)
+    {
+        osg::ref_ptr<Terrain> terrain = getGeoTransform()->getTerrain();
+        if (terrain.valid())
+        {
+            clamp(terrain->getGraph(), terrain.get());
+        }
+    }
+}
+
+void
 LocalGeometryNode::clamp(osg::Node* graph, const Terrain* terrain)
 {
     if (terrain && graph)
     {
-        GeometryClamper clamper;
+        GeometryClamper clamper(_clamperData);
 
+        // The data to clamp to
         clamper.setTerrainPatch( graph );
         clamper.setTerrainSRS( terrain ? terrain->getSRS() : 0L );
-        clamper.setPreserveZ( _clampRelative );
-        //clamper.setOffset( getPosition().alt() );
 
-        this->accept( clamper );
+        // Since the GeometryClamper will use the matrix stack to
+        // resolve vertex locations, and that matrix stack will incorporate
+        // the GeoTransform's altitude, we need to compensate by adding the
+        // altitude back in as an offset.
+        clamper.setOffset(getPosition().alt());
 
+        this->accept( clamper );
+        
         OE_DEBUG << LC << "LGN: clamped.\n";
     }
 }
@@ -288,99 +286,35 @@
 void
 LocalGeometryNode::traverse(osg::NodeVisitor& nv)
 {
-    if (nv.getVisitorType() == nv.UPDATE_VISITOR && _clampDirty)
+    if (nv.getVisitorType() == nv.UPDATE_VISITOR && _clampInUpdateTraversal)
     {
-        osg::ref_ptr<Terrain> terrain = getGeoTransform()->getTerrain();
-        if (terrain.valid())
-            clamp(terrain->getGraph(), terrain.get());
+        reclamp();
 
+        _clampInUpdateTraversal = false;
         ADJUST_UPDATE_TRAV_COUNT(this, -1);
-        _clampDirty = false;
     }
     GeoPositionNode::traverse(nv);
 }
 
-#if 0
-osg::BoundingSphere
-LocalGeometryNode::computeBound() const
-{
-    osg::BoundingSphere bs = AnnotationNode::computeBound();
-    
-    // NOTE: this is the same code found in Feature.cpp. Consolidate?
-
-    _boundingPT.clear();
-
-    // add planes for the four sides of the BS. Normals point inwards.
-    _boundingPT.add( osg::Plane(osg::Vec3d( 1, 0,0), osg::Vec3d(-bs.radius(),0,0)) );
-    _boundingPT.add( osg::Plane(osg::Vec3d(-1, 0,0), osg::Vec3d( bs.radius(),0,0)) );
-    _boundingPT.add( osg::Plane(osg::Vec3d( 0, 1,0), osg::Vec3d(0, -bs.radius(),0)) );
-    _boundingPT.add( osg::Plane(osg::Vec3d( 0,-1,0), osg::Vec3d(0,  bs.radius(),0)) );
-
-    const SpatialReference* srs = getPosition().getSRS();
-    if ( srs )
-    {
-        // for a projected feature, we're done. For a geocentric one, transform the polytope
-        // into world (ECEF) space.
-        if ( srs->isGeographic() && !srs->isPlateCarre() )
-        {
-            const osg::EllipsoidModel* e = srs->getEllipsoid();
-
-            // add a bottom cap, unless the bounds are sufficiently large.
-            double minRad = std::min(e->getRadiusPolar(), e->getRadiusEquator());
-            double maxRad = std::max(e->getRadiusPolar(), e->getRadiusEquator());
-            double zeroOffset = bs.center().length();
-            if ( zeroOffset > minRad * 0.1 )
-            {
-                _boundingPT.add( osg::Plane(osg::Vec3d(0,0,1), osg::Vec3d(0,0,-maxRad+zeroOffset)) );
-            }
-        }
-
-        // transform the clipping planes ito ECEF space
-        GeoPoint refPoint;
-        refPoint.fromWorld( srs, bs.center() );
-
-        osg::Matrix local2world;
-        refPoint.createLocalToWorld( local2world );
-
-        _boundingPT.transform( local2world );
-    }
-
-    return bs;
-}
-#endif
-
-void
-LocalGeometryNode::dirty()
-{
-    GeoPositionNode::dirty();
-
-    // re-clamp the geometry if necessary.
-    if ( _clampCallback.valid() && getMapNode() )
-    {
-        clamp( getMapNode()->getTerrain()->getGraph(), getMapNode()->getTerrain() );
-    }
-}
-
 //-------------------------------------------------------------------
 
 OSGEARTH_REGISTER_ANNOTATION( local_geometry, osgEarth::Annotation::LocalGeometryNode );
 
 
-LocalGeometryNode::LocalGeometryNode(MapNode*              mapNode,
-                                     const Config&         conf,
-                                     const osgDB::Options* dbOptions) :
-GeoPositionNode( mapNode, conf ),
-_clampRelative(false),
-_clampDirty(false)
+LocalGeometryNode::LocalGeometryNode(const Config&         conf,
+                                     const osgDB::Options* options) :
+GeoPositionNode(conf, options)
 {
+    construct();
+
+    conf.get( "style", _style );
+
     if ( conf.hasChild("geometry") )
     {
         Config geomconf = conf.child("geometry");
-        _geom = GeometryUtils::geometryFromWKT( geomconf.value() );
+        osg::ref_ptr<Geometry> geom = GeometryUtils::geometryFromWKT( geomconf.value() );
+        setGeometry(geom.get());
     }
-
-    conf.getObjIfSet( "style", _style );
-    init( dbOptions );
 }
 
 Config
@@ -390,12 +324,10 @@
     conf.key() = "local_geometry";
 
     if ( !_style.empty() )
-        conf.addObj( "style", _style );
+        conf.set( "style", _style );
 
     if ( _geom.valid() )
-    {
-        conf.add( Config("geometry", GeometryUtils::geometryToWKT(_geom.get())) );
-    }
+        conf.set( Config("geometry", GeometryUtils::geometryToWKT(_geom.get())) );
 
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ModelNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ModelNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ModelNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ModelNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -46,7 +46,7 @@
         ModelNode(
             MapNode*              mapNode,
             const Style&          style,
-            const osgDB::Options* dbOptions   =0L );
+            const osgDB::Options* readOptoins =0L );
 
         /**
          * Sets a new style and rebuilds the node.
@@ -70,20 +70,23 @@
          * (internal method).
          */
         ModelNode(
-            MapNode*              mapNode,
             const Config&         conf,
-            const osgDB::Options* dbOptions );
+            const osgDB::Options* readOptions );
 
         virtual Config getConfig() const;
 
     protected:
 
         Style _style;
-        osg::ref_ptr<const osgDB::Options> _dbOptions;
+        osg::ref_ptr<const osgDB::Options> _readOptions;
 
-        void init();
+        void compileModel();
 
         virtual ~ModelNode() { }
+
+    private:
+
+        void construct();
     };
 
 } } // namespace osgEarth::Annotation
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ModelNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ModelNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/ModelNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/ModelNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -44,37 +44,35 @@
 
 ModelNode::ModelNode(MapNode*              mapNode,
                      const Style&          style,
-                     const osgDB::Options* dbOptions ) :
-GeoPositionNode( mapNode ),
-_style       ( style ),
-_dbOptions   ( dbOptions )
+                     const osgDB::Options* readOptions ) :
+GeoPositionNode(),
+_style( style ),
+_readOptions( readOptions )
 {
-    init();
+    construct();
+    setMapNode(mapNode);
+    compileModel();
 }
 
+void
+ModelNode::construct()
+{
+    // nop
+}
 
 void
 ModelNode::setStyle(const Style& style)
 {
     _style = style;
-    init();
-    setPosition(getPosition());
+    compileModel();
 }
 
 void
-ModelNode::init()
+ModelNode::compileModel()
 {
     osgEarth::clearChildren( getPositionAttitudeTransform() );
 
     osg::ref_ptr<const ModelSymbol> sym = _style.get<ModelSymbol>();
-    
-    // backwards-compatibility: support for MarkerSymbol (deprecated)
-    if ( !sym.valid() && _style.has<MarkerSymbol>() )
-    {
-        OE_WARN << LC << "MarkerSymbol is deprecated, please remove it\n";
-        osg::ref_ptr<InstanceSymbol> temp = _style.get<MarkerSymbol>()->convertToInstanceSymbol();
-        sym = dynamic_cast<const ModelSymbol*>( temp.get() );
-    }
 
     if ( sym.valid() )
     {
@@ -90,12 +88,12 @@
 
                 if ( sym->uriAliasMap()->empty() )
                 {
-                    node = uri.getNode( _dbOptions.get() );
+                    node = uri.getNode( _readOptions.get() );
                 }
                 else
                 {
                     // install an alias map if there's one in the symbology.
-                    osg::ref_ptr<osgDB::Options> tempOptions = Registry::instance()->cloneOrCreateOptions(_dbOptions.get());
+                    osg::ref_ptr<osgDB::Options> tempOptions = Registry::instance()->cloneOrCreateOptions(_readOptions.get());
                     tempOptions->setReadFileCallback( new URIAliasMapReadCallback(*sym->uriAliasMap(), uri.full()) );
                     node = uri.getNode( tempOptions.get() );
                 }
@@ -138,7 +136,10 @@
                 if ( sym->scaleZ().isSet() )
                     scale.z() = sym->scaleZ()->eval();
 
-                getPositionAttitudeTransform()->setScale( scale );
+                if (scale != osg::Vec3d(1,1,1))
+                {
+                    getPositionAttitudeTransform()->setScale( scale );
+                }
 
                 // auto scaling?
                 if ( sym->autoScale() == true )
@@ -185,18 +186,22 @@
 OSGEARTH_REGISTER_ANNOTATION( model, osgEarth::Annotation::ModelNode );
 
 
-ModelNode::ModelNode(MapNode* mapNode, const Config& conf, const osgDB::Options* dbOptions) :
-GeoPositionNode    ( mapNode, conf ),
-_dbOptions   ( dbOptions )
+ModelNode::ModelNode(const Config& conf, const osgDB::Options* readOptions) :
+GeoPositionNode(conf, readOptions),
+_readOptions(readOptions)
 {
-    conf.getObjIfSet( "style", _style );
+    construct();
+
+    conf.get( "style", _style );
 
     std::string uri = conf.value("url");
     if ( !uri.empty() )
         _style.getOrCreate<ModelSymbol>()->url() = StringExpression(uri);
 
-    init();
-    setPosition(getPosition());
+    //init();
+    //setPosition(getPosition());
+
+    compileModel();
 }
 
 Config
@@ -206,7 +211,7 @@
     conf.key() = "model";
 
     if ( !_style.empty() )
-        conf.addObj( "style", _style );
+        conf.set( "style", _style );
 
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/PlaceNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/PlaceNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/PlaceNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/PlaceNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -40,58 +40,24 @@
     public:
         META_AnnotationNode(osgEarthAnnotation, PlaceNode);
 
-        /**
-         * Constructs a new place node
-         *
-         * @param mapNode   MapNode that helps position this annotation
-         * @param position  Initial location of the annotation
-         * @param iconImage Image of the place icon
-         * @param labelText Text to place next to the icon
-         * @param style     Optional style settings.
-         */
-        PlaceNode(
-            MapNode*           mapNode,
-            const GeoPoint&    position,
-            osg::Image*        iconImage,
-            const std::string& labelText,
-            const Style&       style =Style() );
-
-        /**
-         * Constructs a new place node. You can specify an icon marker by
-         * adding a IconSymbol to the Style.
-         *
-         * @param mapNode   MapNode that helps position this annotation
-         * @param position  Initial location of the annotation
-         * @param labelText Text to place next to the icon
-         * @param style     Optional style settings.
-         */
-        PlaceNode(
-            MapNode*           mapNode,
-            const GeoPoint&    position,
-            const std::string& labelText,
-            const Style&       style =Style() );
+        //! Constructs a new empty place node.
+        PlaceNode();
 
-        /**
-         * Constuct a new place node entirely from symbology
-         *
-         * @param mapNode   MapNode that helps position this annotation
-         * @param position  Initial location of the annotation
-         * @param style     Style settings.
-         * @param dbOptions I/O options for embedded resource loading
-         */
-        PlaceNode(
-            MapNode*              mapNode,
-            const GeoPoint&       position,
-            const Style&          style,
-            const osgDB::Options* dbOptions);
+        //! Construct new node with text content and default styling.
+        PlaceNode(const std::string& text,
+                  const Style&       style =Style(),
+                  osg::Image*        image =0L);
+        
+        //! Construct new node with position, text content and default styling.
+        PlaceNode(const GeoPoint&    position,
+                  const std::string& text  ="",
+                  const Style&       style =Style(),
+                  osg::Image*        image =0L);
 
-        /**
-         * Deserializes a place node from Config data. (internal method)
-         */
+        //! Deserialize a place node.
         PlaceNode(
-            MapNode*              mapNode,
-            const Config&         conf,
-            const osgDB::Options* dbOptions );
+            const Config& conf,
+            const osgDB::Options* readOptions );
 
         /**
          * Image to use for the icon
@@ -108,7 +74,8 @@
         /**
          * Style (for text and placement)
          */
-        void setStyle( const Style& style );
+        void setStyle(const Style& style );
+        void setStyle(const Style& style, const osgDB::Options* readOptions);
         const Style& getStyle() const { return _style; }
 
     public: // GeoPositionNode override
@@ -128,11 +95,14 @@
 
         virtual ~PlaceNode() { }
 
-        osg::ref_ptr<osg::Image>           _image;
-        std::string                        _text;
-        Style                              _style;
-        class osg::Geode*                  _geode;
-        osg::ref_ptr<const osgDB::Options> _dbOptions;
+        osg::ref_ptr<osg::Image>            _image;
+        std::string                         _text;
+        Style                               _style;
+        osg::Group*                         _geode;
+        osg::Geometry*                      _imageDrawable;
+        osg::Drawable*                      _bboxDrawable;
+        osgText::Text*                      _textDrawable;
+        osg::ref_ptr<const osgDB::Options>  _readOptions;
         osg::ref_ptr<ScreenSpaceLayoutData> _dataLayout;
 
         /** rotation of the label **/
@@ -141,18 +111,24 @@
         GeoPoint                 _geoPointLoc;
         GeoPoint                 _geoPointProj;
 
-        void init();
+        //void init();
         void updateLayoutData();
+        void construct();
+        void compile();
 
     public:
-        // required by META_Node, but this object is not cloneable
-        PlaceNode();
 
         void setConfig(const Config& conf);
 
     private:
+
         PlaceNode(const PlaceNode& rhs, const osg::CopyOp& op =osg::CopyOp::DEEP_COPY_ALL) : GeoPositionNode(rhs, op) { }
 
+    private:
+        static osg::observer_ptr<osg::StateSet> s_geodeStateSet;
+        static osg::observer_ptr<osg::StateSet> s_imageStateSet;
+
+        osg::ref_ptr<osg::StateSet> _geodeStateSet, _imageStateSet;
     };
 
 } } // namespace osgEarth::Annotation
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/PlaceNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/PlaceNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/PlaceNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/PlaceNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -24,15 +24,13 @@
 #include <osgEarthAnnotation/AnnotationUtils>
 #include <osgEarthAnnotation/AnnotationRegistry>
 #include <osgEarthAnnotation/BboxDrawable>
-#include <osgEarthFeatures/BuildTextFilter>
-#include <osgEarthFeatures/LabelSource>
 #include <osgEarth/Utils>
-#include <osgEarth/Registry>
-#include <osgEarth/ShaderGenerator>
 #include <osgEarth/GeoMath>
 #include <osgEarth/ScreenSpaceLayout>
-#include <osgEarth/NodeUtils>
 #include <osgEarth/Lighting>
+#include <osgEarth/Shaders>
+#include <osgEarth/VirtualProgram>
+#include <osgEarth/ShaderGenerator>
 
 #include <osg/Depth>
 #include <osgText/Text>
@@ -41,86 +39,138 @@
 
 using namespace osgEarth;
 using namespace osgEarth::Annotation;
-using namespace osgEarth::Features;
 using namespace osgEarth::Symbology;
 
-PlaceNode::PlaceNode() :
-_geode            ( 0L ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
+namespace
 {
-    //nop
+    const char* iconVS =
+        "#version " GLSL_VERSION_STR "\n"
+        "out vec2 oe_PlaceNode_texcoord; \n"
+        "void oe_PlaceNode_icon_VS(inout vec4 vertex) \n"
+        "{ \n"
+        "    oe_PlaceNode_texcoord = gl_MultiTexCoord0.st; \n"
+        "} \n";
+
+    const char* iconFS =
+        "#version " GLSL_VERSION_STR "\n"
+        "in vec2 oe_PlaceNode_texcoord; \n"
+        "uniform sampler2D oe_PlaceNode_tex; \n"
+        "void oe_PlaceNode_icon_FS(inout vec4 color) \n"
+        "{ \n"
+        "    color = texture(oe_PlaceNode_tex, oe_PlaceNode_texcoord); \n"
+        "} \n";
 }
 
-PlaceNode::PlaceNode(MapNode*           mapNode,
-                     const GeoPoint&    position,
-                     osg::Image*        image,
-                     const std::string& text,
-                     const Style&       style ) :
+osg::observer_ptr<osg::StateSet> PlaceNode::s_geodeStateSet;
+osg::observer_ptr<osg::StateSet> PlaceNode::s_imageStateSet;
 
-GeoPositionNode( mapNode ),
-_image   ( image ),
-_text    ( text ),
-_style   ( style ),
-_geode            ( 0L ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
+PlaceNode::PlaceNode() :
+GeoPositionNode()
 {
-    init();
-    setPosition(position);
+    construct();
+    compile();
 }
 
-PlaceNode::PlaceNode(MapNode*           mapNode,
-                     const GeoPoint&    position,
-                     const std::string& text,
-                     const Style&       style ) :
-
-GeoPositionNode( mapNode ),
-_text    ( text ),
-_style   ( style ),
-_geode            ( 0L ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
+PlaceNode::PlaceNode(const std::string& text,
+                     const Style& style,
+                     osg::Image* image) :
+GeoPositionNode()
 {
-    init();
-    setPosition(position);
+    construct();
+
+    _text = text;
+    _image = image;
+    _style = style;
+
+    compile();
 }
 
-PlaceNode::PlaceNode(MapNode*              mapNode,
-                     const GeoPoint&       position,
-                     const Style&          style,
-                     const osgDB::Options* dbOptions ) :
-GeoPositionNode ( mapNode ),
-_style    ( style ),
-_dbOptions        ( dbOptions ),
-_geode            ( 0L ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
+PlaceNode::PlaceNode(const GeoPoint& position,
+                     const std::string& text,
+                     const Style& style,
+                     osg::Image* image) :
+GeoPositionNode()
 {
-    init();
+    construct();
+
+    _text = text;
+    _image = image;
+    _style = style;
     setPosition(position);
+
+    compile();
 }
 
 void
-PlaceNode::init()
+PlaceNode::construct()
 {
-    osg::StateSet* ss = this->getOrCreateStateSet();
+    _geode = 0L;
+    _labelRotationRad = 0.0f;
+    _followFixedCourse = false;
+    _imageDrawable = 0L;
+    _bboxDrawable = 0L;
+    _textDrawable = 0L;
+
+    // This class makes its own shaders
+    ShaderGenerator::setIgnoreHint(this, true);
+
+    // Construct the shared state sets
+    if (s_geodeStateSet.lock(_geodeStateSet) == false)
+    {
+        static Threading::Mutex s_mutex;
+        Threading::ScopedMutexLock lock(s_mutex);
+
+        if (s_geodeStateSet.lock(_geodeStateSet) == false)
+        {
+            s_geodeStateSet = _geodeStateSet = new osg::StateSet();
 
-    // Draw place nodes in screen space.
-    ScreenSpaceLayout::activate(ss);
+            // draw in the screen-space bin
+            ScreenSpaceLayout::activate(_geodeStateSet.get());
 
-    // Disable lighting for place nodes by default
-    ss->setDefine(OE_LIGHTING_DEFINE, osg::StateAttribute::OFF);
+            // completely disable depth buffer
+            _geodeStateSet->setAttributeAndModes(new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1);
 
-    osgEarth::clearChildren( getPositionAttitudeTransform() );
+            // Disable lighting for place nodes by default
+            _geodeStateSet->setDefine(OE_LIGHTING_DEFINE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
+        }
+    }
 
-    _geode = new osg::Geode();
+    if (s_imageStateSet.lock(_imageStateSet) == false)
+    {
+        static Threading::Mutex s_mutex;
+        Threading::ScopedMutexLock lock(s_mutex);
+
+        if (s_imageStateSet.lock(_imageStateSet) == false)
+        {
+            s_imageStateSet = _imageStateSet = new osg::StateSet();
+            VirtualProgram* vp = VirtualProgram::getOrCreate(_imageStateSet.get());
+            vp->setName("PlaceNode::imageStateSet");
+            vp->setFunction("oe_PlaceNode_icon_VS", iconVS, ShaderComp::LOCATION_VERTEX_MODEL);
+            vp->setFunction("oe_PlaceNode_icon_FS", iconFS, ShaderComp::LOCATION_FRAGMENT_COLORING);
+            _imageStateSet->addUniform(new osg::Uniform("oe_PlaceNode_tex", 0));
+        }
+    }
+}
+
+void
+PlaceNode::compile()
+{
+    osg::Group* pat = getPositionAttitudeTransform();
+    pat->removeChildren(0, pat->getNumChildren());
+
+    _geode = new osg::Group();
+    _geode->setCullingActive(false);
+    _geode->setStateSet(_geodeStateSet.get());
 
     // ensure that (0,0,0) is the bounding sphere control/center point.
     // useful for things like horizon culling.
     _geode->setComputeBoundingSphereCallback(new ControlPointCallback());
 
-    osg::Drawable* text = 0L;
+    getPositionAttitudeTransform()->addChild(_geode);
+
+    _imageDrawable = 0L;
+    _bboxDrawable = 0L;
+    _textDrawable = 0L;
 
     const TextSymbol* symbol = _style.get<TextSymbol>();
 
@@ -148,14 +198,12 @@
 
     osg::ref_ptr<const InstanceSymbol> instance = _style.get<InstanceSymbol>();
 
-    // backwards compability, support for deprecated MarkerSymbol
-    if ( !instance.valid() && _style.has<MarkerSymbol>() )
+    const IconSymbol* icon = 0;
+    if (instance.valid())
     {
-        instance = _style.get<MarkerSymbol>()->convertToInstanceSymbol();
+        icon = instance->asIcon();
     }
 
-    const IconSymbol* icon = instance->asIcon();
-
     if ( !_image.valid() )
     {
         URI imageURI;
@@ -174,7 +222,7 @@
 
         if ( !imageURI.empty() )
         {
-            _image = imageURI.getImage( _dbOptions.get() );
+            _image = imageURI.getImage( _readOptions.get() );
         }
     }
 
@@ -243,12 +291,14 @@
         }
 
         //We must actually rotate the geometry itself and not use a MatrixTransform b/c the 
-        //decluttering doesn't respect Transforms above the drawable.
-        osg::Geometry* imageGeom = AnnotationUtils::createImageGeometry( _image.get(), offset, 0, heading, scale );
-        if ( imageGeom )
+        //decluttering doesn't respect Transforms above the drawable.        
+        _imageDrawable = AnnotationUtils::createImageGeometry(_image.get(), offset, 0, heading, scale);
+        if (_imageDrawable)
         {
-            _geode->addDrawable( imageGeom );
-            imageBox = osgEarth::Utils::getBoundingBox( imageGeom );
+            // todo: optimize this better:
+            _imageDrawable->getOrCreateStateSet()->merge(*_imageStateSet.get());
+            _geode->addChild(_imageDrawable);
+            imageBox = _imageDrawable->getBoundingBox();
         }    
     }
 
@@ -259,39 +309,34 @@
             textSymbol->alignment() = textSymbol->ALIGN_LEFT_CENTER;
     }
 
-    text = AnnotationUtils::createTextDrawable(
+    _textDrawable = AnnotationUtils::createTextDrawable(
             _text,
             _style.get<TextSymbol>(),
             imageBox );
 
     const BBoxSymbol* bboxsymbol = _style.get<BBoxSymbol>();
-    if ( bboxsymbol && text )
+    if ( bboxsymbol && _textDrawable )
     {
-        osg::Drawable* bboxGeom = new BboxDrawable( osgEarth::Utils::getBoundingBox(text), *bboxsymbol );
-        _geode->addDrawable(bboxGeom);
+        _bboxDrawable = new BboxDrawable( _textDrawable->getBoundingBox(), *bboxsymbol );
+        _geode->addChild(_bboxDrawable);
     }
 
-    if ( text )
+    if ( _textDrawable )
     {
-        _geode->addDrawable( text );
+        _geode->addChild( _textDrawable );
     }
-    
-    osg::StateSet* stateSet = _geode->getOrCreateStateSet();
-    stateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1 );
 
-    getPositionAttitudeTransform()->addChild( _geode );
+#if 0 // test a drop line
+    LineDrawable* line = new LineDrawable(GL_LINES);
+    line->pushVertex(osg::Vec3(0,0,0));
+    line->pushVertex(osg::Vec3(0,0,-100000));
+    line->finish();
+    getPositionAttitudeTransform()->addChild(line);
+#endif
 
-    // for clamping and occlusion culling    
-    //OE_WARN << LC << "PlaceNode::applyStyle: " << _style.getConfig().toJSON(true) << std::endl;
-    applyStyle( _style );
+    setDefaultLighting( false );
 
-    setLightingIfNotSet( false );
-    
-    // generate shaders:
-    Registry::shaderGenerator().run(
-        this,
-        "osgEarth.PlaceNode",
-        Registry::stateSetCache() );
+    applyStyle( _style );
 
     setPriority(getPriority());
 
@@ -324,10 +369,14 @@
     }
 
     // re-apply annotation drawable-level stuff as neccesary.
-    for (unsigned i = 0; i < _geode->getNumDrawables(); ++i)
-    {
-        _geode->getDrawable(i)->setUserData(_dataLayout.get());
-    }
+    if (_imageDrawable)
+        _imageDrawable->setUserData(_dataLayout.get());
+
+    if (_bboxDrawable)
+        _bboxDrawable->setUserData(_dataLayout.get());
+
+    if (_textDrawable)
+        _textDrawable->setUserData(_dataLayout.get());
 
     _dataLayout->setPriority(getPriority());    
     
@@ -382,79 +431,90 @@
 
     _text = text;
 
-    if (_geode)
+    if (_textDrawable)
     {
-        for(unsigned i=0; i<_geode->getNumDrawables(); ++i)
-        {
-            osgText::Text* d = dynamic_cast<osgText::Text*>( _geode->getDrawable(i) );
-            if ( d )
-            {
-			    TextSymbol* symbol =  _style.getOrCreate<TextSymbol>();
-			    osgText::String::Encoding text_encoding = osgText::String::ENCODING_UNDEFINED;
-			    if ( symbol && symbol->encoding().isSet() )
-			    {
-				    text_encoding = AnnotationUtils::convertTextSymbolEncoding(symbol->encoding().value());
-			    }
+		TextSymbol* symbol =  _style.getOrCreate<TextSymbol>();
+		osgText::String::Encoding text_encoding = osgText::String::ENCODING_UNDEFINED;
+		if ( symbol && symbol->encoding().isSet() )
+		{
+			text_encoding = AnnotationUtils::convertTextSymbolEncoding(symbol->encoding().value());
+		}
 
-                d->setText( text, text_encoding );
-                break;
-            }
-        }
+        _textDrawable->setText( text, text_encoding );
     }
 }
 
-
 void
 PlaceNode::setStyle(const Style& style)
 {
     // changing the style requires a complete rebuild.
     _style = style;
-    init();
+    compile();
 }
 
+void
+PlaceNode::setStyle(const Style& style, const osgDB::Options* readOptions)
+{
+    // changing the style requires a complete rebuild.
+    _style = style;
+    _readOptions = readOptions;
+    compile();
+}
 
 void
 PlaceNode::setIconImage(osg::Image* image)
 {
-    // changing the icon requires a complete rebuild.
-    _image = image;
-    init();
+    if (_image != image)
+    {
+        _image = image;
+        if (_imageDrawable)
+        {            
+            osg::Texture2D* texture = dynamic_cast<osg::Texture2D*>(_imageDrawable->getStateSet()->getTextureAttribute(0, osg::StateAttribute::TEXTURE));
+            if (texture)
+            {                
+                texture->setImage(_image);
+            }            
+        }
+        else
+        {
+            compile();
+        }
+    }
 }
 
-
 void
 PlaceNode::setDynamic( bool value )
 {
     GeoPositionNode::setDynamic( value );
     
-    if (_geode)
-    {
-        for(unsigned i=0; i<_geode->getNumDrawables(); ++i)
-        {
-            _geode->getDrawable(i)->setDataVariance( 
-                value ? osg::Object::DYNAMIC : osg::Object::STATIC );
-        }
-    }
+    osg::Object::DataVariance dv = value ? osg::Object::DYNAMIC : osg::Object::STATIC;
+
+    if (_textDrawable)
+        _textDrawable->setDataVariance(dv);
+
+    if (_bboxDrawable)
+        _bboxDrawable->setDataVariance(dv);
+
+    if (_imageDrawable)
+        _imageDrawable->setDataVariance(dv);
 }
 
 //-------------------------------------------------------------------
 
 OSGEARTH_REGISTER_ANNOTATION( place, osgEarth::Annotation::PlaceNode );
 
-
-PlaceNode::PlaceNode(MapNode*              mapNode,
-                     const Config&         conf,
-                     const osgDB::Options* dbOptions) :
-GeoPositionNode ( mapNode, conf ),
-_dbOptions( dbOptions ),
-_labelRotationRad ( 0. ),
-_followFixedCourse( false )
+PlaceNode::PlaceNode(const Config&         conf,
+                     const osgDB::Options* readOptions) :
+GeoPositionNode(conf, readOptions),
+_readOptions( readOptions )
 {
-    conf.getObjIfSet( "style",  _style );
-    conf.getIfSet   ( "text",   _text );
+    construct();
+
+    conf.get( "style",  _style );
+    conf.get( "text",   _text );
 
     optional<URI> imageURI;
-    conf.getIfSet( "icon", imageURI );
+    conf.get( "icon", imageURI );
     if ( imageURI.isSet() )
     {
         _image = imageURI->getImage();
@@ -462,8 +522,7 @@
             _image->setFileName( imageURI->base() );
     }
 
-    init();
-    setPosition(getPosition());
+    compile();
 }
 
 void
@@ -471,11 +530,11 @@
 {
     GeoPositionNode::setConfig(conf);
 
-    conf.getObjIfSet( "style",  _style );
-    conf.getIfSet   ( "text",   _text );
+    conf.get( "style",  _style );
+    conf.get   ( "text",   _text );
 
     optional<URI> imageURI;
-    conf.getIfSet( "icon", imageURI );
+    conf.get( "icon", imageURI );
     if ( imageURI.isSet() )
     {
         _image = imageURI->getImage();
@@ -483,20 +542,21 @@
             _image->setFileName( imageURI->base() );
     }
 
-    init();
+    //init();
 }
 
 Config
 PlaceNode::getConfig() const
 {
-    Config conf( "place" );
-    conf.add   ( "text",   _text );
-    conf.addObj( "style",  _style );
+    Config conf = GeoPositionNode::getConfig();
+    conf.key() = "place";
+    conf.set( "text",   _text );
+    conf.set( "style",  _style );
     if ( _image.valid() ) {
         if ( !_image->getFileName().empty() )
-            conf.add( "icon", _image->getFileName() );
+            conf.set( "icon", _image->getFileName() );
         else if ( !_image->getName().empty() )
-            conf.add( "icon", _image->getName() );
+            conf.set( "icon", _image->getName() );
     }
 
     return conf;
@@ -510,7 +570,7 @@
 #include <osgDB/InputStream>
 #include <osgDB/OutputStream>
 
-namespace
+namespace osgEarth { namespace Serializers { namespace PlaceNode
 {
     // functions
     static bool checkConfig(const osgEarth::Annotation::PlaceNode& node)
@@ -542,4 +602,4 @@
     {
         ADD_USER_SERIALIZER(Config);
     }
-}
+} } }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/RectangleNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/RectangleNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/RectangleNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/RectangleNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -49,10 +49,11 @@
 
         META_AnnotationNode( osgEarthAnnotation, RectangleNode );
 
+        RectangleNode();
+
         /**
          * Constructs a new rectangle annotation.
          *
-         * @param mapNode     Map on which the rectangle will appear
          * @param position    Location of the annotation, in map coordinates
          * @param width       Rectangle width
          * @param height      Rectangle height
@@ -60,14 +61,11 @@
          * @param draped      Whether to "drape" the annotation down on to the terrain         
          */
         RectangleNode(
-            MapNode*          mapNode,
             const GeoPoint&   position,
             const Linear&     width,
             const Linear&     height,
             const Style&      style );
 
-        virtual ~RectangleNode() { }
-
         /**
          * Gets the width of this rectangle
          */
@@ -124,14 +122,18 @@
 
     public:
 
-        RectangleNode(MapNode* mapNode, const Config& conf, const osgDB::Options* options);
+        RectangleNode(const Config& conf, const osgDB::Options* options);
         virtual Config getConfig() const;
 
+    protected:        
+
+        virtual ~RectangleNode() { }
+
     private:
-        RectangleNode() { }
         RectangleNode(const RectangleNode& rhs, const osg::CopyOp& op) { }
 
-        void rebuild();
+        void construct();
+        void compile();
 
         Style  _style;
         Linear _width;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/RectangleNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/RectangleNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/RectangleNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/RectangleNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -37,18 +37,35 @@
 using namespace osgEarth::Features;
 using namespace osgEarth::Symbology;
 
+RectangleNode::RectangleNode() :
+GeoPositionNode()
+{
+    construct();
+
+}
 
-RectangleNode::RectangleNode(MapNode*          mapNode,
-                             const GeoPoint&   position,
+RectangleNode::RectangleNode(const GeoPoint&   position,
                              const Linear&     width,
                              const Linear&     height,
                              const Style&      style) :
-GeoPositionNode    ( mapNode, position ),
-_width       ( width ),
-_height      ( height ),
-_style       ( style )
+GeoPositionNode()
 {
-    rebuild();
+    construct();
+
+    _width = width;
+    _height = height;
+    _style = style;
+
+    setPosition(position);
+
+    compile();
+}
+
+void
+RectangleNode::construct()
+{
+    _width.set(1.0, Units::KILOMETERS);
+    _height.set(1.0, Units::KILOMETERS);
 }
 
 const Linear&
@@ -82,7 +99,7 @@
     {
         _width = width;
         _height = height;
-        rebuild();
+        compile();
     }
 }
 
@@ -96,7 +113,7 @@
 RectangleNode::setStyle( const Style& style )
 {
     _style = style;
-    rebuild();
+    compile();
 }
 
 
@@ -334,9 +351,11 @@
 
 
 void
-RectangleNode::rebuild()
+RectangleNode::compile()
 {    
-    osgEarth::clearChildren( getPositionAttitudeTransform() );
+    // clear out old node:
+    osg::Group* pat = getPositionAttitudeTransform();
+    pat->removeChildren(0, pat->getNumChildren());
 
     // construct a local-origin circle.
     GeometryFactory factory;    
@@ -351,8 +370,9 @@
             getPositionAttitudeTransform()->addChild( node.get() );
         }
 
+        setDefaultLighting( false );
+
         applyRenderSymbology( _style );
-        setLightingIfNotSet( false );
     }
 }
 
@@ -363,16 +383,17 @@
 OSGEARTH_REGISTER_ANNOTATION( rectangle, osgEarth::Annotation::RectangleNode );
 
 
-RectangleNode::RectangleNode(MapNode*              mapNode,
-                             const Config&         conf,
+RectangleNode::RectangleNode(const Config&         conf,
                              const osgDB::Options* dbOptions) :
-GeoPositionNode( mapNode, conf )
+GeoPositionNode(conf, dbOptions)
 {
-    conf.getObjIfSet( "width", _width );
-    conf.getObjIfSet( "height", _height );
-    conf.getObjIfSet( "style",  _style );
+    construct();
+
+    conf.get( "width", _width );
+    conf.get( "height", _height );
+    conf.get( "style",  _style );
 
-    rebuild();
+    compile();
 }
 
 Config
@@ -381,9 +402,9 @@
     Config conf = GeoPositionNode::getConfig();
     conf.key() = "rectangle";
 
-    conf.addObj( "width",  _width );
-    conf.addObj( "height", _height );
-    conf.addObj( "style",  _style );
+    conf.set( "width",  _width );
+    conf.set( "height", _height );
+    conf.set( "style",  _style );
 
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/TrackNode osgearth-2.10.2+dfsg/src/osgEarthAnnotation/TrackNode
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/TrackNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/TrackNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -69,7 +69,7 @@
     /**
      * Schema that maps field names to field definitions.
      */
-    typedef fast_map<std::string, TrackNodeField> TrackNodeFieldSchema;
+    typedef std::map<std::string, TrackNodeField> TrackNodeFieldSchema;
 
     /** 
      * TrackNode is a movable, single-point entity represented by an icon,
@@ -93,7 +93,6 @@
          * @param fieldSchema Schema for track label fields
          */
         TrackNode(
-            MapNode*                    mapNode,
             const GeoPoint&             position,
             osg::Image*                 image,
             const TrackNodeFieldSchema& fieldSchema );
@@ -106,7 +105,6 @@
          * @param fieldSchema Schema for track label fields
          */
         TrackNode(
-            MapNode*                    mapNode,
             const GeoPoint&             position,
             const Style&                style,
             const TrackNodeFieldSchema& fieldSchema );
@@ -134,27 +132,19 @@
          * DYNAMIC data variance so it will be thread-safe.
          */
         osg::Drawable* getDrawable( const std::string& name ) const;
-
-    public:
+        
+    public: // AnnotationNode
 
         virtual void setPriority(float value);
+        
+    protected: // AnnotationNode override
+
+        virtual bool supportsRenderBinDetails() const { return false; }
 
     protected:
 
         virtual ~TrackNode() { }
 
-        Style             _style;
-        class osg::Geode* _geode;
-
-        typedef fast_map<std::string, osg::Drawable*> NamedDrawables;
-        NamedDrawables _namedDrawables;
-
-        void init( const TrackNodeFieldSchema& schema );
-
-    protected: // AnnotationNode override
-        
-        virtual bool supportsRenderBinDetails() const { return false; }
-
     private:
         // required by META_Node, but this object is not cloneable
         TrackNode() { }
@@ -162,6 +152,21 @@
 
         void updateLayoutData();
 
+        void construct();       
+        
+        static osg::observer_ptr<osg::StateSet> s_geodeStateSet;
+        static osg::observer_ptr<osg::StateSet> s_imageStateSet;
+
+        osg::ref_ptr<osg::StateSet> _imageStateSet;
+
+        Style             _style;
+        class osg::Geode* _geode;
+        TrackNodeFieldSchema _fieldSchema;
+
+        typedef fast_map<std::string, osg::Drawable*> NamedDrawables;
+        NamedDrawables _namedDrawables;
+
+        void compile();
     };
 
 } } // namespace osgEarth::Annotation
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthAnnotation/TrackNode.cpp osgearth-2.10.2+dfsg/src/osgEarthAnnotation/TrackNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthAnnotation/TrackNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthAnnotation/TrackNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -39,47 +39,119 @@
 
 //------------------------------------------------------------------------
 
-TrackNode::TrackNode(MapNode*                    mapNode, 
-                     const GeoPoint&             position,
+namespace
+{
+    const char* iconVS =
+        "#version " GLSL_VERSION_STR "\n"
+        "out vec2 oe_TrackNode_texcoord; \n"
+        "void oe_TrackNode_icon_VS(inout vec4 vertex) { \n"
+        "    oe_TrackNode_texcoord = gl_MultiTexCoord0.st; \n"
+        "} \n";
+
+    const char* iconFS =
+        "#version " GLSL_VERSION_STR "\n"
+        "in vec2 oe_TrackNode_texcoord; \n"
+        "uniform sampler2D oe_TrackNode_tex; \n"
+        "void oe_TrackNode_icon_FS(inout vec4 color) { \n"
+        "    color = texture(oe_TrackNode_tex, oe_TrackNode_texcoord); \n"
+        "} \n";
+}
+
+//------------------------------------------------------------------------
+
+osg::observer_ptr<osg::StateSet> TrackNode::s_geodeStateSet;
+osg::observer_ptr<osg::StateSet> TrackNode::s_imageStateSet;
+
+
+TrackNode::TrackNode(const GeoPoint&             position,
                      osg::Image*                 image,
                      const TrackNodeFieldSchema& fieldSchema ) :
 
-GeoPositionNode   ( mapNode, position )
+GeoPositionNode()
 {
+    construct();
+
     if ( image )
     {
         IconSymbol* icon = _style.getOrCreate<IconSymbol>();
         icon->setImage( image );
     }
+    
+    _fieldSchema = fieldSchema;
 
-    init( fieldSchema );
+    setPosition(position);
+
+    compile();
 }
 
-TrackNode::TrackNode(MapNode*                    mapNode, 
-                     const GeoPoint&             position,
+TrackNode::TrackNode(const GeoPoint&             position,
                      const Style&                style,
                      const TrackNodeFieldSchema& fieldSchema ) :
 
-GeoPositionNode   ( mapNode, position ),
-_style      ( style )
+GeoPositionNode(),
+_style( style )
 {
-    init( fieldSchema );
+    construct();
+
+    _fieldSchema = fieldSchema;
+
+    setPosition(position);
+
+    compile();
 }
 
 void
-TrackNode::init( const TrackNodeFieldSchema& schema )
+TrackNode::construct()
 {
-    osg::StateSet* ss = this->getOrCreateStateSet();
+    // This class makes its own shaders
+    ShaderGenerator::setIgnoreHint(this, true);
 
-    ScreenSpaceLayout::activate(ss);
-    
-    // Disable lighting for place nodes by default
-    ss->setDefine(OE_LIGHTING_DEFINE, osg::StateAttribute::OFF);
+    _geode = new osg::Geode();
+    getPositionAttitudeTransform()->addChild( _geode );
+
+    // initialize the shared stateset for the shared statesets.
+    osg::ref_ptr<osg::StateSet> geodeStateSet;
+    if (s_geodeStateSet.lock(geodeStateSet) == false)
+    {
+        static Threading::Mutex m;
+        Threading::ScopedMutexLock lock(m);
+        if (s_geodeStateSet.lock(geodeStateSet) == false)
+        {
+            s_geodeStateSet = geodeStateSet = new osg::StateSet();
 
+            // draw in the screen-space bin
+            ScreenSpaceLayout::activate(geodeStateSet.get());
 
-    osgEarth::clearChildren( getPositionAttitudeTransform() );
+            // completely disable depth buffer
+            geodeStateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1 ); 
 
-    _geode = new osg::Geode();
+            // Disable lighting for place nodes by default
+            Lighting::set(geodeStateSet.get(), osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
+        }
+    }
+    _geode->setStateSet(geodeStateSet.get());
+
+    if (s_imageStateSet.lock(_imageStateSet) == false)
+    {
+        static Threading::Mutex m;
+        Threading::ScopedMutexLock lock(m);
+        if (s_imageStateSet.lock(_imageStateSet) == false)
+        {
+            s_imageStateSet = _imageStateSet = new osg::StateSet();
+            VirtualProgram* vp = VirtualProgram::getOrCreate(_imageStateSet.get());
+            vp->setName("TrackNode");
+            vp->setFunction("oe_TrackNode_icon_VS", iconVS, ShaderComp::LOCATION_VERTEX_MODEL);
+            vp->setFunction("oe_TrackNode_icon_FS", iconFS, ShaderComp::LOCATION_FRAGMENT_COLORING);
+            _imageStateSet->addUniform(new osg::Uniform("oe_TrackNode_tex", 0));
+        }
+    }
+}
+
+void
+TrackNode::compile()
+{
+    // reset by clearing out any existing nodes:
+    _geode->removeChildren(0, _geode->getNumChildren());
 
     IconSymbol* icon = _style.get<IconSymbol>();
     osg::Image* image = icon ? icon->getImage() : 0L;
@@ -96,6 +168,8 @@
 
         if ( imageGeom )
         {
+            // todo: optimize this better:
+            imageGeom->getOrCreateStateSet()->merge(*_imageStateSet.get());
             _geode->addDrawable( imageGeom );
 
             ScreenSpaceLayoutData* layout = new ScreenSpaceLayoutData();
@@ -104,11 +178,11 @@
         }
     }
 
-    if ( !schema.empty() )
+    if ( !_fieldSchema.empty() )
     {
         // turn the schema defs into text drawables and record a map so we can
         // set the field text later.
-        for( TrackNodeFieldSchema::const_iterator i = schema.begin(); i != schema.end(); ++i )
+        for( TrackNodeFieldSchema::const_iterator i = _fieldSchema.begin(); i != _fieldSchema.end(); ++i )
         {
             const TrackNodeField& field = i->second;
             if ( field._symbol.valid() )
@@ -138,21 +212,7 @@
         }
     }
 
-    // ensure depth testing always passes, and disable depth buffer writes.
-    osg::StateSet* stateSet = _geode->getOrCreateStateSet();
-    stateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), 1 );
-
     applyStyle( _style );
-
-    setLightingIfNotSet( false );
-
-    getPositionAttitudeTransform()->addChild( _geode );
-    
-    // generate shaders:
-    Registry::shaderGenerator().run(
-        this,
-        "osgEarth.TrackNode",
-        Registry::stateSetCache() );
 }
 
 void
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/agglite/AGGLiteOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/agglite/AGGLiteOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/agglite/AGGLiteOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/agglite/AGGLiteOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -75,8 +75,8 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "optimize_line_sampling", _optimizeLineSampling );
-            conf.getIfSet( "gamma", _gamma );
+            conf.get( "optimize_line_sampling", _optimizeLineSampling );
+            conf.get( "gamma", _gamma );
         }
 
         optional<bool>   _optimizeLineSampling;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/agglite/AGGLiteRasterizerTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/agglite/AGGLiteRasterizerTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/agglite/AGGLiteRasterizerTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/agglite/AGGLiteRasterizerTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/arcgis/ArcGISOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/arcgis/ArcGISOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/arcgis/ArcGISOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/arcgis/ArcGISOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -72,10 +72,10 @@
         }
 
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
-            conf.getIfSet( "token", _token);
-            conf.getIfSet( "format", _format);
-            conf.getIfSet( "layers", _layers);
+            conf.get( "url", _url );
+            conf.get( "token", _token);
+            conf.get( "format", _format);
+            conf.get( "layers", _layers);
         }
 
     private:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/arcgis/Extent.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/arcgis/Extent.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/arcgis/Extent.h	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/arcgis/Extent.h	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/arcgis/MapService.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/arcgis/MapService.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/arcgis/MapService.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/arcgis/MapService.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -10,7 +10,7 @@
 #define LC "[MapService] "
 
 
-MapServiceLayer::MapServiceLayer(int in_id, 
+MapServiceLayer::MapServiceLayer(int in_id,
                                  const std::string& in_name) :
 id( in_id ),
 name( in_name )
@@ -49,7 +49,7 @@
 is_valid( true ),
 num_tiles_wide(_num_tiles_wide),
 num_tiles_high(_num_tiles_high)
-{ 
+{
     //NOP
 }
 
@@ -99,7 +99,7 @@
 TileInfo::getNumTilesHigh() const {
     return num_tiles_high;
 }
-                                 
+
 
 //===========================================================================
 
@@ -111,7 +111,7 @@
     //NOP
 }
 
-bool 
+bool
 MapService::isValid() const {
     return is_valid;
 }
@@ -131,6 +131,11 @@
     return tile_info;
 }
 
+const std::string& MapService::getCopyright() const
+{
+    return _copyright;
+}
+
 bool
 MapService::init( const URI& _uri, const osgDB::ReaderWriter::Options* options )
 {
@@ -152,7 +157,7 @@
 
     // Read the profile. We are using "fullExtent"; perhaps an option to use "initialExtent" instead?
 	double xmin = 0.0;
-	double ymin = 0.0; 
+	double ymin = 0.0;
 	double xmax = 0.0;
 	double ymax = 0.0;
 	int srs = 0;
@@ -160,7 +165,7 @@
     Json::Value fullExtentValue = doc["fullExtent"];
 	Json::Value extentValue = doc["extent"];
 	std::string srsValue;
-	
+
 	// added a case for "extent" which can be removed if we want to fall back on initialExtent if fullExtent fails
     if ( !fullExtentValue.empty() )
 	{
@@ -172,7 +177,7 @@
 		srs = doc["fullExtent"].get("spatialReference", osgEarth::Json::Value::null).get("wkid", 0).asInt();
 
 		srsValue = doc["fullExtent"].get("spatialReference", osgEarth::Json::Value::null).get("wkt", "null").asString();
-	
+
 		OE_DEBUG << LC << "fullExtent discovered: xmin: " << xmin << ", ymin: " << ymin << ", xmax: " << xmax << ", ymax: " << ymax << ", srs: " << srs << std::endl;
 	}
 	else if( !extentValue.empty() )
@@ -201,11 +206,11 @@
 
 		OE_DEBUG << LC << "initialExtent discovered: xmin: " << xmin << ", ymin: " << ymin << ", xmax: " << xmax << ", ymax: " << ymax << ", srs: " << srs << std::endl;
 	}
-    
+
     //Assumes the SRS is going to be an EPSG code
     std::stringstream ss;
     ss << "epsg:" << srs;
-    
+
 	// we can create a valid spatial reference from the WKT/proj4 string .. here just check if x/y/min/max values are set & correct
     if ( ! (xmax > xmin && ymax > ymin /*&& srs != 0*/ ) )
     {
@@ -268,7 +273,7 @@
 		{
             return setError( "Map service tile schema contains no LODs" );
 		}
-        
+
         min_level = INT_MAX;
         max_level = 0;
         for( unsigned int i=0; i<j_levels.size(); i++ )
@@ -356,6 +361,8 @@
 		return setError( "Map service could not create a valid profile" );
 	}
 
+    _copyright = trim(doc["copyrightText"].asString());
+
     // now we're good.
     tile_info = TileInfo( tile_rows, format, min_level, max_level, num_tiles_wide, num_tiles_high);
     is_valid = true;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/arcgis/MapService.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/arcgis/MapService.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/arcgis/MapService.h	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/arcgis/MapService.h	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 
 using namespace osgEarth;
 
-class MapServiceLayer 
+class MapServiceLayer
 {
 public:
     MapServiceLayer( int id, const std::string& name );
@@ -96,13 +96,13 @@
     bool init( const URI& uri, const osgDB::Options* options =0L );
 
     /**
-     * Returns true if the map service initialized succesfully.
+     * Returns true if the map service initialized successfully.
      */
     bool isValid() const;
 
     bool isTiled() const;
 
-    /** 
+    /**
      * If isValid() returns false, this method will return the error message.
      */
     const std::string& getError() const;
@@ -117,6 +117,11 @@
      */
     const TileInfo& getTileInfo() const;
 
+    /**
+     * Gets the copyright text for the layer
+     */
+    const std::string& getCopyright() const;
+
 private:
     bool is_valid;
     URI uri;
@@ -125,6 +130,7 @@
     MapServiceLayerList layers;
     bool tiled;
     TileInfo tile_info;
+    std::string _copyright;
 
     bool setError( const std::string& );
 };
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/arcgis/ReaderWriterArcGIS.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/arcgis/ReaderWriterArcGIS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/arcgis/ReaderWriterArcGIS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/arcgis/ReaderWriterArcGIS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -129,7 +129,7 @@
 			OE_DEBUG << LC << "Layer options not set" << std::endl;
 		}
 
-		OE_DEBUG << LC << "_map_service URL: " << url.full() << std::endl;
+        OE_DEBUG << LC << "_map_service URL: " << url.full() << std::endl;
 
         // read map service metadata from the server
         if ( !_map_service.init(url, dbOptions) )
@@ -142,7 +142,9 @@
                     << _map_service.getError() );
         }
 
-        _dbOptions = Registry::instance()->cloneOrCreateOptions( dbOptions );        
+        _copyright = _map_service.getCopyright();
+
+        _dbOptions = Registry::instance()->cloneOrCreateOptions( dbOptions );
 
         // establish a profile if we don't already have one:
         if ( !getProfile() )
@@ -198,7 +200,7 @@
             buf << std::setprecision(16)
                 << _options.url()->full() << "/export"
                 << "?bbox=" << ex.xMin() << "," << ex.yMin() << "," << ex.xMax() << "," << ex.yMax()
-                << "&format=" << _format 
+                << "&format=" << _format
                 << "&size=256,256"
                 << "&transparent=true"
                 << "&f=image";
@@ -233,7 +235,7 @@
 
         std::string bufStr;
         bufStr = buf.str();
-        return URI(bufStr).getImage( _dbOptions.get(), progress );
+        return URI(bufStr, _options.url()->context()).getImage( _dbOptions.get(), progress );
     }
 
     // override
@@ -244,8 +246,13 @@
         return NULL;
     }
 
+    virtual std::string getAttribution() const
+    {
+        return _copyright;
+    }
+
     // override
-    virtual std::string getExtension() const 
+    virtual std::string getExtension() const
     {
         return _format;
     }
@@ -256,6 +263,7 @@
     std::string _map;
     std::string _layer;
     std::string _format, _dot_format;
+    std::string _copyright;
     MapService _map_service;
     osg::ref_ptr<osgDB::Options> _dbOptions;
 };
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bing/BingOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/bing/BingOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bing/BingOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bing/BingOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -98,9 +98,9 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet("key",                  _apiKey);
-            conf.getIfSet("imagery_set",          _imagerySet );
-            conf.getIfSet("imagery_metadata_api", _imageryMetadataAPI );
+            conf.get("key",                  _apiKey);
+            conf.get("imagery_set",          _imagerySet );
+            conf.get("imagery_metadata_api", _imageryMetadataAPI );
         }
 
         optional<std::string> _apiKey;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bing/BingTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/bing/BingTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bing/BingTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bing/BingTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -7,6 +7,8 @@
 #include <osgEarth/Random>
 #include <osgEarth/ImageUtils>
 #include <osgEarth/Containers>
+#include <osgEarth/JsonUtils>
+#include <osgEarth/Progress>
 
 #include <osgEarthSymbology/Geometry>
 #include <osgEarthSymbology/GeometryRasterizer>
@@ -60,7 +62,6 @@
     BingTileSource(const TileSourceOptions& options) : 
       TileSource   ( options ),
       BingOptions  ( options ),
-      //_options     ( options ),
       _debugDirect ( false ),
       _tileURICache( true, 1024u )
     {
@@ -76,6 +77,12 @@
             _geom->push_back( osg::Vec3(10, 245, 0) );
             _font = Registry::instance()->getDefaultFont();
         }
+
+        const char* str = ::getenv("OSGEARTH_BING_KEY");
+        if (str)
+        {
+            apiKey().init(str);
+        }
     }
 
     /**
@@ -86,7 +93,7 @@
         _readOptions = dbOptions;
 
         // If the user did not include an API key, fail.
-        if ( !apiKey().isSet() )
+        if (apiKey()->empty())
         {
             return Status::Error(Status::ConfigurationError, "Bing API key is required");
         }
@@ -97,13 +104,16 @@
             imagerySet() = "Aerial";
         }
 
-        // Bing maps profile is spherical mercator with 2x2 tiles are the root.
-        const Profile* profile = Profile::create(
-            SpatialReference::get("spherical-mercator"),
-            MERC_MINX, MERC_MINY, MERC_MAXX, MERC_MAXY,
-            2, 2);
+        if (!getProfile())
+        {
+            // Bing maps profile is spherical mercator with 2x2 tiles are the root.
+            const Profile* profile = Profile::create(
+                SpatialReference::get("spherical-mercator"),
+                MERC_MINX, MERC_MINY, MERC_MAXX, MERC_MAXY,
+                2, 2);
 
-        setProfile( profile );
+            setProfile( profile );
+        }
 
         return STATUS_OK;
     }
@@ -200,6 +210,10 @@
                 }
 
                 // decode it:
+                if (metadataResult.getString().empty())
+                {
+                    return 0L;
+                }
                 Config metadata;
                 if ( !metadata.fromJSON(metadataResult.getString()) )
                 {
@@ -243,6 +257,111 @@
 
         return image.release();
     }
+    
+    osg::HeightField* createHeightField(const TileKey& key, ProgressCallback* progress)
+    {
+        osg::ref_ptr<osg::HeightField> hf;
+
+        osg::ref_ptr<const Profile> gg = Profile::create("global-geodetic");
+        GeoExtent e = gg->clampAndTransformExtent(key.getExtent());
+
+        // contact the REST API. Docs are here:
+        // http://dev.virtualearth.net/REST/v1/Elevation/{Bounds}?bounds={boundingBox}&rows={rows}&cols={cols}&heights={heights}&key={BingMapsAPIKey}
+
+        // max return data is 1024 samples (32x32)
+        int tileSize = 32;
+
+        // construct the request URI:
+        std::string request = Stringify()
+            << std::setprecision(12)
+            << "http://dev.virtualearth.net/REST/v1/Elevation/Bounds"
+            << "?bounds=" << e.yMin()<<","<<e.xMin()<<","<<e.yMax()<<","<<e.xMax()
+            << "&rows=" << tileSize
+            << "&cols=" << tileSize
+            << "&heights=ellipsoid"
+            << "&key=" << apiKey().get();
+
+
+        // check the URI cache.
+        URI                  location;
+        TileURICache::Record rec;
+
+        if (_tileURICache.get(request, rec))
+        {
+            location = URI(rec.value());
+        }
+        else
+        {
+            unsigned c = ++_apiCount;
+            if (c % 25 == 0)
+                OE_DEBUG << LC << "API calls = " << c << std::endl;
+
+            // fetch it:
+            ReadResult result = URI(request).readString(_readOptions.get(), progress);
+
+            if (result.failed())
+            {
+                // check for a REST error:
+                if (result.code() == ReadResult::RESULT_SERVER_ERROR)
+                {
+                    OE_WARN << LC << "REST API request error!" << std::endl;
+
+                    Config metadata;
+                    std::string content = result.getString();
+                    OE_WARN << content << std::endl;
+                    metadata.fromJSON(content);
+                    ConfigSet errors = metadata.child("errorDetails").children();
+                    for (ConfigSet::const_iterator i = errors.begin(); i != errors.end(); ++i)
+                    {
+                        OE_WARN << LC << "REST API: " << i->value() << std::endl;
+                    }
+                    return 0L;
+                }
+                else
+                {
+                    OE_DEBUG << LC << "Request error: " << result.getResultCodeString() << std::endl;
+                    if (progress)
+                        progress->cancel();
+                }
+                return 0L;
+            }
+
+            Json::Value root;
+                
+            Json::Reader reader;
+            if (!reader.parse(result.getString(), root, false))
+            {
+                OE_DEBUG << LC << "Invalid JSON: " << result.getString() << std::endl;
+                return 0L;
+            }
+
+            Json::Path path(".resourceSets[0].resources[0].elevations");
+            const Json::Value& e = path.resolve(root);
+
+            if (e.isArray() == false)
+            {
+                OE_INFO << LC << "Path did not resolve." << std::endl;
+                return 0L;
+            }
+
+            if (e.size() != tileSize*tileSize)
+            {
+                OE_DEBUG << LC << "Insufficient data" << std::endl;
+                return 0L;
+            }
+
+            hf = new osg::HeightField();
+            hf->allocate(tileSize, tileSize);
+            int ptr = 0;
+            for(Json::ValueConstIterator i = e.begin(); i != e.end(); ++i)
+            {
+                float elevation = (*i).asDouble();
+                (*hf->getFloatArray())[ptr++] = elevation;
+            }
+        }
+
+        return hf.release();
+    }
 
 private:
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapExtension osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapExtension
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapExtension	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapExtension	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@
                              public BumpMapOptions
     {
     public:
-        META_Object(osgearth_ext_BumpMap, BumpMapExtension);
+        META_OE_Extension(osgEarth, BumpMapExtension, bumpmap);
 
         // CTORs
         BumpMapExtension();
@@ -61,10 +61,6 @@
 
         bool disconnect(MapNode* mapNode);
 
-
-    protected: // Object
-        BumpMapExtension(const BumpMapExtension& rhs, const osg::CopyOp& op) { }
-
     private:
         osg::ref_ptr<const osgDB::Options>   _dbOptions;
         osg::ref_ptr<BumpMapTerrainEffect>   _effect;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapExtension.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapExtension.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapExtension.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapExtension.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.frag.progressive.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.frag.progressive.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.frag.progressive.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.frag.progressive.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -7,9 +7,10 @@
 
 #pragma include BumpMap.frag.common.glsl
 
-#pragma import_defines(OE_IS_SHADOW_CAMERA, OE_IS_PICK_CAMERA)
+#pragma import_defines(OE_IS_DEPTH_CAMERA)
+#pragma import_defines(OE_IS_PICK_CAMERA)
 
-#if defined(OE_IS_SHADOW_CAMERA) || defined(OE_IS_PICK_CAMERA)
+#if defined(OE_IS_DEPTH_CAMERA) || defined(OE_IS_PICK_CAMERA)
 
 //nop
 void oe_bumpmap_fragment(inout vec4 color) { }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.frag.simple.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.frag.simple.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.frag.simple.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.frag.simple.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -7,9 +7,10 @@
 
 #pragma include BumpMap.frag.common.glsl
 
-#pragma import_defines(OE_IS_SHADOW_CAMERA, OE_IS_PICK_CAMERA)
+#pragma import_defines(OE_IS_DEPTH_CAMERA)
+#pragma import_defines(OE_IS_PICK_CAMERA)
 
-#if defined(OE_IS_SHADOW_CAMERA) || defined(OE_IS_PICK_CAMERA)
+#if defined(OE_IS_DEPTH_CAMERA) || defined(OE_IS_PICK_CAMERA)
 
 //nop
 void oe_bumpmap_fragment(inout vec4 color) { }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
      * A Bump Map is a repeating normal texture that modifies the
      * existing normal vector per fragment.
      */
-    class BumpMapOptions : public DriverConfigOptions // NO EXPORT; header only
+    class BumpMapOptions : public ConfigOptions // NO EXPORT; header only
     {
     public:
         // bump map texture to load.
@@ -60,10 +60,8 @@
         const optional<unsigned>& baseLOD() const { return _baseLOD; }
 
     public:
-        BumpMapOptions( const ConfigOptions& opt =ConfigOptions() ) : DriverConfigOptions( opt )
+        BumpMapOptions( const ConfigOptions& opt =ConfigOptions() ) : ConfigOptions( opt )
         {
-            setDriver( "bumpmap" );
-
             // Defaults.
             _intensity.init( 1.0f );
             _scale.init    ( 1.0f );
@@ -78,7 +76,7 @@
 
     public:
         Config getConfig() const {
-            Config conf = DriverConfigOptions::getConfig();
+            Config conf = ConfigOptions::getConfig();
             conf.set("image",     _imageURI);
             conf.set("intensity", _intensity);
             conf.set("scale",     _scale);
@@ -90,18 +88,18 @@
 
     protected:
         void mergeConfig( const Config& conf ) {
-            DriverConfigOptions::mergeConfig( conf );
+            ConfigOptions::mergeConfig( conf );
             fromConfig( conf );
         }
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet("image",     _imageURI);
-            conf.getIfSet("intensity", _intensity);
-            conf.getIfSet("scale",     _scale);
-            conf.getIfSet("octaves",   _octaves);
-            conf.getIfSet("max_range", _maxRange);
-            conf.getIfSet("base_lod",  _baseLOD);
+            conf.get("image",     _imageURI);
+            conf.get("intensity", _intensity);
+            conf.get("scale",     _scale);
+            conf.get("octaves",   _octaves);
+            conf.get("max_range", _maxRange);
+            conf.get("base_lod",  _baseLOD);
         }
 
         optional<URI>      _imageURI;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapShaders osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapShaders
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapShaders	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapShaders	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 // ***DO NOT EDIT THIS FILE - IT IS AUTOMATICALLY GENERATED BY CMAKE***
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapTerrainEffect osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapTerrainEffect
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapTerrainEffect	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapTerrainEffect	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapTerrainEffect.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapTerrainEffect.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMapTerrainEffect.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMapTerrainEffect.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -87,6 +87,7 @@
 
             // configure shaders
             VirtualProgram* vp = VirtualProgram::getOrCreate(stateset);
+            vp->setName("BumpMap");
 
             Shaders package;            
             package.define( "OE_USE_NORMAL_MAP", false ); //engine->normalTexturesRequired() );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.vert.view.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.vert.view.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.vert.view.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/bumpmap/BumpMap.vert.view.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -4,9 +4,9 @@
 #pragma vp_entryPoint oe_bumpmap_vertexView
 #pragma vp_location   vertex_view
 #pragma vp_order      0.5
-#pragma import_defines(OE_IS_SHADOW_CAMERA, OE_IS_PICK_CAMERA)
+#pragma import_defines(OE_IS_DEPTH_CAMERA, OE_IS_PICK_CAMERA)
 
-#if defined(OE_IS_SHADOW_CAMERA) || defined(OE_IS_PICK_CAMERA)
+#if defined(OE_IS_DEPTH_CAMERA) || defined(OE_IS_PICK_CAMERA)
 
 void oe_bumpmap_vertexView(inout vec4 vertexView) { } 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_filesystem/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_filesystem/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_filesystem/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_filesystem/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -1,8 +1,4 @@
 
-IF (ZLIB_FOUND)
-    ADD_DEFINITIONS(-DOSGEARTH_HAVE_ZLIB)
-ENDIF(ZLIB_FOUND)
-
 SET(TARGET_H
     FileSystemCache
 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_filesystem/FileSystemCache osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_filesystem/FileSystemCache
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_filesystem/FileSystemCache	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_filesystem/FileSystemCache	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -50,7 +50,7 @@
     public:
         virtual Config getConfig() const {
             Config conf = ConfigOptions::getConfig();
-            conf.addIfSet( "path", _path );
+            conf.set( "path", _path );
             return conf;
         }
         virtual void mergeConfig( const Config& conf ) {
@@ -60,7 +60,7 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "path", _path );
+            conf.get( "path", _path );
         }
 
         optional<std::string> _path;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_filesystem/FileSystemCache.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_filesystem/FileSystemCache.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_filesystem/FileSystemCache.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_filesystem/FileSystemCache.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -40,7 +40,6 @@
 
 #define OSG_FORMAT "osgb"
 #define OSG_EXT   ".osgb"
-#define OSG_COMPRESS
 
 namespace
 {
@@ -107,8 +106,6 @@
 
         bool writeMetadata( const Config& meta );
 
-        std::string getHashedKey(const std::string&) const;
-
     protected:
         bool purgeDirectory( const std::string& dir );
 
@@ -126,6 +123,7 @@
         osg::ref_ptr<osgDB::ReaderWriter> _rw;
         osg::ref_ptr<osgDB::Options>      _zlibOptions;
         mutable Threading::ReadWriteMutex _mutex;
+        bool                              _debug;
     };
 
     void writeMeta( const std::string& fullPath, const Config& meta )
@@ -211,23 +209,6 @@
 
     //------------------------------------------------------------------------
 
-    std::string
-    FileSystemCacheBin::getHashedKey(const std::string& key) const
-    {
-        if ( getHashKeys() )
-        {
-            unsigned hash = osgEarth::hashString(key);
-            unsigned b1 = (hash & 0xfff00000) >> 20;
-            unsigned b2 = (hash & 0x000fff00) >> 8;
-            unsigned b3 = (hash & 0x000000ff);
-            return Stringify() << std::hex << std::setfill('0') << std::setw(3) << b1 << "/" << b2 << "/" << std::setw(2) << b3;
-        }
-        else
-        {
-            return osgEarth::toLegalFileName(key);
-        }
-    }
-
     bool
     FileSystemCacheBin::binValidForReading(bool silent)
     {
@@ -301,19 +282,21 @@
 
         _zlibOptions = Registry::instance()->cloneOrCreateOptions();
 
-#ifdef OSG_COMPRESS
-#ifdef OSGEARTH_HAVE_ZLIB
-        _zlibOptions->setPluginStringData("Compressor", "zlib");
-        _compressorName = "zlib";
-#endif        
-#endif
-        if (::getenv(OSGEARTH_ENV_DEFAULT_COMPRESSOR) != 0L){
-           _compressorName = ::getenv(OSGEARTH_ENV_DEFAULT_COMPRESSOR);
+        if (::getenv(OSGEARTH_ENV_DEFAULT_COMPRESSOR) != 0L)
+        {
+            _compressorName = ::getenv(OSGEARTH_ENV_DEFAULT_COMPRESSOR);
         }
-        if (_compressorName.length() > 0){
-           _zlibOptions->setPluginStringData("Compressor", _compressorName);
+        else
+        {
+            _compressorName = "zlib";
         }
-     
+
+        if (_compressorName.length() > 0)
+        {
+            _zlibOptions->setPluginStringData("Compressor", _compressorName);
+        }
+
+        _debug = ::getenv("OSGEARTH_CACHE_DEBUG") != 0L;
     }
 
     const osgDB::Options*
@@ -330,8 +313,9 @@
         else
         {
             osgDB::Options* merged = Registry::cloneOrCreateOptions(dbo);
-            if (_compressorName.length()){
-               merged->setPluginStringData("Compressor", _compressorName);
+            if (_compressorName.length())
+            {
+                merged->setPluginStringData("Compressor", _compressorName);
             }
             return merged;
         }
@@ -344,7 +328,7 @@
             return ReadResult(ReadResult::RESULT_NOT_FOUND);
 
         // mangle "key" into a legal path name
-        URI fileURI( getHashedKey(key), _metaPath );
+        URI fileURI( key, _metaPath );
         std::string path = fileURI.full() + OSG_EXT;
 
         if ( !osgDB::fileExists(path) )
@@ -370,6 +354,10 @@
 
             ReadResult rr( r.getImage(), meta );
             rr.setLastModifiedTime(timeStamp);
+
+            if (_debug)
+                OE_NOTICE << LC << "Read image \"" << key << "\" from cache bin [" << getID() << "] path=" << fileURI.full() << "." << OSG_EXT << std::endl;
+
             return rr;            
         }
     }
@@ -381,7 +369,7 @@
             return ReadResult(ReadResult::RESULT_NOT_FOUND);
 
         // mangle "key" into a legal path name
-        URI fileURI( getHashedKey(key), _metaPath );
+        URI fileURI( key, _metaPath );
         std::string path = fileURI.full() + OSG_EXT;
 
         if ( !osgDB::fileExists(path) )
@@ -407,6 +395,10 @@
 
             ReadResult rr( r.getObject(), meta );
             rr.setLastModifiedTime(timeStamp);
+
+            if (_debug)
+                OE_NOTICE << LC << "Read object \"" << key << "\" from cache bin [" << getID() << "] path=" << fileURI.full() << "." << OSG_EXT << std::endl;
+
             return rr;            
         }
     }
@@ -418,9 +410,16 @@
         if ( r.succeeded() )
         {
             if ( r.get<StringObject>() )
+            {
+                if (_debug)
+                    OE_NOTICE << LC << "Read string \"" << key << "\" from cache bin [" << getID() << "]" << std::endl;
+
                 return r;
+            }
             else
+            {
                 return ReadResult();
+            }
         }
         else
         {
@@ -435,7 +434,7 @@
             return false;
 
         // convert the key into a legal filename:
-        URI fileURI( getHashedKey(key), _metaPath );
+        URI fileURI( key, _metaPath );
         
         osgDB::ReaderWriter::WriteResult r;
 
@@ -479,7 +478,8 @@
 
         if ( objWriteOK )
         {
-            OE_DEBUG << LC << "Wrote \"" << key << "\" to cache bin [" << getID() << "] path=" << fileURI.full() << "." << OSG_EXT << std::endl;
+            if (_debug)
+                OE_NOTICE << LC << "Wrote \"" << key << "\" to cache bin [" << getID() << "] path=" << fileURI.full() << "." << OSG_EXT << std::endl;
         }
         else
         {
@@ -496,7 +496,7 @@
         if ( !binValidForReading() ) 
             return STATUS_NOT_FOUND;
 
-        URI fileURI( getHashedKey(key), _metaPath );
+        URI fileURI( key, _metaPath );
         std::string path( fileURI.full() + OSG_EXT );
         if ( !osgDB::fileExists(path) )
             return STATUS_NOT_FOUND;
@@ -508,7 +508,7 @@
     FileSystemCacheBin::remove(const std::string& key)
     {
         if ( !binValidForReading() ) return false;
-        URI fileURI( getHashedKey(key), _metaPath );
+        URI fileURI( key, _metaPath );
         std::string path( fileURI.full() + OSG_EXT );
 
         ScopedWriteLock lock(_mutex);
@@ -519,7 +519,7 @@
     FileSystemCacheBin::touch(const std::string& key)
     {
         if ( !binValidForReading() ) return false;
-        URI fileURI( getHashedKey(key), _metaPath );
+        URI fileURI( key, _metaPath );
         std::string path( fileURI.full() + OSG_EXT );
 
         ScopedWriteLock lock(_mutex);
@@ -548,14 +548,16 @@
                     purgeDirectory( full );
 
                     ok = ::unlink( full.c_str() );
-                    OE_DEBUG << LC << "Unlink: " << full << std::endl;
+                    if (_debug)
+                        OE_NOTICE << LC << "Unlink: " << full << std::endl;
                 }
                 else if ( type == osgDB::REGULAR_FILE )
                 {
                     if ( full != _metaPath )
                     {
                         ok = ::unlink( full.c_str() );
-                        OE_DEBUG << LC << "Unlink: " << full << std::endl;
+                        if (_debug)
+                            OE_NOTICE << LC << "Unlink: " << full << std::endl;
                     }
                 }
 
@@ -614,7 +616,7 @@
 
 /**
  * This driver defers loading of the source data to the appropriate OSG plugin. You
- * must explicity set an override profile when using this driver.
+ * must explicitly set an override profile when using this driver.
  *
  * For example, use this driver to load a simple jpeg file; then set the profile to
  * tell osgEarth its projection.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_leveldb/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_leveldb/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_leveldb/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_leveldb/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -16,6 +16,10 @@
 
 SET(TARGET_LIBRARIES_VARS LEVELDB_LIBRARY)
 
+IF(MSVC)
+    SET(TARGET_EXTERNAL_LIBRARIES Shlwapi)
+ENDIF(MSVC)
+
 SETUP_PLUGIN(osgearth_cache_leveldb)
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_leveldb/LevelDBCacheDriver.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_leveldb/LevelDBCacheDriver.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_leveldb/LevelDBCacheDriver.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_leveldb/LevelDBCacheDriver.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -25,7 +25,7 @@
 {
     /**
      * This driver defers loading of the source data to the appropriate OSG plugin. You
-     * must explicity set an override profile when using this driver.
+     * must explicitly set an override profile when using this driver.
      *
      * For example, use this driver to load a simple jpeg file; then set the profile to
      * tell osgEarth its projection.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_leveldb/LevelDBCacheOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_leveldb/LevelDBCacheOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_leveldb/LevelDBCacheOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_leveldb/LevelDBCacheOptions	2019-07-11 18:30:19.000000000 +0000
@@ -78,12 +78,12 @@
     public:
         virtual Config getConfig() const {
             Config conf = ConfigOptions::getConfig();
-            conf.addIfSet( "path", _path );
-            conf.addIfSet( "max_size_mb", _maxSizeMB );
-            conf.addIfSet( "size_check_period", _sizeCheckPeriod );
-            conf.addIfSet( "size_purge_period", _sizePurgePeriod );
-            conf.addIfSet( "block_size", _blockSize );
-            conf.addIfSet( "key", _key );
+            conf.set( "path", _path );
+            conf.set( "max_size_mb", _maxSizeMB );
+            conf.set( "size_check_period", _sizeCheckPeriod );
+            conf.set( "size_purge_period", _sizePurgePeriod );
+            conf.set( "block_size", _blockSize );
+            conf.set( "key", _key );
             return conf;
         }
         virtual void mergeConfig( const Config& conf ) {
@@ -93,12 +93,12 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "path", _path );
-            conf.getIfSet( "max_size_mb", _maxSizeMB );
-            conf.getIfSet( "size_check_period", _sizeCheckPeriod );
-            conf.getIfSet( "size_purge_period", _sizePurgePeriod );
-            conf.getIfSet( "block_size", _blockSize );
-            conf.getIfSet( "key", _key );
+            conf.get( "path", _path );
+            conf.get( "max_size_mb", _maxSizeMB );
+            conf.get( "size_check_period", _sizeCheckPeriod );
+            conf.get( "size_purge_period", _sizePurgePeriod );
+            conf.get( "block_size", _blockSize );
+            conf.get( "key", _key );
         }
 
         optional<std::string> _path;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_rocksdb/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
-IF(ROCKSDB_FOUND)
+IF(ROCKSDB_FOUND OR RocksDB_FOUND)
 
-set (CMAKE_CXX_STANDARD 11)
+SET(CMAKE_CXX_STANDARD 11)
 
 INCLUDE_DIRECTORIES( ${ROCKSDB_INCLUDE_DIR} )
 
@@ -8,7 +8,7 @@
     RocksDBCacheOptions
     RocksDBCache
     RocksDBCacheBin
-	Tracker
+    Tracker
 )
 SET(TARGET_SRC 
     RocksDBCache.cpp
@@ -16,11 +16,15 @@
     RocksDBCacheDriver.cpp
 )
 
-SET(TARGET_LIBRARIES_VARS ROCKSDB_LIBRARY)
+SET(TARGET_LIBRARIES_VARS ROCKSDB_LIBRARY ZLIB_LIBRARY)
 
-IF(WIN32)
-    SET(TARGET_EXTERNAL_LIBRARIES ws2_32 winmm rpcrt4)
-ENDIF(WIN32)
+IF(MSVC)
+    SET(TARGET_EXTERNAL_LIBRARIES ws2_32 winmm rpcrt4 shlwapi)
+ENDIF(MSVC)
+
+IF(MINGW)
+    SET(TARGET_EXTERNAL_LIBRARIES RocksDB::rocksdb)
+ENDIF(MINGW)
 
 SETUP_PLUGIN(osgearth_cache_rocksdb)
 
@@ -29,6 +33,4 @@
 SET(LIB_PUBLIC_HEADERS RocksDBCacheOptions)
 INCLUDE(ModuleInstallOsgEarthDriverIncludes OPTIONAL)
 
-ENDIF(ROCKSDB_FOUND)
-
-
+ENDIF(ROCKSDB_FOUND OR RocksDB_FOUND)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_rocksdb/RocksDBCacheDriver.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_rocksdb/RocksDBCacheDriver.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_rocksdb/RocksDBCacheDriver.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_rocksdb/RocksDBCacheDriver.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -25,7 +25,7 @@
 {
     /**
      * This driver defers loading of the source data to the appropriate OSG plugin. You
-     * must explicity set an override profile when using this driver.
+     * must explicitly set an override profile when using this driver.
      *
      * For example, use this driver to load a simple jpeg file; then set the profile to
      * tell osgEarth its projection.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_rocksdb/RocksDBCacheOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_rocksdb/RocksDBCacheOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cache_rocksdb/RocksDBCacheOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cache_rocksdb/RocksDBCacheOptions	2019-07-11 18:30:19.000000000 +0000
@@ -102,17 +102,17 @@
     public:
         virtual Config getConfig() const {
             Config conf = ConfigOptions::getConfig();
-            conf.addIfSet( "path", _path );
-			conf.addIfSet( "log_path", _logPath );
-            conf.addIfSet( "max_size_mb", _maxSizeMB );
-            conf.addIfSet( "size_check_period", _sizeCheckPeriod );
-            conf.addIfSet( "size_purge_period", _sizePurgePeriod );
-            conf.addIfSet( "block_size", _blockSize );
-			conf.addIfSet( "block_cache_size", _blockCacheSize );
-			conf.addIfSet( "write_buffer_size", _writeBufferSize );
-			conf.addIfSet( "max_files_level0", _maxFilesLevel0 );
-			conf.addIfSet( "min_buffers_to_merge", _minBuffersToMerge );
-            conf.addIfSet( "key", _key );
+            conf.set( "path", _path );
+			conf.set( "log_path", _logPath );
+            conf.set( "max_size_mb", _maxSizeMB );
+            conf.set( "size_check_period", _sizeCheckPeriod );
+            conf.set( "size_purge_period", _sizePurgePeriod );
+            conf.set( "block_size", _blockSize );
+			conf.set( "block_cache_size", _blockCacheSize );
+			conf.set( "write_buffer_size", _writeBufferSize );
+			conf.set( "max_files_level0", _maxFilesLevel0 );
+			conf.set( "min_buffers_to_merge", _minBuffersToMerge );
+            conf.set( "key", _key );
             return conf;
         }
         virtual void mergeConfig( const Config& conf ) {
@@ -122,17 +122,17 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "path", _path );
-			conf.getIfSet( "log_path", _logPath );
-            conf.getIfSet( "max_size_mb", _maxSizeMB );
-            conf.getIfSet( "size_check_period", _sizeCheckPeriod );
-            conf.getIfSet( "size_purge_period", _sizePurgePeriod );
-            conf.getIfSet( "block_size", _blockSize );
-			conf.getIfSet( "block_cache_size", _blockCacheSize );
-			conf.getIfSet( "write_buffer_size", _writeBufferSize );
-			conf.getIfSet( "max_files_level0", _maxFilesLevel0 );
-			conf.getIfSet( "min_buffers_to_merge", _minBuffersToMerge );
-            conf.getIfSet( "key", _key );
+            conf.get( "path", _path );
+			conf.get( "log_path", _logPath );
+            conf.get( "max_size_mb", _maxSizeMB );
+            conf.get( "size_check_period", _sizeCheckPeriod );
+            conf.get( "size_purge_period", _sizePurgePeriod );
+            conf.get( "block_size", _blockSize );
+			conf.get( "block_cache_size", _blockCacheSize );
+			conf.get( "write_buffer_size", _writeBufferSize );
+			conf.get( "max_files_level0", _maxFilesLevel0 );
+			conf.get( "min_buffers_to_merge", _minBuffersToMerge );
+            conf.get( "key", _key );
         }
 
         optional<std::string> _path;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cesiumion/CesiumIonOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/cesiumion/CesiumIonOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cesiumion/CesiumIonOptions	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cesiumion/CesiumIonOptions	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,90 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_DRIVER_CESIUMION_OPTIONS
+#define OSGEARTH_DRIVER_CESIUMION_OPTIONS 1
+
+#include <osgEarth/Common>
+#include <osgEarth/TileSource>
+#include <osgEarth/URI>
+
+namespace osgEarth { namespace Drivers
+{
+    using namespace osgEarth;
+
+    class CesiumIonOptions : public TileSourceOptions // NO EXPORT; header only
+    {
+    public:
+        optional<URI>& server() { return _server; }
+        const optional<URI>& server() const { return _server; }
+
+        optional<std::string>& format() { return _format; }
+        const optional<std::string>& format() const { return _format; }
+
+        optional<std::string>& assetId() { return _assetId; }
+        const optional<std::string>& assetId() const { return _assetId; }
+
+        optional<std::string>& token() { return _token; }
+        const optional<std::string>& token() const { return _token; }
+
+    public:
+        CesiumIonOptions( const TileSourceOptions& opt =TileSourceOptions() ) :
+            TileSourceOptions( opt ),
+            _server("https://api.cesium.com/"),
+            _format("png")
+        {
+            setDriver( "cesiumion" );
+            fromConfig( _conf );
+        }
+
+        virtual ~CesiumIonOptions() { }
+
+    public:
+        Config getConfig() const {
+            Config conf = TileSourceOptions::getConfig();
+            conf.set("server", _server);
+            conf.set("asset_id", _assetId);
+            conf.set("format", _format);
+            conf.set("token", _token);
+            return conf;
+        }
+
+    protected:
+        void mergeConfig( const Config& conf ) {
+            TileSourceOptions::mergeConfig( conf );
+            fromConfig( conf );
+        }
+
+    private:
+        void fromConfig( const Config& conf ) {
+            conf.get( "server", _server );
+            conf.get( "format", _format );
+            conf.get( "asset_id", _assetId);
+            conf.get( "token", _token);
+        }
+
+        optional<URI>         _server;
+        optional<std::string> _format;
+        optional<std::string> _assetId;
+        optional<std::string> _token;
+    };
+
+} } // namespace osgEarth::Drivers
+
+#endif // OSGEARTH_DRIVER_CESIUMION_OPTIONS
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cesiumion/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/cesiumion/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cesiumion/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cesiumion/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,15 @@
+SET(TARGET_SRC
+  ReaderWriterCesiumIon.cpp
+)
+SET(TARGET_H
+  CesiumIonOptions
+)
+    
+SET(TARGET_COMMON_LIBRARIES ${TARGET_COMMON_LIBRARIES} osgEarthUtil)
+
+SETUP_PLUGIN(osgearth_cesiumion)
+
+# to install public driver includes:
+SET(LIB_NAME cesiumion)
+SET(LIB_PUBLIC_HEADERS CesiumIonOptions)
+INCLUDE(ModuleInstallOsgEarthDriverIncludes OPTIONAL)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/cesiumion/ReaderWriterCesiumIon.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/cesiumion/ReaderWriterCesiumIon.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/cesiumion/ReaderWriterCesiumIon.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/cesiumion/ReaderWriterCesiumIon.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,160 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include <osgEarth/TileSource>
+#include <osgEarth/FileUtils>
+#include <osgEarth/Registry>
+#include <osgEarth/JsonUtils>
+
+#include <osgDB/FileNameUtils>
+#include <osgDB/FileUtils>
+#include <osgDB/Registry>
+#include <osgDB/ReadFile>
+
+#include <sstream>
+#include <iomanip>
+#include <string.h>
+
+#include "CesiumIonOptions"
+
+using namespace osgEarth;
+using namespace osgEarth::Drivers;
+
+#define LC "[CesiumIon driver] "
+#define OE_TEST OE_DEBUG
+
+
+class CesiumIonSource : public TileSource
+{
+public:
+    CesiumIonSource(const TileSourceOptions& options) :
+      TileSource(options),
+      _options(options)
+      {
+          //nop
+      }
+
+      Status initialize(const osgDB::Options* dbOptions)
+      {
+          _dbOptions = Registry::instance()->cloneOrCreateOptions(dbOptions);
+
+          if (_options.assetId().value().empty())
+          {
+              return Status::Error(Status::ConfigurationError, "Fail: driver requires a valid \"asset_id\" property");
+          }
+
+          if (_options.token().value().empty())
+          {
+              return Status::Error(Status::ConfigurationError, "Fail: driver requires a valid \"token\" property");
+          }
+
+          setProfile(osgEarth::Registry::instance()->getSphericalMercatorProfile());
+
+          std::stringstream buf;
+          buf << _options.server()->full();
+          if (!endsWith(_options.server()->full(), "/")) buf << "/";
+          buf << "v1/assets/" << *_options.assetId() << "/endpoint?access_token=" << *_options.token();
+          URI endpoint(buf.str());
+          OE_DEBUG << "Getting endpoint " << endpoint.full() << std::endl;
+
+          ReadResult r = URI(endpoint).readString(_dbOptions.get());
+          if (r.failed())
+              return Status::Error(Status::ConfigurationError, "Failed to get metadata from asset endpoint");
+
+          Json::Value doc;
+          Json::Reader reader;
+          if (!reader.parse(r.getString(), doc))
+          {
+              return Status::Error(Status::ConfigurationError, "Failed to parse metadata from asset endpoint");
+          }
+
+          _resourceUrl = doc["url"].asString();
+          _resourceToken = doc["accessToken"].asString();
+
+          // Configure the accept header
+          std::stringstream buf2;
+          buf2 << "*/*;access_token=" << _resourceToken;
+          _acceptHeader = buf2.str();
+
+          return STATUS_OK;
+      }
+
+
+      osg::Image* createImage(const TileKey&     key,
+          ProgressCallback*  progress )
+      {
+          unsigned x, y;
+          key.getTileXY( x, y );
+
+          // Invert the y value
+          unsigned cols=0, rows=0;
+          key.getProfile()->getNumTiles( key.getLevelOfDetail(), cols, rows );
+          y = rows - y - 1;
+
+          std::string location = _resourceUrl;
+          std::stringstream buf;
+          buf << location;
+          if (!endsWith(location, "/")) buf << "/";
+          buf << key.getLevelOfDetail() << "/" << x << "/" << y << "." << *_options.format();
+
+          URIContext context = _options.server()->context();
+          context.addHeader("accept", _acceptHeader);
+          URI uri(buf.str(), context);
+          return uri.getImage(_dbOptions.get(), progress);
+      }
+
+      virtual std::string getExtension() const
+      {
+          return *_options.format();
+      }
+
+private:
+    const CesiumIonOptions       _options;
+    osg::ref_ptr<osgDB::Options> _dbOptions;
+    std::string                  _acceptHeader;
+    std::string                  _resourceToken;
+    std::string                  _resourceUrl;
+};
+
+class CesiumIonTileSourceDriver : public TileSourceDriver
+{
+public:
+    CesiumIonTileSourceDriver()
+    {
+        supportsExtension( "osgearth_cesiumion", "CesiumIon Driver" );
+    }
+
+    virtual const char* className() const
+    {
+        return "CesiumIon Driver";
+    }
+
+    virtual ReadResult readObject(const std::string& file_name, const Options* options) const
+    {
+        if ( !acceptsExtension(osgDB::getLowerCaseFileExtension( file_name )))
+            return ReadResult::FILE_NOT_HANDLED;
+
+        return new CesiumIonSource( getTileSourceOptions(options) );
+    }
+};
+
+REGISTER_OSGPLUGIN(osgearth_cesiumion, CesiumIonTileSourceDriver)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -34,19 +34,21 @@
 add_subdirectory(cache_filesystem)
 add_subdirectory(cache_leveldb)
 add_subdirectory(cache_rocksdb)
+add_subdirectory(cesiumion)
 add_subdirectory(colorramp)
 add_subdirectory(debug)
 add_subdirectory(detail)
 add_subdirectory(earth)
 add_subdirectory(engine_mp)
 add_subdirectory(engine_rex)
+IF(NOT OSGEARTH_BUILD_PLATFORM_IPHONE AND NOT ANDROID)
 add_subdirectory(fastdxt)
+ENDIF()
 add_subdirectory(featurefilter_intersect)
 add_subdirectory(featurefilter_join)
 add_subdirectory(feature_elevation)
 add_subdirectory(feature_mapnikvectortiles)
 add_subdirectory(feature_ogr)
-add_subdirectory(feature_raster)
 add_subdirectory(feature_tfs)
 add_subdirectory(feature_wfs)
 add_subdirectory(feature_xyz)
@@ -59,8 +61,6 @@
 add_subdirectory(model_feature_geom)
 add_subdirectory(model_simple)
 add_subdirectory(monitor)
-add_subdirectory(ocean_simple)
-add_subdirectory(ocean_triton)
 add_subdirectory(osg)
 add_subdirectory(script_engine_duktape)
 add_subdirectory(skyview)
@@ -69,7 +69,9 @@
 add_subdirectory(sky_simple)
 add_subdirectory(template)
 add_subdirectory(terrainshader)
+add_subdirectory(tilecache)
 add_subdirectory(tileindex)
+add_subdirectory(tilepackage)
 add_subdirectory(tms)
 add_subdirectory(vdatum_egm2008)
 add_subdirectory(vdatum_egm84)
@@ -77,6 +79,13 @@
 add_subdirectory(viewpoints)
 add_subdirectory(vpb)
 add_subdirectory(wcs)
+add_subdirectory(webp)
 add_subdirectory(wms)
 add_subdirectory(xyz)
 
+# Libraries that require C++11 support
+if(CXX11_AVAILABLE)
+    add_subdirectory(gltf)
+else(CXX11_AVAILABLE)
+    message(STATUS "Omitting features that require C++11 support: GLTF")
+endif(CXX11_AVAILABLE)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/colorramp/ColorRampOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/colorramp/ColorRampOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/colorramp/ColorRampOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/colorramp/ColorRampOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@
     public:
         Config getConfig() const {
             Config conf = TileSourceOptions::getConfig();
-            conf.setObj("elevation", _elevationLayerOptions );
+            conf.set("elevation", _elevationLayerOptions );
             conf.set("ramp", _ramp);
             return conf;
         }
@@ -64,13 +64,13 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getObjIfSet("elevation", _elevationLayerOptions );
+            conf.get("elevation", _elevationLayerOptions );
             if (!_elevationLayerOptions.isSet())
             {
-                // Try to get the settings from a heightfield specificiation instead
-                conf.getObjIfSet("heightfield", _elevationLayerOptions );
+                // Try to get the settings from a heightfield specification instead
+                conf.get("heightfield", _elevationLayerOptions );
             }
-            conf.getIfSet("ramp", _ramp);
+            conf.get("ramp", _ramp);
         }
 
       
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/colorramp/ColorRampTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/colorramp/ColorRampTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/colorramp/ColorRampTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/colorramp/ColorRampTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -106,7 +106,7 @@
         GeoHeightField geoHF = _layer->createHeightField(key, progress);
         if (geoHF.valid())
         {
-            osg::HeightField* hf = geoHF.getHeightField(); 
+            const osg::HeightField* hf = geoHF.getHeightField(); 
             osg::Image* image = new osg::Image();
             image->allocateImage(hf->getNumColumns(),hf->getNumRows(),1, GL_RGBA, GL_UNSIGNED_BYTE);
             memset(image->data(), 0, image->getImageSizeInBytes());
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/debug/DebugOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/debug/DebugOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/debug/DebugOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/debug/DebugOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -63,8 +63,8 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "color", _colorCode );
-            conf.getIfSet( "invert_y", _invertY);
+            conf.get( "color", _colorCode );
+            conf.get( "invert_y", _invertY);
         }
 
         optional<std::string> _colorCode;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/debug/DebugTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/debug/DebugTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/debug/DebugTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/debug/DebugTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -50,12 +50,15 @@
         ImageUtils::PixelReader read(src);
         ImageUtils::PixelWriter write(dst);
 
+        // for one-channel images, use the RED channel, otherwise ALPHA channel
+        unsigned chan = src->getPixelFormat() == GL_RED || src->getPixelFormat() == GL_LUMINANCE? 0 : 3;
+
         for( int src_t=0, dst_t=dy; src_t < src->t(); src_t++, dst_t++ )
         {
             for( int src_s=0, dst_s=dx; src_s < src->s(); src_s++, dst_s++ )
             {           
                 osg::Vec4 color = read(src_s, src_t);
-                if ( color.a() > 0.5f )
+                if ( color[chan] > 0.5f )
                     color = newColor;
                 write( color, dst_s, dst_t );
             }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailExtension osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailExtension
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailExtension	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailExtension	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@
                             public ExtensionInterface<MapNode>
     {
     public:
-        META_Object(osgearth_detail, DetailExtension);
+        META_OE_Extension(osgEarth, DetailExtension, detail);
 
         // CTORs
         DetailExtension();
@@ -51,6 +51,8 @@
 
         void setDBOptions(const osgDB::Options* dbOptions);
 
+        const ConfigOptions& getConfigOptions() const { return _options; }
+
 
     public: // ExtensionInterface<MapNode>
 
@@ -58,13 +60,10 @@
 
         bool disconnect(MapNode* mapNode);
 
-
-    protected: // Object
-        DetailExtension(const DetailExtension& rhs, const osg::CopyOp& op) { }
-
+        
     private:
         const DetailOptions                 _options;
-        osg::ref_ptr<const osgDB::Options>     _dbOptions;
+        osg::ref_ptr<const osgDB::Options>  _dbOptions;
         osg::ref_ptr<DetailTerrainEffect>   _effect;
     };
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailExtension.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailExtension.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailExtension.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailExtension.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -81,11 +81,11 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "image", _imageURI );
-            conf.getIfSet( "lod", _lod );
-            conf.getIfSet( "alpha", _alpha );
-            conf.getIfSet( "max_range", _maxRange );
-            conf.getIfSet( "attenuation", _attenDist);
+            conf.get( "image", _imageURI );
+            conf.get( "lod", _lod );
+            conf.get( "alpha", _alpha );
+            conf.get( "max_range", _maxRange );
+            conf.get( "attenuation", _attenDist);
         }
 
         optional<URI> _imageURI;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailPlugin.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailPlugin.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailPlugin.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailPlugin.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailShaders osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailShaders
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailShaders	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailShaders	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 // ***DO NOT EDIT THIS FILE - IT IS AUTOMATICALLY GENERATED BY CMAKE***
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailTerrainEffect osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailTerrainEffect
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailTerrainEffect	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailTerrainEffect	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailTerrainEffect.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailTerrainEffect.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/detail/DetailTerrainEffect.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/detail/DetailTerrainEffect.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -79,6 +79,7 @@
 
             // configure shaders
             VirtualProgram* vp = VirtualProgram::getOrCreate(stateset);
+            vp->setName("DetailTerrainEffect");
 
             Shaders package;            
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/earth/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/earth/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/earth/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/earth/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -19,12 +19,10 @@
     EarthFileSerializer1.cpp
     EarthFileSerializer2.cpp)
 
-IF( CMAKE_DEBUG_POSTFIX )
-    ADD_DEFINITIONS( -DOSGEARTH_DEBUG_POSTFIX=${CMAKE_DEBUG_POSTFIX} )
-ENDIF()
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DOSGEARTH_LIBRARY_POSTFIX=${CMAKE_DEBUG_POSTFIX}")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DOSGEARTH_LIBRARY_POSTFIX=${CMAKE_RELEASE_POSTFIX}")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DOSGEARTH_LIBRARY_POSTFIX=${CMAKE_RELWITHDEBINFO_POSTFIX}")
+SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DOSGEARTH_LIBRARY_POSTFIX=${CMAKE_MINSIZEREL_POSTFIX}")
 
-IF( CMAKE_RELEASE_POSTFIX )
-    ADD_DEFINITIONS( -DOSGEARTH_RELEASE_POSTFIX=${CMAKE_RELEASE_POSTFIX} )
-ENDIF()
 
 SETUP_PLUGIN(earth)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer osgearth-2.10.2+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer1.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer1.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer1.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer1.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer2.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer2.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer2.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/earth/EarthFileSerializer2.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
  */
 #include "EarthFileSerializer"
 #include <osgEarth/FileUtils>
-#include <osgEarth/MapFrame>
 #include <osgEarth/Extension>
 #include <osgEarth/StringUtils>
 #include <osgEarth/FileUtils>
@@ -181,7 +180,7 @@
         {
             _rewriteAbsolutePaths = false;
             _newReferrerAbsPath = osgDB::convertFileNameToUnixStyle( osgDB::getRealPath(referrer) );
-            _newReferrerFolder  = osgDB::getFilePath( osgDB::findDataFile(_newReferrerAbsPath) );
+            _newReferrerFolder  = osgDB::getFilePath( _newReferrerAbsPath );
         }
 
         /** Whether to make absolute paths into relative paths if possible */
@@ -218,7 +217,7 @@
                 std::string newValue = resolve(inputURI);
                 if ( newValue != input.value() )
                 {
-                    input.value() = newValue;
+                    input.setValue(newValue);
                     input.setReferrer( _newReferrerAbsPath );
                 }
 
@@ -275,7 +274,7 @@
 
 			// Definition: an "element" is a part between slashes. Ex: "/a/b" has two elements ("a" and "b").
 			// Algorithm:
-			// 1. If paths are neither both absolute nor both relative, then we cannot do anything (we need to make them absolute, but need additionnal info on how to make it). Return.
+			// 1. If paths are neither both absolute nor both relative, then we cannot do anything (we need to make them absolute, but need additional info on how to make it). Return.
 			// 2. If both paths are absolute and root isn't the same (for Windows only, as roots are of the type "C:", "D:"), then the operation is impossible. Return.
 			// 3. Iterate over two paths elements until elements are equal
 			// 4. For each remaining element in "from", add ".." to result
@@ -333,8 +332,7 @@
 
     bool addLayer(const Config& conf, Map* map)
     {
-        std::string name = conf.key();
-        Layer* layer = Layer::create(name, conf);
+        Layer* layer = Layer::create(conf);
         if (layer)
         {
             map->addLayer(layer);
@@ -438,23 +436,6 @@
             // nop - handled earlier
         }
 
-#if 0
-        else if ( i->key() == "image" )
-        {
-            addImageLayer( *i, map );
-        }
-
-        else */if ( i->key() == "model" )
-        {
-            addModelLayer( *i, map );
-        }
-
-        else if ( i->key() == "mask" )
-        {
-            addMaskLayer( *i, map );
-        }
-#endif
-
         else if ( i->key() == "external" || i->key() == "extensions" )
         {
             externalConfig = *i;
@@ -464,7 +445,6 @@
                 Extension* extension = loadExtension(*e);
                 if (extension)
                     extensions.push_back(extension);
-                //addExtension( *e, mapNode.get() );
             }
         }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/earth/ReaderWriterOsgEarth.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/earth/ReaderWriterOsgEarth.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/earth/ReaderWriterOsgEarth.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/earth/ReaderWriterOsgEarth.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -37,13 +37,8 @@
 #define Q2(x) #x
 #define Q(x)  Q2(x)
 
-#if (defined(_DEBUG) || defined(QT_DEBUG)) && defined(OSGEARTH_DEBUG_POSTFIX)
-#   define LIBNAME_UTIL_POSTFIX Q(OSGEARTH_DEBUG_POSTFIX)
-#elif defined(OSGEARTH_RELEASE_POSTFIX)
-#   define LIBNAME_UTIL_POSTFIX Q(OSGEARTH_RELEASE_POSTFIX)
-#else
-#   define LIBNAME_UTIL_POSTFIX ""
-#endif
+#define LIBNAME_UTIL_POSTFIX Q(OSGEARTH_LIBRARY_POSTFIX)
+
 
 #if defined(WIN32)
 #   define LIBNAME_UTIL "osgEarthUtil"
@@ -75,7 +70,7 @@
     {
         if ( rhs.value() != lhs.value() )
         {
-            lhs.value() = rhs.value();
+            lhs.setValue(rhs.value());
         }
 
         for(ConfigSet::const_iterator rhsChild = rhs.children().begin(); rhsChild != rhs.children().end(); ++rhsChild)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/Common osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/Common
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/Common	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/DynamicLODScaleCallback osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/DynamicLODScaleCallback
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/DynamicLODScaleCallback	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/DynamicLODScaleCallback	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/FileLocationCallback osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/FileLocationCallback
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/FileLocationCallback	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/FileLocationCallback	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/GeometryPool.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/GeometryPool.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/GeometryPool.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/GeometryPool.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -116,7 +116,7 @@
     unsigned numIndiciesInSurface = (_tileSize-1) * (_tileSize-1) * 6;
     unsigned numIncidesInSkirt    = createSkirt ? (_tileSize-1) * 4 * 6 : 0;
     
-    // Pre-allocate enought space for all triangles.
+    // Pre-allocate enough space for all triangles.
     osg::DrawElements* primSet = numVerts > 0xFFFF ? 
         (osg::DrawElements*)(new osg::DrawElementsUInt(GL_TRIANGLES)) :
         (osg::DrawElements*)(new osg::DrawElementsUShort(GL_TRIANGLES));
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/HeightFieldCache osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/HeightFieldCache
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/HeightFieldCache	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/HeightFieldCache	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/HeightFieldCache.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/HeightFieldCache.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/HeightFieldCache.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/HeightFieldCache.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -81,7 +81,7 @@
         // Elevation "smoothing" uses the parent HF as the starting point for building
         // a new tile. This will cause lower-resolution data to propagate down the tree
         // and fill in any gaps in higher-resolution data. The result will be an elevation
-        // grid that is "smoother" but not neccessarily as accurate.
+        // grid that is "smoother" but not necessarily as accurate.
         if ( _useParentAsReferenceHF && parent_hf && parentKey.valid() )
         {
             out_hf = HeightFieldUtils::createSubSample(
@@ -106,6 +106,16 @@
             true, // convertToHAE
             progress );
 
+        // Check for cancelation before writing to a cache
+        if (progress && progress->isCanceled())
+        {
+            if (out_hf.valid())
+            {
+                OE_DEBUG << LC << "Cancelation with a valid HF; this would cache bad data." << std::endl;
+            }
+            return false;
+        }
+
         // If the map failed to provide any suitable data sources at all, replace the
         // heightfield with data from its parent (if available). 
         if ( !populated )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/KeyNodeFactory osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/KeyNodeFactory
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/KeyNodeFactory	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/KeyNodeFactory	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/KeyNodeFactory.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/KeyNodeFactory.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/KeyNodeFactory.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/KeyNodeFactory.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPEngine.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -6,7 +6,10 @@
 #pragma vp_order      0.5
 #pragma vp_define     MP_USE_BLENDING
 
-#pragma import_defines(OE_IS_PICK_CAMERA, OE_IS_SHADOW_CAMERA, OE_TERRAIN_CAST_SHADOWS)
+#pragma import_defines(OE_IS_PICK_CAMERA)
+#pragma import_defines(OE_IS_DEPTH_CAMERA)
+#pragma import_defines(OE_IS_SHADOW_CAMERA)
+#pragma import_defines(OE_TERRAIN_CAST_SHADOWS)
 
 uniform vec4 oe_terrain_color;
 uniform sampler2D oe_layer_tex;
@@ -19,8 +22,10 @@
 
 void oe_mp_apply_coloring(inout vec4 color)
 {
-#if defined(OE_IS_SHADOW_CAMERA) && !defined(OE_TERRAIN_CAST_SHADOWS)
-    discard;
+#if defined(OE_IS_DEPTH_CAMERA)
+    #if defined(OE_IS_SHADOW_CAMERA) && !defined(OE_TERRAIN_CAST_SHADOWS)
+        discard;
+    #endif
     return;
 #endif
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPGeometry osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPGeometry
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPGeometry	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPGeometry	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPGeometry.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPGeometry.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPGeometry.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPGeometry.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -222,7 +222,7 @@
     }
 
     // activate the tile coordinate set - same for all layers
-    if ( renderColor )
+    if ( renderColor && _layers.size() > 0 )
     {
         state.setTexCoordPointer( _imageUnit+1, _tileCoords.get() );
     }
@@ -488,7 +488,7 @@
 
         else if ( de->getNumIndices() % 3 != 0 )
         {
-            OE_WARN << LC << "Invalid primitive set - wrong number of indicies" << std::endl;
+            OE_WARN << LC << "Invalid primitive set - wrong number of indices" << std::endl;
             //_primitives.clear();
             osg::DrawElementsUShort* deus = static_cast<osg::DrawElementsUShort*>(de);
             int extra = de->getNumIndices() % 3;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPShaders osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPShaders
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPShaders	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPShaders	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 // ***DO NOT EDIT THIS FILE - IT IS AUTOMATICALLY GENERATED BY CMAKE***
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineDriver.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineDriver.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineDriver.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineDriver.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -200,6 +200,12 @@
                     
                     Registry::instance()->endActivity(uri);
 
+                    if (progress && progress->isCanceled())
+                    {
+                        OE_DEBUG << LC << "Tile " << key.str() << " : canceled!" << std::endl;
+                        return ReadResult(0L);
+                    }
+
                     // Deal with failed loads.
                     if ( !node.valid() )
                     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -145,7 +145,7 @@
 }
 
 // since this method is called in a database pager thread, we use a ref_ptr output
-// parameter to avoid the engine node being destructed between the time we 
+// parameter to avoid the engine node being destructed between the time we
 // return it and the time it's accessed; this could happen if the user removed the
 // MapNode from the scene during paging.
 void
@@ -312,7 +312,7 @@
         osg::Shader* VS = new osg::Shader(osg::Shader::VERTEX, libVS);
         VS->setName( "oe_terrain_SDK_mp_VS" );
         vp->setShader( VS );
-        
+
         osg::Shader* FS = new osg::Shader(osg::Shader::FRAGMENT, libFS);
         FS->setName( "oe_terrain_SDK_mp_FS" );
         vp->setShader( FS );
@@ -343,7 +343,7 @@
     // live tiles of the current map revision so they can inrementally update
     // themselves if necessary.
     _liveTiles = new TileNodeRegistry("live", this->getTerrain());
-    _liveTiles->setRevisioningEnabled( _terrainOptions.incrementalUpdate() == true );
+    _liveTiles->setRevisioningEnabled(false);
     _liveTiles->setMapRevision( _update_mapf->getRevision() );
 
     // Facility to properly release GL objects
@@ -362,7 +362,7 @@
     {
         getResources()->reserveTextureImageUnit( _secondaryUnit, "MP Engine Secondary" );
     }
-    
+
     // initialize the model factory:
     _tileModelFactory = new TileModelFactory(_liveTiles.get(), _terrainOptions, this);
 
@@ -409,20 +409,18 @@
     dirtyBound();
 
     OE_INFO << LC << "Edge normalization is " << (_terrainOptions.normalizeEdges() == true? "ON" : "OFF") << std::endl;
+
+    if (_terrainOptions.enableMercatorFastPath().isSetTo(true))        
+    {
+        OE_NOTICE << LC << "Mercator fast path is enabled - warning: it is incompatible with caching" << std::endl;
+    }
 }
 
 
 osg::BoundingSphere
 MPTerrainEngineNode::computeBound() const
 {
-    //if ( _terrain && _terrain->getNumChildren() > 0 )
-    //{
-    //    return _terrain->getBound();
-    //}
-    //else
-    {
-        return TerrainEngineNode::computeBound();
-    }
+    return TerrainEngineNode::computeBound();
 }
 
 void
@@ -430,16 +428,7 @@
                                       unsigned         minLevel,
                                       unsigned         maxLevel)
 {
-    if (_terrainOptions.incrementalUpdate() == true && _liveTiles.valid())
-    {
-        GeoExtent extentLocal = extent;
-        if ( !extent.getSRS()->isEquivalentTo(this->getMap()->getSRS()) )
-        {
-            extent.transform(this->getMap()->getSRS(), extentLocal);
-        }
-        
-        _liveTiles->setDirty(extentLocal, minLevel, maxLevel);
-    }
+    //NOP
 }
 
 void
@@ -453,17 +442,7 @@
     }
     else
     {
-        if ( _terrainOptions.incrementalUpdate() == true )
-        {
-            // run an atomic "dirty" operation:
-            //_update_mapf->sync();
-            //_liveTiles->setMapRevision( _update_mapf->getRevision(), forceDirty );
-        }
-        else
-        {
-            dirtyTerrain();
-        }
-
+        dirtyTerrain();
         _refreshRequired = false;
     }
 }
@@ -548,7 +527,7 @@
     {
         // Factory to create the root keys:
         KeyNodeFactory* factory = getKeyNodeFactory();
-    
+
         std::vector< TileKey > keys;
         _update_mapf->getProfile()->getAllKeysAtLOD( *_terrainOptions.firstLOD(), keys );
 
@@ -556,7 +535,7 @@
         OE_DEBUG << LC << "Creating " << keys.size() << " root keys.." << std::endl;
 
         osg::Group* root = new osg::Group;
-        _terrain->addChild( root );        
+        _terrain->addChild( root );
 
 
         osg::ref_ptr<osgDB::Options> dbOptions = Registry::instance()->cloneOrCreateOptions();
@@ -637,7 +616,7 @@
     if ( !knf.valid() )
     {
         // create a compiler for compiling tile models into geometry
-        bool optimizeTriangleOrientation = 
+        bool optimizeTriangleOrientation =
             getMap()->getMapOptions().elevationInterpolation() != INTERP_TRIANGULATE;
 
         MaskLayerVector maskLayers;
@@ -679,12 +658,17 @@
 
     OE_DEBUG << LC << "Create node for \"" << key.str() << "\"" << std::endl;
 
-    bool accumulate    = true;  // use parent data to help build tiles if neccesary
+    bool accumulate    = true;  // use parent data to help build tiles if necessary
     bool setupChildren = true;  // prepare the tile for subdivision
 
     // create the node:
     osg::ref_ptr<osg::Node> node = getKeyNodeFactory()->createNode(key, accumulate, setupChildren, progress);
 
+    if (progress && progress->isCanceled())
+    {
+        return 0;
+    }
+
     // release the reference and return it.
     return node.release();
 }
@@ -717,7 +701,7 @@
     const osgEarth::ElevationInterpolation& interp = _update_mapf->getMapOptions().elevationInterpolation().get();
 
     // Request a heightfield from the map, falling back on lower resolution tiles
-    int tileSize = _terrainOptions.tileSize().get();    
+    int tileSize = _terrainOptions.tileSize().get();
     osg::ref_ptr<osg::HeightField> hf = HeightFieldUtils::createReferenceHeightField( key.getExtent(), tileSize, tileSize, 0u );
 
     TileKey sampleKey = key;
@@ -736,7 +720,7 @@
                     return 0;
                 }
             }
-        }       
+        }
     }
 
     if (!populated)
@@ -750,7 +734,7 @@
     model->_elevationData = TileModel::ElevationData(
         hf.get(),
         GeoLocator::createForKey( sampleKey, mapInfo ),
-        false );        
+        false );
 
     bool optimizeTriangleOrientation = getMap()->getMapOptions().elevationInterpolation() != INTERP_TRIANGULATE;
 
@@ -805,6 +789,7 @@
             switch( change.getAction() )
             {
             case MapModelChange::ADD_LAYER:
+            case MapModelChange::ENABLE_LAYER:
                 if (change.getImageLayer())
                     addImageLayer(change.getImageLayer());
                 else if (change.getElevationLayer())
@@ -812,6 +797,7 @@
                 break;
 
             case MapModelChange::REMOVE_LAYER:
+            case MapModelChange::DISABLE_LAYER:
                 if (change.getImageLayer())
                     removeImageLayer(change.getImageLayer());
                 else if (change.getElevationLayer())
@@ -825,11 +811,17 @@
                     moveElevationLayer(change.getElevationLayer());
                 break;
 
-            case MapModelChange::TOGGLE_ELEVATION_LAYER:
-                toggleElevationLayer( change.getElevationLayer() );
+            case MapModelChange::TOGGLE_LAYER:
+            {
+                ElevationLayer* elevationLayer = change.getElevationLayer();
+                if (elevationLayer)
+                {
+                    toggleElevationLayer(elevationLayer);
+                }
                 break;
+            }
 
-            default: 
+            default:
                 break;
             }
         }
@@ -936,7 +928,7 @@
 
 void
 MPTerrainEngineNode::moveElevationLayer(ElevationLayer* layer)
-{    
+{
     // only need to refresh the terrain if the layer is visible
     if (layer->getVisible())
     {
@@ -969,13 +961,13 @@
         osg::StateSet* terrainStateSet = getTerrainStateSet();
         if ( !terrainStateSet )
             return;
-        
+
         // required for multipass tile rendering to work
         terrainStateSet->setAttributeAndModes(
             new osg::Depth(osg::Depth::LEQUAL, 0, 1, true) );
 
         // activate standard mix blending.
-        terrainStateSet->setAttributeAndModes( 
+        terrainStateSet->setAttributeAndModes(
             new osg::BlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA),
             osg::StateAttribute::ON );
 
@@ -990,13 +982,13 @@
 
             package.replace( "$MP_PRIMARY_UNIT",   Stringify() << _primaryUnit );
             package.replace( "$MP_SECONDARY_UNIT", Stringify() << (_secondaryUnit>=0?_secondaryUnit:0) );
-                
+
             package.define( "MP_USE_BLENDING", (_terrainOptions.enableBlending() == true) );
 
             package.load( vp, package.EngineVertexModel );
             package.load( vp, package.EngineVertexView );
             package.load( vp, package.EngineFragment );
-            
+
             if ( this->normalTexturesRequired() )
             {
                 package.load( vp, package.NormalMapVertex );
@@ -1086,7 +1078,7 @@
             }
 
             // binding for the terrain texture
-            terrainStateSet->getOrCreateUniform( 
+            terrainStateSet->getOrCreateUniform(
                 "oe_layer_tex", osg::Uniform::SAMPLER_2D )->set( _primaryUnit );
 
             // binding for the secondary texture (for LOD blending)
@@ -1128,7 +1120,7 @@
             terrainStateSet->addUniform( new osg::Uniform("oe_layer_minRange", 0.0f) );
             terrainStateSet->addUniform( new osg::Uniform("oe_layer_maxRange", FLT_MAX) );
             terrainStateSet->addUniform( new osg::Uniform("oe_layer_attenuationRange", _terrainOptions.attenuationDistance().get()) );
-            
+
             terrainStateSet->getOrCreateUniform(
                 "oe_min_tile_range_factor",
                 osg::Uniform::FLOAT)->set( *_terrainOptions.minTileRangeFactor() );
@@ -1152,7 +1144,7 @@
                         terrainStateSet->addUniform( new osg::Uniform(
                             layer->shareTexUniformName()->c_str(),
                             layer->shareImageUnit().get() ) );
-                        
+
                     }
                 }
             }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/MPTerrainEngineOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -40,7 +40,6 @@
             _quickRelease      ( true ),
             _normalizeEdges    ( true ),
             _color             ( Color::White ),
-            _incrementalUpdate ( false ),
             _smoothing         ( false ),
             _normalMaps        ( false ),
             _adaptivePolarRangeFactor( true )
@@ -92,12 +91,6 @@
         optional<bool>& adaptivePolarRangeFactor() { return _adaptivePolarRangeFactor; }
         const optional<bool>& adaptivePolarRangeFactor() const { return _adaptivePolarRangeFactor; }
 
-    public:
-
-        /** @deprecated */
-        optional<bool>& incrementalUpdate() { return _incrementalUpdate; }
-        const optional<bool>& incrementalUpdate() const { return _incrementalUpdate; }
-
     protected:
         virtual Config getConfig() const {
             Config conf = TerrainOptions::getConfig();
@@ -105,7 +98,6 @@
             conf.set( "quick_release_gl_objects", _quickRelease );
             conf.set( "normalize_edges", _normalizeEdges);
             conf.set( "color", _color );
-            conf.set( "incremental_update", _incrementalUpdate );
             conf.set( "elevation_smoothing", _smoothing );
             conf.set( "normal_maps", _normalMaps );
             conf.set( "adaptive_polar_range_factor", _adaptivePolarRangeFactor);
@@ -120,14 +112,13 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "skirt_ratio", _skirtRatio );
-            conf.getIfSet( "quick_release_gl_objects", _quickRelease );
-            conf.getIfSet( "normalize_edges", _normalizeEdges );
-            conf.getIfSet( "color", _color );
-            conf.getIfSet( "incremental_update", _incrementalUpdate );
-            conf.getIfSet( "elevation_smoothing", _smoothing );
-            conf.getIfSet( "normal_maps", _normalMaps );
-            conf.getIfSet( "adaptive_polar_range_factor", _adaptivePolarRangeFactor);
+            conf.get( "skirt_ratio", _skirtRatio );
+            conf.get( "quick_release_gl_objects", _quickRelease );
+            conf.get( "normalize_edges", _normalizeEdges );
+            conf.get( "color", _color );
+            conf.get( "elevation_smoothing", _smoothing );
+            conf.get( "normal_maps", _normalMaps );
+            conf.get( "adaptive_polar_range_factor", _adaptivePolarRangeFactor);
        }
 
         optional<float>               _skirtRatio;
@@ -135,7 +126,6 @@
         optional<float>               _lodFallOff;
         optional<bool>                _normalizeEdges;
         optional<Color>               _color;
-        optional<bool>                _incrementalUpdate;
         optional<bool>                _smoothing;
         optional<bool>                _normalMaps;
         optional<bool>                _adaptivePolarRangeFactor;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/SingleKeyNodeFactory.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -67,7 +67,7 @@
     unsigned minLevel = _frame.getHighestMinLevel();
 
     return _options.minLOD().isSet() ?
-        std::max( _options.minLOD().value(), minLevel ) :
+        osg::maximum( _options.minLOD().value(), minLevel ) :
         minLevel;
 }
 
@@ -302,14 +302,7 @@
 
     if ( makeTile )
     {
-        if ( _options.incrementalUpdate() == true )
-        {
-            quad = new TileGroup(key, _engine->getUID(), _liveTiles.get(), _releaser.get());
-        }
-        else
-        {
-            quad = new osg::Group();
-        }
+        quad = new osg::Group();
 
         for( unsigned q=0; q<4; ++q )
         {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/SurfaceNodeFactory.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/SurfaceNodeFactory.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/SurfaceNodeFactory.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/SurfaceNodeFactory.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -66,7 +66,7 @@
     unsigned numIndiciesInSurface = (_tileSize-1) * (_tileSize-1) * 6;
     unsigned numIncidesInSkirt   = _createSkirt ? (_tileSize-1) * 4 * 6 : 0;
     
-    // Pre-allocate enought space for all triangles.
+    // Pre-allocate enough space for all triangles.
     _surfacePrimSet = newDrawElements(GL_TRIANGLES);
     _surfacePrimSet->reserveElements(numIndiciesInSurface + numIncidesInSkirt);
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TerrainNode osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TerrainNode
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TerrainNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TerrainNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TerrainNode.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TerrainNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TerrainNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TerrainNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileGroup osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileGroup
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileGroup	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileGroup	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
     using namespace osgEarth;
 
     /**
-     * TileGroup is a group node that contians four sibling TileNodes
+     * TileGroup is a group node that contains four sibling TileNodes
      * in the quadtree structure. It has the ability to update itself
      * by checking the map revision and scheduling an incremental
      * update of its TileNode set.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileGroup.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileGroup.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileGroup.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileGroup.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModel osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModel
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModel	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModel	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -301,7 +301,7 @@
         osg::ref_ptr<osg::StateSet>        _parentStateSet;
         osg::observer_ptr<const TileModel> _parentModel;
 
-        // convenience funciton to pull out a layer by its UID.
+        // convenience function to pull out a layer by its UID.
         bool getColorData( UID layerUID, ColorData& out ) const {
             ColorDataByUID::const_iterator i = _colorData.find( layerUID );
             if ( i != _colorData.end() ) {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModelCompiler osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModelCompiler
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModelCompiler	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModelCompiler	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -32,6 +32,7 @@
 #include <osgEarth/Progress>
 #include <osgEarth/MaskLayer>
 #include <osgEarth/ModelLayer>
+#include <osgEarth/MapFrame>
 
 #include <osg/Node>
 #include <osg/StateSet>
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModelCompiler.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModelCompiler.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModelCompiler.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModelCompiler.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -357,25 +357,22 @@
         d.surface->setVertexArray( d.surfaceVerts.get() );
 
         // allocate and assign normals
-        d.normals = new osg::Vec3Array();
+        d.normals = new osg::Vec3Array(osg::Array::BIND_PER_VERTEX);
         d.normals->reserve( d.numVerticesInSurface );
         d.surface->setNormalArray( d.normals.get() );
-        d.surface->setNormalBinding( osg::Geometry::BIND_PER_VERTEX );
 
         // vertex attribution
         // for each vertex, a vec4 containing a unit extrusion vector in [0..2] and the raw elevation in [3]
-        d.surfaceAttribs = new osg::Vec4Array();
+        d.surfaceAttribs = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
+        d.surfaceAttribs->setNormalize(false);
         d.surfaceAttribs->reserve( d.numVerticesInSurface );
         d.surface->setVertexAttribArray( osg::Drawable::ATTRIBUTE_6, d.surfaceAttribs.get() );
-        d.surface->setVertexAttribBinding( osg::Drawable::ATTRIBUTE_6, osg::Geometry::BIND_PER_VERTEX );
-        d.surface->setVertexAttribNormalize( osg::Drawable::ATTRIBUTE_6, false );
 
         // for each vertex, index 0 holds the interpolated elevation from the lower lod (for morphing)
-        d.surfaceAttribs2 = new osg::Vec4Array();
+        d.surfaceAttribs2 = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
+        d.surfaceAttribs2->setNormalize(false);
         d.surfaceAttribs2->reserve( d.numVerticesInSurface );
         d.surface->setVertexAttribArray( osg::Drawable::ATTRIBUTE_7, d.surfaceAttribs2.get() );
-        d.surface->setVertexAttribBinding( osg::Drawable::ATTRIBUTE_7, osg::Geometry::BIND_PER_VERTEX );
-        d.surface->setVertexAttribNormalize( osg::Drawable::ATTRIBUTE_7, false );
         
         // temporary data structures for triangulation support
         d.elevations = new osg::FloatArray();
@@ -724,7 +721,7 @@
 
     /**
      * If there are masking records, calculate the vertices to bound the masked area
-     * and the internal verticies to populate it. Then build a triangulation of the
+     * and the internal vertices to populate it. Then build a triangulation of the
      * area inside the masking bounding box and add this to the surface geode.
      */
     void createMaskGeometry( Data& d )
@@ -957,7 +954,7 @@
                 for (osg::Vec3Array::iterator it = maskConstraint->begin(); it != maskConstraint->end(); ++it)
                 {
                     //If the z-value was set from a mask vertex there is no need to change it.  If
-                    //it was set from a vertex from the stitching polygon it may need overriden if
+                    //it was set from a vertex from the stitching polygon it may need overridden if
                     //the vertex lies along a mask edge.  Or if it is unset, it will need to be set.
                     //if (isZSet[count] < 2)
                     if (!isZSet[count])
@@ -1063,25 +1060,22 @@
             stitch_verts->reserve(trig->getInputPointArray()->size());
             stitch_geom->setVertexArray(stitch_verts.get());
 
-            osg::ref_ptr<osg::Vec3Array> stitch_norms = new osg::Vec3Array(trig->getInputPointArray()->size());
+            osg::ref_ptr<osg::Vec3Array> stitch_norms = new osg::Vec3Array(osg::Array::BIND_PER_VERTEX, trig->getInputPointArray()->size());
             stitch_geom->setNormalArray( stitch_norms.get() );
-            stitch_geom->setNormalBinding( osg::Geometry::BIND_PER_VERTEX );
 
 
             // vertex attribution
             // for each vertex, a vec4 containing a unit extrusion vector in [0..2] and the raw elevation in [3]
-            osg::ref_ptr<osg::Vec4Array> surfaceAttribs = new osg::Vec4Array();
+            osg::ref_ptr<osg::Vec4Array> surfaceAttribs = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
+            surfaceAttribs->setNormalize(false);
             surfaceAttribs->reserve( trig->getInputPointArray()->size() );
             stitch_geom->setVertexAttribArray( osg::Drawable::ATTRIBUTE_6, surfaceAttribs.get() );
-            stitch_geom->setVertexAttribBinding( osg::Drawable::ATTRIBUTE_6, osg::Geometry::BIND_PER_VERTEX );
-            stitch_geom->setVertexAttribNormalize( osg::Drawable::ATTRIBUTE_6, false );
 
             // for each vertex, index 0 holds the interpolated elevation from the lower lod (for morphing)
-            osg::ref_ptr<osg::Vec4Array> surfaceAttribs2 = new osg::Vec4Array();
+            osg::ref_ptr<osg::Vec4Array> surfaceAttribs2 = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
+            surfaceAttribs2->setNormalize(false);
             surfaceAttribs2->reserve( trig->getInputPointArray()->size() );
             stitch_geom->setVertexAttribArray( osg::Drawable::ATTRIBUTE_7, surfaceAttribs2.get() );
-            stitch_geom->setVertexAttribBinding( osg::Drawable::ATTRIBUTE_7, osg::Geometry::BIND_PER_VERTEX );
-            stitch_geom->setVertexAttribNormalize( osg::Drawable::ATTRIBUTE_7, false );
 
 
             //Initialize tex coords
@@ -1179,7 +1173,7 @@
             }
 
 
-            // Get triangles from triangulator and add as primative set to the geometry
+            // Get triangles from triangulator and add as primitive set to the geometry
             osg::ref_ptr<osg::DrawElementsUInt> tris = trig->getTriangles();
             if ( tris && tris->getNumIndices() >= 3 )
             {
@@ -1610,10 +1604,10 @@
 
             // Utility arrays:
             std::vector<osg::Vec3> boundaryVerts;
-            boundaryVerts.reserve( 2 * std::max(d.numRows, d.numCols) );
+            boundaryVerts.reserve( 2 * osg::maximum(d.numRows, d.numCols) );
 
             std::vector< float > boundaryElevations;
-            boundaryElevations.reserve( 2 * std::max(d.numRows, d.numCols) );
+            boundaryElevations.reserve( 2 * osg::maximum(d.numRows, d.numCols) );
 
             //Recalculate the west side
             if (w_neighbor && w_neighbor->getNumColumns() == d.originalNumCols && w_neighbor->getNumRows() == d.originalNumRows)
@@ -2110,10 +2104,9 @@
             de->push_back(2); de->push_back(6);
             geom->addPrimitiveSet(de);
 
-            osg::Vec4Array* c= new osg::Vec4Array();
+            osg::Vec4Array* c= new osg::Vec4Array(osg::Array::BIND_OVERALL);
             c->push_back(osg::Vec4(0,1,1,1));
             geom->setColorArray(c);
-            geom->setColorBinding(geom->BIND_OVERALL);
 
             geode->addDrawable(geom);
 
@@ -2135,7 +2128,7 @@
         geode->addDrawable(t);
 
         geode->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(),0);
-        geode->getOrCreateStateSet()->setMode(GL_LIGHTING,0);
+        geode->getOrCreateStateSet()->setMode(GL_LIGHTING,0); // ok .. FFP debugging code
 
         return geode;
     }
@@ -2224,7 +2217,7 @@
     {
         d.surfaceGeode->addDrawable( d.surface );
 
-        // tesselate the surface verts into triangles.
+        // tessellate the surface verts into triangles.
         tessellateSurfaceGeometry( d, _optimizeTriOrientation, *_options.normalizeEdges() );
 
         // build the skirts.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModel.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModel.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModel.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModel.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModelFactory osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModelFactory
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModelFactory	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModelFactory	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -64,7 +64,7 @@
             const MapFrame&          frame,         // map frame from which to get data
             bool                     accumulate,    // whether to accumulate values from parent tile(s)
             osg::ref_ptr<TileModel>& out_model,     // output or NULL upon failure
-            ProgressCallback*        progress);     // progess tracking
+            ProgressCallback*        progress);     // progress tracking
 
         void setNormalMapUnit(int unit) { _normalMapUnit = unit; }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModelFactory.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModelFactory.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileModelFactory.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileModelFactory.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -84,20 +84,10 @@
             const Profile* layerProfile = _layer->getProfile();
 
             //Only try to get data from the source if it actually intersects the key extent
-            bool hasDataInExtent = _layer->mayHaveDataInExtent(_key.getExtent());
-            //bool hasDataInExtent = true;
-            //if (tileSource && layerProfile)
-            //{
-            //    GeoExtent ext = _key.getExtent();
-            //    if (!layerProfile->getSRS()->isEquivalentTo( ext.getSRS()))
-            //    {
-            //        ext = layerProfile->clampAndTransformExtent( ext );
-            //    }
-            //    hasDataInExtent = tileSource->hasDataInExtent( ext );
-            //}
+            bool hasDataInExtent = _layer->mayHaveData(_key);
             
             // fetch the image from the layer.
-            if (hasDataInExtent && _layer->isKeyInLegalRange(_key))
+            if ((hasDataInExtent && _layer->isKeyInLegalRange(_key)) || isRootKey)
             {
                 if ( useMercatorFastPath )
                 {
@@ -515,4 +505,9 @@
     }
 
     out_model = model.release();
+
+    if (progress && progress->isCanceled())
+    {
+        out_model = 0;
+    }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileNode osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileNode
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileNode.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileNodeRegistry osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileNodeRegistry
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileNodeRegistry	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileNodeRegistry	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileNodeRegistry.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileNodeRegistry.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TileNodeRegistry.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TileNodeRegistry.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TilePagedLOD osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TilePagedLOD
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TilePagedLOD	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TilePagedLOD	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TilePagedLOD.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TilePagedLOD.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_mp/TilePagedLOD.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_mp/TilePagedLOD.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -117,12 +117,16 @@
 {
     if ( live )
     {
+// Disabling progress cancellation for mp engine.  This is causing issuses periodically with flat heightfields being generated and 
+// we haven't found an immediate fix for it yet.
+#if 0
         _progress = new MyProgressCallback();
         _progress->_frameOfLastCull = 0;
         _progress->_tiles = live;
         osgDB::Options* options = Registry::instance()->cloneOrCreateOptions();
         options->setUserData( _progress.get() );
         setDatabaseOptions( options );
+#endif
     }
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Common osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Common
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Common	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/DrawState osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/DrawState
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/DrawState	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/DrawState	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -79,17 +79,14 @@
         GLint _tileKeyUL;
         GLint _parentTextureExistsUL;
         GLint _layerUidUL;
-        GLint _layerOpacityUL;
         GLint _layerOrderUL;
-        GLint _layerMinRangeUL;
-        GLint _layerMaxRangeUL;
         GLint _elevTexelCoeffUL;
         GLint _morphConstantsUL;
 
-        optional<int>        _layerOrder;
         optional<osg::Vec2f> _elevTexelCoeff;
         optional<osg::Vec2f> _morphConstants;
         optional<bool>       _parentTextureExists;
+        optional<int>        _layerOrder;
 
         const osg::Program::PerContextProgram* _pcp;
 
@@ -101,10 +98,7 @@
             _tileKeyUL(-1),
             _parentTextureExistsUL(-1),
             _layerUidUL(-1),
-            _layerOpacityUL(-1),
             _layerOrderUL(-1),
-            _layerMinRangeUL(-1),
-            _layerMaxRangeUL(-1),
             _elevTexelCoeffUL(-1),
             _morphConstantsUL(-1),
             _ext(0L),
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/DrawState.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/DrawState.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/DrawState.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/DrawState.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -42,7 +42,7 @@
     if (pcp && (pcp != _pcp))
     {
         // Reset all sampler matrix states since their uniform locations are going to change.
-        _layerOrder.clear();
+        //_runningLayerDrawOrder = 0;
         _elevTexelCoeff.clear();
         _morphConstants.clear();
         _parentTextureExists.clear();
@@ -61,10 +61,7 @@
         _elevTexelCoeffUL = pcp->getUniformLocation(osg::Uniform::getNameID("oe_tile_elevTexelCoeff"));
         _parentTextureExistsUL = pcp->getUniformLocation(osg::Uniform::getNameID("oe_layer_texParentExists"));
         _layerUidUL = pcp->getUniformLocation(osg::Uniform::getNameID("oe_layer_uid"));
-        _layerOpacityUL = pcp->getUniformLocation(osg::Uniform::getNameID("oe_layer_opacity"));
         _layerOrderUL = pcp->getUniformLocation(osg::Uniform::getNameID("oe_layer_order"));
-        _layerMinRangeUL = pcp->getUniformLocation(osg::Uniform::getNameID("oe_layer_minRange"));
-        _layerMaxRangeUL = pcp->getUniformLocation(osg::Uniform::getNameID("oe_layer_maxRange"));
         _morphConstantsUL = pcp->getUniformLocation(osg::Uniform::getNameID("oe_tile_morph"));
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/DrawTileCommand osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/DrawTileCommand
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/DrawTileCommand	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/DrawTileCommand	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -75,10 +75,11 @@
         // Distance from camera to center of tile
         float _range;
 
-        // Tile draw order
-        int _order;
-
+        // Layer order for this tile. i.e., if this is zero, then this command
+        // is drawing a tile for the first LayerDrawable.
+        int _layerOrder;
 
+        // Renders the tile.
         void draw(osg::RenderInfo& ri, DrawState& ds, osg::Referenced* layerData) const;
 
         // Less than operator will ensure that tiles are sorted high-to-low LOD
@@ -100,14 +101,15 @@
             _drawCallback(0L),
             _drawPatch(false),
             _range(0.0f),
-            _order(0) { }
+            _layerOrder(INT_MAX){ }
     };
 
     /**
      * Ordered list of tile drawing commands.
      * List is faster than vector here (benchmarked)
      */
-    typedef std::list<DrawTileCommand> DrawTileCommands;
+    //typedef std::list<DrawTileCommand> DrawTileCommands;
+    typedef std::vector<DrawTileCommand> DrawTileCommands;
 
 } } } // namespace 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/DrawTileCommand.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/DrawTileCommand.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/DrawTileCommand.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/DrawTileCommand.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -29,8 +29,6 @@
     PerContextDrawState& ds = dsMaster.getPCDS(ri.getContextID());
 
     osg::State& state = *ri.getState();
-
-    //OE_INFO << LC << "      TILE: " << _geom << std::endl;
         
     // Tile key encoding, if the uniform is required.
     if (ds._tileKeyUL >= 0 )
@@ -38,10 +36,11 @@
         ds._ext->glUniform4fv(ds._tileKeyUL, 1, _keyValue.ptr());
     }
 
-    if (ds._layerOrderUL >= 0 && !ds._layerOrder.isSetTo(_order))
+    // Apply the layer draw order for this tile so we can blend correctly:
+    if (ds._layerOrderUL >= 0 && !ds._layerOrder.isSetTo(_layerOrder))
     {
-        ds._ext->glUniform1i(ds._layerOrderUL, (GLint)_order);
-        ds._layerOrder = _order;
+        ds._ext->glUniform1i(ds._layerOrderUL, (GLint)_layerOrder);
+        ds._layerOrder = _layerOrder;
     }
 
     // Elevation coefficients (can probably be terrain-wide)
@@ -148,8 +147,7 @@
     // If there's a geometry, draw it now:
     if (_geom.valid())
     {
-        GLenum ptype = _drawPatch ? GL_PATCHES : GL_TRIANGLES;
-
-        _geom->render(ptype, ri);
+        _geom->_ptype[ri.getContextID()] = _drawPatch ? GL_PATCHES : _geom->getDrawElements()->getMode(); //GL_TRIANGLES;
+        _geom->draw(ri);
     }    
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/EngineContext osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/EngineContext
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/EngineContext	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/EngineContext	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -30,7 +30,6 @@
 #include "TileDrawable"
 
 #include <osgEarth/TerrainTileModel>
-#include <osgEarth/MapFrame>
 #include <osgEarth/Progress>
 #include <osgEarth/TerrainEngineNode>
 #include <osgEarth/TileRasterizer>
@@ -62,8 +61,7 @@
             TileNodeRegistry*                   liveTiles,
             const RenderBindings&               renderBindings,
             const RexTerrainEngineOptions&      options,
-            const SelectionInfo&                selectionInfo,
-            ModifyBoundingBoxCallback*          modifyBBoxCallback);
+            const SelectionInfo&                selectionInfo);
         
         Loader* getLoader() const { return _loader; }
 
@@ -73,10 +71,7 @@
 
         GeometryPool* getGeometryPool() const { return _geometryPool; }
 
-        // Raw pointer to the Map. Only call this from the MAIN thread. DO NOT access this
-        // from a pager thread. Instead, create a MapFrame from it in the MAIN thread and
-        // use THAT from the pager thread.
-        const Map* getMap() const;
+        osg::ref_ptr<const Map> getMap() const;
 
         // only call this variant when it's safe to do so (update, cull).
         TerrainEngineNode* getEngine() const { return _terrainEngine.get(); }
@@ -112,8 +107,8 @@
     public:
         
         osg::observer_ptr<TerrainEngineNode>  _terrainEngine;
+        osg::observer_ptr<const Map>          _map;
         int                                   _mainThreadId;
-        const Map*                            _map;
         TileNodeRegistry*                     _liveTiles;
         const RexTerrainEngineOptions&        _options;
         const RenderBindings&                 _renderBindings;
@@ -126,7 +121,7 @@
         int                                   _tilesLastCull;
         osg::ref_ptr<ProgressCallback>        _progress;    
         double                                _expirationRange2;
-        ModifyBoundingBoxCallback*            _bboxCB;
+        osg::ref_ptr<ModifyBoundingBoxCallback> _bboxCB;
     };
 
 } } } // namespace osgEarth::Drivers::RexTerrainEngine
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/EngineContext.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/EngineContext.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/EngineContext.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/EngineContext.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -41,8 +41,7 @@
                              TileNodeRegistry*              liveTiles,
                              const RenderBindings&          renderBindings,
                              const RexTerrainEngineOptions& options,
-                             const SelectionInfo&           selectionInfo,
-                             ModifyBoundingBoxCallback*     bboxCB) :
+                             const SelectionInfo&           selectionInfo) :
 _map           ( map ),
 _terrainEngine ( terrainEngine ),
 _geometryPool  ( geometryPool ),
@@ -53,25 +52,20 @@
 _renderBindings( renderBindings ),
 _options       ( options ),
 _selectionInfo ( selectionInfo ),
-_bboxCB        ( bboxCB ),
 _tick(0),
 _tilesLastCull(0)
 {
     _expirationRange2 = _options.expirationRange().get() * _options.expirationRange().get();
     _mainThreadId = Threading::getCurrentThreadId();
+    _bboxCB = new ModifyBoundingBoxCallback(this);
 }
 
-const Map*
+osg::ref_ptr<const Map>
 EngineContext::getMap() const
 {
-#if 0
-    // debugging check
-    if (Threading::getCurrentThreadId() != _mainThreadId)
-    {
-        OE_WARN << LC << "Illegal - do not call getMap from outside the main thread\n";
-    }
-#endif
-    return _map;
+    osg::ref_ptr<const Map> map;
+    _map.lock(map);
+    return map;
 }
 
 void
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/GeometryPool osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/GeometryPool
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/GeometryPool	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/GeometryPool	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -28,7 +28,7 @@
 #include <osgEarth/ResourceReleaser>
 #include <osg/Geometry>
 
-#if OSG_MIN_VERSION_REQUIRED(3,5,6)
+#if OSG_MIN_VERSION_REQUIRED(3,5,9)
 #define SUPPORTS_VAO 1
 #endif
 
@@ -62,6 +62,10 @@
         osg::Array* getNeighborArray() { return _neighborArray.get(); }
         const osg::Array* getNeighborArray() const { return _neighborArray.get(); }
 
+        void setNeighborNormalArray(osg::Array* array) { _neighborNormalArray = array; }
+        osg::Array* getNeighborNormalArray() { return _neighborNormalArray.get(); }
+        const osg::Array* getNeighborNormalArray() const { return _neighborNormalArray.get(); }
+
         void setDrawElements(osg::DrawElements* array) { _drawElements = array; }
         osg::DrawElements* getDrawElements() { return _drawElements.get(); }
         const osg::DrawElements* getDrawElements() const { return _drawElements.get(); }
@@ -70,43 +74,34 @@
         osg::DrawElements* getMaskElements() { return _maskElements.get(); }
         const osg::DrawElements* getMaskElements() const { return _maskElements.get(); }
 
+        // convert to a "real" geometry object
+        osg::Geometry* makeOsgGeometry();
+
+        // whether this geometry contains anything
+        bool empty() const;
+
+    public: // osg::Drawable
+
 #ifdef SUPPORTS_VAO
-    #if OSG_MIN_VERSION_REQUIRED(3,5,9)
         osg::VertexArrayState* createVertexArrayStateImplementation(osg::RenderInfo& renderInfo) const;
-    #else
-        osg::VertexArrayState* createVertexArrayState(osg::RenderInfo& renderInfo) const;
-    #endif
 #endif
 
-        void compileGLObjects(osg::RenderInfo& renderInfo) const;
-
-        void render(GLenum primitiveType, osg::RenderInfo& renderInfo) const;
+        void drawImplementation(osg::RenderInfo& renderInfo) const;
 
         void resizeGLObjectBuffers(unsigned int maxSize);
         void releaseGLObjects(osg::State* state) const;
         
-        virtual bool supports(const osg::Drawable::AttributeFunctor&) const { return true; }
-        virtual void accept(osg::Drawable::AttributeFunctor&);
-
-        virtual bool supports(const osg::Drawable::ConstAttributeFunctor&) const { return true; }
-        virtual void accept(osg::Drawable::ConstAttributeFunctor&) const;
+        bool supports(const osg::Drawable::AttributeFunctor&) const { return true; }
+        void accept(osg::Drawable::AttributeFunctor&);
 
-        virtual bool supports(const osg::PrimitiveFunctor&) const { return true; }
-        virtual void accept(osg::PrimitiveFunctor&) const;
+        bool supports(const osg::Drawable::ConstAttributeFunctor&) const { return true; }
+        void accept(osg::Drawable::ConstAttributeFunctor&) const;
 
-        virtual bool supports(const osg::PrimitiveIndexFunctor&) const { return true; }
-        virtual void accept(osg::PrimitiveIndexFunctor&) const;
+        bool supports(const osg::PrimitiveFunctor&) const { return true; }
+        void accept(osg::PrimitiveFunctor&) const;
 
-    public:
-
-        // internal function for testing
-        void drawImplementation(osg::RenderInfo& ri) const { render(GL_TRIANGLES, ri); }
-
-        // convert to a "real" geometry object
-        osg::Geometry* makeOsgGeometry();
-
-        // whether this geometry contains anything
-        bool empty() const;
+        bool supports(const osg::PrimitiveIndexFunctor&) const { return true; }
+        void accept(osg::PrimitiveIndexFunctor&) const;
 
     protected:
 
@@ -117,8 +112,14 @@
         osg::ref_ptr<osg::Array>        _colorArray;
         osg::ref_ptr<osg::Array>        _texcoordArray;
         osg::ref_ptr<osg::Array>        _neighborArray;
+        osg::ref_ptr<osg::Array>        _neighborNormalArray;
         osg::ref_ptr<osg::DrawElements> _drawElements;
         osg::ref_ptr<osg::DrawElements> _maskElements;
+
+    private:
+
+        friend struct DrawTileCommand;
+        mutable osg::buffered_object<GLenum> _ptype;
     };
 
     /**
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/GeometryPool.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/GeometryPool.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/GeometryPool.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/GeometryPool.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -51,11 +51,6 @@
 _enabled ( true ),
 _debug   ( false )
 {
-    // sign up for the update traversal so we can prune unused pool objects.
-    setNumChildrenRequiringUpdateTraversal(1u);
-
-    //_tileSize = _options.tileSize().get();
-
     // activate debugging mode
     if ( getenv("OSGEARTH_DEBUG_REX_GEOMETRY_POOL") != 0L )
     {
@@ -175,11 +170,15 @@
     verts->push_back( (*verts)[INDEX] ); \
     normals->push_back( (*normals)[INDEX] ); \
     texCoords->push_back( (*texCoords)[INDEX] ); \
+    texCoords->back().z() = (float)((int)texCoords->back().z() | VERTEX_MARKER_SKIRT); \
     if ( neighbors ) neighbors->push_back( (*neighbors)[INDEX] ); \
+    if ( neighborNormals ) neighborNormals->push_back( (*neighborNormals)[INDEX] ); \
     verts->push_back( (*verts)[INDEX] - ((*normals)[INDEX])*(HEIGHT) ); \
     normals->push_back( (*normals)[INDEX] ); \
     texCoords->push_back( (*texCoords)[INDEX] ); \
+    texCoords->back().z() = (float)((int)texCoords->back().z() | VERTEX_MARKER_SKIRT); \
     if ( neighbors ) neighbors->push_back( (*neighbors)[INDEX] - ((*normals)[INDEX])*(HEIGHT) ); \
+    if ( neighborNormals ) neighborNormals->push_back( (*neighborNormals)[INDEX] ); \
 }
 
 #define addSkirtTriangles(INDEX0, INDEX1) \
@@ -263,6 +262,7 @@
     geom->setNormalArray( normals.get() );
     
     osg::ref_ptr<osg::Vec3Array> neighbors = 0L;
+    osg::ref_ptr<osg::Vec3Array> neighborNormals = 0L;
     if ( _options.morphTerrain() == true )
     {
         // neighbor positions (for morphing)
@@ -271,6 +271,12 @@
         neighbors->setVertexBufferObject(vbo.get());
         neighbors->reserve( numVerts );
         geom->setNeighborArray(neighbors.get());
+        
+        neighborNormals = new osg::Vec3Array();
+        neighborNormals->setVertexBufferObject(vbo.get());
+        neighborNormals->reserve( numVerts );
+        neighborNormals->setBinding(neighborNormals->BIND_PER_VERTEX);
+        geom->setNeighborNormalArray( neighborNormals.get() );
     }
 
     // tex coord is [0..1] across the tile. The 3rd dimension tracks whether the
@@ -316,8 +322,8 @@
 
             if ( populateTexCoords )
             {
-                // if masked then set textCoord z-value to 0.0
-                float marker = maskSet ? maskSet->getMarker(nx, ny) : MASK_MARKER_NORMAL;
+                // Use the Z coord as a type marker
+                float marker = maskSet ? maskSet->getMarker(nx, ny) : VERTEX_MARKER_GRID;
                 texCoords->push_back( osg::Vec3f(nx, ny, marker) );
             }
 
@@ -330,9 +336,15 @@
             // neighbor:
             if ( neighbors )
             {
-                osg::Vec3d modelNeighborLTP = (*verts)[verts->size() - getMorphNeighborIndexOffset(col, row, tileSize)];
+                const osg::Vec3& modelNeighborLTP = (*verts)[verts->size() - getMorphNeighborIndexOffset(col, row, tileSize)];
                 neighbors->push_back(modelNeighborLTP);
             }
+
+            if ( neighborNormals )
+            {
+                const osg::Vec3& modelNeighborNormalLTP = (*normals)[normals->size() - getMorphNeighborIndexOffset(col, row, tileSize)];
+                neighborNormals->push_back(modelNeighborNormalLTP);
+            }
         }
     }
 
@@ -401,7 +413,7 @@
         {
             maskSet = 0L;
             for (osg::Vec3Array::iterator i = texCoords->begin(); i != texCoords->end(); ++i)
-                i->z() = MASK_MARKER_NORMAL;
+                i->z() = VERTEX_MARKER_GRID;
         }
 
         // If the boundary contains the entire tile, draw nothing!
@@ -504,19 +516,19 @@
 GeometryPool::setReleaser(ResourceReleaser* releaser)
 {
     if (_releaser.valid())
-        ADJUST_UPDATE_TRAV_COUNT(this, -1);
+        ADJUST_EVENT_TRAV_COUNT(this, -1);
 
     _releaser = releaser;
 
     if (_releaser.valid())
-        ADJUST_UPDATE_TRAV_COUNT(this, +1);
+        ADJUST_EVENT_TRAV_COUNT(this, +1);
 }
 
 
 void
 GeometryPool::traverse(osg::NodeVisitor& nv)
 {
-    if (nv.getVisitorType() == nv.UPDATE_VISITOR && _releaser.valid() && _enabled)
+    if (nv.getVisitorType() == nv.EVENT_VISITOR && _releaser.valid() && _enabled)
     {
         // look for usused pool objects and push them to the resource releaser.
         ResourceReleaser::ObjectList objects;
@@ -532,7 +544,7 @@
                     keys.push_back(i->first);
                     objects.push_back(i->second.get());
                     
-                    //OE_INFO << "Releasing: " << i->second.get() << std::endl;
+                    OE_DEBUG << "Releasing: " << i->second.get() << std::endl;
                 }
             }
             for (std::vector<GeometryKey>::iterator key = keys.begin(); key != keys.end(); ++key)
@@ -543,7 +555,7 @@
                 _geometryMap.erase(*key);
             }
 
-            //OE_WARN << "Released " << keys.size() << ", pool = " << _geometryMap.size() << std::endl;
+            //OE_INFO << "Released " << keys.size() << ", pool = " << _geometryMap.size() << std::endl;
         }
 
         if (!objects.empty())
@@ -598,6 +610,8 @@
 {
     setSupportsDisplayList(false);
     _supportsVertexBufferObjects = true;
+    _ptype.resize(64u);
+    _ptype.setAllElementsTo(GL_TRIANGLES);
 }
 
 SharedGeometry::SharedGeometry(const SharedGeometry& rhs,const osg::CopyOp& copyop):
@@ -606,6 +620,7 @@
     _normalArray(rhs._normalArray),
     _texcoordArray(rhs._texcoordArray),
     _neighborArray(rhs._neighborArray),
+    _neighborNormalArray(rhs._neighborNormalArray),
     _drawElements(rhs._drawElements),
     _maskElements(rhs._maskElements)
 {
@@ -625,7 +640,6 @@
         (_maskElements.valid() == false || _maskElements->getNumIndices() == 0);
 }
 
-
 #ifdef SUPPORTS_VAO
 #if OSG_MIN_VERSION_REQUIRED(3,5,9)
 osg::VertexArrayState* SharedGeometry::createVertexArrayStateImplementation(osg::RenderInfo& renderInfo) const
@@ -642,7 +656,7 @@
     unsigned texUnits = 0;
     if (_neighborArray.valid())
     {
-        texUnits = 2;
+        texUnits = 3;
     }
     else if (_texcoordArray.valid())
     {
@@ -650,6 +664,7 @@
     }
     if (texUnits)
         vas->assignTexCoordArrayDispatcher(texUnits);
+
     if (state.useVertexArrayObject(_useVertexArrayObject))
     {
         vas->generateVertexArrayObject();
@@ -659,62 +674,6 @@
 }
 #endif
 
-void SharedGeometry::compileGLObjects(osg::RenderInfo& renderInfo) const
-{
-    if (!_vertexArray)
-        return;
-
-    if (_vertexArray->getVertexBufferObject())
-    {
-        osg::State& state = *renderInfo.getState();
-        unsigned int contextID = state.getContextID();
-        osg::GLExtensions* extensions = state.get<osg::GLExtensions>();
-        if (!extensions) return;
-
-        osg::BufferObject* vbo = _vertexArray->getVertexBufferObject();
-        osg::GLBufferObject* vbo_glBufferObject = vbo->getOrCreateGLBufferObject(contextID);
-        if (vbo_glBufferObject && vbo_glBufferObject->isDirty())
-        {
-            // OSG_NOTICE<<"Compile buffer "<<glBufferObject<<std::endl;
-            vbo_glBufferObject->compileBuffer();
-            extensions->glBindBuffer(GL_ARRAY_BUFFER_ARB,0);
-        }
-
-        osg::BufferObject* ebo = _drawElements->getElementBufferObject();
-        osg::GLBufferObject* ebo_glBufferObject = ebo->getOrCreateGLBufferObject(contextID);
-        if (ebo_glBufferObject && vbo_glBufferObject->isDirty())
-        {
-            // OSG_NOTICE<<"Compile buffer "<<glBufferObject<<std::endl;
-            ebo_glBufferObject->compileBuffer();
-            extensions->glBindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB,0);
-        }
-
-#ifdef SUPPORTS_VAO
-        if (state.useVertexArrayObject(_useVertexArrayObject))
-        {
-            osg::VertexArrayState* vas = 0;
-
-            _vertexArrayStateList[contextID] = vas = createVertexArrayState(renderInfo);
-
-            osg::State::SetCurrentVertexArrayStateProxy setVASProxy(state, vas);
-
-#if OSG_MIN_VERSION_REQUIRED(3,5,6)
-            state.bindVertexArrayObject(vas);
-#else
-            vas->bindVertexArrayObject();
-#endif
-
-            if (vbo_glBufferObject) vas->bindVertexBufferObject(vbo_glBufferObject);
-            if (ebo_glBufferObject) vas->bindElementBufferObject(ebo_glBufferObject);
-        }
-#endif
-    }
-    else
-    {
-        Drawable::compileGLObjects(renderInfo);
-    }
-}
-
 void SharedGeometry::resizeGLObjectBuffers(unsigned int maxSize)
 {
     osg::Drawable::resizeGLObjectBuffers(maxSize);
@@ -738,7 +697,7 @@
 }
 
 // called from DrawTileCommand
-void SharedGeometry::render(GLenum primitiveType, osg::RenderInfo& renderInfo) const
+void SharedGeometry::drawImplementation(osg::RenderInfo& renderInfo) const
 {
     osg::State& state = *renderInfo.getState();
     
@@ -754,10 +713,9 @@
 
 #ifdef SUPPORTS_VAO
     osg::VertexArrayState* vas = state.getCurrentVertexArrayState();
+    
     if (!state.useVertexArrayObject(_useVertexArrayObject) || vas->getRequiresSetArrays())
     {
-        // OSG_NOTICE<<"   sending vertex arrays vas->getRequiresSetArrays()="<<vas->getRequiresSetArrays()<<std::endl;
-
         vas->lazyDisablingOfVertexAttributes();
 
         // set up arrays
@@ -776,6 +734,9 @@
         if (_neighborArray.valid() && _neighborArray->getBinding()==osg::Array::BIND_PER_VERTEX)
             vas->setTexCoordArray(state, 1, _neighborArray.get());
 
+        if (_neighborNormalArray.valid() && _neighborNormalArray->getBinding()==osg::Array::BIND_PER_VERTEX)
+            vas->setTexCoordArray(state, 2, _neighborNormalArray.get());
+
         vas->applyDisablingOfVertexAttributes(state);
     }
     else
@@ -796,6 +757,9 @@
         if (_neighborArray.valid())
             state.setTexCoordPointer(1, _neighborArray.get());
 
+        if (_neighborNormalArray.valid())
+            state.setTexCoordPointer(2, _neighborNormalArray.get());
+
         state.applyDisablingOfVertexAttributes();
     }
 
@@ -806,15 +770,20 @@
     bool request_bind_unbind = true;
 #endif
 
+    GLenum primitiveType = _ptype[state.getContextID()];
+
     osg::GLBufferObject* ebo = _drawElements->getOrCreateGLBufferObject(state.getContextID());
 
     if (ebo)
     {
         /*if (request_bind_unbind)*/ state.bindElementBufferObject(ebo);
 
-        glDrawElements(primitiveType, _drawElements->getNumIndices(), _drawElements->getDataType(), (const GLvoid *)(ebo->getOffset(_drawElements->getBufferIndex())));
+        if (_drawElements->getNumIndices() > 0u)
+        {
+            glDrawElements(primitiveType, _drawElements->getNumIndices(), _drawElements->getDataType(), (const GLvoid *)(ebo->getOffset(_drawElements->getBufferIndex())));
+        }
 
-        if (_maskElements.valid())
+        if (_maskElements.valid() && _maskElements->getNumIndices() > 0u)
         {
             glDrawElements(primitiveType, _maskElements->getNumIndices(), _maskElements->getDataType(), (const GLvoid *)(ebo->getOffset(_maskElements->getBufferIndex())));
         }
@@ -823,9 +792,12 @@
     }
     else
     {
-        glDrawElements(primitiveType, _drawElements->getNumIndices(), _drawElements->getDataType(), _drawElements->getDataPointer());
+        if (_drawElements->getNumIndices() > 0u)
+        {
+            glDrawElements(primitiveType, _drawElements->getNumIndices(), _drawElements->getDataType(), _drawElements->getDataPointer());
+        }
 
-        if (_maskElements.valid())
+        if (_maskElements.valid() && _maskElements->getNumIndices() > 0u)
         {
             glDrawElements(primitiveType, _maskElements->getNumIndices(), _maskElements->getDataType(), _maskElements->getDataPointer());
         }
@@ -846,6 +818,7 @@
     afav.applyArray(NORMALS, _normalArray.get());
     afav.applyArray(TEXTURE_COORDS_0,_texcoordArray.get());
     afav.applyArray(TEXTURE_COORDS_1,_neighborArray.get());
+    afav.applyArray(TEXTURE_COORDS_2,_neighborNormalArray.get());
 }
 
 void SharedGeometry::accept(osg::Drawable::ConstAttributeFunctor& af) const
@@ -856,6 +829,7 @@
     afav.applyArray(NORMALS, _normalArray.get());
     afav.applyArray(TEXTURE_COORDS_0,_texcoordArray.get());
     afav.applyArray(TEXTURE_COORDS_1,_neighborArray.get());
+    afav.applyArray(TEXTURE_COORDS_2,_neighborNormalArray.get());
 }
 
 void SharedGeometry::accept(osg::PrimitiveFunctor& pf) const
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/LayerDrawable osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/LayerDrawable
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/LayerDrawable	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/LayerDrawable	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -29,6 +29,8 @@
 
 namespace osgEarth { namespace Drivers { namespace RexTerrainEngine
 {
+    class TerrainRenderData;
+
     /**
      * Drawable for single "Layer" i.e. rendering pass. 
      * It is important that LayerDrawables be rendered in the order in which
@@ -57,7 +59,7 @@
 
         // Layer render order, which is pushed into a Uniform at render time.
         // This value is assigned at cull time by RexTerrainEngineNode.
-        int _order;
+        int _drawOrder;
 
         // The last layer to render will have this flag set, which will
         // prompt the render to dirty the osg::State to prevent corruption.
@@ -66,6 +68,9 @@
 
         // Reference the terrain-wide state
         osg::ref_ptr<DrawState> _drawState;
+
+        // Whether to render this layer.
+        bool _draw;
         
 
     public: // osg::Drawable
@@ -75,6 +80,10 @@
         // All LayerDrawables share the common terrain bounds.
         osg::BoundingSphere computeBound() const { return _drawState->_bs; }
         osg::BoundingBox computeBoundingBox() const { return _drawState->_box; }
+
+    protected:
+        // overriden to prevent OSG from releasing GL objects on an attached stateset.
+        virtual ~LayerDrawable();
     };
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/LayerDrawable.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/LayerDrawable.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/LayerDrawable.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/LayerDrawable.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include "LayerDrawable"
+#include "TerrainRenderData"
 
 using namespace osgEarth::Drivers::RexTerrainEngine;
 
@@ -25,16 +26,57 @@
 
 
 LayerDrawable::LayerDrawable() :
-_renderType(Layer::RENDERTYPE_TILE),
-_order(0),
+_renderType(Layer::RENDERTYPE_TERRAIN_SURFACE),
+_drawOrder(0),
 _layer(0L),
-_clearOsgState(false)
+_visibleLayer(0L),
+_imageLayer(0L),
+_clearOsgState(false),
+_draw(true)
 {
     setDataVariance(DYNAMIC);
     setUseDisplayList(false);
     setUseVertexBufferObjects(true);
+    _tiles.reserve(128);
 }
 
+LayerDrawable::~LayerDrawable()
+{
+    // Drawable's DTOR will release GL objects on any attached stateset;
+    // we don't want that because our Layer stateset is shared and re-usable.
+    // So detach it before OSG has a chance to do so.
+    setStateSet(0L);
+}
+
+namespace
+{
+    // Hack State so we can dirty the texture attrs without dirtying the other 
+    // attributes (as dirtyAllAttributes() would do.
+    struct StateEx : public osg::State
+    {
+        void dirtyAllTextureAttributes()
+        {
+            // dirtyAllTextureAttributes. (Don't call state->dirtyAllAttributes because that
+            // will mess up positional state attributes like light sources)
+            for (TextureAttributeMapList::iterator tamItr = _textureAttributeMapList.begin();
+                tamItr != _textureAttributeMapList.end();
+                ++tamItr)
+            {
+                osg::State::AttributeMap& attributeMap = *tamItr;
+                for (osg::State::AttributeMap::iterator aitr = attributeMap.begin();
+                    aitr != attributeMap.end();
+                    ++aitr)
+                {
+                    osg::State::AttributeStack& as = aitr->second;
+                    as.last_applied_attribute = 0;
+                    as.changed = true;
+                }
+            }
+        }
+    };
+}
+
+
 void
 LayerDrawable::drawImplementation(osg::RenderInfo& ri) const
 {
@@ -45,27 +87,14 @@
 
     ds.refresh(ri, _drawState->_bindings);
 
-    if (_layer)
+    if (ds._layerUidUL >= 0)
     {
-        if (ds._layerUidUL >= 0)
-            ds._ext->glUniform1i(ds._layerUidUL,      (GLint)_layer->getUID());
-        if (ds._layerOpacityUL >= 0 && _visibleLayer)
-            ds._ext->glUniform1f(ds._layerOpacityUL,  (GLfloat)_visibleLayer->getOpacity());
-        if (ds._layerMinRangeUL >= 0 && _imageLayer)
-            ds._ext->glUniform1f(ds._layerMinRangeUL, (GLfloat)_imageLayer->getMinVisibleRange());
-        if (ds._layerMaxRangeUL >= 0 && _imageLayer)
-            ds._ext->glUniform1f(ds._layerMaxRangeUL, (GLfloat)_imageLayer->getMaxVisibleRange());
+        GLint uid = _layer ? (GLint)_layer->getUID() : (GLint)-1;
+        ds._ext->glUniform1i(ds._layerUidUL, uid);
     }
     else
     {
-        if (ds._layerUidUL >= 0)
-            ds._ext->glUniform1i(ds._layerUidUL,      (GLint)-1);
-        if (ds._layerOpacityUL >= 0)
-            ds._ext->glUniform1f(ds._layerOpacityUL,  (GLfloat)1.0f);
-        if (ds._layerMinRangeUL >= 0)
-            ds._ext->glUniform1f(ds._layerMinRangeUL, (GLfloat)0.0f);
-        if (ds._layerMaxRangeUL >= 0)
-            ds._ext->glUniform1f(ds._layerMaxRangeUL, (GLfloat)FLT_MAX);
+        // This just means that the fragment shader for this layer doesn't use oe_layer_uid
     }
 
     for (DrawTileCommands::const_iterator tile = _tiles.begin(); tile != _tiles.end(); ++tile)
@@ -77,8 +106,10 @@
     // necessary when doing custom OpenGL within a Drawable.
     if (_clearOsgState)
     {
-        // Necessary because tile->draw() applies texture attributes without informing the State:
-        ri.getState()->dirtyAllAttributes();
+        // Dirty the texture attributes so OSG can properly reset them
+        // NOTE: cannot call state.dirtyAllAttributes, because that would invalidate
+        // positional state like light sources!
+        reinterpret_cast<StateEx*>(ri.getState())->dirtyAllTextureAttributes();
 
         // NOTE: this is a NOOP in OSG 3.5.x, but not in 3.4.x ... Later we will need to
         // revisit whether to call disableAllVertexArrays() in 3.5.x instead.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Loader osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Loader
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Loader	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Loader	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -24,6 +24,7 @@
 #include <osgEarth/IOTypes>
 #include <osgEarth/ThreadingUtils>
 #include <osgEarth/TileKey>
+#include <osgEarth/Progress>
 
 #include <osg/ref_ptr>
 #include <osg/Group>
@@ -62,7 +63,7 @@
             const TileKey& getTileKey() const { return _key; }
 
             /** Invoke the operation - not safe to alter the graph */
-            virtual void invoke() { }
+            virtual void invoke(ProgressCallback*) { }
 
             /** Apply the results of the invoke operation - runs safely in update stage */
             virtual void apply(const osg::FrameStamp*) { }
@@ -79,8 +80,8 @@
 
             UID getUID() const { return _uid; }
 
-            /** Access the stateset that holds optional GL-compilable objects. */
-            osg::StateSet* getStateSet();
+            /** Creates a stateset that holds GL-compilable objects. */
+            virtual osg::StateSet* createStateSet() const =0; // { return 0L; }
 
             void setFrameNumber(unsigned fn) { _lastFrameSubmitted = fn; }
             unsigned getLastFrameSubmitted() const { return _lastFrameSubmitted; }
@@ -111,7 +112,6 @@
             osg::ref_ptr<osg::Referenced> _internalHandle;
             unsigned                      _lastFrameSubmitted;
             osg::Timer_t                  _lastTick;
-            osg::ref_ptr<osg::StateSet>   _stateSet;
             mutable Threading::Mutex      _lock;
             int                           _loadCount;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Loader.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Loader.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Loader.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Loader.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -46,17 +46,6 @@
     _lastTick = 0;
 }
 
-osg::StateSet*
-Loader::Request::getStateSet()
-{
-    if ( !_stateSet.valid() )
-    {
-        _stateSet = new osg::StateSet();
-        _stateSet->setDataVariance( osg::Object::DYNAMIC );
-    }
-    return _stateSet.get();
-}
-
 void
 Loader::Request::addToChangeSet(osg::Node* node)
 {
@@ -66,6 +55,41 @@
     }
 }
 
+namespace osgEarth { namespace Drivers { namespace RexTerrainEngine
+{
+    /**
+     * Custom progress callback that checks for both request 
+     * timeout (via request::isIdle) and OSG database pager
+     * shutdown (via getDone)
+     */
+    struct RequestProgressCallback : public ProgressCallback
+    {
+        osgDB::DatabasePager::DatabaseThread* _thread;
+        Loader::Request* _request;
+
+        RequestProgressCallback(Loader::Request* req) :
+            _request(req)
+        {
+            // if this is a pager thread, get a handle on it:
+            _thread = dynamic_cast<osgDB::DatabasePager::DatabaseThread*>(
+                OpenThreads::Thread::CurrentThread());
+        }
+
+        virtual bool isCanceled()
+        {
+            // was the request canceled?
+            if (_canceled == false && _request->isIdle())
+                _canceled = true;
+
+            // was the pager shut down?
+            if (_thread != 0L && _thread->getDone())
+                _canceled = true;
+
+            return ProgressCallback::isCanceled();
+        }
+    };
+} } }
+
 //...............................................
 
 #undef  LC
@@ -83,11 +107,18 @@
         // take a reference, which will cause an unref after load.
         osg::ref_ptr<Request> r = request;
 
+        r->setState(Request::RUNNING);
+
         //OE_INFO << LC << "Request invoke : UID = " << request->getUID() << "\n";
-        request->invoke();
+        request->invoke(0L);
         
         //OE_INFO << LC << "Request apply : UID = " << request->getUID() << "\n";
-        request->apply( nv.getFrameStamp() );
+        if (r->isRunning())
+        {
+            request->apply( nv.getFrameStamp() );
+        }
+
+        r->setState(Request::IDLE);
     }
     return request != 0L;
 }
@@ -133,10 +164,15 @@
                     {
                         TileKey key = loader->getTileKeyForRequest(requestUID);
 
-                        MapFrame frame(engine->getMap());
-                        if ( frame.isCached(key) )
+                        const Map* map = engine->getMap();
+                        if (map)
                         {
-                            result = LOCAL_FILE;
+                            LayerVector layers;
+                            map->getLayers(layers);
+                            if (map->isFast(key, layers))
+                            {
+                                result = LOCAL_FILE;
+                            }
                         }
                     }
 
@@ -158,8 +194,9 @@
 
 namespace
 {
-    struct RequestResultNode : public osg::Node
+    class RequestResultNode : public osg::Node
     {
+    public:
         RequestResultNode(Loader::Request* request)
             : _request(request)
         {
@@ -169,7 +206,7 @@
             {
                 // TODO: for some reason pre-compiling is causing texture flashing issues 
                 // with things like classification maps when using --ico. Figure out why.
-                setStateSet( _request->getStateSet() );
+                setStateSet( _request->createStateSet() );
             }
         }
 
@@ -204,14 +241,14 @@
 void
 PagerLoader::setNumLODs(unsigned lods)
 {
-    _numLODs = std::max(lods, 1u);
+    _numLODs = osg::maximum(lods, 1u);
 }
 
 void
 PagerLoader::setMergesPerFrame(int value)
 {
-    _mergesPerFrame = std::max(value, 0);
-    this->setNumChildrenRequiringUpdateTraversal( 1 );
+    _mergesPerFrame = osg::maximum(value, 0);
+    ADJUST_EVENT_TRAV_COUNT(this, +1);
     OE_INFO << LC << "Merges per frame = " << _mergesPerFrame << std::endl;
     
 }
@@ -251,7 +288,7 @@
         request->lock();
         {
             request->setState(Request::RUNNING);
-
+            
             // remember the last tick at which this request was submitted
             request->_lastTick = osg::Timer::instance()->tick();
 
@@ -306,7 +343,7 @@
 PagerLoader::traverse(osg::NodeVisitor& nv)
 {
     // only called when _mergesPerFrame > 0
-    if ( nv.getVisitorType() == nv.UPDATE_VISITOR )
+    if ( nv.getVisitorType() == nv.EVENT_VISITOR )
     {
         if ( nv.getFrameStamp() )
         {
@@ -403,7 +440,9 @@
         Request* req = result->getRequest();
         if ( req )
         {
-            if ( req->_lastTick >= _checkpoint )
+            // Make sure the request is both current (newer than the last checkpoint)
+            // and running (i.e. has not been canceled along the way)
+            if (req->_lastTick >= _checkpoint && req->isRunning())
             {
                 if ( _mergesPerFrame > 0 )
                 {
@@ -421,6 +460,7 @@
 
             else
             {
+                OE_DEBUG << LC << "Request " << req->getName() << " canceled" << std::endl;
                 req->setState( Request::FINISHED );
                 if ( REPORT_ACTIVITY )
                     Registry::instance()->endActivity( req->getName() );
@@ -466,7 +506,8 @@
         if ( REPORT_ACTIVITY )
             Registry::instance()->startActivity( request->getName() );
 
-        request->invoke();
+        osg::ref_ptr<ProgressCallback> prog = new RequestProgressCallback(request);
+        request->invoke(prog.get());
     }
 
     else
@@ -490,7 +531,7 @@
     {
         PagerLoaderAgent()
         {
-            //nop
+            // nop
         }
 
         virtual const char* className() const
@@ -516,10 +557,18 @@
                 osg::ref_ptr<PagerLoader> loader;
                 if (OptionsData<PagerLoader>::lock(dboptions, "osgEarth.PagerLoader", loader))
                 {
-                    Loader::Request* req = loader->invokeAndRelease( requestUID );
-                    return new RequestResultNode(req);
+                    osg::ref_ptr<Loader::Request> req = loader->invokeAndRelease(requestUID);
+
+                    // make sure the request is still running (not canceled)
+                    if (req.valid() && req->isRunning())
+                        return new RequestResultNode(req.release());
+                    else
+                        return ReadResult::FILE_LOADED; // fail silenty (cancelation)
                 }
-                return ReadResult::FILE_NOT_FOUND;
+
+                // fail silently - this could happen if the Loader disappears from
+                // underneath, if say the terrain is destroyed
+                return ReadResult::FILE_LOADED;
             }
             else
             {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/LoadTileData osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/LoadTileData
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/LoadTileData	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/LoadTileData	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -28,7 +28,7 @@
 #include <osgEarth/Progress>
 
 namespace osgEarth { namespace Drivers { namespace RexTerrainEngine
-{    
+{
     class LoadTileData : public Loader::Request
     {
     public:
@@ -41,23 +41,22 @@
     public: // Loader::Request
 
         /** Fetches the data for the tile node. */
-        void invoke();
+        void invoke(ProgressCallback*);
 
         /** Applies the fetched data to the tile node (scene-graph safe) */
         void apply(const osg::FrameStamp*);
 
-    public: // ProgressCallback
-
-        bool isCanceled();
+        //! Creates a stateset containing GL compilable objects from the model
+        osg::StateSet* createStateSet() const;
 
     protected:
         osg::observer_ptr<TileNode> _tilenode;
         osg::observer_ptr<TerrainEngineNode> _engine;
-        EngineContext* _context;
+        osg::observer_ptr<EngineContext> _context;
         osg::ref_ptr<TerrainTileModel> _dataModel;
         TileRenderModel _renderModel;
         CreateTileModelFilter _filter;
-        MapFrame _mapFrame;
+        osg::observer_ptr< const Map > _map;
         bool _enableCancel;
 
         virtual ~LoadTileData() { }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/LoadTileData.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/LoadTileData.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/LoadTileData.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/LoadTileData.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -34,30 +34,14 @@
 _enableCancel(true)
 {
     this->setTileKey(tilenode->getKey());
-    _mapFrame.setMap(context->getMap());
+    _map = context->getMap();
     _engine = context->getEngine();
 }
 
-namespace
-{
-    struct MyProgress : public ProgressCallback {
-        LoadTileData* _req;
-        MyProgress(LoadTileData* req) : _req(req) {}
-        bool isCanceled() { return _req->isIdle(); }
-    };
-}
-
-
 // invoke runs in the background pager thread.
 void
-LoadTileData::invoke()
+LoadTileData::invoke(ProgressCallback* progress)
 {
-    if (!_mapFrame.isValid())
-        return;
-
-    // we're in a pager thread, so must lock safe pointers
-    // (don't access _context from here!)
-
     osg::ref_ptr<TileNode> tilenode;
     if (!_tilenode.lock(tilenode))
         return;
@@ -66,26 +50,23 @@
     if (!_engine.lock(engine))
         return;
 
-    // ensure the map frame is up to date:
-    if (_mapFrame.needsSync())
-        _mapFrame.sync();
-
-    // Only use a progress callback is cancelation is enabled.    
-    osg::ref_ptr<ProgressCallback> progress = _enableCancel ? new MyProgress(this) : 0L;
+    osg::ref_ptr<const Map> map;
+    if (!_map.lock(map))
+        return;
 
     // Assemble all the components necessary to display this tile
     _dataModel = engine->createTileModel(
-        _mapFrame,
-        tilenode->getKey(),           
+        map.get(),
+        tilenode->getKey(),
         _filter,
-        progress.get() );
-}
-
+        _enableCancel? progress : 0L);
 
-bool
-LoadTileData::isCanceled()
-{
-    return isIdle();
+    // if the operation was canceled, set the request to idle and delete the tile model.
+    if (progress && progress->isCanceled())
+    {
+        _dataModel = 0L;
+        setState(Request::IDLE);
+    }
 }
 
 
@@ -93,17 +74,25 @@
 void
 LoadTileData::apply(const osg::FrameStamp* stamp)
 {
+    osg::ref_ptr<EngineContext> context;
+    if (!_context.lock(context))
+        return;
+
+    osg::ref_ptr<const Map> map;
+    if (!_map.lock(map))
+        return;
+
     // ensure we got an actual datamodel:
     if (_dataModel.valid())
     {
         // ensure it's in sync with the map revision (not out of date):
-        if (_dataModel->getRevision() == _context->getMap()->getDataModelRevision())
+        if (map.valid() && _dataModel->getRevision() == map->getDataModelRevision())
         {
             // ensure the tile node hasn't expired:
             osg::ref_ptr<TileNode> tilenode;
             if ( _tilenode.lock(tilenode) )
             {
-                const RenderBindings& bindings = _context->getRenderBindings();
+                const RenderBindings& bindings = context->getRenderBindings();
 
                 // Merge the new data into the tile.
                 tilenode->merge(_dataModel.get(), bindings);
@@ -111,20 +100,6 @@
                 // Mark as complete. TODO: per-data requests will do something different.
                 tilenode->setDirty( false );
 
-#if 0 // gw - moved the notifications to TileNode.
-
-                // Notify listeners that we've added a tile. The patch must be in world space
-                // (include a transform). Only need to fire onTileAdded if there's real elevation data...right?
-                if (_dataModel->elevationModel().valid())
-                {
-                    // Notify the terrain of the new tile. The "graph" needs to be
-                    // the entire terrain graph since REX can load tiles out of order.
-                    _context->getEngine()->getTerrain()->notifyTileAdded(
-                        _dataModel->getKey(),
-                        _context->getEngine()->getTerrain()->getGraph() );
-                }
-#endif
-
                 OE_DEBUG << LC << "apply " << _dataModel->getKey().str() << "\n";
             }
             else
@@ -141,3 +116,56 @@
         _dataModel = 0L;
     }
 }
+
+namespace
+{
+    // Fake attribute that compiles everything in the TerrainTileModel
+    // when the ICO is active.
+    struct ModelCompilingAttribute : public osg::Texture2D
+    {
+        osg::observer_ptr<TerrainTileModel> _dataModel;
+        
+        // the ICO calls apply() directly instead of compileGLObjects
+        void apply(osg::State& state) const
+        {
+            osg::ref_ptr<TerrainTileModel> dataModel;
+            if (_dataModel.lock(dataModel))
+                dataModel->compileGLObjects(state);
+        }
+
+        // no need to override release or resize since this is a temporary object
+        // that exists only to service the ICO.
+
+        META_StateAttribute(osgEarth, ModelCompilingAttribute, osg::StateAttribute::TEXTURE);
+        int compare(const StateAttribute& sa) const { return 0; }
+        ModelCompilingAttribute() { }
+        ModelCompilingAttribute(const ModelCompilingAttribute& rhs, const osg::CopyOp& copy) { }
+    };
+}
+
+osg::StateSet*
+LoadTileData::createStateSet() const
+{
+    osg::ref_ptr<osg::StateSet> out;
+
+    osg::ref_ptr<EngineContext> context;
+    if (!_context.lock(context))
+        return NULL;
+
+    osg::ref_ptr<const Map> map;
+    if (!_map.lock(map))
+        return NULL;
+
+    if (_dataModel.valid() && map.valid() &&
+        _dataModel->getRevision() == map->getDataModelRevision())
+    {
+        // This stateset contains a "fake" attribute that the ICO will
+        // try to GL-compile, thereby GL-compiling everything in the TerrainTileModel.
+        out = new osg::StateSet();
+        ModelCompilingAttribute* mca = new ModelCompilingAttribute();
+        mca->_dataModel = _dataModel.get();
+        out->setTextureAttribute(0, mca, 1);
+    }
+
+    return out.release();
+}
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/MaskGenerator osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/MaskGenerator
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/MaskGenerator	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/MaskGenerator	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -20,14 +20,19 @@
 #define OSGEARTH_DRIVERS_REX_MASK_GENERATOR 1
 
 #include "Common"
-#include <osgEarth/MapFrame>
 #include <osgEarth/TileKey>
+#include <osgEarth/MapInfo>
 #include <osg/Geometry>
 
-#define MASK_MARKER_DISCARD  0.0f    // do not draw
-#define MASK_MARKER_NORMAL   1.0f    // normal vertex
-#define MASK_MARKER_PATCH    2.0f    // not subject to morphing
-#define MASK_MARKER_BOUNDARY 3.0f    // not subject to elevation texture
+#define VERTEX_MARKER_DISCARD   1    // do not draw
+#define VERTEX_MARKER_GRID      2    // regular grid vertex (not part of mask)
+#define VERTEX_MARKER_PATCH     4    // not subject to morphing
+#define VERTEX_MARKER_BOUNDARY  8    // not subject to elevation texture
+#define VERTEX_MARKER_SKIRT    16    // it's a skirt vertex (bitmask)
+
+namespace osgEarth {
+    class Map;
+}
 
 namespace osgEarth { namespace Drivers { namespace RexTerrainEngine
 {
@@ -75,16 +80,10 @@
         //! whether a texcoord indicates that the corresponding vert is masked.
         bool isMasked(const osg::Vec3f& texCoord) const
         {
-            return texCoord.z() == MASK_MARKER_DISCARD;
+            return (VERTEX_MARKER_DISCARD & (int)texCoord.z()) != 0;
         }
 
-        //! True if the texcoord indicates a bounary vertex
-        bool isBoundary(const osg::Vec3f& texCoord) const
-        {
-            return texCoord.z() == MASK_MARKER_BOUNDARY;
-        }
-
-        //! returns once of the MASK_MARKER_* defines for the given NDC location
+        //! returns once of the VERTEX_MARKER_* defines for the given NDC location
         float getMarker(float nx, float ny) const;
 
         //! Gets the LL and UR corners of the "patch rectangle" in NDC space
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/MaskGenerator.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/MaskGenerator.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/MaskGenerator.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/MaskGenerator.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -20,6 +20,9 @@
 
 #include <osgEarth/MaskLayer>
 #include <osgEarth/Locators>
+#include <osgEarth/Map>
+#include <osgEarth/MapInfo>
+#include <osgEarth/ModelLayer>
 #include <osgEarthSymbology/Geometry>
 
 #include <osgUtil/DelaunayTriangulator>
@@ -151,9 +154,9 @@
 MaskGenerator::MaskGenerator(const TileKey& key, unsigned tileSize, const Map* map) :
 _key( key ), _tileSize(tileSize)
 {
-    MapFrame frame(map);
     MaskLayerVector maskLayers;
-    frame.getLayers(maskLayers);
+    map->getLayers(maskLayers);
+
     for(MaskLayerVector::const_iterator it = maskLayers.begin();
         it != maskLayers.end(); 
         ++it)
@@ -161,7 +164,19 @@
         MaskLayer* layer = it->get();
         if ( layer->getMinLevel() <= key.getLevelOfDetail() )
         {
-            setupMaskRecord(frame.getMapInfo(), layer->getOrCreateMaskBoundary( 1.0, key.getExtent().getSRS(), (ProgressCallback*)0L ) );
+            setupMaskRecord(MapInfo(map), layer->getOrCreateMaskBoundary( 1.0, key.getExtent().getSRS(), (ProgressCallback*)0L ) );
+        }
+
+        // add masks from model layers with embedded masks?
+        ModelLayerVector modelLayers;
+        map->getLayers(modelLayers);
+        for(ModelLayerVector::const_iterator i = modelLayers.begin(); i != modelLayers.end(); ++i)
+        {
+            ModelLayer* layer = i->get();
+            if (layer->getMaskSource() && layer->getMaskMinLevel() <= key.getLevelOfDetail())
+            {
+                setupMaskRecord(MapInfo(map), layer->getOrCreateMaskBoundary(1.0f, key.getExtent().getSRS(), (ProgressCallback*)0L) );
+            }
         }
     }
 }
@@ -479,7 +494,7 @@
         for (osg::Vec3Array::iterator it = it_start; it != constraintVerts->end(); ++it)
         {
             //If the z-value was set from a mask vertex there is no need to change it.  If
-            //it was set from a vertex from the patch polygon it may need to be overriden if
+            //it was set from a vertex from the patch polygon it may need to be overridden if
             //the vertex lies along a mask edge.  Or if it is unset, it will need to be set.
             //if (isZSet[count] < 2)
             if (!isZSet[count])
@@ -622,7 +637,7 @@
             neighbors->push_back( local );  
 
         // set up text coords
-        texCoords->push_back( osg::Vec3f(it->x(), it->y(), isBoundary ? MASK_MARKER_BOUNDARY : MASK_MARKER_PATCH) );
+        texCoords->push_back( osg::Vec3f(it->x(), it->y(), isBoundary ? VERTEX_MARKER_BOUNDARY : VERTEX_MARKER_PATCH) );
     }
 
     // Get triangles from triangulator and add as primitive set to the geometry
@@ -679,7 +694,7 @@
 float
 MaskGenerator::getMarker(float nx, float ny) const
 {
-    float marker = MASK_MARKER_NORMAL;
+    float marker = VERTEX_MARKER_GRID;
 
     if (_maskRecords.size() > 0)
     {
@@ -693,14 +708,14 @@
 
         if (i > min_i && i < max_i && j > min_j && j < max_j)
         {
-            marker = MASK_MARKER_DISCARD; // contained by boundary
+            marker = VERTEX_MARKER_DISCARD; // contained by patch
         }
         else if ((i == min_i && j >= min_j && j <= max_j) ||
                  (i == max_i && j >= min_j && j <= max_j) ||
                  (j == min_j && i >= min_i && i <= max_i) ||
                  (j == max_j && i >= min_i && i <= max_i))
         {
-            marker = MASK_MARKER_PATCH;
+            marker = VERTEX_MARKER_PATCH;
         }
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RenderBindings osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RenderBindings
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RenderBindings	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RenderBindings	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.elevation.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.elevation.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.elevation.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.elevation.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -8,26 +8,37 @@
 #pragma import_defines(OE_TERRAIN_RENDER_ELEVATION)
 
 // Vertex Markers:
-#define MASK_MARKER_DISCARD  0.0
-#define MASK_MARKER_NORMAL   1.0
-#define MASK_MARKER_PATCH    2.0
-#define MASK_MARKER_BOUNDARY 3.0
+#define VERTEX_MARKER_DISCARD  1
+#define VERTEX_MARKER_GRID     2
+#define VERTEX_MARKER_PATCH    4
+#define VERTEX_MARKER_BOUNDARY 8
+#define VERTEX_MARKER_SKIRT    16
 
 // stage
 vec3 vp_Normal; // up vector
-vec4 oe_layer_texc;
 vec4 oe_layer_tilec;
 
+flat out int oe_terrain_vertexMarker;
+
+uniform float oe_terrain_altitude;
+
 // SDK functions:
 float oe_terrain_getElevation(in vec2 uv);
 
 void oe_rexEngine_elevation(inout vec4 vertexModel)
-{    
+{
+    vec3 up = normalize(vp_Normal);
+
 #ifdef OE_TERRAIN_RENDER_ELEVATION
-    float elev = 
-        oe_layer_tilec.z == MASK_MARKER_BOUNDARY || oe_layer_tilec.z == MASK_MARKER_DISCARD ? 0.0f
-        : oe_terrain_getElevation( oe_layer_tilec.st );
 
-    vertexModel.xyz += normalize(vp_Normal) * elev;
+    bool ignore =
+        ((oe_terrain_vertexMarker & VERTEX_MARKER_BOUNDARY) != 0) ||
+        ((oe_terrain_vertexMarker & VERTEX_MARKER_DISCARD)  != 0);
+
+    float elev = ignore ? 0.0f : oe_terrain_getElevation( oe_layer_tilec.st );
+    
+    vertexModel.xyz += up * elev;
 #endif
+
+    vertexModel.xyz += up * oe_terrain_altitude;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -6,86 +6,118 @@
 #pragma vp_location   fragment_coloring
 #pragma vp_order      0.5
 
-#pragma import_defines(OE_TERRAIN_RENDER_IMAGERY, OE_TERRAIN_MORPH_IMAGERY, OE_TERRAIN_BLEND_IMAGERY, OE_TERRAIN_CAST_SHADOWS, OE_IS_PICK_CAMERA, OE_IS_SHADOW_CAMERA)
+#pragma import_defines(OE_TERRAIN_RENDER_IMAGERY)
+#pragma import_defines(OE_TERRAIN_MORPH_IMAGERY)
+#pragma import_defines(OE_TERRAIN_BLEND_IMAGERY)
+#pragma import_defines(OE_TERRAIN_CAST_SHADOWS)
+#pragma import_defines(OE_IS_PICK_CAMERA)
+#pragma import_defines(OE_IS_SHADOW_CAMERA)
+#pragma import_defines(OE_IS_DEPTH_CAMERA)
 
 uniform sampler2D oe_layer_tex;
 uniform int       oe_layer_uid;
 uniform int       oe_layer_order;
-uniform float     oe_layer_opacity;
 
 #ifdef OE_TERRAIN_MORPH_IMAGERY
 uniform sampler2D oe_layer_texParent;
 uniform float oe_layer_texParentExists;
-in vec4 oe_layer_texcParent;
+in vec2 oe_layer_texcParent;
 in float oe_rex_morphFactor;
 #endif
 
-in vec4 oe_layer_texc;
+in vec2 oe_layer_texc;
 in vec4 oe_layer_tilec;
+in float oe_layer_opacity;
 
-in float oe_layer_rangeOpacity;
+//in float oe_layer_rangeOpacity;
+
+// Vertex Markers:
+#define VERTEX_MARKER_DISCARD  1
+#define VERTEX_MARKER_GRID     2
+#define VERTEX_MARKER_PATCH    4
+#define VERTEX_MARKER_BOUNDARY 8
+#define VERTEX_MARKER_SKIRT    16
+flat in int oe_terrain_vertexMarker;
 
 void oe_rexEngine_frag(inout vec4 color)
 {
+    // if the provoking vertex is marked for discard, skip it:
+    if ((oe_terrain_vertexMarker & VERTEX_MARKER_DISCARD) != 0)
+    {
+        discard;
+        return;
+    }
+
+    // If this is a shadow camera and the terrain doesn't cast shadows, no render:
 #if defined(OE_IS_SHADOW_CAMERA) && !defined(OE_TERRAIN_CAST_SHADOWS)
     discard;
     return;
 #endif
 
+    // If this is a depth-only camera, skip terrain skirt geometry:
+#if defined(OE_IS_DEPTH_CAMERA)
+    if ((oe_terrain_vertexMarker & VERTEX_MARKER_SKIRT) != 0)
+    {
+        discard;
+        return;
+    }
+#endif // OE_IS_DEPTH_CAMERA
+
+    // if this is a picking camera, reset the color to all zeros:
 #ifdef OE_IS_PICK_CAMERA
     color = vec4(0);
 #else
 
+    // If imagery rendering is disabled, we're done:
 #ifndef OE_TERRAIN_RENDER_IMAGERY
     return;
 #endif
 
-    float isImageLayer = oe_layer_uid >= 0 ? 1.0 : 0.0;
-	vec4 texelSelf = texture(oe_layer_tex, oe_layer_texc.st);
-
-#ifdef OE_TERRAIN_MORPH_IMAGERY
+    // whether this layer contains texel color (UID<0 means no texture)
+    bool isTexelLayer = oe_layer_uid >= 0;
 
-    // sample the parent texture:
-	vec4 texelParent = texture(oe_layer_texParent, oe_layer_texcParent.st);
+    // whether this is the first layer to render:
+    bool isFirstLayer = oe_layer_order == 0;
 
-    // if the parent texture does not exist, use the current texture with alpha=0 as the parent
-    // so we can "fade in" an image layer that starts at LOD > 0:
-    texelParent = mix( vec4(texelSelf.rgb, 0.0), texelParent, oe_layer_texParentExists );
+    vec4 texel = color;
 
-    // Resolve the final texel color:
-	vec4 texel = mix(texelSelf, texelParent, oe_rex_morphFactor);
+    if (isTexelLayer)
+    {
+	    texel = texture(oe_layer_tex, oe_layer_texc);
 
-    // Decide whether to use the texel or the incoming color:
-	texel = mix(color, texel, isImageLayer);
+#ifdef OE_TERRAIN_MORPH_IMAGERY
+        // sample the main texture:
 
-#else
+        // sample the parent texture:
+	    vec4 texelParent = texture(oe_layer_texParent, oe_layer_texcParent);
 
-    // No morphing, just use the incoming color or texture:
-    vec4 texel = mix(color, texelSelf, isImageLayer);
+        // if the parent texture does not exist, use the current texture with alpha=0 as the parent
+        // so we can "fade in" an image layer that starts at LOD > 0:
+        texelParent = mix( vec4(texel.rgb, 0.0), texelParent, oe_layer_texParentExists );
 
+        // Resolve the final texel color:
+	    texel = mix(texel, texelParent, oe_rex_morphFactor);
 #endif
 
-    // Integrate layer opacity into the texture:
-    //texel.a = mix(texel.a, texel.a*oe_layer_rangeOpacity, isImageLayer);
-    texel.a = mix(texel.a, texel.a*oe_layer_opacity*oe_layer_rangeOpacity, isImageLayer);
+        // intergrate thelayer opacity:
+        texel.a = texel.a * oe_layer_opacity;
+        color.a = 1.0;
+    }
     
 #ifdef OE_TERRAIN_BLEND_IMAGERY
-
-    float isFirstImageLayer = (isImageLayer == 1.0 && oe_layer_order == 0) ? 1.0 : 0.0;
-
-    // If this is a first image layer, blend with the incoming terrian color.
+    // If this is a first image layer, blend with the incoming terrain color.
     // Otherwise, apply directly and let GL blending do the rest.
-    if (isFirstImageLayer == 1.0) {
+    if (isTexelLayer && isFirstLayer)
+    {
         color.rgb = texel.rgb*texel.a + color.rgb*(1.0-texel.a);
-        color.a = max(color.a, texel.a);
     }
-    else color = texel;
-
+    else
+    {
+        color = texel;
+    }
 #else
-
     // No blending? The output is just the texel value.
     color = texel;
-
 #endif // OE_TERRAIN_BLEND_IMAGERY
 
 #endif // OE_IS_PICK_CAMERA
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.gs.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.gs.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.gs.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.gs.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -9,10 +9,11 @@
 #pragma vp_location   geometry
 
 // Vertex Markers:
-#define MASK_MARKER_DISCARD  0.0
-#define MASK_MARKER_NORMAL   1.0
-#define MASK_MARKER_SKIRT    2.0
-#define MASK_MARKER_BOUNDARY 3.0
+#define VERTEX_MARKER_DISCARD  1
+#define VERTEX_MARKER_GRID     2
+#define VERTEX_MARKER_PATCH    4
+#define VERTEX_MARKER_BOUNDARY 8
+#define VERTEX_MARKER_SKIRT    16
 
 layout(triangles)      in;
 layout(triangle_strip) out;
@@ -28,7 +29,7 @@
     for(int i=0; i < 3; ++i )
     {
         VP_LoadVertex(i);
-        if ( oe_layer_tilec.z == MASK_MARKER_DISCARD )
+        if ( int(oe_layer_tilec.z) == VERTEX_MARKER_DISCARD )
             return;
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.Morphing.vert.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.Morphing.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.Morphing.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.Morphing.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -6,43 +6,35 @@
 #pragma vp_location   vertex_model
 #pragma vp_order      0.5
 
-#pragma import_defines(OE_TERRAIN_MORPH_GEOMETRY, OE_TERRAIN_RENDER_ELEVATION)
-
+#pragma import_defines(OE_TERRAIN_MORPH_GEOMETRY)
+#pragma import_defines(OE_TERRAIN_RENDER_ELEVATION)
+#pragma import_defines(OE_IS_DEPTH_CAMERA)
 
 // stage
-vec3 vp_Normal; // up vector
+vec3 vp_Normal;
 
-vec4 oe_layer_texc;
 vec4 oe_layer_tilec;
 
 out float oe_rex_morphFactor;
 
+flat out int oe_terrain_vertexMarker;
+
 uniform vec2  oe_tile_morph;
 uniform float oe_tile_size;
 
+#ifdef OE_IS_DEPTH_CAMERA
+uniform mat4 oe_shadowToPrimaryMatrix;
+#endif
+
 // SDK functions:
 float oe_terrain_getElevation(in vec2 uv);
 
 // Vertex Markers:
-#define MASK_MARKER_DISCARD  0.0
-#define MASK_MARKER_NORMAL   1.0
-#define MASK_MARKER_PATCH    2.0
-#define MASK_MARKER_BOUNDARY 3.0
-
-
-// Morphs a vertex using a neighbor.
-void oe_rex_MorphVertex(inout vec3 position, inout vec2 uv, in vec3 neighborPosition)
-{
-   float halfSize        = (0.5*oe_tile_size)-0.5;
-   float twoOverHalfSize = 2.0/(oe_tile_size-1.0);
-   
-   vec2 fractionalPart = fract(uv * halfSize) * twoOverHalfSize;
-   uv = clamp(uv - (fractionalPart * oe_rex_morphFactor), 0.0, 1.0);
-   //uv = clamp(uv, 0, 1);
-
-   vec3 morphVector = neighborPosition.xyz - position.xyz;
-   position.xyz = position.xyz + morphVector*oe_rex_morphFactor;
-}
+#define VERTEX_MARKER_DISCARD  1
+#define VERTEX_MARKER_GRID     2
+#define VERTEX_MARKER_PATCH    4
+#define VERTEX_MARKER_BOUNDARY 8
+#define VERTEX_MARKER_SKIRT    16
 
 
 // Compute a morphing factor based on model-space inputs:
@@ -58,6 +50,12 @@
 #endif
 
     vec4 wouldBePositionView = gl_ModelViewMatrix * wouldBePosition;
+
+#ifdef OE_IS_DEPTH_CAMERA
+    // For a depth camera, we have to compute the morphed position
+    // from the perspective of the primary camera so they match up:
+    wouldBePositionView = oe_shadowToPrimaryMatrix * wouldBePositionView;
+#endif
     
     float fDistanceToEye = length(wouldBePositionView.xyz); // or just -z.
 	float fMorphLerpK  = 1.0f - clamp( oe_tile_morph[0] - fDistanceToEye * oe_tile_morph[1], 0.0, 1.0 );
@@ -70,13 +68,26 @@
     // compute the morphing factor to send down the pipe.
     // we need this even if vertex-morphing is off since we use it for 
     // other things (like image blending)
-    if (oe_layer_tilec.z == MASK_MARKER_NORMAL)
+    if ((oe_terrain_vertexMarker & VERTEX_MARKER_GRID) != 0)
     {
         oe_rex_morphFactor = oe_rex_ComputeMorphFactor(vertexModel, vp_Normal);    
 
 #ifdef OE_TERRAIN_MORPH_GEOMETRY
-        vec3 neighborVertexModel = gl_MultiTexCoord1.xyz;
-        oe_rex_MorphVertex(vertexModel.xyz, oe_layer_tilec.st, neighborVertexModel.xyz);
+        vec3 neighborVertexModel = gl_MultiTexCoord1.xyz;        
+        vec3 neighborNormal = gl_MultiTexCoord2.xyz;
+        
+        float halfSize        = (0.5*oe_tile_size)-0.5;
+        float twoOverHalfSize = 2.0/(oe_tile_size-1.0);   
+        vec2 fractionalPart = fract(oe_layer_tilec.st * halfSize) * twoOverHalfSize;
+        oe_layer_tilec.st = clamp(oe_layer_tilec.st - (fractionalPart * oe_rex_morphFactor), 0.0, 1.0);
+
+        // morph the vertex:
+        vec3 morphVector = neighborVertexModel.xyz - vertexModel.xyz;
+        vertexModel.xyz = vertexModel.xyz + morphVector*oe_rex_morphFactor;
+
+        // morph the normal:
+        morphVector = neighborNormal - vp_Normal;
+        vp_Normal = normalize(vp_Normal + morphVector*oe_rex_morphFactor);
 #endif
     }
     else
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.NormalMap.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.NormalMap.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.NormalMap.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.NormalMap.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -5,7 +5,9 @@
 #pragma vp_location   fragment_coloring
 #pragma vp_order      0.2
 
-#pragma import_defines(OE_TERRAIN_RENDER_NORMAL_MAP, OE_DEBUG_NORMALS)
+#pragma import_defines(OE_TERRAIN_RENDER_NORMAL_MAP)
+#pragma import_defines(OE_DEBUG_NORMALS)
+#pragma import_defines(OE_COMPRESSED_NORMAL_MAP)
 
 // import terrain SDK
 vec4 oe_terrain_getNormalAndCurvature(in vec2);
@@ -24,7 +26,12 @@
 #endif
 
     vec4 encodedNormal = oe_terrain_getNormalAndCurvature(oe_normalMapCoords);
+#ifdef OE_COMPRESSED_NORMAL_MAP
+	vec2 xymod = encodedNormal.rg*2.0 - 1.0;
+    vec3 normal = vec3(xymod, sqrt(1 - xymod.x*xymod.x - xymod.y*xymod.y));
+#else
     vec3 normal = normalize(encodedNormal.xyz*2.0-1.0);
+#endif
 
     vec3 tangent = normalize(cross(oe_normalMapBinormal, oe_UpVectorView));
     vp_Normal = normalize( mat3(tangent, oe_normalMapBinormal, oe_UpVectorView) * normal );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.vert.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -2,7 +2,7 @@
 $GLSL_DEFAULT_PRECISION_FLOAT
 
 #pragma vp_name       REX Engine - Vertex
-#pragma vp_entryPoint oe_rexEngine_vert
+#pragma vp_entryPoint oe_rexEngine_vert_model
 #pragma vp_location   vertex_model
 #pragma vp_order      0.0
 
@@ -11,26 +11,44 @@
 
 // outputs
 out vec4 vp_Color;
-out vec3 vp_Normal;
-
-out vec4 oe_layer_texc;
 out vec4 oe_layer_tilec;
-out vec3 oe_UpVectorView;
 
 out float oe_rex_morphFactor;
+flat out int oe_terrain_vertexMarker;
 
-void oe_rexEngine_vert(inout vec4 vertexModel)
+void oe_rexEngine_vert_model(inout vec4 vertexModel)
 {
     // Texture coordinate for the tile (always 0..1)
     oe_layer_tilec = gl_MultiTexCoord0;
 
     // Color of the underlying map geometry (untextured)
     vp_Color = oe_terrain_color;
-	
-    // "up" vector at this vertex in view space, which we will later
-    // need in order to elevate the terrain
-    oe_UpVectorView = normalize(gl_NormalMatrix*vp_Normal);
 
     // initialize:
     oe_rex_morphFactor = 0.0;
+
+    // Extract the ertex type marker
+    oe_terrain_vertexMarker = int(oe_layer_tilec.z);
+}
+
+
+[break]
+#version $GLSL_VERSION_STR
+$GLSL_DEFAULT_PRECISION_FLOAT
+
+#pragma vp_name       REX Engine - VertexView
+#pragma vp_entryPoint oe_rexEngine_vert_view
+#pragma vp_location   vertex_view
+#pragma vp_order      0.0
+
+// outputs
+vec3 vp_Normal;
+out vec3 oe_UpVectorView;
+
+void oe_rexEngine_vert_view(inout vec4 vertexView)
+{
+    // "up" vector at this vertex in view space, which we will later
+    // need in order to elevate the terrain. vp_Normal can change later
+    // but UpVectorView will stay the same.
+    oe_UpVectorView = vp_Normal;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.vert.view.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.vert.view.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.vert.view.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexEngine.vert.view.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -2,45 +2,21 @@
 $GLSL_DEFAULT_PRECISION_FLOAT
 
 #pragma vp_name       REX Engine - Vertex/View
-#pragma vp_entryPoint oe_rex_elevateVertexAndSetTexCoords
+#pragma vp_entryPoint oe_rex_setTexCoords
 #pragma vp_location   vertex_view
 #pragma vp_order      0.4
 
 // Stage globals
 vec4 oe_layer_tilec;
-vec3 oe_UpVectorView;
-vec4 oe_layer_texc;
-vec4 oe_layer_texcParent;
-
-vec4 vp_Color;
+vec2 oe_layer_texc;
+vec2 oe_layer_texcParent;
 
 uniform mat4 oe_layer_texMatrix;
 uniform mat4 oe_layer_texParentMatrix;
 
-uniform float oe_layer_minRange;
-uniform float oe_layer_maxRange;
-uniform float oe_layer_attenuationRange;
-
-out float oe_layer_rangeOpacity;
-
-// SDK functions:
-float oe_terrain_getElevation(in vec2 uv);
-
-void oe_rex_elevateVertexAndSetTexCoords(inout vec4 vertexView)
+void oe_rex_setTexCoords(inout vec4 vertexView)
 {
     // calculate the texture coordinates:
-    oe_layer_texc       = oe_layer_texMatrix       * oe_layer_tilec;
-	oe_layer_texcParent = oe_layer_texParentMatrix * oe_layer_tilec;
-
-   float range = max(-vertexView.z, 0.0);
-
-   float attenMin    = oe_layer_minRange - oe_layer_attenuationRange;
-   float attenMax    = oe_layer_maxRange + oe_layer_attenuationRange;
-
-   oe_layer_rangeOpacity =
-       oe_layer_minRange >= oe_layer_maxRange                   ? 1.0 :
-       range >= oe_layer_minRange && range < oe_layer_maxRange  ? 1.0 :
-       range < oe_layer_minRange                                ? clamp((range-attenMin)/oe_layer_attenuationRange, 0.0, 1.0) :
-       range > oe_layer_maxRange                                ? clamp((attenMax-range)/oe_layer_attenuationRange, 0.0, 1.0) :
-       0.0;
+    oe_layer_texc       = (oe_layer_texMatrix * oe_layer_tilec).st;
+	oe_layer_texcParent = (oe_layer_texParentMatrix * oe_layer_tilec).st;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineDriver.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineDriver.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineDriver.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineDriver.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -17,16 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include "RexTerrainEngineNode"
-#include "RexTerrainEngineOptions"
-#include "TileNode"
-#include <osgEarth/Registry>
-#include <osgEarth/Progress>
 #include <osgEarth/Utils>
 #include <osgDB/FileNameUtils>
 #include <osgDB/FileUtils>
 #include <osgDB/Registry>
 #include <string>
-#include <sstream>
 
 #define LC "[engine_rex] "
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -40,11 +40,6 @@
 #include "TileDrawable"
 #include "TerrainCuller"
 
-#include <osg/Geode>
-#include <osg/NodeCallback>
-#include <osg/Uniform>
-#include <osg/Timer>
-
 #include <list>
 #include <map>
 #include <vector>
@@ -56,36 +51,38 @@
     class RexTerrainEngineNode : public TerrainEngineNode
     {
     public:
+        META_Node(osgEarth, RexTerrainEngineNode);
+
         RexTerrainEngineNode();
-        META_Node(osgEarth,RexTerrainEngineNode);
+
+    protected:
         virtual ~RexTerrainEngineNode();
 
-    public: // TerrainEngineNode
+    public: // TerrainEngineNode public
 
-        // for standalone tile creation outside of a terrain
+        //! for standalone tile creation outside of a terrain
         osg::Node* createTile(const TileKey& key);
 
-        // Create a standalone tile from a tile model (experimental)
+        //! Create a standalone tile from a tile model (experimental)
         osg::Node* createTile(
             const TerrainTileModel* model,
             int createTileFlags,
             unsigned referenceLOD);
         
-        // when incremental update is enabled, forces regeneration of tiles
-        // in the given region.
+        //! Forces regeneration of tiles in the given region.
         void invalidateRegion(
             const GeoExtent& extent,
             unsigned         minLevel,
             unsigned         maxLevel);
 
-        /** Get the stateset used to render the terrain surface. */
+        //! Get the stateset used to render the terrain surface.
         osg::StateSet* getSurfaceStateSet();
 
-    public: // internal TerrainEngineNode
+        //! Unique identifier of this engine instance
+        UID getUID() const { return _uid; }
 
-        void setMap(const Map* map, const TerrainOptions& options);
+        //! Terrain options object
         const TerrainOptions& getTerrainOptions() const { return _terrainOptions; }
-        UID getUID() const { return _uid; }
 
     public: // osg::Node
 
@@ -101,27 +98,27 @@
 
         void onMapModelChanged( const MapModelChange& change ); // not virtual!
 
-        /** Access to the asychronous data loader */
+        //! Access to the asychronous data loader
         Loader* getLoader() const { return _loader.get(); }
 
-    protected:
-        // override from TerrainEngineNode
+    protected: // TerrainEngineNode protected
+
+        virtual void setMap(const Map* map, const TerrainOptions& options);
+
         virtual void updateTextureCombining() { updateState(); }
         
-        // override from TerrainEngineNode
         virtual void dirtyTerrain();
 
-        // override from TerrainEngineNode
         virtual void dirtyState();
 
     private:
         void init();
         void syncMapModel();
 
-        // Reloads all the tiles in the terrain due to a data model change
+        //! Reloads all the tiles in the terrain due to a data model change
         void refresh(bool force =false);
 
-        // Various methods that trigger when the Map model changes.
+        //! Various methods that trigger when the Map model changes.
         void addLayer(Layer* layer);
         void addElevationLayer( ElevationLayer* layer );
         void addTileLayer( Layer* layer );
@@ -150,21 +147,18 @@
         bool _batchUpdateInProgress;
         bool _refreshRequired;
         bool _stateUpdateRequired;
-        MapFrame _mapFrame;
-
-        LayerExtentVector _cachedLayerExtents;          // extents of each layer, in the Map's SRS. UID = vector index (for speed)
 
+        // extents of each layer, in the Map's SRS. UID = vector index (for speed)
+        LayerExtentVector _cachedLayerExtents; 
 
         // node registry is shared across all threads.
-        osg::ref_ptr<TileNodeRegistry> _liveTiles;      // tiles in the scene graph.
+        osg::ref_ptr<TileNodeRegistry> _liveTiles; // tiles in the scene graph.
         osg::ref_ptr<ResourceReleaser> _releaser;
      
         EngineContext* getEngineContext() const { return _engineContext.get(); }
         osg::ref_ptr< EngineContext > _engineContext;
+        friend class EngineContext;
 
-        osg::Timer _timer;
-        unsigned   _tileCount;
-        double     _tileCreationTime;
         RenderBindings _renderBindings;
         osg::ref_ptr<GeometryPool> _geometryPool;
         osg::ref_ptr<LoaderGroup>  _loader;
@@ -172,6 +166,7 @@
         TileRasterizer* _rasterizer;
         
         osg::ref_ptr<osg::Group> _terrain;
+        bool _morphingSupported;
 
         bool _renderModelUpdateRequired;
 
@@ -179,9 +174,8 @@
 
         SelectionInfo _selectionInfo;
 
+        osg::ref_ptr<osg::StateSet> _surfaceStateSet;
         osg::ref_ptr<osg::StateSet> _imageLayerStateSet;
-
-        osg::ref_ptr<ModifyBoundingBoxCallback> _modifyBBoxCallback;
     };
 
 } } } // namespace osgEarth::Drivers::RexTerrainEngine
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -47,6 +47,8 @@
 
 #define DEFAULT_MAX_LOD 19u
 
+//#define PROFILE
+
 //------------------------------------------------------------------------
 
 namespace
@@ -63,7 +65,7 @@
                 node->onMapModelChanged( change );
         }
     };
-    
+
 
     /**
      * Run this visitor whenever you remove a layer, so that each
@@ -72,13 +74,13 @@
      */
     struct UpdateRenderModels : public osg::NodeVisitor
     {
-        const MapFrame& _frame;
+        const Map* _map;
         const RenderBindings& _bindings;
         unsigned _count;
         bool _reload;
         std::set<UID> _layersToLoad;
 
-        UpdateRenderModels(const MapFrame& frame, RenderBindings& bindings) : _frame(frame), _bindings(bindings), _count(0u), _reload(false)
+        UpdateRenderModels(const Map* map, RenderBindings& bindings) : _map(map), _bindings(bindings), _count(0u), _reload(false)
         {
             setTraversalMode(TRAVERSE_ALL_CHILDREN);
             setNodeMaskOverride(~0);
@@ -112,8 +114,9 @@
                 RenderingPass& pass = model._passes[p];
 
                 // if the map doesn't contain a layer with a matching UID,
-                // it's gone so remove it from the render model.
-                if (!_frame.containsLayer(pass.sourceUID()))
+                // or if the layer is now disabled, remove it from the render model.
+                Layer* layer = _map->getLayerByUID(pass.sourceUID());
+                if (layer == NULL || layer->getEnabled() == false)
                 {
                     model._passes.erase(model._passes.begin()+p);
                     --p;
@@ -136,6 +139,7 @@
                 tileNode.newLayers().insert(_layersToLoad.begin(), _layersToLoad.end());
                 tileNode.setDirty(true);
             }
+
         }
     };
 
@@ -146,11 +150,11 @@
 RexTerrainEngineNode::RexTerrainEngineNode() :
 TerrainEngineNode     ( ),
 _terrain              ( 0L ),
-_tileCount            ( 0 ),
-_tileCreationTime     ( 0.0 ),
 _batchUpdateInProgress( false ),
 _refreshRequired      ( false ),
-_stateUpdateRequired  ( false )
+_stateUpdateRequired  ( false ),
+_renderModelUpdateRequired( false ),
+_rasterizer(0L)
 {
     // Necessary for pager object data
     this->setName("osgEarth.RexTerrainEngineNode");
@@ -178,8 +182,8 @@
 
     // TODO: replace with a "renderer" object that can return statesets
     // for different layer types, or something.
-    _imageLayerStateSet = new osg::StateSet();
-    _imageLayerStateSet->setName("Surface");
+    _surfaceStateSet = new osg::StateSet();
+    _surfaceStateSet->setName("Surface");
 
     _terrain = new osg::Group();
     addChild(_terrain.get());
@@ -190,7 +194,7 @@
     OE_DEBUG << LC << "~RexTerrainEngineNode\n";
 }
 
-void 
+void
 RexTerrainEngineNode::resizeGLObjectBuffers(unsigned maxSize)
 {
     TerrainEngineNode::resizeGLObjectBuffers(maxSize);
@@ -215,23 +219,15 @@
 void
 RexTerrainEngineNode::releaseGLObjects(osg::State* state) const
 {
-    TerrainEngineNode::releaseGLObjects(state);
-
-    getStateSet()->releaseGLObjects(state);
+    //getStateSet()->releaseGLObjects(state);
 
-    _terrain->getStateSet()->releaseGLObjects(state);
+    //_terrain->getStateSet()->releaseGLObjects(state);
 
     _imageLayerStateSet.get()->releaseGLObjects(state);
 
-    // TODO: where should this live? MapNode?
-    LayerVector layers;
-    getMap()->getLayers(layers);
-    for (LayerVector::const_iterator i = layers.begin(); i != layers.end(); ++i)
-    {
-        if ((*i)->getStateSet()) {
-            (*i)->getStateSet()->releaseGLObjects(state);
-        }
-    }
+    _geometryPool->clear();
+
+    TerrainEngineNode::releaseGLObjects(state);
 }
 
 void
@@ -239,6 +235,8 @@
 {
     if (!map) return;
 
+    _map = map;
+
     // Invoke the base class first:
     TerrainEngineNode::setMap(map, options);
 
@@ -246,19 +244,20 @@
     TerrainOptions myOptions = options;
     myOptions.enableMercatorFastPath() = false;
 
-    // Initialize the map frames. We need one for the update thread and one for the
-    // cull thread. Someday we can detect whether these are actually the same thread
-    // (depends on the viewer's threading mode).
-    _mapFrame.setMap(map);
-
-    // A callback for overriding bounding boxes for tiles
-    _modifyBBoxCallback = new ModifyBoundingBoxCallback(_mapFrame);
-
     // merge in the custom options:
     _terrainOptions.merge( myOptions );
 
+    _morphingSupported = true;
+    if (_terrainOptions.rangeMode() == osg::LOD::PIXEL_SIZE_ON_SCREEN)
+    {
+        OE_INFO << LC << "Range mode = pixel size; pixel tile size = " << _terrainOptions.tilePixelSize().get() << std::endl;
+
+        // force morphing off for PSOS mode
+        _morphingSupported = false;
+    }
+
     // morphing imagery LODs requires we bind parent textures to their own unit.
-    if ( _terrainOptions.morphImagery() == true )
+    if (_terrainOptions.morphImagery() == true && _morphingSupported)
     {
         _requireParentTextures = true;
     }
@@ -269,12 +268,7 @@
         _terrainOptions.morphTerrain() = false;
     }
 
-    if (_terrainOptions.rangeMode() == osg::LOD::PIXEL_SIZE_ON_SCREEN)
-    {
-        OE_INFO << LC << "Range mode = pixel size; pixel tile size = " << _terrainOptions.tilePixelSize().get() << std::endl;
-    }
-
-    // if the envvar for tile expiration is set, overide the options setting
+    // if the envvar for tile expiration is set, override the options setting
     const char* val = ::getenv("OSGEARTH_EXPIRATION_THRESHOLD");
     if ( val )
     {
@@ -282,14 +276,6 @@
         OE_INFO << LC << "Expiration threshold set by env var = " << _terrainOptions.expirationThreshold().get() << "\n";
     }
 
-    // if the envvar for hires prioritization is set, override the options setting
-    const char* hiresFirst = ::getenv("OSGEARTH_HIGH_RES_FIRST");
-    if ( hiresFirst )
-    {
-        _terrainOptions.highResolutionFirst() = true;
-        OE_INFO << LC << "High Res First option set to true by env var\n";
-    }
-
     // Check for normals debugging.
     if (::getenv("OSGEARTH_DEBUG_NORMALS"))
         getOrCreateStateSet()->setDefine("OE_DEBUG_NORMALS");
@@ -310,7 +296,8 @@
     // live tiles of the current map revision so they can inrementally update
     // themselves if necessary.
     _liveTiles = new TileNodeRegistry("live");
-    _liveTiles->setMapRevision( _mapFrame.getRevision() );
+    _liveTiles->setMapRevision(map->getDataModelRevision());
+    _liveTiles->setNotifyNeighbors(_terrainOptions.normalizeEdges() == true);
 
     // A resource releaser that will call releaseGLObjects() on expired objects.
     _releaser = new ResourceReleaser();
@@ -359,21 +346,11 @@
     for (LayerVector::const_iterator i = layers.begin(); i != layers.end(); ++i)
         addLayer(i->get());
 
-    //ElevationLayerVector elevationLayers;
-    //map->getLayers( elevationLayers );
-    //for( ElevationLayerVector::const_iterator i = elevationLayers.begin(); i != elevationLayers.end(); ++i )
-    //    addElevationLayer( i->get() );
-
-    //ImageLayerVector imageLayers;
-    //map->getLayers( imageLayers );
-    //for( ImageLayerVector::iterator i = imageLayers.begin(); i != imageLayers.end(); ++i )
-    //    addTileLayer( i->get() );
-
     _batchUpdateInProgress = false;
-    
+
     // Establish a new engine context
     _engineContext = new EngineContext(
-        getMap(),
+        map,
         this, // engine
         _geometryPool.get(),
         _loader.get(),
@@ -382,17 +359,17 @@
         _liveTiles.get(),
         _renderBindings,
         _terrainOptions,
-        _selectionInfo,
-        _modifyBBoxCallback.get());
+        _selectionInfo);
 
     // Calculate the LOD morphing parameters:
     unsigned maxLOD = _terrainOptions.maxLOD().getOrUse(DEFAULT_MAX_LOD);
 
     _selectionInfo.initialize(
         0u, // always zero, not the terrain options firstLOD
-        std::min( _terrainOptions.maxLOD().get(), maxLOD ),
-        _mapFrame.getMapInfo().getProfile(),        
-        _terrainOptions.minTileRangeFactor().get() );
+        osg::minimum( _terrainOptions.maxLOD().get(), maxLOD ),
+        map->getProfile(),
+        _terrainOptions.minTileRangeFactor().get(),
+        _terrainOptions.adaptivePolarRangeFactor().get() );
 
     // set up the initial graph
     refresh();
@@ -421,7 +398,7 @@
         {
             extent.transform(this->getMap()->getSRS(), extentLocal);
         }
-        
+
         _liveTiles->setDirty(extentLocal, minLevel, maxLevel);
     }
 }
@@ -444,7 +421,7 @@
 osg::StateSet*
 RexTerrainEngineNode::getSurfaceStateSet()
 {
-    return _imageLayerStateSet.get();
+    return _surfaceStateSet.get();
 }
 
 void
@@ -470,27 +447,27 @@
     color.samplerName() = "oe_layer_tex";
     color.matrixName()  = "oe_layer_texMatrix";
     getResources()->reserveTextureImageUnit( color.unit(), "Terrain Color" );
-    
+
     SamplerBinding& elevation = _renderBindings[SamplerBinding::ELEVATION];
     elevation.usage()       = SamplerBinding::ELEVATION;
     elevation.samplerName() = "oe_tile_elevationTex";
     elevation.matrixName()  = "oe_tile_elevationTexMatrix";
     if (this->elevationTexturesRequired())
         getResources()->reserveTextureImageUnit( elevation.unit(), "Terrain Elevation" );
-   
+
     SamplerBinding& normal = _renderBindings[SamplerBinding::NORMAL];
     normal.usage()       = SamplerBinding::NORMAL;
     normal.samplerName() = "oe_tile_normalTex";
     normal.matrixName()  = "oe_tile_normalTexMatrix";
     if (this->normalTexturesRequired())
         getResources()->reserveTextureImageUnit( normal.unit(), "Terrain Normals" );
-    
+
     SamplerBinding& colorParent = _renderBindings[SamplerBinding::COLOR_PARENT];
     colorParent.usage()       = SamplerBinding::COLOR_PARENT;
     colorParent.samplerName() = "oe_layer_texParent";
     colorParent.matrixName()  = "oe_layer_texParentMatrix";
     if (this->parentTexturesRequired())
-        getResources()->reserveTextureImageUnit(colorParent.unit(), "Terrain Color (Parent)");
+        getResources()->reserveTextureImageUnit(colorParent.unit(), "Terrain Parent Color");
 
     // Apply a default, empty texture to each render binding.
     OE_DEBUG << LC << "Render Bindings:\n";
@@ -511,6 +488,7 @@
 void
 RexTerrainEngineNode::dirtyTerrain()
 {
+    _terrain->releaseGLObjects();
     _terrain->removeChildren(0, _terrain->getNumChildren());
 
     // clear the loader:
@@ -521,14 +499,14 @@
     {
         _liveTiles->releaseAll(_releaser.get());
     }
-    
+
     // scrub the geometry pool:
     _geometryPool->clear();
 
     // Build the first level of the terrain.
     // Collect the tile keys comprising the root tiles of the terrain.
     std::vector<TileKey> keys;
-    _mapFrame.getProfile()->getAllKeysAtLOD( *_terrainOptions.firstLOD(), keys );
+    getMap()->getProfile()->getAllKeysAtLOD( *_terrainOptions.firstLOD(), keys );
 
     // create a root node for each root tile key.
     OE_DEBUG << LC << "Creating " << keys.size() << " root keys." << std::endl;
@@ -546,10 +524,10 @@
             tileNode->setMinimumExpirationFrames(_terrainOptions.minExpiryFrames().get());
         }
         if (_terrainOptions.minExpiryTime().isSet())
-        {         
+        {
             tileNode->setMinimumExpirationTime(_terrainOptions.minExpiryTime().get());
         }
-                
+
         // Next, build the surface geometry for the node.
         tileNode->create( keys[i], 0L, _engineContext.get() );
 
@@ -591,8 +569,8 @@
 void
 RexTerrainEngineNode::dirtyState()
 {
-    // TODO: perhaps defer this until the next update traversal so we don't 
-    // reinitialize the state multiple times unnecessarily. 
+    // TODO: perhaps defer this until the next update traversal so we don't
+    // reinitialize the state multiple times unnecessarily.
     updateState();
 }
 
@@ -603,13 +581,13 @@
     {
         if (_renderModelUpdateRequired)
         {
-            UpdateRenderModels visitor(_mapFrame, _renderBindings);
+            UpdateRenderModels visitor(getMap(), _renderBindings);
             _terrain->accept(visitor);
             _renderModelUpdateRequired = false;
         }
         TerrainEngineNode::traverse( nv );
     }
-    
+
     else if ( nv.getVisitorType() == nv.CULL_VISITOR )
     {
         // Inform the registry of the current frame so that Tiles have access
@@ -623,23 +601,45 @@
 
         // Marks the start of the cull pass
         getEngineContext()->startCull( cv );
-        
+
         // Initialize a new culler
         TerrainCuller culler(cv, this->getEngineContext());
 
         // Prepare the culler with the set of renderable layers:
-        culler.setup(_mapFrame, _cachedLayerExtents, this->getEngineContext()->getRenderBindings());
+        culler.setup(getMap(), _cachedLayerExtents, this->getEngineContext()->getRenderBindings());
+
+#ifdef PROFILE
+        static std::vector<double> times;
+        static double times_total = 0.0;
+        osg::Timer_t s1 = osg::Timer::instance()->tick();
+#endif
 
         // Assemble the terrain drawables:
         _terrain->accept(culler);
 
         // If we're using geometry pooling, optimize the drawable for shared state
-        // by sorting the draw commands
+        // by sorting the draw commands.
+        // TODO: benchmark this further to see whether it's worthwhile
+        unsigned totalTiles = 0L;
         if (getEngineContext()->getGeometryPool()->isEnabled())
         {
-            culler._terrain.sortDrawCommands();
+            totalTiles = culler._terrain.sortDrawCommands();
         }
 
+#ifdef PROFILE
+        osg::Timer_t s2 = osg::Timer::instance()->tick();
+        double delta = osg::Timer::instance()->delta_m(s1, s2);
+        times_total += delta;
+        times.push_back(delta);
+        if (times.size() == 60)
+        {
+            Registry::instance()->startActivity("CULL(ms)", Stringify()<<(times_total/times.size()));
+            Registry::instance()->startActivity("Tiles:", Stringify()<<totalTiles);
+            times.clear();
+            times_total = 0;
+        }
+#endif
+
         // The common stateset for the terrain group:
         cv->pushStateSet(_terrain->getOrCreateStateSet());
 
@@ -648,6 +648,7 @@
         LayerDrawable* lastLayer = 0L;
         unsigned order = 0;
         bool surfaceStateSetPushed = false;
+        bool imageLayerStateSetPushed = false;
         int layersDrawn = 0;
 
         osg::State::StateSetStack stateSetStack;
@@ -660,44 +661,59 @@
             if (!i->get()->_tiles.empty())
             {
                 lastLayer = i->get();
-                lastLayer->_order = -1;
 
-                // if this is a RENDERTYPE_TILE, we need to activate the default surface state set.
-                if (lastLayer->_renderType == Layer::RENDERTYPE_TILE)
+                // if this is a RENDERTYPE_TERRAIN_SURFACE, we need to activate either the
+                // default surface state set or the image layer state set.
+                if (lastLayer->_renderType == Layer::RENDERTYPE_TERRAIN_SURFACE)
                 {
-                    lastLayer->_order = order++;
-
                     if (!surfaceStateSetPushed)
-                        cv->pushStateSet(getSurfaceStateSet());
-                    surfaceStateSetPushed = true;
+                    {
+                        cv->pushStateSet(_surfaceStateSet.get());
+                        surfaceStateSetPushed = true;
+                    }
+
+                    if (lastLayer->_imageLayer || lastLayer->_layer == NULL)
+                    {
+                        if (!imageLayerStateSetPushed)
+                        {
+                            cv->pushStateSet(_imageLayerStateSet.get());
+                            imageLayerStateSetPushed = true;
+                        }
+                    }
+                    else
+                    {
+                        if (imageLayerStateSetPushed)
+                        {
+                            cv->popStateSet();
+                            imageLayerStateSetPushed = false;
+                        }
+                    }
                 }
-                else if (surfaceStateSetPushed)
+
+                else
                 {
-                    cv->popStateSet();
-                    surfaceStateSetPushed = false;
-                }                    
+                    if (imageLayerStateSetPushed)
+                    {
+                        cv->popStateSet();
+                        imageLayerStateSetPushed = false;
+                    }
+                    if (surfaceStateSetPushed)
+                    {
+                        cv->popStateSet();
+                        surfaceStateSetPushed = false;
+                    }
+                }
 
                 //OE_INFO << "   Apply: " << (lastLayer->_layer ? lastLayer->_layer->getName() : "-1") << "; tiles=" << lastLayer->_tiles.size() << std::endl;
                 //buf << (lastLayer->_layer ? lastLayer->_layer->getName() : "none") << " (" << lastLayer->_tiles.size() << ")\n";
 
                 if (lastLayer->_layer)
                 {
-                    stateSetStack.clear();
-
-                    if (lastLayer->_layer->cull(cv, stateSetStack))
-                    {
-                        for (unsigned j = 0; j<stateSetStack.size(); ++j)
-                            cv->pushStateSet(stateSetStack[j]);
-
-                        cv->apply(*lastLayer);
-
-                        for (unsigned j = 0; j<stateSetStack.size(); ++j)
-                            cv->popStateSet();
-                    }
+                    lastLayer->_layer->apply(lastLayer, cv);                    
                 }
                 else
                 {
-                    cv->apply(*lastLayer);
+                    lastLayer->accept(*cv);
                 }
 
                 ++layersDrawn;
@@ -715,7 +731,13 @@
         {
             lastLayer->_clearOsgState = true;
         }
-                
+
+        if (imageLayerStateSetPushed)
+        {
+            cv->popStateSet();
+            imageLayerStateSetPushed = false;
+        }
+
         if (surfaceStateSetPushed)
         {
             cv->popStateSet();
@@ -724,7 +746,7 @@
 
         // pop the common terrain state set
         cv->popStateSet();
-        
+
         // marks the end of the cull pass
         this->getEngineContext()->endCull( cv );
 
@@ -744,7 +766,9 @@
         _loader->accept(nv);
         _unloader->accept(nv);
         _releaser->accept(nv);
-        _rasterizer->accept(nv);
+
+        if (_rasterizer)
+            _rasterizer->accept(nv);
     }
 
     else
@@ -755,8 +779,8 @@
 
 unsigned int
 RexTerrainEngineNode::computeSampleSize(unsigned int levelOfDetail)
-{    
-    unsigned maxLevel = std::min( *_terrainOptions.maxLOD(), 19u ); // beyond LOD 19 or 20, morphing starts to lose precision.
+{
+    unsigned maxLevel = osg::minimum( *_terrainOptions.maxLOD(), 19u ); // beyond LOD 19 or 20, morphing starts to lose precision.
     unsigned int meshSize = *_terrainOptions.tileSize();
 
     unsigned int sampleSize = meshSize;
@@ -768,7 +792,7 @@
         level--;
     }
 
-    return sampleSize;    
+    return sampleSize;
 }
 
 osg::Vec3d getWorld( const GeoHeightField& geoHF, unsigned int c, unsigned int r)
@@ -779,7 +803,7 @@
 
     osg::Vec3d world;
     GeoPoint point(geoHF.getExtent().getSRS(), x, y, h );
-    point.toWorld( world );    
+    point.toWorld( world );
     return world;
 }
 
@@ -808,7 +832,7 @@
     {
         for (unsigned int r = 0; r < geoHF.getHeightField()->getNumRows() - 1; r++)
         {
-            // Add two triangles 
+            // Add two triangles
             verts->push_back( getWorld( geoHF, c,     r    ) * world2local );
             verts->push_back( getWorld( geoHF, c + 1, r    ) * world2local );
             verts->push_back( getWorld( geoHF, c + 1, r + 1) * world2local );
@@ -821,13 +845,12 @@
     geode->setCullingActive(false);
     mt->setCullingActive(false);
 
-    geometry->addPrimitiveSet(new osg::DrawArrays(GL_TRIANGLES, 0, verts->size()));      
+    geometry->addPrimitiveSet(new osg::DrawArrays(GL_TRIANGLES, 0, verts->size()));
 
     osg::Vec4ubArray* colors = new osg::Vec4ubArray();
     colors->push_back(osg::Vec4ub(255,0,0,255));
     geometry->setColorArray(colors, osg::Array::BIND_OVERALL);
-    mt->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-    mt->getOrCreateStateSet()->setRenderBinDetails(99, "RenderBin");        
+    mt->getOrCreateStateSet()->setRenderBinDetails(99, "RenderBin");
 
     return mt;
 }
@@ -847,22 +870,18 @@
     unsigned tileSize = getEngineContext()->getOptions().tileSize().get();
 
     optional<bool> hasMasks(false);
-    
+
     // Trivial rejection test for masking geometry. Check at the top level and
     // if there's not mask there, there's no mask at the reference LOD either.
-    osg::ref_ptr<MaskGenerator> maskGenerator = new MaskGenerator(
-        model->getKey(),
-        tileSize,
-        getEngineContext()->getMap()
-    );
+    osg::ref_ptr<MaskGenerator> maskGenerator = new MaskGenerator(model->getKey(), tileSize, getMap());
 
     bool includeTilesWithMasks = (flags & CREATE_TILE_INCLUDE_TILES_WITH_MASKS) != 0;
     bool includeTilesWithoutMasks = (flags & CREATE_TILE_INCLUDE_TILES_WITHOUT_MASKS) != 0;
-    
+
     if (maskGenerator->hasMasks() == false && includeTilesWithoutMasks == false)
         return 0L;
 
-    // If the ref LOD is higher than the key LOD, build a list of tile keys at the 
+    // If the ref LOD is higher than the key LOD, build a list of tile keys at the
     // ref LOD that match up with the main tile key in the model.
     std::vector<TileKey> keys;
     if (referenceLOD > model->getKey().getLOD())
@@ -891,14 +910,13 @@
     osg::Group* group = new osg::Group();
 
     maskGenerator = 0L;
-    
+
+    MapInfo mapInfo(getMap());
+
     for (std::vector<TileKey>::const_iterator key = keys.begin(); key != keys.end(); ++key)
     {
         // Mask generator creates geometry from masking boundaries when they exist.
-        maskGenerator = new MaskGenerator(
-            *key,
-            tileSize,
-            getEngineContext()->getMap());
+        maskGenerator = new MaskGenerator(*key, tileSize, getMap());
 
         if (maskGenerator->hasMasks() == true && includeTilesWithMasks == false)
             continue;
@@ -910,7 +928,7 @@
 
         getEngineContext()->getGeometryPool()->getPooledGeometry(
             *key,
-            _mapFrame.getMapInfo(),
+            mapInfo,
             tileSize,
             maskGenerator.get(),
             sharedGeom);
@@ -932,7 +950,7 @@
                 if (model->elevationModel().valid())
                 {
                     // Clone the vertex array since it's shared and we're going to alter it
-                    geom->setVertexArray(osg::clone(geom->getVertexArray()));
+                    geom->setVertexArray(osg::clone(geom->getVertexArray(), osg::CopyOp::DEEP_COPY_ALL));
 
                     // Apply the elevation model to the verts, noting that the texture coordinate
                     // runs [0..1] across the tile and the normal is the up vector at each vertex.
@@ -956,7 +974,7 @@
                         osg::Vec3& tileCoord = (*tileCoords)[i];
 
                         // Skip verts on a masking boundary since their elevations are hard-wired.
-                        if (tileCoord.z() != MASK_MARKER_BOUNDARY)
+                        if ((VERTEX_MARKER_BOUNDARY & (int)tileCoord.z()) == 0) // if BOUNARY bit not set
                         {
                             osg::Vec3d n = osg::Vec3d(tileCoord.x(), tileCoord.y(), 0);
                             n = n * scaleBias;
@@ -997,7 +1015,7 @@
                     //    << "; max=" << tkMax.x() << "," << tkMax.y() << std::endl;
                 }
             }
-    
+
             // Establish a local reference frame for the tile:
             GeoPoint centroid;
             key->getExtent().getCentroid(centroid);
@@ -1019,7 +1037,7 @@
 RexTerrainEngineNode::createTile( const TileKey& key )
 {
      // Compute the sample size to use for the key's level of detail that will line up exactly with the tile size of the highest level of subdivision of the rex engine.
-    unsigned int sampleSize = computeSampleSize( key.getLevelOfDetail() );    
+    unsigned int sampleSize = computeSampleSize( key.getLevelOfDetail() );
     OE_INFO << LC << "Computed a sample size of " << sampleSize << " for lod " << key.getLevelOfDetail() << std::endl;
 
     TileKey sampleKey = key;
@@ -1033,11 +1051,16 @@
     bool populated = false;
     while (!populated)
     {
-        populated = _mapFrame.populateHeightField(
-            out_hf,
-            sampleKey,
-            true, // convertToHAE
-            0 );
+        ElevationLayerVector elevation;
+        getMap()->getLayers(elevation);
+
+        populated = elevation.populateHeightFieldAndNormalMap(
+            out_hf.get(),               // height field
+            NULL,                       // normal map
+            sampleKey,                  // tile key
+            getMap()->getProfileNoVDatum(),  // HAE profile
+            INTERP_BILINEAR,            // elevation interp
+            NULL );                     // progress callback
 
         if (!populated)
         {
@@ -1060,15 +1083,15 @@
     }
 #endif
 
-    GeoHeightField geoHF( out_hf.get(), sampleKey.getExtent() );    
+    GeoHeightField geoHF( out_hf.get(), sampleKey.getExtent() );
     if (sampleKey != key)
-    {   
-        geoHF = geoHF.createSubSample( key.getExtent(), sampleSize, sampleSize, osgEarth::INTERP_BILINEAR);         
+    {
+        geoHF = geoHF.createSubSample( key.getExtent(), sampleSize, sampleSize, osgEarth::INTERP_BILINEAR);
     }
 
     // We should now have a heightfield that matches up exactly with the requested key at the appropriate resolution.
     // Turn it into triangles.
-    return renderHeightField( geoHF );      
+    return renderHeightField( geoHF );
 }
 
 
@@ -1093,12 +1116,7 @@
 
     else
     {
-        // update the thread-safe map model copy:
-        if ( _mapFrame.sync() )
-        {
-            _liveTiles->setMapRevision( _mapFrame.getRevision() );
-            OE_INFO << LC << "MapFrame synced to new revision: " << _mapFrame.getRevision() << std::endl;
-        }
+        _liveTiles->setMapRevision(getMap()->getDataModelRevision());
 
         // dispatch the change handler
         if ( change.getLayer() )
@@ -1107,10 +1125,12 @@
             switch( change.getAction() )
             {
             case MapModelChange::ADD_LAYER:
+            case MapModelChange::ENABLE_LAYER:
                 addLayer(change.getLayer());
                 break;
 
             case MapModelChange::REMOVE_LAYER:
+            case MapModelChange::DISABLE_LAYER:
                 if (change.getImageLayer())
                     removeImageLayer( change.getImageLayer() );
                 else if (change.getElevationLayer())
@@ -1122,11 +1142,17 @@
                     moveElevationLayer(change.getElevationLayer());
                 break;
 
-            case MapModelChange::TOGGLE_ELEVATION_LAYER:
-                toggleElevationLayer( change.getElevationLayer() );
+            case MapModelChange::TOGGLE_LAYER:
+            {
+                ElevationLayer* elevationLayer = change.getElevationLayer();
+                if (elevationLayer)
+                {
+                    toggleElevationLayer(elevationLayer);
+                }
                 break;
+            }
 
-            default: 
+            default:
                 break;
             }
         }
@@ -1143,7 +1169,8 @@
 
     // Store the layer's extent in the map's SRS:
     LayerExtent& le = _cachedLayerExtents[layer->getUID()];
-    le._extent = layer->getExtent().transform(_mapFrame.getMapInfo().getSRS());
+
+    le._extent = layer->getExtent().transform(getMap()->getSRS());
     le._computed = true;
 }
 
@@ -1154,13 +1181,13 @@
     {
         if (layer->getEnabled())
         {
-            if (layer->getRenderType() == Layer::RENDERTYPE_TILE)
+            if (layer->getRenderType() == Layer::RENDERTYPE_TERRAIN_SURFACE)
                 addTileLayer(layer);
             else if (dynamic_cast<ElevationLayer*>(layer))
                 addElevationLayer(dynamic_cast<ElevationLayer*>(layer));
         }
 
-        cacheLayerExtentInMapSRS(layer);
+        cacheLayerExtentInMapSRS(layer);        
     }
 }
 
@@ -1205,12 +1232,12 @@
                     newBinding.samplerName() = imageLayer->shareTexUniformName().get();
                     newBinding.matrixName()  = imageLayer->shareTexMatUniformName().get();
 
-                    OE_INFO << LC 
+                    OE_INFO << LC
                         << "Shared Layer \"" << imageLayer->getName() << "\" : sampler=\"" << newBinding.samplerName() << "\", "
                         << "matrix=\"" << newBinding.matrixName() << "\", "
                         << "unit=" << newBinding.unit() << "\n";
 
-                    // Install an empty texture for this binding at the top of the graph, so that 
+                    // Install an empty texture for this binding at the top of the graph, so that
                     // a texture is always defined even when the data source supplies no real data.
                     if (newBinding.isActive())
                     {
@@ -1222,12 +1249,6 @@
                     }
                 }
             }
-
-            // For an image layer, attach the default fragment shader:
-            Shaders shaders;
-            osg::StateSet* stateSet = imageLayer->getOrCreateStateSet();
-            VirtualProgram* vp = VirtualProgram::getOrCreate(stateSet);
-            shaders.load(vp, shaders.ENGINE_FRAG);
         }
 
         else
@@ -1239,27 +1260,12 @@
         {
             // Update the existing render models, and trigger a data reload.
             // Later we can limit the reload to an update of only the new data.
-            UpdateRenderModels updateModels(_mapFrame, _renderBindings);
-
-#if 0
-            // This uses the loaddata filter approach which will only request
-            // data for one layer. It mostly works but not 100%; see hires-insets
-            // as an example. Removing the world layer and re-adding it while
-            // zoomed in doesn't result in all tiles reloading. Possibly a
-            // synchronization issue.
-            ImageLayerVector imageLayers;
-            _mapFrame.getLayers(imageLayers);
-
-            if (imageLayers.size() == 1)
-                updateModels.setReloadData(true);
-            else
-                updateModels.layersToLoad().insert(tileLayer->getUID());
-#else
+            UpdateRenderModels updateModels(getMap(), _renderBindings);
             updateModels.setReloadData(true);
-#endif
-
             _terrain->accept(updateModels);
         }
+
+        updateState();
     }
 }
 
@@ -1293,15 +1299,17 @@
                 }
             }
         }
+
+        updateState();
     }
 
     if (_terrain)
     {
         // Run the update visitor, which will clean out any rendering passes
-        // associated with the layer we just removed. This would happen 
+        // associated with the layer we just removed. This would happen
         // automatically during cull/update anyway, but it's more efficient
         // to do it all at once.
-        UpdateRenderModels updater(_mapFrame, _renderBindings);
+        UpdateRenderModels updater(getMap(), _renderBindings);
         _terrain->accept(updater);
     }
 
@@ -1341,7 +1349,7 @@
 void
 RexTerrainEngineNode::moveElevationLayer(ElevationLayer* layerMoved)
 {
-    if ( layerMoved->getEnabled() == false )
+    if (layerMoved->getEnabled() == false)
         return;
 
     // only need to refresh is the elevation layer is visible.
@@ -1352,7 +1360,7 @@
 }
 
 void
-RexTerrainEngineNode::toggleElevationLayer( ElevationLayer* layer )
+RexTerrainEngineNode::toggleElevationLayer(ElevationLayer* layer)
 {
     refresh();
 }
@@ -1361,81 +1369,87 @@
 void
 RexTerrainEngineNode::updateState()
 {
-    if ( _batchUpdateInProgress )
+    if (_batchUpdateInProgress)
     {
         _stateUpdateRequired = true;
     }
     else
     {
-        osg::StateSet* terrainStateSet   = _terrain->getOrCreateStateSet();   // everything
+        osg::StateSet* terrainStateSet = _terrain->getOrCreateStateSet();   // everything
         terrainStateSet->setName("Terrain Group");
 
         osg::StateSet* surfaceStateSet = getSurfaceStateSet();    // just the surface
-        
-        //terrainStateSet->setRenderBinDetails(0, "SORT_FRONT_TO_BACK");
-        
+
         // required for multipass tile rendering to work
         surfaceStateSet->setAttributeAndModes(
-            new osg::Depth(osg::Depth::LEQUAL, 0, 1, true) );
+            new osg::Depth(osg::Depth::LEQUAL, 0, 1, true));
 
         surfaceStateSet->setAttributeAndModes(
             new osg::CullFace(), osg::StateAttribute::ON);
 
         // activate standard mix blending.
-        terrainStateSet->setAttributeAndModes( 
-            new osg::BlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA),
-            osg::StateAttribute::ON );
+        terrainStateSet->setAttributeAndModes(
+            new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA),
+            osg::StateAttribute::ON);
 
         // install patch param if we are tessellation on the GPU.
-        if ( _terrainOptions.gpuTessellation() == true )
+        if (_terrainOptions.gpuTessellation() == true)
         {
-            #ifdef HAVE_PATCH_PARAMETER
-              terrainStateSet->setAttributeAndModes( new osg::PatchParameter(3) );
-            #endif
+#ifdef HAVE_PATCH_PARAMETER
+            terrainStateSet->setAttributeAndModes(new osg::PatchParameter(3));
+#endif
         }
 
-        // install shaders, if we're using them.
-        if ( Registry::capabilities().supportsGLSL() )
-        {
-            Shaders package;
+        Shaders package;
 
-            VirtualProgram* terrainVP = VirtualProgram::getOrCreate(terrainStateSet);
-            terrainVP->setName( "Rex Terrain" );
-            package.load(terrainVP, package.ENGINE_VERT_MODEL);
-            
-            surfaceStateSet->addUniform(new osg::Uniform("oe_terrain_color", _terrainOptions.color().get()));
+        VirtualProgram* terrainVP = VirtualProgram::getOrCreate(terrainStateSet);
+        terrainVP->setName("Rex Terrain");
+        package.load(terrainVP, package.ENGINE_VERT_MODEL);
 
-            surfaceStateSet->setDefine("OE_TERRAIN_RENDER_IMAGERY");
+        surfaceStateSet->addUniform(new osg::Uniform("oe_terrain_color", _terrainOptions.color().get()));
 
-            // Funtions that affect only the terrain surface:
-            VirtualProgram* surfaceVP = VirtualProgram::getOrCreate(surfaceStateSet);
-            surfaceVP->setName("Rex Surface");
+        surfaceStateSet->addUniform(new osg::Uniform("oe_terrain_altitude", (float)0.0f));
 
-            // Functions that affect the terrain surface only:
-            package.load(surfaceVP, package.ENGINE_VERT_VIEW);
-            package.load(surfaceVP, package.ENGINE_ELEVATION_MODEL);
-            //package.load(surfaceVP, package.ENGINE_FRAG);
+        surfaceStateSet->setDefine("OE_TERRAIN_RENDER_IMAGERY");
 
-            // Elevation?
-            if (this->elevationTexturesRequired())
-            {
-                surfaceStateSet->setDefine("OE_TERRAIN_RENDER_ELEVATION");
-            }
+        // Functions that affect only the terrain surface:
+        VirtualProgram* surfaceVP = VirtualProgram::getOrCreate(surfaceStateSet);
+        surfaceVP->setName("Rex Surface");
 
-            // Normal mapping shaders:
-            if ( this->normalTexturesRequired() )
-            {
-                package.load(surfaceVP, package.NORMAL_MAP_VERT);
-                package.load(surfaceVP, package.NORMAL_MAP_FRAG);
+        // Functions that affect the terrain surface only:
+        package.load(surfaceVP, package.ENGINE_VERT_VIEW);
+        package.load(surfaceVP, package.ENGINE_ELEVATION_MODEL);
+        //package.load(surfaceVP, package.ENGINE_FRAG);
+
+        // Elevation?
+        if (this->elevationTexturesRequired())
+        {
+            surfaceStateSet->setDefine("OE_TERRAIN_RENDER_ELEVATION");
+        }
+
+        // Normal mapping shaders:
+        //if (this->normalTexturesRequired())
+        {
+            package.load(surfaceVP, package.NORMAL_MAP_VERT);
+            package.load(surfaceVP, package.NORMAL_MAP_FRAG);
+
+            if (this->normalTexturesRequired())
                 surfaceStateSet->setDefine("OE_TERRAIN_RENDER_NORMAL_MAP");
-            }
+        }
 
-            if (_terrainOptions.enableBlending() == true)
-            {
-                surfaceStateSet->setDefine("OE_TERRAIN_BLEND_IMAGERY");
-            }
+        if (_terrainOptions.enableBlending() == true)
+        {
+            surfaceStateSet->setDefine("OE_TERRAIN_BLEND_IMAGERY");
+        } 
 
-            // Morphing?
+        if (_terrainOptions.compressNormalMaps() == true)
+        {
+            surfaceStateSet->setDefine("OE_COMPRESSED_NORMAL_MAP");
+        }
+
+        // Morphing?
+        if (_morphingSupported)
+        {
             if (_terrainOptions.morphTerrain() == true ||
                 _terrainOptions.morphImagery() == true)
             {
@@ -1450,123 +1464,119 @@
                     surfaceStateSet->setDefine("OE_TERRAIN_MORPH_GEOMETRY");
                 }
             }
+        }
 
-            // Shadowing?
-            if (_terrainOptions.castShadows() == true)
-            {
-                surfaceStateSet->setDefine("OE_TERRAIN_CAST_SHADOWS");
-            }
+        // Shadowing?
+        if (_terrainOptions.castShadows() == true)
+        {
+            surfaceStateSet->setDefine("OE_TERRAIN_CAST_SHADOWS");
+        }
 
-            // assemble color filter code snippets.
-            bool haveColorFilters = false;
-            {
-                // Color filter frag function:
-                std::string fs_colorfilters =
-                    "#version " GLSL_VERSION_STR "\n"
-                    GLSL_DEFAULT_PRECISION_FLOAT "\n"
-                    "uniform int oe_layer_uid; \n"
-                    "$COLOR_FILTER_HEAD"
-                    "void oe_rexEngine_applyFilters(inout vec4 color) \n"
-                    "{ \n"
-                        "$COLOR_FILTER_BODY"
-                    "} \n";
-
-                std::stringstream cf_head;
-                std::stringstream cf_body;
-                const char* I = "    ";
-
-                // second, install the per-layer color filter functions AND shared layer bindings.
-                bool ifStarted = false;
-                ImageLayerVector imageLayers;
-                _mapFrame.getLayers(imageLayers);
+        // assemble color filter code snippets.
+        bool haveColorFilters = false;
+        {
+            // Color filter frag function:
+            std::string fs_colorfilters =
+                "#version " GLSL_VERSION_STR "\n"
+                GLSL_DEFAULT_PRECISION_FLOAT "\n"
+                "uniform int oe_layer_uid; \n"
+                "$COLOR_FILTER_HEAD"
+                "void oe_rexEngine_applyFilters(inout vec4 color) \n"
+                "{ \n"
+                    "$COLOR_FILTER_BODY"
+                "} \n";
+
+            std::stringstream cf_head;
+            std::stringstream cf_body;
+            const char* I = "    ";
 
-                for( int i=0; i<imageLayers.size(); ++i )
+            bool ifStarted = false;
+            ImageLayerVector imageLayers;
+            getMap()->getLayers(imageLayers);
+
+            for( int i=0; i<imageLayers.size(); ++i )
+            {
+                ImageLayer* layer = imageLayers[i].get();
+                if ( layer->getEnabled() )
                 {
-                    ImageLayer* layer = imageLayers[i].get();
-                    if ( layer->getEnabled() )
+                    // install Color Filter function calls:
+                    const ColorFilterChain& chain = layer->getColorFilters();
+                    if ( chain.size() > 0 )
                     {
-                        // install Color Filter function calls:
-                        const ColorFilterChain& chain = layer->getColorFilters();
-                        if ( chain.size() > 0 )
+                        haveColorFilters = true;
+                        if ( ifStarted ) cf_body << I << "else if ";
+                        else             cf_body << I << "if ";
+                        cf_body << "(oe_layer_uid == " << layer->getUID() << ") {\n";
+                        for( ColorFilterChain::const_iterator j = chain.begin(); j != chain.end(); ++j )
                         {
-                            haveColorFilters = true;
-                            if ( ifStarted ) cf_body << I << "else if ";
-                            else             cf_body << I << "if ";
-                            cf_body << "(oe_layer_uid == " << layer->getUID() << ") {\n";
-                            for( ColorFilterChain::const_iterator j = chain.begin(); j != chain.end(); ++j )
-                            {
-                                const ColorFilter* filter = j->get();
-                                cf_head << "void " << filter->getEntryPointFunctionName() << "(inout vec4 color);\n";
-                                cf_body << I << I << filter->getEntryPointFunctionName() << "(color);\n";
-                                filter->install( surfaceStateSet );
-                            }
-                            cf_body << I << "}\n";
-                            ifStarted = true;
+                            const ColorFilter* filter = j->get();
+                            cf_head << "void " << filter->getEntryPointFunctionName() << "(inout vec4 color);\n";
+                            cf_body << I << I << filter->getEntryPointFunctionName() << "(color);\n";
+                            filter->install( surfaceStateSet );
                         }
+                        cf_body << I << "}\n";
+                        ifStarted = true;
                     }
                 }
+            }
 
-                if ( haveColorFilters )
-                {
-                    std::string cf_head_str, cf_body_str;
-                    cf_head_str = cf_head.str();
-                    cf_body_str = cf_body.str();
-
-                    replaceIn( fs_colorfilters, "$COLOR_FILTER_HEAD", cf_head_str );
-                    replaceIn( fs_colorfilters, "$COLOR_FILTER_BODY", cf_body_str );
-
-                    surfaceVP->setFunction(
-                        "oe_rexEngine_applyFilters",
-                        fs_colorfilters,
-                        ShaderComp::LOCATION_FRAGMENT_COLORING,
-                        0.6 );
-                }
+            if ( haveColorFilters )
+            {
+                std::string cf_head_str, cf_body_str;
+                cf_head_str = cf_head.str();
+                cf_body_str = cf_body.str();
+
+                replaceIn( fs_colorfilters, "$COLOR_FILTER_HEAD", cf_head_str );
+                replaceIn( fs_colorfilters, "$COLOR_FILTER_BODY", cf_body_str );
+
+                surfaceVP->setFunction(
+                    "oe_rexEngine_applyFilters",
+                    fs_colorfilters,
+                    ShaderComp::LOCATION_FRAGMENT_COLORING,
+                    0.6 );
             }
+        }
 
 #if 0
-            // Apply uniforms for sampler bindings:
-            OE_DEBUG << LC << "Render Bindings:\n";
-            osg::ref_ptr<osg::Texture> tex = new osg::Texture2D(ImageUtils::createEmptyImage(1,1));
-            for (unsigned i = 0; i < _renderBindings.size(); ++i)
+        // Apply uniforms for sampler bindings:
+        OE_DEBUG << LC << "Render Bindings:\n";
+        osg::ref_ptr<osg::Texture> tex = new osg::Texture2D(ImageUtils::createEmptyImage(1,1));
+        for (unsigned i = 0; i < _renderBindings.size(); ++i)
+        {
+            SamplerBinding& b = _renderBindings[i];
+            if (b.isActive())
             {
-                SamplerBinding& b = _renderBindings[i];
-                if (b.isActive())
-                {
-                    osg::Uniform* u = new osg::Uniform(b.samplerName().c_str(), b.unit());
-                    terrainStateSet->addUniform( u );
-                    OE_DEBUG << LC << " > Bound \"" << b.samplerName() << "\" to unit " << b.unit() << "\n";
-                    terrainStateSet->setTextureAttribute(b.unit(), tex.get());
-                }
+                osg::Uniform* u = new osg::Uniform(b.samplerName().c_str(), b.unit());
+                terrainStateSet->addUniform( u );
+                OE_DEBUG << LC << " > Bound \"" << b.samplerName() << "\" to unit " << b.unit() << "\n";
+                terrainStateSet->setTextureAttribute(b.unit(), tex.get());
             }
+        }
 #endif
 
-            // uniform that controls per-layer opacity
-            terrainStateSet->addUniform( new osg::Uniform("oe_layer_opacity", 1.0f) );
-
-            // uniform that conveys the layer UID to the shaders; necessary
-            // for per-layer branching (like color filters)
-            // UID -1 => no image layer (no texture)
-            terrainStateSet->addUniform( new osg::Uniform("oe_layer_uid", (int)-1 ) );
-
-            // uniform that conveys the render order, since the shaders
-            // need to know which is the first layer in order to blend properly
-            terrainStateSet->addUniform( new osg::Uniform("oe_layer_order", (int)0) );
-
-            // default min/max range uniforms. (max < min means ranges are disabled)
-            terrainStateSet->addUniform( new osg::Uniform("oe_layer_minRange", 0.0f) );
-            terrainStateSet->addUniform( new osg::Uniform("oe_layer_maxRange", -1.0f) );
-            terrainStateSet->addUniform( new osg::Uniform("oe_layer_attenuationRange", _terrainOptions.attenuationDistance().get()) );
-            
-            terrainStateSet->getOrCreateUniform(
-                "oe_min_tile_range_factor",
-                osg::Uniform::FLOAT)->set( *_terrainOptions.minTileRangeFactor() );
-
-            terrainStateSet->addUniform(new osg::Uniform("oe_tile_size", (float)_terrainOptions.tileSize().get()));
-
-            // special object ID that denotes the terrain surface.
-            surfaceStateSet->addUniform( new osg::Uniform(
-                Registry::objectIndex()->getObjectIDUniformName().c_str(), OSGEARTH_OBJECTID_TERRAIN) );
-        }
+        // uniform that conveys the layer UID to the shaders; necessary
+        // for per-layer branching (like color filters)
+        // UID -1 => no image layer (no texture)
+        terrainStateSet->addUniform( new osg::Uniform("oe_layer_uid", (int)-1 ) );
+
+        // uniform that conveys the render order, since the shaders
+        // need to know which is the first layer in order to blend properly
+        terrainStateSet->addUniform( new osg::Uniform("oe_layer_order", (int)0) );
+
+        // default min/max range uniforms. (max < min means ranges are disabled)
+        terrainStateSet->addUniform( new osg::Uniform("oe_terrain_attenuationRange", _terrainOptions.attenuationDistance().get()) );
+
+        terrainStateSet->addUniform(new osg::Uniform("oe_tile_size", (float)_terrainOptions.tileSize().get()));
+
+        // special object ID that denotes the terrain surface.
+        surfaceStateSet->addUniform( new osg::Uniform(
+            Registry::objectIndex()->getObjectIDUniformName().c_str(), OSGEARTH_OBJECTID_TERRAIN) );
+        
+        // For an image layer, attach the default fragment shader:
+        //_imageLayerStateSet = osg::clone(surfaceStateSet, osg::CopyOp::DEEP_COPY_ALL);
+        _imageLayerStateSet = new osg::StateSet();
+        VirtualProgram* vp = VirtualProgram::getOrCreate(_imageLayerStateSet.get());
+        package.load(vp, package.ENGINE_FRAG);
 
         _stateUpdateRequired = false;
     }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/RexTerrainEngineOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -40,13 +40,13 @@
             _color                  ( Color::White ),
             _expirationThreshold    ( 300 ),
             _progressive            ( false ),
-            _highResolutionFirst    ( true ),
             _normalMaps             ( true ),
             _normalizeEdges         ( false ),
             _morphTerrain           ( true ),
             _morphImagery           ( true ),
             _mergesPerFrame         ( 20 ),
-            _expirationRange        ( 0 )
+            _expirationRange        ( 0 ),
+            _adaptivePolarRangeFactor( true )
         {
             setDriver( "rex" );
             fromConfig( _conf );
@@ -86,10 +86,6 @@
         optional<bool>& progressive() { return _progressive; }
         const optional<bool>& progressive() const { return _progressive; }
 
-        /** Whether to load higher-resolution data first. */
-        optional<bool>& highResolutionFirst() { return _highResolutionFirst; }
-        const optional<bool>& highResolutionFirst() const { return _highResolutionFirst; } 
-
         /** Whether to generate normal map textures. Default is true. */
         optional<bool>& normalMaps() { return _normalMaps; }
         const optional<bool>& normalMaps() const { return _normalMaps; }
@@ -99,11 +95,13 @@
         optional<bool>& normalizeEdges() { return _normalizeEdges; }
         const optional<bool>& normalizeEdges() const { return _normalizeEdges; }
 
-        /** Whether to morph terrain data between terrain tile LODs. */
+        /** Whether to morph terrain data between terrain tile LODs.
+         *  This feature is not available when rangeMode is PIXEL_SIZE_ON_SCREEN */
         optional<bool>& morphTerrain() { return _morphTerrain; }
         const optional<bool>& morphTerrain() const { return _morphTerrain; }
 
-        /** Whether to morph imagery between terrain tile LODs. */
+        /** Whether to morph imagery between terrain tile LODs.
+         *  This feature is not available when rangeMode is PIXEL_SIZE_ON_SCREEN */
         optional<bool>& morphImagery() { return _morphImagery; }
         const optional<bool>& morphImagery() const { return _morphImagery; }
 
@@ -111,6 +109,14 @@
         optional<int>& mergesPerFrame() { return _mergesPerFrame; }
         const optional<int>& mergesPerFrame() const { return _mergesPerFrame; }
 
+        /**
+         * Whether to automatically adjust(reduce) the minTileRangeFactor with increase in
+         * latitude. This prevents overtessellation in the polar regions. Only works with
+         * a geocentric map. Defaults to true.
+         */
+        optional<bool>& adaptivePolarRangeFactor() { return _adaptivePolarRangeFactor; }
+        const optional<bool>& adaptivePolarRangeFactor() const { return _adaptivePolarRangeFactor; }
+
         /** Options for specific LODs */
         std::vector<LODOptions>& lods() { return _lods; }
         const std::vector<LODOptions>& lods() const { return _lods; }
@@ -120,27 +126,26 @@
             Config conf = TerrainOptions::getConfig();
             conf.set( "skirt_ratio", _skirtRatio );
             conf.set( "color", _color );
-            conf.set( "quick_release_gl_objects", _quickRelease );
             conf.set( "expiration_range", _expirationRange );
             conf.set( "expiration_threshold", _expirationThreshold );
             conf.set( "progressive", _progressive );
-            conf.set( "high_resolution_first", _highResolutionFirst );
             conf.set( "normal_maps", _normalMaps );
             conf.set( "normalize_edges", _normalizeEdges);
             conf.set( "morph_terrain", _morphTerrain );
             conf.set( "morph_imagery", _morphImagery );
             conf.set( "merges_per_frame", _mergesPerFrame );
+            conf.set( "adaptive_polar_range_factor", _adaptivePolarRangeFactor);
 
             if (!_lods.empty()) {
                 Config lodsConf("lods");
                 for (unsigned i = 0; i < _lods.size(); ++i) {
                     Config lodConf("lod");
-                    lodConf.addIfSet("lod", _lods[i]._lod);
-                    lodConf.addIfSet("priority_scale", _lods[i]._priorityScale);
-                    lodConf.addIfSet("priority_offset", _lods[i]._priorityOffset);
+                    lodConf.set("lod", _lods[i]._lod);
+                    lodConf.set("priority_scale", _lods[i]._priorityScale);
+                    lodConf.set("priority_offset", _lods[i]._priorityOffset);
                     lodsConf.add(lodConf);
                 }
-                conf.add(lodsConf);
+                conf.set(lodsConf);
             }
 
             return conf;
@@ -154,18 +159,17 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "skirt_ratio", _skirtRatio );
-            conf.getIfSet( "color", _color );
-            conf.getIfSet( "quick_release_gl_objects", _quickRelease );
-            conf.getIfSet( "expiration_range", _expirationRange );
-            conf.getIfSet( "expiration_threshold", _expirationThreshold );
-            conf.getIfSet( "progressive", _progressive );
-            conf.getIfSet( "high_resolution_first", _highResolutionFirst );
-            conf.getIfSet( "normal_maps", _normalMaps );
-            conf.getIfSet( "normalize_edges", _normalizeEdges);
-            conf.getIfSet( "morph_terrain", _morphTerrain );
-            conf.getIfSet( "morph_imagery", _morphImagery );
-            conf.getIfSet( "merges_per_frame", _mergesPerFrame );
+            conf.get( "skirt_ratio", _skirtRatio );
+            conf.get( "color", _color );
+            conf.get( "expiration_range", _expirationRange );
+            conf.get( "expiration_threshold", _expirationThreshold );
+            conf.get( "progressive", _progressive );
+            conf.get( "normal_maps", _normalMaps );
+            conf.get( "normalize_edges", _normalizeEdges);
+            conf.get( "morph_terrain", _morphTerrain );
+            conf.get( "morph_imagery", _morphImagery );
+            conf.get( "merges_per_frame", _mergesPerFrame );
+            conf.get( "adaptive_polar_range_factor", _adaptivePolarRangeFactor);
 
             const Config* lods = conf.child_ptr("lods");
             if (lods) {
@@ -174,9 +178,9 @@
                     if (!lodConf.empty()) {
                         _lods.push_back(LODOptions());
                         LODOptions& lod = _lods.back();
-                        lodConf.getIfSet("lod", lod._lod);
-                        lodConf.getIfSet("priority_scale", lod._priorityScale);
-                        lodConf.getIfSet("priority_offset", lod._priorityOffset);
+                        lodConf.get("lod", lod._lod);
+                        lodConf.get("priority_scale", lod._priorityScale);
+                        lodConf.get("priority_offset", lod._priorityOffset);
                     }
                 }
             }
@@ -184,16 +188,15 @@
 
         optional<float>    _skirtRatio;
         optional<Color>    _color;
-        optional<bool>     _quickRelease;
         optional<float>    _expirationRange;
         optional<unsigned> _expirationThreshold;
         optional<bool>     _progressive;
-        optional<bool>     _highResolutionFirst;
         optional<bool>     _normalMaps;
         optional<bool>     _normalizeEdges;
         optional<bool>     _morphTerrain;
         optional<bool>     _morphImagery;
         optional<int>      _mergesPerFrame;
+        optional<bool>     _adaptivePolarRangeFactor;
         std::vector<LODOptions> _lods;
     };
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/SelectionInfo osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/SelectionInfo
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/SelectionInfo	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/SelectionInfo	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -20,20 +20,13 @@
 #define OSGEARTH_DRIVERS_REX_TERRAIN_ENGINE_SELECTION_INFO 1
 
 #include "Common"
+#include <osg/NodeVisitor>
 #include <osgEarth/Profile>
 #include <vector>
 
 
 namespace osgEarth { namespace Drivers { namespace RexTerrainEngine
 {
-    struct VisParameters
-    {
-        double _visibilityRange;
-        double _visibilityRange2;
-        double _fMorphStart;
-        double _fMorphEnd;
-    };
-
     /**
      * SelectionInfo is a data structure that holds the LOD distance switching 
      * information for the terrain, to support paging and LOD morphing. 
@@ -42,34 +35,36 @@
     class SelectionInfo
     {
     public:
-        SelectionInfo() : _numLods(0), _uiFirstLOD(0) { }
+        struct LOD
+        {
+            double _visibilityRange;
+            double _morphStart;
+            double _morphEnd;
+            unsigned _minValidTY, _maxValidTY;
+        };
+
+    public:
+        SelectionInfo() : _firstLOD(0) { }
+
+        //! Initialize the selection into LODs
+        void initialize(unsigned firstLod, unsigned maxLod, const Profile* profile, double mtrf, bool restrictPolarSubdivision);
 
-        bool initialized(void) const;
-        void initialize(unsigned uiFirstLod, unsigned uiMaxLod, const Profile* profile, double mtrf);
+        //! Number of LODs
+        unsigned getNumLODs(void) const { return _lods.size(); }
 
-        unsigned getNumLODs(void) const { return _numLods; }
+        //! Visibility and morphing information for a specific LOD
+        const LOD& getLOD(unsigned lod) const;
 
-        // Morph start ratio
-        static double getMorphStartRatio(void) { return _fMorphStartRatio; }
+        //! Fetch the effective visibility range and morphing range for a key
+        void get(const TileKey& key, float& out_range, float& out_startMorphRange, float& out_endMorphRange) const;
 
-        // LOD at which morphing should start
-        static unsigned getLODForMorphing(bool isProjected);
+        //! Get just the visibility range for a TileKey.
+        float getRange(const TileKey& key) const;
 
-        VisParameters visParameters(unsigned lod) const;
     private:
-        unsigned                        _numLods;
-        std::pair<unsigned, unsigned>   _uiGridDimensions; 
-        std::vector<VisParameters>      _vecVisParams;
-        unsigned                        _uiFirstLOD;
-        static const double             _fMorphStartRatio; 
-
-        // This is the lod at which morphing should start (used by shader)
-        static const unsigned           _uiLODForMorphingRoundEarth;
-        
-        // This is used to determine _numLods given a fLodFar during initialize
-        // initialize. This is the distance beyond which further lods (and 
-        // hence VisParameters) are not generated
-        static const double             _fLodLowerBound;
+        std::vector<LOD>    _lods;
+        unsigned            _firstLOD;
+        static const double _morphStartRatio;
     };
 
 } } } // namespace
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/SelectionInfo.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/SelectionInfo.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/SelectionInfo.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/SelectionInfo.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -17,80 +17,144 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include "SelectionInfo"
-#include "SurfaceNode"
-#include "RexTerrainEngineOptions"
-
-#include <osgEarth/Profile>
+#include <osgEarth/TileKey>
 
 using namespace osgEarth::Drivers::RexTerrainEngine;
 using namespace osgEarth;
 
 #define LC "[SelectionInfo] "
 
-const unsigned SelectionInfo::_uiLODForMorphingRoundEarth = 0;
-const double   SelectionInfo::_fLodLowerBound   = 12.0;
-const double   SelectionInfo::_fMorphStartRatio = 0.66;
+const double SelectionInfo::_morphStartRatio = 0.66;
 
-unsigned SelectionInfo::getLODForMorphing(bool isProjected)
+const SelectionInfo::LOD&
+SelectionInfo::getLOD(unsigned lod) const
 {
-    return (isProjected) ? 0 : _uiLODForMorphingRoundEarth;
-}
+    static SelectionInfo::LOD s_dummy;
 
-VisParameters SelectionInfo::visParameters(unsigned lod) const
-{
-    if (lod-_uiFirstLOD>=_vecVisParams.size())
+    if (lod-_firstLOD >= _lods.size())
     {
         // note, this can happen if firstLOD() is set
         OE_DEBUG << LC <<"Index out of bounds"<<std::endl;
-        return VisParameters();
+        return s_dummy;
     }
-    return _vecVisParams[lod-_uiFirstLOD];
+    return _lods[lod-_firstLOD];
 }
 
-bool SelectionInfo::initialized(void) const
+void
+SelectionInfo::initialize(unsigned firstLod, unsigned maxLod, const Profile* profile, double mtrf, bool restrictPolarSubdivision)
 {
-    return _vecVisParams.size()>0;
-}
-
-void SelectionInfo::initialize(unsigned uiFirstLod, unsigned uiMaxLod, const Profile* profile, double mtrf)
-{
-    if (initialized())
+    if (getNumLODs() > 0)
     {
         OE_INFO << LC <<"Error: Selection Information already initialized"<<std::endl;
         return;
     }
-    if (uiFirstLod>uiMaxLod)
+
+    if (firstLod > maxLod)
     {
         OE_INFO << LC <<"Error: Inconsistent First and Max LODs"<<std::endl;
         return;
     }
 
-    _uiFirstLOD = uiFirstLod;
+    _firstLOD = firstLod;
 
-    double fLodNear = 0;
-    float fRatio = 1.0;
+    unsigned numLods = maxLod + 1u;
 
-    _numLods = uiMaxLod+1u; // - uiFirstLod;
+    _lods.resize(numLods);
 
-    _vecVisParams.resize(_numLods);
-
-    for (unsigned lod = 0; lod <= uiMaxLod; ++lod)
+    for (unsigned lod = 0; lod <= maxLod; ++lod)
     {
-        TileKey key(lod, 0, 0, profile);
+        unsigned tx, ty;
+        profile->getNumTiles(lod, tx, ty);
+        TileKey key(lod, tx/2, ty/2, profile);
         GeoExtent e = key.getExtent();
         GeoCircle c = e.computeBoundingGeoCircle();
         double range = c.getRadius() * mtrf * 2.0;
-
-        _vecVisParams[lod]._visibilityRange = range;
-        _vecVisParams[lod]._visibilityRange2 = range*range;
+        _lods[lod]._visibilityRange = range;
+        _lods[lod]._minValidTY = 0;
+        _lods[lod]._maxValidTY = INT32_MAX;
     }
     
-    fLodNear = 0;
-    double fPrevPos = fLodNear;
-    for (int i=(int)(_numLods-1); i>=0; --i)
-    {
-        _vecVisParams[i]._fMorphEnd   = _vecVisParams[i]._visibilityRange;
-        _vecVisParams[i]._fMorphStart = fPrevPos + (_vecVisParams[i]._fMorphEnd - fPrevPos) * _fMorphStartRatio;
-        fPrevPos = _vecVisParams[i]._fMorphStart;
+    double metersPerEquatorialDegree = (profile->getSRS()->getEllipsoid()->getRadiusEquator() * 2.0 * osg::PI) / 360.0;
+
+    double prevPos = 0.0;
+
+    for (int lod=(int)(numLods-1); lod>=0; --lod)
+    {
+        double span = _lods[lod]._visibilityRange - prevPos;
+
+        _lods[lod]._morphEnd   = _lods[lod]._visibilityRange;
+        _lods[lod]._morphStart = prevPos + span*_morphStartRatio;
+        //prevPos = _lods[i]._morphStart; // original value
+        prevPos = _lods[lod]._morphEnd;
+
+        // Calc the maximum valid TY (to avoid over-subdivision at the poles)
+        // In a geographic map, this will effectively limit the maximum LOD
+        // progressively starting at about +/- 72 degrees latitude.
+        unsigned startLOD = 6;
+        if (restrictPolarSubdivision && lod >= startLOD && profile->getSRS()->isGeographic())
+        {            
+            const double startAR = 0.1; // minimum allowable aspect ratio at startLOD
+            const double endAR = 0.4;   // minimum allowable aspect ratio at maxLOD
+            double lodT = (double)(lod-startLOD)/(double)(numLods-1);
+            double minAR = startAR + (endAR-startAR)*lodT;
+
+            unsigned tx, ty;
+            profile->getNumTiles(lod, tx, ty);
+            for(int y=ty/2; y>=0; --y)
+            {
+                TileKey k(lod, 0, y, profile);
+                const GeoExtent& e = k.getExtent();
+                double lat = 0.5*(e.yMax()+e.yMin());
+                double width = e.width() * metersPerEquatorialDegree * cos(osg::DegreesToRadians(lat));
+                double height = e.height() * metersPerEquatorialDegree;
+                if (width/height < minAR)
+                {
+                    _lods[lod]._minValidTY = osg::minimum(y+1, (int)(ty-1));
+                    _lods[lod]._maxValidTY = (ty-1)-_lods[lod]._minValidTY;
+                    OE_DEBUG << "LOD " << lod 
+                        << " TY=" << ty
+                        << " minAR=" << minAR
+                        << " minTY=" << _lods[lod]._minValidTY
+                        << " maxTY=" << _lods[lod]._maxValidTY
+                        << " (+/-" << lat << " deg)"
+                        << std::endl;
+                    break;
+                }
+            }
+        }
+    }
+}
+
+void
+SelectionInfo::get(const TileKey& key, 
+                   float& out_range,
+                   float& out_startMorphRange,
+                   float& out_endMorphRange) const
+{
+    out_range = 0.0f;
+    out_startMorphRange = 0.0f;
+    out_endMorphRange = 0.0f;
+
+    if (key.getLOD() < _lods.size())
+    {
+        const LOD& lod = _lods[key.getLOD()];
+
+        if (key.getTileY() >= lod._minValidTY && key.getTileY() <= lod._maxValidTY)
+        {
+            out_range = lod._visibilityRange;
+            out_startMorphRange = lod._morphStart;
+            out_endMorphRange = lod._morphEnd;
+        }
+    }
+}
+
+float
+SelectionInfo::getRange(const TileKey& key) const
+{
+    const LOD& lod = _lods[key.getLOD()];
+    if (key.getTileY() >= lod._minValidTY && key.getTileY() <= lod._maxValidTY)
+    {
+        return lod._visibilityRange;
     }
+    return 0.0f;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Shaders osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Shaders
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Shaders	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Shaders	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 // ***DO NOT EDIT THIS FILE - IT IS AUTOMATICALLY GENERATED BY CMAKE***
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/SurfaceNode osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/SurfaceNode
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/SurfaceNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/SurfaceNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -33,6 +33,7 @@
 #include <osg/Geode>
 #include <osgText/Text>
 #include <osgUtil/CullVisitor>
+#include <OpenThreads/Atomic>
 #include <vector>
 
 namespace osgEarth { namespace Drivers { namespace RexTerrainEngine
@@ -80,11 +81,20 @@
         
         // A box can have 4 children. 
         // Returns true if any child box intersects the sphere of radius centered around point
-        inline bool anyChildBoxIntersectsSphere(const osg::Vec3& point, float radiusSquared, float lodScale) {
-            double X = radiusSquared / (lodScale*lodScale);
+        inline bool anyChildBoxIntersectsSphere(const osg::Vec3& point, float radiusSquared) {
             for(int c=0; c<4; ++c) {
                 for(int j=0; j<8; ++j) {
-                    if ( (_childrenCorners[c][j]-point).length2() < X )
+                    if ( (_childrenCorners[c][j]-point).length2() < radiusSquared )
+                        return true;
+                }
+            }
+            return false;
+        }
+
+        bool anyChildBoxWithinRange(float range, osg::NodeVisitor& nv) const {
+            for(int c=0; c<4; ++c) {
+                for(int j=0; j<8; ++j) {
+                    if (nv.getDistanceToViewPoint(_childrenCorners[c][j], true) < range)
                         return true;
                 }
             }
@@ -95,15 +105,23 @@
 
         osg::BoundingSphere computeBound() const;
 
+        osg::Node* getDebugNode() const { return _debugNode.get(); }
+
+        void setLastFramePassedCull(unsigned fn);
+
+        unsigned getLastFramePassedCull() const { return _lastFramePassedCull; }
+
+        float getPixelSizeOnScreen(osg::CullStack* cull) const;
+
     protected:
         virtual ~SurfaceNode() { }
 
         TileKey                     _tileKey;
         osg::ref_ptr<TileDrawable>  _drawable;
-        osg::ref_ptr<osg::Group>    _debugGeode;
+        osg::ref_ptr<osg::Node>     _debugNode;
         osg::ref_ptr<osgText::Text> _debugText;
         static const bool           _enableDebugNodes;
-        
+        OpenThreads::Atomic         _lastFramePassedCull;
         HorizonTileCuller           _horizonCuller;        
 
         typedef osg::Vec3 VectorPoints[8];
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/SurfaceNode.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/SurfaceNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/SurfaceNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/SurfaceNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -24,6 +24,7 @@
 #include <osgEarth/Registry>
 #include <osgEarth/Horizon>
 #include <osgEarth/ImageUtils>
+#include <osgEarth/LineDrawable>
 
 #include <osg/CullStack>
 #include <osg/Geode>
@@ -45,58 +46,35 @@
 
 namespace
 {    
-    osg::Group* makeBBox(const osg::BoundingBox& bbox, const TileKey& key)
-    {        
+    osg::Node* makeBBox(const osg::BoundingBox& bbox, const TileKey& key)
+    {
         osg::Group* geode = new osg::Group();
         std::string sizeStr = "(empty)";
         float zpos = 0.0f;
 
         if ( bbox.valid() )
         {
-            osg::Geometry* geom = new osg::Geometry();
-            geom->setName("bbox");
-        
-            osg::Vec3Array* v = new osg::Vec3Array();
-            for(int i=0; i<8; ++i)
-                v->push_back(bbox.corner(i));
-            geom->setVertexArray(v);
-
-            osg::DrawElementsUByte* de = new osg::DrawElementsUByte(GL_LINES);
-
-#if 1
-            // bottom:
-            de->push_back(0); de->push_back(1);
-            de->push_back(1); de->push_back(3);
-            de->push_back(3); de->push_back(2);
-            de->push_back(2); de->push_back(0);
-#endif
-#if 1
-            // top:
-            de->push_back(4); de->push_back(5);
-            de->push_back(5); de->push_back(7);
-            de->push_back(7); de->push_back(6);
-            de->push_back(6); de->push_back(4);
-#endif
-#if 0
-            // corners:
-            de->push_back(0); de->push_back(4);
-            de->push_back(1); de->push_back(5);
-            de->push_back(3); de->push_back(7);
-            de->push_back(2); de->push_back(6);
-#endif
-            geom->addPrimitiveSet(de);
-
-            osg::Vec4Array* c= new osg::Vec4Array();
-            c->push_back(osg::Vec4(1,0,0,1));
-            geom->setColorArray(c);
-            geom->setColorBinding(geom->BIND_OVERALL);
-
-            geode->addChild(geom);
-
+            static const int index[24] = {
+                0,1, 1,3, 3,2, 2,0,
+                0,4, 1,5, 2,6, 3,7,
+                4,5, 5,7, 7,6, 6,4
+            };
+
+            LineDrawable* lines = new LineDrawable(GL_LINES);            
+            for(int i=0; i<24; i+=2)
+            {
+                lines->pushVertex(bbox.corner(index[i]));
+                lines->pushVertex(bbox.corner(index[i+1]));
+            }
+            lines->setColor(osg::Vec4(1,0,0,1));
+            lines->finish();
             sizeStr = Stringify() << key.str() << "\nmax="<<bbox.zMax()<<"\nmin="<<bbox.zMin()<<"\n";
             zpos = bbox.zMax();
+
+            geode->addChild(lines);
         }
 
+#if 0
         osgText::Text* textDrawable = new osgText::Text();
         textDrawable->setDataVariance(osg::Object::DYNAMIC);
         textDrawable->setText( sizeStr );
@@ -110,10 +88,11 @@
         textDrawable->setPosition(osg::Vec3(0,0,zpos));
         textDrawable->setAutoRotateToScreen(true);
         geode->addChild(textDrawable);
+#endif
 
-        geode->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(),0);
-        geode->getOrCreateStateSet()->setMode(GL_LIGHTING,0);
-        geode->getOrCreateStateSet()->setRenderBinDetails(INT_MAX, "DepthSortedBin");
+        //geode->getOrCreateStateSet()->setAttributeAndModes(new osg::Program(),0);
+        //geode->getOrCreateStateSet()->setMode(GL_LIGHTING,0); // ok; ffp debugging code
+        //geode->getOrCreateStateSet()->setRenderBinDetails(INT_MAX, "DepthSortedBin");
 
         return geode;
     }
@@ -147,7 +126,7 @@
         b->push_back(1); b->push_back(5); b->push_back(2);
         geom->addPrimitiveSet(b);
 
-        osg::Vec3Array* n = new osg::Vec3Array();
+        osg::Vec3Array* n = new osg::Vec3Array(osg::Array::BIND_PER_VERTEX);
         n->reserve(6);
         n->push_back(osg::Vec3(0, 0, 1));
         n->push_back(osg::Vec3(0, 0, -1));
@@ -156,15 +135,13 @@
         n->push_back(osg::Vec3(0, 1, 0));
         n->push_back(osg::Vec3(0, -1, 0));
         geom->setNormalArray(n);
-        geom->setNormalBinding(osg::Geometry::BIND_PER_VERTEX);
 
         //MeshSubdivider ms;
         //ms.run(*geom, osg::DegreesToRadians(maxAngle), GEOINTERP_GREAT_CIRCLE);
 
-        osg::Vec4Array* c = new osg::Vec4Array(1);
+        osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
         (*c)[0].set(1,1,0,1);
         geom->setColorArray(c);
-        geom->setColorBinding(osg::Geometry::BIND_OVERALL);
 
         return geom;
     }
@@ -190,8 +167,8 @@
         // necessary because a tile that's below the ellipsoid (ocean floor, e.g.)
         // may be visible even if it doesn't pass the horizon-cone test. In such
         // cases we need a more conservative ellipsoid.
-        double zMin = (double)std::min( bbox.corner(0).z(), 0.0f );
-        zMin = std::max(zMin, -25000.0); // approx the lowest point on earth * 2
+        double zMin = static_cast<double>(osg::minimum( bbox.corner(0).z(), static_cast<osg::BoundingBox::value_type>(0.)));
+        zMin = osg::maximum(zMin, -25000.0); // approx the lowest point on earth * 2
         _horizon->setEllipsoid( osg::EllipsoidModel(
             srs->getEllipsoid()->getRadiusEquator() + zMin, 
             srs->getEllipsoid()->getRadiusPolar() + zMin) );
@@ -224,7 +201,7 @@
 //..............................................................
 
 
-const bool SurfaceNode::_enableDebugNodes = ::getenv("OSGEARTH_MP_DEBUG") != 0L;
+const bool SurfaceNode::_enableDebugNodes = ::getenv("OSGEARTH_REX_DEBUG") != 0L;
 
 SurfaceNode::SurfaceNode(const TileKey&        tilekey,
                          const MapInfo&        mapinfo,
@@ -263,6 +240,22 @@
     return bs;
 }
 
+float
+SurfaceNode::getPixelSizeOnScreen(osg::CullStack* cull) const
+{     
+    // By using the width, the "apparent" pixel size will decrease as we
+    // near the poles.
+    double R = _drawable->getWidth()*0.5;
+    //double R = _drawable->getRadius() / 1.4142;
+    return cull->clampedPixelSize(getMatrix().getTrans(), R) / cull->getLODScale();
+}
+
+void
+SurfaceNode::setLastFramePassedCull(unsigned fn)
+{
+    _lastFramePassedCull.exchange(fn);
+}
+
 void
 SurfaceNode::setElevationRaster(const osg::Image*   raster,
                                 const osg::Matrixf& scaleBias)
@@ -277,11 +270,7 @@
     }
 
     // next compute the bounding box in local space:
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,2)
     const osg::BoundingBox& box = _drawable->getBoundingBox();
-#else
-    const osg::BoundingBox& box = _drawable->getBound();
-#endif
 
     // Compute the medians of each potential child node:
 
@@ -384,17 +373,17 @@
 SurfaceNode::addDebugNode(const osg::BoundingBox& box)
 {
     _debugText = 0;
-    _debugGeode = makeBBox(box, _tileKey);
-    addChild( _debugGeode.get() );
+    _debugNode = makeBBox(box, _tileKey);
+    addChild( _debugNode.get() );
 }
 
 void
 SurfaceNode::removeDebugNode(void)
 {
     _debugText = 0;
-    if ( _debugGeode.valid() )
+    if ( _debugNode.valid() )
     {
-        removeChild( _debugGeode.get() );
+        removeChild( _debugNode.get() );
     }
 }
 
@@ -411,9 +400,5 @@
 const osg::BoundingBox&
 SurfaceNode::getAlignedBoundingBox() const
 {
-#if OSG_VERSION_GREATER_OR_EQUAL(3,3,2)
     return _drawable->getBoundingBox();
-#else
-    return _drawable->getBound();
-#endif
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TerrainCuller osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TerrainCuller
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TerrainCuller	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TerrainCuller	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -21,8 +21,7 @@
 
 #include "EngineContext"
 #include "TerrainRenderData"
-
-#include <osgEarth/MapFrame>
+#include "SelectionInfo"
 
 #include <osg/NodeVisitor>
 #include <osgUtil/CullVisitor>
@@ -47,23 +46,22 @@
     class TerrainCuller : public osg::NodeVisitor, public osg::CullStack
     {
     public:
-        const MapFrame* _frame;
         TerrainRenderData _terrain;
         EngineContext* _context;
         osg::Camera* _camera;
         TileNode* _currentTileNode;
-        unsigned _currentTileDrawCommands;
-        DrawTileCommand* _firstTileDrawCommandForTile;
+        DrawTileCommand* _firstDrawCommandForTile;
         unsigned _orphanedPassesDetected;
         osgUtil::CullVisitor* _cv;
         LayerExtentVector* _layerExtents;
+        bool _isSpy;
 
     public:
         /** A new terrain culler */
         TerrainCuller(osgUtil::CullVisitor* cullVisitor, EngineContext* context);
 
         /** Initialize the culler with a map and a set of render bindings. */
-        void setup(const MapFrame& frame, LayerExtentVector& layerExtents, const RenderBindings& bindings);
+        void setup(const Map* map, LayerExtentVector& layerExtents, const RenderBindings& bindings);
 
         /** The active camera */
         osg::Camera* getCamera() { return _camera; }
@@ -74,8 +72,12 @@
         /** The CullVIsitor that parents this culler. */
         osgUtil::CullVisitor& getParent() { return *_cv; }
 
+        bool isCulledToBBox(osg::Transform* node, const osg::BoundingBox& box);
+
     public: // osg::NodeVisitor
         void apply(osg::Node& node);
+        void apply(TileNode& node);
+        void apply(SurfaceNode& node);
         
         float getDistanceToViewPoint(const osg::Vec3& pos, bool withLODScale) const;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TerrainCuller.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TerrainCuller.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TerrainCuller.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TerrainCuller.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -19,6 +19,8 @@
 #include "TerrainCuller"
 #include "TileNode"
 #include "SurfaceNode"
+#include "SelectionInfo"
+#include <osgEarth/TraversalData>
 
 #define LC "[TerrainCuller] "
 
@@ -26,7 +28,6 @@
 
 
 TerrainCuller::TerrainCuller(osgUtil::CullVisitor* cullVisitor, EngineContext* context) :
-_frame(0L),
 _camera(0L),
 _currentTileNode(0L),
 _orphanedPassesDetected(0u),
@@ -43,22 +44,24 @@
     pushViewport(_cv->getViewport());
     pushProjectionMatrix(_cv->getProjectionMatrix());
     pushModelViewMatrix(_cv->getModelViewMatrix(), _cv->getCurrentCamera()->getReferenceFrame());
+    setLODScale(_cv->getLODScale());
     _camera = _cv->getCurrentCamera();
+    _isSpy = VisitorData::isSet(*cullVisitor, "osgEarth.Spy");
 }
 
 void
-TerrainCuller::setup(const MapFrame& frame, LayerExtentVector& layerExtents, const RenderBindings& bindings)
+TerrainCuller::setup(const Map* map, LayerExtentVector& layerExtents, const RenderBindings& bindings)
 {
     unsigned frameNum = getFrameStamp() ? getFrameStamp()->getFrameNumber() : 0u;
     _layerExtents = &layerExtents;
-    _terrain.setup(frame, bindings, frameNum, _cv);
+    _terrain.setup(map, bindings, frameNum, _cv);
 }
 
 float
 TerrainCuller::getDistanceToViewPoint(const osg::Vec3& pos, bool withLODScale) const
 {
-    if (withLODScale) return (pos-getViewPointLocal()).length()*getLODScale();
-    else return (pos-getViewPointLocal()).length();
+    // pass through, in case developer has overridden the method in the prototype CV
+    return _cv->getDistanceToViewPoint(pos, withLODScale);
 }
 
 DrawTileCommand*
@@ -81,58 +84,62 @@
     osg::ref_ptr<LayerDrawable> drawable = _terrain.layer(uid);
     if (drawable.valid())
     {
-        // Cull based on the layer extent.
-        if (drawable->_layer)
+        // Layer marked for drawing?
+        if (drawable->_draw)
         {
-            const LayerExtent& le = (*_layerExtents)[drawable->_layer->getUID()];
-            if (le._computed && 
-                le._extent.isValid() &&
-                le._extent.intersects(tileNode->getKey().getExtent()) == false)
+            // Cull based on the layer extent.
+            if (drawable->_layer)
             {
-                // culled out!
-                //OE_DEBUG << LC << "Skippping " << drawable->_layer->getName() 
-                //    << " key " << tileNode->getKey().str()
-                //    << " because it was culled by extent." << std::endl;
-                return 0L;
+                const LayerExtent& le = (*_layerExtents)[drawable->_layer->getUID()];
+                if (le._computed && 
+                    le._extent.isValid() &&
+                    le._extent.intersects(tileNode->getKey().getExtent()) == false)
+                {
+                    // culled out!
+                    //OE_DEBUG << LC << "Skippping " << drawable->_layer->getName() 
+                    //    << " key " << tileNode->getKey().str()
+                    //    << " because it was culled by extent." << std::endl;
+                    return 0L;
+                }            
             }
-        }
 
-        drawable->_tiles.push_back(DrawTileCommand());
-        DrawTileCommand* tile = &drawable->_tiles.back();
+            drawable->_tiles.push_back(DrawTileCommand());
+            DrawTileCommand* tile = &drawable->_tiles.back();
 
-        // install everything we need in the Draw Command:
-        tile->_colorSamplers = pass ? &(pass->samplers()) : 0L;
-        tile->_sharedSamplers = &model->_sharedSamplers;
-        tile->_modelViewMatrix = this->getModelViewMatrix();
-        tile->_keyValue = tileNode->getTileKeyValue();
-        tile->_geom = surface->getDrawable()->_geom.get();
-        tile->_morphConstants = tileNode->getMorphConstants();
-        tile->_key = &tileNode->getKey();
-        //tile->_order = (int)orderInTile;
-        tile->_order = drawable->_order; // layer order in map tile.
+            // install everything we need in the Draw Command:
+            tile->_colorSamplers = pass ? &(pass->samplers()) : 0L;
+            tile->_sharedSamplers = &model->_sharedSamplers;
+            tile->_modelViewMatrix = _cv->getModelViewMatrix();
+            tile->_keyValue = tileNode->getTileKeyValue();
+            tile->_geom = surface->getDrawable()->_geom.get();
+            tile->_morphConstants = tileNode->getMorphConstants();
+            tile->_key = &tileNode->getKey();
 
-        osg::Vec3 c = surface->getBound().center() * surface->getInverseMatrix();
-        tile->_range = getDistanceToViewPoint(c, true);
+            osg::Vec3 c = surface->getBound().center() * surface->getInverseMatrix();
+            tile->_range = getDistanceToViewPoint(c, true);
 
-        const osg::Image* elevRaster = tileNode->getElevationRaster();
-        if (elevRaster)
-        {
-            float bias = _context->getUseTextureBorder() ? 1.5 : 0.5;
+            tile->_layerOrder = drawable->_drawOrder;
 
-            // Compute an elevation texture sampling scale/bias so we sample elevation data on center
-            // instead of on edge (as we do with color, etc.)
-            //
-            // This starts out as:
-            //   scale = (size-1)/size : this shrinks the sample area by one texel since we're sampling on center
-            //   bias = 0.5/size : this shifts the sample area over 1/2 texel to the center.
-            //
-            // But, since we also have a 1-texel border, we need to further reduce the scale by 2 texels to
-            // remove the border, and shift an extra texel over as well. Giving us this:
-            float size = (float)elevRaster->s();
-            tile->_elevTexelCoeff.set((size - (2.0*bias)) / size, bias / size);
-        }
+            const osg::Image* elevRaster = tileNode->getElevationRaster();
+            if (elevRaster)
+            {
+                float bias = _context->getUseTextureBorder() ? 1.5 : 0.5;
 
-        return tile;
+                // Compute an elevation texture sampling scale/bias so we sample elevation data on center
+                // instead of on edge (as we do with color, etc.)
+                //
+                // This starts out as:
+                //   scale = (size-1)/size : this shrinks the sample area by one texel since we're sampling on center
+                //   bias = 0.5/size : this shifts the sample area over 1/2 texel to the center.
+                //
+                // But, since we also have a 1-texel border, we need to further reduce the scale by 2 texels to
+                // remove the border, and shift an extra texel over as well. Giving us this:
+                float size = (float)elevRaster->s();
+                tile->_elevTexelCoeff.set((size - (2.0*bias)) / size, bias / size);
+            }
+
+            return tile;
+        }
     }
     else if (pass)
     {
@@ -141,6 +148,10 @@
         // this information so we can run a cleanup visitor later on.
         ++_orphanedPassesDetected;
     }
+    else
+    {
+        OE_WARN << "Added nothing for a UID -1 darw command" << std::endl;
+    }
     
     return 0L;
 }
@@ -148,127 +159,171 @@
 void
 TerrainCuller::apply(osg::Node& node)
 {
-    // push the node's state.
-    osg::StateSet* node_state = node.getStateSet();
-
     TileNode* tileNode = dynamic_cast<TileNode*>(&node);
     if (tileNode)
     {
-        _currentTileNode = tileNode;
+        apply(*tileNode);
+    }
+    else
+    {
+        SurfaceNode* surfaceNode = dynamic_cast<SurfaceNode*>(&node);
+        if (surfaceNode)
+        {
+            apply(*surfaceNode);
+            return; // no need to traverse further
+        }
+    }
+
+    // Handle any CullCallbacks and traverse.
+    osg::Callback* cullCallback = node.getCullCallback();
+    if (cullCallback) cullCallback->run(&node, this);
+    else traverse(node);
+}
+
+bool
+TerrainCuller::isCulledToBBox(osg::Transform* node, const osg::BoundingBox& box)
+{
+    osg::RefMatrix* matrix = createOrReuseMatrix(*_cv->getModelViewMatrix());
+    node->computeLocalToWorldMatrix(*matrix, this);
+    _cv->pushModelViewMatrix(matrix, node->getReferenceFrame());
+    bool culled = _cv->isCulled(box);
+    _cv->popModelViewMatrix();
+    return culled;
+}
 
-        // reset the pointer to the first DrawTileCommand. We keep track of this so
-        // we can set it's "order" member to zero at the end, so the rendering engine
-        // knows to blend it with the terrain geometry color.
-        _firstTileDrawCommandForTile = 0L;
+void
+TerrainCuller::apply(TileNode& node)
+{
+    _currentTileNode = &node;
 
-        //_currentTileDrawCommands = 0u;
+    // reset the pointer to the first DrawTileCommand. We keep track of this so
+    // we can set it's "layerOrder" member to zero at the end, so the rendering engine
+    // knows to blend it with the terrain geometry color.
+    _firstDrawCommandForTile = 0L;
         
-        if (!_terrain.patchLayers().empty())
+    if (!_terrain.patchLayers().empty())
+    {
+        // todo: check for patch/virtual
+        const RenderBindings& bindings = _context->getRenderBindings();
+        TileRenderModel& renderModel = _currentTileNode->renderModel();
+
+        bool pushedMatrix = false;
+
+        // Render patch layers if applicable.
+        // A patch layer is one rendered using GL_PATCHES.
+        for (PatchLayerVector::const_iterator i = _terrain.patchLayers().begin(); i != _terrain.patchLayers().end(); ++i)
         {
-            // todo: check for patch/virtual
-            const RenderBindings& bindings = _context->getRenderBindings();
-            TileRenderModel& renderModel = _currentTileNode->renderModel();
-
-            bool pushedMatrix = false;
-            
-            for (PatchLayerVector::const_iterator i = _terrain.patchLayers().begin(); i != _terrain.patchLayers().end(); ++i)
+            PatchLayer* layer = i->get();
+
+            // is the layer accepting this key?
+            if (layer->getAcceptCallback() && !layer->getAcceptCallback()->acceptKey(_currentTileNode->getKey()))
+                continue;
+
+            // is the tile in visible range?
+            float range = _cv->getDistanceToViewPoint(node.getBound().center(), true) - node.getBound().radius();
+            if (layer->getMaxVisibleRange() < range)
+                continue;
+
+            // Push this tile's matrix if we haven't already done so:
+            if (!pushedMatrix)
             {
-                PatchLayer* layer = i->get();
-                if (layer->getAcceptCallback() == 0L ||
-                    layer->getAcceptCallback()->acceptKey(_currentTileNode->getKey()))
-                {
-                    // Push this tile's matrix if we haven't already done so:
-                    if (!pushedMatrix)
-                    {
-                        SurfaceNode* surface = tileNode->getSurfaceNode();
-
-                        // push the surface matrix:
-                        osg::Matrix mvm = *getModelViewMatrix();
-                        surface->computeLocalToWorldMatrix(mvm, this);
-                        pushModelViewMatrix(createOrReuseMatrix(mvm), surface->getReferenceFrame());
-                        pushedMatrix = true;
-                    }
-
-                    // Add the draw command:
-                    DrawTileCommand* cmd = addDrawCommand(layer->getUID(), &renderModel, 0L, tileNode);
-                    if (cmd)
-                    {
-                        cmd->_drawPatch = true;
-                        cmd->_drawCallback = layer->getDrawCallback();
-                    }
-                }
+                SurfaceNode* surface = node.getSurfaceNode();
+                    
+                // push the surface matrix:
+                osg::RefMatrix* matrix = createOrReuseMatrix(*_cv->getModelViewMatrix());
+                surface->computeLocalToWorldMatrix(*matrix,this);
+                _cv->pushModelViewMatrix(matrix, surface->getReferenceFrame());
+
+                pushedMatrix = true;
             }
 
-            if (pushedMatrix)
+            // Add the draw command:
+            DrawTileCommand* cmd = addDrawCommand(layer->getUID(), &renderModel, 0L, &node);
+            if (cmd)
             {
-                popModelViewMatrix();
+                cmd->_drawPatch = true;
+                cmd->_drawCallback = layer->getDrawCallback();
             }
         }
+
+        if (pushedMatrix)
+        {
+           _cv->popModelViewMatrix();
+        }
     }
+}
 
-    else
+void
+TerrainCuller::apply(SurfaceNode& node)
+{
+    TileRenderModel& renderModel = _currentTileNode->renderModel();
+
+    // push the surface matrix:
+    osg::RefMatrix* matrix = createOrReuseMatrix(*getModelViewMatrix());
+    node.computeLocalToWorldMatrix(*matrix,this);
+    _cv->pushModelViewMatrix(matrix, node.getReferenceFrame());
+
+    // now test against the local bounding box for tighter culling:
+    if (!_cv->isCulled(node.getAlignedBoundingBox()))
     {
-        SurfaceNode* surface = dynamic_cast<SurfaceNode*>(&node);
-        if (surface)
+        if (!_isSpy)
         {
-            TileRenderModel& renderModel = _currentTileNode->renderModel();
+            node.setLastFramePassedCull(getFrameStamp()->getFrameNumber());
+        }
+
+        int order = 0;
+        unsigned count = 0;
 
-            // push the surface matrix:
-            osg::Matrix mvm = *getModelViewMatrix();
-            surface->computeLocalToWorldMatrix(mvm, this);
-            pushModelViewMatrix(createOrReuseMatrix(mvm), surface->getReferenceFrame());
-
-            int order = 0;
-
-            // First go through any legit rendering pass data in the Tile and
-            // and add a DrawCommand for each.
-            for (unsigned p = 0; p < renderModel._passes.size(); ++p)
+        // First go through any legit rendering pass data in the Tile and
+        // and add a DrawCommand for each.
+        for (unsigned p = 0; p < renderModel._passes.size(); ++p)
+        {
+            const RenderingPass& pass = renderModel._passes[p];
+            DrawTileCommand* cmd = addDrawCommand(pass.sourceUID(), &renderModel, &pass, _currentTileNode);
+            if (cmd)
             {
-                const RenderingPass& pass = renderModel._passes[p];
-                DrawTileCommand* cmd = addDrawCommand(pass.sourceUID(), &renderModel, &pass, _currentTileNode);
-                if (cmd)
+                if (_firstDrawCommandForTile == 0L)
                 {
-                    if (_firstTileDrawCommandForTile == 0L)
-                    {
-                        _firstTileDrawCommandForTile = cmd;
-                    }
-                    else if (cmd->_order < _firstTileDrawCommandForTile->_order)
-                    {
-                        //_firstTileDrawCommandForTile->_order = 1;
-                        _firstTileDrawCommandForTile = cmd;
-                    }
+                    _firstDrawCommandForTile = cmd;
+                }
+                else if (cmd->_layerOrder < _firstDrawCommandForTile->_layerOrder)
+                {
+                    _firstDrawCommandForTile = cmd;
                 }
             }
+        }
 
-            // If the culler added no draw commands for this tile... we still need
-            // to draw something or else there will be a hole! So draw a blank tile.
-            // UID = -1 is the special UID code for a blank.
-            if (_firstTileDrawCommandForTile == 0L)
-            {
-                //OE_INFO << LC << "Adding blank render for tile " << _currentTileNode->getKey().str() << std::endl;
-                DrawTileCommand* cmd = addDrawCommand(-1, &renderModel, 0L, _currentTileNode);
-                if (cmd)
-                    cmd->_order = 0;
-            }
-
-            // Set the layer order of the first draw command for this tile to zero,
-            // to support proper terrain blending.
-            if (_firstTileDrawCommandForTile)
+        // If the culler added no draw commands for this tile... we still need
+        // to draw something or else there will be a hole! So draw a blank tile.
+        // UID = -1 is the special UID code for a blank.
+        if (_firstDrawCommandForTile == 0L)
+        {
+            //OE_INFO << LC << "Adding blank render for tile " << _currentTileNode->getKey().str() << std::endl;
+            DrawTileCommand* cmd = addDrawCommand(-1, &renderModel, 0L, _currentTileNode);
+            if (cmd)
             {
-                _firstTileDrawCommandForTile->_order = 0;
+                _firstDrawCommandForTile = cmd;
             }
-                
-            // pop the matrix from the cull stack
-            popModelViewMatrix();
+        }
 
-            // update our bounds
-            _terrain._drawState->_bs.expandBy(surface->getBound());
-            _terrain._drawState->_box.expandBy(_terrain._drawState->_bs);
+        // Set the layer order of the first draw command for this tile to zero,
+        // to support proper terrain blending.
+        if (_firstDrawCommandForTile)
+        {
+            _firstDrawCommandForTile->_layerOrder = 0;
         }
+
+        // update our bounds
+        _terrain._drawState->_bs.expandBy(node.getBound());
+        _terrain._drawState->_box.expandBy(_terrain._drawState->_bs);
     }
+                
+    // pop the matrix from the cull stack
+    _cv->popModelViewMatrix();
 
-    // Handle any CullCallbacks and traverse.
-    osg::Callback* cullCallback = node.getCullCallback();
-    if (cullCallback) cullCallback->run(&node, this);
-    else traverse(node);
+    if (node.getDebugNode())
+    {
+        node.accept(*_cv);
+    }
 }
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TerrainRenderData osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TerrainRenderData
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TerrainRenderData	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TerrainRenderData	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -23,9 +23,6 @@
 #include "DrawState"
 #include "LayerDrawable"
 
-#include <osgEarth/MapFrame>
-#include <osg/StateSet>
-
 using namespace osgEarth;
 
 namespace osgEarth { namespace Drivers { namespace RexTerrainEngine
@@ -41,13 +38,13 @@
             _bindings(0L) { }
 
         /** Set up the map layers before culling the terrain */
-        void setup(const MapFrame& frame, const RenderBindings& bindings, unsigned frameNum, osgUtil::CullVisitor* cv);
+        void setup(const Map* map, const RenderBindings& bindings, unsigned frameNum, osgUtil::CullVisitor* cv);
 
-        /** Optimize for best state sharing (when using geometry pooling) */
-        void sortDrawCommands();
+        /** Optimize for best state sharing (when using geometry pooling). Returns total tile count. */
+        unsigned sortDrawCommands();
 
         /** Add a Drawable for a layer. Add these in the order you wish to render them. */
-        LayerDrawable* addLayerDrawable(const Layer*, const MapFrame& frame);
+        LayerDrawable* addLayerDrawable(const Layer*);
 
         /** Layers to draw */
         LayerDrawableList& layers() { return _layerList; }
@@ -59,7 +56,7 @@
         // Draw state shared by all layers during one frame.
         osg::ref_ptr<DrawState> _drawState;
 
-        // Layers of type RENDERTYPE_PATCH
+        // Layers of type RENDERTYPE_TERRAIN_PATCH
         PatchLayerVector& patchLayers() { return _patchLayers; }
         
     private:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TerrainRenderData.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TerrainRenderData.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TerrainRenderData.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TerrainRenderData.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -19,6 +19,7 @@
 #include "TerrainRenderData"
 #include "TileNode"
 #include "SurfaceNode"
+#include <osgEarth/ClampableNode>
 
 using namespace osgEarth::Drivers::RexTerrainEngine;
 
@@ -26,17 +27,22 @@
 #define LC "[TerrainRenderData] "
 
 
-void
+unsigned
 TerrainRenderData::sortDrawCommands()
 {
+    unsigned total = 0;
     for (LayerDrawableList::iterator i = _layerList.begin(); i != _layerList.end(); ++i)
     {
-        i->get()->_tiles.sort();
+        //TODO: review and benchmark list vs. vector vs. unsorted here.
+        DrawTileCommands& cmds = i->get()->_tiles;
+        std::sort(cmds.begin(), cmds.end());
+        total += i->get()->_tiles.size();
     }
+    return total;
 }
 
 void
-TerrainRenderData::setup(const MapFrame& frame,
+TerrainRenderData::setup(const Map* map,
                          const RenderBindings& bindings,
                          unsigned frameNum,
                          osgUtil::CullVisitor* cv)
@@ -47,20 +53,26 @@
     _drawState = new DrawState();
     _drawState->_frame = frameNum;
     _drawState->_bindings = &bindings;
+    
+    // Is this a depth camera? Because if it is, we don't need any color layers.
+    const osg::Camera* cam = cv->getCurrentCamera();
+    bool isDepthCamera = ClampableNode::isDepthCamera(cam);
 
     // Make a drawable for each rendering pass (i.e. each render-able map layer).
-    for(LayerVector::const_iterator i = frame.layers().begin();
-        i != frame.layers().end();
-        ++i)
+    LayerVector layers;
+    map->getLayers(layers);
+
+    for (LayerVector::const_iterator i = layers.begin(); i != layers.end(); ++i)
     {
         Layer* layer = i->get();
         if (layer->getEnabled())
         {
-            if (layer->getRenderType() == Layer::RENDERTYPE_TILE ||
-                layer->getRenderType() == Layer::RENDERTYPE_PATCH)
-            {
-                bool render = true;
+            bool render =
+                (layer->getRenderType() == Layer::RENDERTYPE_TERRAIN_SURFACE) || // && !isDepthCamera) ||
+                (layer->getRenderType() == Layer::RENDERTYPE_TERRAIN_PATCH);
 
+            if ( render )
+            {
                 // If this is an image layer, check the enabled/visible states.
                 VisibleLayer* visLayer = dynamic_cast<VisibleLayer*>(layer);
                 if (visLayer)
@@ -70,7 +82,20 @@
 
                 if (render)
                 {
-                    if (layer->getRenderType() == Layer::RENDERTYPE_PATCH)
+                    if (layer->getRenderType() == Layer::RENDERTYPE_TERRAIN_SURFACE)
+                    {
+                        LayerDrawable* ld = addLayerDrawable(layer);
+
+                        // If the current camera is depth-only, leave this layer in the set
+                        // but mark it as no-draw. We keep it in the set so the culler doesn't
+                        // inadvertently think it's an orphaned layer.
+                        if (isDepthCamera)
+                        {
+                            ld->_draw = false;
+                        }
+                    }
+
+                    else // if (layer->getRenderType() == Layer::RENDERTYPE_TERRAIN_PATCH)
                     {
                         PatchLayer* patchLayer = static_cast<PatchLayer*>(layer); // asumption!
 
@@ -78,21 +103,16 @@
                             patchLayer->getAcceptCallback()->acceptLayer(*cv, cv->getCurrentCamera()))
                         {
                             patchLayers().push_back(dynamic_cast<PatchLayer*>(layer));
-                            addLayerDrawable(layer, frame);
+                            addLayerDrawable(layer);
                         }
                     }
-                    else
-                    {
-                        addLayerDrawable(layer, frame);
-                    }
                 }
             }
         }
     }
 
     // Include a "blank" layer for missing data.
-    LayerDrawable* blank = addLayerDrawable(0L, frame);
-    blank->getOrCreateStateSet()->setDefine("OE_TERRAIN_RENDER_IMAGERY", osg::StateAttribute::OFF);
+    LayerDrawable* blank = addLayerDrawable(0L);
 }
 
 namespace
@@ -110,22 +130,27 @@
 }
 
 LayerDrawable*
-TerrainRenderData::addLayerDrawable(const Layer* layer, const MapFrame& frame)
+TerrainRenderData::addLayerDrawable(const Layer* layer)
 {
-    UID uid = layer ? layer->getUID() : -1;
-    LayerDrawable* ld = new LayerDrawable();
-    _layerList.push_back(ld);
-    _layerMap[uid] = ld;
-    ld->_layer = layer;
-    ld->_visibleLayer = dynamic_cast<const VisibleLayer*>(layer);
-    ld->_imageLayer = dynamic_cast<const ImageLayer*>(layer);
-    ld->_order = _layerList.size() - 1;
-    ld->_drawState = _drawState.get();
+    LayerDrawable* drawable = new LayerDrawable();
+    drawable->_drawOrder = _layerList.size();
+    _layerList.push_back(drawable);
+
+    drawable->_drawState = _drawState.get();
+
     if (layer)
     {
-        ld->setStateSet(layer->getStateSet());
-        ld->_renderType = layer->getRenderType();
+        _layerMap[layer->getUID()] = drawable;
+        drawable->_layer = layer;
+        drawable->_visibleLayer = dynamic_cast<const VisibleLayer*>(layer);
+        drawable->_imageLayer = dynamic_cast<const ImageLayer*>(layer);
+        drawable->setStateSet(layer->getStateSet());
+        drawable->_renderType = layer->getRenderType();
+    }
+    else
+    {
+        _layerMap[-1] = drawable;
     }
-    //ld->setDrawCallback(new DebugCallback(layer ? layer->getName() : "[blank]"));
-    return ld;
+
+    return drawable;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileDrawable osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileDrawable
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileDrawable	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileDrawable	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -26,37 +26,19 @@
 #include <osg/Image>
 #include <osg/Matrixf>
 #include <osgEarth/TileKey>
-#include <osgEarth/MapFrame>
+#include <osgEarth/Map>
 
 using namespace osgEarth;
 
 namespace osgEarth { namespace Drivers { namespace RexTerrainEngine
 {
+    class EngineContext;
+
     struct ModifyBoundingBoxCallback : public osg::Referenced
     {
-        ModifyBoundingBoxCallback(const MapFrame& frame) : _frame(frame) { }
-
-        mutable Threading::Mutex _mutex;
-        mutable MapFrame _frame;
-
-        void operator()(const TileKey& key, osg::BoundingBox& bbox) const
-        {
-            if (_frame.needsSync())
-            {
-                Threading::ScopedMutexLock lock(_mutex);
-                _frame.sync();
-            }
-
-            for (LayerVector::const_iterator layer = _frame.layers().begin();
-                layer != _frame.layers().end();
-                ++layer)
-            {
-                if (layer->valid())
-                {
-                    layer->get()->modifyTileBoundingBox(key, bbox);
-                }
-            }
-        }
+        ModifyBoundingBoxCallback(EngineContext* engine);
+        void operator()(const TileKey& key, osg::BoundingBox& bbox);
+        EngineContext* _engine;
     };
 
     /**
@@ -89,7 +71,9 @@
         osg::Vec3f* _mesh;
         GLuint* _meshIndices;
 
+        osg::BoundingBox _bboxOffsets;
         ModifyBoundingBoxCallback* _bboxCB;
+        mutable float _bboxRadius;
 
     public:
         
@@ -115,6 +99,10 @@
         // Set the render model so we can properly calculate bounding boxes
         void setModifyBBoxCallback(ModifyBoundingBoxCallback* bboxCB) { _bboxCB = bboxCB; }
 
+        float getRadius() const { return _bboxRadius; }
+
+        float getWidth() const { return getBoundingBox().xMax() - getBoundingBox().xMin(); }
+
     public: // osg::Drawable overrides
 
         // These methods defer functors (like stats collection) to the underlying
@@ -145,3 +133,4 @@
 } } } // namespace osgEarth::Drivers::RexTerrainEngine
 
 #endif // OSGEARTH_DRIVERS_REX_TERRAIN_ENGINE_RexGEOMETRY
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileDrawable.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileDrawable.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileDrawable.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileDrawable.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -17,6 +17,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include "TileDrawable"
+#include "EngineContext"
 
 #include <osg/Version>
 #include <iterator>
@@ -30,6 +31,35 @@
 
 #define LC "[TileDrawable] "
 
+//........................................................................
+
+ModifyBoundingBoxCallback::ModifyBoundingBoxCallback(EngineContext* engine) : 
+_engine(engine)
+{ 
+    //nop
+}
+
+void
+ModifyBoundingBoxCallback::operator()(const TileKey& key, osg::BoundingBox& bbox)
+{
+    _engine->getEngine()->fireModifyTileBoundingBoxCallbacks(key, bbox);
+
+    osg::ref_ptr<const Map> map = _engine->getMap();
+    if (map.valid())
+    {
+        LayerVector layers;
+        map->getLayers(layers);
+
+        for (LayerVector::const_iterator layer = layers.begin(); layer != layers.end(); ++layer)
+        {
+            if (layer->valid())
+            {
+                layer->get()->modifyTileBoundingBox(key, bbox);
+            }
+        }
+    }
+}
+//........................................................................
 
 TileDrawable::TileDrawable(const TileKey& key,
                            SharedGeometry* geometry,
@@ -37,7 +67,8 @@
 osg::Drawable( ),
 _key         ( key ),
 _geom        ( geometry ),
-_tileSize    ( tileSize )
+_tileSize    ( tileSize ),
+_bboxRadius  ( 1.0 )
 {   
     // a mesh to materialize the heightfield for functors
     _mesh = new osg::Vec3f[ tileSize*tileSize ];
@@ -153,15 +184,19 @@
 {
     osg::BoundingBox box;
 
+    // core bbox created from the mesh:
     for(unsigned i=0; i<_tileSize*_tileSize; ++i)
     {
         box.expandBy(_mesh[i]);
     }
 
+    // finally see if any of the layers request a bbox change:
     if (_bboxCB)
     {
         (*_bboxCB)(_key, box);
     }
 
+    _bboxRadius = box.radius();
+
     return box;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileNode osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileNode
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -119,6 +119,8 @@
         std::set<UID>& newLayers() { return _newLayers; }
 
         void refreshSharedSamplers(const RenderBindings& bindings);
+
+        bool isDirty() const { return _dirty; }
         
     public: // osg::Node
 
@@ -140,7 +142,6 @@
         bool                               _dirty;
         OpenThreads::Atomic                _lastTraversalFrame;
         double                             _lastTraversalTime;
-        OpenThreads::Atomic                _lastAcceptSurfaceFrame;
         unsigned                           _count;
         bool                               _childrenReady;
         unsigned int                       _minExpiryFrames;
@@ -151,6 +152,8 @@
         std::set<UID>                      _newLayers;
         bool                               _empty;
         bool                               _isRootTile;
+        bool                               _imageUpdatesActive;
+        TileKey                            _subdivideTestKey;
 
         osg::observer_ptr<TileNode> _eastNeighbor;
         osg::observer_ptr<TileNode> _southNeighbor;
@@ -167,12 +170,15 @@
 
         bool accept_cull(TerrainCuller*);
 
-        bool cull_stealth(TerrainCuller*);
+        bool cull_spy(TerrainCuller*);
 
-        bool accept_cull_stealth(TerrainCuller*);
+        bool accept_cull_spy(TerrainCuller*);
 
         bool shouldSubDivide(TerrainCuller*, const SelectionInfo&);
 
+        // whether this tile should render the given pass
+        bool passInLegalRange(const RenderingPass&) const;
+
         /** Load (or continue loading) content for the tiles in this quad. */
         void load(TerrainCuller*);
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileNode.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -32,12 +32,15 @@
 #include <osgEarth/TraversalData>
 #include <osgEarth/Shadowing>
 #include <osgEarth/Utils>
+#include <osgEarth/NodeUtils>
 #include <osgEarth/TraversalData>
 
 #include <osg/Uniform>
 #include <osg/ComputeBoundsVisitor>
 #include <osg/ValueObject>
 
+#include <osgDB/WriteFile>
+
 using namespace osgEarth::Drivers::RexTerrainEngine;
 using namespace osgEarth;
 
@@ -74,7 +77,8 @@
 _count(0),
 _stitchNormalMap(false),
 _empty(false),              // an "empty" node exists but has no geometry or children.,
-_isRootTile(false)
+_isRootTile(false),
+_imageUpdatesActive(false)
 {
     //nop
 }
@@ -89,20 +93,21 @@
 
     _key = key;
 
-    // Mask generator creates geometry from masking boundaries when they exist.
-    osg::ref_ptr<MaskGenerator> masks = new MaskGenerator(
-        key, 
-        context->getOptions().tileSize().get(),
-        context->getMap());
+    osg::ref_ptr<const Map> map = _context->getMap();
+    if (!map.valid())
+        return;
 
-    MapInfo mapInfo(context->getMap());
+    unsigned tileSize = context->getOptions().tileSize().get();
+
+    // Mask generator creates geometry from masking boundaries when they exist.
+    osg::ref_ptr<MaskGenerator> masks = new MaskGenerator(key, tileSize, map.get());
 
     // Get a shared geometry from the pool that corresponds to this tile key:
     osg::ref_ptr<SharedGeometry> geom;
     context->getGeometryPool()->getPooledGeometry(
         key,
-        mapInfo,         
-        context->getOptions().tileSize().get(),
+        MapInfo(map.get()),
+        tileSize,
         masks.get(), 
         geom);
 
@@ -128,7 +133,7 @@
     // Create the node to house the tile drawable:
     _surface = new SurfaceNode(
         key,
-        mapInfo,
+        MapInfo(map.get()),
         context->getRenderBindings(),
         surfaceDrawable );
     
@@ -140,28 +145,31 @@
     // whether the stitch together normal maps for adjacent tiles.
     _stitchNormalMap = context->_options.normalizeEdges() == true;
 
-    // Encode the tile key in a uniform. Note! The X and Y components are presented
-    // modulo 2^16 form so they don't overrun single-precision space.
+    // Encode the tile key in a uniform
     unsigned tw, th;
     _key.getProfile()->getNumTiles(_key.getLOD(), tw, th);
 
-    const double m = 65536; //pow(2.0, 16.0);
-
     double x = (double)_key.getTileX();
     double y = (double)(th - _key.getTileY()-1);
 
     _tileKeyValue.set(
-        (float)fmod(x, m),
-        (float)fmod(y, m),
+        (float)x,
+        (float)y,
         (float)_key.getLOD(),
         -1.0f);
 
     // initialize all the per-tile uniforms the shaders will need:
-    float start = (float)context->getSelectionInfo().visParameters(_key.getLOD())._fMorphStart;
-    float end   = (float)context->getSelectionInfo().visParameters(_key.getLOD())._fMorphEnd;
-    float one_by_end_minus_start = end - start;
-    one_by_end_minus_start = 1.0f/one_by_end_minus_start;
-    _morphConstants.set( end * one_by_end_minus_start, one_by_end_minus_start );
+    float range, morphStart, morphEnd;
+    context->getSelectionInfo().get(_key, range, morphStart, morphEnd);
+
+    float one_over_end_minus_start = 1.0f/(morphEnd - morphStart);
+    _morphConstants.set(morphEnd * one_over_end_minus_start, one_over_end_minus_start);
+
+    // Make a tilekey to use for testing whether to subdivide.
+    if (_key.getTileY() <= th/2)
+        _subdivideTestKey = _key.createChildKey(0);
+    else
+        _subdivideTestKey = _key.createChildKey(3);
 
     // Initialize the data model by copying the parent's rendering data
     // and scale/biasing the matrices.
@@ -177,6 +185,10 @@
         {
             const RenderingPass& parentPass = parent->_renderModel._passes[p];
 
+            // If the key is now out of the layer's valid min/max range, skip this pass.
+            if (!passInLegalRange(parentPass))
+                continue;
+
             // Copy the parent pass:
             _renderModel._passes.push_back(parentPass);
             RenderingPass& myPass = _renderModel._passes.back();
@@ -240,7 +252,7 @@
     {
         bs = _surface->getBound();
         const osg::BoundingBox bbox = _surface->getAlignedBoundingBox();
-        _tileKeyValue.a() = std::max( (bbox.xMax()-bbox.xMin()), (bbox.yMax()-bbox.yMin()) );
+        _tileKeyValue.a() = osg::maximum( (bbox.xMax()-bbox.xMin()), (bbox.yMax()-bbox.yMin()) );
     }    
     return bs;
 }
@@ -252,7 +264,7 @@
 
     bool dormant = 
            fs &&
-           fs->getFrameNumber() - _lastTraversalFrame > std::max(_minExpiryFrames, minMinExpiryFrames) &&
+           fs->getFrameNumber() - _lastTraversalFrame > osg::maximum(_minExpiryFrames, minMinExpiryFrames) &&
            fs->getReferenceTime() - _lastTraversalTime > _minExpiryTime;
     return dormant;
 }
@@ -278,13 +290,14 @@
 const osg::Image*
 TileNode::getElevationRaster() const
 {
-    return _surface->getElevationRaster();
+    return _surface.valid() ? _surface->getElevationRaster() : 0L;
 }
 
 const osg::Matrixf&
 TileNode::getElevationMatrix() const
 {
-    return _surface->getElevationMatrix();
+    static osg::Matrixf s_identity;
+    return _surface.valid() ? _surface->getElevationMatrix() : s_identity;
 }
 
 void
@@ -335,45 +348,60 @@
     unsigned currLOD = _key.getLOD();
 
     EngineContext* context = culler->getEngineContext();
-
-    if (context->getOptions().rangeMode() == osg::LOD::PIXEL_SIZE_ON_SCREEN)
+    
+    if (currLOD < selectionInfo.getNumLODs() && currLOD != selectionInfo.getNumLODs()-1)
     {
-        float pixelSize = -1.0;
-        if (context->getEngine()->getComputeRangeCallback())
+        // In PSOS mode, subdivide when the on-screen size of a tile exceeds the maximum
+        // allowable on-screen tile size in pixels.
+        if (context->getOptions().rangeMode() == osg::LOD::PIXEL_SIZE_ON_SCREEN)
         {
-            pixelSize = (*context->getEngine()->getComputeRangeCallback())(this, *culler->_cv);
-        }    
-        if (pixelSize <= 0.0)
-        {
-            pixelSize = culler->clampedPixelSize(getBound());
+            float tileSizeInPixels = -1.0;
+
+            if (context->getEngine()->getComputeRangeCallback())
+            {
+                tileSizeInPixels = (*context->getEngine()->getComputeRangeCallback())(this, *culler->_cv);
+            }    
+
+            if (tileSizeInPixels <= 0.0)
+            {
+                tileSizeInPixels = _surface->getPixelSizeOnScreen(culler);
+            }
+        
+            return (tileSizeInPixels > context->getOptions().tilePixelSize().get());
         }
-        return (pixelSize > context->getOptions().tilePixelSize().get() * 4);
-    }
-    else
-    {
-        float range = (float)selectionInfo.visParameters(currLOD+1)._visibilityRange2;
-        if (currLOD < selectionInfo.getNumLODs() && currLOD != selectionInfo.getNumLODs()-1)
+
+        // In DISTANCE-TO-EYE mode, use the visibility ranges precomputed in the SelectionInfo.
+        else
         {
+            float range = context->getSelectionInfo().getRange(_subdivideTestKey);
+#if 1
+            // slightly slower than the alternate block below, but supports a user overriding
+            // CullVisitor::getDistanceToViewPoint -gw
+            return _surface->anyChildBoxWithinRange(range, *culler);
+#else
             return _surface->anyChildBoxIntersectsSphere(
                 culler->getViewPointLocal(), 
-                range,
-                culler->getLODScale());
+                range*range / culler->getLODScale());
+#endif
         }
     }                 
     return false;
 }
 
 bool
-TileNode::cull_stealth(TerrainCuller* culler)
+TileNode::cull_spy(TerrainCuller* culler)
 {
     bool visible = false;
 
     EngineContext* context = culler->getEngineContext();
 
-    // Shows all culled tiles, good for testing culling
+    // Shows all culled tiles. All this does is traverse the terrain
+    // and add any tile that's been "legitimately" culled (i.e. culled
+    // by a non-spy traversal) in the last 2 frames. We use this
+    // trick to spy on another camera.
     unsigned frame = culler->getFrameStamp()->getFrameNumber();
 
-    if ( frame - _lastAcceptSurfaceFrame < 2u )
+    if ( frame - _surface->getLastFramePassedCull() < 2u)
     {
         _surface->accept( *culler );
     }
@@ -382,7 +410,9 @@
     {
         for(int i=0; i<4; ++i)
         {
-            getSubTile(i)->accept( *culler );
+            TileNode* child = getSubTile(i);
+            if (child)
+                child->accept( *culler );
         }
     }
 
@@ -412,10 +442,14 @@
     // whether to accept the current surface node and not the children.
     bool canAcceptSurface = false;
     
-    // Don't create children in progressive mode until content is in place
-    if ( _dirty && context->getOptions().progressive() == true )
+    // Don't load data in progressive mode until the parent is up to date
+    if (context->getOptions().progressive() == true)
     {
-        canCreateChildren = false;
+        TileNode* parent = getParentTile();
+        if ( parent && parent->isDirty() )
+        {
+            canLoadData = false;
+        }
     }
     
     // If this is an inherit-viewpoint camera, we don't need it to invoke subdivision
@@ -455,7 +489,9 @@
         {
             for(int i=0; i<4; ++i)
             {
-                getSubTile(i)->accept(*culler);
+                TileNode* child = getSubTile(i);
+                if (child)
+                    child->accept(*culler);
             }
         }
 
@@ -476,7 +512,6 @@
     if ( canAcceptSurface )
     {
         _surface->accept( *culler );
-        _lastAcceptSurfaceFrame.exchange( culler->getFrameStamp()->getFrameNumber() );
     }
 
     // If this tile is marked dirty, try loading data.
@@ -509,13 +544,13 @@
 }
 
 bool
-TileNode::accept_cull_stealth(TerrainCuller* culler)
+TileNode::accept_cull_spy(TerrainCuller* culler)
 {
     bool visible = false;
     
     if (culler)
     {
-        visible = cull_stealth( culler );
+        visible = cull_spy( culler );
     }
 
     return visible;
@@ -531,9 +566,9 @@
         {
             TerrainCuller* culler = dynamic_cast<TerrainCuller*>(&nv);
         
-            if (VisitorData::isSet(culler->getParent(), "osgEarth.Stealth"))
+            if (culler->_isSpy)
             {
-                accept_cull_stealth( culler );
+                accept_cull_spy( culler );
             }
             else
             {
@@ -545,6 +580,41 @@
     // Everything else: update, GL compile, intersection, compute bound, etc.
     else
     {
+        // Check for image updates.
+        if (nv.getVisitorType() == nv.UPDATE_VISITOR && _imageUpdatesActive)
+        {
+            unsigned numUpdated = 0u;
+
+            for (unsigned p = 0; p < _renderModel._passes.size(); ++p)
+            {
+                RenderingPass& pass = _renderModel._passes[p];
+                Samplers& samplers = pass.samplers();
+                for (unsigned s = 0; s < samplers.size(); ++s)
+                {
+                    Sampler& sampler = samplers[s];
+                    if (sampler._texture.valid() && sampler._matrix.isIdentity())
+                    {
+                        for(unsigned i = 0; i < sampler._texture->getNumImages(); ++i)
+                        {
+                            osg::Image* image = sampler._texture->getImage(i);
+                            if (image && image->requiresUpdateCall())
+                            {
+                                image->update(&nv);
+                                numUpdated++;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // if no updates were detected, don't check next time.
+            if (numUpdated == 0)
+            {
+                ADJUST_UPDATE_TRAV_COUNT(this, -1);
+                _imageUpdatesActive = false;
+            }
+        }
+
         // If there are child nodes, traverse them:
         int numChildren = getNumChildren();
         if ( numChildren > 0 )
@@ -566,7 +636,7 @@
 void
 TileNode::createChildren(EngineContext* context)
 {
-    // NOTE: Ensure that _mutex is locked before calling this fucntion!
+    // NOTE: Ensure that _mutex is locked before calling this function!
     //OE_WARN << "Creating children for " << _key.str() << std::endl;
 
     // Create the four child nodes.
@@ -595,7 +665,6 @@
 {
     bool newElevationData = false;
 
-#if 1
     const SamplerBinding& color = bindings[SamplerBinding::COLOR];
     if (color.isActive())
     {
@@ -619,25 +688,40 @@
                         if (bindings[SamplerBinding::COLOR_PARENT].isActive())
                         {
                             pass->samplers()[SamplerBinding::COLOR_PARENT]._texture = model->getTexture();
-                            pass->samplers()[SamplerBinding::COLOR_PARENT]._matrix.makeIdentity();
+                            pass->samplers()[SamplerBinding::COLOR_PARENT]._matrix = *model->getMatrix();
                         }
                     }
                     pass->samplers()[SamplerBinding::COLOR]._texture = model->getTexture();
                     pass->samplers()[SamplerBinding::COLOR]._matrix = *model->getMatrix();
 
                     // Handle an RTT image layer:
-                    if (model->getImageLayer() && model->getImageLayer()->createTextureSupported())
+                    if (model->getImageLayer() && model->getImageLayer()->useCreateTexture())
                     {
                         // Check the texture's userdata for a Node. If there is one there,
                         // render it to the texture using the Tile Rasterizer service.
                         // TODO: consider hanging on to this texture and not applying it to
                         // the live tile until the RTT is complete. (Prevents unsightly flashing)
                         GeoNode* rttNode = dynamic_cast<GeoNode*>(model->getTexture()->getUserData());
-                        if (rttNode)
+
+                        if (rttNode && _context->getTileRasterizer())
                         {
                             _context->getTileRasterizer()->push(rttNode->_node.get(), model->getTexture(), rttNode->_extent);
                         }
                     }
+
+                    // check to see if this data requires an image update traversal.
+                    if (_imageUpdatesActive == false)
+                    {
+                        for(unsigned i=0; i<model->getTexture()->getNumImages(); ++i)
+                        {
+                            if (model->getTexture()->getImage(i)->requiresUpdateCall())
+                            {
+                                ADJUST_UPDATE_TRAV_COUNT(this, +1);
+                                _imageUpdatesActive = true;
+                                break;
+                            }
+                        }
+                    }
                 }
             }
 
@@ -656,55 +740,6 @@
             }
         }
     }
-#else
-    // Add color passes:
-    const SamplerBinding& color = bindings[SamplerBinding::COLOR];
-    if (color.isActive())
-    {
-        for (TerrainTileImageLayerModelVector::const_iterator i = model->colorLayers().begin();
-            i != model->colorLayers().end();
-            ++i)
-        {
-            TerrainTileImageLayerModel* layer = i->get();
-            if (layer && layer->getTexture())
-            {
-                RenderingPass* pass = _renderModel.getPass(layer->getImageLayer()->getUID());
-                if (!pass)
-                {
-                    pass = &_renderModel.addPass();
-                    pass->_layer = layer->getImageLayer();
-                    pass->_imageLayer = layer->getImageLayer();
-                    pass->_sourceUID = layer->getImageLayer()->getUID();
-
-                    // This is a new pass that just showed up at this LOD
-                    // Since it just arrived at this LOD, make the parent the same as the color.
-                    if (bindings[SamplerBinding::COLOR_PARENT].isActive())
-                    {
-                        pass->_samplers[SamplerBinding::COLOR_PARENT]._texture = layer->getTexture();
-                        pass->_samplers[SamplerBinding::COLOR_PARENT]._matrix.makeIdentity();
-                    }
-                }
-                pass->_samplers[SamplerBinding::COLOR]._texture = layer->getTexture();
-                //pass->_samplers[SamplerBinding::COLOR]._matrix.makeIdentity();
-                pass->_samplers[SamplerBinding::COLOR]._matrix = *layer->getMatrix();
-
-                // Handle an RTT image layer:
-                if (layer->getImageLayer() && layer->getImageLayer()->createTextureSupported())
-                {
-                    // Check the texture's userdata for a Node. If there is one there,
-                    // render it to the texture using the Tile Rasterizer service.
-                    // TODO: consider hanging on to this texture and not applying it to
-                    // the live tile until the RTT is complete. (Prevents unsightly flashing)
-                    GeoNode* rttNode = dynamic_cast<GeoNode*>(layer->getTexture()->getUserData());
-                    if (rttNode)
-                    {
-                        _context->getTileRasterizer()->push(rttNode->_node.get(), layer->getTexture(), rttNode->_extent);
-                    }
-                }
-            }
-        }
-    }
-#endif
 
     // Elevation:
     const SamplerBinding& elevation = bindings[SamplerBinding::ELEVATION];
@@ -769,15 +804,16 @@
 
     if (_childrenReady)
     {
-        getSubTile(0)->refreshInheritedData(this, bindings);
-        getSubTile(1)->refreshInheritedData(this, bindings);
-        getSubTile(2)->refreshInheritedData(this, bindings);
-        getSubTile(3)->refreshInheritedData(this, bindings);
+        for (int i = 0; i < 4; ++i)
+        {
+            TileNode* child = getSubTile(i);
+            if (child)
+                child->refreshInheritedData(this, bindings);
+        }
     }
 
     if (newElevationData)
     {
-        OE_DEBUG << LC << "notify (merge) key " << getKey().str() << std::endl;
         _context->getEngine()->getTerrain()->notifyTileAdded(getKey(), this);
     }
 }
@@ -866,7 +902,7 @@
                     if (mySampler._texture.get() != parentSampler._texture.get() ||
                         mySampler._matrix != newMatrix)
                     {
-                        if (parentSampler._texture.valid())
+                        if (parentSampler._texture.valid() && passInLegalRange(parentPass))
                         {
                             // set the parent-color texture to the parent's color texture
                             // and scale/bias the matrix.
@@ -888,9 +924,7 @@
                 // and scale/bias their texture matrix.
                 else if (!mySampler._texture.valid() || !mySampler._matrix.isIdentity())
                 {
-                    const Sampler& parentSampler = parentPass.samplers()[s];
-                    mySampler._texture = parentSampler._texture.get();
-                    mySampler._matrix = parentSampler._matrix;
+                    mySampler = parentPass.samplers()[s];
                     mySampler._matrix.preMult(scaleBias[quadrant]);
                     ++changes;
                 }
@@ -899,19 +933,22 @@
         else
         {
             // Pass exists in the parent node, but not in this node, so add it now.
-            myPass = &_renderModel.addPass();
-            *myPass = parentPass;
-
-            for (unsigned s = 0; s < myPass->samplers().size(); ++s)
+            if (passInLegalRange(parentPass))
             {
-                Sampler& sampler = myPass->samplers()[s];
-                sampler._matrix.preMult(scaleBias[quadrant]);
+                myPass = &_renderModel.addPass();
+                *myPass = parentPass;
+
+                for (unsigned s = 0; s < myPass->samplers().size(); ++s)
+                {
+                    Sampler& sampler = myPass->samplers()[s];
+                    sampler._matrix.preMult(scaleBias[quadrant]);
+                }
+                ++changes;
             }
-            ++changes;
         }
     }
 
-    // Handle all the shared samples (elevation, normal, etc.)
+    // Handle all the shared samplers (elevation, normal, etc.)
     const Samplers& parentSharedSamplers = parent->_renderModel._sharedSamplers;
     Samplers& mySharedSamplers = _renderModel._sharedSamplers;
     for (unsigned s = 0; s<mySharedSamplers.size(); ++s)
@@ -919,9 +956,7 @@
         Sampler& mySampler = mySharedSamplers[s];
         if (!mySampler._texture.valid() || !mySampler._matrix.isIdentity())
         {
-            const Sampler& parentSampler = parentSharedSamplers[s];
-            mySampler._texture = parentSampler._texture.get();
-            mySampler._matrix = parentSampler._matrix;
+            mySampler = parentSharedSamplers[s];
             mySampler._matrix.preMult(scaleBias[quadrant]);
             ++changes;
 
@@ -933,16 +968,26 @@
         }
     }
 
+    // Handle any shared samplers that exist in the parent but not here:
+    for (unsigned s = mySharedSamplers.size(); s < parentSharedSamplers.size(); ++s)
+    {
+        mySharedSamplers[s] = parentSharedSamplers[s];
+        mySharedSamplers[s]._matrix.preMult(scaleBias[quadrant]);
+        ++changes;
+    }
+
     if (changes > 0)
     {
         dirtyBound(); // only for elev/patch changes maybe?
 
         if (_childrenReady)
         {
-            getSubTile(0)->refreshInheritedData(this, bindings);
-            getSubTile(1)->refreshInheritedData(this, bindings);
-            getSubTile(2)->refreshInheritedData(this, bindings);
-            getSubTile(3)->refreshInheritedData(this, bindings);
+            for (int i = 0; i < 4; ++i)
+            {
+                TileNode* child = getSubTile(i);
+                if (child)
+                    child->refreshInheritedData(this, bindings);
+            }
         }
     }
     else
@@ -951,6 +996,15 @@
     }
 }
 
+bool
+TileNode::passInLegalRange(const RenderingPass& pass) const
+{
+    return 
+        pass.terrainLayer() == 0L ||
+        pass.terrainLayer()->isKeyInVisualRange(getKey());
+        //pass.terrainLayer()->isKeyInLegalRange(getKey());
+}
+
 void
 TileNode::load(TerrainCuller* culler)
 {    
@@ -960,21 +1014,21 @@
     
     // LOD priority is in the range [0..numLods]
     float lodPriority = (float)lod;
-    if ( _context->getOptions().highResolutionFirst() == false )
+
+    // If progressive mode is enabled, lower LODs get higher priority since
+    // we want to load them in order
+    if (_context->getOptions().progressive() == true)
         lodPriority = (float)(numLods - lod);
 
+    // dist priority is in the range [0..1]
     float distance = culler->getDistanceToViewPoint(getBound().center(), true);
-
-    // dist priority uis in the range [0..1]
-    float distPriority = 1.0 - distance/si.visParameters(0)._visibilityRange;
+    float maxRange = si.getLOD(0)._visibilityRange;
+    float distPriority = 1.0 - distance/maxRange;
 
     // add them together, and you get tiles sorted first by lodPriority
     // (because of the biggest range), and second by distance.
     float priority = lodPriority + distPriority;
 
-    // normalize the composite priority to [0..1].
-    //priority /= (float)(numLods+1); // GW: moved this to the PagerLoader.
-
     // Submit to the loader.
     _context->getLoader()->load( _loadRequest.get(), priority, *culler );
 }
@@ -984,7 +1038,7 @@
 {
     osg::ref_ptr<LoadTileData> loadTileData = new LoadTileData(this, _context.get());
     loadTileData->setEnableCancelation(false);
-    loadTileData->invoke();
+    loadTileData->invoke(0L);
     loadTileData->apply(0L);
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileNodeRegistry osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileNodeRegistry
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileNodeRegistry	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileNodeRegistry	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -146,6 +146,12 @@
         const Revision& getMapRevision() const { return _maprev; }
 
         /**
+         * Whether tiles will listen for their neighbors to arrive in order to
+         * facilitate normal map edge matching.
+         */
+        void setNotifyNeighbors(bool value);
+
+        /**
          * Marks all tiles intersecting the extent as dirty. If incremental
          * update is enabled, they will automatically reload.
          *
@@ -219,6 +225,7 @@
         TileNodeMap                       _tiles;
         OpenThreads::Atomic               _frameNumber;
         mutable Threading::ReadWriteMutex _tilesMutex;
+        bool                              _notifyNeighbors;
 
         //typedef std::vector<TileKey> TileKeyVector;
         typedef fast_set<TileKey> TileKeySet;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileNodeRegistry.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileNodeRegistry.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileNodeRegistry.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileNodeRegistry.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -34,7 +34,8 @@
 TileNodeRegistry::TileNodeRegistry(const std::string& name) :
 _name              ( name ),
 _revisioningEnabled( false ),
-_frameNumber       ( 0u )
+_frameNumber       ( 0u ),
+_notifyNeighbors   ( false )
 {
     //nop
 }
@@ -46,6 +47,11 @@
     _revisioningEnabled = value;
 }
 
+void
+TileNodeRegistry::setNotifyNeighbors(bool value)
+{
+    _notifyNeighbors = value;
+}
 
 void
 TileNodeRegistry::setMapRevision(const Revision& rev,
@@ -101,35 +107,38 @@
 TileNodeRegistry::addSafely(TileNode* tile)
 {
     _tiles.insert( tile->getKey(), tile );
-    //_tiles[ tile->getTileKey() ] = tile;
+    
     if ( _revisioningEnabled )
         tile->setMapRevision( _maprev );
     
     // Start waiting on our neighbors
-    startListeningFor(tile->getKey().createNeighborKey(1, 0), tile);
-    startListeningFor(tile->getKey().createNeighborKey(0, 1), tile);
-
-    // check for tiles that are waiting on this tile, and notify them!
-    TileKeyOneToMany::iterator notifier = _notifiers.find( tile->getKey() );
-    if ( notifier != _notifiers.end() )
+    if (_notifyNeighbors)
     {
-        TileKeySet& listeners = notifier->second;
+        startListeningFor(tile->getKey().createNeighborKey(1, 0), tile);
+        startListeningFor(tile->getKey().createNeighborKey(0, 1), tile);
 
-        for(TileKeySet::iterator listener = listeners.begin(); listener != listeners.end(); ++listener)
+        // check for tiles that are waiting on this tile, and notify them!
+        TileKeyOneToMany::iterator notifier = _notifiers.find( tile->getKey() );
+        if ( notifier != _notifiers.end() )
         {
-            TileNode* listenerTile = _tiles.find( *listener );
-            if ( listenerTile )
+            TileKeySet& listeners = notifier->second;
+
+            for(TileKeySet::iterator listener = listeners.begin(); listener != listeners.end(); ++listener)
             {
-                listenerTile->notifyOfArrival( tile );
+                TileNode* listenerTile = _tiles.find( *listener );
+                if ( listenerTile )
+                {
+                    listenerTile->notifyOfArrival( tile );
+                }
             }
+            _notifiers.erase( notifier );
         }
-        _notifiers.erase( notifier );
-    }
 
-    OE_DEBUG << LC << _name 
-        << ": tiles=" << _tiles.size()
-        << ", notifiers=" << _notifiers.size()
-        << std::endl;
+        OE_DEBUG << LC << _name 
+            << ": tiles=" << _tiles.size()
+            << ", notifiers=" << _notifiers.size()
+            << std::endl;
+    }
 
     Metrics::counter("RexStats", "Tiles", _tiles.size());
 }
@@ -140,25 +149,18 @@
     TileNode* tile = _tiles.find(key);
     if (tile)
     {
-        // remove neighbor listeners:
-        stopListeningFor(key.createNeighborKey(1, 0), tile);
-        stopListeningFor(key.createNeighborKey(0, 1), tile);
+        if (_notifyNeighbors)
+        {
+            // remove neighbor listeners:
+            stopListeningFor(key.createNeighborKey(1, 0), tile);
+            stopListeningFor(key.createNeighborKey(0, 1), tile);
+        }
 
         // remove the tile.
         _tiles.erase( key );
 
         Metrics::counter("RexStats", "Tiles", _tiles.size());
     }
-
-    //for(TileKeyOneToMany::iterator i = _notifiers.begin(); i != _notifiers.end(); )
-    //{
-    //    i->second.erase( key );
-
-    //    if ( i->second.size() == 0 )
-    //        _notifiers.erase( i++ ); // http://stackoverflow.com/a/8234813/4218920
-    //    else
-    //        ++i;
-    //}
 }
 
 void
@@ -248,33 +250,11 @@
     return _tiles.empty();
 }
 
-#if 0
-void
-TileNodeRegistry::listenFor(const TileKey& tileToWaitFor, TileNode* waiter)
-{
-    Threading::ScopedWriteLock lock( _tilesMutex );
-    TileNode* tile = _tiles.find( tileToWaitFor );
-    if ( tile )
-    {
-        OE_DEBUG << LC << waiter->getTileKey().str() << " listened for " << tileToWaitFor.str()
-            << ", but it was already in the repo.\n";
-
-        waiter->notifyOfArrival( tile );
-    }
-    else
-    {
-        OE_DEBUG << LC << waiter->getTileKey().str() << " listened for " << tileToWaitFor.str() << ".\n";
-        //_notifications[tileToWaitFor].push_back( waiter->getKey() );
-        _notifiers[tileToWaitFor].insert( waiter->getTileKey() );
-    }
-}
-#endif
-
 void
 TileNodeRegistry::startListeningFor(const TileKey& tileToWaitFor, TileNode* waiter)
 {
-    //Threading::ScopedMutexLock lock( _tilesMutex );
     // ASSUME EXCLUSIVE LOCK
+
     TileNode* tile = _tiles.find( tileToWaitFor );
     if ( tile )
     {
@@ -294,7 +274,6 @@
 void
 TileNodeRegistry::stopListeningFor(const TileKey& tileToWaitFor, TileNode* waiter)
 {
-    //Threading::ScopedMutexLock lock( _tilesMutex );
     // ASSUME EXCLUSIVE LOCK
 
     TileKeyOneToMany::iterator i = _notifiers.find(tileToWaitFor);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileRenderModel osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileRenderModel
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/TileRenderModel	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/TileRenderModel	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -53,7 +53,8 @@
         RenderingPass() :
             _sourceUID(-1),
             _samplers(SamplerBinding::COLOR_PARENT+1),
-            _visibleLayer(0L)
+            _visibleLayer(0L),
+            _terrainLayer(0L)
             { }
         
         UID sourceUID() const { return _sourceUID; }
@@ -61,6 +62,7 @@
         const Samplers& samplers() const  { return _samplers; }
         const Layer* layer() const { return _layer.get(); }
         const VisibleLayer* visibleLayer() const { return _visibleLayer; }
+        const TerrainLayer* terrainLayer() const { return _terrainLayer; }
 
         void releaseGLObjects(osg::State* state) const
         {
@@ -80,6 +82,7 @@
             _layer = layer;
             if (layer) {
                 _visibleLayer = dynamic_cast<const VisibleLayer*>(layer);
+                _terrainLayer = dynamic_cast<const TerrainLayer*>(layer);
                 _sourceUID = layer->getUID();
             }
         }
@@ -96,6 +99,10 @@
 
         /** VisibleLayer responsible for this rendering pass (is _layer is a VisibleLayer) */
         const VisibleLayer* _visibleLayer;
+        
+        /** VisibleLayer responsible for this rendering pass (is _layer is a TerrainLayer) */
+        const TerrainLayer* _terrainLayer;
+
 
     };
 
@@ -154,7 +161,7 @@
                 _passes[p].releaseGLObjects(state);
         }
 
-        /** Resize GL buffers associated with thie model */
+        /** Resize GL buffers associated with this model */
         void resizeGLObjectBuffers(unsigned size)
         {
             for (unsigned s = 0; s<_sharedSamplers.size(); ++s)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Unloader osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Unloader
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Unloader	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Unloader	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Unloader.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Unloader.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/engine_rex/Unloader.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/engine_rex/Unloader.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -21,6 +21,7 @@
 #include "TileNodeRegistry"
 
 #include <osgEarth/Metrics>
+#include <osgEarth/NodeUtils>
 
 using namespace osgEarth::Drivers::RexTerrainEngine;
 
@@ -71,7 +72,7 @@
 _tiles(tiles),
 _threshold( INT_MAX )
 {
-    this->setNumChildrenRequiringUpdateTraversal( 1u );
+    ADJUST_EVENT_TRAV_COUNT(this, +1);
 }
 
 void
@@ -86,7 +87,7 @@
 void
 UnloaderGroup::traverse(osg::NodeVisitor& nv)
 {
-    if ( nv.getVisitorType() == nv.UPDATE_VISITOR )
+    if ( nv.getVisitorType() == nv.EVENT_VISITOR )
     {        
         if ( _parentKeys.size() > _threshold )
         {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/fastdxt/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/fastdxt/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/fastdxt/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/fastdxt/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -1,4 +1,4 @@
-OPTION(OSGEARTH_ENABLE_FASTDXT "Set to ON to build optional FastDXT image compressor." OFF)
+OPTION(OSGEARTH_ENABLE_FASTDXT "Set to ON to build optional FastDXT image compressor." ON)
 IF(OSGEARTH_ENABLE_FASTDXT)
 
 OPTION(CURL_IS_STATIC "on if curl is a static lib " ON)
@@ -33,14 +33,6 @@
     intrinsic.cpp
 )
 
-IF( CMAKE_DEBUG_POSTFIX )
-    ADD_DEFINITIONS( -DOSGEARTH_DEBUG_POSTFIX=${CMAKE_DEBUG_POSTFIX} )
-ENDIF()
-
-IF( CMAKE_RELEASE_POSTFIX )
-    ADD_DEFINITIONS( -DOSGEARTH_RELEASE_POSTFIX=${CMAKE_RELEASE_POSTFIX} )
-ENDIF()
-
 SETUP_PLUGIN(fastdxt)
 
 ENDIF(OSGEARTH_ENABLE_FASTDXT)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/fastdxt/FastDXTImageProcessor.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/fastdxt/FastDXTImageProcessor.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/fastdxt/FastDXTImageProcessor.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/fastdxt/FastDXTImageProcessor.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2013 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_elevation/FeatureElevationOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_elevation/FeatureElevationOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_elevation/FeatureElevationOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_elevation/FeatureElevationOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -64,7 +64,7 @@
         {
             Config conf = TileSourceOptions::getConfig();
             conf.set( "attr", _attr );
-            conf.setObj( "features", _featureOptions );
+            conf.set( "features", _featureOptions );
             conf.set( "offset", _offset );
 
             return conf;
@@ -76,8 +76,8 @@
         }
 
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "attr", _attr );
-            conf.getIfSet( "offset", _offset );
+            conf.get( "attr", _attr );
+            conf.get( "offset", _offset );
 
             if ( conf.hasChild("features") )
                 _featureOptions->merge( conf.child("features") );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_elevation/ReaderWriterFeatureElevation.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_elevation/ReaderWriterFeatureElevation.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_elevation/ReaderWriterFeatureElevation.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_elevation/ReaderWriterFeatureElevation.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -50,7 +50,6 @@
 using namespace osgEarth;
 using namespace osgEarth::Drivers;
 
-#include <osgEarth/Profiler>
 #include <osgEarth/Metrics>
 
 
@@ -64,6 +63,9 @@
       _offset(-0.1)
     {
         _offset = _options.offset().getOrUse(_offset);
+
+        // default tile size:
+        setPixelsPerTile(257u);
     }
 
     virtual ~FeatureElevationTileSource() { }
@@ -164,7 +166,7 @@
             query.bounds() = extentInFeatureSRS.bounds();
             
 		    FeatureList featureList;
-            osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor(query);
+            osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor(query, progress);
             while ( cursor.valid() && cursor->hasMore() )
             {
                 Feature* f = cursor->nextFeature();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -20,6 +20,7 @@
 
 #include <osgEarth/Registry>
 #include <osgEarth/ImageUtils>
+#include <osgEarth/Progress>
 
 #include <osgEarthFeatures/Filter>
 #include <osgEarthFeatures/FeatureCursor>
@@ -70,14 +71,14 @@
     /**
      * Gets all the features that intersect the extent
      */
-    void getFeatures(const GeoExtent& extent, FeatureList& features)
+    void getFeatures(const GeoExtent& extent, FeatureList& features, ProgressCallback* progress)
     {
         GeoExtent localExtent = extent.transform( _featureSource->getFeatureProfile()->getSRS() );
         Query query;
         query.bounds() = localExtent.bounds();
         if (localExtent.intersects( _featureSource->getFeatureProfile()->getExtent()))
         {
-            osg::ref_ptr< FeatureCursor > cursor = _featureSource->createFeatureCursor( query );
+            osg::ref_ptr< FeatureCursor > cursor = _featureSource->createFeatureCursor(query, progress);
             if (cursor)
             {
                 cursor->fill( features );
@@ -89,9 +90,11 @@
     {
         if (_featureSource.valid())
         {
+            osg::ref_ptr<ProgressCallback> progress = new ProgressCallback();
+
             // Get any features that intersect this query.
             FeatureList boundaries;
-            getFeatures(context.extent().get(), boundaries );
+            getFeatures(context.extent().get(), boundaries, progress.get());
             
             
             // The list of output features
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilterOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilterOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilterOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/featurefilter_intersect/IntersectFeatureFilterOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -52,8 +52,8 @@
         Config getConfig() const {
             Config conf = ConfigOptions::getConfig();
             conf.key() = "intersect";
-            conf.addObjIfSet( "features", _features );
-            conf.addIfSet   ( "contains", _contains );
+            conf.set( "features", _features );
+            conf.set( "contains", _contains );
             return conf;
         }
 
@@ -65,8 +65,8 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getObjIfSet( "features", _features );
-            conf.getIfSet   ( "contains", _contains );
+            conf.get( "features", _features );
+            conf.get( "contains", _contains );
         }
 
         optional<FeatureSourceOptions> _features;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/featurefilter_join/JoinFeatureFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/featurefilter_join/JoinFeatureFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/featurefilter_join/JoinFeatureFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/featurefilter_join/JoinFeatureFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -68,14 +68,14 @@
     /**
      * Gets all the features that intersect the extent
      */
-    void getFeatures(const GeoExtent& extent, FeatureList& features)
+    void getFeatures(const GeoExtent& extent, FeatureList& features, ProgressCallback* progress)
     {
         GeoExtent localExtent = extent.transform( _featureSource->getFeatureProfile()->getSRS() );
         Query query;
         query.bounds() = localExtent.bounds();
         if (localExtent.intersects( _featureSource->getFeatureProfile()->getExtent()))
         {
-            osg::ref_ptr< FeatureCursor > cursor = _featureSource->createFeatureCursor( query );
+            osg::ref_ptr< FeatureCursor > cursor = _featureSource->createFeatureCursor( query, progress );
             if (cursor)
             {
                 cursor->fill( features );
@@ -89,7 +89,7 @@
         {
             // Get any features that intersect this query.
             FeatureList boundaries;
-            getFeatures(context.extent().get(), boundaries );
+            getFeatures(context.extent().get(), boundaries, 0L); // TODO: progress...
 
             if (!boundaries.empty())
             {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/featurefilter_join/JoinFeatureFilterOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/featurefilter_join/JoinFeatureFilterOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/featurefilter_join/JoinFeatureFilterOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/featurefilter_join/JoinFeatureFilterOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -44,7 +44,7 @@
         Config getConfig() const {
             Config conf = ConfigOptions::getConfig();
             conf.key() = "join";
-            conf.addObjIfSet( "features", _features );
+            conf.set( "features", _features );
             return conf;
         }
 
@@ -56,7 +56,7 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getObjIfSet( "features", _features );
+            conf.get( "features", _features );
         }
 
         optional<FeatureSourceOptions> _features;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 FIND_PACKAGE(Protobuf)
 
-IF(SQLITE3_FOUND AND PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE)
+IF(SQLITE3_FOUND AND Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE)
 
 INCLUDE_DIRECTORIES( ${SQLITE3_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/FeatureSourceMVT.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/FeatureSourceMVT.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/FeatureSourceMVT.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/FeatureSourceMVT.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -64,7 +64,7 @@
         //nop
     }
 
-    FeatureCursor* createFeatureCursor( const Symbology::Query& query )
+    FeatureCursor* createFeatureCursor( const Symbology::Query& query, ProgressCallback* progress )
     {
         if (!query.tileKey().isSet())
         {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/MVTFeatureOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/MVTFeatureOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/MVTFeatureOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_mapnikvectortiles/MVTFeatureOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -63,7 +63,7 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
+            conf.get( "url", _url );
         }
 
         optional<URI>         _url;        
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_ogr/FeatureCursorOGR osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_ogr/FeatureCursorOGR
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_ogr/FeatureCursorOGR	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_ogr/FeatureCursorOGR	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -52,7 +52,8 @@
         const FeatureSource*      source,
         const FeatureProfile*     profile,
         const Symbology::Query&   query,
-        const FeatureFilterChain* filters );
+        const FeatureFilterChain* filters,
+        ProgressCallback*         progress);
 
 public: // FeatureCursor
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_ogr/FeatureCursorOGR.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_ogr/FeatureCursorOGR.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_ogr/FeatureCursorOGR.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_ogr/FeatureCursorOGR.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -75,7 +75,9 @@
                                    const FeatureSource*        source,
                                    const FeatureProfile*       profile,
                                    const Symbology::Query&     query,
-                                   const FeatureFilterChain*   filters) :
+                                   const FeatureFilterChain*   filters,
+                                   ProgressCallback*           progress) :
+FeatureCursor     ( progress ),
 _source           ( source ),
 _dsHandle         ( dsHandle ),
 _layerHandle      ( layerHandle ),
@@ -242,6 +244,15 @@
             OGRFeatureH handle = OGR_L_GetNextFeature( _resultSetHandle );
             if ( handle )
             {
+                /*
+                // Crop the geometry by the spatial filter.  Could be useful for tiling.
+                if (_spatialFilter)
+                {
+                    OGRGeometryH geomRef = OGR_F_GetGeometryRef(handle);
+                    OGRGeometryH intersection = OGR_G_Intersection(geomRef, _spatialFilter);
+                    OGR_F_SetGeometry(handle, intersection);
+                }
+                */
                 osg::ref_ptr<Feature> feature = OgrUtils::createFeature( handle, _profile.get() );
 
                 if (feature.valid())
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_ogr/FeatureSourceOGR.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_ogr/FeatureSourceOGR.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_ogr/FeatureSourceOGR.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_ogr/FeatureSourceOGR.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -32,6 +32,7 @@
 #include <osgDB/FileNameUtils>
 #include <osgDB/FileUtils>
 #include <list>
+#include <gdal_priv.h>
 #include <ogr_api.h>
 #include <cpl_error.h>
 
@@ -108,6 +109,89 @@
         }
     }
 
+    const Status& create(const FeatureProfile* profile,
+                          const FeatureSchema& schema,
+                          const Geometry::Type& geometryType,
+                          const osgDB::Options* dbOptions)
+    {
+        setFeatureProfile(profile);
+        _schema = schema;
+
+        // Data source at a URL?
+        if (_options.url().isSet())
+        {
+            _source = _options.url()->full();
+
+            // ..inside a zip file?
+            if (osgEarth::endsWith(_source, ".zip", false) || _source.find(".zip/") != std::string::npos)
+            {
+                _source = Stringify() << "/vsizip/" << _source;
+            }
+        }
+        // ..or database connection?
+        else if (_options.connection().isSet())
+        {
+            _source = _options.connection().value();
+        }
+
+        // ..or inline geometry?
+        _geometry =
+            _options.geometry().valid() ? _options.geometry().get() :
+            _options.geometryConfig().isSet() ? parseGeometry(*_options.geometryConfig()) :
+            _options.geometryUrl().isSet() ? parseGeometryUrl(*_options.geometryUrl(), dbOptions) :
+            0L;
+
+        // If nothing was set, we're done
+        if (_source.empty() && !_geometry.valid())
+        {
+            setStatus(Status(Status::ConfigurationError, "No URL, connection, or inline geometry provided"));
+            return getStatus();
+        }
+
+        std::string driverName = _options.ogrDriver().value();
+        if (driverName.empty())
+            driverName = "ESRI Shapefile";
+
+        _ogrDriverHandle = OGRGetDriverByName(driverName.c_str());
+
+        _dsHandle = OGR_Dr_CreateDataSource(_ogrDriverHandle, _source.c_str(), NULL);
+
+        if (!_dsHandle)
+        {
+            std::string msg = CPLGetLastErrorMsg();
+            setStatus(Status(Status::ResourceUnavailable, Stringify() << "Failed to create \"" << _source << "\" ... " << msg));
+            return getStatus();
+        }
+        
+        OGRwkbGeometryType ogrGeomType = OgrUtils::getOGRGeometryType(geometryType);
+
+        OGRSpatialReferenceH ogrSRS = profile->getSRS()->getHandle();
+
+        _layerHandle = OGR_DS_CreateLayer(_dsHandle, "", ogrSRS, ogrGeomType, NULL);
+
+        if (!_layerHandle)
+        {
+            setStatus(Status(Status::ResourceUnavailable, Stringify() << "Failed to create layer \"" << _options.layer().get() << "\" from \"" << _source << "\""));
+            return getStatus();
+        }
+
+        for(FeatureSchema::const_iterator i = _schema.begin(); i != _schema.end(); ++i)
+        {
+            OGRFieldType type =
+                i->second == ATTRTYPE_DOUBLE ? OFTReal :
+                i->second == ATTRTYPE_INT ? OFTInteger :
+                OFTString;
+            OGRFieldDefnH fdef = OGR_Fld_Create(i->first.c_str(), type);
+            OGR_L_CreateField(_layerHandle, fdef, TRUE);
+        }
+
+        _featureCount = 0;
+
+        _geometryType = geometryType;
+
+        return getStatus();
+    }
+
     //override
     Status initialize(const osgDB::Options* dbOptions)
     {
@@ -187,16 +271,28 @@
             int openMode = _options.openWrite().isSet() && _options.openWrite().value() ? 1 : 0;
 
             _dsHandle = OGROpenShared( _source.c_str(), openMode, &_ogrDriverHandle );
+
             if ( !_dsHandle )
-                return Status::Error(Status::ResourceUnavailable, Stringify() << "Failed to open \"" << _source << "\"");
+            {
+                std::string msg = CPLGetLastErrorMsg();
+                return Status::Error(Status::ResourceUnavailable, Stringify() << "Failed to open \"" << _source << "\" ... " << msg);
+            }
 
             if (openMode == 1)
+            {
                 _writable = true;
+            }
                 
             // Open a specific layer within the data source, if applicable:
-            _layerHandle = openLayer(_dsHandle, _options.layer().value());
-            if ( !_layerHandle )
+            if (!_layerHandle)
+            {
+                _layerHandle = openLayer(_dsHandle, _options.layer().value());
+            }
+
+            if (!_layerHandle)
+            {
                 return Status::Error(Status::ResourceUnavailable, Stringify() << "Failed to open layer \"" << _options.layer().get() << "\" from \"" << _source << "\"");
+            }
 
 
             // if the user provided a profile, use that:
@@ -316,7 +412,7 @@
     }
 
     //override
-    FeatureCursor* createFeatureCursor(const Symbology::Query& query)
+    FeatureCursor* createFeatureCursor(const Symbology::Query& query, ProgressCallback* progress)
     {
         if ( _geometry.valid() )
         {
@@ -345,14 +441,23 @@
 
             if ( dsHandle && layerHandle )
             {
+                Query newQuery(query);
+                if (_options.query().isSet())
+                {
+                    newQuery = _options.query()->combineWith(query);
+                }
+
+                OE_DEBUG << newQuery.getConfig().toJSON(true) << std::endl;
+
                 // cursor is responsible for the OGR handles.
                 return new FeatureCursorOGR( 
                     dsHandle,
                     layerHandle, 
                     this,
                     getFeatureProfile(),
-                    query,
-                    getFilters() );
+                    newQuery,
+                    getFilters(),
+                    progress);
             }
             else
             {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_ogr/OGRFeatureOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_ogr/OGRFeatureOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_ogr/OGRFeatureOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_ogr/OGRFeatureOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -54,6 +54,9 @@
         optional<std::string>& layer() { return _layer; }
         const optional<std::string>& layer() const { return _layer; }
 
+        optional<Query>& query() { return _query; }
+        const optional<Query>& query() const { return _query; }
+
         // does not serialize
         osg::ref_ptr<Symbology::Geometry>& geometry() { return _geometry; }
         const osg::ref_ptr<Symbology::Geometry>& geometry() const { return _geometry; }
@@ -77,7 +80,8 @@
             conf.set( "geometry", _geometryConf );    
             conf.set( "geometry_url", _geometryUrl );
             conf.set( "layer", _layer );
-            conf.updateNonSerializable( "OGRFeatureOptions::geometry", _geometry.get() );
+            conf.set( "query", _query );
+            conf.setNonSerializable( "OGRFeatureOptions::geometry", _geometry.get() );
             return conf;
         }
 
@@ -89,14 +93,15 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
-            conf.getIfSet( "connection", _connection );
-            conf.getIfSet( "ogr_driver", _ogrDriver );
-            conf.getIfSet( "build_spatial_index", _buildSpatialIndex );
-            conf.getIfSet( "force_rebuild_spatial_index", _forceRebuildSpatialIndex );
-            conf.getIfSet( "geometry", _geometryConf );
-            conf.getIfSet( "geometry_url", _geometryUrl );
-            conf.getIfSet( "layer", _layer);
+            conf.get( "url", _url );
+            conf.get( "connection", _connection );
+            conf.get( "ogr_driver", _ogrDriver );
+            conf.get( "build_spatial_index", _buildSpatialIndex );
+            conf.get( "force_rebuild_spatial_index", _forceRebuildSpatialIndex );
+            conf.get( "geometry", _geometryConf );
+            conf.get( "geometry_url", _geometryUrl );
+            conf.get( "layer", _layer);
+            conf.get( "query", _query );
             _geometry = conf.getNonSerializable<Symbology::Geometry>( "OGRFeatureOptions::geometry" );
         }
 
@@ -109,6 +114,7 @@
         optional<Config>                  _geometryProfileConf;
         optional<std::string>             _geometryUrl;
         optional<std::string>             _layer;
+        optional<Query>                   _query;
         osg::ref_ptr<Symbology::Geometry> _geometry;
     };
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_tfs/FeatureSourceTFS.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_tfs/FeatureSourceTFS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_tfs/FeatureSourceTFS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_tfs/FeatureSourceTFS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 #include <osgEarth/Registry>
 #include <osgEarth/XmlUtils>
 #include <osgEarth/FileUtils>
+#include <osgEarth/Progress>
 
 #include <osgEarthFeatures/FeatureSource>
 #include <osgEarthFeatures/Filter>
@@ -240,11 +241,22 @@
     {     
         if (query.tileKey().isSet())
         {
-            const TileKey &key = query.tileKey().get();
+            const TileKey& key = query.tileKey().get();
             unsigned int tileX = key.getTileX();
             unsigned int tileY = key.getTileY();
             unsigned int level = key.getLevelOfDetail();
-            
+
+            // attempt to verify that the request is within the first and max level
+            // of the data source.
+            const FeatureProfile* fp = getFeatureProfile();
+            if (fp && fp->getTiled())
+            {
+                if (fp->getFirstLevel() > level || fp->getMaxLevel() < level)
+                {
+                    return "";
+                }
+            }
+
             // TFS follows the same protocol as TMS, with the origin in the lower left of the profile.
             // osgEarth TileKeys are upper left origin, so we need to invert the tilekey to request the correct key.            
             if (_options.invertY() == false)
@@ -265,22 +277,21 @@
         return "";                       
     }
 
-    FeatureCursor* createFeatureCursor(const Symbology::Query& query)
+    FeatureCursor* createFeatureCursor(const Symbology::Query& query, ProgressCallback* progress)
     {
         FeatureCursor* result = 0L;
 
         std::string url = createURL( query );
-        if (url.empty()) return 0;
 
-        // check the blacklist:
-        if ( Registry::instance()->isBlacklisted(url) )
+        // the URL wil lbe empty if it was invalid or outside the level bounds of the layer.
+        if (url.empty())
             return 0L;
 
         OE_DEBUG << LC << url << std::endl;
-        URI uri(url);
+        URI uri(url, _options.url()->context());
 
         // read the data:
-        ReadResult r = uri.readString( _readOptions.get() );
+        ReadResult r = uri.readString(_readOptions.get(), progress);
 
         const std::string& buffer = r.getString();
         const Config&      meta   = r.metadata();
@@ -332,12 +343,7 @@
             }
         }
 
-        //result = new FeatureListCursor(features);
-        result = dataOK ? new FeatureListCursor( features ) : 0L;
-
-        if ( !result )
-            Registry::instance()->blacklist( url );
-
+        result = new FeatureListCursor(features);
         return result;
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_tfs/TFSFeatureOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_tfs/TFSFeatureOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_tfs/TFSFeatureOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_tfs/TFSFeatureOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -81,11 +81,11 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
-            conf.getIfSet( "format", _format );
-            conf.getIfSet( "invert_y", _invertY );
-            conf.getIfSet( "min_level", _minLevel);
-            conf.getIfSet( "max_level", _maxLevel);
+            conf.get( "url", _url );
+            conf.get( "format", _format );
+            conf.get( "invert_y", _invertY );
+            conf.get( "min_level", _minLevel);
+            conf.get( "max_level", _maxLevel);
         }
 
         optional<URI>         _url;        
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_wfs/FeatureSourceWFS.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_wfs/FeatureSourceWFS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_wfs/FeatureSourceWFS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_wfs/FeatureSourceWFS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -330,21 +330,17 @@
         return str;
     }
 
-    FeatureCursor* createFeatureCursor( const Symbology::Query& query )
+    FeatureCursor* createFeatureCursor( const Symbology::Query& query, ProgressCallback* progress )
     {
         FeatureCursor* result = 0L;
 
-        std::string url = createURL( query );        
-
-        // check the blacklist:
-        if ( Registry::instance()->isBlacklisted(url) )
-            return 0L;
+        std::string url = createURL( query );
 
         OE_DEBUG << LC << url << std::endl;
-        URI uri(url);
+        URI uri(url, _options.url()->context());
 
         // read the data:
-        ReadResult r = uri.readString( _readOptions.get() );
+        ReadResult r = uri.readString( _readOptions.get(), progress );
 
         const std::string& buffer = r.getString();
         const Config&      meta   = r.metadata();
@@ -390,9 +386,6 @@
 
         result = dataOK ? new FeatureListCursor( features ) : 0L;
 
-        if ( !result )
-            Registry::instance()->blacklist( url );
-
         return result;
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_wfs/WFSFeatureOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_wfs/WFSFeatureOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_wfs/WFSFeatureOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_wfs/WFSFeatureOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -37,10 +37,6 @@
         /** Base URL of the WFS service (not including any WFS parameters) */
         optional<URI>& url() { return _url; }
         const optional<URI>& url() const { return _url; }
-        
-        /** deprecated */
-        optional<Config>& geometryProfileOptions() { return _geometryProfileConf; }
-        const optional<Config>& geometryProfileOptions() const { return _geometryProfileConf; }
 
         /** WFS typename parameter (see WFS spec) */
         optional<std::string>& typeName() { return _typename; }
@@ -54,7 +50,7 @@
         optional<std::string>& outputFormat() { return _outputFormat; }
         const optional<std::string>& outputFormat() const { return _outputFormat; }
 
-        /** Explicity disable a "TFS" tiled feature source queries */
+        /** Explicitly disable a "TFS" tiled feature source queries */
         optional<bool>& disableTiling() { return _disableTiling; }
         const optional<bool>& disableTiling() const { return _disableTiling;}
 
@@ -82,7 +78,6 @@
         Config getConfig() const {
             Config conf = FeatureSourceOptions::getConfig();
             conf.set( "url", _url ); 
-            conf.set( "geometry_profile", _geometryProfileConf );
             conf.set( "typename", _typename );
             conf.set( "outputformat", _outputFormat);
             conf.set( "maxfeatures", _maxFeatures );
@@ -100,13 +95,13 @@
 
     private:
         void fromConfig( const Config& conf ) {            
-            conf.getIfSet( "url", _url );
-            conf.getIfSet( "geometry_profile", _geometryProfileConf );
-            conf.getIfSet( "typename", _typename);
-            conf.getIfSet( "outputformat", _outputFormat );
-            conf.getIfSet( "maxfeatures", _maxFeatures );
-            conf.getIfSet( "disable_tiling", _disableTiling);
-            conf.getIfSet( "request_buffer", _buffer);            
+            conf.get( "url", _url );
+            conf.get( "geometry_profile", _geometryProfileConf );
+            conf.get( "typename", _typename);
+            conf.get( "outputformat", _outputFormat );
+            conf.get( "maxfeatures", _maxFeatures );
+            conf.get( "disable_tiling", _disableTiling);
+            conf.get( "request_buffer", _buffer);            
         }
 
         optional<URI>         _url;        
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_xyz/FeatureSourceXYZ.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_xyz/FeatureSourceXYZ.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_xyz/FeatureSourceXYZ.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_xyz/FeatureSourceXYZ.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -119,7 +119,7 @@
 
       bool getFeatures( const std::string& buffer, const TileKey& key, const std::string& mimeType, FeatureList& features )
       {            
-          if (mimeType == "application/x-protobuf" || mimeType == "binary/octet-stream")
+          if (mimeType == "application/x-protobuf" || mimeType == "binary/octet-stream" || mimeType == "application/octet-stream")
           {
               std::stringstream in(buffer);
               return MVT::read(in, key, features);
@@ -266,28 +266,26 @@
 
               URI uri( location, _options.url()->context() );
               if ( !cacheKey.empty() )
-                  uri.setCacheKey( cacheKey );
+              {
+                  uri.setCacheKey(Cache::makeCacheKey(location, "uri"));
+              }
 
               return uri;
           }
           return URI();
       }
 
-      FeatureCursor* createFeatureCursor(const Symbology::Query& query)
+      FeatureCursor* createFeatureCursor(const Symbology::Query& query, ProgressCallback* progress)
       {
           FeatureCursor* result = 0L;
 
           URI uri =  createURL( query );
           if (uri.empty()) return 0;
 
-          // check the blacklist:
-          if ( Registry::instance()->isBlacklisted(uri.full()) )
-              return 0L;
-
           OE_DEBUG << LC << uri.full() << std::endl;
 
           // read the data:
-          ReadResult r = uri.readString( _readOptions.get() );
+          ReadResult r = uri.readString( _readOptions.get(), progress );
 
           const std::string& buffer = r.getString();
           const Config&      meta   = r.metadata();
@@ -342,9 +340,6 @@
           //result = new FeatureListCursor(features);
           result = dataOK ? new FeatureListCursor( features ) : 0L;
 
-          if ( !result )
-              Registry::instance()->blacklist( uri.full() );
-
           return result;
       }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_xyz/XYZFeatureOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_xyz/XYZFeatureOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/feature_xyz/XYZFeatureOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/feature_xyz/XYZFeatureOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -80,11 +80,11 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
-            conf.getIfSet( "format", _format );
-            conf.getIfSet( "invert_y", _invertY );
-            conf.getIfSet( "min_level", _minLevel);
-            conf.getIfSet( "max_level", _maxLevel);
+            conf.get( "url", _url );
+            conf.get( "format", _format );
+            conf.get( "invert_y", _invertY );
+            conf.get( "min_level", _minLevel);
+            conf.get( "max_level", _maxLevel);
         }
 
         optional<URI>         _url;        
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gdal/GDALOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/gdal/GDALOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gdal/GDALOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gdal/GDALOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -82,8 +82,7 @@
         
         /**
          * Interpolation method to use when resampling source data; options are
-         * nearest, average, and bilinear.  Only effects elevation data
-         * unless interp_imagery is also set to true.
+         * nearest, average, and bilinear.
          */
         optional<ElevationInterpolation>& interpolation() { return _interpolation; }
         const optional<ElevationInterpolation>& interpolation() const { return _interpolation; }
@@ -103,16 +102,6 @@
         const optional<unsigned int>& subDataSet() const { return _subDataSet;}
 
         /**
-         * Set to true to also sample imagery using the method specified by "interpolation"
-         * By default imagery is sampled using nearest sampling.  This takes advantage of
-         * any built in overviews or wavelet compression in the source file but can 
-         * cause artifacts on neighboring tiles.  Interpolating the imagery can look nicer
-         * but will be much slower.
-         */
-        optional<bool>& interpolateImagery() { return _interpolateImagery;}
-        const optional<bool>& interpolateImagery() const { return _interpolateImagery;}
-
-        /**
          The "warp profile" is a way to tell the GDAL driver to keep the original SRS and geotransform of the source data
          but use a Warped VRT to make the data appear to conform to the given profile.  This is useful for merging multiple 
          files that may be in different projections using the composite driver.
@@ -133,8 +122,7 @@
 
         GDALOptions( const TileSourceOptions& options =TileSourceOptions() ) :
             TileSourceOptions( options ),
-            _interpolation( INTERP_AVERAGE ),
-            _interpolateImagery( false )
+            _interpolation(INTERP_AVERAGE)
         {
             setDriver( "gdal" );
             fromConfig( _conf );
@@ -153,19 +141,19 @@
             conf.set( "black_extensions", _blackExtensions );
 
             if ( _interpolation.isSet() ) {
-                if ( _interpolation.value() == osgEarth::INTERP_NEAREST ) conf.update( "interpolation", "nearest" );
-                else if ( _interpolation.value() == osgEarth::INTERP_AVERAGE ) conf.update( "interpolation", "average" );
-                else if ( _interpolation.value() == osgEarth::INTERP_BILINEAR ) conf.update( "interpolation", "bilinear" );
+                if ( _interpolation.value() == osgEarth::INTERP_NEAREST ) conf.set( "interpolation", "nearest" );
+                else if ( _interpolation.value() == osgEarth::INTERP_AVERAGE ) conf.set( "interpolation", "average" );
+                else if ( _interpolation.value() == osgEarth::INTERP_BILINEAR ) conf.set( "interpolation", "bilinear" );
+                else if (_interpolation.value() == osgEarth::INTERP_CUBIC) conf.set("interpolation", "cubic");
+                else if (_interpolation.value() == osgEarth::INTERP_CUBICSPLINE) conf.set("interpolation", "cubicspline");
             }
 
             conf.set( "max_data_level_override", _maxDataLevelOverride);
-            conf.set( "subdataset", _subDataSet);
+            conf.set( "subdataset", _subDataSet);            
 
-            conf.set( "interp_imagery", _interpolateImagery);
+            conf.set( "warp_profile", _warpProfile );
 
-            conf.setObj( "warp_profile", _warpProfile );
-
-            conf.updateNonSerializable( "GDALOptions::ExternalDataset", _externalDataset.get() );
+            conf.setNonSerializable( "GDALOptions::ExternalDataset", _externalDataset.get() );
 
             return conf;
         }
@@ -176,20 +164,20 @@
         }
 
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
-            conf.getIfSet( "connection", _connection );
-            conf.getIfSet( "extensions", _extensions );
-            conf.getIfSet( "black_extensions", _blackExtensions );
+            conf.get( "url", _url );
+            conf.get( "connection", _connection );
+            conf.get( "extensions", _extensions );
+            conf.get( "black_extensions", _blackExtensions );
             std::string in = conf.value( "interpolation" );
             if ( in == "nearest" ) _interpolation = osgEarth::INTERP_NEAREST;
             else if ( in == "average" ) _interpolation = osgEarth::INTERP_AVERAGE;
             else if ( in == "bilinear" ) _interpolation = osgEarth::INTERP_BILINEAR;
-            conf.getIfSet( "max_data_level_override", _maxDataLevelOverride);
-            conf.getIfSet( "subdataset", _subDataSet);
-
-            conf.getIfSet("interp_imagery", _interpolateImagery);
+            else if (in == "cubic") _interpolation = osgEarth::INTERP_CUBIC;
+            else if (in == "cubicspline") _interpolation = osgEarth::INTERP_CUBICSPLINE;
+            conf.get( "max_data_level_override", _maxDataLevelOverride);
+            conf.get( "subdataset", _subDataSet);
 
-            conf.getObjIfSet( "warp_profile", _warpProfile );
+            conf.get( "warp_profile", _warpProfile );
 
             _externalDataset = conf.getNonSerializable<ExternalDataset>( "GDALOptions::ExternalDataset" );
         }
@@ -199,7 +187,6 @@
         optional<std::string>            _extensions;
         optional<std::string>            _blackExtensions;
         optional<ElevationInterpolation> _interpolation;
-        optional<bool>                   _interpolateImagery;
         optional<unsigned int>           _maxDataLevelOverride;
         optional<unsigned int>           _subDataSet;
         optional<ProfileOptions>         _warpProfile;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gdal/ReaderWriterGDAL.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/gdal/ReaderWriterGDAL.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gdal/ReaderWriterGDAL.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gdal/ReaderWriterGDAL.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -76,6 +76,16 @@
 #  include <gdal_proxy.h>
 #endif
 
+#if (GDAL_VERSION_MAJOR >= 2)
+#  define GDAL_VERSION_2_0_OR_NEWER 1
+#endif
+
+#ifndef GDAL_VERSION_2_0_OR_NEWER
+// RasterIO was substantially improved in 2.0
+// See https://trac.osgeo.org/gdal/wiki/rfc51_rasterio_resampling_progress
+typedef int GSpacing;
+#endif
+
 #include <cpl_string.h>
 
 //GDAL VRT api is only available after 1.5.0
@@ -121,7 +131,12 @@
 static void
 getFiles(const osgDB::Options& options, const std::string &file, const std::vector<std::string> &exts, const std::vector<std::string> &blackExts, std::vector<std::string> &files)
 {
-    if (osgDB::fileType(file) == osgDB::DIRECTORY)
+    // Special cases for gdal virtual file systems
+    if (startsWith(file, "/vsi"))
+    {
+        files.push_back(file);
+    }
+    else if (osgDB::fileType(file) == osgDB::DIRECTORY)
     {
         osgDB::DirectoryContents contents = osgDB::getDirectoryContents(file);
         for (osgDB::DirectoryContents::iterator itr = contents.begin(); itr != contents.end(); ++itr)
@@ -251,15 +266,13 @@
             if (psDatasetProperties[i].adfGeoTransform[GEOTRSFRM_ROTATION_PARAM1] != 0 ||
                 psDatasetProperties[i].adfGeoTransform[GEOTRSFRM_ROTATION_PARAM2] != 0)
             {
-                fprintf( stderr, "GDAL Driver does not support rotated geo transforms. Skipping %s\n",
-                             dsFileName);
+                OE_WARN << LC << "GDAL Driver does not support rotated geo transforms. Skipping " << dsFileName << std::endl;
                 GDALClose(hDS);
                 continue;
             }
             if (psDatasetProperties[i].adfGeoTransform[GEOTRSFRM_NS_RES] >= 0)
             {
-                fprintf( stderr, "GDAL Driver does not support positive NS resolution. Skipping %s\n",
-                             dsFileName);
+                OE_WARN << LC << "GDAL Driver does not support positive NS resolution. Skipping " << dsFileName << std::endl;
                 GDALClose(hDS);
                 continue;
             }
@@ -310,27 +323,28 @@
                     (proj == NULL && projectionRef != NULL) ||
                     (proj != NULL && projectionRef != NULL && EQUAL(proj, projectionRef) == FALSE))
                 {
-                    fprintf( stderr, "gdalbuildvrt does not support heterogenous projection. Skipping %s\n",dsFileName);
+                    OE_WARN << LC << "gdalbuildvrt does not support heterogeneous projections. Skipping " << dsFileName << std::endl;
                     GDALClose(hDS);
                     continue;
                 }
                 int _nBands = GDALGetRasterCount(hDS);
                 if (nBands != _nBands)
                 {
-                    fprintf( stderr, "gdalbuildvrt does not support heterogenous band numbers. Skipping %s\n",
-                             dsFileName);
+                    OE_WARN << LC << "gdalbuildvrt does not support heterogeneous band numbers. Skipping " << dsFileName << std::endl;
                     GDALClose(hDS);
+                    hDS = NULL;
                     continue;
                 }
-                for(j=0;j<nBands;j++)
+                for(j=0;j<nBands && hDS != NULL;j++)
                 {
                     GDALRasterBandH hRasterBand = GDALGetRasterBand( hDS, j+1 );
                     if (bandProperties[j].colorInterpretation != GDALGetRasterColorInterpretation(hRasterBand) ||
                         bandProperties[j].dataType != GDALGetRasterDataType(hRasterBand))
                     {
-                        fprintf( stderr, "gdalbuildvrt does not support heterogenous band characteristics. Skipping %s\n",
+                        fprintf( stderr, "gdalbuildvrt does not support heterogeneous band characteristics. Skipping %s\n",
                              dsFileName);
                         GDALClose(hDS);
+                        hDS = NULL;
                     }
                     if (bandProperties[j].colorTable)
                     {
@@ -338,16 +352,18 @@
                         if (colorTable == NULL ||
                             GDALGetColorEntryCount(colorTable) != GDALGetColorEntryCount(bandProperties[j].colorTable))
                         {
-                            fprintf( stderr, "gdalbuildvrt does not support heterogenous band characteristics. Skipping %s\n",
+                            fprintf( stderr, "gdalbuildvrt does not support heterogeneous band characteristics. Skipping %s\n",
                              dsFileName);
                             GDALClose(hDS);
+                            hDS = NULL;
                             break;
                         }
                         /* We should check that the palette are the same too ! */
                     }
                 }
-                if (j != nBands)
+                if (j != nBands || hDS == NULL)
                     continue;
+
                 if (product_minX < minX) minX = product_minX;
                 if (product_minY < minY) minY = product_minY;
                 if (product_maxX > maxX) maxX = product_maxX;
@@ -379,10 +395,14 @@
                 }
             }
 
-            psDatasetProperties[i].isFileOK = 1;
-            nCount ++;
-            bFirst = FALSE;
-            GDALClose(hDS);
+            if (hDS != NULL)
+            {
+                psDatasetProperties[i].isFileOK = 1;
+                nCount ++;
+                bFirst = FALSE;
+                GDALClose(hDS);
+                hDS = NULL;
+            }
         }
         else
         {
@@ -669,7 +689,8 @@
       _srcDS(NULL),
       _warpedDS(NULL),
       _options(options),
-      _maxDataLevel(30)
+      _maxDataLevel(30),
+      _linearUnits(1.0)
     {
     }
 
@@ -747,8 +768,18 @@
         // source connection:
         std::string source;
 
-        if ( _options.url().isSet() )
-            source = _options.url()->full();
+        if (_options.url().isSet())
+        {
+            // Use the base instead of the full if this is a gdal virtual file system
+            if (startsWith(_options.url()->base(), "/vsi"))
+            {
+                source = _options.url()->base();
+            }
+            else
+            {
+                source = _options.url()->full();
+            }
+        }
         else if ( _options.connection().isSet() )
             source = _options.connection().value();
 
@@ -840,7 +871,7 @@
                             {
                                 if ( vrtDriver->CreateCopy(vrtFile.c_str(), _srcDS, 0, 0, 0, 0 ) == NULL )
                                 {
-                                    OE_WARN << LC << INDENT << "Faile to create copy" << std::endl;
+                                    OE_WARN << LC << INDENT << "Failed to create copy" << std::endl;
                                 }
 
                                 //We created the temp file, now read the contents back
@@ -1144,6 +1175,7 @@
         double maxResolution = osg::minimum(resolutionX, resolutionY);
 
         OE_INFO << LC << INDENT << "Resolution= " << resolutionX << "x" << resolutionY << " max=" << maxResolution << std::endl;
+        OE_INFO << LC << INDENT << "Tile size = " << getPixelsPerTile() << std::endl;
 
         if (_options.maxDataLevelOverride().isSet())
         {
@@ -1209,6 +1241,10 @@
             getDataExtents().insert(getDataExtents().end(), dataExtents.begin(), dataExtents.end());
         }
 
+
+        // Get the linear units of the SRS for scaling elevation values
+        _linearUnits = OSRGetLinearUnits((OGRSpatialReferenceH)srs->getHandle(), 0);
+
         //Set the profile
         setProfile( profile );
         OE_DEBUG << LC << INDENT << "Set Profile to " << (profile ? profile->toString() : "NULL") <<  std::endl;
@@ -1242,7 +1278,7 @@
         return 0;
     }
 
-    static void getPalleteIndexColor(GDALRasterBand* band, int index, osg::Vec4ub& color)
+    static bool getPalleteIndexColor(GDALRasterBand* band, int index, osg::Vec4ub& color)
     {
         const GDALColorEntry *colorEntry = band->GetColorTable()->GetColorEntry( index );
         GDALPaletteInterp interp = band->GetColorTable()->GetPaletteInterpretation();
@@ -1255,7 +1291,7 @@
             color.g() = 0;
             color.b() = 0;
             color.a() = 1;
-
+            return false;
         }
         else
         {
@@ -1317,6 +1353,11 @@
                 color.b() = static_cast<unsigned char>(colorEntry->c1*255.0f);
                 color.a() = static_cast<unsigned char>(255.0f);
             }
+            else
+            {
+                return false;
+            }
+            return true;
         }
     }
 
@@ -1340,6 +1381,62 @@
 
     }
 
+    // GDALRasterBand::RasterIO helper method
+    bool rasterIO(GDALRasterBand *band,
+        GDALRWFlag eRWFlag,
+        int nXOff,
+        int nYOff,
+        int nXSize,
+        int nYSize,
+        void *pData,
+        int nBufXSize,
+        int nBufYSize,
+        GDALDataType eBufType,
+        GSpacing nPixelSpace,
+        GSpacing nLineSpace,
+        ElevationInterpolation interpolation = INTERP_NEAREST
+        )
+    {
+#if GDAL_VERSION_2_0_OR_NEWER
+        GDALRasterIOExtraArg psExtraArg;
+
+        // defaults to GRIORA_NearestNeighbour
+        INIT_RASTERIO_EXTRA_ARG(psExtraArg);
+
+        switch(interpolation)
+        {
+            case INTERP_AVERAGE:
+                //psExtraArg.eResampleAlg = GRIORA_Average;
+                // for some reason gdal's average resampling produces artifacts occasionally for imagery at higher levels.
+                // for now we'll just use bilinear interpolation under the hood until we can understand what is going on.
+                psExtraArg.eResampleAlg = GRIORA_Bilinear;
+                break;
+            case INTERP_BILINEAR:
+                psExtraArg.eResampleAlg = GRIORA_Bilinear;
+                break;
+            case INTERP_CUBIC:
+                psExtraArg.eResampleAlg = GRIORA_Cubic;
+                break;
+            case INTERP_CUBICSPLINE:
+                psExtraArg.eResampleAlg = GRIORA_CubicSpline;
+                break;
+        }
+
+        CPLErr err = band->RasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize, pData, nBufXSize, nBufYSize, eBufType, nPixelSpace, nLineSpace, &psExtraArg);
+#else
+        if (interpolation != INTERP_NEAREST)
+        {
+            OE_DEBUG << LC << "RasterIO falling back to INTERP_NEAREST.\n";
+        }
+        CPLErr err = band->RasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize, pData, nBufXSize, nBufYSize, eBufType, nPixelSpace, nLineSpace);
+#endif
+        if (err != CE_None)
+        {
+            OE_WARN << LC << "RasterIO failed.\n";
+        }
+        return (err == CE_None);
+    }
+
     osg::Image* createImage( const TileKey&        key,
         ProgressCallback*     progress)
     {
@@ -1511,66 +1608,43 @@
             image->allocateImage(tileSize, tileSize, 1, pixelFormat, GL_UNSIGNED_BYTE);
             memset(image->data(), 0, image->getImageSizeInBytes());
 
-            //Nearest interpolation just uses RasterIO to sample the imagery and should be very fast.
-            if (!*_options.interpolateImagery() || _options.interpolation() == INTERP_NEAREST)
-            {
-                bandRed->RasterIO(GF_Read, off_x, off_y, width, height, red, target_width, target_height, GDT_Byte, 0, 0);
-                bandGreen->RasterIO(GF_Read, off_x, off_y, width, height, green, target_width, target_height, GDT_Byte, 0, 0);
-                bandBlue->RasterIO(GF_Read, off_x, off_y, width, height, blue, target_width, target_height, GDT_Byte, 0, 0);
+            rasterIO(bandRed, GF_Read, off_x, off_y, width, height, red, target_width, target_height, GDT_Byte, 0, 0, *_options.interpolation());
+            rasterIO(bandGreen, GF_Read, off_x, off_y, width, height, green, target_width, target_height, GDT_Byte, 0, 0, *_options.interpolation());
+            rasterIO(bandBlue, GF_Read, off_x, off_y, width, height, blue, target_width, target_height, GDT_Byte, 0, 0, *_options.interpolation());
 
-                if (bandAlpha)
-                {
-                    bandAlpha->RasterIO(GF_Read, off_x, off_y, width, height, alpha, target_width, target_height, GDT_Byte, 0, 0);
-                }
-
-                for (int src_row = 0, dst_row = tile_offset_top;
-                    src_row < target_height;
-                    src_row++, dst_row++)
-                {
-                    for (int src_col = 0, dst_col = tile_offset_left;
-                        src_col < target_width;
-                        ++src_col, ++dst_col)
-                    {
-                        unsigned char r = red[src_col + src_row * target_width];
-                        unsigned char g = green[src_col + src_row * target_width];
-                        unsigned char b = blue[src_col + src_row * target_width];
-                        unsigned char a = alpha[src_col + src_row * target_width];
-                        *(image->data(dst_col, dst_row) + 0) = r;
-                        *(image->data(dst_col, dst_row) + 1) = g;
-                        *(image->data(dst_col, dst_row) + 2) = b;
-                        if (!isValidValue( r, bandRed)    ||
-                            !isValidValue( g, bandGreen)  ||
-                            !isValidValue( b, bandBlue)   ||
-                            (bandAlpha && !isValidValue( a, bandAlpha )))
-                        {
-                            a = 0.0f;
-                        }
-                        *(image->data(dst_col, dst_row) + 3) = a;
-                    }
-                }
-
-                image->flipVertical();
+            if (bandAlpha)
+            {
+                rasterIO(bandAlpha, GF_Read, off_x, off_y, width, height, alpha, target_width, target_height, GDT_Byte, 0, 0, *_options.interpolation());
             }
-            else
+
+            for (int src_row = 0, dst_row = tile_offset_top;
+                src_row < target_height;
+                src_row++, dst_row++)
             {
-                //Sample each point exactly
-                for (unsigned int c = 0; c < (unsigned int)tileSize; ++c)
+                for (int src_col = 0, dst_col = tile_offset_left;
+                    src_col < target_width;
+                    ++src_col, ++dst_col)
                 {
-                    double geoX = xmin + (dx * (double)c);
-                    for (unsigned int r = 0; r < (unsigned int)tileSize; ++r)
+                    unsigned char r = red[src_col + src_row * target_width];
+                    unsigned char g = green[src_col + src_row * target_width];
+                    unsigned char b = blue[src_col + src_row * target_width];
+                    unsigned char a = alpha[src_col + src_row * target_width];
+                    *(image->data(dst_col, dst_row) + 0) = r;
+                    *(image->data(dst_col, dst_row) + 1) = g;
+                    *(image->data(dst_col, dst_row) + 2) = b;
+                    if (!isValidValue(r, bandRed) ||
+                        !isValidValue(g, bandGreen) ||
+                        !isValidValue(b, bandBlue) ||
+                        (bandAlpha && !isValidValue(a, bandAlpha)))
                     {
-                        double geoY = ymin + (dy * (double)r);
-                        *(image->data(c,r) + 0) = (unsigned char)getInterpolatedValue(bandRed,  geoX,geoY,false);
-                        *(image->data(c,r) + 1) = (unsigned char)getInterpolatedValue(bandGreen,geoX,geoY,false);
-                        *(image->data(c,r) + 2) = (unsigned char)getInterpolatedValue(bandBlue, geoX,geoY,false);
-                        if (bandAlpha != NULL)
-                            *(image->data(c,r) + 3) = (unsigned char)getInterpolatedValue(bandAlpha,geoX, geoY, false);
-                        else
-                            *(image->data(c,r) + 3) = 255;
+                        a = 0.0f;
                     }
+                    *(image->data(dst_col, dst_row) + 3) = a;
                 }
             }
 
+            image->flipVertical();
+
             delete []red;
             delete []green;
             delete []blue;
@@ -1590,25 +1664,25 @@
                 case GDT_Byte:
                     glDataType = GL_FLOAT;
                     gdalSampleSize = 1;
-                    internalFormat = GL_LUMINANCE32F_ARB;
+                    internalFormat = GL_R16F; // so we can still rep NO_DATA_VALUE?
                     break;
 
                 case GDT_UInt16:
                 case GDT_Int16:
                     glDataType = GL_FLOAT;
                     gdalSampleSize = 2;
-                    internalFormat = GL_LUMINANCE32F_ARB;
+                    internalFormat = GL_R16F;
                     break;
 
                 default:
                     glDataType = GL_FLOAT;
                     gdalSampleSize = 4;
-                    internalFormat = GL_LUMINANCE32F_ARB;
+                    internalFormat = GL_R32F;
                 }
 
                 // Create an un-normalized luminance image to hold coverage values.
                 image = new osg::Image();
-                image->allocateImage( tileSize, tileSize, 1, GL_LUMINANCE, glDataType );
+                image->allocateImage( tileSize, tileSize, 1, GL_RED, glDataType );
                 image->setInternalTextureFormat( internalFormat );
                 ImageUtils::markAsUnNormalized( image.get(), true );
                 memset(image->data(), 0, image->getImageSizeInBytes());
@@ -1634,9 +1708,8 @@
                 float nodata = bandGray->GetNoDataValue(&success);
                 if ( !success )
                     nodata = NO_DATA_VALUE; //getNoDataValue(); //getOptions().noDataValue().get();
-
-                CPLErr err = bandGray->RasterIO(GF_Read, off_x, off_y, width, height, data, target_width, target_height, gdalDataType, 0, 0);
-                if ( err == CE_None )
+                
+                if (rasterIO(bandGray, GF_Read, off_x, off_y, width, height, data, target_width, target_height, gdalDataType, 0, 0, INTERP_NEAREST))
                 {
                     // copy from data to image.
                     for (int src_row = 0, dst_row = tile_offset_top; src_row < target_height; src_row++, dst_row++)
@@ -1684,77 +1757,53 @@
                 memset(image->data(), 0, image->getImageSizeInBytes());
 
 
-                if (!*_options.interpolateImagery() || _options.interpolation() == INTERP_NEAREST)
-                {
-                    bandGray->RasterIO(GF_Read, off_x, off_y, width, height, gray, target_width, target_height, GDT_Byte, 0, 0);
-
-                    if (bandAlpha)
-                    {
-                        bandAlpha->RasterIO(GF_Read, off_x, off_y, width, height, alpha, target_width, target_height, GDT_Byte, 0, 0);
-                    }
-
-                    for (int src_row = 0, dst_row = tile_offset_top;
-                        src_row < target_height;
-                        src_row++, dst_row++)
-                    {
-                        for (int src_col = 0, dst_col = tile_offset_left;
-                            src_col < target_width;
-                            ++src_col, ++dst_col)
-                        {
-                            unsigned char g = gray[src_col + src_row * target_width];
-                            unsigned char a = alpha[src_col + src_row * target_width];
-                            *(image->data(dst_col, dst_row) + 0) = g;
-                            *(image->data(dst_col, dst_row) + 1) = g;
-                            *(image->data(dst_col, dst_row) + 2) = g;
-                            if (!isValidValue( g, bandGray) ||
-                                (bandAlpha && !isValidValue( a, bandAlpha)))
-                            {
-                                a = 0.0f;
-                            }
-                            *(image->data(dst_col, dst_row) + 3) = a;
-                        }
-                    }
+                rasterIO(bandGray, GF_Read, off_x, off_y, width, height, gray, target_width, target_height, GDT_Byte, 0, 0, *_options.interpolation());
 
-                    image->flipVertical();
+                if (bandAlpha)
+                {
+                    rasterIO(bandAlpha, GF_Read, off_x, off_y, width, height, alpha, target_width, target_height, GDT_Byte, 0, 0, *_options.interpolation());
                 }
-                else
+
+                for (int src_row = 0, dst_row = tile_offset_top;
+                    src_row < target_height;
+                    src_row++, dst_row++)
                 {
-                    for (int r = 0; r < tileSize; ++r)
+                    for (int src_col = 0, dst_col = tile_offset_left;
+                        src_col < target_width;
+                        ++src_col, ++dst_col)
                     {
-                        double geoY   = ymin + (dy * (double)r);
-
-                        for (int c = 0; c < tileSize; ++c)
+                        unsigned char g = gray[src_col + src_row * target_width];
+                        unsigned char a = alpha[src_col + src_row * target_width];
+                        *(image->data(dst_col, dst_row) + 0) = g;
+                        *(image->data(dst_col, dst_row) + 1) = g;
+                        *(image->data(dst_col, dst_row) + 2) = g;
+                        if (!isValidValue(g, bandGray) ||
+                            (bandAlpha && !isValidValue(a, bandAlpha)))
                         {
-                            double geoX = xmin + (dx * (double)c);
-                            float  color = getInterpolatedValue(bandGray,geoX,geoY,false);
-
-                            *(image->data(c,r) + 0) = (unsigned char)color;
-                            *(image->data(c,r) + 1) = (unsigned char)color;
-                            *(image->data(c,r) + 2) = (unsigned char)color;
-                            if (bandAlpha != NULL)
-                                *(image->data(c,r) + 3) = (unsigned char)getInterpolatedValue(bandAlpha,geoX,geoY,false);
-                            else
-                                *(image->data(c,r) + 3) = 255;
+                            a = 0.0f;
                         }
+                        *(image->data(dst_col, dst_row) + 3) = a;
                     }
                 }
 
+                image->flipVertical();
+                
                 delete []gray;
                 delete []alpha;
             }
         }
         else if (bandPalette)
         {
-            //Pallete indexed imagery doesn't support interpolation currently and only uses nearest
-            //b/c interpolating pallete indexes doesn't make sense.
+            //Palette indexed imagery doesn't support interpolation currently and only uses nearest
+            //b/c interpolating palette indexes doesn't make sense.
             unsigned char *palette = new unsigned char[target_width * target_height];
 
             image = new osg::Image;
 
             if ( _options.coverage() == true )
             {
-                image->allocateImage(tileSize, tileSize, 1, GL_LUMINANCE, GL_FLOAT);
-                image->setInternalTextureFormat(GL_LUMINANCE32F_ARB);
+                image->allocateImage(tileSize, tileSize, 1, GL_RED, GL_FLOAT);
+                image->setInternalTextureFormat(GL_R16F);
                 ImageUtils::markAsUnNormalized(image.get(), true);
 
                 // initialize all coverage texels to NODATA. -gw
@@ -1773,7 +1822,7 @@
                 memset(image->data(), 0, image->getImageSizeInBytes());
             }
 
-            bandPalette->RasterIO(GF_Read, off_x, off_y, width, height, palette, target_width, target_height, GDT_Byte, 0, 0);
+            rasterIO(bandPalette, GF_Read, off_x, off_y, width, height, palette, target_width, target_height, GDT_Byte, 0, 0, INTERP_NEAREST);
 
             ImageUtils::PixelWriter write(image.get());
 
@@ -1788,20 +1837,29 @@
                     unsigned char p = palette[src_col + src_row * target_width];
 
                     if ( _options.coverage() == true )
-                    {
-                        osg::Vec4 pixel;
-                        if ( isValidValue(p, bandPalette) )
-                            pixel.r() = (float)p;
+                    {                        
+                        osg::Vec4ub color;
+                        osg::Vec4f pixel;
+                        if (getPalleteIndexColor(bandPalette, p, color) &&
+                            isValidValue((float)color.r(), bandPalette)) // need this?
+                        {
+                            pixel.r() = (float)color.r();
+                        }
                         else
+                        {
                             pixel.r() = NO_DATA_VALUE;
+                        }
 
                         write(pixel, dst_col, dst_row);
                     }
                     else
                     {
                         osg::Vec4ub color;
-                        getPalleteIndexColor( bandPalette, p, color );
-                        if (!isValidValue( p, bandPalette))
+                        if (!getPalleteIndexColor( bandPalette, p, color ))
+                        {
+                            color.a() = 0.0f;
+                        }
+                        else if (!isValidValue((float)color.r(), bandPalette)) // is this applicable for palettized data?
                         {
                             color.a() = 0.0f;
                         }
@@ -1903,8 +1961,8 @@
 
         if ( _options.interpolation() == INTERP_NEAREST )
         {
-            band->RasterIO(GF_Read, (int)osg::round(c), (int)osg::round(r), 1, 1, &result, 1, 1, GDT_Float32, 0, 0);
-            if (!isValidValue( result, band))
+            rasterIO(band, GF_Read, (int)osg::round(c), (int)osg::round(r), 1, 1, &result, 1, 1, GDT_Float32, 0, 0);
+            if (!isValidValue(result, band))
             {
                 return NO_DATA_VALUE;
             }
@@ -1921,17 +1979,11 @@
 
             float urHeight, llHeight, ulHeight, lrHeight;
 
-            band->RasterIO(GF_Read, colMin, rowMin, 1, 1, &llHeight, 1, 1, GDT_Float32, 0, 0);
-            band->RasterIO(GF_Read, colMin, rowMax, 1, 1, &ulHeight, 1, 1, GDT_Float32, 0, 0);
-            band->RasterIO(GF_Read, colMax, rowMin, 1, 1, &lrHeight, 1, 1, GDT_Float32, 0, 0);
-            band->RasterIO(GF_Read, colMax, rowMax, 1, 1, &urHeight, 1, 1, GDT_Float32, 0, 0);
-
-            /*
-            if (!isValidValue(urHeight, band)) urHeight = 0.0f;
-            if (!isValidValue(llHeight, band)) llHeight = 0.0f;
-            if (!isValidValue(ulHeight, band)) ulHeight = 0.0f;
-            if (!isValidValue(lrHeight, band)) lrHeight = 0.0f;
-            */
+            rasterIO(band, GF_Read, colMin, rowMin, 1, 1, &llHeight, 1, 1, GDT_Float32, 0, 0);
+            rasterIO(band, GF_Read, colMin, rowMax, 1, 1, &ulHeight, 1, 1, GDT_Float32, 0, 0);
+            rasterIO(band, GF_Read, colMax, rowMin, 1, 1, &lrHeight, 1, 1, GDT_Float32, 0, 0);
+            rasterIO(band, GF_Read, colMax, rowMax, 1, 1, &urHeight, 1, 1, GDT_Float32, 0, 0);
+
             if ((!isValidValue(urHeight, band)) || (!isValidValue(llHeight, band)) ||(!isValidValue(ulHeight, band)) || (!isValidValue(lrHeight, band)))
             {
                 return NO_DATA_VALUE;
@@ -1985,8 +2037,6 @@
         return result;
     }
 
-
-#if 1
     osg::HeightField* createHeightField( const TileKey&        key,
                                          ProgressCallback*     progress)
     {
@@ -2050,13 +2100,13 @@
                 int startOffset = iBufRowMin * tileSize + iBufColMin;
                 int lineSpace = tileSize * sizeof(float);
 
-                band->RasterIO(GF_Read, iWinColMin, iWinRowMin, iNumWinCols, iNumWinRows, &buffer[startOffset], iNumBufCols, iNumBufRows, GDT_Float32, 0, lineSpace);
+                rasterIO(band, GF_Read, iWinColMin, iWinRowMin, iNumWinCols, iNumWinRows, &buffer[startOffset], iNumBufCols, iNumBufRows, GDT_Float32, 0, lineSpace);
 
                 for (int r = 0, ir = tileSize - 1; r < tileSize; ++r, --ir)
                 {
                     for (int c = 0; c < tileSize; ++c)
                     {
-                        hf->setHeight(c, ir, buffer[r * tileSize + c]);
+                        hf->setHeight(c, ir, _linearUnits * buffer[r * tileSize + c]);
                     }
                 }
             }
@@ -2070,7 +2120,7 @@
                     for (int c = 0; c < tileSize; ++c)
                     {
                         double geoX = xmin + (dx * (double)c);
-                        float h = getInterpolatedValue(band, geoX, geoY);
+                        float h = getInterpolatedValue(band, geoX, geoY) * _linearUnits;
                         hf->setHeight(c, r, h);
                     }
                 }
@@ -2084,299 +2134,6 @@
         return hf.release();
     }
 
-#else
-
-    /**
-     * Specialized version of GeoHeightField's getHeightAtLocation that just clamps values that are outside of the dataset
-     * to be within the dataset (logic in HeightFieldUtils::getHeightAtLocation).
-     * This is necessary when sampling datasets along the edges where data might actually not exist.
-     * For example, take a worldwide elevation dataset with bounds -180, -90 to 180, 90 that is 200x100 pixels.
-     * When you go to sample the western hemisphere you end up reading a heightfield of size 100x100.  The bounds of the actual data that was
-     * read in heightfield form are actually 0.5,0.5 to 99.5, 99.5 b/c the elevation sample point is in the center of the pixels, not the entire pixel.
-     * So the loop that attempts to resample the heightfield might be asking for elevation values at -180,-90 which is in pixel space 0,0.
-     * In this version of the getHeightAtLocation function it will just return the value at 0.5, 0.5.
-     */
-    float getHeightAtLocation(const GeoHeightField& hf, double x, double y, ElevationInterpolation interp)
-    {
-        double xInterval = hf.getExtent().width()  / (double)(hf.getHeightField()->getNumColumns()-1);
-        double yInterval = hf.getExtent().height() / (double)(hf.getHeightField()->getNumRows()-1);
-
-        // sample the heightfield at the input coordinates:
-        // (note: since it's sampling the HF, it will return an MSL height if applicable)
-        float height = HeightFieldUtils::getHeightAtLocation(
-            hf.getHeightField(),
-            x, y,
-            hf.getExtent().xMin(), hf.getExtent().yMin(),
-            xInterval, yInterval,
-            interp);
-
-        return height;
-    }
-
-     osg::HeightField* createHeightField( const TileKey&        key,
-                                         ProgressCallback*     progress)
-    {
-        if (key.getLevelOfDetail() > _maxDataLevel)
-        {
-            //OE_NOTICE << "Reached maximum data resolution key=" << key.getLevelOfDetail() << " max=" << _maxDataLevel <<  std::endl;
-            return NULL;
-        }
-
-        GDAL_SCOPED_LOCK;
-
-        int tileSize = _options.tileSize().value();
-
-        //Allocate the heightfield
-        osg::ref_ptr<osg::HeightField> hf = new osg::HeightField;
-        hf->allocate(tileSize, tileSize);
-        for (unsigned int i = 0; i < hf->getHeightList().size(); ++i) hf->getHeightList()[i] = NO_DATA_VALUE;
-
-        if (intersects(key))
-        {
-            //Get the extents of the tile
-            double xmin, ymin, xmax, ymax;
-            key.getExtent().getBounds(xmin, ymin, xmax, ymax);
-
-            // Compute the intersection of the incoming key with the data extents of the dataset
-            osgEarth::GeoExtent intersection = key.getExtent().intersectionSameSRS( _extents );
-
-            // Determine the read window
-            double src_min_x, src_min_y, src_max_x, src_max_y;
-            // Get the pixel coordinates of the intersection
-            geoToPixel( intersection.xMin(), intersection.yMax(), src_min_x, src_min_y);
-            geoToPixel( intersection.xMax(), intersection.yMin(), src_max_x, src_max_y);
-
-            int rasterWidth = _warpedDS->GetRasterXSize();
-            int rasterHeight = _warpedDS->GetRasterYSize();
-
-            // Convert the doubles to integers.  We floor the mins and ceil the maximums to give the widest window possible.
-            src_min_x = osg::round(src_min_x);
-            src_min_y = osg::round(src_min_y);
-            src_max_x = osg::round(src_max_x);
-            src_max_y = osg::round(src_max_y);
-
-            // We are now dealing with integer pixel values, so need to add 1 to get the width
-            int width  = (int)(src_max_x - src_min_x) + 1;
-            int height = (int)(src_max_y - src_min_y) + 1;
-
-            // Don't read anything greater than a dimension of max_read_dimensions.  If the source window is really large it will use
-            // GDAL's nearest neighbour sampling.  If the source window is < max_read_dimensions x max_read_dimensions then the exact source data is read and
-            // resampled.  This make sure that once get into high enough resolution data the verts don't move around on you due to sampling.
-            int max_read_dimensions = 256;
-
-            // Width of the GDAL target buffer. Will be modified later.
-            int target_width;
-            int target_height;
-
-            // If the source window is large, then just read a sample from it using GDALs nearest neighbour algorithm. We will then sample from the result.
-            if(width > max_read_dimensions)
-            {
-                target_width = max_read_dimensions;
-                // Figure out how many source pixels equate to half a read buffer cell.
-                double dx = ((double)width) / ((double)(target_width - 1)) * 0.5;
-                //Inflate the source read window by half a target buffer cell. There are two reasons for this:
-                // 1) Later we will deflate our read window by the same amount, so if we don't do this here there will be an apparent gap between tiles.
-                // 2) GDAL will start reading half way along the first target buffer cell and finish reading half way along the last.
-                //     We want the the nearest neighbour to that point to be right on the tile boundary so that the boundary values are the same on neighbouring tiles.
-                int x0 = (int)floor(src_min_x - dx);
-                int x1 = (int)ceil(src_max_x + dx);
-
-                bool limitx0 = false;
-                bool limitx1 = false;
-
-                // Check if the recalculated values are valid, or if they need to be limited to the edge of the data.
-                if( x0 < 0 )
-                {
-                    x0 = 0;
-                    limitx0 = true;
-                }
-
-                if( x1 > rasterWidth - 1 )
-                {
-                    x1 = rasterWidth - 1;
-                    limitx1 = true;
-                }
-
-                // If one of the recalculated values was limited, then we need to recalculate the other so that half a cell offset will land on the edge of the grid.
-                if( limitx0 && !limitx1 )
-                {
-                    // Recalculate x1
-                    double dx_rev = (src_max_x - x0) / (((double)target_width) - 0.5);
-                    x1 = (int)ceil(src_max_x + dx_rev);
-                }
-
-                if( limitx1 && !limitx0 )
-                {
-                    // Recalculate x0
-                    double dx_rev = (x1 - src_min_x) / (((double)target_width) - 0.5);
-                    x0 = (int)floor(src_min_x - dx_rev);
-                }
-
-                src_min_x = x0;
-                src_max_x = x1;
-
-                // Need to recalc width.
-                width = (int)(src_max_x - src_min_x) + 1;
-            }
-            else
-            {
-                // Inflate the source window by one cell. Source pixels are read exactly, so don't need to worry about GDAL sub sampling.
-                src_min_x = osg::maximum((int)src_min_x - 1, 0);
-                src_max_x = osg::minimum((int)src_max_x + 1, rasterWidth - 1);
-                // Need to recalc width.
-                width = (int)(src_max_x - src_min_x) + 1;
-                target_width = width;
-            }
-
-            if(height > max_read_dimensions)
-            {
-                target_height = max_read_dimensions;
-                // Figure out how many source pixels equate to half a read buffer cell.
-                double dy =  ((double)height) / ((double)(target_height - 1)) * 0.5;
-                //Inflate the source read window by half a target buffer cell. There are two reasons for this:
-                // 1) Later we will deflate our read window by the same amount, so if we don't do this here there will be an apparent gap between tiles.
-                // 2) GDAL will start reading half way along the first target buffer cell and finish reading half way along the last.
-                //     We want the the nearest neighbour to that point to be right on the tile boundary so that the boundary values are the same on neighbouring tiles.
-                int y0 = (int)floor(src_min_y - dy);
-                int y1 = (int)ceil(src_max_y + dy);
-
-                bool limity0 = false;
-                bool limity1 = false;
-
-                // Check if the recalculated values are valid, or if they need to be limited to the edge of the data.
-                if( y0 < 0 )
-                {
-                    y0 = 0;
-                    limity0 = true;
-                }
-
-                if( y1 > rasterHeight - 1 )
-                {
-                    y1 = rasterHeight - 1;
-                    limity1 = true;
-                }
-
-                // If one of the recalculated values was limited, then we need to recalculate the other so that half a cell offset will land on the edge of the grid.
-                if( limity0 && !limity1 )
-                {
-                    // Recalculate y1
-                    double dy_rev = (src_max_y - y0) / (((double)target_height) - 0.5);
-                    y1 = (int)ceil(src_max_y + dy_rev);
-                }
-
-                if( limity1 && !limity0 )
-                {
-                    // Recalculate y0
-                    double dy_rev = (y1 - src_min_y) / (((double)target_height) - 0.5);
-                    y0 = (int)floor(src_min_y - dy_rev);
-                }
-
-                src_min_y = y0;
-                src_max_y = y1;
-
-                // Need to recalc height.
-                height = (int)(src_max_y - src_min_y) + 1;
-            }
-            else
-            {
-                // Inflate the source window by one cell. Source pixels are read exactly, so don't need to worry about GDAL sub sampling.
-                src_min_y = osg::maximum((int)src_min_y - 1, 0);
-                src_max_y = osg::minimum((int)src_max_y + 1, rasterHeight - 1);
-                // Need to recalc height.
-                height = (int)(src_max_y - src_min_y) + 1;
-                target_height = height;
-            }
-
-            OE_DEBUG << LC << "Reading key " << key.str() << "   " << xmin << ", " << ymin << ", " << xmax << ", " << ymax << ", " << std::endl;
-            OE_DEBUG << LC << "ReadWindow " << src_min_x << "," << src_min_y  << "," << src_max_x << "," << src_max_y << " " << width << "x" << height << std::endl;
-            OE_DEBUG << LC << "DestWindowSize " << target_width << "x" << target_height << std::endl;
-
-            // Figure out the true pixel extents of what we read
-            double read_min_x, read_min_y, read_max_x, read_max_y;
-            pixelToGeo(src_min_x, src_min_y, read_min_x, read_max_y);
-            // True extents extends to the far side of the last pixel and line.
-            pixelToGeo(src_max_x + 1, src_max_y + 1, read_max_x, read_min_y);
-
-            // We need to deflate the size of the extents by the width of 0.5 'target buffer' pixel to get the correct extents of the heightfield since it's
-            // sampled at the center of the pixels and not the outside edges.
-            double half_dx = ((read_max_x - read_min_x)/((double)target_width)) / 2.0;
-            double half_dy = ((read_max_y - read_min_y)/((double)target_height)) / 2.0;
-            read_min_x += half_dx;
-            read_min_y += half_dy;
-            read_max_x -= half_dx;
-            read_max_y -= half_dy;
-
-
-            OE_DEBUG << LC << "Read extents " << read_min_x << ", " << read_min_y << " to " << read_max_x << ", " << read_max_y << std::endl;
-
-            // Try to find a FLOAT band
-            GDALRasterBand* band = findBandByDataType(_warpedDS, GDT_Float32);
-            if (band == NULL)
-            {
-                // Just get first band
-                band = _warpedDS->GetRasterBand(1);
-            }
-
-            float *heights = new float[target_width * target_height];
-            for (unsigned int i = 0; i < target_width * target_height; i++)
-            {
-                heights[i] = NO_DATA_VALUE;
-            }
-            band->RasterIO(GF_Read, src_min_x, src_min_y, width, height, heights, target_width, target_height, GDT_Float32, 0, 0);
-
-            // Now create a GeoHeightField that we can sample from.  This heightfield only contains the portion that was actually read from the dataset
-            osg::ref_ptr< osg::HeightField > readHF = new osg::HeightField();
-            readHF->allocate( target_width, target_height );
-            for (unsigned int c = 0; c < target_width; c++)
-            {
-                for (unsigned int r = 0; r < target_height; r++)
-                {
-                    unsigned inv_r = target_height - r -1;
-                    float h = heights[r * target_width + c];
-                    // Mark the value as nodata using the universal NO_DATA_VALUE marker.
-                    if (!isValidValue( h, band ) )
-                    {
-                        h = NO_DATA_VALUE;
-                    }
-
-                    readHF->setHeight(c, inv_r, h );
-                }
-            }
-
-            // Delete the heights array, it's been copied into readHF.
-            delete[] heights;
-
-
-            // Create a GeoHeightField so we can easily sample it.
-            GeoHeightField readGeoHeightField(readHF, GeoExtent(this->getProfile()->getSRS(), read_min_x, read_min_y, read_max_x, read_max_y));
-
-
-            // Iterate over the output heightfield and sample the data that was read into it.
-            double dx = (xmax - xmin) / (tileSize-1);
-            double dy = (ymax - ymin) / (tileSize-1);
-
-            for (int c = 0; c < tileSize; ++c)
-            {
-                double geoX = xmin + (dx * (double)c);
-                for (int r = 0; r < tileSize; ++r)
-                {
-                    double geoY = ymin + (dy * (double)r);
-
-                    float h = NO_DATA_VALUE;
-                    if (readGeoHeightField.getExtent().contains(geoX, geoY))
-                    {
-                        h = getHeightAtLocation( readGeoHeightField, geoX, geoY, *_options.interpolation() );
-                    }
-                    hf->setHeight(c, r, h);
-                }
-            }
-        }
-        return hf.release();
-    }
-
-#endif
-
-
 
     bool intersects(const TileKey& key)
     {
@@ -2390,6 +2147,7 @@
     GDALDataset* _warpedDS;
     double       _geotransform[6];
     double       _invtransform[6];
+    double       _linearUnits;
 
     GeoExtent _extents;
     Bounds _bounds;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/B3DMReader.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/B3DMReader.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/B3DMReader.h	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/B3DMReader.h	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,174 @@
+/* -*-c++-*- */
+/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#ifndef OSGEARTH_B3DM_READER_H
+#define OSGEARTH_B3DM_READER_H
+
+#include <osgEarth/Endian>
+#include <osgEarth/URI>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/Registry>
+#include "GLTFReader.h"
+
+using namespace osgEarth;
+
+#undef LC
+#define LC "[B3DMReader] "
+
+struct b3dmheader
+{
+    char magic[4];
+    unsigned int version;
+    unsigned int byteLength;
+    unsigned int featureTableJSONByteLength;
+    unsigned int featureTableBinaryByteLength;
+    unsigned int batchTableJSONByteLength;
+    unsigned int batchTableBinaryByteLength;
+};
+
+class B3DMReader
+{
+public:
+    //! Read a B3DM file and return a node
+    osg::Node* read(const std::string& location, const osgDB::Options* options) const
+    {
+        // Load the whole thing into memory
+        URIStream inputStream(location, std::ifstream::binary);
+
+        std::istreambuf_iterator<char> eof;
+        std::string data(std::istreambuf_iterator<char>(inputStream), eof);
+
+        // Check the header's magic string. If it's not there, attempt
+        // to run a decompressor on it
+
+        std::string magic(data, 0, 4);
+        if (magic != "b3dm")
+        {
+            osg::ref_ptr<osgDB::BaseCompressor> compressor = osgDB::Registry::instance()->getObjectWrapperManager()->findCompressor("zlib");
+            if (compressor.valid())
+            {
+                std::stringstream in_data(data);
+                std::string temp;
+                if (!compressor->decompress(in_data, temp))
+                {
+                    OE_WARN << LC << "Invalid b3dm" << std::endl;
+                    return NULL;
+                }
+                data = temp;
+            }
+        }
+
+        b3dmheader header;
+        unsigned bytesRead = 0;
+
+        std::stringstream buf(data);
+        buf.read(reinterpret_cast<char*>(&header), sizeof(b3dmheader));
+        bytesRead += sizeof(b3dmheader);
+
+#ifdef OE_IS_BIG_ENDIAN
+        byteSwapInPlace(header.version);
+        byteSwapInPlace(header.byteLength);
+        byteSwapInPlace(header.featureTableJSONByteLength);
+        byteSwapInPlace(header.featureTableBinaryByteLength);
+        byteSwapInPlace(header.batchTableJSONByteLength);
+        byteSwapInPlace(header.batchTableBinaryByteLength);
+#endif
+
+        size_t sz = header.byteLength;
+
+        osg::Vec3d rtc_center;
+
+        if (header.featureTableJSONByteLength > 0)
+        {
+            std::string featureTableJson;
+            featureTableJson.resize(header.featureTableJSONByteLength);
+            buf.read(reinterpret_cast<char*>(&featureTableJson[0]), header.featureTableJSONByteLength);
+            OE_DEBUG << "Read featureTableJson " << featureTableJson << std::endl;
+
+            json ftJson = json::parse(featureTableJson);
+            if (ftJson.find("RTC_CENTER") != ftJson.end()) {
+                json RTC_CENTER = ftJson["RTC_CENTER"];
+                rtc_center.x() = RTC_CENTER[0];
+                rtc_center.y() = RTC_CENTER[1];
+                rtc_center.z() = RTC_CENTER[2];
+            }
+            OE_DEBUG << LC << "Read rtc_center " << rtc_center.x() << ", " << rtc_center.y() << ", " << rtc_center.z() << std::endl;
+
+            bytesRead += header.featureTableJSONByteLength;
+        }
+
+        if (header.featureTableBinaryByteLength > 0)
+        {
+            std::string featureTableBinary;
+            featureTableBinary.resize(header.featureTableBinaryByteLength);
+            buf.read(reinterpret_cast<char*>(&featureTableBinary[0]), header.featureTableBinaryByteLength);
+            OE_DEBUG << "Read featureTableJson " << featureTableBinary << std::endl;
+            bytesRead += header.featureTableBinaryByteLength;
+        }
+
+        if (header.batchTableJSONByteLength > 0)
+        {
+            std::string batchTableJSON;
+            batchTableJSON.resize(header.batchTableJSONByteLength);
+            buf.read(reinterpret_cast<char*>(&batchTableJSON[0]), header.batchTableJSONByteLength);
+            OE_DEBUG << "Read batchTableJSON " << batchTableJSON << std::endl;
+            bytesRead += header.batchTableJSONByteLength;
+        }
+
+        if (header.batchTableBinaryByteLength > 0)
+        {
+            std::string batchTableBinary;
+            batchTableBinary.resize(header.batchTableBinaryByteLength);
+            buf.read(reinterpret_cast<char*>(&batchTableBinary[0]), header.batchTableBinaryByteLength);
+            OE_DEBUG << "Read batchTableJSON " << batchTableBinary << std::endl;
+            bytesRead += header.batchTableBinaryByteLength;
+        }
+
+        std::string gltfData;
+        gltfData.resize(sz - bytesRead);
+        buf.read(reinterpret_cast<char *>(&gltfData[0]), static_cast<std::streamsize>(gltfData.size()));
+
+        tinygltf::Model model;
+        tinygltf::TinyGLTF loader;
+        std::string err;
+        std::string warn;
+        loader.LoadBinaryFromMemory(&model, &err, &warn, reinterpret_cast<unsigned char*>(&gltfData[0]), sz);
+
+
+        osg::MatrixTransform *mt = new osg::MatrixTransform;
+
+        GLTFReader gltfReader;
+        osg::Node* modelNode = gltfReader.makeNodeFromModel(model);
+        if (rtc_center.x() == 0.0 && rtc_center.y() == 0.0 && rtc_center.z() == 0.0)
+        {
+            return modelNode;
+        }
+        else
+        {
+            osg::MatrixTransform* mt = new osg::MatrixTransform;
+            mt->setMatrix(osg::Matrix::translate(rtc_center));
+            mt->addChild(modelNode);
+            return mt;
+        }
+    }
+};
+
+#endif // OSGEARTH_B3DM_READER_H
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/B3DMWriter.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/B3DMWriter.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/B3DMWriter.h	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/B3DMWriter.h	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,131 @@
+/* -*-c++-*- */
+/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#ifndef OSGEARTH_B3DM_WRITER_H
+#define OSGEARTH_B3DM_WRITER_H
+
+#include "B3DMReader.h"
+#include "GLTFWriter.h"
+#include <osgEarth/JsonUtils>
+using namespace osgEarth;
+
+#undef LC
+#define LC "[B3DMWriter] "
+
+class B3DMWriter
+{
+public:
+    osgDB::ReaderWriter::WriteResult write(const osg::Node& node, 
+                                           const std::string& location, 
+                                           bool isBinary,
+                                           const osgDB::Options* options) const
+    {
+        std::fstream fout(location.c_str(), std::ios::out | std::ios::binary);
+        if (!fout.is_open())
+            return osgDB::ReaderWriter::WriteResult::ERROR_IN_WRITING_FILE;
+
+        std::string featureTableJSON;
+        {
+            Json::Value value(Json::objectValue);
+            value["BATCH_LENGTH"] = 1;
+            // no RTC_CENTER
+            Json::FastWriter writer;
+            featureTableJSON = writer.write(value);
+        }
+        int featureTablePadding = 4 - (featureTableJSON.length() % 4);
+        if (featureTablePadding == 4) featureTablePadding = 0;
+
+        // no binary feature table
+
+        // no batch table, json or binary
+
+        // convert OSG to GLTF and write to a buffer:
+        GLTFWriter gltfWriter;
+        tinygltf::Model model;
+        gltfWriter.convertOSGtoGLTF(node, model);
+
+        tinygltf::TinyGLTF gltfOut;
+        std::ostringstream gltfBuf;
+        gltfOut.WriteGltfSceneToBinaryStream(&model, location, gltfBuf, true, true);
+        std::string gltfData = gltfBuf.str();
+        int gltfDataPadding = 4 - (gltfData.length() % 4);
+        if (gltfDataPadding == 4) gltfDataPadding = 0;
+
+        // assemble the header:
+        b3dmheader header;
+        header.magic[0] = 'b', header.magic[1] = '3', header.magic[2] = 'd', header.magic[3] = 'm';
+        header.version = 1;
+        header.featureTableJSONByteLength = featureTableJSON.length() + featureTablePadding;
+        header.featureTableBinaryByteLength = 0;
+        header.batchTableJSONByteLength = 0;
+        header.batchTableBinaryByteLength = 0;
+        header.byteLength =
+            sizeof(b3dmheader) +
+            header.featureTableJSONByteLength +
+            header.featureTableBinaryByteLength +
+            header.batchTableJSONByteLength +
+            header.batchTableBinaryByteLength +
+            gltfData.length() +
+            gltfDataPadding;
+
+#ifdef OE_IS_BIG_ENDIAN
+        byteSwapInPlace(header.version);
+        byteSwapInPlace(header.byteLength);
+        byteSwapInPlace(header.featureTableJSONByteLength);
+        byteSwapInPlace(header.featureTableBinaryByteLength);
+        byteSwapInPlace(header.batchTableJSONByteLength);
+        byteSwapInPlace(header.batchTableBinaryByteLength);
+#endif
+
+        std::stringstream compressionInput;
+        std::ostream* output = &fout;
+
+        osg::ref_ptr<osgDB::BaseCompressor> compressor = osgDB::Registry::instance()->getObjectWrapperManager()->findCompressor("zlib");
+        if (compressor.valid())
+        {
+            output = &compressionInput;
+        }
+
+        // B3DM header:
+        output->write((const char*)&header, sizeof(b3dmheader));
+
+        // Tables:
+        output->write(featureTableJSON.c_str(), featureTableJSON.length());
+        output->write("   ", featureTablePadding);
+
+        // If we want to write the other 3 tables, they go here
+
+        // GLTF binary data
+        output->write(gltfData.c_str(), gltfData.length());
+        output->write("\0\0\0", gltfDataPadding);
+
+        if (compressor.valid())
+        {
+            compressor->compress(fout, compressionInput.str());
+        }
+
+        fout.close();
+
+        return osgDB::ReaderWriter::WriteResult::FILE_SAVED;
+    }
+};
+
+#endif // OSGEARTH_B3DM_WRITER_H
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,11 @@
+SET(TARGET_H
+    GLTFReader.h
+    GLTFWriter.h
+    B3DMReader.h
+    B3DMWriter.h
+)
+SET(TARGET_SRC
+    ReaderWriterGLTF.cpp
+)
+#### end var setup  ###
+SETUP_PLUGIN(gltf)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/GLTFReader.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/GLTFReader.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/GLTFReader.h	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/GLTFReader.h	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,484 @@
+/* -*-c++-*- */
+/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#ifndef OSGEARTH_GLTF_READER_H
+#define OSGEARTH_GLTF_READER_H
+
+#include <osg/Node>
+#include <osg/Geometry>
+#include <osg/MatrixTransform>
+#include <osg/Texture2D>
+#include <osgDB/FileNameUtils>
+#include <osgDB/ReaderWriter>
+#include <osgUtil/Optimizer>
+#include <osgEarth/Notify>
+
+#undef LC
+#define LC "[GLTFWriter] "
+
+class GLTFReader
+{
+public:
+    osgDB::ReaderWriter::ReadResult read(const std::string& location, 
+                                         bool isBinary,
+                                         const osgDB::Options* options) const
+    {
+        std::string err, warn;
+        tinygltf::Model model;
+        tinygltf::TinyGLTF loader;
+
+        if (isBinary)
+        {
+            loader.LoadBinaryFromFile(&model, &err, &warn, location);
+        }
+        else
+        {
+            loader.LoadASCIIFromFile(&model, &err, &warn, location);
+        }
+
+        if (!err.empty()) {
+            OE_WARN << LC << "gltf Error loading " << location << std::endl;
+            OE_WARN << LC << err << std::endl;
+            return osgDB::ReaderWriter::ReadResult::ERROR_IN_READING_FILE;
+        }
+
+        return makeNodeFromModel(model);
+    }
+
+    osg::Node* makeNodeFromModel(const tinygltf::Model &model) const
+    {
+        osg::Group* group = new osg::Group();
+
+        for (unsigned int i = 0; i < model.scenes.size(); i++)
+        {
+            const tinygltf::Scene &scene = model.scenes[i];
+
+            for (size_t j = 0; j < scene.nodes.size(); j++) {
+                osg::Node* node = createNode(model, model.nodes[scene.nodes[j]]);
+                if (node)
+                {
+                    group->addChild(node);
+                }
+            }
+        }
+        return group;
+    }
+
+    osg::Node* createNode(const tinygltf::Model &model, const tinygltf::Node& node) const
+    {
+        osg::MatrixTransform* mt = new osg::MatrixTransform;
+        mt->setName(node.name);
+        if (node.matrix.size() == 16)
+        {
+            osg::Matrixd mat;
+            mat.set(node.matrix.data());
+            mt->setMatrix(mat);
+        }
+        else
+        {
+            osg::Matrixd scale, translation, rotation;
+            if (node.scale.size() == 3)
+            {
+                scale = osg::Matrixd::scale(node.scale[0], node.scale[1], node.scale[2]);
+            }
+
+            if (node.rotation.size() == 4) {
+                osg::Quat quat(node.rotation[0], node.rotation[1], node.rotation[2], node.rotation[3]);
+                rotation.makeRotate(quat);
+            }
+
+            if (node.translation.size() == 3) {
+                translation = osg::Matrixd::translate(node.translation[0], node.translation[1], node.translation[2]);
+            }
+
+            mt->setMatrix(scale * rotation * translation);
+        }
+
+
+        // todo transformation
+        if (node.mesh >= 0)
+        {
+            mt->addChild(makeMesh(model, model.meshes[node.mesh]));
+        }
+
+        // Load any children.
+        for (unsigned int i = 0; i < node.children.size(); i++)
+        {
+            osg::Node* child = createNode(model, model.nodes[node.children[i]]);
+            if (child)
+            {
+                mt->addChild(child);
+            }
+        }
+        return mt;
+    }
+
+
+    osg::Node* makeMesh(const tinygltf::Model &model, const tinygltf::Mesh& mesh) const
+    {
+        osg::Group *group = new osg::Group;
+
+        std::vector< osg::ref_ptr< osg::Array > > arrays;
+        extractArrays(model, arrays);
+
+        // Transforms verts and normals from Y-UP (GLTF spec) to Z-UP (OSG)
+        const osg::Matrixd YUP2ZUP(1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1);
+
+        OE_DEBUG << "Drawing " << mesh.primitives.size() << " primitives in mesh" << std::endl;
+
+        for (size_t i = 0; i < mesh.primitives.size(); i++) {
+
+            OE_DEBUG << " Processing primitive " << i << std::endl;
+            const tinygltf::Primitive &primitive = mesh.primitives[i];
+            if (primitive.indices < 0)
+            {
+                return 0;
+            }
+
+            osg::ref_ptr< osg::Geometry > geom = new osg::Geometry;
+            geom->setUseDisplayList(false);
+            geom->setUseVertexBufferObjects(true);
+
+            group->addChild(geom.get());
+
+            // The base color factor of the material
+            osg::Vec4 baseColorFactor(1.0f, 1.0f, 1.0f, 1.0f);
+
+            if (primitive.material >= 0)
+            {
+                const tinygltf::Material& material = model.materials[primitive.material];
+
+                /*
+                OSG_NOTICE << "extCommonValues=" << material.extCommonValues.size() << std::endl;
+                for (ParameterMap::iterator paramItr = material.extCommonValues.begin(); paramItr != material.extCommonValues.end(); ++paramItr)
+                {
+                    OSG_NOTICE << paramItr->first << "=" << paramItr->second.string_value << std::endl;
+                }
+                */
+
+                OE_DEBUG << "additionalValues=" << material.additionalValues.size() << std::endl;
+                for (tinygltf::ParameterMap::const_iterator paramItr = material.additionalValues.begin(); paramItr != material.additionalValues.end(); ++paramItr)
+                {
+                    OSG_NOTICE << "    " << paramItr->first << "=" << paramItr->second.string_value << std::endl;
+                }
+
+                //OSG_NOTICE << "values=" << material.values.size() << std::endl;
+                for (tinygltf::ParameterMap::const_iterator paramItr = material.values.begin(); paramItr != material.values.end(); ++paramItr)
+                {
+                    if (paramItr->first == "baseColorFactor")
+                    {
+                        tinygltf::ColorValue color = paramItr->second.ColorFactor();
+                        baseColorFactor = osg::Vec4(color[0], color[1], color[2], color[3]);
+                    }
+                    else
+                    {
+                        OE_DEBUG << "    " << paramItr->first << "=" << paramItr->second.string_value << std::endl;
+                    }
+
+                }
+                /*
+                OSG_NOTICE << "extPBRValues=" << material.extPBRValues.size() << std::endl;
+                for (ParameterMap::iterator paramItr = material.extPBRValues.begin(); paramItr != material.extPBRValues.end(); ++paramItr)
+                {
+                    OSG_NOTICE << paramItr->first << "=" << paramItr->second.string_value << std::endl;
+                }
+                */
+
+                for (tinygltf::ParameterMap::const_iterator paramItr = material.values.begin(); paramItr != material.values.end(); ++paramItr)
+                {
+                    if (paramItr->first == "baseColorTexture")
+                    {
+                        std::map< std::string, double>::const_iterator i = paramItr->second.json_double_value.find("index");
+                        if (i != paramItr->second.json_double_value.end())
+                        {
+                            int index = i->second;
+
+                            const tinygltf::Texture& texture = model.textures[index];
+
+                            osg::Texture2D* tex = new osg::Texture2D;
+                            if (texture.sampler >= 0 && texture.sampler < model.samplers.size())
+                            {
+                                const tinygltf::Sampler& sampler = model.samplers[texture.sampler];
+                                tex->setFilter(osg::Texture::MIN_FILTER, (osg::Texture::FilterMode)sampler.minFilter);
+                                tex->setFilter(osg::Texture::MAG_FILTER, (osg::Texture::FilterMode)sampler.magFilter);
+                                tex->setWrap(osg::Texture::WRAP_S, (osg::Texture::WrapMode)sampler.wrapS);
+                                tex->setWrap(osg::Texture::WRAP_T, (osg::Texture::WrapMode)sampler.wrapT);
+                                tex->setWrap(osg::Texture::WRAP_R, (osg::Texture::WrapMode)sampler.wrapR);
+                            }
+
+                            const tinygltf::Image& image = model.images[texture.source];
+                            osg::ref_ptr< osg::Image> img = new osg::Image;
+
+                            GLenum format = GL_RGB;
+                            if (image.component == 4) format = GL_RGBA;
+
+                            if (image.image.size() > 0)
+                            {
+                                unsigned char *imgData = new unsigned char[image.image.size()];
+                                memcpy(imgData, &image.image.at(0), image.image.size());
+                                img->setImage(image.width, image.height, 1, format, format, GL_UNSIGNED_BYTE, imgData, osg::Image::AllocationMode::USE_NEW_DELETE);
+                            }
+
+                            tex->setImage(img);
+                            geom->getOrCreateStateSet()->setTextureAttributeAndModes(0, tex, osg::StateAttribute::ON);
+                        }
+                    }
+                }
+            }
+
+            // Always make a color array with the base color
+            osg::Vec4Array* colors = new osg::Vec4Array();
+            geom->setColorArray(colors, osg::Array::BIND_OVERALL);
+            colors->push_back(baseColorFactor);
+
+            std::map<std::string, int>::const_iterator it(primitive.attributes.begin());
+            std::map<std::string, int>::const_iterator itEnd(
+                primitive.attributes.end());
+
+            for (; it != itEnd; it++)
+            {
+                const tinygltf::Accessor &accessor = model.accessors[it->second];
+
+                if (it->first.compare("POSITION") == 0)
+                {
+                    geom->setVertexArray(arrays[it->second]);
+
+                    // convert Y-UP to Z-UP
+                    osg::Vec3Array* verts = dynamic_cast<osg::Vec3Array*>(geom->getVertexArray());
+                    for(unsigned i=0; i<verts->size(); ++i)
+                        (*verts)[i] = (*verts)[i] * YUP2ZUP;
+                }
+
+                else if (it->first.compare("NORMAL") == 0)
+                {
+                    geom->setNormalArray(arrays[it->second]);
+
+                    // convert Y-UP to Z-UP
+                    osg::Vec3Array* normals = dynamic_cast<osg::Vec3Array*>(geom->getNormalArray());
+                    for (unsigned i = 0; i < normals->size(); ++i)
+                        (*normals)[i] = osg::Matrixd::transform3x3((*normals)[i], YUP2ZUP);
+                }
+                else if (it->first.compare("TEXCOORD_0") == 0)
+                {
+                    geom->setTexCoordArray(0, arrays[it->second]);
+                }
+                else if (it->first.compare("TEXCOORD_1") == 0)
+                {
+                    geom->setTexCoordArray(1, arrays[it->second]);
+                }
+                else if (it->first.compare("COLOR_0") == 0)
+                {
+                    OE_DEBUG << "Setting color array " << arrays[it->second].get() << std::endl;
+                    geom->setColorArray(arrays[it->second]);
+                }
+                else
+                {
+                    OE_DEBUG << "Skipping array " << it->first << std::endl;
+                }
+            }
+
+            const tinygltf::Accessor &indexAccessor =
+                model.accessors[primitive.indices];
+
+            int mode = -1;
+            if (primitive.mode == TINYGLTF_MODE_TRIANGLES) {
+                mode = GL_TRIANGLES;
+            }
+            else if (primitive.mode == TINYGLTF_MODE_TRIANGLE_STRIP) {
+                mode = GL_TRIANGLE_STRIP;
+            }
+            else if (primitive.mode == TINYGLTF_MODE_TRIANGLE_FAN) {
+                mode = GL_TRIANGLE_FAN;
+            }
+            else if (primitive.mode == TINYGLTF_MODE_POINTS) {
+                mode = GL_POINTS;
+            }
+            else if (primitive.mode == TINYGLTF_MODE_LINE) {
+                mode = GL_LINES;
+            }
+            else if (primitive.mode == TINYGLTF_MODE_LINE_LOOP) {
+                mode = GL_LINE_LOOP;
+            }
+
+            {
+                const tinygltf::BufferView& bufferView = model.bufferViews[indexAccessor.bufferView];
+                const tinygltf::Buffer& buffer = model.buffers[bufferView.buffer];
+
+                if (indexAccessor.componentType == GL_UNSIGNED_SHORT)
+                {
+                    osg::DrawElementsUShort* drawElements = new osg::DrawElementsUShort(mode);
+                    unsigned short* indices = (unsigned short*)(&buffer.data.at(0) + bufferView.byteOffset + indexAccessor.byteOffset);
+                    for (unsigned int j = 0; j < indexAccessor.count; j++)
+                    {
+                        unsigned short index = indices[j];
+                        drawElements->push_back(index);
+                    }
+                    geom->addPrimitiveSet(drawElements);
+                }
+                else if (indexAccessor.componentType == GL_UNSIGNED_INT)
+                {
+                    osg::DrawElementsUInt* drawElements = new osg::DrawElementsUInt(mode);
+                    unsigned int* indices = (unsigned int*)(&buffer.data.at(0) + bufferView.byteOffset + indexAccessor.byteOffset);
+                    for (unsigned int j = 0; j < indexAccessor.count; j++)
+                    {
+                        unsigned int index = indices[j];
+                        drawElements->push_back(index);
+                    }
+                    geom->addPrimitiveSet(drawElements);
+                }
+                else if (indexAccessor.componentType == GL_UNSIGNED_BYTE)
+                {
+                    osg::DrawElementsUByte* drawElements = new osg::DrawElementsUByte(mode);
+                    unsigned char* indices = (unsigned char*)(&buffer.data.at(0) + bufferView.byteOffset + indexAccessor.byteOffset);
+                    for (unsigned int j = 0; j < indexAccessor.count; j++)
+                    {
+                        unsigned char index = indices[j];
+                        drawElements->push_back(index);
+                    }
+                    geom->addPrimitiveSet(drawElements);
+                }
+            }
+        }
+
+        return group;
+    } // Turn all of the accessors and turn them into arrays
+    void extractArrays(const tinygltf::Model &model, std::vector<osg::ref_ptr<osg::Array>> &arrays) const
+    {
+        for (unsigned int i = 0; i < model.accessors.size(); i++)
+        {
+            const tinygltf::Accessor& accessor = model.accessors[i];
+            const tinygltf::BufferView& bufferView = model.bufferViews[accessor.bufferView];
+            const tinygltf::Buffer& buffer = model.buffers[bufferView.buffer];
+
+
+            osg::ref_ptr< osg::Array > osgArray;
+
+            if (accessor.componentType == TINYGLTF_COMPONENT_TYPE_FLOAT)
+            {
+                if (accessor.type == TINYGLTF_TYPE_SCALAR)
+                {
+                    osg::FloatArray* floatArray = new osg::FloatArray;
+                    const tinygltf::BufferView& bufferView = model.bufferViews[accessor.bufferView];
+                    const tinygltf::Buffer& buffer = model.buffers[bufferView.buffer];
+
+                    float* array = (float*)(&buffer.data.at(0) + accessor.byteOffset + bufferView.byteOffset);
+                    unsigned int pos = 0;
+                    for (unsigned int j = 0; j < accessor.count; j++)
+                    {
+                        float s = array[pos];
+                        if (bufferView.byteStride > 0)
+                        {
+                            pos += (bufferView.byteStride / 4);
+                        }
+                        else
+                        {
+                            pos += 1;
+                        }
+                        floatArray->push_back(s);
+                    }
+                    osgArray = floatArray;
+                }
+                else if (accessor.type == TINYGLTF_TYPE_VEC2)
+                {
+                    osg::Vec2Array* vec2Array = new osg::Vec2Array;
+                    const tinygltf::BufferView& bufferView = model.bufferViews[accessor.bufferView];
+                    const tinygltf::Buffer& buffer = model.buffers[bufferView.buffer];
+
+                    float* array = (float*)(&buffer.data.at(0) + accessor.byteOffset + bufferView.byteOffset);
+                    unsigned int pos = 0;
+                    for (unsigned int j = 0; j < accessor.count; j++)
+                    {
+                        float s = array[pos];
+                        float t = array[pos + 1];
+                        if (bufferView.byteStride > 0)
+                        {
+                            pos += (bufferView.byteStride / 4);
+                        }
+                        else
+                        {
+                            pos += 2;
+                        }
+                        vec2Array->push_back(osg::Vec2(s, t));
+                    }
+                    osgArray = vec2Array;
+                }
+                else if (accessor.type == TINYGLTF_TYPE_VEC3)
+                {
+                    osg::Vec3Array* vec3Array = new osg::Vec3Array;
+                    float* array = (float*)(&buffer.data.at(0) + accessor.byteOffset + bufferView.byteOffset);
+                    unsigned int pos = 0;
+                    for (unsigned int j = 0; j < accessor.count; j++)
+                    {
+                        float x = array[pos];
+                        float y = array[pos + 1];
+                        float z = array[pos + 2];
+                        if (bufferView.byteStride > 0)
+                        {
+                            pos += (bufferView.byteStride / 4);
+                        }
+                        else
+                        {
+                            pos += 3;
+                        }
+                        vec3Array->push_back(osg::Vec3(x, y, z));
+                        osgArray = vec3Array;
+                    }
+                }
+                else if (accessor.type == TINYGLTF_TYPE_VEC4)
+                {
+                    osg::Vec4Array* vec4Array = new osg::Vec4Array;
+                    float* array = (float*)(&buffer.data.at(0) + accessor.byteOffset + bufferView.byteOffset);
+                    unsigned int pos = 0;
+                    for (unsigned int j = 0; j < accessor.count; j++)
+                    {
+                        float r = array[pos];
+                        float g = array[pos + 1];
+                        float b = array[pos + 2];
+                        float a = array[pos + 3];
+                        if (bufferView.byteStride > 0)
+                        {
+                            pos += (bufferView.byteStride / 4);
+                        }
+                        else
+                        {
+                            pos += 4;
+                        }
+                        vec4Array->push_back(osg::Vec4(r, g, b, a));
+                        osgArray = vec4Array;
+                    }
+                }
+            }
+
+            if (osgArray.valid())
+            {
+                osgArray->setBinding(osg::Array::BIND_PER_VERTEX);
+            }
+            else
+            {
+                OSG_DEBUG << "Adding null array for " << i << std::endl;
+            }
+            arrays.push_back(osgArray);
+        }
+    }
+
+};
+
+#endif // OSGEARTH_GLTF_READER_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/GLTFWriter.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/GLTFWriter.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/GLTFWriter.h	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/GLTFWriter.h	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,366 @@
+/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#ifndef OSGEARTH_GLTF_WRITER_H
+#define OSGEARTH_GLTF_WRITER_H
+
+#include <osg/Node>
+#include <osg/Geometry>
+#include <osg/MatrixTransform>
+#include <osgDB/FileNameUtils>
+#include <osgDB/ReaderWriter>
+#include <osgEarth/Notify>
+#include <osgEarth/StringUtils>
+#include <stack>
+
+using namespace osgEarth;
+
+#undef LC
+#define LC "[GLTFWriter] "
+
+//! Visitor that builds a GLTF data model from an OSG scene graph.
+class OSGtoGLTF : public osg::NodeVisitor
+{
+private:
+    typedef std::map<const osg::Node*, int> OsgNodeSequenceMap;
+    typedef std::map<const osg::BufferData*, int> ArraySequenceMap;
+    typedef std::map<const osg::Array*, int> AccessorSequenceMap;
+
+    tinygltf::Model& _model;
+    std::stack<tinygltf::Node*> _gltfNodeStack;
+    OsgNodeSequenceMap _osgNodeSeqMap;
+    ArraySequenceMap _buffers;
+    ArraySequenceMap _bufferViews;
+    ArraySequenceMap _accessors;
+
+public:
+    OSGtoGLTF(tinygltf::Model& model) : _model(model)
+    {
+        setTraversalMode(TRAVERSE_ALL_CHILDREN);
+        setNodeMaskOverride(~0);
+
+        // default root scene:
+        _model.scenes.push_back(tinygltf::Scene());
+        tinygltf::Scene& scene = _model.scenes.back();
+        _model.defaultScene = 0;
+    }
+
+    void push(tinygltf::Node& gnode)
+    {
+        _gltfNodeStack.push(&gnode);
+    }
+
+    void pop()
+    {
+        _gltfNodeStack.pop();
+    }
+
+    void apply(osg::Node& node)
+    {
+        bool isRoot = _model.scenes[_model.defaultScene].nodes.empty();
+        if (isRoot)
+        {
+            // put a placeholder here just to prevent any other nodes
+            // from thinking they are the root
+            _model.scenes[_model.defaultScene].nodes.push_back(-1);
+        }
+
+        traverse(node);
+
+        _model.nodes.push_back(tinygltf::Node());
+        tinygltf::Node& gnode = _model.nodes.back();
+        int id = _model.nodes.size() - 1;
+        gnode.name = Stringify() << "_gltfNode_" << id;
+        _osgNodeSeqMap[&node] = id;
+
+        if (isRoot)
+        {
+            // replace the placeholder with the actual root id.
+            _model.scenes[_model.defaultScene].nodes.back() = id;
+        }
+    }
+
+    void apply(osg::Group& group)
+    {
+        apply(static_cast<osg::Node&>(group));
+
+        for (unsigned i = 0; i < group.getNumChildren(); ++i)
+        {
+            int id = _osgNodeSeqMap[group.getChild(i)];
+            _model.nodes.back().children.push_back(id);
+        }
+    }
+
+    void apply(osg::Transform& xform)
+    {
+        apply(static_cast<osg::Group&>(xform));
+
+        osg::Matrix matrix;
+        xform.computeLocalToWorldMatrix(matrix, this);
+        const double* ptr = matrix.ptr();
+        for (unsigned i = 0; i < 16; ++i)
+            _model.nodes.back().matrix.push_back(*ptr++);
+    }
+
+    unsigned getBytesInDataType(GLenum dataType)
+    {
+        return
+            dataType == GL_BYTE || dataType == GL_UNSIGNED_BYTE ? 1 :
+            dataType == GL_SHORT || dataType == GL_UNSIGNED_SHORT ? 2 :
+            dataType == GL_INT || dataType == GL_UNSIGNED_INT || dataType == GL_FLOAT ? 4 :
+            0;
+    }
+
+    unsigned getBytesPerElement(const osg::Array* data)
+    {
+        return data->getDataSize() * getBytesInDataType(data->getDataType());
+    }
+
+    unsigned getBytesPerElement(const osg::DrawElements* data)
+    {
+        return
+            dynamic_cast<const osg::DrawElementsUByte*>(data) ? 1 :
+            dynamic_cast<const osg::DrawElementsUShort*>(data) ? 2 :
+            4;
+    }
+
+    int getOrCreateBuffer(const osg::BufferData* data, GLenum type)
+    {
+        ArraySequenceMap::iterator a = _buffers.find(data);
+        if (a != _buffers.end())
+            return a->second;
+
+        _model.buffers.push_back(tinygltf::Buffer());
+        tinygltf::Buffer& buffer = _model.buffers.back();
+        int id = _model.buffers.size() - 1;
+        _buffers[data] = id;
+
+        int bytes = getBytesInDataType(type);
+        buffer.data.resize(data->getTotalDataSize());
+
+        //TODO: account for endianess
+        unsigned char* ptr = (unsigned char*)(data->getDataPointer());
+        for (unsigned i = 0; i < data->getTotalDataSize(); ++i)
+            buffer.data[i] = *ptr++;
+
+        return id;
+    }
+
+    int getOrCreateBufferView(const osg::BufferData* data, GLenum type, GLenum target)
+    {
+        ArraySequenceMap::iterator a = _bufferViews.find(data);
+        if (a != _bufferViews.end())
+            return a->second;
+
+        int bufferId = -1;
+        ArraySequenceMap::iterator buffersIter = _buffers.find(data);
+        if (buffersIter != _buffers.end())
+            bufferId = buffersIter->second;
+        else
+            bufferId = getOrCreateBuffer(data, type);
+
+        _model.bufferViews.push_back(tinygltf::BufferView());
+        tinygltf::BufferView& bv = _model.bufferViews.back();
+        int id = _model.bufferViews.size() - 1;
+        _bufferViews[data] = id;
+
+        bv.buffer = bufferId;
+        bv.byteLength = data->getTotalDataSize();
+        bv.byteOffset = 0;
+        bv.target = target;
+
+        //ONLY used for vertex attrbs, I guess:
+        //unsigned bytesPerComponent = getBytesPerComponent(data->getDataType());
+        //unsigned componentsPerElement = data->getDataSize();
+        //bv.byteStride = bytesPerComponent * componentsPerElement;
+
+        return id;
+    }
+
+    int getOrCreateAccessor(osg::Array* data, osg::PrimitiveSet* pset, tinygltf::Primitive& prim, const std::string& attr)
+    {
+        ArraySequenceMap::iterator a = _accessors.find(data);
+        if (a != _accessors.end())
+            return a->second;
+
+        ArraySequenceMap::iterator bv = _bufferViews.find(data);
+        if (bv == _bufferViews.end())
+            return -1;
+
+        _model.accessors.push_back(tinygltf::Accessor());
+        tinygltf::Accessor& accessor = _model.accessors.back();
+        int accessorId = _model.accessors.size() - 1;
+        prim.attributes[attr] = accessorId;
+
+        accessor.type =
+            data->getDataSize() == 1 ? TINYGLTF_TYPE_SCALAR :
+            data->getDataSize() == 2 ? TINYGLTF_TYPE_VEC2 :
+            data->getDataSize() == 3 ? TINYGLTF_TYPE_VEC3 :
+            data->getDataSize() == 4 ? TINYGLTF_TYPE_VEC4 :
+            TINYGLTF_TYPE_SCALAR;
+
+        accessor.bufferView = bv->second;
+        accessor.byteOffset = 0;
+        accessor.componentType = data->getDataType();
+        accessor.count = data->getNumElements();
+
+        const osg::DrawArrays* da = dynamic_cast<const osg::DrawArrays*>(pset);
+        if (da)
+        {
+            accessor.byteOffset = da->getFirst() * getBytesPerElement(data);
+        }
+
+        //TODO: indexed elements
+        osg::DrawElements* de = dynamic_cast<osg::DrawElements*>(pset);
+        if (de)
+        {
+            _model.accessors.push_back(tinygltf::Accessor());
+            tinygltf::Accessor& idxAccessor = _model.accessors.back();
+            prim.indices = _model.accessors.size() - 1;
+
+            idxAccessor.type = TINYGLTF_TYPE_SCALAR;
+            idxAccessor.byteOffset = 0;
+            idxAccessor.componentType = de->getDataType();
+            idxAccessor.count = de->getNumIndices();
+
+            getOrCreateBuffer(de, idxAccessor.componentType);
+            int idxBV = getOrCreateBufferView(de, idxAccessor.componentType, GL_ELEMENT_ARRAY_BUFFER_ARB);
+
+            idxAccessor.bufferView = idxBV;
+        }
+
+        return accessorId;
+    }
+
+    void apply(osg::Drawable& drawable)
+    {
+        if (drawable.asGeometry())
+        {
+            apply(static_cast<osg::Node&>(drawable));
+
+            osg::Geometry* geom = drawable.asGeometry();
+
+            _model.meshes.push_back(tinygltf::Mesh());
+            tinygltf::Mesh& mesh = _model.meshes.back();
+            _model.nodes.back().mesh = _model.meshes.size() - 1;
+
+            osg::Vec3f posMin(FLT_MAX, FLT_MAX, FLT_MAX);
+            osg::Vec3f posMax(-FLT_MAX, -FLT_MAX, -FLT_MAX);
+            osg::Vec3Array* positions = dynamic_cast<osg::Vec3Array*>(geom->getVertexArray());
+            if (positions)
+            {
+                getOrCreateBufferView(positions, GL_FLOAT, GL_ARRAY_BUFFER_ARB);
+                for (unsigned i = 0; i < positions->size(); ++i)
+                {
+                    const osg::Vec3f& v = (*positions)[i];
+                    posMin.x() = osg::minimum(posMin.x(), v.x());
+                    posMin.y() = osg::minimum(posMin.y(), v.y());
+                    posMin.z() = osg::minimum(posMin.z(), v.z());
+                    posMax.x() = osg::maximum(posMax.x(), v.x());
+                    posMax.y() = osg::maximum(posMax.y(), v.y());
+                    posMax.z() = osg::maximum(posMax.z(), v.z());
+                }
+            }
+
+            osg::Vec3Array* normals = dynamic_cast<osg::Vec3Array*>(geom->getNormalArray());
+            if (normals)
+            {
+                getOrCreateBufferView(normals, GL_FLOAT, GL_ARRAY_BUFFER_ARB);
+            }
+
+            osg::Vec4Array* colors = dynamic_cast<osg::Vec4Array*>(geom->getColorArray());
+            if (colors)
+            {
+                getOrCreateBufferView(colors, GL_FLOAT, GL_ARRAY_BUFFER_ARB);
+            }
+
+            for (unsigned i = 0; i < geom->getNumPrimitiveSets(); ++i)
+            {
+                osg::PrimitiveSet* pset = geom->getPrimitiveSet(i);
+
+                mesh.primitives.push_back(tinygltf::Primitive());
+                tinygltf::Primitive& primitive = mesh.primitives.back();
+
+                primitive.mode = pset->getMode();
+
+                int a = getOrCreateAccessor(positions, pset, primitive, "POSITION");
+
+                // record min/max for position array (required):
+                tinygltf::Accessor& posacc = _model.accessors[a];
+                posacc.minValues.push_back(posMin.x());
+                posacc.minValues.push_back(posMin.y());
+                posacc.minValues.push_back(posMin.z());
+                posacc.maxValues.push_back(posMax.x());
+                posacc.maxValues.push_back(posMax.y());
+                posacc.maxValues.push_back(posMax.z());
+
+                getOrCreateAccessor(normals, pset, primitive, "NORMAL");
+
+                getOrCreateAccessor(colors, pset, primitive, "COLOR_0");
+            }
+        }
+    }
+};
+
+class GLTFWriter
+{
+public:
+    osgDB::ReaderWriter::WriteResult write(const osg::Node& node,
+                                           const std::string& location,
+                                           bool isBinary,
+                                           const osgDB::Options* options) const
+    {
+        tinygltf::Model model;
+        convertOSGtoGLTF(node, model);
+
+        tinygltf::TinyGLTF writer;
+
+        writer.WriteGltfSceneToFile(
+            &model,
+            location,
+            true,           // embedImages
+            true,           // embedBuffers
+            true,           // prettyPrint
+            isBinary);      // writeBinary
+
+        return osgDB::ReaderWriter::WriteResult::FILE_SAVED;
+    }
+
+    void convertOSGtoGLTF(const osg::Node& node, tinygltf::Model& model) const
+    {
+        model.asset.version = "2.0";
+
+        osg::Node& nc_node = const_cast<osg::Node&>(node); // won't change it, promise :)
+        nc_node.ref();
+
+        // GLTF uses a +X=right +y=up -z=forward coordinate system
+        osg::ref_ptr<osg::MatrixTransform> transform = new osg::MatrixTransform;
+        transform->setMatrix(osg::Matrixd::rotate(osg::Vec3d(0.0, 0.0, 1.0), osg::Vec3d(0.0, 1.0, 0.0)));
+        transform->addChild(&nc_node);
+
+        OSGtoGLTF converter(model);
+        transform->accept(converter);
+
+        transform->removeChild(&nc_node);
+        nc_node.unref_nodelete();
+    }
+};
+
+#endif // OSGEARTH_GLTF_WRITER_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/json.hpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/json.hpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/json.hpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/json.hpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,14722 @@
+/*
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++
+|  |  |__   |  |  | | | |  version 2.1.1
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#ifndef NLOHMANN_JSON_HPP
+#define NLOHMANN_JSON_HPP
+
+#include <algorithm> // all_of, copy, fill, find, for_each, generate_n, none_of, remove, reverse, transform
+#include <array> // array
+#include <cassert> // assert
+#include <ciso646> // and, not, or
+#include <clocale> // lconv, localeconv
+#include <cmath> // isfinite, labs, ldexp, signbit
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <cstdint> // int64_t, uint64_t
+#include <cstdlib> // abort, strtod, strtof, strtold, strtoul, strtoll, strtoull
+#include <cstring> // memcpy, strlen
+#include <forward_list> // forward_list
+#include <functional> // function, hash, less
+#include <initializer_list> // initializer_list
+#include <iomanip> // hex
+#include <iosfwd>   // istream, ostream
+#include <iterator> // advance, begin, back_inserter, bidirectional_iterator_tag, distance, end, inserter, iterator, iterator_traits, next, random_access_iterator_tag, reverse_iterator
+#include <limits> // numeric_limits
+#include <locale> // locale
+#include <map> // map
+#include <memory> // addressof, allocator, allocator_traits, unique_ptr
+#include <numeric> // accumulate
+#include <sstream> // stringstream
+#include <string> // getline, stoi, string, to_string
+#include <type_traits> // add_pointer, conditional, decay, enable_if, false_type, integral_constant, is_arithmetic, is_base_of, is_const, is_constructible, is_convertible, is_default_constructible, is_enum, is_floating_point, is_integral, is_nothrow_move_assignable, is_nothrow_move_constructible, is_pointer, is_reference, is_same, is_scalar, is_signed, remove_const, remove_cv, remove_pointer, remove_reference, true_type, underlying_type
+#include <utility> // declval, forward, make_pair, move, pair, swap
+#include <valarray> // valarray
+#include <vector> // vector
+
+// exclude unsupported compilers
+#if defined(__clang__)
+    #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+        #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+    #endif
+#elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+    #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40900
+        #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+    #endif
+#endif
+
+// disable float-equal warnings on GCC/clang
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdocumentation"
+#endif
+
+// allow for portable deprecation warnings
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #define JSON_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+    #define JSON_DEPRECATED __declspec(deprecated)
+#else
+    #define JSON_DEPRECATED
+#endif
+
+// allow to disable exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && not defined(JSON_NOEXCEPTION)
+    #define JSON_THROW(exception) throw exception
+    #define JSON_TRY try
+    #define JSON_CATCH(exception) catch(exception)
+#else
+    #define JSON_THROW(exception) std::abort()
+    #define JSON_TRY if(true)
+    #define JSON_CATCH(exception) if(false)
+#endif
+
+// manual branch prediction
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #define JSON_LIKELY(x)      __builtin_expect(!!(x), 1)
+    #define JSON_UNLIKELY(x)    __builtin_expect(!!(x), 0)
+#else
+    #define JSON_LIKELY(x)      x
+    #define JSON_UNLIKELY(x)    x
+#endif
+
+// cpp language standard detection
+#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+    #define JSON_HAS_CPP_17
+    #define JSON_HAS_CPP_14
+#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+    #define JSON_HAS_CPP_14
+#endif
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+template<typename = void, typename = void>
+struct adl_serializer;
+
+// forward declaration of basic_json (required to split the class)
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer>
+class basic_json;
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json
+// This is only temporary and will be removed in 3.0
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer>
+
+
+/*!
+@brief unnamed namespace with internal helper functions
+
+This namespace collects some functions that could not be defined inside the
+@ref basic_json class.
+
+@since version 2.1.0
+*/
+namespace detail
+{
+////////////////
+// exceptions //
+////////////////
+
+/*!
+@brief general exception of the @ref basic_json class
+
+This class is an extension of `std::exception` objects with a member @a id for
+exception ids. It is used as the base class for all exceptions thrown by the
+@ref basic_json class. This class can hence be used as "wildcard" to catch
+exceptions.
+
+Subclasses:
+- @ref parse_error for exceptions indicating a parse error
+- @ref invalid_iterator for exceptions indicating errors with iterators
+- @ref type_error for exceptions indicating executing a member function with
+                  a wrong type
+- @ref out_of_range for exceptions indicating access out of the defined range
+- @ref other_error for exceptions indicating other library errors
+
+@internal
+@note To have nothrow-copy-constructible exceptions, we internally use
+      `std::runtime_error` which can cope with arbitrary-length error messages.
+      Intermediate strings are built with static functions and then passed to
+      the actual constructor.
+@endinternal
+
+@liveexample{The following code shows how arbitrary library exceptions can be
+caught.,exception}
+
+@since version 3.0.0
+*/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id;
+
+  protected:
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+};
+
+/*!
+@brief exception indicating a parse error
+
+This excpetion is thrown by the library when a parse error occurs. Parse errors
+can occur during the deserialization of JSON text, CBOR, MessagePack, as well
+as when using JSON Patch.
+
+Member @a byte holds the byte index of the last read character in the input
+file.
+
+Exceptions have ids 1xx.
+
+name / id                      | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
+json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
+json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
+json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
+json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
+json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number wihtout a leading `0`.
+json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character.
+json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
+json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number.
+json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
+json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xf8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
+json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
+
+@note For an input with n bytes, 1 is the index of the first character and n+1
+      is the index of the terminating null byte or the end of file. This also
+      holds true when reading a byte vector (CBOR or MessagePack).
+
+@liveexample{The following code shows how a `parse_error` exception can be
+caught.,parse_error}
+
+@sa @ref exception for the base class of the library exceptions
+@sa @ref invalid_iterator for exceptions indicating errors with iterators
+@sa @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa @ref out_of_range for exceptions indicating access out of the defined range
+@sa @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] byte_     the byte index where the error occurred (or 0 if the
+                         position cannot be determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        (byte_ != 0 ? (" at " + std::to_string(byte_)) : "") +
+                        ": " + what_arg;
+        return parse_error(id_, byte_, w.c_str());
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+};
+
+/*!
+@brief exception indicating errors with iterators
+
+This exception is thrown if iterators passed to a library function do not match
+the expected semantics.
+
+Exceptions have ids 2xx.
+
+name / id                           | example message | description
+----------------------------------- | --------------- | -------------------------
+json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
+json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from.
+json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid.
+json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid.
+json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range.
+json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key.
+json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to.
+json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container.
+json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered.
+json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin().
+
+@liveexample{The following code shows how an `invalid_iterator` exception can be
+caught.,invalid_iterator}
+
+@sa @ref exception for the base class of the library exceptions
+@sa @ref parse_error for exceptions indicating a parse error
+@sa @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa @ref out_of_range for exceptions indicating access out of the defined range
+@sa @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class invalid_iterator : public exception
+{
+  public:
+    static invalid_iterator create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("invalid_iterator", id_) + what_arg;
+        return invalid_iterator(id_, w.c_str());
+    }
+
+  private:
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating executing a member function with a wrong type
+
+This exception is thrown in case of a type error; that is, a library function is
+executed on a JSON value whose type does not match the expected semantics.
+
+Exceptions have ids 3xx.
+
+name / id                     | example message | description
+----------------------------- | --------------- | -------------------------
+json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead.
+json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
+json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t&.
+json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types.
+json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types.
+json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types.
+json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types.
+json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types.
+json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types.
+json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types.
+json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types.
+json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types.
+json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
+json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers.
+json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive.
+
+@liveexample{The following code shows how a `type_error` exception can be
+caught.,type_error}
+
+@sa @ref exception for the base class of the library exceptions
+@sa @ref parse_error for exceptions indicating a parse error
+@sa @ref invalid_iterator for exceptions indicating errors with iterators
+@sa @ref out_of_range for exceptions indicating access out of the defined range
+@sa @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class type_error : public exception
+{
+  public:
+    static type_error create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("type_error", id_) + what_arg;
+        return type_error(id_, w.c_str());
+    }
+
+  private:
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating access out of the defined range
+
+This exception is thrown in case a library function is called on an input
+parameter that exceeds the expected range, for instance in case of array
+indices or nonexisting object keys.
+
+Exceptions have ids 4xx.
+
+name / id                       | example message | description
+------------------------------- | --------------- | -------------------------
+json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1.
+json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
+json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
+json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
+json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
+json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
+
+@liveexample{The following code shows how an `out_of_range` exception can be
+caught.,out_of_range}
+
+@sa @ref exception for the base class of the library exceptions
+@sa @ref parse_error for exceptions indicating a parse error
+@sa @ref invalid_iterator for exceptions indicating errors with iterators
+@sa @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class out_of_range : public exception
+{
+  public:
+    static out_of_range create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("out_of_range", id_) + what_arg;
+        return out_of_range(id_, w.c_str());
+    }
+
+  private:
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating other library errors
+
+This exception is thrown in case of errors that cannot be classified with the
+other exception types.
+
+Exceptions have ids 5xx.
+
+name / id                      | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed.
+json.exception.other_error.502 | invalid object size for conversion | Some conversions to user-defined types impose constraints on the object size (e.g. std::pair)
+
+@sa @ref exception for the base class of the library exceptions
+@sa @ref parse_error for exceptions indicating a parse error
+@sa @ref invalid_iterator for exceptions indicating errors with iterators
+@sa @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa @ref out_of_range for exceptions indicating access out of the defined range
+
+@liveexample{The following code shows how an `other_error` exception can be
+caught.,other_error}
+
+@since version 3.0.0
+*/
+class other_error : public exception
+{
+  public:
+    static other_error create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("other_error", id_) + what_arg;
+        return other_error(id_, w.c_str());
+    }
+
+  private:
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+
+
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
+/*!
+@brief the JSON type enumeration
+
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : uint8_t
+{
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    discarded         ///< discarded by the the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string
+- furthermore, each type is not smaller than itself
+
+@since version 1.0.0
+*/
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    static constexpr std::array<uint8_t, 8> order = {{
+            0, // null
+            3, // object
+            4, // array
+            5, // string
+            1, // boolean
+            2, // integer
+            2, // unsigned
+            2, // float
+        }
+    };
+
+    // discarded values are not comparable
+    return lhs != value_t::discarded and rhs != value_t::discarded and
+           order[static_cast<std::size_t>(lhs)] < order[static_cast<std::size_t>(rhs)];
+}
+
+
+/////////////
+// helpers //
+/////////////
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+// implementation of C++14 index_sequence and affiliates
+// source: https://stackoverflow.com/a/32223343
+template<std::size_t... Ints>
+struct index_sequence
+{
+    using type = index_sequence;
+    using value_type = std::size_t;
+    static constexpr std::size_t size() noexcept
+    {
+        return sizeof...(Ints);
+    }
+};
+
+template<class Sequence1, class Sequence2>
+struct merge_and_renumber;
+
+template<std::size_t... I1, std::size_t... I2>
+struct merge_and_renumber<index_sequence<I1...>, index_sequence<I2...>>
+        : index_sequence < I1..., (sizeof...(I1) + I2)... >
+          {};
+
+template<std::size_t N>
+struct make_index_sequence
+    : merge_and_renumber < typename make_index_sequence < N / 2 >::type,
+      typename make_index_sequence < N - N / 2 >::type >
+{};
+
+template<> struct make_index_sequence<0> : index_sequence<> { };
+template<> struct make_index_sequence<1> : index_sequence<0> { };
+
+template<typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+/*
+Implementation of two C++17 constructs: conjunction, negation. This is needed
+to avoid evaluating all the traits in a condition
+
+For example: not std::is_same<void, T>::value and has_value_type<T>::value
+will not compile when T = void (on MSVC at least). Whereas
+conjunction<negation<std::is_same<void, T>>, has_value_type<T>>::value will
+stop evaluating if negation<...>::value == false
+
+Please note that those constructs must be used with caution, since symbols can
+become very long quickly (which can slow down compilation and cause MSVC
+internal compiler errors). Only use it when you have to (see example ahead).
+*/
+template<class...> struct conjunction : std::true_type {};
+template<class B1> struct conjunction<B1> : B1 {};
+template<class B1, class... Bn>
+struct conjunction<B1, Bn...> : std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
+
+template<class B> struct negation : std::integral_constant < bool, !B::value > {};
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+
+//////////////////
+// constructors //
+//////////////////
+
+template<value_t> struct external_constructor;
+
+template<>
+struct external_constructor<value_t::boolean>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
+    {
+        j.m_type = value_t::boolean;
+        j.m_value = b;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::string>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
+    {
+        j.m_type = value_t::string;
+        j.m_value = s;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+    {
+        j.m_type = value_t::string;
+        j.m_value = std::move(s);
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_float>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
+    {
+        j.m_type = value_t::number_float;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_unsigned>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
+    {
+        j.m_type = value_t::number_unsigned;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_integer>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
+    {
+        j.m_type = value_t::number_integer;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::array>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = arr;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = std::move(arr);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename CompatibleArrayType,
+             enable_if_t<not std::is_same<CompatibleArrayType,
+                                          typename BasicJsonType::array_t>::value,
+                         int> = 0>
+    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
+    {
+        using std::begin;
+        using std::end;
+        j.m_type = value_t::array;
+        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->reserve(arr.size());
+        for (bool x : arr)
+        {
+            j.m_value.array->push_back(x);
+        }
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename T,
+             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->resize(arr.size());
+        std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::object>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
+    {
+        j.m_type = value_t::object;
+        j.m_value = obj;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+    {
+        j.m_type = value_t::object;
+        j.m_value = std::move(obj);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename CompatibleObjectType,
+             enable_if_t<not std::is_same<CompatibleObjectType,
+                                          typename BasicJsonType::object_t>::value, int> = 0>
+    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_type = value_t::object;
+        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.assert_invariant();
+    }
+};
+
+
+////////////////////////
+// has_/is_ functions //
+////////////////////////
+
+/*!
+@brief Helper to determine whether there's a key_type for T.
+
+This helper is used to tell associative containers apart from other containers
+such as sequence containers. For instance, `std::map` passes the test as it
+contains a `mapped_type`, whereas `std::vector` fails the test.
+
+@sa http://stackoverflow.com/a/7728728/266378
+@since version 1.0.0, overworked in version 2.0.6
+*/
+#define NLOHMANN_JSON_HAS_HELPER(type)                                        \
+    template<typename T> struct has_##type {                                  \
+    private:                                                                  \
+        template<typename U, typename = typename U::type>                     \
+        static int detect(U &&);                                              \
+        static void detect(...);                                              \
+    public:                                                                   \
+        static constexpr bool value =                                         \
+                std::is_integral<decltype(detect(std::declval<T>()))>::value; \
+    }
+
+NLOHMANN_JSON_HAS_HELPER(mapped_type);
+NLOHMANN_JSON_HAS_HELPER(key_type);
+NLOHMANN_JSON_HAS_HELPER(value_type);
+NLOHMANN_JSON_HAS_HELPER(iterator);
+
+#undef NLOHMANN_JSON_HAS_HELPER
+
+
+template<bool B, class RealType, class CompatibleObjectType>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template<class RealType, class CompatibleObjectType>
+struct is_compatible_object_type_impl<true, RealType, CompatibleObjectType>
+{
+    static constexpr auto value =
+        std::is_constructible<typename RealType::key_type, typename CompatibleObjectType::key_type>::value and
+        std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
+};
+
+template<class BasicJsonType, class CompatibleObjectType>
+struct is_compatible_object_type
+{
+    static auto constexpr value = is_compatible_object_type_impl <
+                                  conjunction<negation<std::is_same<void, CompatibleObjectType>>,
+                                  has_mapped_type<CompatibleObjectType>,
+                                  has_key_type<CompatibleObjectType>>::value,
+                                  typename BasicJsonType::object_t, CompatibleObjectType >::value;
+};
+
+template<typename BasicJsonType, typename T>
+struct is_basic_json_nested_type
+{
+    static auto constexpr value = std::is_same<T, typename BasicJsonType::iterator>::value or
+                                  std::is_same<T, typename BasicJsonType::const_iterator>::value or
+                                  std::is_same<T, typename BasicJsonType::reverse_iterator>::value or
+                                  std::is_same<T, typename BasicJsonType::const_reverse_iterator>::value;
+};
+
+template<class BasicJsonType, class CompatibleArrayType>
+struct is_compatible_array_type
+{
+    static auto constexpr value =
+        conjunction<negation<std::is_same<void, CompatibleArrayType>>,
+        negation<is_compatible_object_type<
+        BasicJsonType, CompatibleArrayType>>,
+        negation<std::is_constructible<typename BasicJsonType::string_t,
+        CompatibleArrayType>>,
+        negation<is_basic_json_nested_type<BasicJsonType, CompatibleArrayType>>,
+        has_value_type<CompatibleArrayType>,
+        has_iterator<CompatibleArrayType>>::value;
+};
+
+template<bool, typename, typename>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl<true, RealIntegerType, CompatibleNumberIntegerType>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        std::is_constructible<RealIntegerType, CompatibleNumberIntegerType>::value and
+        CompatibleLimits::is_integer and
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+{
+    static constexpr auto value =
+        is_compatible_integer_type_impl <
+        std::is_integral<CompatibleNumberIntegerType>::value and
+        not std::is_same<bool, CompatibleNumberIntegerType>::value,
+        RealIntegerType, CompatibleNumberIntegerType > ::value;
+};
+
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template<typename BasicJsonType, typename T>
+struct has_from_json
+{
+  private:
+    // also check the return type of from_json
+    template<typename U, typename = enable_if_t<std::is_same<void, decltype(uncvref_t<U>::from_json(
+                 std::declval<BasicJsonType>(), std::declval<T&>()))>::value>>
+    static int detect(U&&);
+    static void detect(...);
+
+  public:
+    static constexpr bool value = std::is_integral<decltype(
+                                      detect(std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json
+{
+  private:
+    template <
+        typename U,
+        typename = enable_if_t<std::is_same<
+                                   T, decltype(uncvref_t<U>::from_json(std::declval<BasicJsonType>()))>::value >>
+    static int detect(U&&);
+    static void detect(...);
+
+  public:
+    static constexpr bool value = std::is_integral<decltype(detect(
+                                      std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+template<typename BasicJsonType, typename T>
+struct has_to_json
+{
+  private:
+    template<typename U, typename = decltype(uncvref_t<U>::to_json(
+                 std::declval<BasicJsonType&>(), std::declval<T>()))>
+    static int detect(U&&);
+    static void detect(...);
+
+  public:
+    static constexpr bool value = std::is_integral<decltype(detect(
+                                      std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
+};
+
+
+/////////////
+// to_json //
+/////////////
+
+template<typename BasicJsonType, typename T, enable_if_t<
+             std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+void to_json(BasicJsonType& j, T b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, b);
+}
+
+template<typename BasicJsonType, typename CompatibleString,
+         enable_if_t<std::is_constructible<typename BasicJsonType::string_t,
+                     CompatibleString>::value, int> = 0>
+void to_json(BasicJsonType& j, const CompatibleString& s)
+{
+    external_constructor<value_t::string>::construct(j, s);
+}
+
+template <typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+    external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
+template<typename BasicJsonType, typename FloatType,
+         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
+void to_json(BasicJsonType& j, FloatType val) noexcept
+{
+    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
+}
+
+template <
+    typename BasicJsonType, typename CompatibleNumberUnsignedType,
+    enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t,
+                CompatibleNumberUnsignedType>::value, int> = 0 >
+void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+{
+    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
+}
+
+template <
+    typename BasicJsonType, typename CompatibleNumberIntegerType,
+    enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t,
+                CompatibleNumberIntegerType>::value, int> = 0 >
+void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+{
+    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
+}
+
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void to_json(BasicJsonType& j, EnumType e) noexcept
+{
+    using underlying_type = typename std::underlying_type<EnumType>::type;
+    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+    external_constructor<value_t::array>::construct(j, e);
+}
+
+template <
+    typename BasicJsonType, typename CompatibleArrayType,
+    enable_if_t <
+        is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value or
+        std::is_same<typename BasicJsonType::array_t, CompatibleArrayType>::value,
+        int > = 0 >
+void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template <typename BasicJsonType, typename T,
+          enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+void to_json(BasicJsonType& j, std::valarray<T> arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template <typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template <
+    typename BasicJsonType, typename CompatibleObjectType,
+    enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value,
+                int> = 0 >
+void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+{
+    external_constructor<value_t::object>::construct(j, obj);
+}
+
+template <typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+{
+    external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template<typename BasicJsonType, typename T, std::size_t N,
+         enable_if_t<not std::is_constructible<
+                         typename BasicJsonType::string_t, T (&)[N]>::value,
+                     int> = 0>
+void to_json(BasicJsonType& j, T (&arr)[N])
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType, typename... Args>
+void to_json(BasicJsonType& j, const std::pair<Args...>& p)
+{
+    j = {p.first, p.second};
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...>)
+{
+    j = {std::get<Idx>(t)...};
+}
+
+template<typename BasicJsonType, typename... Args>
+void to_json(BasicJsonType& j, const std::tuple<Args...>& t)
+{
+    to_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+}
+
+///////////////
+// from_json //
+///////////////
+
+// overloads for basic_json template parameters
+template<typename BasicJsonType, typename ArithmeticType,
+         enable_if_t<std::is_arithmetic<ArithmeticType>::value and
+                     not std::is_same<ArithmeticType,
+                                      typename BasicJsonType::boolean_t>::value,
+                     int> = 0>
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+    }
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+    if (JSON_UNLIKELY(not j.is_boolean()))
+    {
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name())));
+    }
+    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+    if (JSON_UNLIKELY(not j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+    }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void from_json(const BasicJsonType& j, EnumType& e)
+{
+    typename std::underlying_type<EnumType>::type val;
+    get_arithmetic_value(j, val);
+    e = static_cast<EnumType>(val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::array_t& arr)
+{
+    if (JSON_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+    if (JSON_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    std::transform(j.rbegin(), j.rend(),
+                   std::front_inserter(l), [](const BasicJsonType & i)
+    {
+        return i.template get<T>();
+    });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+    if (JSON_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    l.resize(j.size());
+    std::copy(j.m_value.array->begin(), j.m_value.array->end(), std::begin(l));
+}
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+void from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<0> /*unused*/)
+{
+    using std::end;
+
+    std::transform(j.begin(), j.end(),
+                   std::inserter(arr, end(arr)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename CompatibleArrayType::value_type>();
+    });
+}
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+auto from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+    arr.reserve(std::declval<typename CompatibleArrayType::size_type>()),
+    void())
+{
+    using std::end;
+
+    arr.reserve(j.size());
+    std::transform(j.begin(), j.end(),
+                   std::inserter(arr, end(arr)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename CompatibleArrayType::value_type>();
+    });
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+void from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr, priority_tag<2> /*unused*/)
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename CompatibleArrayType,
+         enable_if_t<is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value and
+                     std::is_convertible<BasicJsonType, typename CompatibleArrayType::value_type>::value and
+                     not std::is_same<typename BasicJsonType::array_t, CompatibleArrayType>::value, int> = 0>
+void from_json(const BasicJsonType& j, CompatibleArrayType& arr)
+{
+    if (JSON_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+
+    from_json_array_impl(j, arr, priority_tag<2> {});
+}
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+         enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value, int> = 0>
+void from_json(const BasicJsonType& j, CompatibleObjectType& obj)
+{
+    if (JSON_UNLIKELY(not j.is_object()))
+    {
+        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name())));
+    }
+
+    auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    using value_type = typename CompatibleObjectType::value_type;
+    std::transform(
+        inner_object->begin(), inner_object->end(),
+        std::inserter(obj, obj.begin()),
+        [](typename BasicJsonType::object_t::value_type const & p)
+    {
+        return value_type(p.first, p.second.template get<typename CompatibleObjectType::mapped_type>());
+    });
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template<typename BasicJsonType, typename ArithmeticType,
+         enable_if_t <
+             std::is_arithmetic<ArithmeticType>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+             int> = 0>
+void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+        case value_t::boolean:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+            break;
+        }
+
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+    }
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+void from_json(const BasicJsonType& j, std::pair<A1, A2>& p)
+{
+    p = {j.at(0).template get<A1>(), j.at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence<Idx...>)
+{
+    t = std::make_tuple(j.at(Idx).template get<typename std::tuple_element<Idx, Tuple>::type>()...);
+}
+
+template<typename BasicJsonType, typename... Args>
+void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
+{
+    from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+}
+
+struct to_json_fn
+{
+  private:
+    template<typename BasicJsonType, typename T>
+    auto call(BasicJsonType& j, T&& val, priority_tag<1> /*unused*/) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    -> decltype(to_json(j, std::forward<T>(val)), void())
+    {
+        return to_json(j, std::forward<T>(val));
+    }
+
+    template<typename BasicJsonType, typename T>
+    void call(BasicJsonType& /*unused*/, T&& /*unused*/, priority_tag<0> /*unused*/) const noexcept
+    {
+        static_assert(sizeof(BasicJsonType) == 0,
+                      "could not find to_json() method in T's namespace");
+    }
+
+  public:
+    template<typename BasicJsonType, typename T>
+    void operator()(BasicJsonType& j, T&& val) const
+    noexcept(noexcept(std::declval<to_json_fn>().call(j, std::forward<T>(val), priority_tag<1> {})))
+    {
+        return call(j, std::forward<T>(val), priority_tag<1> {});
+    }
+};
+
+struct from_json_fn
+{
+  private:
+    template<typename BasicJsonType, typename T>
+    auto call(const BasicJsonType& j, T& val, priority_tag<1> /*unused*/) const
+    noexcept(noexcept(from_json(j, val)))
+    -> decltype(from_json(j, val), void())
+    {
+        return from_json(j, val);
+    }
+
+    template<typename BasicJsonType, typename T>
+    void call(const BasicJsonType& /*unused*/, T& /*unused*/, priority_tag<0> /*unused*/) const noexcept
+    {
+        static_assert(sizeof(BasicJsonType) == 0,
+                      "could not find from_json() method in T's namespace");
+    }
+
+  public:
+    template<typename BasicJsonType, typename T>
+    void operator()(const BasicJsonType& j, T& val) const
+    noexcept(noexcept(std::declval<from_json_fn>().call(j, val, priority_tag<1> {})))
+    {
+        return call(j, val, priority_tag<1> {});
+    }
+};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static constexpr T value{};
+};
+
+template<typename T>
+constexpr T static_const<T>::value;
+
+////////////////////
+// input adapters //
+////////////////////
+
+/*!
+@brief abstract input adapter interface
+
+Produces a stream of std::char_traits<char>::int_type characters from a
+std::istream, a buffer, or some other input type.  Accepts the return of exactly
+one non-EOF character for future input.  The int_type characters returned
+consist of all valid char values as positive values (typically unsigned char),
+plus an EOF value outside that range, specified by the value of the function
+std::char_traits<char>::eof().  This value is typically -1, but could be any
+arbitrary value which is not a valid char value.
+*/
+struct input_adapter_protocol
+{
+    /// get a character [0,255] or std::char_traits<char>::eof().
+    virtual std::char_traits<char>::int_type get_character() = 0;
+    /// restore the last non-eof() character to input
+    virtual void unget_character() = 0;
+    virtual ~input_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+using input_adapter_t = std::shared_ptr<input_adapter_protocol>;
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input.  Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter : public input_adapter_protocol
+{
+  public:
+    ~input_stream_adapter() override
+    {
+        // clear stream flags; we use underlying streambuf I/O, do not
+        // maintain ifstream flags
+        is.clear();
+    }
+
+    explicit input_stream_adapter(std::istream& i)
+        : is(i), sb(*i.rdbuf())
+    {
+        // ignore Byte Order Mark at start of input
+        std::char_traits<char>::int_type c;
+        if ((c = get_character()) == 0xEF)
+        {
+            if ((c = get_character()) == 0xBB)
+            {
+                if ((c = get_character()) == 0xBF)
+                {
+                    return; // Ignore BOM
+                }
+                else if (c != std::char_traits<char>::eof())
+                {
+                    is.unget();
+                }
+                is.putback('\xBB');
+            }
+            else if (c != std::char_traits<char>::eof())
+            {
+                is.unget();
+            }
+            is.putback('\xEF');
+        }
+        else if (c != std::char_traits<char>::eof())
+        {
+            is.unget(); // Not BOM. Process as usual.
+        }
+    }
+
+    // delete because of pointer members
+    input_stream_adapter(const input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&) = delete;
+
+    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+    // ensure that std::char_traits<char>::eof() and the character 0xff do not
+    // end up as the same value, eg. 0xffffffff.
+    std::char_traits<char>::int_type get_character() override
+    {
+        return sb.sbumpc();
+    }
+
+    void unget_character() override
+    {
+        sb.sungetc();  // is.unget() avoided for performance
+    }
+
+  private:
+    /// the associated input stream
+    std::istream& is;
+    std::streambuf& sb;
+};
+
+/// input adapter for buffer input
+class input_buffer_adapter : public input_adapter_protocol
+{
+  public:
+    input_buffer_adapter(const char* b, const std::size_t l)
+        : cursor(b), limit(b + l), start(b)
+    {
+        // skip byte order mark
+        if (l >= 3 and b[0] == '\xEF' and b[1] == '\xBB' and b[2] == '\xBF')
+        {
+            cursor += 3;
+        }
+    }
+
+    // delete because of pointer members
+    input_buffer_adapter(const input_buffer_adapter&) = delete;
+    input_buffer_adapter& operator=(input_buffer_adapter&) = delete;
+
+    std::char_traits<char>::int_type get_character() noexcept override
+    {
+        if (JSON_LIKELY(cursor < limit))
+        {
+            return std::char_traits<char>::to_int_type(*(cursor++));
+        }
+
+        return std::char_traits<char>::eof();
+    }
+
+    void unget_character() noexcept override
+    {
+        if (JSON_LIKELY(cursor > start))
+        {
+            --cursor;
+        }
+    }
+
+  private:
+    /// pointer to the current character
+    const char* cursor;
+    /// pointer past the last character
+    const char* limit;
+    /// pointer to the first character
+    const char* start;
+};
+
+class input_adapter
+{
+  public:
+    // native support
+
+    /// input adapter for input stream
+    input_adapter(std::istream& i)
+        : ia(std::make_shared<input_stream_adapter>(i)) {}
+
+    /// input adapter for input stream
+    input_adapter(std::istream&& i)
+        : ia(std::make_shared<input_stream_adapter>(i)) {}
+
+    /// input adapter for buffer
+    template<typename CharT,
+             typename std::enable_if<
+                 std::is_pointer<CharT>::value and
+                 std::is_integral<
+                     typename std::remove_pointer<CharT>::type>::value and
+                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                 int>::type = 0>
+    input_adapter(CharT b, std::size_t l)
+        : ia(std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(b), l)) {}
+
+    // derived support
+
+    /// input adapter for string literal
+    template<typename CharT,
+             typename std::enable_if<
+                 std::is_pointer<CharT>::value and
+                 std::is_integral<
+                     typename std::remove_pointer<CharT>::type>::value and
+                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                 int>::type = 0>
+    input_adapter(CharT b)
+        : input_adapter(reinterpret_cast<const char*>(b),
+                        std::strlen(reinterpret_cast<const char*>(b))) {}
+
+    /// input adapter for iterator range with contiguous storage
+    template<class IteratorType,
+             typename std::enable_if<
+                 std::is_same<typename std::iterator_traits<IteratorType>::iterator_category,
+                              std::random_access_iterator_tag>::value,
+                 int>::type = 0>
+    input_adapter(IteratorType first, IteratorType last)
+    {
+        // assertion to check that the iterator range is indeed contiguous,
+        // see http://stackoverflow.com/a/35008842/266378 for more discussion
+        assert(std::accumulate(
+                   first, last, std::pair<bool, int>(true, 0),
+                   [&first](std::pair<bool, int> res, decltype(*first) val)
+        {
+            res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
+            return res;
+        }).first);
+
+        // assertion to check that each element is 1 byte long
+        static_assert(
+            sizeof(typename std::iterator_traits<IteratorType>::value_type) == 1,
+            "each element in the iterator range must have the size of 1 byte");
+
+        const auto len = static_cast<size_t>(std::distance(first, last));
+        if (JSON_LIKELY(len > 0))
+        {
+            // there is at least one element: use the address of first
+            ia = std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(&(*first)), len);
+        }
+        else
+        {
+            // the address of first cannot be used: use nullptr
+            ia = std::make_shared<input_buffer_adapter>(nullptr, len);
+        }
+    }
+
+    /// input adapter for array
+    template<class T, std::size_t N>
+    input_adapter(T (&array)[N])
+        : input_adapter(std::begin(array), std::end(array)) {}
+
+    /// input adapter for contiguous container
+    template <
+        class ContiguousContainer,
+        typename std::enable_if <
+            not std::is_pointer<ContiguousContainer>::value and
+            std::is_base_of<std::random_access_iterator_tag,
+                            typename std::iterator_traits<decltype(std::begin(std::declval<ContiguousContainer const>()))>::iterator_category>::value,
+            int >::type = 0 >
+    input_adapter(const ContiguousContainer& c)
+        : input_adapter(std::begin(c), std::end(c)) {}
+
+    operator input_adapter_t()
+    {
+        return ia;
+    }
+
+  private:
+    /// the actual adapter
+    input_adapter_t ia = nullptr;
+};
+
+//////////////////////
+// lexer and parser //
+//////////////////////
+
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType>
+class lexer
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+  public:
+    /// token types for the parser
+    enum class token_type
+    {
+        uninitialized,    ///< indicating the scanner is uninitialized
+        literal_true,     ///< the `true` literal
+        literal_false,    ///< the `false` literal
+        literal_null,     ///< the `null` literal
+        value_string,     ///< a string -- use get_string() for actual value
+        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
+        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
+        value_float,      ///< an floating point number -- use get_number_float() for actual value
+        begin_array,      ///< the character for array begin `[`
+        begin_object,     ///< the character for object begin `{`
+        end_array,        ///< the character for array end `]`
+        end_object,       ///< the character for object end `}`
+        name_separator,   ///< the name separator `:`
+        value_separator,  ///< the value separator `,`
+        parse_error,      ///< indicating a parse error
+        end_of_input,     ///< indicating the end of the input buffer
+        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
+    };
+
+    /// return name of values of type token_type (only used for errors)
+    static const char* token_type_name(const token_type t) noexcept
+    {
+        switch (t)
+        {
+            case token_type::uninitialized:
+                return "<uninitialized>";
+            case token_type::literal_true:
+                return "true literal";
+            case token_type::literal_false:
+                return "false literal";
+            case token_type::literal_null:
+                return "null literal";
+            case token_type::value_string:
+                return "string literal";
+            case lexer::token_type::value_unsigned:
+            case lexer::token_type::value_integer:
+            case lexer::token_type::value_float:
+                return "number literal";
+            case token_type::begin_array:
+                return "'['";
+            case token_type::begin_object:
+                return "'{'";
+            case token_type::end_array:
+                return "']'";
+            case token_type::end_object:
+                return "'}'";
+            case token_type::name_separator:
+                return "':'";
+            case token_type::value_separator:
+                return "','";
+            case token_type::parse_error:
+                return "<parse error>";
+            case token_type::end_of_input:
+                return "end of input";
+            case token_type::literal_or_value:
+                return "'[', '{', or a literal";
+            default: // catch non-enum values
+                return "unknown token"; // LCOV_EXCL_LINE
+        }
+    }
+
+    explicit lexer(detail::input_adapter_t adapter)
+        : ia(std::move(adapter)), decimal_point_char(get_decimal_point()) {}
+
+    // delete because of pointer members
+    lexer(const lexer&) = delete;
+    lexer& operator=(lexer&) = delete;
+
+  private:
+    /////////////////////
+    // locales
+    /////////////////////
+
+    /// return the locale-dependent decimal point
+    static char get_decimal_point() noexcept
+    {
+        const auto loc = localeconv();
+        assert(loc != nullptr);
+        return (loc->decimal_point == nullptr) ? '.' : loc->decimal_point[0];
+    }
+
+    /////////////////////
+    // scan functions
+    /////////////////////
+
+    /*!
+    @brief get codepoint from 4 hex characters following `\u`
+
+    For input "\u c1 c2 c3 c4" the codepoint is:
+      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+    between the ASCII value of the character and the desired integer value.
+
+    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+            non-hex character)
+    */
+    int get_codepoint()
+    {
+        // this function only makes sense after reading `\u`
+        assert(current == 'u');
+        int codepoint = 0;
+
+        const auto factors = { 12, 8, 4, 0 };
+        for (const auto factor : factors)
+        {
+            get();
+
+            if (current >= '0' and current <= '9')
+            {
+                codepoint += ((current - 0x30) << factor);
+            }
+            else if (current >= 'A' and current <= 'F')
+            {
+                codepoint += ((current - 0x37) << factor);
+            }
+            else if (current >= 'a' and current <= 'f')
+            {
+                codepoint += ((current - 0x57) << factor);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        assert(0x0000 <= codepoint and codepoint <= 0xFFFF);
+        return codepoint;
+    }
+
+    /*!
+    @brief check if the next byte(s) are inside a given range
+
+    Adds the current byte and, for each passed range, reads a new byte and
+    checks if it is inside the range. If a violation was detected, set up an
+    error message and return false. Otherwise, return true.
+
+    @return true if and only if no range violation was detected
+    */
+    bool next_byte_in_range(std::initializer_list<int> ranges)
+    {
+        assert(ranges.size() == 2 or ranges.size() == 4 or ranges.size() == 6);
+        add(current);
+
+        for (auto range = ranges.begin(); range != ranges.end(); ++range)
+        {
+            get();
+            if (JSON_LIKELY(*range <= current and current <= *(++range)))
+            {
+                add(current);
+            }
+            else
+            {
+                error_message = "invalid string: ill-formed UTF-8 byte";
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief scan a string literal
+
+    This function scans a string according to Sect. 7 of RFC 7159. While
+    scanning, bytes are escaped and copied into buffer yytext. Then the function
+    returns successfully, yytext is *not* null-terminated (as it may contain \0
+    bytes), and yytext.size() is the number of bytes in the string.
+
+    @return token_type::value_string if string could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note In case of errors, variable error_message contains a textual
+          description.
+    */
+    token_type scan_string()
+    {
+        // reset yytext (ignore opening quote)
+        reset();
+
+        // we entered the function by reading an open quote
+        assert(current == '\"');
+
+        while (true)
+        {
+            // get next character
+            switch (get())
+            {
+                // end of file while parsing string
+                case std::char_traits<char>::eof():
+                {
+                    error_message = "invalid string: missing closing quote";
+                    return token_type::parse_error;
+                }
+
+                // closing quote
+                case '\"':
+                {
+                    return token_type::value_string;
+                }
+
+                // escapes
+                case '\\':
+                {
+                    switch (get())
+                    {
+                        // quotation mark
+                        case '\"':
+                            add('\"');
+                            break;
+                        // reverse solidus
+                        case '\\':
+                            add('\\');
+                            break;
+                        // solidus
+                        case '/':
+                            add('/');
+                            break;
+                        // backspace
+                        case 'b':
+                            add('\b');
+                            break;
+                        // form feed
+                        case 'f':
+                            add('\f');
+                            break;
+                        // line feed
+                        case 'n':
+                            add('\n');
+                            break;
+                        // carriage return
+                        case 'r':
+                            add('\r');
+                            break;
+                        // tab
+                        case 't':
+                            add('\t');
+                            break;
+
+                        // unicode escapes
+                        case 'u':
+                        {
+                            int codepoint;
+                            const int codepoint1 = get_codepoint();
+
+                            if (JSON_UNLIKELY(codepoint1 == -1))
+                            {
+                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                return token_type::parse_error;
+                            }
+
+                            // check if code point is a high surrogate
+                            if (0xD800 <= codepoint1 and codepoint1 <= 0xDBFF)
+                            {
+                                // expect next \uxxxx entry
+                                if (JSON_LIKELY(get() == '\\' and get() == 'u'))
+                                {
+                                    const int codepoint2 = get_codepoint();
+
+                                    if (JSON_UNLIKELY(codepoint2 == -1))
+                                    {
+                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                        return token_type::parse_error;
+                                    }
+
+                                    // check if codepoint2 is a low surrogate
+                                    if (JSON_LIKELY(0xDC00 <= codepoint2 and codepoint2 <= 0xDFFF))
+                                    {
+                                        codepoint =
+                                            // high surrogate occupies the most significant 22 bits
+                                            (codepoint1 << 10)
+                                            // low surrogate occupies the least significant 15 bits
+                                            + codepoint2
+                                            // there is still the 0xD800, 0xDC00 and 0x10000 noise
+                                            // in the result so we have to subtract with:
+                                            // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+                                            - 0x35FDC00;
+                                    }
+                                    else
+                                    {
+                                        error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+                                        return token_type::parse_error;
+                                    }
+                                }
+                                else
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+                            else
+                            {
+                                if (JSON_UNLIKELY(0xDC00 <= codepoint1 and codepoint1 <= 0xDFFF))
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+                                    return token_type::parse_error;
+                                }
+
+                                // only work with first code point
+                                codepoint = codepoint1;
+                            }
+
+                            // result of the above calculation yields a proper codepoint
+                            assert(0x00 <= codepoint and codepoint <= 0x10FFFF);
+
+                            // translate code point to bytes
+                            if (codepoint < 0x80)
+                            {
+                                // 1-byte characters: 0xxxxxxx (ASCII)
+                                add(codepoint);
+                            }
+                            else if (codepoint <= 0x7ff)
+                            {
+                                // 2-byte characters: 110xxxxx 10xxxxxx
+                                add(0xC0 | (codepoint >> 6));
+                                add(0x80 | (codepoint & 0x3F));
+                            }
+                            else if (codepoint <= 0xffff)
+                            {
+                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+                                add(0xE0 | (codepoint >> 12));
+                                add(0x80 | ((codepoint >> 6) & 0x3F));
+                                add(0x80 | (codepoint & 0x3F));
+                            }
+                            else
+                            {
+                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                                add(0xF0 | (codepoint >> 18));
+                                add(0x80 | ((codepoint >> 12) & 0x3F));
+                                add(0x80 | ((codepoint >> 6) & 0x3F));
+                                add(0x80 | (codepoint & 0x3F));
+                            }
+
+                            break;
+                        }
+
+                        // other characters after escape
+                        default:
+                            error_message = "invalid string: forbidden character after backslash";
+                            return token_type::parse_error;
+                    }
+
+                    break;
+                }
+
+                // invalid control characters
+                case 0x00:
+                case 0x01:
+                case 0x02:
+                case 0x03:
+                case 0x04:
+                case 0x05:
+                case 0x06:
+                case 0x07:
+                case 0x08:
+                case 0x09:
+                case 0x0a:
+                case 0x0b:
+                case 0x0c:
+                case 0x0d:
+                case 0x0e:
+                case 0x0f:
+                case 0x10:
+                case 0x11:
+                case 0x12:
+                case 0x13:
+                case 0x14:
+                case 0x15:
+                case 0x16:
+                case 0x17:
+                case 0x18:
+                case 0x19:
+                case 0x1a:
+                case 0x1b:
+                case 0x1c:
+                case 0x1d:
+                case 0x1e:
+                case 0x1f:
+                {
+                    error_message = "invalid string: control character must be escaped";
+                    return token_type::parse_error;
+                }
+
+                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+                case 0x20:
+                case 0x21:
+                case 0x23:
+                case 0x24:
+                case 0x25:
+                case 0x26:
+                case 0x27:
+                case 0x28:
+                case 0x29:
+                case 0x2a:
+                case 0x2b:
+                case 0x2c:
+                case 0x2d:
+                case 0x2e:
+                case 0x2f:
+                case 0x30:
+                case 0x31:
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3a:
+                case 0x3b:
+                case 0x3c:
+                case 0x3d:
+                case 0x3e:
+                case 0x3f:
+                case 0x40:
+                case 0x41:
+                case 0x42:
+                case 0x43:
+                case 0x44:
+                case 0x45:
+                case 0x46:
+                case 0x47:
+                case 0x48:
+                case 0x49:
+                case 0x4a:
+                case 0x4b:
+                case 0x4c:
+                case 0x4d:
+                case 0x4e:
+                case 0x4f:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5a:
+                case 0x5b:
+                case 0x5d:
+                case 0x5e:
+                case 0x5f:
+                case 0x60:
+                case 0x61:
+                case 0x62:
+                case 0x63:
+                case 0x64:
+                case 0x65:
+                case 0x66:
+                case 0x67:
+                case 0x68:
+                case 0x69:
+                case 0x6a:
+                case 0x6b:
+                case 0x6c:
+                case 0x6d:
+                case 0x6e:
+                case 0x6f:
+                case 0x70:
+                case 0x71:
+                case 0x72:
+                case 0x73:
+                case 0x74:
+                case 0x75:
+                case 0x76:
+                case 0x77:
+                case 0x78:
+                case 0x79:
+                case 0x7a:
+                case 0x7b:
+                case 0x7c:
+                case 0x7d:
+                case 0x7e:
+                case 0x7f:
+                {
+                    add(current);
+                    break;
+                }
+
+                // U+0080..U+07FF: bytes C2..DF 80..BF
+                case 0xc2:
+                case 0xc3:
+                case 0xc4:
+                case 0xc5:
+                case 0xc6:
+                case 0xc7:
+                case 0xc8:
+                case 0xc9:
+                case 0xca:
+                case 0xcb:
+                case 0xcc:
+                case 0xcd:
+                case 0xce:
+                case 0xcf:
+                case 0xd0:
+                case 0xd1:
+                case 0xd2:
+                case 0xd3:
+                case 0xd4:
+                case 0xd5:
+                case 0xd6:
+                case 0xd7:
+                case 0xd8:
+                case 0xd9:
+                case 0xda:
+                case 0xdb:
+                case 0xdc:
+                case 0xdd:
+                case 0xde:
+                case 0xdf:
+                {
+                    if (JSON_UNLIKELY(not next_byte_in_range({0x80, 0xBF})))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+                case 0xe0:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+                case 0xe1:
+                case 0xe2:
+                case 0xe3:
+                case 0xe4:
+                case 0xe5:
+                case 0xe6:
+                case 0xe7:
+                case 0xe8:
+                case 0xe9:
+                case 0xea:
+                case 0xeb:
+                case 0xec:
+                case 0xee:
+                case 0xef:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+                case 0xed:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+                case 0xf0:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+                case 0xf1:
+                case 0xf2:
+                case 0xf3:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+                case 0xf4:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // remaining bytes (80..C1 and F5..FF) are ill-formed
+                default:
+                {
+                    error_message = "invalid string: ill-formed UTF-8 byte";
+                    return token_type::parse_error;
+                }
+            }
+        }
+    }
+
+    static void strtof(float& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtof(str, endptr);
+    }
+
+    static void strtof(double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtod(str, endptr);
+    }
+
+    static void strtof(long double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtold(str, endptr);
+    }
+
+    /*!
+    @brief scan a number literal
+
+    This function scans a string according to Sect. 6 of RFC 7159.
+
+    The function is realized with a deterministic finite state machine derived
+    from the grammar described in RFC 7159. Starting in state "init", the
+    input is read and used to determined the next state. Only state "done"
+    accepts the number. State "error" is a trap state to model errors. In the
+    table below, "anything" means any character but the ones listed before.
+
+    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
+    ---------|----------|----------|----------|---------|---------|----------|-----------
+    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
+    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
+    zero     | done     | done     | exponent | done    | done    | decimal1 | done
+    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
+    decimal1 | decimal2 | [error]  | [error]  | [error] | [error] | [error]  | [error]
+    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
+    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
+    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
+    any2     | any2     | any2     | done     | done    | done    | done     | done
+
+    The state machine is realized with one label per state (prefixed with
+    "scan_number_") and `goto` statements between them. The state machine
+    contains cycles, but any cycle can be left when EOF is read. Therefore,
+    the function is guaranteed to terminate.
+
+    During scanning, the read bytes are stored in yytext. This string is
+    then converted to a signed integer, an unsigned integer, or a
+    floating-point number.
+
+    @return token_type::value_unsigned, token_type::value_integer, or
+            token_type::value_float if number could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note The scanner is independent of the current locale. Internally, the
+          locale's decimal point is used instead of `.` to work with the
+          locale-dependent converters.
+    */
+    token_type scan_number()
+    {
+        // reset yytext to store the number's bytes
+        reset();
+
+        // the type of the parsed number; initially set to unsigned; will be
+        // changed if minus sign, decimal point or exponent is read
+        token_type number_type = token_type::value_unsigned;
+
+        // state (init): we just found out we need to scan a number
+        switch (current)
+        {
+            case '-':
+            {
+                add(current);
+                goto scan_number_minus;
+            }
+
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                // all other characters are rejected outside scan_number()
+                assert(false); // LCOV_EXCL_LINE
+            }
+        }
+
+scan_number_minus:
+        // state: we just parsed a leading minus sign
+        number_type = token_type::value_integer;
+        switch (get())
+        {
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '-'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_zero:
+        // state: we just parse a zero (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_any1:
+        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_decimal1:
+        // state: we just parsed a decimal point
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '.'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_decimal2:
+        // we just parsed at least one number after a decimal point
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_exponent:
+        // we just parsed an exponent
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '+':
+            case '-':
+            {
+                add(current);
+                goto scan_number_sign;
+            }
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message =
+                    "invalid number; expected '+', '-', or digit after exponent";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_sign:
+        // we just parsed an exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after exponent sign";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_any2:
+        // we just parsed a number after the exponent or exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_done:
+        // unget the character after the number (we only read it to know that
+        // we are done scanning a number)
+        unget();
+
+        char* endptr = nullptr;
+        errno = 0;
+
+        // try to parse integers first and fall back to floats
+        if (number_type == token_type::value_unsigned)
+        {
+            const auto x = std::strtoull(yytext.data(), &endptr, 10);
+
+            // we checked the number format before
+            assert(endptr == yytext.data() + yytext.size());
+
+            if (errno == 0)
+            {
+                value_unsigned = static_cast<number_unsigned_t>(x);
+                if (value_unsigned == x)
+                {
+                    return token_type::value_unsigned;
+                }
+            }
+        }
+        else if (number_type == token_type::value_integer)
+        {
+            const auto x = std::strtoll(yytext.data(), &endptr, 10);
+
+            // we checked the number format before
+            assert(endptr == yytext.data() + yytext.size());
+
+            if (errno == 0)
+            {
+                value_integer = static_cast<number_integer_t>(x);
+                if (value_integer == x)
+                {
+                    return token_type::value_integer;
+                }
+            }
+        }
+
+        // this code is reached if we parse a floating-point number or if an
+        // integer conversion above failed
+        strtof(value_float, yytext.data(), &endptr);
+
+        // we checked the number format before
+        assert(endptr == yytext.data() + yytext.size());
+
+        return token_type::value_float;
+    }
+
+    /*!
+    @param[in] literal_text  the literal text to expect
+    @param[in] length        the length of the passed literal text
+    @param[in] return_type   the token type to return on success
+    */
+    token_type scan_literal(const char* literal_text, const std::size_t length,
+                            token_type return_type)
+    {
+        assert(current == literal_text[0]);
+        for (std::size_t i = 1; i < length; ++i)
+        {
+            if (JSON_UNLIKELY(get() != literal_text[i]))
+            {
+                error_message = "invalid literal";
+                return token_type::parse_error;
+            }
+        }
+        return return_type;
+    }
+
+    /////////////////////
+    // input management
+    /////////////////////
+
+    /// reset yytext; current character is beginning of token
+    void reset() noexcept
+    {
+        yytext.clear();
+        token_string.clear();
+        token_string.push_back(std::char_traits<char>::to_char_type(current));
+    }
+
+    /*
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a
+    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
+    for use in error messages.
+
+    @return character read from the input
+    */
+    std::char_traits<char>::int_type get()
+    {
+        ++chars_read;
+        current = ia->get_character();
+        if (JSON_LIKELY(current != std::char_traits<char>::eof()))
+        {
+            token_string.push_back(std::char_traits<char>::to_char_type(current));
+        }
+        return current;
+    }
+
+    /// unget current character (return it again on next get)
+    void unget()
+    {
+        --chars_read;
+        if (JSON_LIKELY(current != std::char_traits<char>::eof()))
+        {
+            ia->unget_character();
+            assert(token_string.size() != 0);
+            token_string.pop_back();
+        }
+    }
+
+    /// add a character to yytext
+    void add(int c)
+    {
+        yytext.push_back(std::char_traits<char>::to_char_type(c));
+    }
+
+  public:
+    /////////////////////
+    // value getters
+    /////////////////////
+
+    /// return integer value
+    constexpr number_integer_t get_number_integer() const noexcept
+    {
+        return value_integer;
+    }
+
+    /// return unsigned integer value
+    constexpr number_unsigned_t get_number_unsigned() const noexcept
+    {
+        return value_unsigned;
+    }
+
+    /// return floating-point value
+    constexpr number_float_t get_number_float() const noexcept
+    {
+        return value_float;
+    }
+
+    /// return current string value (implicitly resets the token; useful only once)
+    std::string move_string()
+    {
+        return std::move(yytext);
+    }
+
+    /////////////////////
+    // diagnostics
+    /////////////////////
+
+    /// return position of last read token
+    constexpr std::size_t get_position() const noexcept
+    {
+        return chars_read;
+    }
+
+    /// return the last read token (for errors only).  Will never contain EOF
+    /// (an arbitrary value that is not a valid char value, often -1), because
+    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
+    std::string get_token_string() const
+    {
+        // escape control characters
+        std::string result;
+        for (auto c : token_string)
+        {
+            if ('\x00' <= c and c <= '\x1f')
+            {
+                // escape control characters
+                std::stringstream ss;
+                ss << "<U+" << std::setw(4) << std::uppercase << std::setfill('0')
+                   << std::hex << static_cast<int>(c) << ">";
+                result += ss.str();
+            }
+            else
+            {
+                // add character as is
+                result.push_back(c);
+            }
+        }
+
+        return result;
+    }
+
+    /// return syntax error message
+    constexpr const char* get_error_message() const noexcept
+    {
+        return error_message;
+    }
+
+    /////////////////////
+    // actual scanner
+    /////////////////////
+
+    token_type scan()
+    {
+        // read next character and ignore whitespace
+        do
+        {
+            get();
+        }
+        while (current == ' ' or current == '\t' or current == '\n' or current == '\r');
+
+        switch (current)
+        {
+            // structural characters
+            case '[':
+                return token_type::begin_array;
+            case ']':
+                return token_type::end_array;
+            case '{':
+                return token_type::begin_object;
+            case '}':
+                return token_type::end_object;
+            case ':':
+                return token_type::name_separator;
+            case ',':
+                return token_type::value_separator;
+
+            // literals
+            case 't':
+                return scan_literal("true", 4, token_type::literal_true);
+            case 'f':
+                return scan_literal("false", 5, token_type::literal_false);
+            case 'n':
+                return scan_literal("null", 4, token_type::literal_null);
+
+            // string
+            case '\"':
+                return scan_string();
+
+            // number
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                return scan_number();
+
+            // end of input (the null byte is needed when parsing from
+            // string literals)
+            case '\0':
+            case std::char_traits<char>::eof():
+                return token_type::end_of_input;
+
+            // error
+            default:
+                error_message = "invalid literal";
+                return token_type::parse_error;
+        }
+    }
+
+  private:
+    /// input adapter
+    detail::input_adapter_t ia = nullptr;
+
+    /// the current character
+    std::char_traits<char>::int_type current = std::char_traits<char>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// raw input token string (for error messages)
+    std::vector<char> token_string { };
+
+    /// buffer for variable-length tokens (numbers, strings)
+    std::string yytext { };
+
+    /// a description of occurred lexer errors
+    const char* error_message = "";
+
+    // number values
+    number_integer_t value_integer = 0;
+    number_unsigned_t value_unsigned = 0;
+    number_float_t value_float = 0;
+
+    /// the decimal point
+    const char decimal_point_char = '.';
+};
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive decent parser.
+*/
+template<typename BasicJsonType>
+class parser
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using lexer_t = lexer<BasicJsonType>;
+    using token_type = typename lexer_t::token_type;
+
+  public:
+    enum class parse_event_t : uint8_t
+    {
+        /// the parser read `{` and started to process a JSON object
+        object_start,
+        /// the parser read `}` and finished processing a JSON object
+        object_end,
+        /// the parser read `[` and started to process a JSON array
+        array_start,
+        /// the parser read `]` and finished processing a JSON array
+        array_end,
+        /// the parser read a key of a value in an object
+        key,
+        /// the parser finished reading a JSON value
+        value
+    };
+
+    using parser_callback_t =
+        std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+
+    /// a parser reading from an input adapter
+    explicit parser(detail::input_adapter_t adapter,
+                    const parser_callback_t cb = nullptr,
+                    const bool allow_exceptions_ = true)
+        : callback(cb), m_lexer(adapter), allow_exceptions(allow_exceptions_)
+    {}
+
+    /*!
+    @brief public parser interface
+
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        // read first token
+        get_token();
+
+        parse_internal(true, result);
+        result.assert_invariant();
+
+        // in strict mode, input must be completely read
+        if (strict)
+        {
+            get_token();
+            expect(token_type::end_of_input);
+        }
+
+        // in case of an error, return discarded value
+        if (errored)
+        {
+            result = value_t::discarded;
+            return;
+        }
+
+        // set top-level value to null if it was discarded by the callback
+        // function
+        if (result.is_discarded())
+        {
+            result = nullptr;
+        }
+    }
+
+    /*!
+    @brief public accept interface
+
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
+    */
+    bool accept(const bool strict = true)
+    {
+        // read first token
+        get_token();
+
+        if (not accept_internal())
+        {
+            return false;
+        }
+
+        // strict => last token must be EOF
+        return not strict or (get_token() == token_type::end_of_input);
+    }
+
+  private:
+    /*!
+    @brief the actual parser
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse_internal(bool keep, BasicJsonType& result)
+    {
+        // never parse after a parse error was detected
+        assert(not errored);
+
+        // start with a discarded value
+        if (not result.is_discarded())
+        {
+            result.m_value.destroy(result.m_type);
+            result.m_type = value_t::discarded;
+        }
+
+        switch (last_token)
+        {
+            case token_type::begin_object:
+            {
+                if (keep)
+                {
+                    if (callback)
+                    {
+                        keep = callback(depth++, parse_event_t::object_start, result);
+                    }
+
+                    if (not callback or keep)
+                    {
+                        // explicitly set result to object to cope with {}
+                        result.m_type = value_t::object;
+                        result.m_value = value_t::object;
+                    }
+                }
+
+                // read next token
+                get_token();
+
+                // closing } -> we are done
+                if (last_token == token_type::end_object)
+                {
+                    if (keep and callback and not callback(--depth, parse_event_t::object_end, result))
+                    {
+                        result.m_value.destroy(result.m_type);
+                        result.m_type = value_t::discarded;
+                    }
+                    break;
+                }
+
+                // parse values
+                std::string key;
+                BasicJsonType value;
+                while (true)
+                {
+                    // store key
+                    if (not expect(token_type::value_string))
+                    {
+                        return;
+                    }
+                    key = m_lexer.move_string();
+
+                    bool keep_tag = false;
+                    if (keep)
+                    {
+                        if (callback)
+                        {
+                            BasicJsonType k(key);
+                            keep_tag = callback(depth, parse_event_t::key, k);
+                        }
+                        else
+                        {
+                            keep_tag = true;
+                        }
+                    }
+
+                    // parse separator (:)
+                    get_token();
+                    if (not expect(token_type::name_separator))
+                    {
+                        return;
+                    }
+
+                    // parse and add value
+                    get_token();
+                    value.m_value.destroy(value.m_type);
+                    value.m_type = value_t::discarded;
+                    parse_internal(keep, value);
+
+                    if (JSON_UNLIKELY(errored))
+                    {
+                        return;
+                    }
+
+                    if (keep and keep_tag and not value.is_discarded())
+                    {
+                        result.m_value.object->emplace(std::move(key), std::move(value));
+                    }
+
+                    // comma -> next value
+                    get_token();
+                    if (last_token == token_type::value_separator)
+                    {
+                        get_token();
+                        continue;
+                    }
+
+                    // closing }
+                    if (not expect(token_type::end_object))
+                    {
+                        return;
+                    }
+                    break;
+                }
+
+                if (keep and callback and not callback(--depth, parse_event_t::object_end, result))
+                {
+                    result.m_value.destroy(result.m_type);
+                    result.m_type = value_t::discarded;
+                }
+                break;
+            }
+
+            case token_type::begin_array:
+            {
+                if (keep)
+                {
+                    if (callback)
+                    {
+                        keep = callback(depth++, parse_event_t::array_start, result);
+                    }
+
+                    if (not callback or keep)
+                    {
+                        // explicitly set result to array to cope with []
+                        result.m_type = value_t::array;
+                        result.m_value = value_t::array;
+                    }
+                }
+
+                // read next token
+                get_token();
+
+                // closing ] -> we are done
+                if (last_token == token_type::end_array)
+                {
+                    if (callback and not callback(--depth, parse_event_t::array_end, result))
+                    {
+                        result.m_value.destroy(result.m_type);
+                        result.m_type = value_t::discarded;
+                    }
+                    break;
+                }
+
+                // parse values
+                BasicJsonType value;
+                while (true)
+                {
+                    // parse value
+                    value.m_value.destroy(value.m_type);
+                    value.m_type = value_t::discarded;
+                    parse_internal(keep, value);
+
+                    if (JSON_UNLIKELY(errored))
+                    {
+                        return;
+                    }
+
+                    if (keep and not value.is_discarded())
+                    {
+                        result.m_value.array->push_back(std::move(value));
+                    }
+
+                    // comma -> next value
+                    get_token();
+                    if (last_token == token_type::value_separator)
+                    {
+                        get_token();
+                        continue;
+                    }
+
+                    // closing ]
+                    if (not expect(token_type::end_array))
+                    {
+                        return;
+                    }
+                    break;
+                }
+
+                if (keep and callback and not callback(--depth, parse_event_t::array_end, result))
+                {
+                    result.m_value.destroy(result.m_type);
+                    result.m_type = value_t::discarded;
+                }
+                break;
+            }
+
+            case token_type::literal_null:
+            {
+                result.m_type = value_t::null;
+                break;
+            }
+
+            case token_type::value_string:
+            {
+                result.m_type = value_t::string;
+                result.m_value = m_lexer.move_string();
+                break;
+            }
+
+            case token_type::literal_true:
+            {
+                result.m_type = value_t::boolean;
+                result.m_value = true;
+                break;
+            }
+
+            case token_type::literal_false:
+            {
+                result.m_type = value_t::boolean;
+                result.m_value = false;
+                break;
+            }
+
+            case token_type::value_unsigned:
+            {
+                result.m_type = value_t::number_unsigned;
+                result.m_value = m_lexer.get_number_unsigned();
+                break;
+            }
+
+            case token_type::value_integer:
+            {
+                result.m_type = value_t::number_integer;
+                result.m_value = m_lexer.get_number_integer();
+                break;
+            }
+
+            case token_type::value_float:
+            {
+                result.m_type = value_t::number_float;
+                result.m_value = m_lexer.get_number_float();
+
+                // throw in case of infinity or NAN
+                if (JSON_UNLIKELY(not std::isfinite(result.m_value.number_float)))
+                {
+                    if (allow_exceptions)
+                    {
+                        JSON_THROW(out_of_range::create(406, "number overflow parsing '" +
+                                                        m_lexer.get_token_string() + "'"));
+                    }
+                    expect(token_type::uninitialized);
+                }
+                break;
+            }
+
+            case token_type::parse_error:
+            {
+                // using "uninitialized" to avoid "expected" message
+                if (not expect(token_type::uninitialized))
+                {
+                    return;
+                }
+                break; // LCOV_EXCL_LINE
+            }
+
+            default:
+            {
+                // the last token was unexpected; we expected a value
+                if (not expect(token_type::literal_or_value))
+                {
+                    return;
+                }
+                break; // LCOV_EXCL_LINE
+            }
+        }
+
+        if (keep and callback and not callback(depth, parse_event_t::value, result))
+        {
+            result.m_type = value_t::discarded;
+        }
+    }
+
+    /*!
+    @brief the acutal acceptor
+
+    @invariant 1. The last token is not yet processed. Therefore, the caller
+                  of this function must make sure a token has been read.
+               2. When this function returns, the last token is processed.
+                  That is, the last read character was already considered.
+
+    This invariant makes sure that no token needs to be "unput".
+    */
+    bool accept_internal()
+    {
+        switch (last_token)
+        {
+            case token_type::begin_object:
+            {
+                // read next token
+                get_token();
+
+                // closing } -> we are done
+                if (last_token == token_type::end_object)
+                {
+                    return true;
+                }
+
+                // parse values
+                while (true)
+                {
+                    // parse key
+                    if (last_token != token_type::value_string)
+                    {
+                        return false;
+                    }
+
+                    // parse separator (:)
+                    get_token();
+                    if (last_token != token_type::name_separator)
+                    {
+                        return false;
+                    }
+
+                    // parse value
+                    get_token();
+                    if (not accept_internal())
+                    {
+                        return false;
+                    }
+
+                    // comma -> next value
+                    get_token();
+                    if (last_token == token_type::value_separator)
+                    {
+                        get_token();
+                        continue;
+                    }
+
+                    // closing }
+                    return (last_token == token_type::end_object);
+                }
+            }
+
+            case token_type::begin_array:
+            {
+                // read next token
+                get_token();
+
+                // closing ] -> we are done
+                if (last_token == token_type::end_array)
+                {
+                    return true;
+                }
+
+                // parse values
+                while (true)
+                {
+                    // parse value
+                    if (not accept_internal())
+                    {
+                        return false;
+                    }
+
+                    // comma -> next value
+                    get_token();
+                    if (last_token == token_type::value_separator)
+                    {
+                        get_token();
+                        continue;
+                    }
+
+                    // closing ]
+                    return (last_token == token_type::end_array);
+                }
+            }
+
+            case token_type::value_float:
+            {
+                // reject infinity or NAN
+                return std::isfinite(m_lexer.get_number_float());
+            }
+
+            case token_type::literal_false:
+            case token_type::literal_null:
+            case token_type::literal_true:
+            case token_type::value_integer:
+            case token_type::value_string:
+            case token_type::value_unsigned:
+                return true;
+
+            default: // the last token was unexpected
+                return false;
+        }
+    }
+
+    /// get next token from lexer
+    token_type get_token()
+    {
+        return (last_token = m_lexer.scan());
+    }
+
+    /*!
+    @throw parse_error.101 if expected token did not occur
+    */
+    bool expect(token_type t)
+    {
+        if (JSON_UNLIKELY(t != last_token))
+        {
+            errored = true;
+            expected = t;
+            if (allow_exceptions)
+            {
+                throw_exception();
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    [[noreturn]] void throw_exception() const
+    {
+        std::string error_msg = "syntax error - ";
+        if (last_token == token_type::parse_error)
+        {
+            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
+                         m_lexer.get_token_string() + "'";
+        }
+        else
+        {
+            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
+        }
+
+        if (expected != token_type::uninitialized)
+        {
+            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
+        }
+
+        JSON_THROW(parse_error::create(101, m_lexer.get_position(), error_msg));
+    }
+
+  private:
+    /// current level of recursion
+    int depth = 0;
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// the type of the last read token
+    token_type last_token = token_type::uninitialized;
+    /// the lexer
+    lexer_t m_lexer;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// possible reason for the syntax error
+    token_type expected = token_type::uninitialized;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+///////////////
+// iterators //
+///////////////
+
+/*!
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+
+    constexpr difference_type get_value() const noexcept
+    {
+        return m_it;
+    }
+
+    /// set iterator to a defined beginning
+    void set_begin() noexcept
+    {
+        m_it = begin_value;
+    }
+
+    /// set iterator to a defined past the end
+    void set_end() noexcept
+    {
+        m_it = end_value;
+    }
+
+    /// return whether the iterator can be dereferenced
+    constexpr bool is_begin() const noexcept
+    {
+        return m_it == begin_value;
+    }
+
+    /// return whether the iterator is at end
+    constexpr bool is_end() const noexcept
+    {
+        return m_it == end_value;
+    }
+
+    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it == rhs.m_it;
+    }
+
+    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it < rhs.m_it;
+    }
+
+    primitive_iterator_t operator+(difference_type i)
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it - rhs.m_it;
+    }
+
+    friend std::ostream& operator<<(std::ostream& os, primitive_iterator_t it)
+    {
+        return os << it.m_it;
+    }
+
+    primitive_iterator_t& operator++()
+    {
+        ++m_it;
+        return *this;
+    }
+
+    primitive_iterator_t operator++(int)
+    {
+        auto result = *this;
+        m_it++;
+        return result;
+    }
+
+    primitive_iterator_t& operator--()
+    {
+        --m_it;
+        return *this;
+    }
+
+    primitive_iterator_t operator--(int)
+    {
+        auto result = *this;
+        m_it--;
+        return result;
+    }
+
+    primitive_iterator_t& operator+=(difference_type n)
+    {
+        m_it += n;
+        return *this;
+    }
+
+    primitive_iterator_t& operator-=(difference_type n)
+    {
+        m_it -= n;
+        return *this;
+    }
+
+  private:
+    static constexpr difference_type begin_value = 0;
+    static constexpr difference_type end_value = begin_value + 1;
+
+    /// iterator as signed integer type
+    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+};
+
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+    /// iterator for JSON objects
+    typename BasicJsonType::object_t::iterator object_iterator {};
+    /// iterator for JSON arrays
+    typename BasicJsonType::array_t::iterator array_iterator {};
+    /// generic iterator for all other types
+    primitive_iterator_t primitive_iterator {};
+};
+
+template<typename IteratorType> class iteration_proxy;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+
+@note An iterator is called *initialized* when a pointer to a JSON value has
+      been set (e.g., by a constructor or a copy assignment). If the iterator is
+      default-constructed, it is *uninitialized* and most methods are undefined.
+      **The library uses assertions to detect calls on uninitialized iterators.**
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](http://en.cppreference.com/w/cpp/concept/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl : public std::iterator<std::bidirectional_iterator_tag, BasicJsonType>
+{
+    /// allow basic_json to access private members
+    friend iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+    friend BasicJsonType;
+    friend iteration_proxy<iter_impl>;
+
+    using object_t = typename BasicJsonType::object_t;
+    using array_t = typename BasicJsonType::array_t;
+    // make sure BasicJsonType is basic_json or const basic_json
+    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+                  "iter_impl only accepts (const) basic_json");
+
+  public:
+    /// the type of the values when the iterator is dereferenced
+    using value_type = typename BasicJsonType::value_type;
+    /// a type to represent differences between iterators
+    using difference_type = typename BasicJsonType::difference_type;
+    /// defines a pointer to the type iterated over (value_type)
+    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+          typename BasicJsonType::const_pointer,
+          typename BasicJsonType::pointer>::type;
+    /// defines a reference to the type iterated over (value_type)
+    using reference =
+        typename std::conditional<std::is_const<BasicJsonType>::value,
+        typename BasicJsonType::const_reference,
+        typename BasicJsonType::reference>::type;
+
+    /// default constructor
+    iter_impl() = default;
+
+    /*!
+    @brief constructor for a given JSON instance
+    @param[in] object  pointer to a JSON object for this iterator
+    @pre object != nullptr
+    @post The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    explicit iter_impl(pointer object) noexcept : m_object(object)
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = typename object_t::iterator();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = typename array_t::iterator();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator = primitive_iterator_t();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @note The conventional copy constructor and copy assignment are implicitly
+          defined. Combined with the following converting constructor and
+          assignment, they support: (1) copy from iterator to iterator, (2)
+          copy from const iterator to const iterator, and (3) conversion from
+          iterator to const iterator. However conversion from const iterator
+          to iterator is not defined.
+    */
+
+    /*!
+    @brief converting constructor
+    @param[in] other  non-const iterator to copy from
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it) {}
+
+    /*!
+    @brief converting assignment
+    @param[in,out] other  non-const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+  private:
+    /*!
+    @brief set the iterator to the first value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_begin() noexcept
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->begin();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->begin();
+                break;
+            }
+
+            case value_t::null:
+            {
+                // set to end so begin()==end() is true: null is empty
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator.set_begin();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @brief set the iterator past the last value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_end() noexcept
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->end();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->end();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+        }
+    }
+
+  public:
+    /*!
+    @brief return a reference to the value pointed to by the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator*() const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                assert(m_it.object_iterator != m_object->m_value.object->end());
+                return m_it.object_iterator->second;
+            }
+
+            case value_t::array:
+            {
+                assert(m_it.array_iterator != m_object->m_value.array->end());
+                return *m_it.array_iterator;
+            }
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief dereference the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    pointer operator->() const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                assert(m_it.object_iterator != m_object->m_value.object->end());
+                return &(m_it.object_iterator->second);
+            }
+
+            case value_t::array:
+            {
+                assert(m_it.array_iterator != m_object->m_value.array->end());
+                return &*m_it.array_iterator;
+            }
+
+            default:
+            {
+                if (JSON_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief post-increment (it++)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator++(int)
+    {
+        auto result = *this;
+        ++(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-increment (++it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator++()
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, 1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, 1);
+                break;
+            }
+
+            default:
+            {
+                ++m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief post-decrement (it--)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator--(int)
+    {
+        auto result = *this;
+        --(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-decrement (--it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator--()
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, -1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, -1);
+                break;
+            }
+
+            default:
+            {
+                --m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief  comparison: equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator==(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+        }
+
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                return (m_it.object_iterator == other.m_it.object_iterator);
+
+            case value_t::array:
+                return (m_it.array_iterator == other.m_it.array_iterator);
+
+            default:
+                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief  comparison: not equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator!=(const iter_impl& other) const
+    {
+        return not operator==(other);
+    }
+
+    /*!
+    @brief  comparison: smaller
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+        }
+
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators"));
+
+            case value_t::array:
+                return (m_it.array_iterator < other.m_it.array_iterator);
+
+            default:
+                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief  comparison: less than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<=(const iter_impl& other) const
+    {
+        return not other.operator < (*this);
+    }
+
+    /*!
+    @brief  comparison: greater than
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>(const iter_impl& other) const
+    {
+        return not operator<=(other);
+    }
+
+    /*!
+    @brief  comparison: greater than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>=(const iter_impl& other) const
+    {
+        return not operator<(other);
+    }
+
+    /*!
+    @brief  add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator+=(difference_type i)
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, i);
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator += i;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief  subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator-=(difference_type i)
+    {
+        return operator+=(-i);
+    }
+
+    /*!
+    @brief  add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator+(difference_type i) const
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief  addition of distance and iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    friend iter_impl operator+(difference_type i, const iter_impl& it)
+    {
+        auto result = it;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief  subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator-(difference_type i) const
+    {
+        auto result = *this;
+        result -= i;
+        return result;
+    }
+
+    /*!
+    @brief  return difference
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    difference_type operator-(const iter_impl& other) const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+            case value_t::array:
+                return m_it.array_iterator - other.m_it.array_iterator;
+
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief  access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators"));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief  return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    typename object_t::key_type key() const
+    {
+        assert(m_object != nullptr);
+
+        if (JSON_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators"));
+    }
+
+    /*!
+    @brief  return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  private:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it = {};
+};
+
+/// proxy class for the iterator_wrapper functions
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// helper class for iteration
+    class iteration_proxy_internal
+    {
+      private:
+        /// the iterator
+        IteratorType anchor;
+        /// an index for arrays (used to create key names)
+        std::size_t array_index = 0;
+
+      public:
+        explicit iteration_proxy_internal(IteratorType it) noexcept : anchor(it) {}
+
+        /// dereference operator (needed for range-based for)
+        iteration_proxy_internal& operator*()
+        {
+            return *this;
+        }
+
+        /// increment operator (needed for range-based for)
+        iteration_proxy_internal& operator++()
+        {
+            ++anchor;
+            ++array_index;
+
+            return *this;
+        }
+
+        /// inequality operator (needed for range-based for)
+        bool operator!=(const iteration_proxy_internal& o) const noexcept
+        {
+            return anchor != o.anchor;
+        }
+
+        /// return key of the iterator
+        std::string key() const
+        {
+            assert(anchor.m_object != nullptr);
+
+            switch (anchor.m_object->type())
+            {
+                // use integer array index as key
+                case value_t::array:
+                    return std::to_string(array_index);
+
+                // use key from the object
+                case value_t::object:
+                    return anchor.key();
+
+                // use an empty key for all primitive types
+                default:
+                    return "";
+            }
+        }
+
+        /// return value of the iterator
+        typename IteratorType::reference value() const
+        {
+            return anchor.value();
+        }
+    };
+
+    /// the container to iterate
+    typename IteratorType::reference container;
+
+  public:
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont)
+        : container(cont) {}
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_internal begin() noexcept
+    {
+        return iteration_proxy_internal(container.begin());
+    }
+
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_internal end() noexcept
+    {
+        return iteration_proxy_internal(container.end());
+    }
+};
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](http://en.cppreference.com/w/cpp/concept/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+- [OutputIterator](http://en.cppreference.com/w/cpp/concept/OutputIterator):
+  It is possible to write to the pointed-to element (only if @a Base is
+  @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    /// shortcut to the reverse iterator adaptor
+    using base_iterator = std::reverse_iterator<Base>;
+    /// the reference type for the pointed-to element
+    using reference = typename Base::reference;
+
+    /// create reverse iterator from iterator
+    json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+        : base_iterator(it) {}
+
+    /// create reverse iterator from base class
+    json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+    /// post-increment (it++)
+    json_reverse_iterator operator++(int)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+    }
+
+    /// pre-increment (++it)
+    json_reverse_iterator& operator++()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+    }
+
+    /// post-decrement (it--)
+    json_reverse_iterator operator--(int)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+    }
+
+    /// pre-decrement (--it)
+    json_reverse_iterator& operator--()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+    }
+
+    /// add to iterator
+    json_reverse_iterator& operator+=(difference_type i)
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+    }
+
+    /// add to iterator
+    json_reverse_iterator operator+(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+    }
+
+    /// subtract from iterator
+    json_reverse_iterator operator-(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+    }
+
+    /// return difference
+    difference_type operator-(const json_reverse_iterator& other) const
+    {
+        return base_iterator(*this) - base_iterator(other);
+    }
+
+    /// access to successor
+    reference operator[](difference_type n) const
+    {
+        return *(this->operator+(n));
+    }
+
+    /// return the key of an object iterator
+    auto key() const -> decltype(std::declval<Base>().key())
+    {
+        auto it = --this->base();
+        return it.key();
+    }
+
+    /// return the value of an iterator
+    reference value() const
+    {
+        auto it = --this->base();
+        return it.operator * ();
+    }
+};
+
+/////////////////////
+// output adapters //
+/////////////////////
+
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+    virtual void write_character(CharType c) = 0;
+    virtual void write_characters(const CharType* s, std::size_t length) = 0;
+    virtual ~output_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_vector_adapter(std::vector<CharType>& vec) : v(vec) {}
+
+    void write_character(CharType c) override
+    {
+        v.push_back(c);
+    }
+
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        std::copy(s, s + length, std::back_inserter(v));
+    }
+
+  private:
+    std::vector<CharType>& v;
+};
+
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_stream_adapter(std::basic_ostream<CharType>& s) : stream(s) {}
+
+    void write_character(CharType c) override
+    {
+        stream.put(c);
+    }
+
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        stream.write(s, static_cast<std::streamsize>(length));
+    }
+
+  private:
+    std::basic_ostream<CharType>& stream;
+};
+
+/// output adapter for basic_string
+template<typename CharType>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_string_adapter(std::basic_string<CharType>& s) : str(s) {}
+
+    void write_character(CharType c) override
+    {
+        str.push_back(c);
+    }
+
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        str.append(s, length);
+    }
+
+  private:
+    std::basic_string<CharType>& str;
+};
+
+template<typename CharType>
+class output_adapter
+{
+  public:
+    output_adapter(std::vector<CharType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType>>(vec)) {}
+
+    output_adapter(std::basic_ostream<CharType>& s)
+        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+
+    output_adapter(std::basic_string<CharType>& s)
+        : oa(std::make_shared<output_string_adapter<CharType>>(s)) {}
+
+    operator output_adapter_t<CharType>()
+    {
+        return oa;
+    }
+
+  private:
+    output_adapter_t<CharType> oa = nullptr;
+};
+
+//////////////////////////////
+// binary reader and writer //
+//////////////////////////////
+
+/*!
+@brief deserialization of CBOR and MessagePack values
+*/
+template<typename BasicJsonType>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(input_adapter_t adapter) : ia(std::move(adapter))
+    {
+        assert(ia);
+    }
+
+    /*!
+    @brief create a JSON value from CBOR input
+
+    @param[in] strict  whether to expect the input to be consumed completed
+    @return JSON value created from CBOR input
+
+    @throw parse_error.110 if input ended unexpectedly or the end of file was
+                           not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported byte was read
+    */
+    BasicJsonType parse_cbor(const bool strict)
+    {
+        const auto res = parse_cbor_internal();
+        if (strict)
+        {
+            get();
+            check_eof(true);
+        }
+        return res;
+    }
+
+    /*!
+    @brief create a JSON value from MessagePack input
+
+    @param[in] strict  whether to expect the input to be consumed completed
+    @return JSON value created from MessagePack input
+
+    @throw parse_error.110 if input ended unexpectedly or the end of file was
+                           not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported byte was read
+    */
+    BasicJsonType parse_msgpack(const bool strict)
+    {
+        const auto res = parse_msgpack_internal();
+        if (strict)
+        {
+            get();
+            check_eof(true);
+        }
+        return res;
+    }
+
+    /*!
+    @brief determine system byte order
+
+    @return true if and only if system's byte order is little endian
+
+    @note from http://stackoverflow.com/a/1001328/266378
+    */
+    static constexpr bool little_endianess(int num = 1) noexcept
+    {
+        return (*reinterpret_cast<char*>(&num) == 1);
+    }
+
+  private:
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+    */
+    BasicJsonType parse_cbor_internal(const bool get_char = true)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case std::char_traits<char>::eof():
+                JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0a:
+            case 0x0b:
+            case 0x0c:
+            case 0x0d:
+            case 0x0e:
+            case 0x0f:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return static_cast<number_unsigned_t>(current);
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+                return get_number<uint8_t>();
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+                return get_number<uint16_t>();
+
+            case 0x1a: // Unsigned integer (four-byte uint32_t follows)
+                return get_number<uint32_t>();
+
+            case 0x1b: // Unsigned integer (eight-byte uint64_t follows)
+                return get_number<uint64_t>();
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2a:
+            case 0x2b:
+            case 0x2c:
+            case 0x2d:
+            case 0x2e:
+            case 0x2f:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return static_cast<int8_t>(0x20 - 1 - current);
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                // must be uint8_t !
+                return static_cast<number_integer_t>(-1) - get_number<uint8_t>();
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                return static_cast<number_integer_t>(-1) - get_number<uint16_t>();
+            }
+
+            case 0x3a: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                return static_cast<number_integer_t>(-1) - get_number<uint32_t>();
+            }
+
+            case 0x3b: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                return static_cast<number_integer_t>(-1) -
+                       static_cast<number_integer_t>(get_number<uint64_t>());
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6a:
+            case 0x6b:
+            case 0x6c:
+            case 0x6d:
+            case 0x6e:
+            case 0x6f:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7a: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7b: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7f: // UTF-8 string (indefinite length)
+            {
+                return get_cbor_string();
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8a:
+            case 0x8b:
+            case 0x8c:
+            case 0x8d:
+            case 0x8e:
+            case 0x8f:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            {
+                return get_cbor_array(current & 0x1f);
+            }
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                return get_cbor_array(get_number<uint8_t>());
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                return get_cbor_array(get_number<uint16_t>());
+            }
+
+            case 0x9a: // array (four-byte uint32_t for n follow)
+            {
+                return get_cbor_array(get_number<uint32_t>());
+            }
+
+            case 0x9b: // array (eight-byte uint64_t for n follow)
+            {
+                return get_cbor_array(get_number<uint64_t>());
+            }
+
+            case 0x9f: // array (indefinite length)
+            {
+                BasicJsonType result = value_t::array;
+                while (get() != 0xff)
+                {
+                    result.push_back(parse_cbor_internal(false));
+                }
+                return result;
+            }
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xa0:
+            case 0xa1:
+            case 0xa2:
+            case 0xa3:
+            case 0xa4:
+            case 0xa5:
+            case 0xa6:
+            case 0xa7:
+            case 0xa8:
+            case 0xa9:
+            case 0xaa:
+            case 0xab:
+            case 0xac:
+            case 0xad:
+            case 0xae:
+            case 0xaf:
+            case 0xb0:
+            case 0xb1:
+            case 0xb2:
+            case 0xb3:
+            case 0xb4:
+            case 0xb5:
+            case 0xb6:
+            case 0xb7:
+            {
+                return get_cbor_object(current & 0x1f);
+            }
+
+            case 0xb8: // map (one-byte uint8_t for n follows)
+            {
+                return get_cbor_object(get_number<uint8_t>());
+            }
+
+            case 0xb9: // map (two-byte uint16_t for n follow)
+            {
+                return get_cbor_object(get_number<uint16_t>());
+            }
+
+            case 0xba: // map (four-byte uint32_t for n follow)
+            {
+                return get_cbor_object(get_number<uint32_t>());
+            }
+
+            case 0xbb: // map (eight-byte uint64_t for n follow)
+            {
+                return get_cbor_object(get_number<uint64_t>());
+            }
+
+            case 0xbf: // map (indefinite length)
+            {
+                BasicJsonType result = value_t::object;
+                while (get() != 0xff)
+                {
+                    auto key = get_cbor_string();
+                    result[key] = parse_cbor_internal();
+                }
+                return result;
+            }
+
+            case 0xf4: // false
+            {
+                return false;
+            }
+
+            case 0xf5: // true
+            {
+                return true;
+            }
+
+            case 0xf6: // null
+            {
+                return value_t::null;
+            }
+
+            case 0xf9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const int byte1 = get();
+                check_eof();
+                const int byte2 = get();
+                check_eof();
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const int half = (byte1 << 8) + byte2;
+                const int exp = (half >> 10) & 0x1f;
+                const int mant = half & 0x3ff;
+                double val;
+                if (exp == 0)
+                {
+                    val = std::ldexp(mant, -24);
+                }
+                else if (exp != 31)
+                {
+                    val = std::ldexp(mant + 1024, exp - 25);
+                }
+                else
+                {
+                    val = (mant == 0) ? std::numeric_limits<double>::infinity()
+                          : std::numeric_limits<double>::quiet_NaN();
+                }
+                return (half & 0x8000) != 0 ? -val : val;
+            }
+
+            case 0xfa: // Single-Precision Float (four-byte IEEE 754)
+            {
+                return get_number<float>();
+            }
+
+            case 0xfb: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                return get_number<double>();
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                std::stringstream ss;
+                ss << std::setw(2) << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(112, chars_read, "error reading CBOR; last byte: 0x" + ss.str()));
+            }
+        }
+    }
+
+    BasicJsonType parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case std::char_traits<char>::eof():
+                JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0a:
+            case 0x0b:
+            case 0x0c:
+            case 0x0d:
+            case 0x0e:
+            case 0x0f:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1a:
+            case 0x1b:
+            case 0x1c:
+            case 0x1d:
+            case 0x1e:
+            case 0x1f:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2a:
+            case 0x2b:
+            case 0x2c:
+            case 0x2d:
+            case 0x2e:
+            case 0x2f:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3a:
+            case 0x3b:
+            case 0x3c:
+            case 0x3d:
+            case 0x3e:
+            case 0x3f:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4a:
+            case 0x4b:
+            case 0x4c:
+            case 0x4d:
+            case 0x4e:
+            case 0x4f:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5a:
+            case 0x5b:
+            case 0x5c:
+            case 0x5d:
+            case 0x5e:
+            case 0x5f:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6a:
+            case 0x6b:
+            case 0x6c:
+            case 0x6d:
+            case 0x6e:
+            case 0x6f:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7a:
+            case 0x7b:
+            case 0x7c:
+            case 0x7d:
+            case 0x7e:
+            case 0x7f:
+                return static_cast<number_unsigned_t>(current);
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8a:
+            case 0x8b:
+            case 0x8c:
+            case 0x8d:
+            case 0x8e:
+            case 0x8f:
+            {
+                return get_msgpack_object(current & 0x0f);
+            }
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9a:
+            case 0x9b:
+            case 0x9c:
+            case 0x9d:
+            case 0x9e:
+            case 0x9f:
+            {
+                return get_msgpack_array(current & 0x0f);
+            }
+
+            // fixstr
+            case 0xa0:
+            case 0xa1:
+            case 0xa2:
+            case 0xa3:
+            case 0xa4:
+            case 0xa5:
+            case 0xa6:
+            case 0xa7:
+            case 0xa8:
+            case 0xa9:
+            case 0xaa:
+            case 0xab:
+            case 0xac:
+            case 0xad:
+            case 0xae:
+            case 0xaf:
+            case 0xb0:
+            case 0xb1:
+            case 0xb2:
+            case 0xb3:
+            case 0xb4:
+            case 0xb5:
+            case 0xb6:
+            case 0xb7:
+            case 0xb8:
+            case 0xb9:
+            case 0xba:
+            case 0xbb:
+            case 0xbc:
+            case 0xbd:
+            case 0xbe:
+            case 0xbf:
+                return get_msgpack_string();
+
+            case 0xc0: // nil
+                return value_t::null;
+
+            case 0xc2: // false
+                return false;
+
+            case 0xc3: // true
+                return true;
+
+            case 0xca: // float 32
+                return get_number<float>();
+
+            case 0xcb: // float 64
+                return get_number<double>();
+
+            case 0xcc: // uint 8
+                return get_number<uint8_t>();
+
+            case 0xcd: // uint 16
+                return get_number<uint16_t>();
+
+            case 0xce: // uint 32
+                return get_number<uint32_t>();
+
+            case 0xcf: // uint 64
+                return get_number<uint64_t>();
+
+            case 0xd0: // int 8
+                return get_number<int8_t>();
+
+            case 0xd1: // int 16
+                return get_number<int16_t>();
+
+            case 0xd2: // int 32
+                return get_number<int32_t>();
+
+            case 0xd3: // int 64
+                return get_number<int64_t>();
+
+            case 0xd9: // str 8
+            case 0xda: // str 16
+            case 0xdb: // str 32
+                return get_msgpack_string();
+
+            case 0xdc: // array 16
+            {
+                return get_msgpack_array(get_number<uint16_t>());
+            }
+
+            case 0xdd: // array 32
+            {
+                return get_msgpack_array(get_number<uint32_t>());
+            }
+
+            case 0xde: // map 16
+            {
+                return get_msgpack_object(get_number<uint16_t>());
+            }
+
+            case 0xdf: // map 32
+            {
+                return get_msgpack_object(get_number<uint32_t>());
+            }
+
+            // positive fixint
+            case 0xe0:
+            case 0xe1:
+            case 0xe2:
+            case 0xe3:
+            case 0xe4:
+            case 0xe5:
+            case 0xe6:
+            case 0xe7:
+            case 0xe8:
+            case 0xe9:
+            case 0xea:
+            case 0xeb:
+            case 0xec:
+            case 0xed:
+            case 0xee:
+            case 0xef:
+            case 0xf0:
+            case 0xf1:
+            case 0xf2:
+            case 0xf3:
+            case 0xf4:
+            case 0xf5:
+            case 0xf6:
+            case 0xf7:
+            case 0xf8:
+            case 0xf9:
+            case 0xfa:
+            case 0xfb:
+            case 0xfc:
+            case 0xfd:
+            case 0xfe:
+            case 0xff:
+                return static_cast<int8_t>(current);
+
+            default: // anything else
+            {
+                std::stringstream ss;
+                ss << std::setw(2) << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(112, chars_read,
+                                               "error reading MessagePack; last byte: 0x" + ss.str()));
+            }
+        }
+    }
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `std::char_traits<char>::eof()` in that case.
+
+    @return character read from the input
+    */
+    int get()
+    {
+        ++chars_read;
+        return (current = ia->get_character());
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+
+    @return number of type @a NumberType
+
+    @note This function needs to respect the system's endianess, because
+          bytes in CBOR and MessagePack are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+
+    @throw parse_error.110 if input has less than `sizeof(NumberType)` bytes
+    */
+    template<typename NumberType> NumberType get_number()
+    {
+        // step 1: read input into array with system's byte order
+        std::array<uint8_t, sizeof(NumberType)> vec;
+        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
+        {
+            get();
+            check_eof();
+
+            // reverse byte order prior to conversion if necessary
+            if (is_little_endian)
+            {
+                vec[sizeof(NumberType) - i - 1] = static_cast<uint8_t>(current);
+            }
+            else
+            {
+                vec[i] = static_cast<uint8_t>(current); // LCOV_EXCL_LINE
+            }
+        }
+
+        // step 2: convert array into number of type T and return
+        NumberType result;
+        std::memcpy(&result, vec.data(), sizeof(NumberType));
+        return result;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @param[in] len number of bytes to read
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref check_eof() detects the end of
+          the input before we run out of string memory.
+
+    @return string created by reading @a len bytes
+
+    @throw parse_error.110 if input has less than @a len bytes
+    */
+    template<typename NumberType>
+    std::string get_string(const NumberType len)
+    {
+        std::string result;
+        std::generate_n(std::back_inserter(result), len, [this]()
+        {
+            get();
+            check_eof();
+            return static_cast<char>(current);
+        });
+        return result;
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @return string
+
+    @throw parse_error.110 if input ended
+    @throw parse_error.113 if an unexpected byte is read
+    */
+    std::string get_cbor_string()
+    {
+        check_eof();
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6a:
+            case 0x6b:
+            case 0x6c:
+            case 0x6d:
+            case 0x6e:
+            case 0x6f:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(current & 0x1f);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                return get_string(get_number<uint8_t>());
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                return get_string(get_number<uint16_t>());
+            }
+
+            case 0x7a: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                return get_string(get_number<uint32_t>());
+            }
+
+            case 0x7b: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                return get_string(get_number<uint64_t>());
+            }
+
+            case 0x7f: // UTF-8 string (indefinite length)
+            {
+                std::string result;
+                while (get() != 0xff)
+                {
+                    check_eof();
+                    result.push_back(static_cast<char>(current));
+                }
+                return result;
+            }
+
+            default:
+            {
+                std::stringstream ss;
+                ss << std::setw(2) << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(113, chars_read, "expected a CBOR string; last byte: 0x" + ss.str()));
+            }
+        }
+    }
+
+    template<typename NumberType>
+    BasicJsonType get_cbor_array(const NumberType len)
+    {
+        BasicJsonType result = value_t::array;
+        std::generate_n(std::back_inserter(*result.m_value.array), len, [this]()
+        {
+            return parse_cbor_internal();
+        });
+        return result;
+    }
+
+    template<typename NumberType>
+    BasicJsonType get_cbor_object(const NumberType len)
+    {
+        BasicJsonType result = value_t::object;
+        std::generate_n(std::inserter(*result.m_value.object,
+                                      result.m_value.object->end()),
+                        len, [this]()
+        {
+            get();
+            auto key = get_cbor_string();
+            auto val = parse_cbor_internal();
+            return std::make_pair(std::move(key), std::move(val));
+        });
+        return result;
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @return string
+
+    @throw parse_error.110 if input ended
+    @throw parse_error.113 if an unexpected byte is read
+    */
+    std::string get_msgpack_string()
+    {
+        check_eof();
+
+        switch (current)
+        {
+            // fixstr
+            case 0xa0:
+            case 0xa1:
+            case 0xa2:
+            case 0xa3:
+            case 0xa4:
+            case 0xa5:
+            case 0xa6:
+            case 0xa7:
+            case 0xa8:
+            case 0xa9:
+            case 0xaa:
+            case 0xab:
+            case 0xac:
+            case 0xad:
+            case 0xae:
+            case 0xaf:
+            case 0xb0:
+            case 0xb1:
+            case 0xb2:
+            case 0xb3:
+            case 0xb4:
+            case 0xb5:
+            case 0xb6:
+            case 0xb7:
+            case 0xb8:
+            case 0xb9:
+            case 0xba:
+            case 0xbb:
+            case 0xbc:
+            case 0xbd:
+            case 0xbe:
+            case 0xbf:
+            {
+                return get_string(current & 0x1f);
+            }
+
+            case 0xd9: // str 8
+            {
+                return get_string(get_number<uint8_t>());
+            }
+
+            case 0xda: // str 16
+            {
+                return get_string(get_number<uint16_t>());
+            }
+
+            case 0xdb: // str 32
+            {
+                return get_string(get_number<uint32_t>());
+            }
+
+            default:
+            {
+                std::stringstream ss;
+                ss << std::setw(2) << std::setfill('0') << std::hex << current;
+                JSON_THROW(parse_error::create(113, chars_read,
+                                               "expected a MessagePack string; last byte: 0x" + ss.str()));
+            }
+        }
+    }
+
+    template<typename NumberType>
+    BasicJsonType get_msgpack_array(const NumberType len)
+    {
+        BasicJsonType result = value_t::array;
+        std::generate_n(std::back_inserter(*result.m_value.array), len, [this]()
+        {
+            return parse_msgpack_internal();
+        });
+        return result;
+    }
+
+    template<typename NumberType>
+    BasicJsonType get_msgpack_object(const NumberType len)
+    {
+        BasicJsonType result = value_t::object;
+        std::generate_n(std::inserter(*result.m_value.object,
+                                      result.m_value.object->end()),
+                        len, [this]()
+        {
+            get();
+            auto key = get_msgpack_string();
+            auto val = parse_msgpack_internal();
+            return std::make_pair(std::move(key), std::move(val));
+        });
+        return result;
+    }
+
+    /*!
+    @brief check if input ended
+    @throw parse_error.110 if input ended
+    */
+    void check_eof(const bool expect_eof = false) const
+    {
+        if (expect_eof)
+        {
+            if (JSON_UNLIKELY(current != std::char_traits<char>::eof()))
+            {
+                JSON_THROW(parse_error::create(110, chars_read, "expected end of input"));
+            }
+        }
+        else
+        {
+            if (JSON_UNLIKELY(current == std::char_traits<char>::eof()))
+            {
+                JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
+            }
+        }
+    }
+
+  private:
+    /// input adapter
+    input_adapter_t ia = nullptr;
+
+    /// the current character
+    int current = std::char_traits<char>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianess
+    const bool is_little_endian = little_endianess();
+};
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+  public:
+    /*!
+    @brief create a binary writer
+
+    @param[in] adapter  output adapter to write to
+    */
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
+    {
+        assert(oa);
+    }
+
+    /*!
+    @brief[in] j  JSON value to serialize
+    */
+    void write_cbor(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                oa->write_character(static_cast<CharType>(0xf6));
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? static_cast<CharType>(0xf5)
+                                    : static_cast<CharType>(0xf4));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // CBOR does not differentiate between positive signed
+                    // integers and unsigned integers. Therefore, we used the
+                    // code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_integer <= 0x17)
+                    {
+                        write_number(static_cast<uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<uint8_t>::max)())
+                    {
+                        oa->write_character(static_cast<CharType>(0x18));
+                        write_number(static_cast<uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<uint16_t>::max)())
+                    {
+                        oa->write_character(static_cast<CharType>(0x19));
+                        write_number(static_cast<uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<uint32_t>::max)())
+                    {
+                        oa->write_character(static_cast<CharType>(0x1a));
+                        write_number(static_cast<uint32_t>(j.m_value.number_integer));
+                    }
+                    else
+                    {
+                        oa->write_character(static_cast<CharType>(0x1b));
+                        write_number(static_cast<uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    // The conversions below encode the sign in the first
+                    // byte, and the value is converted to a positive number.
+                    const auto positive_number = -1 - j.m_value.number_integer;
+                    if (j.m_value.number_integer >= -24)
+                    {
+                        write_number(static_cast<uint8_t>(0x20 + positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<uint8_t>::max)())
+                    {
+                        oa->write_character(static_cast<CharType>(0x38));
+                        write_number(static_cast<uint8_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<uint16_t>::max)())
+                    {
+                        oa->write_character(static_cast<CharType>(0x39));
+                        write_number(static_cast<uint16_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<uint32_t>::max)())
+                    {
+                        oa->write_character(static_cast<CharType>(0x3a));
+                        write_number(static_cast<uint32_t>(positive_number));
+                    }
+                    else
+                    {
+                        oa->write_character(static_cast<CharType>(0x3b));
+                        write_number(static_cast<uint64_t>(positive_number));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= 0x17)
+                {
+                    write_number(static_cast<uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)())
+                {
+                    oa->write_character(static_cast<CharType>(0x18));
+                    write_number(static_cast<uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<uint16_t>::max)())
+                {
+                    oa->write_character(static_cast<CharType>(0x19));
+                    write_number(static_cast<uint16_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<uint32_t>::max)())
+                {
+                    oa->write_character(static_cast<CharType>(0x1a));
+                    write_number(static_cast<uint32_t>(j.m_value.number_unsigned));
+                }
+                else
+                {
+                    oa->write_character(static_cast<CharType>(0x1b));
+                    write_number(static_cast<uint64_t>(j.m_value.number_unsigned));
+                }
+                break;
+            }
+
+            case value_t::number_float: // Double-Precision Float
+            {
+                oa->write_character(static_cast<CharType>(0xfb));
+                write_number(j.m_value.number_float);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<uint8_t>(0x60 + N));
+                }
+                else if (N <= 0xff)
+                {
+                    oa->write_character(static_cast<CharType>(0x78));
+                    write_number(static_cast<uint8_t>(N));
+                }
+                else if (N <= 0xffff)
+                {
+                    oa->write_character(static_cast<CharType>(0x79));
+                    write_number(static_cast<uint16_t>(N));
+                }
+                else if (N <= 0xffffffff)
+                {
+                    oa->write_character(static_cast<CharType>(0x7a));
+                    write_number(static_cast<uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= 0xffffffffffffffff)
+                {
+                    oa->write_character(static_cast<CharType>(0x7b));
+                    write_number(static_cast<uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<uint8_t>(0x80 + N));
+                }
+                else if (N <= 0xff)
+                {
+                    oa->write_character(static_cast<CharType>(0x98));
+                    write_number(static_cast<uint8_t>(N));
+                }
+                else if (N <= 0xffff)
+                {
+                    oa->write_character(static_cast<CharType>(0x99));
+                    write_number(static_cast<uint16_t>(N));
+                }
+                else if (N <= 0xffffffff)
+                {
+                    oa->write_character(static_cast<CharType>(0x9a));
+                    write_number(static_cast<uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= 0xffffffffffffffff)
+                {
+                    oa->write_character(static_cast<CharType>(0x9b));
+                    write_number(static_cast<uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_cbor(el);
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<uint8_t>(0xa0 + N));
+                }
+                else if (N <= 0xff)
+                {
+                    oa->write_character(static_cast<CharType>(0xb8));
+                    write_number(static_cast<uint8_t>(N));
+                }
+                else if (N <= 0xffff)
+                {
+                    oa->write_character(static_cast<CharType>(0xb9));
+                    write_number(static_cast<uint16_t>(N));
+                }
+                else if (N <= 0xffffffff)
+                {
+                    oa->write_character(static_cast<CharType>(0xba));
+                    write_number(static_cast<uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= 0xffffffffffffffff)
+                {
+                    oa->write_character(static_cast<CharType>(0xbb));
+                    write_number(static_cast<uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_cbor(el.first);
+                    write_cbor(el.second);
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @brief[in] j  JSON value to serialize
+    */
+    void write_msgpack(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null: // nil
+            {
+                oa->write_character(static_cast<CharType>(0xc0));
+                break;
+            }
+
+            case value_t::boolean: // true and false
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? static_cast<CharType>(0xc3)
+                                    : static_cast<CharType>(0xc2));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // MessagePack does not differentiate between positive
+                    // signed integers and unsigned integers. Therefore, we used
+                    // the code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_unsigned < 128)
+                    {
+                        // positive fixnum
+                        write_number(static_cast<uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)())
+                    {
+                        // uint 8
+                        oa->write_character(static_cast<CharType>(0xcc));
+                        write_number(static_cast<uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<uint16_t>::max)())
+                    {
+                        // uint 16
+                        oa->write_character(static_cast<CharType>(0xcd));
+                        write_number(static_cast<uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<uint32_t>::max)())
+                    {
+                        // uint 32
+                        oa->write_character(static_cast<CharType>(0xce));
+                        write_number(static_cast<uint32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<uint64_t>::max)())
+                    {
+                        // uint 64
+                        oa->write_character(static_cast<CharType>(0xcf));
+                        write_number(static_cast<uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    if (j.m_value.number_integer >= -32)
+                    {
+                        // negative fixnum
+                        write_number(static_cast<int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<int8_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<int8_t>::max)())
+                    {
+                        // int 8
+                        oa->write_character(static_cast<CharType>(0xd0));
+                        write_number(static_cast<int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<int16_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<int16_t>::max)())
+                    {
+                        // int 16
+                        oa->write_character(static_cast<CharType>(0xd1));
+                        write_number(static_cast<int16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<int32_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<int32_t>::max)())
+                    {
+                        // int 32
+                        oa->write_character(static_cast<CharType>(0xd2));
+                        write_number(static_cast<int32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<int64_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<int64_t>::max)())
+                    {
+                        // int 64
+                        oa->write_character(static_cast<CharType>(0xd3));
+                        write_number(static_cast<int64_t>(j.m_value.number_integer));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned < 128)
+                {
+                    // positive fixnum
+                    write_number(static_cast<uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)())
+                {
+                    // uint 8
+                    oa->write_character(static_cast<CharType>(0xcc));
+                    write_number(static_cast<uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<uint16_t>::max)())
+                {
+                    // uint 16
+                    oa->write_character(static_cast<CharType>(0xcd));
+                    write_number(static_cast<uint16_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<uint32_t>::max)())
+                {
+                    // uint 32
+                    oa->write_character(static_cast<CharType>(0xce));
+                    write_number(static_cast<uint32_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<uint64_t>::max)())
+                {
+                    // uint 64
+                    oa->write_character(static_cast<CharType>(0xcf));
+                    write_number(static_cast<uint64_t>(j.m_value.number_integer));
+                }
+                break;
+            }
+
+            case value_t::number_float: // float 64
+            {
+                oa->write_character(static_cast<CharType>(0xcb));
+                write_number(j.m_value.number_float);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 31)
+                {
+                    // fixstr
+                    write_number(static_cast<uint8_t>(0xa0 | N));
+                }
+                else if (N <= 255)
+                {
+                    // str 8
+                    oa->write_character(static_cast<CharType>(0xd9));
+                    write_number(static_cast<uint8_t>(N));
+                }
+                else if (N <= 65535)
+                {
+                    // str 16
+                    oa->write_character(static_cast<CharType>(0xda));
+                    write_number(static_cast<uint16_t>(N));
+                }
+                else if (N <= 4294967295)
+                {
+                    // str 32
+                    oa->write_character(static_cast<CharType>(0xdb));
+                    write_number(static_cast<uint32_t>(N));
+                }
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 15)
+                {
+                    // fixarray
+                    write_number(static_cast<uint8_t>(0x90 | N));
+                }
+                else if (N <= 0xffff)
+                {
+                    // array 16
+                    oa->write_character(static_cast<CharType>(0xdc));
+                    write_number(static_cast<uint16_t>(N));
+                }
+                else if (N <= 0xffffffff)
+                {
+                    // array 32
+                    oa->write_character(static_cast<CharType>(0xdd));
+                    write_number(static_cast<uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_msgpack(el);
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 15)
+                {
+                    // fixmap
+                    write_number(static_cast<uint8_t>(0x80 | (N & 0xf)));
+                }
+                else if (N <= 65535)
+                {
+                    // map 16
+                    oa->write_character(static_cast<CharType>(0xde));
+                    write_number(static_cast<uint16_t>(N));
+                }
+                else if (N <= 4294967295)
+                {
+                    // map 32
+                    oa->write_character(static_cast<CharType>(0xdf));
+                    write_number(static_cast<uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_msgpack(el.first);
+                    write_msgpack(el.second);
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+  private:
+    /*
+    @brief write a number to output input
+
+    @param[in] n number of type @a NumberType
+    @tparam NumberType the type of the number
+
+    @note This function needs to respect the system's endianess, because bytes
+          in CBOR and MessagePack are stored in network order (big endian) and
+          therefore need reordering on little endian systems.
+    */
+    template<typename NumberType> void write_number(NumberType n)
+    {
+        // step 1: write number to array of length NumberType
+        std::array<CharType, sizeof(NumberType)> vec;
+        std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+        // step 2: write array to output (with possible reordering)
+        if (is_little_endian)
+        {
+            // reverse byte order prior to conversion if necessary
+            std::reverse(vec.begin(), vec.end());
+        }
+
+        oa->write_characters(vec.data(), sizeof(NumberType));
+    }
+
+  private:
+    /// whether we can assume little endianess
+    const bool is_little_endian = binary_reader<BasicJsonType>::little_endianess();
+
+    /// the output
+    output_adapter_t<CharType> oa = nullptr;
+};
+
+///////////////////
+// serialization //
+///////////////////
+
+template<typename BasicJsonType>
+class serializer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+  public:
+    /*!
+    @param[in] s  output stream to serialize to
+    @param[in] ichar  indentation character to use
+    */
+    serializer(output_adapter_t<char> s, const char ichar)
+        : o(std::move(s)), loc(std::localeconv()),
+          thousands_sep(loc->thousands_sep == nullptr ? '\0' : loc->thousands_sep[0]),
+          decimal_point(loc->decimal_point == nullptr ? '\0' : loc->decimal_point[0]),
+          indent_char(ichar), indent_string(512, indent_char) {}
+
+    // delete because of pointer members
+    serializer(const serializer&) = delete;
+    serializer& operator=(const serializer&) = delete;
+
+    /*!
+    @brief internal implementation of the serialization function
+
+    This function is called by the public member function dump and organizes
+    the serialization internally. The indentation level is propagated as
+    additional parameter. In case of arrays and objects, the function is
+    called recursively.
+
+    - strings and object keys are escaped using `escape_string()`
+    - integer numbers are converted implicitly via `operator<<`
+    - floating-point numbers are converted to a string using `"%g"` format
+
+    @param[in] val             value to serialize
+    @param[in] pretty_print    whether the output shall be pretty-printed
+    @param[in] indent_step     the indent level
+    @param[in] current_indent  the current indent level (only used internally)
+    */
+    void dump(const BasicJsonType& val, const bool pretty_print,
+              const bool ensure_ascii,
+              const unsigned int indent_step,
+              const unsigned int current_indent = 0)
+    {
+        switch (val.m_type)
+        {
+            case value_t::object:
+            {
+                if (val.m_value.object->empty())
+                {
+                    o->write_characters("{}", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\": ", 3);
+                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    assert(i != val.m_value.object->cend());
+                    assert(std::next(i) == val.m_value.object->cend());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\": ", 3);
+                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_character('{');
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\":", 2);
+                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    assert(i != val.m_value.object->cend());
+                    assert(std::next(i) == val.m_value.object->cend());
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\":", 2);
+                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character('}');
+                }
+
+                return;
+            }
+
+            case value_t::array:
+            {
+                if (val.m_value.array->empty())
+                {
+                    o->write_characters("[]", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("[\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        dump(*i, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    assert(not val.m_value.array->empty());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character(']');
+                }
+                else
+                {
+                    o->write_character('[');
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        dump(*i, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    assert(not val.m_value.array->empty());
+                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character(']');
+                }
+
+                return;
+            }
+
+            case value_t::string:
+            {
+                o->write_character('\"');
+                dump_escaped(*val.m_value.string, ensure_ascii);
+                o->write_character('\"');
+                return;
+            }
+
+            case value_t::boolean:
+            {
+                if (val.m_value.boolean)
+                {
+                    o->write_characters("true", 4);
+                }
+                else
+                {
+                    o->write_characters("false", 5);
+                }
+                return;
+            }
+
+            case value_t::number_integer:
+            {
+                dump_integer(val.m_value.number_integer);
+                return;
+            }
+
+            case value_t::number_unsigned:
+            {
+                dump_integer(val.m_value.number_unsigned);
+                return;
+            }
+
+            case value_t::number_float:
+            {
+                dump_float(val.m_value.number_float);
+                return;
+            }
+
+            case value_t::discarded:
+            {
+                o->write_characters("<discarded>", 11);
+                return;
+            }
+
+            case value_t::null:
+            {
+                o->write_characters("null", 4);
+                return;
+            }
+        }
+    }
+
+  private:
+    /*!
+    @brief returns the number of expected bytes following in UTF-8 string
+
+    @param[in]  u  the first byte of a UTF-8 string
+    @return  the number of expected bytes following
+    */
+    static constexpr std::size_t bytes_following(const uint8_t u)
+    {
+        return ((u <= 127) ? 0
+                : ((192 <= u and u <= 223) ? 1
+                   : ((224 <= u and u <= 239) ? 2
+                      : ((240 <= u and u <= 247) ? 3 : std::string::npos))));
+    }
+
+    /*!
+    @brief calculates the extra space to escape a JSON string
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+    @return the number of characters required to escape string @a s
+
+    @complexity Linear in the length of string @a s.
+    */
+    static std::size_t extra_space(const string_t& s,
+                                   const bool ensure_ascii) noexcept
+    {
+        std::size_t res = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            switch (s[i])
+            {
+                // control characters that can be escaped with a backslash
+                case '"':
+                case '\\':
+                case '\b':
+                case '\f':
+                case '\n':
+                case '\r':
+                case '\t':
+                {
+                    // from c (1 byte) to \x (2 bytes)
+                    res += 1;
+                    break;
+                }
+
+                // control characters that need \uxxxx escaping
+                case 0x00:
+                case 0x01:
+                case 0x02:
+                case 0x03:
+                case 0x04:
+                case 0x05:
+                case 0x06:
+                case 0x07:
+                case 0x0b:
+                case 0x0e:
+                case 0x0f:
+                case 0x10:
+                case 0x11:
+                case 0x12:
+                case 0x13:
+                case 0x14:
+                case 0x15:
+                case 0x16:
+                case 0x17:
+                case 0x18:
+                case 0x19:
+                case 0x1a:
+                case 0x1b:
+                case 0x1c:
+                case 0x1d:
+                case 0x1e:
+                case 0x1f:
+                {
+                    // from c (1 byte) to \uxxxx (6 bytes)
+                    res += 5;
+                    break;
+                }
+
+                default:
+                {
+                    if (ensure_ascii and (s[i] & 0x80 or s[i] == 0x7F))
+                    {
+                        const auto bytes = bytes_following(static_cast<uint8_t>(s[i]));
+                        if (bytes == std::string::npos)
+                        {
+                            // invalid characters are treated as is, so no
+                            // additional space will be used
+                            break;
+                        }
+
+                        if (bytes == 3)
+                        {
+                            // codepoints that need 4 bytes (i.e., 3 additional
+                            // bytes) in UTF-8 need a surrogate pair when \u
+                            // escaping is used: from 4 bytes to \uxxxx\uxxxx
+                            // (12 bytes)
+                            res += (12 - bytes - 1);
+                        }
+                        else
+                        {
+                            // from x bytes to \uxxxx (6 bytes)
+                            res += (6 - bytes - 1);
+                        }
+
+                        // skip the additional bytes
+                        i += bytes;
+                    }
+                    break;
+                }
+            }
+        }
+
+        return res;
+    }
+
+    static void escape_codepoint(int codepoint, string_t& result, std::size_t& pos)
+    {
+        // expecting a proper codepoint
+        assert(0x00 <= codepoint and codepoint <= 0x10FFFF);
+
+        // the last written character was the backslash before the 'u'
+        assert(result[pos] == '\\');
+
+        // write the 'u'
+        result[++pos] = 'u';
+
+        // convert a number 0..15 to its hex representation (0..f)
+        static const std::array<char, 16> hexify =
+        {
+            {
+                '0', '1', '2', '3', '4', '5', '6', '7',
+                '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+            }
+        };
+
+        if (codepoint < 0x10000)
+        {
+            // codepoints U+0000..U+FFFF can be represented as \uxxxx.
+            result[++pos] = hexify[(codepoint >> 12) & 0x0F];
+            result[++pos] = hexify[(codepoint >> 8) & 0x0F];
+            result[++pos] = hexify[(codepoint >> 4) & 0x0F];
+            result[++pos] = hexify[codepoint & 0x0F];
+        }
+        else
+        {
+            // codepoints U+10000..U+10FFFF need a surrogate pair to be
+            // represented as \uxxxx\uxxxx.
+            // http://www.unicode.org/faq/utf_bom.html#utf16-4
+            codepoint -= 0x10000;
+            const int high_surrogate = 0xD800 | ((codepoint >> 10) & 0x3FF);
+            const int low_surrogate = 0xDC00 | (codepoint & 0x3FF);
+            result[++pos] = hexify[(high_surrogate >> 12) & 0x0F];
+            result[++pos] = hexify[(high_surrogate >> 8) & 0x0F];
+            result[++pos] = hexify[(high_surrogate >> 4) & 0x0F];
+            result[++pos] = hexify[high_surrogate & 0x0F];
+            ++pos;  // backslash is already in output
+            result[++pos] = 'u';
+            result[++pos] = hexify[(low_surrogate >> 12) & 0x0F];
+            result[++pos] = hexify[(low_surrogate >> 8) & 0x0F];
+            result[++pos] = hexify[(low_surrogate >> 4) & 0x0F];
+            result[++pos] = hexify[low_surrogate & 0x0F];
+        }
+
+        ++pos;
+    }
+
+    /*!
+    @brief dump escaped string
+
+    Escape a string by replacing certain special characters by a sequence of an
+    escape character (backslash) and another character and other control
+    characters by a sequence of "\u" followed by a four-digit hex
+    representation. The escaped string is written to output stream @a o.
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+
+    @complexity Linear in the length of string @a s.
+    */
+    void dump_escaped(const string_t& s, const bool ensure_ascii) const
+    {
+        const auto space = extra_space(s, ensure_ascii);
+        if (space == 0)
+        {
+            o->write_characters(s.c_str(), s.size());
+            return;
+        }
+
+        // create a result string of necessary size
+        string_t result(s.size() + space, '\\');
+        std::size_t pos = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            switch (s[i])
+            {
+                case '"': // quotation mark (0x22)
+                {
+                    result[pos + 1] = '"';
+                    pos += 2;
+                    break;
+                }
+
+                case '\\': // reverse solidus (0x5c)
+                {
+                    // nothing to change
+                    pos += 2;
+                    break;
+                }
+
+                case '\b': // backspace (0x08)
+                {
+                    result[pos + 1] = 'b';
+                    pos += 2;
+                    break;
+                }
+
+                case '\f': // formfeed (0x0c)
+                {
+                    result[pos + 1] = 'f';
+                    pos += 2;
+                    break;
+                }
+
+                case '\n': // newline (0x0a)
+                {
+                    result[pos + 1] = 'n';
+                    pos += 2;
+                    break;
+                }
+
+                case '\r': // carriage return (0x0d)
+                {
+                    result[pos + 1] = 'r';
+                    pos += 2;
+                    break;
+                }
+
+                case '\t': // horizontal tab (0x09)
+                {
+                    result[pos + 1] = 't';
+                    pos += 2;
+                    break;
+                }
+
+                default:
+                {
+                    // escape control characters (0x00..0x1F) or, if
+                    // ensure_ascii parameter is used, non-ASCII characters
+                    if ((0x00 <= s[i] and s[i] <= 0x1F) or
+                            (ensure_ascii and (s[i] & 0x80 or s[i] == 0x7F)))
+                    {
+                        const auto bytes = bytes_following(static_cast<uint8_t>(s[i]));
+                        if (bytes == std::string::npos)
+                        {
+                            // copy invalid character as is
+                            result[pos++] = s[i];
+                            break;
+                        }
+
+                        // check that the additional bytes are present
+                        assert(i + bytes < s.size());
+
+                        // to use \uxxxx escaping, we first need to caluclate
+                        // the codepoint from the UTF-8 bytes
+                        int codepoint = 0;
+
+                        assert(0 <= bytes and bytes <= 3);
+                        switch (bytes)
+                        {
+                            case 0:
+                            {
+                                codepoint = s[i] & 0xFF;
+                                break;
+                            }
+
+                            case 1:
+                            {
+                                codepoint = ((s[i] & 0x3F) << 6)
+                                            + (s[i + 1] & 0x7F);
+                                break;
+                            }
+
+                            case 2:
+                            {
+                                codepoint = ((s[i] & 0x1F) << 12)
+                                            + ((s[i + 1] & 0x7F) << 6)
+                                            + (s[i + 2] & 0x7F);
+                                break;
+                            }
+
+                            case 3:
+                            {
+                                codepoint = ((s[i] & 0xF) << 18)
+                                            + ((s[i + 1] & 0x7F) << 12)
+                                            + ((s[i + 2] & 0x7F) << 6)
+                                            + (s[i + 3] & 0x7F);
+                                break;
+                            }
+
+                            default:
+                                break;  // LCOV_EXCL_LINE
+                        }
+
+                        escape_codepoint(codepoint, result, pos);
+                        i += bytes;
+                    }
+                    else
+                    {
+                        // all other characters are added as-is
+                        result[pos++] = s[i];
+                    }
+                    break;
+                }
+            }
+        }
+
+        assert(pos == result.size());
+        o->write_characters(result.c_str(), result.size());
+    }
+
+    /*!
+    @brief dump an integer
+
+    Dump a given integer to output stream @a o. Works internally with
+    @a number_buffer.
+
+    @param[in] x  integer number (signed or unsigned) to dump
+    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+    */
+    template <
+        typename NumberType,
+        detail::enable_if_t<std::is_same<NumberType, number_unsigned_t>::value or
+                            std::is_same<NumberType, number_integer_t>::value,
+                            int> = 0 >
+    void dump_integer(NumberType x)
+    {
+        // special case for "0"
+        if (x == 0)
+        {
+            o->write_character('0');
+            return;
+        }
+
+        const bool is_negative = (x <= 0) and (x != 0);  // see issue #755
+        std::size_t i = 0;
+
+        while (x != 0)
+        {
+            // spare 1 byte for '\0'
+            assert(i < number_buffer.size() - 1);
+
+            const auto digit = std::labs(static_cast<long>(x % 10));
+            number_buffer[i++] = static_cast<char>('0' + digit);
+            x /= 10;
+        }
+
+        if (is_negative)
+        {
+            // make sure there is capacity for the '-'
+            assert(i < number_buffer.size() - 2);
+            number_buffer[i++] = '-';
+        }
+
+        std::reverse(number_buffer.begin(), number_buffer.begin() + i);
+        o->write_characters(number_buffer.data(), i);
+    }
+
+    /*!
+    @brief dump a floating-point number
+
+    Dump a given floating-point number to output stream @a o. Works internally
+    with @a number_buffer.
+
+    @param[in] x  floating-point number to dump
+    */
+    void dump_float(number_float_t x)
+    {
+        // NaN / inf
+        if (not std::isfinite(x) or std::isnan(x))
+        {
+            o->write_characters("null", 4);
+            return;
+        }
+
+        // get number of digits for a text -> float -> text round-trip
+        static constexpr auto d = std::numeric_limits<number_float_t>::digits10;
+
+        // the actual conversion
+        std::ptrdiff_t len = snprintf(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+        // negative value indicates an error
+        assert(len > 0);
+        // check if buffer was large enough
+        assert(static_cast<std::size_t>(len) < number_buffer.size());
+
+        // erase thousands separator
+        if (thousands_sep != '\0')
+        {
+            const auto end = std::remove(number_buffer.begin(),
+                                         number_buffer.begin() + len, thousands_sep);
+            std::fill(end, number_buffer.end(), '\0');
+            assert((end - number_buffer.begin()) <= len);
+            len = (end - number_buffer.begin());
+        }
+
+        // convert decimal point to '.'
+        if (decimal_point != '\0' and decimal_point != '.')
+        {
+            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+            if (dec_pos != number_buffer.end())
+            {
+                *dec_pos = '.';
+            }
+        }
+
+        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+        // determine if need to append ".0"
+        const bool value_is_int_like =
+            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+                         [](char c)
+        {
+            return (c == '.' or c == 'e');
+        });
+
+        if (value_is_int_like)
+        {
+            o->write_characters(".0", 2);
+        }
+    }
+
+  private:
+    /// the output of the serializer
+    output_adapter_t<char> o = nullptr;
+
+    /// a (hopefully) large enough character buffer
+    std::array<char, 64> number_buffer{{}};
+
+    /// the locale
+    const std::lconv* loc = nullptr;
+    /// the locale's thousand separator character
+    const char thousands_sep = '\0';
+    /// the locale's decimal point character
+    const char decimal_point = '\0';
+
+    /// the indentation character
+    const char indent_char;
+
+    /// the indentation string
+    string_t indent_string;
+};
+
+template<typename BasicJsonType>
+class json_ref
+{
+  public:
+    using value_type = BasicJsonType;
+
+    json_ref(value_type&& value)
+        : owned_value(std::move(value)),
+          value_ref(&owned_value),
+          is_rvalue(true)
+    {}
+
+    json_ref(const value_type& value)
+        : value_ref(const_cast<value_type*>(&value)),
+          is_rvalue(false)
+    {}
+
+    json_ref(std::initializer_list<json_ref> init)
+        : owned_value(init),
+          value_ref(&owned_value),
+          is_rvalue(true)
+    {}
+
+    template <class... Args>
+    json_ref(Args&&... args)
+        : owned_value(std::forward<Args>(args)...),
+          value_ref(&owned_value),
+          is_rvalue(true)
+    {}
+
+    // class should be movable only
+    json_ref(json_ref&&) = default;
+    json_ref(const json_ref&) = delete;
+    json_ref& operator=(const json_ref&) = delete;
+
+    value_type moved_or_copied() const
+    {
+        if (is_rvalue)
+        {
+            return std::move(*value_ref);
+        }
+        return *value_ref;
+    }
+
+    value_type const& operator*() const
+    {
+        return *static_cast<value_type const*>(value_ref);
+    }
+
+    value_type const* operator->() const
+    {
+        return static_cast<value_type const*>(value_ref);
+    }
+
+  private:
+    mutable value_type owned_value = nullptr;
+    value_type* value_ref = nullptr;
+    const bool is_rvalue;
+};
+
+} // namespace detail
+
+/// namespace to hold default `to_json` / `from_json` functions
+namespace
+{
+constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
+constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
+}
+
+
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](http://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename, typename>
+struct adl_serializer
+{
+    /*!
+    @brief convert a JSON value to any value type
+
+    This function is usually called by the `get()` function of the
+    @ref basic_json class (either explicit or via conversion operators).
+
+    @param[in] j         JSON value to read from
+    @param[in,out] val  value to write to
+    */
+    template<typename BasicJsonType, typename ValueType>
+    static void from_json(BasicJsonType&& j, ValueType& val) noexcept(
+        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+    {
+        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
+    }
+
+    /*!
+    @brief convert any value type to a JSON value
+
+    This function is usually called by the constructors of the @ref basic_json
+    class.
+
+    @param[in,out] j  JSON value to write to
+    @param[in] val     value to read from
+    */
+    template<typename BasicJsonType, typename ValueType>
+    static void to_json(BasicJsonType& j, ValueType&& val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
+    {
+        ::nlohmann::to_json(j, std::forward<ValueType>(val));
+    }
+};
+
+/*!
+@brief JSON Pointer
+
+A JSON pointer defines a string syntax for identifying a specific value
+within a JSON document. It can be used with functions `at` and
+`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
+
+@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
+
+@since version 2.0.0
+*/
+class json_pointer
+{
+    /// allow basic_json to access private members
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    friend class basic_json;
+
+  public:
+    /*!
+    @brief create JSON pointer
+
+    Create a JSON pointer according to the syntax described in
+    [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
+
+    @param[in] s  string representing the JSON pointer; if omitted, the empty
+                  string is assumed which references the whole JSON value
+
+    @throw parse_error.107 if the given JSON pointer @a s is nonempty and
+    does not begin with a slash (`/`); see example below
+
+    @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s
+    is not followed by `0` (representing `~`) or `1` (representing `/`);
+    see example below
+
+    @liveexample{The example shows the construction several valid JSON
+    pointers as well as the exceptional behavior.,json_pointer}
+
+    @since version 2.0.0
+    */
+    explicit json_pointer(const std::string& s = "") : reference_tokens(split(s)) {}
+
+    /*!
+    @brief return a string representation of the JSON pointer
+
+    @invariant For each JSON pointer `ptr`, it holds:
+    @code {.cpp}
+    ptr == json_pointer(ptr.to_string());
+    @endcode
+
+    @return a string representation of the JSON pointer
+
+    @liveexample{The example shows the result of `to_string`.,
+    json_pointer__to_string}
+
+    @since version 2.0.0
+    */
+    std::string to_string() const noexcept
+    {
+        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+                               std::string{},
+                               [](const std::string & a, const std::string & b)
+        {
+            return a + "/" + escape(b);
+        });
+    }
+
+    /// @copydoc to_string()
+    operator std::string() const
+    {
+        return to_string();
+    }
+
+  private:
+    /*!
+    @brief remove and return last reference pointer
+    @throw out_of_range.405 if JSON pointer has no parent
+    */
+    std::string pop_back()
+    {
+        if (JSON_UNLIKELY(is_root()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        auto last = reference_tokens.back();
+        reference_tokens.pop_back();
+        return last;
+    }
+
+    /// return whether pointer points to the root document
+    bool is_root() const
+    {
+        return reference_tokens.empty();
+    }
+
+    json_pointer top() const
+    {
+        if (JSON_UNLIKELY(is_root()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        json_pointer result = *this;
+        result.reference_tokens = {reference_tokens[0]};
+        return result;
+    }
+
+
+    /*!
+    @brief create and return a reference to the pointed to value
+
+    @complexity Linear in the number of reference tokens.
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.313 if value cannot be unflattened
+    */
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    NLOHMANN_BASIC_JSON_TPL& get_and_create(NLOHMANN_BASIC_JSON_TPL& j) const;
+
+    /*!
+    @brief return a reference to the pointed to value
+
+    @note This version does not throw if a value is not present, but tries to
+          create nested values instead. For instance, calling this function
+          with pointer `"/this/that"` on a null value is equivalent to calling
+          `operator[]("this").operator[]("that")` on that value, effectively
+          changing the null value to an object.
+
+    @param[in] ptr  a JSON value
+
+    @return reference to the JSON value pointed to by the JSON pointer
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    NLOHMANN_BASIC_JSON_TPL& get_unchecked(NLOHMANN_BASIC_JSON_TPL* ptr) const;
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    NLOHMANN_BASIC_JSON_TPL& get_checked(NLOHMANN_BASIC_JSON_TPL* ptr) const;
+
+    /*!
+    @brief return a const reference to the pointed to value
+
+    @param[in] ptr  a JSON value
+
+    @return const reference to the JSON value pointed to by the JSON
+    pointer
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    const NLOHMANN_BASIC_JSON_TPL& get_unchecked(const NLOHMANN_BASIC_JSON_TPL* ptr) const;
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    const NLOHMANN_BASIC_JSON_TPL& get_checked(const NLOHMANN_BASIC_JSON_TPL* ptr) const;
+
+    /*!
+    @brief split the string input to reference tokens
+
+    @note This function is only called by the json_pointer constructor.
+          All exceptions below are documented there.
+
+    @throw parse_error.107  if the pointer is not empty or begins with '/'
+    @throw parse_error.108  if character '~' is not followed by '0' or '1'
+    */
+    static std::vector<std::string> split(const std::string& reference_string)
+    {
+        std::vector<std::string> result;
+
+        // special case: empty reference string -> no reference tokens
+        if (reference_string.empty())
+        {
+            return result;
+        }
+
+        // check if nonempty reference string begins with slash
+        if (JSON_UNLIKELY(reference_string[0] != '/'))
+        {
+            JSON_THROW(detail::parse_error::create(107, 1,
+                                                   "JSON pointer must be empty or begin with '/' - was: '" +
+                                                   reference_string + "'"));
+        }
+
+        // extract the reference tokens:
+        // - slash: position of the last read slash (or end of string)
+        // - start: position after the previous slash
+        for (
+            // search for the first slash after the first character
+            std::size_t slash = reference_string.find_first_of('/', 1),
+            // set the beginning of the first reference token
+            start = 1;
+            // we can stop if start == string::npos+1 = 0
+            start != 0;
+            // set the beginning of the next reference token
+            // (will eventually be 0 if slash == std::string::npos)
+            start = slash + 1,
+            // find next slash
+            slash = reference_string.find_first_of('/', start))
+        {
+            // use the text between the beginning of the reference token
+            // (start) and the last slash (slash).
+            auto reference_token = reference_string.substr(start, slash - start);
+
+            // check reference tokens are properly escaped
+            for (std::size_t pos = reference_token.find_first_of('~');
+                    pos != std::string::npos;
+                    pos = reference_token.find_first_of('~', pos + 1))
+            {
+                assert(reference_token[pos] == '~');
+
+                // ~ must be followed by 0 or 1
+                if (JSON_UNLIKELY(pos == reference_token.size() - 1 or
+                                  (reference_token[pos + 1] != '0' and
+                                   reference_token[pos + 1] != '1')))
+                {
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'"));
+                }
+            }
+
+            // finally, store the reference token
+            unescape(reference_token);
+            result.push_back(reference_token);
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief replace all occurrences of a substring by another string
+
+    @param[in,out] s  the string to manipulate; changed so that all
+                   occurrences of @a f are replaced with @a t
+    @param[in]     f  the substring to replace with @a t
+    @param[in]     t  the string to replace @a f
+
+    @pre The search string @a f must not be empty. **This precondition is
+    enforced with an assertion.**
+
+    @since version 2.0.0
+    */
+    static void replace_substring(std::string& s, const std::string& f,
+                                  const std::string& t)
+    {
+        assert(not f.empty());
+        for (auto pos = s.find(f);                // find first occurrence of f
+                pos != std::string::npos;         // make sure f was found
+                s.replace(pos, f.size(), t),      // replace with t, and
+                pos = s.find(f, pos + t.size()))  // find next occurrence of f
+        {}
+    }
+
+    /// escape "~"" to "~0" and "/" to "~1"
+    static std::string escape(std::string s)
+    {
+        replace_substring(s, "~", "~0");
+        replace_substring(s, "/", "~1");
+        return s;
+    }
+
+    /// unescape "~1" to tilde and "~0" to slash (order is important!)
+    static void unescape(std::string& s)
+    {
+        replace_substring(s, "~1", "/");
+        replace_substring(s, "~0", "~");
+    }
+
+    /*!
+    @param[in] reference_string  the reference string to the current value
+    @param[in] value             the value to consider
+    @param[in,out] result        the result object to insert values to
+
+    @note Empty objects or arrays are flattened to `null`.
+    */
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    static void flatten(const std::string& reference_string,
+                        const NLOHMANN_BASIC_JSON_TPL& value,
+                        NLOHMANN_BASIC_JSON_TPL& result);
+
+    /*!
+    @param[in] value  flattened JSON
+
+    @return unflattened JSON
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+    @throw type_error.313  if value cannot be unflattened
+    */
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    static NLOHMANN_BASIC_JSON_TPL
+    unflatten(const NLOHMANN_BASIC_JSON_TPL& value);
+
+    friend bool operator==(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept;
+
+    friend bool operator!=(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept;
+
+    /// the reference tokens
+    std::vector<std::string> reference_tokens;
+};
+
+/*!
+@brief a class to store JSON values
+
+@tparam ObjectType type for JSON objects (`std::map` by default; will be used
+in @ref object_t)
+@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used
+in @ref array_t)
+@tparam StringType type for JSON strings and object keys (`std::string` by
+default; will be used in @ref string_t)
+@tparam BooleanType type for JSON booleans (`bool` by default; will be used
+in @ref boolean_t)
+@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by
+default; will be used in @ref number_integer_t)
+@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c
+`uint64_t` by default; will be used in @ref number_unsigned_t)
+@tparam NumberFloatType type for JSON floating-point numbers (`double` by
+default; will be used in @ref number_float_t)
+@tparam AllocatorType type of the allocator to use (`std::allocator` by
+default)
+@tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
+and `from_json()` (@ref adl_serializer by default)
+
+@requirement The class satisfies the following concept requirements:
+- Basic
+ - [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible):
+   JSON values can be default constructed. The result will be a JSON null
+   value.
+ - [MoveConstructible](http://en.cppreference.com/w/cpp/concept/MoveConstructible):
+   A JSON value can be constructed from an rvalue argument.
+ - [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible):
+   A JSON value can be copy-constructed from an lvalue expression.
+ - [MoveAssignable](http://en.cppreference.com/w/cpp/concept/MoveAssignable):
+   A JSON value van be assigned from an rvalue argument.
+ - [CopyAssignable](http://en.cppreference.com/w/cpp/concept/CopyAssignable):
+   A JSON value can be copy-assigned from an lvalue expression.
+ - [Destructible](http://en.cppreference.com/w/cpp/concept/Destructible):
+   JSON values can be destructed.
+- Layout
+ - [StandardLayoutType](http://en.cppreference.com/w/cpp/concept/StandardLayoutType):
+   JSON values have
+   [standard layout](http://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
+   All non-static data members are private and standard layout types, the
+   class has no virtual functions or (virtual) base classes.
+- Library-wide
+ - [EqualityComparable](http://en.cppreference.com/w/cpp/concept/EqualityComparable):
+   JSON values can be compared with `==`, see @ref
+   operator==(const_reference,const_reference).
+ - [LessThanComparable](http://en.cppreference.com/w/cpp/concept/LessThanComparable):
+   JSON values can be compared with `<`, see @ref
+   operator<(const_reference,const_reference).
+ - [Swappable](http://en.cppreference.com/w/cpp/concept/Swappable):
+   Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
+   other compatible types, using unqualified function call @ref swap().
+ - [NullablePointer](http://en.cppreference.com/w/cpp/concept/NullablePointer):
+   JSON values can be compared against `std::nullptr_t` objects which are used
+   to model the `null` value.
+- Container
+ - [Container](http://en.cppreference.com/w/cpp/concept/Container):
+   JSON values can be used like STL containers and provide iterator access.
+ - [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer);
+   JSON values can be used like STL containers and provide reverse iterator
+   access.
+
+@invariant The member variables @a m_value and @a m_type have the following
+relationship:
+- If `m_type == value_t::object`, then `m_value.object != nullptr`.
+- If `m_type == value_t::array`, then `m_value.array != nullptr`.
+- If `m_type == value_t::string`, then `m_value.string != nullptr`.
+The invariants are checked by member function assert_invariant().
+
+@internal
+@note ObjectType trick from http://stackoverflow.com/a/9860911
+@endinternal
+
+@see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange
+Format](http://rfc7159.net/rfc7159)
+
+@since version 1.0.0
+
+@nosubgrouping
+*/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+class basic_json
+{
+  private:
+    template<detail::value_t> friend struct detail::external_constructor;
+    friend ::nlohmann::json_pointer;
+    friend ::nlohmann::detail::parser<basic_json>;
+    friend ::nlohmann::detail::serializer<basic_json>;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::iter_impl;
+    template<typename BasicJsonType, typename CharType>
+    friend class ::nlohmann::detail::binary_writer;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::binary_reader;
+
+    /// workaround type for MSVC
+    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+
+    // convenience aliases for types residing in namespace detail;
+    using lexer = ::nlohmann::detail::lexer<basic_json>;
+    using parser = ::nlohmann::detail::parser<basic_json>;
+
+    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+    template<typename BasicJsonType>
+    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+    template<typename BasicJsonType>
+    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+    template<typename Iterator>
+    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+    template<typename CharType>
+    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json>;
+    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+    using serializer = ::nlohmann::detail::serializer<basic_json>;
+
+  public:
+    using value_t = detail::value_t;
+    // forward declarations
+    using json_pointer = ::nlohmann::json_pointer;
+    template<typename T, typename SFINAE>
+    using json_serializer = JSONSerializer<T, SFINAE>;
+
+    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+    ////////////////
+    // exceptions //
+    ////////////////
+
+    /// @name exceptions
+    /// Classes to implement user-defined exceptions.
+    /// @{
+
+    /// @copydoc detail::exception
+    using exception = detail::exception;
+    /// @copydoc detail::parse_error
+    using parse_error = detail::parse_error;
+    /// @copydoc detail::invalid_iterator
+    using invalid_iterator = detail::invalid_iterator;
+    /// @copydoc detail::type_error
+    using type_error = detail::type_error;
+    /// @copydoc detail::out_of_range
+    using out_of_range = detail::out_of_range;
+    /// @copydoc detail::other_error
+    using other_error = detail::other_error;
+
+    /// @}
+
+
+    /////////////////////
+    // container types //
+    /////////////////////
+
+    /// @name container types
+    /// The canonic container types to use @ref basic_json like any other STL
+    /// container.
+    /// @{
+
+    /// the type of elements in a basic_json container
+    using value_type = basic_json;
+
+    /// the type of an element reference
+    using reference = value_type&;
+    /// the type of an element const reference
+    using const_reference = const value_type&;
+
+    /// a type to represent differences between iterators
+    using difference_type = std::ptrdiff_t;
+    /// a type to represent container sizes
+    using size_type = std::size_t;
+
+    /// the allocator type
+    using allocator_type = AllocatorType<basic_json>;
+
+    /// the type of an element pointer
+    using pointer = typename std::allocator_traits<allocator_type>::pointer;
+    /// the type of an element const pointer
+    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
+
+    /// an iterator for a basic_json container
+    using iterator = iter_impl<basic_json>;
+    /// a const iterator for a basic_json container
+    using const_iterator = iter_impl<const basic_json>;
+    /// a reverse iterator for a basic_json container
+    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
+    /// a const reverse iterator for a basic_json container
+    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
+
+    /// @}
+
+
+    /*!
+    @brief returns the allocator associated with the container
+    */
+    static allocator_type get_allocator()
+    {
+        return allocator_type();
+    }
+
+    /*!
+    @brief returns version information on the library
+
+    This function returns a JSON object with information about the library,
+    including the version number and information on the platform and compiler.
+
+    @return JSON object holding version information
+    key         | description
+    ----------- | ---------------
+    `compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
+    `copyright` | The copyright line for the library as string.
+    `name`      | The name of the library as string.
+    `platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
+    `url`       | The URL of the project as string.
+    `version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
+
+    @liveexample{The following code shows an example output of the `meta()`
+    function.,meta}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @complexity Constant.
+
+    @since 2.1.0
+    */
+    static basic_json meta()
+    {
+        basic_json result;
+
+        result["copyright"] = "(C) 2013-2017 Niels Lohmann";
+        result["name"] = "JSON for Modern C++";
+        result["url"] = "https://github.com/nlohmann/json";
+        result["version"] =
+        {
+            {"string", "2.1.1"}, {"major", 2}, {"minor", 1}, {"patch", 1}
+        };
+
+#ifdef _WIN32
+        result["platform"] = "win32";
+#elif defined __linux__
+        result["platform"] = "linux";
+#elif defined __APPLE__
+        result["platform"] = "apple";
+#elif defined __unix__
+        result["platform"] = "unix";
+#else
+        result["platform"] = "unknown";
+#endif
+
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
+#elif defined(__HP_cc) || defined(__HP_aCC)
+        result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
+
+#ifdef __cplusplus
+        result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+        result["compiler"]["c++"] = "unknown";
+#endif
+        return result;
+    }
+
+
+    ///////////////////////////
+    // JSON value data types //
+    ///////////////////////////
+
+    /// @name JSON value data types
+    /// The data types to store a JSON value. These types are derived from
+    /// the template arguments passed to class @ref basic_json.
+    /// @{
+
+    /*!
+    @brief a type for an object
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
+    > An object is an unordered collection of zero or more name/value pairs,
+    > where a name is a string and a value is a string, number, boolean, null,
+    > object, or array.
+
+    To store objects in C++, a type is defined by the template parameters
+    described below.
+
+    @tparam ObjectType  the container to store objects (e.g., `std::map` or
+    `std::unordered_map`)
+    @tparam StringType the type of the keys or names (e.g., `std::string`).
+    The comparison function `std::less<StringType>` is used to order elements
+    inside the container.
+    @tparam AllocatorType the allocator to use for objects (e.g.,
+    `std::allocator`)
+
+    #### Default type
+
+    With the default values for @a ObjectType (`std::map`), @a StringType
+    (`std::string`), and @a AllocatorType (`std::allocator`), the default
+    value for @a object_t is:
+
+    @code {.cpp}
+    std::map<
+      std::string, // key_type
+      basic_json, // value_type
+      std::less<std::string>, // key_compare
+      std::allocator<std::pair<const std::string, basic_json>> // allocator_type
+    >
+    @endcode
+
+    #### Behavior
+
+    The choice of @a object_t influences the behavior of the JSON class. With
+    the default type, objects have the following behavior:
+
+    - When all names are unique, objects will be interoperable in the sense
+      that all software implementations receiving that object will agree on
+      the name-value mappings.
+    - When the names within an object are not unique, later stored name/value
+      pairs overwrite previously stored name/value pairs, leaving the used
+      names unique. For instance, `{"key": 1}` and `{"key": 2, "key": 1}` will
+      be treated as equal and both stored as `{"key": 1}`.
+    - Internally, name/value pairs are stored in lexicographical order of the
+      names. Objects will also be serialized (see @ref dump) in this order.
+      For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
+      and serialized as `{"a": 2, "b": 1}`.
+    - When comparing objects, the order of the name/value pairs is irrelevant.
+      This makes objects interoperable in the sense that they will not be
+      affected by these differences. For instance, `{"b": 1, "a": 2}` and
+      `{"a": 2, "b": 1}` will be treated as equal.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the maximum depth of nesting.
+
+    In this class, the object's limit of nesting is not explicitly constrained.
+    However, a maximum depth of nesting may be introduced by the compiler or
+    runtime environment. A theoretical limit can be queried by calling the
+    @ref max_size function of a JSON object.
+
+    #### Storage
+
+    Objects are stored as pointers in a @ref basic_json type. That is, for any
+    access to object values, a pointer of type `object_t*` must be
+    dereferenced.
+
+    @sa @ref array_t -- type for an array value
+
+    @since version 1.0.0
+
+    @note The order name/value pairs are added to the object is *not*
+    preserved by the library. Therefore, iterating an object may return
+    name/value pairs in a different order than they were originally stored. In
+    fact, keys will be traversed in alphabetical order as `std::map` with
+    `std::less` is used by default. Please note this behavior conforms to [RFC
+    7159](http://rfc7159.net/rfc7159), because any order implements the
+    specified "unordered" nature of JSON objects.
+    */
+
+#if defined(JSON_HAS_CPP_14)
+    // Use transparent comparator if possible, combined with perfect forwarding
+    // on find() and count() calls prevents unnecessary string construction.
+    using object_comparator_t = std::less<>;
+#else
+    using object_comparator_t = std::less<StringType>;
+#endif
+    using object_t = ObjectType<StringType,
+          basic_json,
+          object_comparator_t,
+          AllocatorType<std::pair<const StringType,
+          basic_json>>>;
+
+    /*!
+    @brief a type for an array
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
+    > An array is an ordered sequence of zero or more values.
+
+    To store objects in C++, a type is defined by the template parameters
+    explained below.
+
+    @tparam ArrayType  container type to store arrays (e.g., `std::vector` or
+    `std::list`)
+    @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`)
+
+    #### Default type
+
+    With the default values for @a ArrayType (`std::vector`) and @a
+    AllocatorType (`std::allocator`), the default value for @a array_t is:
+
+    @code {.cpp}
+    std::vector<
+      basic_json, // value_type
+      std::allocator<basic_json> // allocator_type
+    >
+    @endcode
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the maximum depth of nesting.
+
+    In this class, the array's limit of nesting is not explicitly constrained.
+    However, a maximum depth of nesting may be introduced by the compiler or
+    runtime environment. A theoretical limit can be queried by calling the
+    @ref max_size function of a JSON array.
+
+    #### Storage
+
+    Arrays are stored as pointers in a @ref basic_json type. That is, for any
+    access to array values, a pointer of type `array_t*` must be dereferenced.
+
+    @sa @ref object_t -- type for an object value
+
+    @since version 1.0.0
+    */
+    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+    /*!
+    @brief a type for a string
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
+    > A string is a sequence of zero or more Unicode characters.
+
+    To store objects in C++, a type is defined by the template parameter
+    described below. Unicode values are split by the JSON class into
+    byte-sized characters during deserialization.
+
+    @tparam StringType  the container to store strings (e.g., `std::string`).
+    Note this container is used for keys/names in objects, see @ref object_t.
+
+    #### Default type
+
+    With the default values for @a StringType (`std::string`), the default
+    value for @a string_t is:
+
+    @code {.cpp}
+    std::string
+    @endcode
+
+    #### Encoding
+
+    Strings are stored in UTF-8 encoding. Therefore, functions like
+    `std::string::size()` or `std::string::length()` return the number of
+    bytes in the string rather than the number of characters or glyphs.
+
+    #### String comparison
+
+    [RFC 7159](http://rfc7159.net/rfc7159) states:
+    > Software implementations are typically required to test names of object
+    > members for equality. Implementations that transform the textual
+    > representation into sequences of Unicode code units and then perform the
+    > comparison numerically, code unit by code unit, are interoperable in the
+    > sense that implementations will agree in all cases on equality or
+    > inequality of two strings. For example, implementations that compare
+    > strings with escaped characters unconverted may incorrectly find that
+    > `"a\\b"` and `"a\u005Cb"` are not equal.
+
+    This implementation is interoperable as it does compare strings code unit
+    by code unit.
+
+    #### Storage
+
+    String values are stored as pointers in a @ref basic_json type. That is,
+    for any access to string values, a pointer of type `string_t*` must be
+    dereferenced.
+
+    @since version 1.0.0
+    */
+    using string_t = StringType;
+
+    /*!
+    @brief a type for a boolean
+
+    [RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a
+    type which differentiates the two literals `true` and `false`.
+
+    To store objects in C++, a type is defined by the template parameter @a
+    BooleanType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a BooleanType (`bool`), the default value for
+    @a boolean_t is:
+
+    @code {.cpp}
+    bool
+    @endcode
+
+    #### Storage
+
+    Boolean values are stored directly inside a @ref basic_json type.
+
+    @since version 1.0.0
+    */
+    using boolean_t = BooleanType;
+
+    /*!
+    @brief a type for a number (integer)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store integer numbers in C++, a type is defined by the template
+    parameter @a NumberIntegerType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberIntegerType (`int64_t`), the default
+    value for @a number_integer_t is:
+
+    @code {.cpp}
+    int64_t
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in integer literals lead to an interpretation as octal
+      number. Internally, the value will be stored as decimal number. For
+      instance, the C++ integer literal `010` will be serialized to `8`.
+      During deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the range and precision of numbers.
+
+    When the default type is used, the maximal integer number that can be
+    stored is `9223372036854775807` (INT64_MAX) and the minimal integer number
+    that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers
+    that are out of range will yield over/underflow when used in a
+    constructor. During deserialization, too large or small integer numbers
+    will be automatically be stored as @ref number_unsigned_t or @ref
+    number_float_t.
+
+    [RFC 7159](http://rfc7159.net/rfc7159) further states:
+    > Note that when such software is used, numbers that are integers and are
+    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
+    > that implementations will agree exactly on their numeric values.
+
+    As this range is a subrange of the exactly supported range [INT64_MIN,
+    INT64_MAX], this class's integer type is interoperable.
+
+    #### Storage
+
+    Integer number values are stored directly inside a @ref basic_json type.
+
+    @sa @ref number_float_t -- type for number values (floating-point)
+
+    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+
+    @since version 1.0.0
+    */
+    using number_integer_t = NumberIntegerType;
+
+    /*!
+    @brief a type for a number (unsigned)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store unsigned integer numbers in C++, a type is defined by the
+    template parameter @a NumberUnsignedType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberUnsignedType (`uint64_t`), the
+    default value for @a number_unsigned_t is:
+
+    @code {.cpp}
+    uint64_t
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in integer literals lead to an interpretation as octal
+      number. Internally, the value will be stored as decimal number. For
+      instance, the C++ integer literal `010` will be serialized to `8`.
+      During deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the range and precision of numbers.
+
+    When the default type is used, the maximal integer number that can be
+    stored is `18446744073709551615` (UINT64_MAX) and the minimal integer
+    number that can be stored is `0`. Integer numbers that are out of range
+    will yield over/underflow when used in a constructor. During
+    deserialization, too large or small integer numbers will be automatically
+    be stored as @ref number_integer_t or @ref number_float_t.
+
+    [RFC 7159](http://rfc7159.net/rfc7159) further states:
+    > Note that when such software is used, numbers that are integers and are
+    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
+    > that implementations will agree exactly on their numeric values.
+
+    As this range is a subrange (when considered in conjunction with the
+    number_integer_t type) of the exactly supported range [0, UINT64_MAX],
+    this class's integer type is interoperable.
+
+    #### Storage
+
+    Integer number values are stored directly inside a @ref basic_json type.
+
+    @sa @ref number_float_t -- type for number values (floating-point)
+    @sa @ref number_integer_t -- type for number values (integer)
+
+    @since version 2.0.0
+    */
+    using number_unsigned_t = NumberUnsignedType;
+
+    /*!
+    @brief a type for a number (floating-point)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store floating-point numbers in C++, a type is defined by the template
+    parameter @a NumberFloatType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberFloatType (`double`), the default
+    value for @a number_float_t is:
+
+    @code {.cpp}
+    double
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in floating-point literals will be ignored. Internally,
+      the value will be stored as decimal number. For instance, the C++
+      floating-point literal `01.2` will be serialized to `1.2`. During
+      deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) states:
+    > This specification allows implementations to set limits on the range and
+    > precision of numbers accepted. Since software that implements IEEE
+    > 754-2008 binary64 (double precision) numbers is generally available and
+    > widely used, good interoperability can be achieved by implementations
+    > that expect no more precision or range than these provide, in the sense
+    > that implementations will approximate JSON numbers within the expected
+    > precision.
+
+    This implementation does exactly follow this approach, as it uses double
+    precision floating-point numbers. Note values smaller than
+    `-1.79769313486232e+308` and values greater than `1.79769313486232e+308`
+    will be stored as NaN internally and be serialized to `null`.
+
+    #### Storage
+
+    Floating-point number values are stored directly inside a @ref basic_json
+    type.
+
+    @sa @ref number_integer_t -- type for number values (integer)
+
+    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+
+    @since version 1.0.0
+    */
+    using number_float_t = NumberFloatType;
+
+    /// @}
+
+  private:
+
+    /// helper for exception-safe object creation
+    template<typename T, typename... Args>
+    static T* create(Args&& ... args)
+    {
+        AllocatorType<T> alloc;
+        auto deleter = [&](T * object)
+        {
+            alloc.deallocate(object, 1);
+        };
+        std::unique_ptr<T, decltype(deleter)> object(alloc.allocate(1), deleter);
+        alloc.construct(object.get(), std::forward<Args>(args)...);
+        assert(object != nullptr);
+        return object.release();
+    }
+
+    ////////////////////////
+    // JSON value storage //
+    ////////////////////////
+
+    /*!
+    @brief a JSON value
+
+    The actual storage for a JSON value of the @ref basic_json class. This
+    union combines the different storage types for the JSON value types
+    defined in @ref value_t.
+
+    JSON type | value_t type    | used type
+    --------- | --------------- | ------------------------
+    object    | object          | pointer to @ref object_t
+    array     | array           | pointer to @ref array_t
+    string    | string          | pointer to @ref string_t
+    boolean   | boolean         | @ref boolean_t
+    number    | number_integer  | @ref number_integer_t
+    number    | number_unsigned | @ref number_unsigned_t
+    number    | number_float    | @ref number_float_t
+    null      | null            | *no value is stored*
+
+    @note Variable-length types (objects, arrays, and strings) are stored as
+    pointers. The size of the union should not exceed 64 bits if the default
+    value types are used.
+
+    @since version 1.0.0
+    */
+    union json_value
+    {
+        /// object (stored with pointer to save storage)
+        object_t* object;
+        /// array (stored with pointer to save storage)
+        array_t* array;
+        /// string (stored with pointer to save storage)
+        string_t* string;
+        /// boolean
+        boolean_t boolean;
+        /// number (integer)
+        number_integer_t number_integer;
+        /// number (unsigned integer)
+        number_unsigned_t number_unsigned;
+        /// number (floating-point)
+        number_float_t number_float;
+
+        /// default constructor (for null values)
+        json_value() = default;
+        /// constructor for booleans
+        json_value(boolean_t v) noexcept : boolean(v) {}
+        /// constructor for numbers (integer)
+        json_value(number_integer_t v) noexcept : number_integer(v) {}
+        /// constructor for numbers (unsigned)
+        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
+        /// constructor for numbers (floating-point)
+        json_value(number_float_t v) noexcept : number_float(v) {}
+        /// constructor for empty values of a given type
+        json_value(value_t t)
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    object = create<object_t>();
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    array = create<array_t>();
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    string = create<string_t>("");
+                    break;
+                }
+
+                case value_t::boolean:
+                {
+                    boolean = boolean_t(false);
+                    break;
+                }
+
+                case value_t::number_integer:
+                {
+                    number_integer = number_integer_t(0);
+                    break;
+                }
+
+                case value_t::number_unsigned:
+                {
+                    number_unsigned = number_unsigned_t(0);
+                    break;
+                }
+
+                case value_t::number_float:
+                {
+                    number_float = number_float_t(0.0);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    break;
+                }
+
+                default:
+                {
+                    if (JSON_UNLIKELY(t == value_t::null))
+                    {
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 2.1.1")); // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+            }
+        }
+
+        /// constructor for strings
+        json_value(const string_t& value)
+        {
+            string = create<string_t>(value);
+        }
+
+        /// constructor for rvalue strings
+        json_value(string_t&& value)
+        {
+            string = create<string_t>(std::move(value));
+        }
+
+        /// constructor for objects
+        json_value(const object_t& value)
+        {
+            object = create<object_t>(value);
+        }
+
+        /// constructor for rvalue objects
+        json_value(object_t&& value)
+        {
+            object = create<object_t>(std::move(value));
+        }
+
+        /// constructor for arrays
+        json_value(const array_t& value)
+        {
+            array = create<array_t>(value);
+        }
+
+        /// constructor for rvalue arrays
+        json_value(array_t&& value)
+        {
+            array = create<array_t>(std::move(value));
+        }
+
+        void destroy(value_t t)
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    AllocatorType<object_t> alloc;
+                    alloc.destroy(object);
+                    alloc.deallocate(object, 1);
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    AllocatorType<array_t> alloc;
+                    alloc.destroy(array);
+                    alloc.deallocate(array, 1);
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    AllocatorType<string_t> alloc;
+                    alloc.destroy(string);
+                    alloc.deallocate(string, 1);
+                    break;
+                }
+
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    };
+
+    /*!
+    @brief checks the class invariants
+
+    This function asserts the class invariants. It needs to be called at the
+    end of every constructor to make sure that created objects respect the
+    invariant. Furthermore, it has to be called each time the type of a JSON
+    value is changed, because the invariant expresses a relationship between
+    @a m_type and @a m_value.
+    */
+    void assert_invariant() const
+    {
+        assert(m_type != value_t::object or m_value.object != nullptr);
+        assert(m_type != value_t::array or m_value.array != nullptr);
+        assert(m_type != value_t::string or m_value.string != nullptr);
+    }
+
+  public:
+    //////////////////////////
+    // JSON parser callback //
+    //////////////////////////
+
+    using parse_event_t = typename parser::parse_event_t;
+
+    /*!
+    @brief per-element parser callback type
+
+    With a parser callback function, the result of parsing a JSON text can be
+    influenced. When passed to @ref parse, it is called on certain events
+    (passed as @ref parse_event_t via parameter @a event) with a set recursion
+    depth @a depth and context JSON value @a parsed. The return value of the
+    callback function is a boolean indicating whether the element that emitted
+    the callback shall be kept or not.
+
+    We distinguish six scenarios (determined by the event type) in which the
+    callback function can be called. The following table describes the values
+    of the parameters @a depth, @a event, and @a parsed.
+
+    parameter @a event | description | parameter @a depth | parameter @a parsed
+    ------------------ | ----------- | ------------------ | -------------------
+    parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
+    parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
+    parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
+    parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
+    parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
+    parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value
+
+    @image html callback_events.png "Example when certain parse events are triggered"
+
+    Discarding a value (i.e., returning `false`) has different effects
+    depending on the context in which function was called:
+
+    - Discarded values in structured types are skipped. That is, the parser
+      will behave as if the discarded value was never read.
+    - In case a value outside a structured type is skipped, it is replaced
+      with `null`. This case happens if the top-level element is skipped.
+
+    @param[in] depth  the depth of the recursion during parsing
+
+    @param[in] event  an event of type parse_event_t indicating the context in
+    the callback function has been called
+
+    @param[in,out] parsed  the current intermediate parse result; note that
+    writing to this value has no effect for parse_event_t::key events
+
+    @return Whether the JSON value which called the function during parsing
+    should be kept (`true`) or not (`false`). In the latter case, it is either
+    skipped completely or replaced by an empty discarded object.
+
+    @sa @ref parse for examples
+
+    @since version 1.0.0
+    */
+    using parser_callback_t = typename parser::parser_callback_t;
+
+
+    //////////////////
+    // constructors //
+    //////////////////
+
+    /// @name constructors and destructors
+    /// Constructors of class @ref basic_json, copy/move constructor, copy
+    /// assignment, static functions creating objects, and the destructor.
+    /// @{
+
+    /*!
+    @brief create an empty value with a given type
+
+    Create an empty JSON value with a given type. The value will be default
+    initialized with an empty value which depends on the type:
+
+    Value type  | initial value
+    ----------- | -------------
+    null        | `null`
+    boolean     | `false`
+    string      | `""`
+    number      | `0`
+    object      | `{}`
+    array       | `[]`
+
+    @param[in] v  the type of the value to create
+
+    @complexity Constant.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows the constructor for different @ref
+    value_t values,basic_json__value_t}
+
+    @sa @ref clear() -- restores the postcondition of this constructor
+
+    @since version 1.0.0
+    */
+    basic_json(const value_t v)
+        : m_type(v), m_value(v)
+    {
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a null object
+
+    Create a `null` JSON value. It either takes a null pointer as parameter
+    (explicitly creating `null`) or no parameter (implicitly creating `null`).
+    The passed null pointer itself is not read -- it is only used to choose
+    the right constructor.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this constructor never throws
+    exceptions.
+
+    @liveexample{The following code shows the constructor with and without a
+    null pointer parameter.,basic_json__nullptr_t}
+
+    @since version 1.0.0
+    */
+    basic_json(std::nullptr_t = nullptr) noexcept
+        : basic_json(value_t::null)
+    {
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a JSON value
+
+    This is a "catch all" constructor for all compatible JSON types; that is,
+    types for which a `to_json()` method exsits. The constructor forwards the
+    parameter @a val to that method (to `json_serializer<U>::to_json` method
+    with `U = uncvref_t<CompatibleType>`, to be exact).
+
+    Template type @a CompatibleType includes, but is not limited to, the
+    following types:
+    - **arrays**: @ref array_t and all kinds of compatible containers such as
+      `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
+      `std::array`, `std::valarray`, `std::set`, `std::unordered_set`,
+      `std::multiset`, and `std::unordered_multiset` with a `value_type` from
+      which a @ref basic_json value can be constructed.
+    - **objects**: @ref object_t and all kinds of compatible associative
+      containers such as `std::map`, `std::unordered_map`, `std::multimap`,
+      and `std::unordered_multimap` with a `key_type` compatible to
+      @ref string_t and a `value_type` from which a @ref basic_json value can
+      be constructed.
+    - **strings**: @ref string_t, string literals, and all compatible string
+      containers can be used.
+    - **numbers**: @ref number_integer_t, @ref number_unsigned_t,
+      @ref number_float_t, and all convertible number types such as `int`,
+      `size_t`, `int64_t`, `float` or `double` can be used.
+    - **boolean**: @ref boolean_t / `bool` can be used.
+
+    See the examples below.
+
+    @tparam CompatibleType a type such that:
+    - @a CompatibleType is not derived from `std::istream`,
+    - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
+         constructors),
+    - @a CompatibleType is not a @ref basic_json nested type (e.g.,
+         @ref json_pointer, @ref iterator, etc ...)
+    - @ref @ref json_serializer<U> has a
+         `to_json(basic_json_t&, CompatibleType&&)` method
+
+    @tparam U = `uncvref_t<CompatibleType>`
+
+    @param[in] val the value to be forwarded to the respective constructor
+
+    @complexity Usually linear in the size of the passed @a val, also
+                depending on the implementation of the called `to_json()`
+                method.
+
+    @exceptionsafety Depends on the called constructor. For types directly
+    supported by the library (i.e., all types for which no `to_json()` function
+    was provided), strong guarantee holds: if an exception is thrown, there are
+    no changes to any JSON value.
+
+    @liveexample{The following code shows the constructor with several
+    compatible types.,basic_json__CompatibleType}
+
+    @since version 2.1.0
+    */
+    template<typename CompatibleType, typename U = detail::uncvref_t<CompatibleType>,
+             detail::enable_if_t<not std::is_base_of<std::istream, U>::value and
+                                 not std::is_same<U, basic_json_t>::value and
+                                 not detail::is_basic_json_nested_type<
+                                     basic_json_t, U>::value and
+                                 detail::has_to_json<basic_json, U>::value,
+                                 int> = 0>
+    basic_json(CompatibleType && val) noexcept(noexcept(JSONSerializer<U>::to_json(
+                std::declval<basic_json_t&>(), std::forward<CompatibleType>(val))))
+    {
+        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a container (array or object) from an initializer list
+
+    Creates a JSON value of type array or object from the passed initializer
+    list @a init. In case @a type_deduction is `true` (default), the type of
+    the JSON value to be created is deducted from the initializer list @a init
+    according to the following rules:
+
+    1. If the list is empty, an empty JSON object value `{}` is created.
+    2. If the list consists of pairs whose first element is a string, a JSON
+       object value is created where the first elements of the pairs are
+       treated as keys and the second elements are as values.
+    3. In all other cases, an array is created.
+
+    The rules aim to create the best fit between a C++ initializer list and
+    JSON values. The rationale is as follows:
+
+    1. The empty initializer list is written as `{}` which is exactly an empty
+       JSON object.
+    2. C++ has no way of describing mapped types other than to list a list of
+       pairs. As JSON requires that keys must be of type string, rule 2 is the
+       weakest constraint one can pose on initializer lists to interpret them
+       as an object.
+    3. In all other cases, the initializer list could not be interpreted as
+       JSON object type, so interpreting it as JSON array type is safe.
+
+    With the rules described above, the following JSON values cannot be
+    expressed by an initializer list:
+
+    - the empty array (`[]`): use @ref array(initializer_list_t)
+      with an empty initializer list in this case
+    - arrays whose elements satisfy rule 2: use @ref
+      array(initializer_list_t) with the same initializer list
+      in this case
+
+    @note When used without parentheses around an empty initializer list, @ref
+    basic_json() is called instead of this function, yielding the JSON null
+    value.
+
+    @param[in] init  initializer list with JSON values
+
+    @param[in] type_deduction internal parameter; when set to `true`, the type
+    of the JSON value is deducted from the initializer list @a init; when set
+    to `false`, the type provided via @a manual_type is forced. This mode is
+    used by the functions @ref array(initializer_list_t) and
+    @ref object(initializer_list_t).
+
+    @param[in] manual_type internal parameter; when @a type_deduction is set
+    to `false`, the created JSON value will use the provided type (only @ref
+    value_t::array and @ref value_t::object are valid); when @a type_deduction
+    is set to `true`, this parameter has no effect
+
+    @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
+    `value_t::object`, but @a init contains an element which is not a pair
+    whose first element is a string. In this case, the constructor could not
+    create an object. If @a type_deduction would have be `true`, an array
+    would have been created. See @ref object(initializer_list_t)
+    for an example.
+
+    @complexity Linear in the size of the initializer list @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The example below shows how JSON values are created from
+    initializer lists.,basic_json__list_init_t}
+
+    @sa @ref array(initializer_list_t) -- create a JSON array
+    value from an initializer list
+    @sa @ref object(initializer_list_t) -- create a JSON object
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    basic_json(initializer_list_t init,
+               bool type_deduction = true,
+               value_t manual_type = value_t::array)
+    {
+        // check if each element is an array with two elements whose first
+        // element is a string
+        bool is_an_object = std::all_of(init.begin(), init.end(),
+                                        [](const detail::json_ref<basic_json>& element_ref)
+        {
+            return (element_ref->is_array() and element_ref->size() == 2 and (*element_ref)[0].is_string());
+        });
+
+        // adjust type if type deduction is not wanted
+        if (not type_deduction)
+        {
+            // if array is wanted, do not create an object though possible
+            if (manual_type == value_t::array)
+            {
+                is_an_object = false;
+            }
+
+            // if object is wanted but impossible, throw an exception
+            if (JSON_UNLIKELY(manual_type == value_t::object and not is_an_object))
+            {
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list"));
+            }
+        }
+
+        if (is_an_object)
+        {
+            // the initializer list is a list of pairs -> create object
+            m_type = value_t::object;
+            m_value = value_t::object;
+
+            std::for_each(init.begin(), init.end(), [this](const detail::json_ref<basic_json>& element_ref)
+            {
+                auto element = element_ref.moved_or_copied();
+                m_value.object->emplace(
+                    std::move(*((*element.m_value.array)[0].m_value.string)),
+                    std::move((*element.m_value.array)[1]));
+            });
+        }
+        else
+        {
+            // the initializer list describes an array -> create array
+            m_type = value_t::array;
+            m_value.array = create<array_t>(init.begin(), init.end());
+        }
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief explicitly create an array from an initializer list
+
+    Creates a JSON array value from a given initializer list. That is, given a
+    list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the
+    initializer list is empty, the empty array `[]` is created.
+
+    @note This function is only needed to express two edge cases that cannot
+    be realized with the initializer list constructor (@ref
+    basic_json(initializer_list_t, bool, value_t)). These cases
+    are:
+    1. creating an array whose elements are all pairs whose first element is a
+    string -- in this case, the initializer list constructor would create an
+    object, taking the first elements as keys
+    2. creating an empty array -- passing the empty initializer list to the
+    initializer list constructor yields an empty object
+
+    @param[in] init  initializer list with JSON values to create an array from
+    (optional)
+
+    @return JSON array value
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows an example for the `array`
+    function.,array}
+
+    @sa @ref basic_json(initializer_list_t, bool, value_t) --
+    create a JSON value from an initializer list
+    @sa @ref object(initializer_list_t) -- create a JSON object
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    static basic_json array(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::array);
+    }
+
+    /*!
+    @brief explicitly create an object from an initializer list
+
+    Creates a JSON object value from a given initializer list. The initializer
+    lists elements must be pairs, and their first elements must be strings. If
+    the initializer list is empty, the empty object `{}` is created.
+
+    @note This function is only added for symmetry reasons. In contrast to the
+    related function @ref array(initializer_list_t), there are
+    no cases which can only be expressed by this function. That is, any
+    initializer list @a init can also be passed to the initializer list
+    constructor @ref basic_json(initializer_list_t, bool, value_t).
+
+    @param[in] init  initializer list to create an object from (optional)
+
+    @return JSON object value
+
+    @throw type_error.301 if @a init is not a list of pairs whose first
+    elements are strings. In this case, no object can be created. When such a
+    value is passed to @ref basic_json(initializer_list_t, bool, value_t),
+    an array would have been created from the passed initializer list @a init.
+    See example below.
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows an example for the `object`
+    function.,object}
+
+    @sa @ref basic_json(initializer_list_t, bool, value_t) --
+    create a JSON value from an initializer list
+    @sa @ref array(initializer_list_t) -- create a JSON array
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    static basic_json object(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::object);
+    }
+
+    /*!
+    @brief construct an array with count copies of given value
+
+    Constructs a JSON array value by creating @a cnt copies of a passed value.
+    In case @a cnt is `0`, an empty array is created.
+
+    @param[in] cnt  the number of JSON copies of @a val to create
+    @param[in] val  the JSON value to copy
+
+    @post `std::distance(begin(),end()) == cnt` holds.
+
+    @complexity Linear in @a cnt.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows examples for the @ref
+    basic_json(size_type\, const basic_json&)
+    constructor.,basic_json__size_type_basic_json}
+
+    @since version 1.0.0
+    */
+    basic_json(size_type cnt, const basic_json& val)
+        : m_type(value_t::array)
+    {
+        m_value.array = create<array_t>(cnt, val);
+        assert_invariant();
+    }
+
+    /*!
+    @brief construct a JSON container given an iterator range
+
+    Constructs the JSON value with the contents of the range `[first, last)`.
+    The semantics depends on the different types a JSON value can have:
+    - In case of a null type, invalid_iterator.206 is thrown.
+    - In case of other primitive types (number, boolean, or string), @a first
+      must be `begin()` and @a last must be `end()`. In this case, the value is
+      copied. Otherwise, invalid_iterator.204 is thrown.
+    - In case of structured types (array, object), the constructor behaves as
+      similar versions for `std::vector` or `std::map`; that is, a JSON array
+      or object is constructed from the values in the range.
+
+    @tparam InputIT an input iterator type (@ref iterator or @ref
+    const_iterator)
+
+    @param[in] first begin of the range to copy from (included)
+    @param[in] last end of the range to copy from (excluded)
+
+    @pre Iterators @a first and @a last must be initialized. **This
+         precondition is enforced with an assertion (see warning).** If
+         assertions are switched off, a violation of this precondition yields
+         undefined behavior.
+
+    @pre Range `[first, last)` is valid. Usually, this precondition cannot be
+         checked efficiently. Only certain edge cases are detected; see the
+         description of the exceptions below. A violation of this precondition
+         yields undefined behavior.
+
+    @warning A precondition is enforced with a runtime assertion that will
+             result in calling `std::abort` if this precondition is not met.
+             Assertions can be disabled by defining `NDEBUG` at compile time.
+             See http://en.cppreference.com/w/cpp/error/assert for more
+             information.
+
+    @throw invalid_iterator.201 if iterators @a first and @a last are not
+    compatible (i.e., do not belong to the same JSON value). In this case,
+    the range `[first, last)` is undefined.
+    @throw invalid_iterator.204 if iterators @a first and @a last belong to a
+    primitive type (number, boolean, or string), but @a first does not point
+    to the first element any more. In this case, the range `[first, last)` is
+    undefined. See example code below.
+    @throw invalid_iterator.206 if iterators @a first and @a last belong to a
+    null value. In this case, the range `[first, last)` is undefined.
+
+    @complexity Linear in distance between @a first and @a last.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The example below shows several ways to create JSON values by
+    specifying a subrange with iterators.,basic_json__InputIt_InputIt}
+
+    @since version 1.0.0
+    */
+    template<class InputIT, typename std::enable_if<
+                 std::is_same<InputIT, typename basic_json_t::iterator>::value or
+                 std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int>::type = 0>
+    basic_json(InputIT first, InputIT last)
+    {
+        assert(first.m_object != nullptr);
+        assert(last.m_object != nullptr);
+
+        // make sure iterator fits the current value
+        if (JSON_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible"));
+        }
+
+        // copy type from first iterator
+        m_type = first.m_object->m_type;
+
+        // check if iterator range is complete for primitive values
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_UNLIKELY(not first.m_it.primitive_iterator.is_begin()
+                                  or not last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = first.m_object->m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = first.m_object->m_value.number_float;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = first.m_object->m_value.boolean;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *first.m_object->m_value.string;
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object = create<object_t>(first.m_it.object_iterator,
+                                                  last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                last.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " +
+                                                    std::string(first.m_object->type_name())));
+        }
+
+        assert_invariant();
+    }
+
+
+    ///////////////////////////////////////
+    // other constructors and destructor //
+    ///////////////////////////////////////
+
+    /// @private
+    basic_json(const detail::json_ref<basic_json>& ref)
+        : basic_json(ref.moved_or_copied())
+    {}
+
+    /*!
+    @brief copy constructor
+
+    Creates a copy of a given JSON value.
+
+    @param[in] other  the JSON value to copy
+
+    @post `*this == other`
+
+    @complexity Linear in the size of @a other.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    requirements:
+    - The complexity is linear.
+    - As postcondition, it holds: `other == basic_json(other)`.
+
+    @liveexample{The following code shows an example for the copy
+    constructor.,basic_json__basic_json}
+
+    @since version 1.0.0
+    */
+    basic_json(const basic_json& other)
+        : m_type(other.m_type)
+    {
+        // check of passed value is valid
+        other.assert_invariant();
+
+        switch (m_type)
+        {
+            case value_t::object:
+            {
+                m_value = *other.m_value.object;
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value = *other.m_value.array;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *other.m_value.string;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value = other.m_value.boolean;
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                m_value = other.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value = other.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value = other.m_value.number_float;
+                break;
+            }
+
+            default:
+                break;
+        }
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief move constructor
+
+    Move constructor. Constructs a JSON value with the contents of the given
+    value @a other using move semantics. It "steals" the resources from @a
+    other and leaves it as JSON null value.
+
+    @param[in,out] other  value to move to this object
+
+    @post `*this` has the same value as @a other before the call.
+    @post @a other is a JSON null value.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this constructor never throws
+    exceptions.
+
+    @requirement This function helps `basic_json` satisfying the
+    [MoveConstructible](http://en.cppreference.com/w/cpp/concept/MoveConstructible)
+    requirements.
+
+    @liveexample{The code below shows the move constructor explicitly called
+    via std::move.,basic_json__moveconstructor}
+
+    @since version 1.0.0
+    */
+    basic_json(basic_json&& other) noexcept
+        : m_type(std::move(other.m_type)),
+          m_value(std::move(other.m_value))
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        // invalidate payload
+        other.m_type = value_t::null;
+        other.m_value = {};
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief copy assignment
+
+    Copy assignment operator. Copies a JSON value via the "copy and swap"
+    strategy: It is expressed in terms of the copy constructor, destructor,
+    and the `swap()` member function.
+
+    @param[in] other  value to copy from
+
+    @complexity Linear.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    requirements:
+    - The complexity is linear.
+
+    @liveexample{The code below shows and example for the copy assignment. It
+    creates a copy of value `a` which is then swapped with `b`. Finally\, the
+    copy of `a` (which is the null value after the swap) is
+    destroyed.,basic_json__copyassignment}
+
+    @since version 1.0.0
+    */
+    reference& operator=(basic_json other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value and
+        std::is_nothrow_move_assignable<value_t>::value and
+        std::is_nothrow_move_constructible<json_value>::value and
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        using std::swap;
+        swap(m_type, other.m_type);
+        swap(m_value, other.m_value);
+
+        assert_invariant();
+        return *this;
+    }
+
+    /*!
+    @brief destructor
+
+    Destroys the JSON value and frees all allocated memory.
+
+    @complexity Linear.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    requirements:
+    - The complexity is linear.
+    - All stored elements are destroyed and all memory is freed.
+
+    @since version 1.0.0
+    */
+    ~basic_json()
+    {
+        assert_invariant();
+        m_value.destroy(m_type);
+    }
+
+    /// @}
+
+  public:
+    ///////////////////////
+    // object inspection //
+    ///////////////////////
+
+    /// @name object inspection
+    /// Functions to inspect the type of a JSON value.
+    /// @{
+
+    /*!
+    @brief serialization
+
+    Serialization function for JSON values. The function tries to mimic
+    Python's `json.dumps()` function, and currently supports its @a indent
+    and @a ensure_ascii parameters.
+
+    @param[in] indent If indent is nonnegative, then array elements and object
+    members will be pretty-printed with that indent level. An indent level of
+    `0` will only insert newlines. `-1` (the default) selects the most compact
+    representation.
+    @param[in] indent_char The character to use for indentation if @a indent is
+    greater than `0`. The default is ` ` (space).
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with \uXXXX sequences, and the result consists
+    of ASCII characters only.
+
+    @return string containing the serialization of the JSON value
+
+    @complexity Linear.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @liveexample{The following example shows the effect of different @a indent\,
+    @a indent_char\, and @a ensure_ascii parameters to the result of the
+    serialization.,dump}
+
+    @see https://docs.python.org/2/library/json.html#json.dump
+
+    @since version 1.0.0; indentation character @a indent_char and option
+           @a ensure_ascii added in version 3.0.0
+    */
+    string_t dump(const int indent = -1, const char indent_char = ' ',
+                  const bool ensure_ascii = false) const
+    {
+        string_t result;
+        serializer s(detail::output_adapter<char>(result), indent_char);
+
+        if (indent >= 0)
+        {
+            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
+        }
+        else
+        {
+            s.dump(*this, false, ensure_ascii, 0);
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief return the type of the JSON value (explicit)
+
+    Return the type of the JSON value as a value from the @ref value_t
+    enumeration.
+
+    @return the type of the JSON value
+            Value type                | return value
+            ------------------------- | -------------------------
+            null                      | value_t::null
+            boolean                   | value_t::boolean
+            string                    | value_t::string
+            number (integer)          | value_t::number_integer
+            number (unsigned integer) | value_t::number_unsigned
+            number (foating-point)    | value_t::number_float
+            object                    | value_t::object
+            array                     | value_t::array
+            discarded                 | value_t::discarded
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `type()` for all JSON
+    types.,type}
+
+    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+    @sa @ref type_name() -- return the type as string
+
+    @since version 1.0.0
+    */
+    constexpr value_t type() const noexcept
+    {
+        return m_type;
+    }
+
+    /*!
+    @brief return whether type is primitive
+
+    This function returns true if and only if the JSON type is primitive
+    (string, number, boolean, or null).
+
+    @return `true` if type is primitive (string, number, boolean, or null),
+    `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_primitive()` for all JSON
+    types.,is_primitive}
+
+    @sa @ref is_structured() -- returns whether JSON value is structured
+    @sa @ref is_null() -- returns whether JSON value is `null`
+    @sa @ref is_string() -- returns whether JSON value is a string
+    @sa @ref is_boolean() -- returns whether JSON value is a boolean
+    @sa @ref is_number() -- returns whether JSON value is a number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_primitive() const noexcept
+    {
+        return is_null() or is_string() or is_boolean() or is_number();
+    }
+
+    /*!
+    @brief return whether type is structured
+
+    This function returns true if and only if the JSON type is structured
+    (array or object).
+
+    @return `true` if type is structured (array or object), `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_structured()` for all JSON
+    types.,is_structured}
+
+    @sa @ref is_primitive() -- returns whether value is primitive
+    @sa @ref is_array() -- returns whether value is an array
+    @sa @ref is_object() -- returns whether value is an object
+
+    @since version 1.0.0
+    */
+    constexpr bool is_structured() const noexcept
+    {
+        return is_array() or is_object();
+    }
+
+    /*!
+    @brief return whether value is null
+
+    This function returns true if and only if the JSON value is null.
+
+    @return `true` if type is null, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_null()` for all JSON
+    types.,is_null}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_null() const noexcept
+    {
+        return (m_type == value_t::null);
+    }
+
+    /*!
+    @brief return whether value is a boolean
+
+    This function returns true if and only if the JSON value is a boolean.
+
+    @return `true` if type is boolean, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_boolean()` for all JSON
+    types.,is_boolean}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_boolean() const noexcept
+    {
+        return (m_type == value_t::boolean);
+    }
+
+    /*!
+    @brief return whether value is a number
+
+    This function returns true if and only if the JSON value is a number. This
+    includes both integer (signed and unsigned) and floating-point values.
+
+    @return `true` if type is number (regardless whether integer, unsigned
+    integer or floating-type), `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number()` for all JSON
+    types.,is_number}
+
+    @sa @ref is_number_integer() -- check if value is an integer or unsigned
+    integer number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number() const noexcept
+    {
+        return is_number_integer() or is_number_float();
+    }
+
+    /*!
+    @brief return whether value is an integer number
+
+    This function returns true if and only if the JSON value is a signed or
+    unsigned integer number. This excludes floating-point values.
+
+    @return `true` if type is an integer or unsigned integer number, `false`
+    otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_integer()` for all
+    JSON types.,is_number_integer}
+
+    @sa @ref is_number() -- check if value is a number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number_integer() const noexcept
+    {
+        return (m_type == value_t::number_integer or m_type == value_t::number_unsigned);
+    }
+
+    /*!
+    @brief return whether value is an unsigned integer number
+
+    This function returns true if and only if the JSON value is an unsigned
+    integer number. This excludes floating-point and signed integer values.
+
+    @return `true` if type is an unsigned integer number, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_unsigned()` for all
+    JSON types.,is_number_unsigned}
+
+    @sa @ref is_number() -- check if value is a number
+    @sa @ref is_number_integer() -- check if value is an integer or unsigned
+    integer number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 2.0.0
+    */
+    constexpr bool is_number_unsigned() const noexcept
+    {
+        return (m_type == value_t::number_unsigned);
+    }
+
+    /*!
+    @brief return whether value is a floating-point number
+
+    This function returns true if and only if the JSON value is a
+    floating-point number. This excludes signed and unsigned integer values.
+
+    @return `true` if type is a floating-point number, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_float()` for all
+    JSON types.,is_number_float}
+
+    @sa @ref is_number() -- check if value is number
+    @sa @ref is_number_integer() -- check if value is an integer number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number_float() const noexcept
+    {
+        return (m_type == value_t::number_float);
+    }
+
+    /*!
+    @brief return whether value is an object
+
+    This function returns true if and only if the JSON value is an object.
+
+    @return `true` if type is object, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_object()` for all JSON
+    types.,is_object}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_object() const noexcept
+    {
+        return (m_type == value_t::object);
+    }
+
+    /*!
+    @brief return whether value is an array
+
+    This function returns true if and only if the JSON value is an array.
+
+    @return `true` if type is array, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_array()` for all JSON
+    types.,is_array}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_array() const noexcept
+    {
+        return (m_type == value_t::array);
+    }
+
+    /*!
+    @brief return whether value is a string
+
+    This function returns true if and only if the JSON value is a string.
+
+    @return `true` if type is string, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_string()` for all JSON
+    types.,is_string}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_string() const noexcept
+    {
+        return (m_type == value_t::string);
+    }
+
+    /*!
+    @brief return whether value is discarded
+
+    This function returns true if and only if the JSON value was discarded
+    during parsing with a callback function (see @ref parser_callback_t).
+
+    @note This function will always be `false` for JSON values after parsing.
+    That is, discarded values can only occur during parsing, but will be
+    removed when inside a structured value or replaced by null in other cases.
+
+    @return `true` if type is discarded, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_discarded()` for all JSON
+    types.,is_discarded}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_discarded() const noexcept
+    {
+        return (m_type == value_t::discarded);
+    }
+
+    /*!
+    @brief return the type of the JSON value (implicit)
+
+    Implicitly return the type of the JSON value as a value from the @ref
+    value_t enumeration.
+
+    @return the type of the JSON value
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies the @ref value_t operator for
+    all JSON types.,operator__value_t}
+
+    @sa @ref type() -- return the type of the JSON value (explicit)
+    @sa @ref type_name() -- return the type as string
+
+    @since version 1.0.0
+    */
+    constexpr operator value_t() const noexcept
+    {
+        return m_type;
+    }
+
+    /// @}
+
+  private:
+    //////////////////
+    // value access //
+    //////////////////
+
+    /// get a boolean (explicit)
+    boolean_t get_impl(boolean_t* /*unused*/) const
+    {
+        if (JSON_LIKELY(is_boolean()))
+        {
+            return m_value.boolean;
+        }
+
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name())));
+    }
+
+    /// get a pointer to the value (object)
+    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (object)
+    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /*!
+    @brief helper function to implement get_ref()
+
+    This function helps to implement get_ref() without code duplication for
+    const and non-const overloads
+
+    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
+
+    @throw type_error.303 if ReferenceType does not match underlying value
+    type of the current JSON
+    */
+    template<typename ReferenceType, typename ThisType>
+    static ReferenceType get_ref_impl(ThisType& obj)
+    {
+        // delegate the call to get_ptr<>()
+        auto ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+
+        if (JSON_LIKELY(ptr != nullptr))
+        {
+            return *ptr;
+        }
+
+        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name())));
+    }
+
+  public:
+    /// @name value access
+    /// Direct access to the stored value of a JSON value.
+    /// @{
+
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template <
+        typename BasicJsonType,
+        detail::enable_if_t<std::is_same<typename std::remove_const<BasicJsonType>::type,
+                                         basic_json_t>::value,
+                            int> = 0 >
+    basic_json get() const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible)
+    and [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType ret;
+    JSONSerializer<ValueType>::from_json(*this, ret);
+    return ret;
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+    - @ref json_serializer<ValueType> does not have a `from_json()` method of
+      the form `ValueType from_json(const basic_json&)`
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get__ValueType_const}
+
+    @since version 2.1.0
+    */
+    template <
+        typename ValueTypeCV,
+        typename ValueType = detail::uncvref_t<ValueTypeCV>,
+        detail::enable_if_t <
+            not std::is_same<basic_json_t, ValueType>::value and
+            detail::has_from_json<basic_json_t, ValueType>::value and
+            not detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+            int > = 0 >
+    ValueType get() const noexcept(noexcept(
+                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    {
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(not std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        static_assert(std::is_default_constructible<ValueType>::value,
+                      "types must be DefaultConstructible when used with get()");
+
+        ValueType ret;
+        JSONSerializer<ValueType>::from_json(*this, ret);
+        return ret;
+    }
+
+    /*!
+    @brief get a value (explicit); special case
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is **not** [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible)
+    and **not** [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    return JSONSerializer<ValueTypeCV>::from_json(*this);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json and
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `ValueType from_json(const basic_json&)`
+
+    @note If @ref json_serializer<ValueType> has both overloads of
+    `from_json()`, this one is chosen.
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @since version 2.1.0
+    */
+    template <
+        typename ValueTypeCV,
+        typename ValueType = detail::uncvref_t<ValueTypeCV>,
+        detail::enable_if_t<not std::is_same<basic_json_t, ValueType>::value and
+                            detail::has_non_default_from_json<basic_json_t,
+                                    ValueType>::value, int> = 0 >
+    ValueType get() const noexcept(noexcept(
+                                       JSONSerializer<ValueTypeCV>::from_json(std::declval<const basic_json_t&>())))
+    {
+        static_assert(not std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return JSONSerializer<ValueTypeCV>::from_json(*this);
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+
+    Explicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning The pointer becomes invalid if the underlying JSON object
+    changes.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get__PointerType}
+
+    @sa @ref get_ptr() for explicit pointer-member access
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    PointerType get() noexcept
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    constexpr const PointerType get() const noexcept
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /*!
+    @brief get a pointer value (implicit)
+
+    Implicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning Writing data to the pointee of the result yields an undefined
+    state.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
+    assertion.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get_ptr}
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    PointerType get_ptr() noexcept
+    {
+        // get the type of the PointerType (remove pointer and const)
+        using pointee_t = typename std::remove_const<typename
+                          std::remove_pointer<typename
+                          std::remove_const<PointerType>::type>::type>::type;
+        // make sure the type matches the allowed types
+        static_assert(
+            std::is_same<object_t, pointee_t>::value
+            or std::is_same<array_t, pointee_t>::value
+            or std::is_same<string_t, pointee_t>::value
+            or std::is_same<boolean_t, pointee_t>::value
+            or std::is_same<number_integer_t, pointee_t>::value
+            or std::is_same<number_unsigned_t, pointee_t>::value
+            or std::is_same<number_float_t, pointee_t>::value
+            , "incompatible pointer type");
+
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /*!
+    @brief get a pointer value (implicit)
+    @copydoc get_ptr()
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value and
+                 std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
+    constexpr const PointerType get_ptr() const noexcept
+    {
+        // get the type of the PointerType (remove pointer and const)
+        using pointee_t = typename std::remove_const<typename
+                          std::remove_pointer<typename
+                          std::remove_const<PointerType>::type>::type>::type;
+        // make sure the type matches the allowed types
+        static_assert(
+            std::is_same<object_t, pointee_t>::value
+            or std::is_same<array_t, pointee_t>::value
+            or std::is_same<string_t, pointee_t>::value
+            or std::is_same<boolean_t, pointee_t>::value
+            or std::is_same<number_integer_t, pointee_t>::value
+            or std::is_same<number_unsigned_t, pointee_t>::value
+            or std::is_same<number_float_t, pointee_t>::value
+            , "incompatible pointer type");
+
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /*!
+    @brief get a reference value (implicit)
+
+    Implicit reference access to the internally stored JSON value. No copies
+    are made.
+
+    @warning Writing data to the referee of the result yields an undefined
+    state.
+
+    @tparam ReferenceType reference type; must be a reference to @ref array_t,
+    @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or
+    @ref number_float_t. Enforced by static assertion.
+
+    @return reference to the internally stored JSON value if the requested
+    reference type @a ReferenceType fits to the JSON value; throws
+    type_error.303 otherwise
+
+    @throw type_error.303 in case passed type @a ReferenceType is incompatible
+    with the stored JSON value; see example below
+
+    @complexity Constant.
+
+    @liveexample{The example shows several calls to `get_ref()`.,get_ref}
+
+    @since version 1.1.0
+    */
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value, int>::type = 0>
+    ReferenceType get_ref()
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a reference value (implicit)
+    @copydoc get_ref()
+    */
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value and
+                 std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int>::type = 0>
+    ReferenceType get_ref() const
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a value (implicit)
+
+    Implicit type conversion between the JSON value and a compatible value.
+    The call is realized by calling @ref get() const.
+
+    @tparam ValueType non-pointer type compatible to the JSON value, for
+    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
+    `std::vector` types for JSON arrays. The character type of @ref string_t
+    as well as an initializer list of this type is excluded to avoid
+    ambiguities as these types implicitly convert to `std::string`.
+
+    @return copy of the JSON value, converted to type @a ValueType
+
+    @throw type_error.302 in case passed type @a ValueType is incompatible
+    to the JSON value type (e.g., the JSON value is of type boolean, but a
+    string is requested); see example below
+
+    @complexity Linear in the size of the JSON value.
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,operator__ValueType}
+
+    @since version 1.0.0
+    */
+    template < typename ValueType, typename std::enable_if <
+                   not std::is_pointer<ValueType>::value and
+                   not std::is_same<ValueType, detail::json_ref<basic_json>>::value and
+                   not std::is_same<ValueType, typename string_t::value_type>::value
+#ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
+                   and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
+#endif
+#if defined(JSON_HAS_CPP_17)
+                   and not std::is_same<ValueType, typename std::string_view>::value
+#endif
+                   , int >::type = 0 >
+    operator ValueType() const
+    {
+        // delegate the call to get<>() const
+        return get<ValueType>();
+    }
+
+    /// @}
+
+
+    ////////////////////
+    // element access //
+    ////////////////////
+
+    /// @name element access
+    /// Access to the JSON value.
+    /// @{
+
+    /*!
+    @brief access specified array element with bounds checking
+
+    Returns a reference to the element at specified location @a idx, with
+    bounds checking.
+
+    @param[in] idx  index of the element to access
+
+    @return reference to the element at index @a idx
+
+    @throw type_error.304 if the JSON value is not an array; in this case,
+    calling `at` with an index makes no sense. See example below.
+    @throw out_of_range.401 if the index @a idx is out of range of the array;
+    that is, `idx >= size()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how array elements can be read and
+    written using `at()`. It also demonstrates the different exceptions that
+    can be thrown.,at__size_type}
+    */
+    reference at(size_type idx)
+    {
+        // at only works for arrays
+        if (JSON_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified array element with bounds checking
+
+    Returns a const reference to the element at specified location @a idx,
+    with bounds checking.
+
+    @param[in] idx  index of the element to access
+
+    @return const reference to the element at index @a idx
+
+    @throw type_error.304 if the JSON value is not an array; in this case,
+    calling `at` with an index makes no sense. See example below.
+    @throw out_of_range.401 if the index @a idx is out of range of the array;
+    that is, `idx >= size()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how array elements can be read using
+    `at()`. It also demonstrates the different exceptions that can be thrown.,
+    at__size_type_const}
+    */
+    const_reference at(size_type idx) const
+    {
+        // at only works for arrays
+        if (JSON_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified object element with bounds checking
+
+    Returns a reference to the element at with specified key @a key, with
+    bounds checking.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.304 if the JSON value is not an object; in this case,
+    calling `at` with a key makes no sense. See example below.
+    @throw out_of_range.403 if the key @a key is is not stored in the object;
+    that is, `find(key) == end()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Logarithmic in the size of the container.
+
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how object elements can be read and
+    written using `at()`. It also demonstrates the different exceptions that
+    can be thrown.,at__object_t_key_type}
+    */
+    reference at(const typename object_t::key_type& key)
+    {
+        // at only works for objects
+        if (JSON_LIKELY(is_object()))
+        {
+            JSON_TRY
+            {
+                return m_value.object->at(key);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified object element with bounds checking
+
+    Returns a const reference to the element at with specified key @a key,
+    with bounds checking.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @throw type_error.304 if the JSON value is not an object; in this case,
+    calling `at` with a key makes no sense. See example below.
+    @throw out_of_range.403 if the key @a key is is not stored in the object;
+    that is, `find(key) == end()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Logarithmic in the size of the container.
+
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how object elements can be read using
+    `at()`. It also demonstrates the different exceptions that can be thrown.,
+    at__object_t_key_type_const}
+    */
+    const_reference at(const typename object_t::key_type& key) const
+    {
+        // at only works for objects
+        if (JSON_LIKELY(is_object()))
+        {
+            JSON_TRY
+            {
+                return m_value.object->at(key);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified array element
+
+    Returns a reference to the element at specified location @a idx.
+
+    @note If @a idx is beyond the range of the array (i.e., `idx >= size()`),
+    then the array is silently filled up with `null` values to make `idx` a
+    valid reference to the last stored element.
+
+    @param[in] idx  index of the element to access
+
+    @return reference to the element at index @a idx
+
+    @throw type_error.305 if the JSON value is not an array or null; in that
+    cases, using the [] operator with an index makes no sense.
+
+    @complexity Constant if @a idx is in the range of the array. Otherwise
+    linear in `idx - size()`.
+
+    @liveexample{The example below shows how array elements can be read and
+    written using `[]` operator. Note the addition of `null`
+    values.,operatorarray__size_type}
+
+    @since version 1.0.0
+    */
+    reference operator[](size_type idx)
+    {
+        // implicitly convert null value to an empty array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value.array = create<array_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for arrays
+        if (JSON_LIKELY(is_array()))
+        {
+            // fill up array with null values if given idx is outside range
+            if (idx >= m_value.array->size())
+            {
+                m_value.array->insert(m_value.array->end(),
+                                      idx - m_value.array->size() + 1,
+                                      basic_json());
+            }
+
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified array element
+
+    Returns a const reference to the element at specified location @a idx.
+
+    @param[in] idx  index of the element to access
+
+    @return const reference to the element at index @a idx
+
+    @throw type_error.305 if the JSON value is not an array; in that cases,
+    using the [] operator with an index makes no sense.
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how array elements can be read using
+    the `[]` operator.,operatorarray__size_type_const}
+
+    @since version 1.0.0
+    */
+    const_reference operator[](size_type idx) const
+    {
+        // const operator[] only works for arrays
+        if (JSON_LIKELY(is_array()))
+        {
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element
+
+    Returns a reference to the element at with specified key @a key.
+
+    @note If @a key is not found in the object, then it is silently added to
+    the object and filled with a `null` value to make `key` a valid reference.
+    In case the value was `null` before, it is converted to an object.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.305 if the JSON value is not an object or null; in that
+    cases, using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read and
+    written using the `[]` operator.,operatorarray__key_type}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+    */
+    reference operator[](const typename object_t::key_type& key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_LIKELY(is_object()))
+        {
+            return m_value.object->operator[](key);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief read-only access specified object element
+
+    Returns a const reference to the element at with specified key @a key. No
+    bounds checking is performed.
+
+    @warning If the element with key @a key does not exist, the behavior is
+    undefined.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @pre The element with key @a key must exist. **This precondition is
+         enforced with an assertion.**
+
+    @throw type_error.305 if the JSON value is not an object; in that cases,
+    using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read using
+    the `[]` operator.,operatorarray__key_type_const}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+    */
+    const_reference operator[](const typename object_t::key_type& key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_LIKELY(is_object()))
+        {
+            assert(m_value.object->find(key) != m_value.object->end());
+            return m_value.object->find(key)->second;
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element
+
+    Returns a reference to the element at with specified key @a key.
+
+    @note If @a key is not found in the object, then it is silently added to
+    the object and filled with a `null` value to make `key` a valid reference.
+    In case the value was `null` before, it is converted to an object.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.305 if the JSON value is not an object or null; in that
+    cases, using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read and
+    written using the `[]` operator.,operatorarray__key_type}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.1.0
+    */
+    template<typename T>
+    reference operator[](T* key)
+    {
+        // implicitly convert null to object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // at only works for objects
+        if (JSON_LIKELY(is_object()))
+        {
+            return m_value.object->operator[](key);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief read-only access specified object element
+
+    Returns a const reference to the element at with specified key @a key. No
+    bounds checking is performed.
+
+    @warning If the element with key @a key does not exist, the behavior is
+    undefined.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @pre The element with key @a key must exist. **This precondition is
+         enforced with an assertion.**
+
+    @throw type_error.305 if the JSON value is not an object; in that cases,
+    using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read using
+    the `[]` operator.,operatorarray__key_type_const}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.1.0
+    */
+    template<typename T>
+    const_reference operator[](T* key) const
+    {
+        // at only works for objects
+        if (JSON_LIKELY(is_object()))
+        {
+            assert(m_value.object->find(key) != m_value.object->end());
+            return m_value.object->find(key)->second;
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element with default value
+
+    Returns either a copy of an object's element at the specified key @a key
+    or a given default value if no element with key @a key exists.
+
+    The function is basically equivalent to executing
+    @code {.cpp}
+    try {
+        return at(key);
+    } catch(out_of_range) {
+        return default_value;
+    }
+    @endcode
+
+    @note Unlike @ref at(const typename object_t::key_type&), this function
+    does not throw if the given key @a key was not found.
+
+    @note Unlike @ref operator[](const typename object_t::key_type& key), this
+    function does not implicitly add an element to the position defined by @a
+    key. This function is furthermore also applicable to const objects.
+
+    @param[in] key  key of the element to access
+    @param[in] default_value  the value to return if @a key is not found
+
+    @tparam ValueType type compatible to JSON values, for instance `int` for
+    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
+    JSON arrays. Note the type of the expected value at @a key and the default
+    value @a default_value must be compatible.
+
+    @return copy of the element at key @a key or @a default_value if @a key
+    is not found
+
+    @throw type_error.306 if the JSON value is not an objec; in that cases,
+    using `value()` with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be queried
+    with a default value.,basic_json__value}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+
+    @since version 1.0.0
+    */
+    template<class ValueType, typename std::enable_if<
+                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
+    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
+    {
+        // at only works for objects
+        if (JSON_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return *it;
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief overload for a default value of type const char*
+    @copydoc basic_json::value(const typename object_t::key_type&, ValueType) const
+    */
+    string_t value(const typename object_t::key_type& key, const char* default_value) const
+    {
+        return value(key, string_t(default_value));
+    }
+
+    /*!
+    @brief access specified object element via JSON Pointer with default value
+
+    Returns either a copy of an object's element at the specified key @a key
+    or a given default value if no element with key @a key exists.
+
+    The function is basically equivalent to executing
+    @code {.cpp}
+    try {
+        return at(ptr);
+    } catch(out_of_range) {
+        return default_value;
+    }
+    @endcode
+
+    @note Unlike @ref at(const json_pointer&), this function does not throw
+    if the given key @a key was not found.
+
+    @param[in] ptr  a JSON pointer to the element to access
+    @param[in] default_value  the value to return if @a ptr found no value
+
+    @tparam ValueType type compatible to JSON values, for instance `int` for
+    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
+    JSON arrays. Note the type of the expected value at @a key and the default
+    value @a default_value must be compatible.
+
+    @return copy of the element at key @a key or @a default_value if @a key
+    is not found
+
+    @throw type_error.306 if the JSON value is not an objec; in that cases,
+    using `value()` with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be queried
+    with a default value.,basic_json__value_ptr}
+
+    @sa @ref operator[](const json_pointer&) for unchecked access by reference
+
+    @since version 2.0.2
+    */
+    template<class ValueType, typename std::enable_if<
+                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
+    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
+    {
+        // at only works for objects
+        if (JSON_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this);
+            }
+            JSON_CATCH (out_of_range&)
+            {
+                return default_value;
+            }
+        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief overload for a default value of type const char*
+    @copydoc basic_json::value(const json_pointer&, ValueType) const
+    */
+    string_t value(const json_pointer& ptr, const char* default_value) const
+    {
+        return value(ptr, string_t(default_value));
+    }
+
+    /*!
+    @brief access the first element
+
+    Returns a reference to the first element in the container. For a JSON
+    container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
+
+    @return In case of a structured type (array or object), a reference to the
+    first element is returned. In case of number, string, or boolean values, a
+    reference to the value is returned.
+
+    @complexity Constant.
+
+    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
+    or an empty array or object (undefined behavior, **guarded by
+    assertions**).
+    @post The JSON value remains unchanged.
+
+    @throw invalid_iterator.214 when called on `null` value
+
+    @liveexample{The following code shows an example for `front()`.,front}
+
+    @sa @ref back() -- access the last element
+
+    @since version 1.0.0
+    */
+    reference front()
+    {
+        return *begin();
+    }
+
+    /*!
+    @copydoc basic_json::front()
+    */
+    const_reference front() const
+    {
+        return *cbegin();
+    }
+
+    /*!
+    @brief access the last element
+
+    Returns a reference to the last element in the container. For a JSON
+    container `c`, the expression `c.back()` is equivalent to
+    @code {.cpp}
+    auto tmp = c.end();
+    --tmp;
+    return *tmp;
+    @endcode
+
+    @return In case of a structured type (array or object), a reference to the
+    last element is returned. In case of number, string, or boolean values, a
+    reference to the value is returned.
+
+    @complexity Constant.
+
+    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
+    or an empty array or object (undefined behavior, **guarded by
+    assertions**).
+    @post The JSON value remains unchanged.
+
+    @throw invalid_iterator.214 when called on a `null` value. See example
+    below.
+
+    @liveexample{The following code shows an example for `back()`.,back}
+
+    @sa @ref front() -- access the first element
+
+    @since version 1.0.0
+    */
+    reference back()
+    {
+        auto tmp = end();
+        --tmp;
+        return *tmp;
+    }
+
+    /*!
+    @copydoc basic_json::back()
+    */
+    const_reference back() const
+    {
+        auto tmp = cend();
+        --tmp;
+        return *tmp;
+    }
+
+    /*!
+    @brief remove element given an iterator
+
+    Removes the element specified by iterator @a pos. The iterator @a pos must
+    be valid and dereferenceable. Thus the `end()` iterator (which is valid,
+    but is not dereferenceable) cannot be used as a value for @a pos.
+
+    If called on a primitive type other than `null`, the resulting JSON value
+    will be `null`.
+
+    @param[in] pos iterator to the element to remove
+    @return Iterator following the last removed element. If the iterator @a
+    pos refers to the last element, the `end()` iterator is returned.
+
+    @tparam IteratorType an @ref iterator or @ref const_iterator
+
+    @post Invalidates iterators and references at or after the point of the
+    erase, including the `end()` iterator.
+
+    @throw type_error.307 if called on a `null` value; example: `"cannot use
+    erase() with null"`
+    @throw invalid_iterator.202 if called on an iterator which does not belong
+    to the current JSON value; example: `"iterator does not fit current
+    value"`
+    @throw invalid_iterator.205 if called on a primitive type with invalid
+    iterator (i.e., any iterator which is not `begin()`); example: `"iterator
+    out of range"`
+
+    @complexity The complexity depends on the type:
+    - objects: amortized constant
+    - arrays: linear in distance between @a pos and the end of the container
+    - strings: linear in the length of the string
+    - other types: constant
+
+    @liveexample{The example shows the result of `erase()` for different JSON
+    types.,erase__IteratorType}
+
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    template<class IteratorType, typename std::enable_if<
+                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
+                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
+             = 0>
+    IteratorType erase(IteratorType pos)
+    {
+        // make sure iterator fits the current value
+        if (JSON_UNLIKELY(this != pos.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_UNLIKELY(not pos.m_it.primitive_iterator.is_begin()))
+                {
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range"));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    alloc.destroy(m_value.string);
+                    alloc.deallocate(m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief remove elements given an iterator range
+
+    Removes the element specified by the range `[first; last)`. The iterator
+    @a first does not need to be dereferenceable if `first == last`: erasing
+    an empty range is a no-op.
+
+    If called on a primitive type other than `null`, the resulting JSON value
+    will be `null`.
+
+    @param[in] first iterator to the beginning of the range to remove
+    @param[in] last iterator past the end of the range to remove
+    @return Iterator following the last removed element. If the iterator @a
+    second refers to the last element, the `end()` iterator is returned.
+
+    @tparam IteratorType an @ref iterator or @ref const_iterator
+
+    @post Invalidates iterators and references at or after the point of the
+    erase, including the `end()` iterator.
+
+    @throw type_error.307 if called on a `null` value; example: `"cannot use
+    erase() with null"`
+    @throw invalid_iterator.203 if called on iterators which does not belong
+    to the current JSON value; example: `"iterators do not fit current value"`
+    @throw invalid_iterator.204 if called on a primitive type with invalid
+    iterators (i.e., if `first != begin()` and `last != end()`); example:
+    `"iterators out of range"`
+
+    @complexity The complexity depends on the type:
+    - objects: `log(size()) + std::distance(first, last)`
+    - arrays: linear in the distance between @a first and @a last, plus linear
+      in the distance between @a last and end of the container
+    - strings: linear in the length of the string
+    - other types: constant
+
+    @liveexample{The example shows the result of `erase()` for different JSON
+    types.,erase__IteratorType_IteratorType}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    template<class IteratorType, typename std::enable_if<
+                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
+                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
+             = 0>
+    IteratorType erase(IteratorType first, IteratorType last)
+    {
+        // make sure iterator fits the current value
+        if (JSON_UNLIKELY(this != first.m_object or this != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value"));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_LIKELY(not first.m_it.primitive_iterator.is_begin()
+                                or not last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    alloc.destroy(m_value.string);
+                    alloc.deallocate(m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
+                                              last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
+                                             last.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief remove element from a JSON object given a key
+
+    Removes elements from a JSON object with the key value @a key.
+
+    @param[in] key value of the elements to remove
+
+    @return Number of elements removed. If @a ObjectType is the default
+    `std::map` type, the return value will always be `0` (@a key was not
+    found) or `1` (@a key was found).
+
+    @post References and iterators to the erased elements are invalidated.
+    Other references and iterators are not affected.
+
+    @throw type_error.307 when called on a type other than JSON object;
+    example: `"cannot use erase() with null"`
+
+    @complexity `log(size()) + count(key)`
+
+    @liveexample{The example shows the effect of `erase()`.,erase__key_type}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // this erase only works for objects
+        if (JSON_LIKELY(is_object()))
+        {
+            return m_value.object->erase(key);
+        }
+
+        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief remove element from a JSON array given an index
+
+    Removes element from a JSON array at the index @a idx.
+
+    @param[in] idx index of the element to remove
+
+    @throw type_error.307 when called on a type other than JSON object;
+    example: `"cannot use erase() with null"`
+    @throw out_of_range.401 when `idx >= size()`; example: `"array index 17
+    is out of range"`
+
+    @complexity Linear in distance between @a idx and the end of the container.
+
+    @liveexample{The example shows the effect of `erase()`.,erase__size_type}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+
+    @since version 1.0.0
+    */
+    void erase(const size_type idx)
+    {
+        // this erase only works for arrays
+        if (JSON_LIKELY(is_array()))
+        {
+            if (JSON_UNLIKELY(idx >= size()))
+            {
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+
+            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
+        }
+        else
+        {
+            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+    }
+
+    /// @}
+
+
+    ////////////
+    // lookup //
+    ////////////
+
+    /// @name lookup
+    /// @{
+
+    /*!
+    @brief find an element in a JSON object
+
+    Finds an element in a JSON object with key equivalent to @a key. If the
+    element is not found or the JSON value is not an object, end() is
+    returned.
+
+    @note This method always returns @ref end() when executed on a JSON type
+          that is not an object.
+
+    @param[in] key key value of the element to search for.
+
+    @return Iterator to an element with key equivalent to @a key. If no such
+    element is found or the JSON value is not an object, past-the-end (see
+    @ref end()) iterator is returned.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The example shows how `find()` is used.,find__key_type}
+
+    @since version 1.0.0
+    */
+    template<typename KeyT>
+    iterator find(KeyT&& key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief find an element in a JSON object
+    @copydoc find(KeyT&&)
+    */
+    template<typename KeyT>
+    const_iterator find(KeyT&& key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief returns the number of occurrences of a key in a JSON object
+
+    Returns the number of elements with key @a key. If ObjectType is the
+    default `std::map` type, the return value will always be `0` (@a key was
+    not found) or `1` (@a key was found).
+
+    @note This method always returns `0` when executed on a JSON type that is
+          not an object.
+
+    @param[in] key key value of the element to count
+
+    @return Number of elements with key @a key. If the JSON value is not an
+    object, the return value will be `0`.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The example shows how `count()` is used.,count}
+
+    @since version 1.0.0
+    */
+    template<typename KeyT>
+    size_type count(KeyT&& key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
+    }
+
+    /// @}
+
+
+    ///////////////
+    // iterators //
+    ///////////////
+
+    /// @name iterators
+    /// @{
+
+    /*!
+    @brief returns an iterator to the first element
+
+    Returns an iterator to the first element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return iterator to the first element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    requirements:
+    - The complexity is constant.
+
+    @liveexample{The following code shows an example for `begin()`.,begin}
+
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref cend() -- returns a const iterator to the end
+
+    @since version 1.0.0
+    */
+    iterator begin() noexcept
+    {
+        iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /*!
+    @copydoc basic_json::cbegin()
+    */
+    const_iterator begin() const noexcept
+    {
+        return cbegin();
+    }
+
+    /*!
+    @brief returns a const iterator to the first element
+
+    Returns a const iterator to the first element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return const iterator to the first element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
+
+    @liveexample{The following code shows an example for `cbegin()`.,cbegin}
+
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref cend() -- returns a const iterator to the end
+
+    @since version 1.0.0
+    */
+    const_iterator cbegin() const noexcept
+    {
+        const_iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /*!
+    @brief returns an iterator to one past the last element
+
+    Returns an iterator to one past the last element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return iterator one past the last element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    requirements:
+    - The complexity is constant.
+
+    @liveexample{The following code shows an example for `end()`.,end}
+
+    @sa @ref cend() -- returns a const iterator to the end
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+
+    @since version 1.0.0
+    */
+    iterator end() noexcept
+    {
+        iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /*!
+    @copydoc basic_json::cend()
+    */
+    const_iterator end() const noexcept
+    {
+        return cend();
+    }
+
+    /*!
+    @brief returns a const iterator to one past the last element
+
+    Returns a const iterator to one past the last element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return const iterator one past the last element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
+
+    @liveexample{The following code shows an example for `cend()`.,cend}
+
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+
+    @since version 1.0.0
+    */
+    const_iterator cend() const noexcept
+    {
+        const_iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /*!
+    @brief returns an iterator to the reverse-beginning
+
+    Returns an iterator to the reverse-beginning; that is, the last element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `reverse_iterator(end())`.
+
+    @liveexample{The following code shows an example for `rbegin()`.,rbegin}
+
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref crend() -- returns a const reverse iterator to the end
+
+    @since version 1.0.0
+    */
+    reverse_iterator rbegin() noexcept
+    {
+        return reverse_iterator(end());
+    }
+
+    /*!
+    @copydoc basic_json::crbegin()
+    */
+    const_reverse_iterator rbegin() const noexcept
+    {
+        return crbegin();
+    }
+
+    /*!
+    @brief returns an iterator to the reverse-end
+
+    Returns an iterator to the reverse-end; that is, one before the first
+    element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `reverse_iterator(begin())`.
+
+    @liveexample{The following code shows an example for `rend()`.,rend}
+
+    @sa @ref crend() -- returns a const reverse iterator to the end
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+
+    @since version 1.0.0
+    */
+    reverse_iterator rend() noexcept
+    {
+        return reverse_iterator(begin());
+    }
+
+    /*!
+    @copydoc basic_json::crend()
+    */
+    const_reverse_iterator rend() const noexcept
+    {
+        return crend();
+    }
+
+    /*!
+    @brief returns a const reverse iterator to the last element
+
+    Returns a const iterator to the reverse-beginning; that is, the last
+    element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
+
+    @liveexample{The following code shows an example for `crbegin()`.,crbegin}
+
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref crend() -- returns a const reverse iterator to the end
+
+    @since version 1.0.0
+    */
+    const_reverse_iterator crbegin() const noexcept
+    {
+        return const_reverse_iterator(cend());
+    }
+
+    /*!
+    @brief returns a const reverse iterator to one before the first
+
+    Returns a const reverse iterator to the reverse-end; that is, one before
+    the first element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
+
+    @liveexample{The following code shows an example for `crend()`.,crend}
+
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+
+    @since version 1.0.0
+    */
+    const_reverse_iterator crend() const noexcept
+    {
+        return const_reverse_iterator(cbegin());
+    }
+
+  public:
+    /*!
+    @brief wrapper to access iterator member functions in range-based for
+
+    This function allows to access @ref iterator::key() and @ref
+    iterator::value() during range-based for loops. In these loops, a
+    reference to the JSON values is returned, so there is no access to the
+    underlying iterator.
+
+    @liveexample{The following code shows how the wrapper is used,iterator_wrapper}
+
+    @note The name of this function is not yet final and may change in the
+    future.
+    */
+    static iteration_proxy<iterator> iterator_wrapper(reference cont)
+    {
+        return iteration_proxy<iterator>(cont);
+    }
+
+    /*!
+    @copydoc iterator_wrapper(reference)
+    */
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference cont)
+    {
+        return iteration_proxy<const_iterator>(cont);
+    }
+
+    /// @}
+
+
+    //////////////
+    // capacity //
+    //////////////
+
+    /// @name capacity
+    /// @{
+
+    /*!
+    @brief checks whether the container is empty.
+
+    Checks if a JSON value has no elements (i.e. whether its @ref size is `0`).
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `true`
+            boolean     | `false`
+            string      | `false`
+            number      | `false`
+            object      | result of function `object_t::empty()`
+            array       | result of function `array_t::empty()`
+
+    @liveexample{The following code uses `empty()` to check if a JSON
+    object contains any elements.,empty}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their `empty()` functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @note This function does not return whether a string stored as JSON value
+    is empty - it returns whether the JSON container itself is empty which is
+    false in the case of a string.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `begin() == end()`.
+
+    @sa @ref size() -- returns the number of elements
+
+    @since version 1.0.0
+    */
+    bool empty() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return true;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::empty()
+                return m_value.array->empty();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::empty()
+                return m_value.object->empty();
+            }
+
+            default:
+            {
+                // all other types are nonempty
+                return false;
+            }
+        }
+    }
+
+    /*!
+    @brief returns the number of elements
+
+    Returns the number of elements in a JSON value.
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `0`
+            boolean     | `1`
+            string      | `1`
+            number      | `1`
+            object      | result of function object_t::size()
+            array       | result of function array_t::size()
+
+    @liveexample{The following code calls `size()` on the different value
+    types.,size}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their size() functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @note This function does not return the length of a string stored as JSON
+    value - it returns the number of elements in the JSON value which is 1 in
+    the case of a string.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `std::distance(begin(), end())`.
+
+    @sa @ref empty() -- checks whether the container is empty
+    @sa @ref max_size() -- returns the maximal number of elements
+
+    @since version 1.0.0
+    */
+    size_type size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return 0;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::size()
+                return m_value.array->size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::size()
+                return m_value.object->size();
+            }
+
+            default:
+            {
+                // all other types have size 1
+                return 1;
+            }
+        }
+    }
+
+    /*!
+    @brief returns the maximum possible number of elements
+
+    Returns the maximum number of elements a JSON value is able to hold due to
+    system or library implementation limitations, i.e. `std::distance(begin(),
+    end())` for the JSON value.
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `0` (same as `size()`)
+            boolean     | `1` (same as `size()`)
+            string      | `1` (same as `size()`)
+            number      | `1` (same as `size()`)
+            object      | result of function `object_t::max_size()`
+            array       | result of function `array_t::max_size()`
+
+    @liveexample{The following code calls `max_size()` on the different value
+    types. Note the output is implementation specific.,max_size}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their `max_size()` functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of returning `b.size()` where `b` is the largest
+      possible JSON value.
+
+    @sa @ref size() -- returns the number of elements
+
+    @since version 1.0.0
+    */
+    size_type max_size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::array:
+            {
+                // delegate call to array_t::max_size()
+                return m_value.array->max_size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::max_size()
+                return m_value.object->max_size();
+            }
+
+            default:
+            {
+                // all other types have max_size() == size()
+                return size();
+            }
+        }
+    }
+
+    /// @}
+
+
+    ///////////////
+    // modifiers //
+    ///////////////
+
+    /// @name modifiers
+    /// @{
+
+    /*!
+    @brief clears the contents
+
+    Clears the content of a JSON value and resets it to the default value as
+    if @ref basic_json(value_t) would have been called with the current value
+    type from @ref type():
+
+    Value type  | initial value
+    ----------- | -------------
+    null        | `null`
+    boolean     | `false`
+    string      | `""`
+    number      | `0`
+    object      | `{}`
+    array       | `[]`
+
+    @post Has the same effect as calling
+    @code {.cpp}
+    *this = basic_json(type());
+    @endcode
+
+    @liveexample{The example below shows the effect of `clear()` to different
+    JSON types.,clear}
+
+    @complexity Linear in the size of the JSON value.
+
+    @iterators All iterators, pointers and references related to this container
+               are invalidated.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @sa @ref basic_json(value_t) -- constructor that creates an object with the
+        same value than calling `clear()`
+
+    @since version 1.0.0
+    */
+    void clear() noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = 0;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = 0;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = 0.0;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = false;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value.string->clear();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array->clear();
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object->clear();
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @brief add an object to an array
+
+    Appends the given element @a val to the end of the JSON value. If the
+    function is called on a JSON null value, an empty array is created before
+    appending @a val.
+
+    @param[in] val the value to add to the JSON array
+
+    @throw type_error.308 when called on a type other than JSON array or
+    null; example: `"cannot use push_back() with number"`
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows how `push_back()` and `+=` can be used to
+    add elements to a JSON array. Note how the `null` value was silently
+    converted to a JSON array.,push_back}
+
+    @since version 1.0.0
+    */
+    void push_back(basic_json&& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_UNLIKELY(not(is_null() or is_array())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (move semantics)
+        m_value.array->push_back(std::move(val));
+        // invalidate object
+        val.m_type = value_t::null;
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    reference operator+=(basic_json&& val)
+    {
+        push_back(std::move(val));
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    void push_back(const basic_json& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_UNLIKELY(not(is_null() or is_array())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array
+        m_value.array->push_back(val);
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    reference operator+=(const basic_json& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an object
+
+    Inserts the given element @a val to the JSON object. If the function is
+    called on a JSON null value, an empty object is created before inserting
+    @a val.
+
+    @param[in] val the value to add to the JSON object
+
+    @throw type_error.308 when called on a type other than JSON object or
+    null; example: `"cannot use push_back() with number"`
+
+    @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+    @liveexample{The example shows how `push_back()` and `+=` can be used to
+    add elements to a JSON object. Note how the `null` value was silently
+    converted to a JSON object.,push_back__object_t__value}
+
+    @since version 1.0.0
+    */
+    void push_back(const typename object_t::value_type& val)
+    {
+        // push_back only works for null objects or objects
+        if (JSON_UNLIKELY(not(is_null() or is_object())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array
+        m_value.object->insert(val);
+    }
+
+    /*!
+    @brief add an object to an object
+    @copydoc push_back(const typename object_t::value_type&)
+    */
+    reference operator+=(const typename object_t::value_type& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an object
+
+    This function allows to use `push_back` with an initializer list. In case
+
+    1. the current value is an object,
+    2. the initializer list @a init contains only two elements, and
+    3. the first element of @a init is a string,
+
+    @a init is converted into an object element and added using
+    @ref push_back(const typename object_t::value_type&). Otherwise, @a init
+    is converted to a JSON value and added using @ref push_back(basic_json&&).
+
+    @param[in] init  an initializer list
+
+    @complexity Linear in the size of the initializer list @a init.
+
+    @note This function is required to resolve an ambiguous overload error,
+          because pairs like `{"key", "value"}` can be both interpreted as
+          `object_t::value_type` or `std::initializer_list<basic_json>`, see
+          https://github.com/nlohmann/json/issues/235 for more information.
+
+    @liveexample{The example shows how initializer lists are treated as
+    objects when possible.,push_back__initializer_list}
+    */
+    void push_back(initializer_list_t init)
+    {
+        if (is_object() and init.size() == 2 and (*init.begin())->is_string())
+        {
+            basic_json&& key = init.begin()->moved_or_copied();
+            push_back(typename object_t::value_type(
+                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
+        }
+        else
+        {
+            push_back(basic_json(init));
+        }
+    }
+
+    /*!
+    @brief add an object to an object
+    @copydoc push_back(initializer_list_t)
+    */
+    reference operator+=(initializer_list_t init)
+    {
+        push_back(init);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an array
+
+    Creates a JSON value from the passed parameters @a args to the end of the
+    JSON value. If the function is called on a JSON null value, an empty array
+    is created before appending the value created from @a args.
+
+    @param[in] args arguments to forward to a constructor of @ref basic_json
+    @tparam Args compatible types to create a @ref basic_json object
+
+    @throw type_error.311 when called on a type other than JSON array or
+    null; example: `"cannot use emplace_back() with number"`
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows how `push_back()` can be used to add
+    elements to a JSON array. Note how the `null` value was silently converted
+    to a JSON array.,emplace_back}
+
+    @since version 2.0.8
+    */
+    template<class... Args>
+    void emplace_back(Args&& ... args)
+    {
+        // emplace_back only works for null objects or arrays
+        if (JSON_UNLIKELY(not(is_null() or is_array())))
+        {
+            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        m_value.array->emplace_back(std::forward<Args>(args)...);
+    }
+
+    /*!
+    @brief add an object to an object if key does not exist
+
+    Inserts a new element into a JSON object constructed in-place with the
+    given @a args if there is no element with the key in the container. If the
+    function is called on a JSON null value, an empty object is created before
+    appending the value created from @a args.
+
+    @param[in] args arguments to forward to a constructor of @ref basic_json
+    @tparam Args compatible types to create a @ref basic_json object
+
+    @return a pair consisting of an iterator to the inserted element, or the
+            already-existing element if no insertion happened, and a bool
+            denoting whether the insertion took place.
+
+    @throw type_error.311 when called on a type other than JSON object or
+    null; example: `"cannot use emplace() with number"`
+
+    @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+    @liveexample{The example shows how `emplace()` can be used to add elements
+    to a JSON object. Note how the `null` value was silently converted to a
+    JSON object. Further note how no value is added if there was already one
+    value stored with the same key.,emplace}
+
+    @since version 2.0.8
+    */
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&& ... args)
+    {
+        // emplace only works for null objects or arrays
+        if (JSON_UNLIKELY(not(is_null() or is_object())))
+        {
+            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name())));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        auto res = m_value.object->emplace(std::forward<Args>(args)...);
+        // create result iterator and set iterator to the result of emplace
+        auto it = begin();
+        it.m_it.object_iterator = res.first;
+
+        // return pair of iterator and boolean
+        return {it, res.second};
+    }
+
+    /*!
+    @brief inserts element
+
+    Inserts element @a val before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] val element to insert
+    @return iterator pointing to the inserted @a val.
+
+    @throw type_error.309 if called on JSON values other than arrays;
+    example: `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @complexity Constant plus linear in the distance between @a pos and end of
+    the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+            }
+
+            // insert to array and return iterator
+            iterator result(this);
+            result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, val);
+            return result;
+        }
+
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief inserts element
+    @copydoc insert(const_iterator, const basic_json&)
+    */
+    iterator insert(const_iterator pos, basic_json&& val)
+    {
+        return insert(pos, val);
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts @a cnt copies of @a val before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] cnt number of copies of @a val to insert
+    @param[in] val element to insert
+    @return iterator pointing to the first element inserted, or @a pos if
+    `cnt==0`
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @complexity Linear in @a cnt plus linear in the distance between @a pos
+    and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__count}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+            }
+
+            // insert to array and return iterator
+            iterator result(this);
+            result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+            return result;
+        }
+
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from range `[first, last)` before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+    @throw invalid_iterator.211 if @a first or @a last are iterators into
+    container for which insert is called; example: `"passed iterators may not
+    belong to container"`
+
+    @return iterator pointing to the first element inserted, or @a pos if
+    `first==last`
+
+    @complexity Linear in `std::distance(first, last)` plus linear in the
+    distance between @a pos and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__range}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
+    {
+        // insert only works for arrays
+        if (JSON_UNLIKELY(not is_array()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        if (JSON_UNLIKELY(first.m_object == this))
+        {
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container"));
+        }
+
+        // insert to array and return iterator
+        iterator result(this);
+        result.m_it.array_iterator = m_value.array->insert(
+                                         pos.m_it.array_iterator,
+                                         first.m_it.array_iterator,
+                                         last.m_it.array_iterator);
+        return result;
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from initializer list @a ilist before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] ilist initializer list to insert the values from
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @return iterator pointing to the first element inserted, or @a pos if
+    `ilist` is empty
+
+    @complexity Linear in `ilist.size()` plus linear in the distance between
+    @a pos and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__ilist}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, initializer_list_t ilist)
+    {
+        // insert only works for arrays
+        if (JSON_UNLIKELY(not is_array()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        // insert to array and return iterator
+        iterator result(this);
+        result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, ilist.begin(), ilist.end());
+        return result;
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from range `[first, last)`.
+
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.309 if called on JSON values other than objects; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    point to an object; example: `"iterators first and last must point to
+    objects"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+
+    @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number
+    of elements to insert.
+
+    @liveexample{The example shows how `insert()` is used.,insert__range_object}
+
+    @since version 3.0.0
+    */
+    void insert(const_iterator first, const_iterator last)
+    {
+        // insert only works for objects
+        if (JSON_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_UNLIKELY(not first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+        }
+
+        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+    }
+
+    /*!
+    @brief updates a JSON object from another object, overwriting existing keys
+
+    Inserts all values from JSON object @a j and overwrites existing keys.
+
+    @param[in] j  JSON object to read values from
+
+    @throw type_error.312 if called on JSON values other than objects; example:
+    `"cannot use update() with string"`
+
+    @complexity O(N*log(size() + N)), where N is the number of elements to
+                insert.
+
+    @liveexample{The example shows how `update()` is used.,update}
+
+    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+    @since version 3.0.0
+    */
+    void update(const_reference j)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+        }
+        if (JSON_UNLIKELY(not j.is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name())));
+        }
+
+        for (auto it = j.begin(); it != j.end(); ++it)
+        {
+            m_value.object->operator[](it.key()) = it.value();
+        }
+    }
+
+    /*!
+    @brief updates a JSON object from another object, overwriting existing keys
+
+    Inserts all values from from range `[first, last)` and overwrites existing
+    keys.
+
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.312 if called on JSON values other than objects; example:
+    `"cannot use update() with string"`
+    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    point to an object; example: `"iterators first and last must point to
+    objects"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+
+    @complexity O(N*log(size() + N)), where N is the number of elements to
+                insert.
+
+    @liveexample{The example shows how `update()` is used__range.,update}
+
+    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+    @since version 3.0.0
+    */
+    void update(const_iterator first, const_iterator last)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_UNLIKELY(not first.m_object->is_object()
+                          or not first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+        }
+
+        for (auto it = first; it != last; ++it)
+        {
+            m_value.object->operator[](it.key()) = it.value();
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of the JSON value with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other JSON value to exchange the contents with
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how JSON values can be swapped with
+    `swap()`.,swap__reference}
+
+    @since version 1.0.0
+    */
+    void swap(reference other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value and
+        std::is_nothrow_move_assignable<value_t>::value and
+        std::is_nothrow_move_constructible<json_value>::value and
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        std::swap(m_type, other.m_type);
+        std::swap(m_value, other.m_value);
+        assert_invariant();
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON array with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other array to exchange the contents with
+
+    @throw type_error.310 when JSON value is not an array; example: `"cannot
+    use swap() with string"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how arrays can be swapped with
+    `swap()`.,swap__array_t}
+
+    @since version 1.0.0
+    */
+    void swap(array_t& other)
+    {
+        // swap only works for arrays
+        if (JSON_LIKELY(is_array()))
+        {
+            std::swap(*(m_value.array), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON object with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other object to exchange the contents with
+
+    @throw type_error.310 when JSON value is not an object; example:
+    `"cannot use swap() with string"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how objects can be swapped with
+    `swap()`.,swap__object_t}
+
+    @since version 1.0.0
+    */
+    void swap(object_t& other)
+    {
+        // swap only works for objects
+        if (JSON_LIKELY(is_object()))
+        {
+            std::swap(*(m_value.object), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON string with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other string to exchange the contents with
+
+    @throw type_error.310 when JSON value is not a string; example: `"cannot
+    use swap() with boolean"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how strings can be swapped with
+    `swap()`.,swap__string_t}
+
+    @since version 1.0.0
+    */
+    void swap(string_t& other)
+    {
+        // swap only works for strings
+        if (JSON_LIKELY(is_string()))
+        {
+            std::swap(*(m_value.string), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /// @}
+
+  public:
+    //////////////////////////////////////////
+    // lexicographical comparison operators //
+    //////////////////////////////////////////
+
+    /// @name lexicographical comparison operators
+    /// @{
+
+    /*!
+    @brief comparison: equal
+
+    Compares two JSON values for equality according to the following rules:
+    - Two JSON values are equal if (1) they are from the same type and (2)
+      their stored values are the same according to their respective
+      `operator==`.
+    - Integer and floating-point numbers are automatically converted before
+      comparison. Note than two NaN values are always treated as unequal.
+    - Two JSON null values are equal.
+
+    @note Floating-point inside JSON values numbers are compared with
+    `json::number_float_t::operator==` which is `double::operator==` by
+    default. To compare floating-point while respecting an epsilon, an alternative
+    [comparison function](https://github.com/mariokonrad/marnav/blob/master/src/marnav/math/floatingpoint.hpp#L34-#L39)
+    could be used, for instance
+    @code {.cpp}
+    template <typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
+    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
+    {
+        return std::abs(a - b) <= epsilon;
+    }
+    @endcode
+
+    @note NaN values never compare equal to themselves or to other NaN values.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether the values @a lhs and @a rhs are equal
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @complexity Linear.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__equal}
+
+    @since version 1.0.0
+    */
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    {
+        const auto lhs_type = lhs.type();
+        const auto rhs_type = rhs.type();
+
+        if (lhs_type == rhs_type)
+        {
+            switch (lhs_type)
+            {
+                case value_t::array:
+                    return (*lhs.m_value.array == *rhs.m_value.array);
+
+                case value_t::object:
+                    return (*lhs.m_value.object == *rhs.m_value.object);
+
+                case value_t::null:
+                    return true;
+
+                case value_t::string:
+                    return (*lhs.m_value.string == *rhs.m_value.string);
+
+                case value_t::boolean:
+                    return (lhs.m_value.boolean == rhs.m_value.boolean);
+
+                case value_t::number_integer:
+                    return (lhs.m_value.number_integer == rhs.m_value.number_integer);
+
+                case value_t::number_unsigned:
+                    return (lhs.m_value.number_unsigned == rhs.m_value.number_unsigned);
+
+                case value_t::number_float:
+                    return (lhs.m_value.number_float == rhs.m_value.number_float);
+
+                default:
+                    return false;
+            }
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
+        {
+            return (static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float);
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
+        {
+            return (lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer));
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
+        {
+            return (static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float);
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
+        {
+            return (lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned));
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
+        {
+            return (static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer);
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
+        {
+            return (lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned));
+        }
+
+        return false;
+    }
+
+    /*!
+    @brief comparison: equal
+    @copydoc operator==(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return (lhs == basic_json(rhs));
+    }
+
+    /*!
+    @brief comparison: equal
+    @copydoc operator==(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return (basic_json(lhs) == rhs);
+    }
+
+    /*!
+    @brief comparison: not equal
+
+    Compares two JSON values for inequality by calculating `not (lhs == rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether the values @a lhs and @a rhs are not equal
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__notequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (lhs == rhs);
+    }
+
+    /*!
+    @brief comparison: not equal
+    @copydoc operator!=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return (lhs != basic_json(rhs));
+    }
+
+    /*!
+    @brief comparison: not equal
+    @copydoc operator!=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return (basic_json(lhs) != rhs);
+    }
+
+    /*!
+    @brief comparison: less than
+
+    Compares whether one JSON value @a lhs is less than another JSON value @a
+    rhs according to the following rules:
+    - If @a lhs and @a rhs have the same type, the values are compared using
+      the default `<` operator.
+    - Integer and floating-point numbers are automatically converted before
+      comparison
+    - In case @a lhs and @a rhs have different types, the values are ignored
+      and the order of the types is considered, see
+      @ref operator<(const value_t, const value_t).
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is less than @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__less}
+
+    @since version 1.0.0
+    */
+    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    {
+        const auto lhs_type = lhs.type();
+        const auto rhs_type = rhs.type();
+
+        if (lhs_type == rhs_type)
+        {
+            switch (lhs_type)
+            {
+                case value_t::array:
+                    return (*lhs.m_value.array) < (*rhs.m_value.array);
+
+                case value_t::object:
+                    return *lhs.m_value.object < *rhs.m_value.object;
+
+                case value_t::null:
+                    return false;
+
+                case value_t::string:
+                    return *lhs.m_value.string < *rhs.m_value.string;
+
+                case value_t::boolean:
+                    return lhs.m_value.boolean < rhs.m_value.boolean;
+
+                case value_t::number_integer:
+                    return lhs.m_value.number_integer < rhs.m_value.number_integer;
+
+                case value_t::number_unsigned:
+                    return lhs.m_value.number_unsigned < rhs.m_value.number_unsigned;
+
+                case value_t::number_float:
+                    return lhs.m_value.number_float < rhs.m_value.number_float;
+
+                default:
+                    return false;
+            }
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
+        {
+            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
+        {
+            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
+        }
+
+        // We only reach this line if we cannot compare values. In that case,
+        // we compare types. Note we have to call the operator explicitly,
+        // because MSVC has problems otherwise.
+        return operator<(lhs_type, rhs_type);
+    }
+
+    /*!
+    @brief comparison: less than
+    @copydoc operator<(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return (lhs < basic_json(rhs));
+    }
+
+    /*!
+    @brief comparison: less than
+    @copydoc operator<(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return (basic_json(lhs) < rhs);
+    }
+
+    /*!
+    @brief comparison: less than or equal
+
+    Compares whether one JSON value @a lhs is less than or equal to another
+    JSON value by calculating `not (rhs < lhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is less than or equal to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__greater}
+
+    @since version 1.0.0
+    */
+    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (rhs < lhs);
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @copydoc operator<=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return (lhs <= basic_json(rhs));
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @copydoc operator<=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return (basic_json(lhs) <= rhs);
+    }
+
+    /*!
+    @brief comparison: greater than
+
+    Compares whether one JSON value @a lhs is greater than another
+    JSON value by calculating `not (lhs <= rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is greater than to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__lessequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (lhs <= rhs);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @copydoc operator>(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return (lhs > basic_json(rhs));
+    }
+
+    /*!
+    @brief comparison: greater than
+    @copydoc operator>(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return (basic_json(lhs) > rhs);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+
+    Compares whether one JSON value @a lhs is greater than or equal to another
+    JSON value by calculating `not (lhs < rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is greater than or equal to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__greaterequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (lhs < rhs);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @copydoc operator>=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return (lhs >= basic_json(rhs));
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @copydoc operator>=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return (basic_json(lhs) >= rhs);
+    }
+
+    /// @}
+
+    ///////////////////
+    // serialization //
+    ///////////////////
+
+    /// @name serialization
+    /// @{
+
+    /*!
+    @brief serialize to stream
+
+    Serialize the given JSON value @a j to the output stream @a o. The JSON
+    value will be serialized using the @ref dump member function.
+
+    - The indentation of the output can be controlled with the member variable
+      `width` of the output stream @a o. For instance, using the manipulator
+      `std::setw(4)` on @a o sets the indentation level to `4` and the
+      serialization result is the same as calling `dump(4)`.
+
+    - The indentation characrer can be controlled with the member variable
+      `fill` of the output stream @a o. For instance, the manipulator
+      `std::setfill('\\t')` sets indentation to use a tab character rather than
+      the default space character.
+
+    @param[in,out] o  stream to serialize to
+    @param[in] j  JSON value to serialize
+
+    @return the stream @a o
+
+    @complexity Linear.
+
+    @liveexample{The example below shows the serialization with different
+    parameters to `width` to adjust the indentation level.,operator_serialize}
+
+    @since version 1.0.0; indentaction character added in version 3.0.0
+    */
+    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
+    {
+        // read width member and use it as indentation parameter if nonzero
+        const bool pretty_print = (o.width() > 0);
+        const auto indentation = (pretty_print ? o.width() : 0);
+
+        // reset width to 0 for subsequent calls to this stream
+        o.width(0);
+
+        // do the actual serialization
+        serializer s(detail::output_adapter<char>(o), o.fill());
+        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
+        return o;
+    }
+
+    /*!
+    @brief serialize to stream
+    @deprecated This stream operator is deprecated and will be removed in a
+                future version of the library. Please use
+                @ref operator<<(std::ostream&, const basic_json&)
+                instead; that is, replace calls like `j >> o;` with `o << j;`.
+    @since version 1.0.0; deprecated since version 3.0.0
+    */
+    JSON_DEPRECATED
+    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
+    {
+        return o << j;
+    }
+
+    /// @}
+
+
+    /////////////////////
+    // deserialization //
+    /////////////////////
+
+    /// @name deserialization
+    /// @{
+
+    /*!
+    @brief deserialize from a compatible input
+
+    This function reads from a compatible input. Examples are:
+    - an array of 1-byte values
+    - strings with character/literal type with size of 1 byte
+    - input streams
+    - container with contiguous storage of 1-byte values. Compatible container
+      types include `std::vector`, `std::string`, `std::array`,
+      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
+      arrays can be used with `std::begin()`/`std::end()`. User-defined
+      containers can be used as long as they implement random-access iterators
+      and a contiguous storage.
+
+    @pre Each element of the container has a size of 1 byte. Violating this
+    precondition yields undefined behavior. **This precondition is enforced
+    with a static assertion.**
+
+    @pre The container storage is contiguous. Violating this precondition
+    yields undefined behavior. **This precondition is enforced with an
+    assertion.**
+    @pre Each element of the container has a size of 1 byte. Violating this
+    precondition yields undefined behavior. **This precondition is enforced
+    with a static assertion.**
+
+    @warning There is no way to enforce all preconditions at compile-time. If
+             the function is called with a noncompliant container and with
+             assertions switched off, the behavior is undefined and will most
+             likely yield segmentation violation.
+
+    @param[in] i  input to read from
+    @param[in] cb  a parser callback function of type @ref parser_callback_t
+    which is used to control the deserialization by filtering unwanted values
+    (optional)
+
+    @return result of the deserialization
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the parser callback function
+    @a cb has a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from an array.,parse__array__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function with
+    and without callback function.,parse__string__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function with
+    and without callback function.,parse__istream__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
+
+    @since version 2.0.3 (contiguous containers)
+    */
+    static basic_json parse(detail::input_adapter i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true)
+    {
+        basic_json result;
+        parser(i, cb, allow_exceptions).parse(true, result);
+        return result;
+    }
+
+    /*!
+    @copydoc basic_json parse(detail::input_adapter, const parser_callback_t)
+    */
+    static basic_json parse(detail::input_adapter& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true)
+    {
+        basic_json result;
+        parser(i, cb, allow_exceptions).parse(true, result);
+        return result;
+    }
+
+    static bool accept(detail::input_adapter i)
+    {
+        return parser(i).accept(true);
+    }
+
+    static bool accept(detail::input_adapter& i)
+    {
+        return parser(i).accept(true);
+    }
+
+    /*!
+    @brief deserialize from an iterator range with contiguous storage
+
+    This function reads from an iterator range of a container with contiguous
+    storage of 1-byte values. Compatible container types include
+    `std::vector`, `std::string`, `std::array`, `std::valarray`, and
+    `std::initializer_list`. Furthermore, C-style arrays can be used with
+    `std::begin()`/`std::end()`. User-defined containers can be used as long
+    as they implement random-access iterators and a contiguous storage.
+
+    @pre The iterator range is contiguous. Violating this precondition yields
+    undefined behavior. **This precondition is enforced with an assertion.**
+    @pre Each element in the range has a size of 1 byte. Violating this
+    precondition yields undefined behavior. **This precondition is enforced
+    with a static assertion.**
+
+    @warning There is no way to enforce all preconditions at compile-time. If
+             the function is called with noncompliant iterators and with
+             assertions switched off, the behavior is undefined and will most
+             likely yield segmentation violation.
+
+    @tparam IteratorType iterator of container with contiguous storage
+    @param[in] first  begin of the range to parse (included)
+    @param[in] last  end of the range to parse (excluded)
+    @param[in] cb  a parser callback function of type @ref parser_callback_t
+    which is used to control the deserialization by filtering unwanted values
+    (optional)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return result of the deserialization
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the parser callback function
+    @a cb has a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from an iterator range.,parse__iteratortype__parser_callback_t}
+
+    @since version 2.0.3
+    */
+    template<class IteratorType, typename std::enable_if<
+                 std::is_base_of<
+                     std::random_access_iterator_tag,
+                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+    static basic_json parse(IteratorType first, IteratorType last,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true)
+    {
+        basic_json result;
+        parser(detail::input_adapter(first, last), cb, allow_exceptions).parse(true, result);
+        return result;
+    }
+
+    template<class IteratorType, typename std::enable_if<
+                 std::is_base_of<
+                     std::random_access_iterator_tag,
+                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+    static bool accept(IteratorType first, IteratorType last)
+    {
+        return parser(detail::input_adapter(first, last)).accept(true);
+    }
+
+    /*!
+    @brief deserialize from stream
+    @deprecated This stream operator is deprecated and will be removed in a
+                future version of the library. Please use
+                @ref operator>>(std::istream&, basic_json&)
+                instead; that is, replace calls like `j << i;` with `i >> j;`.
+    @since version 1.0.0; deprecated since version 3.0.0
+    */
+    JSON_DEPRECATED
+    friend std::istream& operator<<(basic_json& j, std::istream& i)
+    {
+        return operator>>(i, j);
+    }
+
+    /*!
+    @brief deserialize from stream
+
+    Deserializes an input stream to a JSON value.
+
+    @param[in,out] i  input stream to read a serialized JSON value from
+    @param[in,out] j  JSON value to write the deserialized input to
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below shows how a JSON value is constructed by
+    reading a serialization from a stream.,operator_deserialize}
+
+    @sa parse(std::istream&, const parser_callback_t) for a variant with a
+    parser callback function to filter values while parsing
+
+    @since version 1.0.0
+    */
+    friend std::istream& operator>>(std::istream& i, basic_json& j)
+    {
+        parser(detail::input_adapter(i)).parse(false, j);
+        return i;
+    }
+
+    /// @}
+
+    ///////////////////////////
+    // convenience functions //
+    ///////////////////////////
+
+    /*!
+    @brief return the type as string
+
+    Returns the type name as string to be used in error messages - usually to
+    indicate that a function was called on a wrong JSON type.
+
+    @return a string representation of a the @a m_type member:
+            Value type  | return value
+            ----------- | -------------
+            null        | `"null"`
+            boolean     | `"boolean"`
+            string      | `"string"`
+            number      | `"number"` (for all number types)
+            object      | `"object"`
+            array       | `"array"`
+            discarded   | `"discarded"`
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @complexity Constant.
+
+    @liveexample{The following code exemplifies `type_name()` for all JSON
+    types.,type_name}
+
+    @sa @ref type() -- return the type of the JSON value
+    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+
+    @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
+    since 3.0.0
+    */
+    const char* type_name() const noexcept
+    {
+        {
+            switch (m_type)
+            {
+                case value_t::null:
+                    return "null";
+                case value_t::object:
+                    return "object";
+                case value_t::array:
+                    return "array";
+                case value_t::string:
+                    return "string";
+                case value_t::boolean:
+                    return "boolean";
+                case value_t::discarded:
+                    return "discarded";
+                default:
+                    return "number";
+            }
+        }
+    }
+
+
+  private:
+    //////////////////////
+    // member variables //
+    //////////////////////
+
+    /// the type of the current element
+    value_t m_type = value_t::null;
+
+    /// the value of the current element
+    json_value m_value = {};
+
+    //////////////////////////////////////////
+    // binary serialization/deserialization //
+    //////////////////////////////////////////
+
+    /// @name binary serialization/deserialization support
+    /// @{
+
+  public:
+    /*!
+    @brief create a CBOR serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
+    Binary Object Representation) serialization format. CBOR is a binary
+    serialization format which aims to be more compact than JSON itself, yet
+    more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    CBOR types according to the CBOR specification (RFC 7049):
+
+    JSON value type | value/range                                | CBOR type                          | first byte
+    --------------- | ------------------------------------------ | ---------------------------------- | ---------------
+    null            | `null`                                     | Null                               | 0xf6
+    boolean         | `true`                                     | True                               | 0xf5
+    boolean         | `false`                                    | False                              | 0xf4
+    number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow)  | 0x3b
+    number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow)  | 0x3a
+    number_integer  | -32768..-129                               | Negative integer (2 bytes follow)  | 0x39
+    number_integer  | -128..-25                                  | Negative integer (1 byte follow)   | 0x38
+    number_integer  | -24..-1                                    | Negative integer                   | 0x20..0x37
+    number_integer  | 0..23                                      | Integer                            | 0x00..0x17
+    number_integer  | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
+    number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
+    number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1a
+    number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1b
+    number_unsigned | 0..23                                      | Integer                            | 0x00..0x17
+    number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
+    number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
+    number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1a
+    number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1b
+    number_float    | *any value*                                | Double-Precision Float             | 0xfb
+    string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
+    string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
+    string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
+    string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)      | 0x7a
+    string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)      | 0x7b
+    array           | *size*: 0..23                              | array                              | 0x80..0x97
+    array           | *size*: 23..255                            | array (1 byte follow)              | 0x98
+    array           | *size*: 256..65535                         | array (2 bytes follow)             | 0x99
+    array           | *size*: 65536..4294967295                  | array (4 bytes follow)             | 0x9a
+    array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)             | 0x9b
+    object          | *size*: 0..23                              | map                                | 0xa0..0xb7
+    object          | *size*: 23..255                            | map (1 byte follow)                | 0xb8
+    object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xb9
+    object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xba
+    object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xbb
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a CBOR value.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @note The following CBOR types are not used in the conversion:
+          - byte strings (0x40..0x5f)
+          - UTF-8 strings terminated by "break" (0x7f)
+          - arrays terminated by "break" (0x9f)
+          - maps terminated by "break" (0xbf)
+          - date/time (0xc0..0xc1)
+          - bignum (0xc2..0xc3)
+          - decimal fraction (0xc4)
+          - bigfloat (0xc5)
+          - tagged items (0xc6..0xd4, 0xd8..0xdb)
+          - expected conversions (0xd5..0xd7)
+          - simple values (0xe0..0xf3, 0xf8)
+          - undefined (0xf7)
+          - half and single-precision floats (0xf9-0xfa)
+          - break (0xff)
+
+    @param[in] j  JSON value to serialize
+    @return MessagePack serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in CBOR format.,to_cbor}
+
+    @sa http://cbor.io
+    @sa @ref from_cbor(const std::vector<uint8_t>&, const size_t) for the
+        analogous deserialization
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+
+    @since version 2.0.9
+    */
+    static std::vector<uint8_t> to_cbor(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_cbor(j, result);
+        return result;
+    }
+
+    static void to_cbor(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_cbor(j);
+    }
+
+    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_cbor(j);
+    }
+
+    /*!
+    @brief create a MessagePack serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the MessagePack
+    serialization format. MessagePack is a binary serialization format which
+    aims to be more compact than JSON itself, yet more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    MessagePack types according to the MessagePack specification:
+
+    JSON value type | value/range                       | MessagePack type | first byte
+    --------------- | --------------------------------- | ---------------- | ----------
+    null            | `null`                            | nil              | 0xc0
+    boolean         | `true`                            | true             | 0xc3
+    boolean         | `false`                           | false            | 0xc2
+    number_integer  | -9223372036854775808..-2147483649 | int64            | 0xd3
+    number_integer  | -2147483648..-32769               | int32            | 0xd2
+    number_integer  | -32768..-129                      | int16            | 0xd1
+    number_integer  | -128..-33                         | int8             | 0xd0
+    number_integer  | -32..-1                           | negative fixint  | 0xe0..0xff
+    number_integer  | 0..127                            | positive fixint  | 0x00..0x7f
+    number_integer  | 128..255                          | uint 8           | 0xcc
+    number_integer  | 256..65535                        | uint 16          | 0xcd
+    number_integer  | 65536..4294967295                 | uint 32          | 0xce
+    number_integer  | 4294967296..18446744073709551615  | uint 64          | 0xcf
+    number_unsigned | 0..127                            | positive fixint  | 0x00..0x7f
+    number_unsigned | 128..255                          | uint 8           | 0xcc
+    number_unsigned | 256..65535                        | uint 16          | 0xcd
+    number_unsigned | 65536..4294967295                 | uint 32          | 0xce
+    number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xcf
+    number_float    | *any value*                       | float 64         | 0xcb
+    string          | *length*: 0..31                   | fixstr           | 0xa0..0xbf
+    string          | *length*: 32..255                 | str 8            | 0xd9
+    string          | *length*: 256..65535              | str 16           | 0xda
+    string          | *length*: 65536..4294967295       | str 32           | 0xdb
+    array           | *size*: 0..15                     | fixarray         | 0x90..0x9f
+    array           | *size*: 16..65535                 | array 16         | 0xdc
+    array           | *size*: 65536..4294967295         | array 32         | 0xdd
+    object          | *size*: 0..15                     | fix map          | 0x80..0x8f
+    object          | *size*: 16..65535                 | map 16           | 0xde
+    object          | *size*: 65536..4294967295         | map 32           | 0xdf
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a MessagePack value.
+
+    @note The following values can **not** be converted to a MessagePack value:
+          - strings with more than 4294967295 bytes
+          - arrays with more than 4294967295 elements
+          - objects with more than 4294967295 elements
+
+    @note The following MessagePack types are not used in the conversion:
+          - bin 8 - bin 32 (0xc4..0xc6)
+          - ext 8 - ext 32 (0xc7..0xc9)
+          - float 32 (0xca)
+          - fixext 1 - fixext 16 (0xd4..0xd8)
+
+    @note Any MessagePack output created @ref to_msgpack can be successfully
+          parsed by @ref from_msgpack.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @param[in] j  JSON value to serialize
+    @return MessagePack serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in MessagePack format.,to_msgpack}
+
+    @sa http://msgpack.org
+    @sa @ref from_msgpack(const std::vector<uint8_t>&, const size_t) for the
+        analogous deserialization
+    @sa @ref to_cbor(const basic_json& for the related CBOR format
+
+    @since version 2.0.9
+    */
+    static std::vector<uint8_t> to_msgpack(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_msgpack(j, result);
+        return result;
+    }
+
+    static void to_msgpack(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_msgpack(j);
+    }
+
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
+
+    /*!
+    @brief create a JSON value from an input in CBOR format
+
+    Deserializes a given input @a i to a JSON value using the CBOR (Concise
+    Binary Object Representation) serialization format.
+
+    The library maps CBOR types to JSON value types as follows:
+
+    CBOR type              | JSON value type | first byte
+    ---------------------- | --------------- | ----------
+    Integer                | number_unsigned | 0x00..0x17
+    Unsigned integer       | number_unsigned | 0x18
+    Unsigned integer       | number_unsigned | 0x19
+    Unsigned integer       | number_unsigned | 0x1a
+    Unsigned integer       | number_unsigned | 0x1b
+    Negative integer       | number_integer  | 0x20..0x37
+    Negative integer       | number_integer  | 0x38
+    Negative integer       | number_integer  | 0x39
+    Negative integer       | number_integer  | 0x3a
+    Negative integer       | number_integer  | 0x3b
+    Negative integer       | number_integer  | 0x40..0x57
+    UTF-8 string           | string          | 0x60..0x77
+    UTF-8 string           | string          | 0x78
+    UTF-8 string           | string          | 0x79
+    UTF-8 string           | string          | 0x7a
+    UTF-8 string           | string          | 0x7b
+    UTF-8 string           | string          | 0x7f
+    array                  | array           | 0x80..0x97
+    array                  | array           | 0x98
+    array                  | array           | 0x99
+    array                  | array           | 0x9a
+    array                  | array           | 0x9b
+    array                  | array           | 0x9f
+    map                    | object          | 0xa0..0xb7
+    map                    | object          | 0xb8
+    map                    | object          | 0xb9
+    map                    | object          | 0xba
+    map                    | object          | 0xbb
+    map                    | object          | 0xbf
+    False                  | `false`         | 0xf4
+    True                   | `true`          | 0xf5
+    Nill                   | `null`          | 0xf6
+    Half-Precision Float   | number_float    | 0xf9
+    Single-Precision Float | number_float    | 0xfa
+    Double-Precision Float | number_float    | 0xfb
+
+    @warning The mapping is **incomplete** in the sense that not all CBOR
+             types can be converted to a JSON value. The following CBOR types
+             are not supported and will yield parse errors (parse_error.112):
+             - byte strings (0x40..0x5f)
+             - date/time (0xc0..0xc1)
+             - bignum (0xc2..0xc3)
+             - decimal fraction (0xc4)
+             - bigfloat (0xc5)
+             - tagged items (0xc6..0xd4, 0xd8..0xdb)
+             - expected conversions (0xd5..0xd7)
+             - simple values (0xe0..0xf3, 0xf8)
+             - undefined (0xf7)
+
+    @warning CBOR allows map keys of any type, whereas JSON only allows
+             strings as keys in object values. Therefore, CBOR maps with keys
+             other than UTF-8 strings are rejected (parse_error.113).
+
+    @note Any CBOR output created @ref to_cbor can be successfully parsed by
+          @ref from_cbor.
+
+    @param[in] i  an input in CBOR format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @return deserialized JSON value
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported features from CBOR were
+    used in the given input @a v or if the input is not valid CBOR
+    @throw parse_error.113 if a string was expected as map key, but not found
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in CBOR
+    format to a JSON value.,from_cbor}
+
+    @sa http://cbor.io
+    @sa @ref to_cbor(const basic_json&) for the analogous serialization
+    @sa @ref from_msgpack(detail::input_adapter, const bool) for the
+        related MessagePack format
+
+    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+           consume input adapters, removed start_index parameter, and added
+           @a strict parameter since 3.0.0
+    */
+    static basic_json from_cbor(detail::input_adapter i,
+                                const bool strict = true)
+    {
+        return binary_reader(i).parse_cbor(strict);
+    }
+
+    /*!
+    @copydoc from_cbor(detail::input_adapter, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    static basic_json from_cbor(A1 && a1, A2 && a2, const bool strict = true)
+    {
+        return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_cbor(strict);
+    }
+
+    /*!
+    @brief create a JSON value from an input in MessagePack format
+
+    Deserializes a given input @a i to a JSON value using the MessagePack
+    serialization format.
+
+    The library maps MessagePack types to JSON value types as follows:
+
+    MessagePack type | JSON value type | first byte
+    ---------------- | --------------- | ----------
+    positive fixint  | number_unsigned | 0x00..0x7f
+    fixmap           | object          | 0x80..0x8f
+    fixarray         | array           | 0x90..0x9f
+    fixstr           | string          | 0xa0..0xbf
+    nil              | `null`          | 0xc0
+    false            | `false`         | 0xc2
+    true             | `true`          | 0xc3
+    float 32         | number_float    | 0xca
+    float 64         | number_float    | 0xcb
+    uint 8           | number_unsigned | 0xcc
+    uint 16          | number_unsigned | 0xcd
+    uint 32          | number_unsigned | 0xce
+    uint 64          | number_unsigned | 0xcf
+    int 8            | number_integer  | 0xd0
+    int 16           | number_integer  | 0xd1
+    int 32           | number_integer  | 0xd2
+    int 64           | number_integer  | 0xd3
+    str 8            | string          | 0xd9
+    str 16           | string          | 0xda
+    str 32           | string          | 0xdb
+    array 16         | array           | 0xdc
+    array 32         | array           | 0xdd
+    map 16           | object          | 0xde
+    map 32           | object          | 0xdf
+    negative fixint  | number_integer  | 0xe0-0xff
+
+    @warning The mapping is **incomplete** in the sense that not all
+             MessagePack types can be converted to a JSON value. The following
+             MessagePack types are not supported and will yield parse errors:
+              - bin 8 - bin 32 (0xc4..0xc6)
+              - ext 8 - ext 32 (0xc7..0xc9)
+              - fixext 1 - fixext 16 (0xd4..0xd8)
+
+    @note Any MessagePack output created @ref to_msgpack can be successfully
+          parsed by @ref from_msgpack.
+
+    @param[in] i  an input in MessagePack format convertible to an input
+                  adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported features from MessagePack were
+    used in the given input @a i or if the input is not valid MessagePack
+    @throw parse_error.113 if a string was expected as map key, but not found
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    MessagePack format to a JSON value.,from_msgpack}
+
+    @sa http://msgpack.org
+    @sa @ref to_msgpack(const basic_json&) for the analogous serialization
+    @sa @ref from_cbor(detail::input_adapter, const bool) for the related CBOR
+        format
+
+    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+           consume input adapters, removed start_index parameter, and added
+           @a strict parameter since 3.0.0
+    */
+    static basic_json from_msgpack(detail::input_adapter i,
+                                   const bool strict = true)
+    {
+        return binary_reader(i).parse_msgpack(strict);
+    }
+
+    /*!
+    @copydoc from_msgpack(detail::input_adapter, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    static basic_json from_msgpack(A1 && a1, A2 && a2, const bool strict = true)
+    {
+        return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_msgpack(strict);
+    }
+
+    /// @}
+
+    //////////////////////////
+    // JSON Pointer support //
+    //////////////////////////
+
+    /// @name JSON Pointer functions
+    /// @{
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Uses a JSON pointer to retrieve a reference to the respective JSON value.
+    No bound checking is performed. Similar to @ref operator[](const typename
+    object_t::key_type&), `null` values are created in arrays and objects if
+    necessary.
+
+    In particular:
+    - If the JSON pointer points to an object key that does not exist, it
+      is created an filled with a `null` value before a reference to it
+      is returned.
+    - If the JSON pointer points to an array index that does not exist, it
+      is created an filled with a `null` value before a reference to it
+      is returned. All indices between the current maximum and the given
+      index are also filled with `null`.
+    - The special value `-` is treated as a synonym for the index past the
+      end.
+
+    @param[in] ptr  a JSON pointer
+
+    @return reference to the element pointed to by @a ptr
+
+    @complexity Constant.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+
+    @liveexample{The behavior is shown in the example.,operatorjson_pointer}
+
+    @since version 2.0.0
+    */
+    reference operator[](const json_pointer& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Uses a JSON pointer to retrieve a reference to the respective JSON value.
+    No bound checking is performed. The function does not change the JSON
+    value; no `null` values are created. In particular, the the special value
+    `-` yields an exception.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return const reference to the element pointed to by @a ptr
+
+    @complexity Constant.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+
+    @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
+
+    @since version 2.0.0
+    */
+    const_reference operator[](const json_pointer& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Returns a reference to the element at with specified JSON pointer @a ptr,
+    with bounds checking.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return reference to the element pointed to by @a ptr
+
+    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+    begins with '0'. See example below.
+
+    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+    is not a number. See example below.
+
+    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+    is out of range. See example below.
+
+    @throw out_of_range.402 if the array index '-' is used in the passed JSON
+    pointer @a ptr. As `at` provides checked access (and no elements are
+    implicitly inserted), the index '-' is always invalid. See example below.
+
+    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 2.0.0
+
+    @liveexample{The behavior is shown in the example.,at_json_pointer}
+    */
+    reference at(const json_pointer& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Returns a const reference to the element at with specified JSON pointer @a
+    ptr, with bounds checking.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return reference to the element pointed to by @a ptr
+
+    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+    begins with '0'. See example below.
+
+    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+    is not a number. See example below.
+
+    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+    is out of range. See example below.
+
+    @throw out_of_range.402 if the array index '-' is used in the passed JSON
+    pointer @a ptr. As `at` provides checked access (and no elements are
+    implicitly inserted), the index '-' is always invalid. See example below.
+
+    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 2.0.0
+
+    @liveexample{The behavior is shown in the example.,at_json_pointer_const}
+    */
+    const_reference at(const json_pointer& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    /*!
+    @brief return flattened JSON value
+
+    The function creates a JSON object whose keys are JSON pointers (see [RFC
+    6901](https://tools.ietf.org/html/rfc6901)) and whose values are all
+    primitive. The original JSON value can be restored using the @ref
+    unflatten() function.
+
+    @return an object that maps JSON pointers to primitive values
+
+    @note Empty objects and arrays are flattened to `null` and will not be
+          reconstructed correctly by the @ref unflatten() function.
+
+    @complexity Linear in the size the JSON value.
+
+    @liveexample{The following code shows how a JSON object is flattened to an
+    object whose keys consist of JSON pointers.,flatten}
+
+    @sa @ref unflatten() for the reverse function
+
+    @since version 2.0.0
+    */
+    basic_json flatten() const
+    {
+        basic_json result(value_t::object);
+        json_pointer::flatten("", *this, result);
+        return result;
+    }
+
+    /*!
+    @brief unflatten a previously flattened JSON value
+
+    The function restores the arbitrary nesting of a JSON value that has been
+    flattened before using the @ref flatten() function. The JSON value must
+    meet certain constraints:
+    1. The value must be an object.
+    2. The keys must be JSON pointers (see
+       [RFC 6901](https://tools.ietf.org/html/rfc6901))
+    3. The mapped values must be primitive JSON types.
+
+    @return the original JSON from a flattened version
+
+    @note Empty objects and arrays are flattened by @ref flatten() to `null`
+          values and can not unflattened to their original type. Apart from
+          this example, for a JSON value `j`, the following is always true:
+          `j == j.flatten().unflatten()`.
+
+    @complexity Linear in the size the JSON value.
+
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+
+    @liveexample{The following code shows how a flattened JSON object is
+    unflattened into the original nested JSON object.,unflatten}
+
+    @sa @ref flatten() for the reverse function
+
+    @since version 2.0.0
+    */
+    basic_json unflatten() const
+    {
+        return json_pointer::unflatten(*this);
+    }
+
+    /// @}
+
+    //////////////////////////
+    // JSON Patch functions //
+    //////////////////////////
+
+    /// @name JSON Patch functions
+    /// @{
+
+    /*!
+    @brief applies a JSON patch
+
+    [JSON Patch](http://jsonpatch.com) defines a JSON document structure for
+    expressing a sequence of operations to apply to a JSON) document. With
+    this function, a JSON Patch is applied to the current JSON value by
+    executing all operations from the patch.
+
+    @param[in] json_patch  JSON patch document
+    @return patched document
+
+    @note The application of a patch is atomic: Either all operations succeed
+          and the patched document is returned or an exception is thrown. In
+          any case, the original value is not changed: the patch is applied
+          to a copy of the value.
+
+    @throw parse_error.104 if the JSON patch does not consist of an array of
+    objects
+
+    @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory
+    attributes are missing); example: `"operation add must have member path"`
+
+    @throw out_of_range.401 if an array index is out of range.
+
+    @throw out_of_range.403 if a JSON pointer inside the patch could not be
+    resolved successfully in the current JSON value; example: `"key baz not
+    found"`
+
+    @throw out_of_range.405 if JSON pointer has no parent ("add", "remove",
+    "move")
+
+    @throw other_error.501 if "test" operation was unsuccessful
+
+    @complexity Linear in the size of the JSON value and the length of the
+    JSON patch. As usually only a fraction of the JSON value is affected by
+    the patch, the complexity can usually be neglected.
+
+    @liveexample{The following code shows how a JSON patch is applied to a
+    value.,patch}
+
+    @sa @ref diff -- create a JSON patch by comparing two JSON values
+
+    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+    @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
+
+    @since version 2.0.0
+    */
+    basic_json patch(const basic_json& json_patch) const
+    {
+        // make a working copy to apply the patch to
+        basic_json result = *this;
+
+        // the valid JSON Patch operations
+        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
+
+        const auto get_op = [](const std::string & op)
+        {
+            if (op == "add")
+            {
+                return patch_operations::add;
+            }
+            if (op == "remove")
+            {
+                return patch_operations::remove;
+            }
+            if (op == "replace")
+            {
+                return patch_operations::replace;
+            }
+            if (op == "move")
+            {
+                return patch_operations::move;
+            }
+            if (op == "copy")
+            {
+                return patch_operations::copy;
+            }
+            if (op == "test")
+            {
+                return patch_operations::test;
+            }
+
+            return patch_operations::invalid;
+        };
+
+        // wrapper for "add" operation; add value at ptr
+        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
+        {
+            // adding to the root of the target document means replacing it
+            if (ptr.is_root())
+            {
+                result = val;
+            }
+            else
+            {
+                // make sure the top element of the pointer exists
+                json_pointer top_pointer = ptr.top();
+                if (top_pointer != ptr)
+                {
+                    result.at(top_pointer);
+                }
+
+                // get reference to parent of JSON pointer ptr
+                const auto last_path = ptr.pop_back();
+                basic_json& parent = result[ptr];
+
+                switch (parent.m_type)
+                {
+                    case value_t::null:
+                    case value_t::object:
+                    {
+                        // use operator[] to add value
+                        parent[last_path] = val;
+                        break;
+                    }
+
+                    case value_t::array:
+                    {
+                        if (last_path == "-")
+                        {
+                            // special case: append to back
+                            parent.push_back(val);
+                        }
+                        else
+                        {
+                            const auto idx = std::stoi(last_path);
+                            if (JSON_UNLIKELY(static_cast<size_type>(idx) > parent.size()))
+                            {
+                                // avoid undefined behavior
+                                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+                            }
+                            else
+                            {
+                                // default case: insert add offset
+                                parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
+                            }
+                        }
+                        break;
+                    }
+
+                    default:
+                    {
+                        // if there exists a parent it cannot be primitive
+                        assert(false);  // LCOV_EXCL_LINE
+                    }
+                }
+            }
+        };
+
+        // wrapper for "remove" operation; remove value at ptr
+        const auto operation_remove = [&result](json_pointer & ptr)
+        {
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.pop_back();
+            basic_json& parent = result.at(ptr);
+
+            // remove child
+            if (parent.is_object())
+            {
+                // perform range check
+                auto it = parent.find(last_path);
+                if (JSON_LIKELY(it != parent.end()))
+                {
+                    parent.erase(it);
+                }
+                else
+                {
+                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found"));
+                }
+            }
+            else if (parent.is_array())
+            {
+                // note erase performs range check
+                parent.erase(static_cast<size_type>(std::stoi(last_path)));
+            }
+        };
+
+        // type check: top level value must be an array
+        if (JSON_UNLIKELY(not json_patch.is_array()))
+        {
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
+        }
+
+        // iterate and apply the operations
+        for (const auto& val : json_patch)
+        {
+            // wrapper to get a value for an operation
+            const auto get_value = [&val](const std::string & op,
+                                          const std::string & member,
+                                          bool string_type) -> basic_json&
+            {
+                // find value
+                auto it = val.m_value.object->find(member);
+
+                // context-sensitive error message
+                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
+
+                // check if desired value is present
+                if (JSON_UNLIKELY(it == val.m_value.object->end()))
+                {
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'"));
+                }
+
+                // check if result is of type string
+                if (JSON_UNLIKELY(string_type and not it->second.is_string()))
+                {
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'"));
+                }
+
+                // no error: return value
+                return it->second;
+            };
+
+            // type check: every element of the array must be an object
+            if (JSON_UNLIKELY(not val.is_object()))
+            {
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
+            }
+
+            // collect mandatory members
+            const std::string op = get_value("op", "op", true);
+            const std::string path = get_value(op, "path", true);
+            json_pointer ptr(path);
+
+            switch (get_op(op))
+            {
+                case patch_operations::add:
+                {
+                    operation_add(ptr, get_value("add", "value", false));
+                    break;
+                }
+
+                case patch_operations::remove:
+                {
+                    operation_remove(ptr);
+                    break;
+                }
+
+                case patch_operations::replace:
+                {
+                    // the "path" location must exist - use at()
+                    result.at(ptr) = get_value("replace", "value", false);
+                    break;
+                }
+
+                case patch_operations::move:
+                {
+                    const std::string from_path = get_value("move", "from", true);
+                    json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json v = result.at(from_ptr);
+
+                    // The move operation is functionally identical to a
+                    // "remove" operation on the "from" location, followed
+                    // immediately by an "add" operation at the target
+                    // location with the value that was just removed.
+                    operation_remove(from_ptr);
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::copy:
+                {
+                    const std::string from_path = get_value("copy", "from", true);
+                    const json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    result[ptr] = result.at(from_ptr);
+                    break;
+                }
+
+                case patch_operations::test:
+                {
+                    bool success = false;
+                    JSON_TRY
+                    {
+                        // check if "value" matches the one at "path"
+                        // the "path" location must exist - use at()
+                        success = (result.at(ptr) == get_value("test", "value", false));
+                    }
+                    JSON_CATCH (out_of_range&)
+                    {
+                        // ignore out of range errors: success remains false
+                    }
+
+                    // throw an exception if test fails
+                    if (JSON_UNLIKELY(not success))
+                    {
+                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump()));
+                    }
+
+                    break;
+                }
+
+                case patch_operations::invalid:
+                {
+                    // op must be "add", "remove", "replace", "move", "copy", or
+                    // "test"
+                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid"));
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief creates a diff as a JSON patch
+
+    Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can
+    be changed into the value @a target by calling @ref patch function.
+
+    @invariant For two JSON values @a source and @a target, the following code
+    yields always `true`:
+    @code {.cpp}
+    source.patch(diff(source, target)) == target;
+    @endcode
+
+    @note Currently, only `remove`, `add`, and `replace` operations are
+          generated.
+
+    @param[in] source  JSON value to compare from
+    @param[in] target  JSON value to compare against
+    @param[in] path    helper value to create JSON pointers
+
+    @return a JSON patch to convert the @a source to @a target
+
+    @complexity Linear in the lengths of @a source and @a target.
+
+    @liveexample{The following code shows how a JSON patch is created as a
+    diff for two JSON values.,diff}
+
+    @sa @ref patch -- apply a JSON patch
+
+    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+
+    @since version 2.0.0
+    */
+    static basic_json diff(const basic_json& source, const basic_json& target,
+                           const std::string& path = "")
+    {
+        // the patch
+        basic_json result(value_t::array);
+
+        // if the values are the same, return empty patch
+        if (source == target)
+        {
+            return result;
+        }
+
+        if (source.type() != target.type())
+        {
+            // different types: replace value
+            result.push_back(
+            {
+                {"op", "replace"}, {"path", path}, {"value", target}
+            });
+        }
+        else
+        {
+            switch (source.type())
+            {
+                case value_t::array:
+                {
+                    // first pass: traverse common elements
+                    std::size_t i = 0;
+                    while (i < source.size() and i < target.size())
+                    {
+                        // recursive call to compare array values at index i
+                        auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
+                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                        ++i;
+                    }
+
+                    // i now reached the end of at least one array
+                    // in a second pass, traverse the remaining elements
+
+                    // remove my remaining elements
+                    const auto end_index = static_cast<difference_type>(result.size());
+                    while (i < source.size())
+                    {
+                        // add operations in reverse order to avoid invalid
+                        // indices
+                        result.insert(result.begin() + end_index, object(
+                        {
+                            {"op", "remove"},
+                            {"path", path + "/" + std::to_string(i)}
+                        }));
+                        ++i;
+                    }
+
+                    // add other remaining elements
+                    while (i < target.size())
+                    {
+                        result.push_back(
+                        {
+                            {"op", "add"},
+                            {"path", path + "/" + std::to_string(i)},
+                            {"value", target[i]}
+                        });
+                        ++i;
+                    }
+
+                    break;
+                }
+
+                case value_t::object:
+                {
+                    // first pass: traverse this object's elements
+                    for (auto it = source.begin(); it != source.end(); ++it)
+                    {
+                        // escape the key name to be used in a JSON patch
+                        const auto key = json_pointer::escape(it.key());
+
+                        if (target.find(it.key()) != target.end())
+                        {
+                            // recursive call to compare object values at key it
+                            auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
+                            result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                        }
+                        else
+                        {
+                            // found a key that is not in o -> remove it
+                            result.push_back(object(
+                            {
+                                {"op", "remove"}, {"path", path + "/" + key}
+                            }));
+                        }
+                    }
+
+                    // second pass: traverse other object's elements
+                    for (auto it = target.begin(); it != target.end(); ++it)
+                    {
+                        if (source.find(it.key()) == source.end())
+                        {
+                            // found a key that is not in this -> add it
+                            const auto key = json_pointer::escape(it.key());
+                            result.push_back(
+                            {
+                                {"op", "add"}, {"path", path + "/" + key},
+                                {"value", it.value()}
+                            });
+                        }
+                    }
+
+                    break;
+                }
+
+                default:
+                {
+                    // both primitive type: replace value
+                    result.push_back(
+                    {
+                        {"op", "replace"}, {"path", path}, {"value", target}
+                    });
+                    break;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /// @}
+};
+
+/////////////
+// presets //
+/////////////
+
+/*!
+@brief default JSON class
+
+This type is the default specialization of the @ref basic_json class which
+uses the standard template types.
+
+@since version 1.0.0
+*/
+using json = basic_json<>;
+
+//////////////////
+// json_pointer //
+//////////////////
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+NLOHMANN_BASIC_JSON_TPL&
+json_pointer::get_and_create(NLOHMANN_BASIC_JSON_TPL& j) const
+{
+    using size_type = typename NLOHMANN_BASIC_JSON_TPL::size_type;
+    auto result = &j;
+
+    // in case no reference tokens exist, return a reference to the JSON value
+    // j which will be overwritten by a primitive value
+    for (const auto& reference_token : reference_tokens)
+    {
+        switch (result->m_type)
+        {
+            case detail::value_t::null:
+            {
+                if (reference_token == "0")
+                {
+                    // start a new array if reference token is 0
+                    result = &result->operator[](0);
+                }
+                else
+                {
+                    // start a new object otherwise
+                    result = &result->operator[](reference_token);
+                }
+                break;
+            }
+
+            case detail::value_t::object:
+            {
+                // create an entry in the object
+                result = &result->operator[](reference_token);
+                break;
+            }
+
+            case detail::value_t::array:
+            {
+                // create an entry in the array
+                JSON_TRY
+                {
+                    result = &result->operator[](static_cast<size_type>(std::stoi(reference_token)));
+                }
+                JSON_CATCH(std::invalid_argument&)
+                {
+                    JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                }
+                break;
+            }
+
+            /*
+            The following code is only reached if there exists a reference
+            token _and_ the current value is primitive. In this case, we have
+            an error situation, because primitive values may only occur as
+            single value; that is, with an empty list of reference tokens.
+            */
+            default:
+                JSON_THROW(detail::type_error::create(313, "invalid value to unflatten"));
+        }
+    }
+
+    return *result;
+}
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+NLOHMANN_BASIC_JSON_TPL&
+json_pointer::get_unchecked(NLOHMANN_BASIC_JSON_TPL* ptr) const
+{
+    using size_type = typename NLOHMANN_BASIC_JSON_TPL::size_type;
+    for (const auto& reference_token : reference_tokens)
+    {
+        // convert null values to arrays or objects before continuing
+        if (ptr->m_type == detail::value_t::null)
+        {
+            // check if reference token is a number
+            const bool nums =
+                std::all_of(reference_token.begin(), reference_token.end(),
+                            [](const char x)
+            {
+                return (x >= '0' and x <= '9');
+            });
+
+            // change value to array for numbers or "-" or to object otherwise
+            *ptr = (nums or reference_token == "-")
+                   ? detail::value_t::array
+                   : detail::value_t::object;
+        }
+
+        switch (ptr->m_type)
+        {
+            case detail::value_t::object:
+            {
+                // use unchecked object access
+                ptr = &ptr->operator[](reference_token);
+                break;
+            }
+
+            case detail::value_t::array:
+            {
+                // error condition (cf. RFC 6901, Sect. 4)
+                if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                {
+                    JSON_THROW(detail::parse_error::create(106, 0,
+                                                           "array index '" + reference_token +
+                                                           "' must not begin with '0'"));
+                }
+
+                if (reference_token == "-")
+                {
+                    // explicitly treat "-" as index beyond the end
+                    ptr = &ptr->operator[](ptr->m_value.array->size());
+                }
+                else
+                {
+                    // convert array index to number; unchecked access
+                    JSON_TRY
+                    {
+                        ptr = &ptr->operator[](
+                            static_cast<size_type>(std::stoi(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                }
+                break;
+            }
+
+            default:
+                JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+        }
+    }
+
+    return *ptr;
+}
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+NLOHMANN_BASIC_JSON_TPL&
+json_pointer::get_checked(NLOHMANN_BASIC_JSON_TPL* ptr) const
+{
+    using size_type = typename NLOHMANN_BASIC_JSON_TPL::size_type;
+    for (const auto& reference_token : reference_tokens)
+    {
+        switch (ptr->m_type)
+        {
+            case detail::value_t::object:
+            {
+                // note: at performs range check
+                ptr = &ptr->at(reference_token);
+                break;
+            }
+
+            case detail::value_t::array:
+            {
+                if (JSON_UNLIKELY(reference_token == "-"))
+                {
+                    // "-" always fails the range check
+                    JSON_THROW(detail::out_of_range::create(402,
+                                                            "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                            ") is out of range"));
+                }
+
+                // error condition (cf. RFC 6901, Sect. 4)
+                if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                {
+                    JSON_THROW(detail::parse_error::create(106, 0,
+                                                           "array index '" + reference_token +
+                                                           "' must not begin with '0'"));
+                }
+
+                // note: at performs range check
+                JSON_TRY
+                {
+                    ptr = &ptr->at(static_cast<size_type>(std::stoi(reference_token)));
+                }
+                JSON_CATCH(std::invalid_argument&)
+                {
+                    JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                }
+                break;
+            }
+
+            default:
+                JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+        }
+    }
+
+    return *ptr;
+}
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+const NLOHMANN_BASIC_JSON_TPL&
+json_pointer::get_unchecked(const NLOHMANN_BASIC_JSON_TPL* ptr) const
+{
+    using size_type = typename NLOHMANN_BASIC_JSON_TPL::size_type;
+    for (const auto& reference_token : reference_tokens)
+    {
+        switch (ptr->m_type)
+        {
+            case detail::value_t::object:
+            {
+                // use unchecked object access
+                ptr = &ptr->operator[](reference_token);
+                break;
+            }
+
+            case detail::value_t::array:
+            {
+                if (JSON_UNLIKELY(reference_token == "-"))
+                {
+                    // "-" cannot be used for const access
+                    JSON_THROW(detail::out_of_range::create(402,
+                                                            "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                            ") is out of range"));
+                }
+
+                // error condition (cf. RFC 6901, Sect. 4)
+                if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                {
+                    JSON_THROW(detail::parse_error::create(106, 0,
+                                                           "array index '" + reference_token +
+                                                           "' must not begin with '0'"));
+                }
+
+                // use unchecked array access
+                JSON_TRY
+                {
+                    ptr = &ptr->operator[](
+                        static_cast<size_type>(std::stoi(reference_token)));
+                }
+                JSON_CATCH(std::invalid_argument&)
+                {
+                    JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                }
+                break;
+            }
+
+            default:
+                JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+        }
+    }
+
+    return *ptr;
+}
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+const NLOHMANN_BASIC_JSON_TPL&
+json_pointer::get_checked(const NLOHMANN_BASIC_JSON_TPL* ptr) const
+{
+    using size_type = typename NLOHMANN_BASIC_JSON_TPL::size_type;
+    for (const auto& reference_token : reference_tokens)
+    {
+        switch (ptr->m_type)
+        {
+            case detail::value_t::object:
+            {
+                // note: at performs range check
+                ptr = &ptr->at(reference_token);
+                break;
+            }
+
+            case detail::value_t::array:
+            {
+                if (JSON_UNLIKELY(reference_token == "-"))
+                {
+                    // "-" always fails the range check
+                    JSON_THROW(detail::out_of_range::create(402,
+                                                            "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                            ") is out of range"));
+                }
+
+                // error condition (cf. RFC 6901, Sect. 4)
+                if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                {
+                    JSON_THROW(detail::parse_error::create(106, 0,
+                                                           "array index '" + reference_token +
+                                                           "' must not begin with '0'"));
+                }
+
+                // note: at performs range check
+                JSON_TRY
+                {
+                    ptr = &ptr->at(static_cast<size_type>(std::stoi(reference_token)));
+                }
+                JSON_CATCH(std::invalid_argument&)
+                {
+                    JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                }
+                break;
+            }
+
+            default:
+                JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+        }
+    }
+
+    return *ptr;
+}
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+void json_pointer::flatten(const std::string& reference_string,
+                           const NLOHMANN_BASIC_JSON_TPL& value,
+                           NLOHMANN_BASIC_JSON_TPL& result)
+{
+    switch (value.m_type)
+    {
+        case detail::value_t::array:
+        {
+            if (value.m_value.array->empty())
+            {
+                // flatten empty array as null
+                result[reference_string] = nullptr;
+            }
+            else
+            {
+                // iterate array and use index as reference string
+                for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
+                {
+                    flatten(reference_string + "/" + std::to_string(i),
+                            value.m_value.array->operator[](i), result);
+                }
+            }
+            break;
+        }
+
+        case detail::value_t::object:
+        {
+            if (value.m_value.object->empty())
+            {
+                // flatten empty object as null
+                result[reference_string] = nullptr;
+            }
+            else
+            {
+                // iterate object and use keys as reference string
+                for (const auto& element : *value.m_value.object)
+                {
+                    flatten(reference_string + "/" + escape(element.first), element.second, result);
+                }
+            }
+            break;
+        }
+
+        default:
+        {
+            // add primitive value with its reference string
+            result[reference_string] = value;
+            break;
+        }
+    }
+}
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+NLOHMANN_BASIC_JSON_TPL
+json_pointer::unflatten(const NLOHMANN_BASIC_JSON_TPL& value)
+{
+    if (JSON_UNLIKELY(not value.is_object()))
+    {
+        JSON_THROW(detail::type_error::create(314, "only objects can be unflattened"));
+    }
+
+    NLOHMANN_BASIC_JSON_TPL result;
+
+    // iterate the JSON object values
+    for (const auto& element : *value.m_value.object)
+    {
+        if (JSON_UNLIKELY(not element.second.is_primitive()))
+        {
+            JSON_THROW(detail::type_error::create(315, "values in object must be primitive"));
+        }
+
+        // assign value to reference pointed to by JSON pointer; Note that if
+        // the JSON pointer is "" (i.e., points to the whole value), function
+        // get_and_create returns a reference to result itself. An assignment
+        // will then create a primitive value.
+        json_pointer(element.first).get_and_create(result) = element.second;
+    }
+
+    return result;
+}
+
+inline bool operator==(json_pointer const& lhs, json_pointer const& rhs) noexcept
+{
+    return (lhs.reference_tokens == rhs.reference_tokens);
+}
+
+inline bool operator!=(json_pointer const& lhs, json_pointer const& rhs) noexcept
+{
+    return not (lhs == rhs);
+}
+} // namespace nlohmann
+
+
+///////////////////////
+// nonmember support //
+///////////////////////
+
+// specialization of std::swap, and std::hash
+namespace std
+{
+/*!
+@brief exchanges the values of two JSON objects
+
+@since version 1.0.0
+*/
+template<>
+inline void swap(nlohmann::json& j1,
+                 nlohmann::json& j2) noexcept(
+                     is_nothrow_move_constructible<nlohmann::json>::value and
+                     is_nothrow_move_assignable<nlohmann::json>::value
+                 )
+{
+    j1.swap(j2);
+}
+
+/// hash value for JSON objects
+template<>
+struct hash<nlohmann::json>
+{
+    /*!
+    @brief return a hash value for a JSON object
+
+    @since version 1.0.0
+    */
+    std::size_t operator()(const nlohmann::json& j) const
+    {
+        // a naive hashing via the string representation
+        const auto& h = hash<nlohmann::json::string_t>();
+        return h(j.dump());
+    }
+};
+
+/// specialization for std::less<value_t>
+/// @note: do not remove the space after '<',
+///        see https://github.com/nlohmann/json/pull/679
+template<>
+struct less< ::nlohmann::detail::value_t>
+{
+    /*!
+    @brief compare two value_t enum values
+    @since version 3.0.0
+    */
+    bool operator()(nlohmann::detail::value_t lhs,
+                    nlohmann::detail::value_t rhs) const noexcept
+    {
+        return nlohmann::detail::operator<(lhs, rhs);
+    }
+};
+
+} // namespace std
+
+/*!
+@brief user-defined string literal for JSON values
+
+This operator implements a user-defined string literal for JSON objects. It
+can be used by adding `"_json"` to a string literal and returns a JSON object
+if no parse error occurred.
+
+@param[in] s  a string representation of a JSON object
+@param[in] n  the length of string @a s
+@return a JSON object
+
+@since version 1.0.0
+*/
+inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/*!
+@brief user-defined string literal for JSON pointer
+
+This operator implements a user-defined string literal for JSON Pointers. It
+can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
+object if no parse error occurred.
+
+@param[in] s  a string representation of a JSON Pointer
+@param[in] n  the length of string @a s
+@return a JSON pointer object
+
+@since version 2.0.0
+*/
+inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+// restore GCC/clang diagnostic settings
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #pragma GCC diagnostic pop
+#endif
+#if defined(__clang__)
+    #pragma GCC diagnostic pop
+#endif
+
+// clean up
+#undef JSON_CATCH
+#undef JSON_THROW
+#undef JSON_TRY
+#undef JSON_LIKELY
+#undef JSON_UNLIKELY
+#undef JSON_DEPRECATED
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
+
+#endif
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/ReaderWriterGLTF.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/ReaderWriterGLTF.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/ReaderWriterGLTF.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/ReaderWriterGLTF.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,114 @@
+/* -*-c++-*- */
+/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#include <osg/Notify>
+
+#define TINYGLTF_IMPLEMENTATION
+#define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+// #define TINYGLTF_NOEXCEPTION // optional. disable exception handling.
+#include "tiny_gltf.h"
+using namespace tinygltf;
+
+#include "GLTFReader.h"
+#include "GLTFWriter.h"
+#include "B3DMReader.h"
+#include "B3DMWriter.h"
+
+#include <osgDB/FileNameUtils>
+#include <osgDB/Registry>
+using namespace osgEarth;
+
+#undef LC
+#define LC "[gltf] "
+
+class GLTFReaderWriter : public osgDB::ReaderWriter
+{
+public:
+    GLTFReaderWriter()
+    {
+        supportsExtension("gltf", "glTF ascii loader");
+        supportsExtension("glb", "glTF binary loader");
+        supportsExtension("b3dm", "b3dm loader");
+    }
+
+    virtual const char* className() const { return "glTF plugin"; }
+
+    virtual ReadResult readObject(const std::string& location, const osgDB::Options* options) const
+    {
+        return readNode(location, options);
+    }
+
+    virtual ReadResult readNode(const std::string& location, const osgDB::Options* options) const
+    {
+        std::string ext = osgDB::getFileExtension(location);
+        if (!acceptsExtension(ext))
+            return ReadResult::FILE_NOT_HANDLED;
+
+        if (ext == "gltf")
+        {
+            GLTFReader reader;
+            tinygltf::Model model;
+            return reader.read(location, false, options);
+        }
+        else if (ext == "glb")
+        {
+            GLTFReader reader;
+            tinygltf::Model model;
+            return reader.read(location, true, options);
+        }
+        else if (ext == "b3dm")
+        {
+            B3DMReader reader;
+            return reader.read(location, options);
+        }
+        else return ReadResult::FILE_NOT_HANDLED;
+    }
+
+    //! Writes a node to GLTF.
+    WriteResult writeNode(const osg::Node& node, const std::string& location, const osgDB::Options* options) const
+    {
+        std::string ext = osgDB::getLowerCaseFileExtension(location);
+        if (!acceptsExtension(ext))
+            return WriteResult::FILE_NOT_HANDLED;
+
+        if (ext == "gltf")
+        {
+            GLTFWriter writer;
+            return writer.write(node, location, false, options);
+        }
+        else if (ext == "glb")
+        {
+            GLTFWriter writer;
+            return writer.write(node, location, true, options);
+        }
+        else if (ext == "b3dm")
+        {
+            B3DMWriter writer;
+            return writer.write(node, location, true, options);
+        }
+
+        return WriteResult::ERROR_IN_WRITING_FILE;
+    }
+    
+};
+
+REGISTER_OSGPLUGIN(gltf, GLTFReaderWriter)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/stb_image.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/stb_image.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/stb_image.h	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/stb_image.h	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,6509 @@
+/* stb_image - v2.08 - public domain image loader - http://nothings.org/stb_image.h
+                                     no warranty implied; use at your own risk
+
+   Do this:
+      #define STB_IMAGE_IMPLEMENTATION
+   before you include this file in *one* C or C++ file to create the implementation.
+
+   // i.e. it should look like this:
+   #include ...
+   #include ...
+   #include ...
+   #define STB_IMAGE_IMPLEMENTATION
+   #include "stb_image.h"
+
+   You can #define STBI_ASSERT(x) before the #include to avoid using assert.h.
+   And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free
+
+
+   QUICK NOTES:
+      Primarily of interest to game developers and other people who can
+          avoid problematic images and only need the trivial interface
+
+      JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib)
+      PNG 1/2/4/8-bit-per-channel (16 bpc not supported)
+
+      TGA (not sure what subset, if a subset)
+      BMP non-1bpp, non-RLE
+      PSD (composited view only, no extra channels, 8/16 bit-per-channel)
+
+      GIF (*comp always reports as 4-channel)
+      HDR (radiance rgbE format)
+      PIC (Softimage PIC)
+      PNM (PPM and PGM binary only)
+
+      Animated GIF still needs a proper API, but here's one way to do it:
+          http://gist.github.com/urraka/685d9a6340b26b830d49
+
+      - decode from memory or through FILE (define STBI_NO_STDIO to remove code)
+      - decode from arbitrary I/O callbacks
+      - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON)
+
+   Full documentation under "DOCUMENTATION" below.
+
+
+   Revision 2.00 release notes:
+
+      - Progressive JPEG is now supported.
+
+      - PPM and PGM binary formats are now supported, thanks to Ken Miller.
+
+      - x86 platforms now make use of SSE2 SIMD instructions for
+        JPEG decoding, and ARM platforms can use NEON SIMD if requested.
+        This work was done by Fabian "ryg" Giesen. SSE2 is used by
+        default, but NEON must be enabled explicitly; see docs.
+
+        With other JPEG optimizations included in this version, we see
+        2x speedup on a JPEG on an x86 machine, and a 1.5x speedup
+        on a JPEG on an ARM machine, relative to previous versions of this
+        library. The same results will not obtain for all JPGs and for all
+        x86/ARM machines. (Note that progressive JPEGs are significantly
+        slower to decode than regular JPEGs.) This doesn't mean that this
+        is the fastest JPEG decoder in the land; rather, it brings it
+        closer to parity with standard libraries. If you want the fastest
+        decode, look elsewhere. (See "Philosophy" section of docs below.)
+
+        See final bullet items below for more info on SIMD.
+
+      - Added STBI_MALLOC, STBI_REALLOC, and STBI_FREE macros for replacing
+        the memory allocator. Unlike other STBI libraries, these macros don't
+        support a context parameter, so if you need to pass a context in to
+        the allocator, you'll have to store it in a global or a thread-local
+        variable.
+
+      - Split existing STBI_NO_HDR flag into two flags, STBI_NO_HDR and
+        STBI_NO_LINEAR.
+            STBI_NO_HDR:     suppress implementation of .hdr reader format
+            STBI_NO_LINEAR:  suppress high-dynamic-range light-linear float API
+
+      - You can suppress implementation of any of the decoders to reduce
+        your code footprint by #defining one or more of the following
+        symbols before creating the implementation.
+
+            STBI_NO_JPEG
+            STBI_NO_PNG
+            STBI_NO_BMP
+            STBI_NO_PSD
+            STBI_NO_TGA
+            STBI_NO_GIF
+            STBI_NO_HDR
+            STBI_NO_PIC
+            STBI_NO_PNM   (.ppm and .pgm)
+
+      - You can request *only* certain decoders and suppress all other ones
+        (this will be more forward-compatible, as addition of new decoders
+        doesn't require you to disable them explicitly):
+
+            STBI_ONLY_JPEG
+            STBI_ONLY_PNG
+            STBI_ONLY_BMP
+            STBI_ONLY_PSD
+            STBI_ONLY_TGA
+            STBI_ONLY_GIF
+            STBI_ONLY_HDR
+            STBI_ONLY_PIC
+            STBI_ONLY_PNM   (.ppm and .pgm)
+
+         Note that you can define multiples of these, and you will get all
+         of them ("only x" and "only y" is interpreted to mean "only x&y").
+
+       - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still
+         want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB
+
+      - Compilation of all SIMD code can be suppressed with
+            #define STBI_NO_SIMD
+        It should not be necessary to disable SIMD unless you have issues
+        compiling (e.g. using an x86 compiler which doesn't support SSE
+        intrinsics or that doesn't support the method used to detect
+        SSE2 support at run-time), and even those can be reported as
+        bugs so I can refine the built-in compile-time checking to be
+        smarter.
+
+      - The old STBI_SIMD system which allowed installing a user-defined
+        IDCT etc. has been removed. If you need this, don't upgrade. My
+        assumption is that almost nobody was doing this, and those who
+        were will find the built-in SIMD more satisfactory anyway.
+
+      - RGB values computed for JPEG images are slightly different from
+        previous versions of stb_image. (This is due to using less
+        integer precision in SIMD.) The C code has been adjusted so
+        that the same RGB values will be computed regardless of whether
+        SIMD support is available, so your app should always produce
+        consistent results. But these results are slightly different from
+        previous versions. (Specifically, about 3% of available YCbCr values
+        will compute different RGB results from pre-1.49 versions by +-1;
+        most of the deviating values are one smaller in the G channel.)
+
+      - If you must produce consistent results with previous versions of
+        stb_image, #define STBI_JPEG_OLD and you will get the same results
+        you used to; however, you will not get the SIMD speedups for
+        the YCbCr-to-RGB conversion step (although you should still see
+        significant JPEG speedup from the other changes).
+
+        Please note that STBI_JPEG_OLD is a temporary feature; it will be
+        removed in future versions of the library. It is only intended for
+        near-term back-compatibility use.
+
+
+   Latest revision history:
+      2.08  (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA
+      2.07  (2015-09-13) partial animated GIF support
+                         limited 16-bit PSD support
+                         minor bugs, code cleanup, and compiler warnings
+      2.06  (2015-04-19) fix bug where PSD returns wrong '*comp' value
+      2.05  (2015-04-19) fix bug in progressive JPEG handling, fix warning
+      2.04  (2015-04-15) try to re-enable SIMD on MinGW 64-bit
+      2.03  (2015-04-12) additional corruption checking
+                         stbi_set_flip_vertically_on_load
+                         fix NEON support; fix mingw support
+      2.02  (2015-01-19) fix incorrect assert, fix warning
+      2.01  (2015-01-17) fix various warnings
+      2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG
+      2.00  (2014-12-25) optimize JPEG, including x86 SSE2 & ARM NEON SIMD
+                         progressive JPEG
+                         PGM/PPM support
+                         STBI_MALLOC,STBI_REALLOC,STBI_FREE
+                         STBI_NO_*, STBI_ONLY_*
+                         GIF bugfix
+      1.48  (2014-12-14) fix incorrectly-named assert()
+      1.47  (2014-12-14) 1/2/4-bit PNG support (both grayscale and paletted)
+                         optimize PNG
+                         fix bug in interlaced PNG with user-specified channel count
+
+   See end of file for full revision history.
+
+
+ ============================    Contributors    =========================
+
+ Image formats                                Bug fixes & warning fixes
+    Sean Barrett (jpeg, png, bmp)                Marc LeBlanc
+    Nicolas Schulz (hdr, psd)                    Christpher Lloyd
+    Jonathan Dummer (tga)                        Dave Moore
+    Jean-Marc Lienher (gif)                      Won Chun
+    Tom Seddon (pic)                             the Horde3D community
+    Thatcher Ulrich (psd)                        Janez Zemva
+    Ken Miller (pgm, ppm)                        Jonathan Blow
+    urraka@github (animated gif)                 Laurent Gomila
+                                                 Aruelien Pocheville
+                                                 Ryamond Barbiero
+                                                 David Woo
+ Extensions, features                            Martin Golini
+    Jetro Lauha (stbi_info)                      Roy Eltham
+    Martin "SpartanJ" Golini (stbi_info)         Luke Graham
+    James "moose2000" Brown (iPhone PNG)         Thomas Ruf
+    Ben "Disch" Wenger (io callbacks)            John Bartholomew
+    Omar Cornut (1/2/4-bit PNG)                  Ken Hamada
+    Nicolas Guillemot (vertical flip)            Cort Stratton
+    Richard Mitton (16-bit PSD)                  Blazej Dariusz Roszkowski
+                                                 Thibault Reuille
+                                                 Paul Du Bois
+                                                 Guillaume George
+                                                 Jerry Jansson
+                                                 Hayaki Saito
+                                                 Johan Duparc
+                                                 Ronny Chevalier
+ Optimizations & bugfixes                        Michal Cichon
+    Fabian "ryg" Giesen                          Tero Hanninen
+    Arseny Kapoulkine                            Sergio Gonzalez
+                                                 Cass Everitt
+                                                 Engin Manap
+  If your name should be here but                Martins Mozeiko
+  isn't, let Sean know.                          Joseph Thomson
+                                                 Phil Jordan
+                                                 Nathan Reed
+                                                 Michaelangel007@github
+                                                 Nick Verigakis
+
+LICENSE
+
+This software is in the public domain. Where that dedication is not
+recognized, you are granted a perpetual, irrevocable license to copy,
+distribute, and modify this file as you see fit.
+
+*/
+
+#ifndef STBI_INCLUDE_STB_IMAGE_H
+#define STBI_INCLUDE_STB_IMAGE_H
+
+// DOCUMENTATION
+//
+// Limitations:
+//    - no 16-bit-per-channel PNG
+//    - no 12-bit-per-channel JPEG
+//    - no JPEGs with arithmetic coding
+//    - no 1-bit BMP
+//    - GIF always returns *comp=4
+//
+// Basic usage (see HDR discussion below for HDR usage):
+//    int x,y,n;
+//    unsigned char *data = stbi_load(filename, &x, &y, &n, 0);
+//    // ... process data if not NULL ...
+//    // ... x = width, y = height, n = # 8-bit components per pixel ...
+//    // ... replace '0' with '1'..'4' to force that many components per pixel
+//    // ... but 'n' will always be the number that it would have been if you said 0
+//    stbi_image_free(data)
+//
+// Standard parameters:
+//    int *x       -- outputs image width in pixels
+//    int *y       -- outputs image height in pixels
+//    int *comp    -- outputs # of image components in image file
+//    int req_comp -- if non-zero, # of image components requested in result
+//
+// The return value from an image loader is an 'unsigned char *' which points
+// to the pixel data, or NULL on an allocation failure or if the image is
+// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels,
+// with each pixel consisting of N interleaved 8-bit components; the first
+// pixel pointed to is top-left-most in the image. There is no padding between
+// image scanlines or between pixels, regardless of format. The number of
+// components N is 'req_comp' if req_comp is non-zero, or *comp otherwise.
+// If req_comp is non-zero, *comp has the number of components that _would_
+// have been output otherwise. E.g. if you set req_comp to 4, you will always
+// get RGBA output, but you can check *comp to see if it's trivially opaque
+// because e.g. there were only 3 channels in the source image.
+//
+// An output image with N components has the following components interleaved
+// in this order in each pixel:
+//
+//     N=#comp     components
+//       1           grey
+//       2           grey, alpha
+//       3           red, green, blue
+//       4           red, green, blue, alpha
+//
+// If image loading fails for any reason, the return value will be NULL,
+// and *x, *y, *comp will be unchanged. The function stbi_failure_reason()
+// can be queried for an extremely brief, end-user unfriendly explanation
+// of why the load failed. Define STBI_NO_FAILURE_STRINGS to avoid
+// compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly
+// more user-friendly ones.
+//
+// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized.
+//
+// ===========================================================================
+//
+// Philosophy
+//
+// stb libraries are designed with the following priorities:
+//
+//    1. easy to use
+//    2. easy to maintain
+//    3. good performance
+//
+// Sometimes I let "good performance" creep up in priority over "easy to maintain",
+// and for best performance I may provide less-easy-to-use APIs that give higher
+// performance, in addition to the easy to use ones. Nevertheless, it's important
+// to keep in mind that from the standpoint of you, a client of this library,
+// all you care about is #1 and #3, and stb libraries do not emphasize #3 above all.
+//
+// Some secondary priorities arise directly from the first two, some of which
+// make more explicit reasons why performance can't be emphasized.
+//
+//    - Portable ("ease of use")
+//    - Small footprint ("easy to maintain")
+//    - No dependencies ("ease of use")
+//
+// ===========================================================================
+//
+// I/O callbacks
+//
+// I/O callbacks allow you to read from arbitrary sources, like packaged
+// files or some other source. Data read from callbacks are processed
+// through a small internal buffer (currently 128 bytes) to try to reduce
+// overhead.
+//
+// The three functions you must define are "read" (reads some bytes of data),
+// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end).
+//
+// ===========================================================================
+//
+// SIMD support
+//
+// The JPEG decoder will try to automatically use SIMD kernels on x86 when
+// supported by the compiler. For ARM Neon support, you must explicitly
+// request it.
+//
+// (The old do-it-yourself SIMD API is no longer supported in the current
+// code.)
+//
+// On x86, SSE2 will automatically be used when available based on a run-time
+// test; if not, the generic C versions are used as a fall-back. On ARM targets,
+// the typical path is to have separate builds for NEON and non-NEON devices
+// (at least this is true for iOS and Android). Therefore, the NEON support is
+// toggled by a build flag: define STBI_NEON to get NEON loops.
+//
+// The output of the JPEG decoder is slightly different from versions where
+// SIMD support was introduced (that is, for versions before 1.49). The
+// difference is only +-1 in the 8-bit RGB channels, and only on a small
+// fraction of pixels. You can force the pre-1.49 behavior by defining
+// STBI_JPEG_OLD, but this will disable some of the SIMD decoding path
+// and hence cost some performance.
+//
+// If for some reason you do not want to use any of SIMD code, or if
+// you have issues compiling it, you can disable it entirely by
+// defining STBI_NO_SIMD.
+//
+// ===========================================================================
+//
+// HDR image support   (disable by defining STBI_NO_HDR)
+//
+// stb_image now supports loading HDR images in general, and currently
+// the Radiance .HDR file format, although the support is provided
+// generically. You can still load any file through the existing interface;
+// if you attempt to load an HDR file, it will be automatically remapped to
+// LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1;
+// both of these constants can be reconfigured through this interface:
+//
+//     stbi_hdr_to_ldr_gamma(2.2f);
+//     stbi_hdr_to_ldr_scale(1.0f);
+//
+// (note, do not use _inverse_ constants; stbi_image will invert them
+// appropriately).
+//
+// Additionally, there is a new, parallel interface for loading files as
+// (linear) floats to preserve the full dynamic range:
+//
+//    float *data = stbi_loadf(filename, &x, &y, &n, 0);
+//
+// If you load LDR images through this interface, those images will
+// be promoted to floating point values, run through the inverse of
+// constants corresponding to the above:
+//
+//     stbi_ldr_to_hdr_scale(1.0f);
+//     stbi_ldr_to_hdr_gamma(2.2f);
+//
+// Finally, given a filename (or an open file or memory block--see header
+// file for details) containing image data, you can query for the "most
+// appropriate" interface to use (that is, whether the image is HDR or
+// not), using:
+//
+//     stbi_is_hdr(char *filename);
+//
+// ===========================================================================
+//
+// iPhone PNG support:
+//
+// By default we convert iphone-formatted PNGs back to RGB, even though
+// they are internally encoded differently. You can disable this conversion
+// by by calling stbi_convert_iphone_png_to_rgb(0), in which case
+// you will always just get the native iphone "format" through (which
+// is BGR stored in RGB).
+//
+// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per
+// pixel to remove any premultiplied alpha *only* if the image file explicitly
+// says there's premultiplied data (currently only happens in iPhone images,
+// and only if iPhone convert-to-rgb processing is on).
+//
+
+
+#ifndef STBI_NO_STDIO
+#include <stdio.h>
+#endif // STBI_NO_STDIO
+
+#define STBI_VERSION 1
+
+enum
+{
+   STBI_default = 0, // only used for req_comp
+
+   STBI_grey       = 1,
+   STBI_grey_alpha = 2,
+   STBI_rgb        = 3,
+   STBI_rgb_alpha  = 4
+};
+
+typedef unsigned char stbi_uc;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef STB_IMAGE_STATIC
+#define STBIDEF static
+#else
+#define STBIDEF extern
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// PRIMARY API - works on images of any type
+//
+
+//
+// load image by filename, open file, or memory buffer
+//
+
+typedef struct
+{
+   int      (*read)  (void *user,char *data,int size);   // fill 'data' with 'size' bytes.  return number of bytes actually read
+   void     (*skip)  (void *user,int n);                 // skip the next 'n' bytes, or 'unget' the last -n bytes if negative
+   int      (*eof)   (void *user);                       // returns nonzero if we are at end of file/data
+} stbi_io_callbacks;
+
+STBIDEF stbi_uc *stbi_load               (char              const *filename,           int *x, int *y, int *comp, int req_comp);
+STBIDEF stbi_uc *stbi_load_from_memory   (stbi_uc           const *buffer, int len   , int *x, int *y, int *comp, int req_comp);
+STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk  , void *user, int *x, int *y, int *comp, int req_comp);
+
+#ifndef STBI_NO_STDIO
+STBIDEF stbi_uc *stbi_load_from_file  (FILE *f,                  int *x, int *y, int *comp, int req_comp);
+// for stbi_load_from_file, file pointer is left pointing immediately after image
+#endif
+
+#ifndef STBI_NO_LINEAR
+   STBIDEF float *stbi_loadf                 (char const *filename,           int *x, int *y, int *comp, int req_comp);
+   STBIDEF float *stbi_loadf_from_memory     (stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp);
+   STBIDEF float *stbi_loadf_from_callbacks  (stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp);
+
+   #ifndef STBI_NO_STDIO
+   STBIDEF float *stbi_loadf_from_file  (FILE *f,                int *x, int *y, int *comp, int req_comp);
+   #endif
+#endif
+
+#ifndef STBI_NO_HDR
+   STBIDEF void   stbi_hdr_to_ldr_gamma(float gamma);
+   STBIDEF void   stbi_hdr_to_ldr_scale(float scale);
+#endif
+
+#ifndef STBI_NO_LINEAR
+   STBIDEF void   stbi_ldr_to_hdr_gamma(float gamma);
+   STBIDEF void   stbi_ldr_to_hdr_scale(float scale);
+#endif // STBI_NO_HDR
+
+// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR
+STBIDEF int    stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user);
+STBIDEF int    stbi_is_hdr_from_memory(stbi_uc const *buffer, int len);
+#ifndef STBI_NO_STDIO
+STBIDEF int      stbi_is_hdr          (char const *filename);
+STBIDEF int      stbi_is_hdr_from_file(FILE *f);
+#endif // STBI_NO_STDIO
+
+
+// get a VERY brief reason for failure
+// NOT THREADSAFE
+STBIDEF const char *stbi_failure_reason  (void);
+
+// free the loaded image -- this is just free()
+STBIDEF void     stbi_image_free      (void *retval_from_stbi_load);
+
+// get image dimensions & components without fully decoding
+STBIDEF int      stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp);
+STBIDEF int      stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp);
+
+#ifndef STBI_NO_STDIO
+STBIDEF int      stbi_info            (char const *filename,     int *x, int *y, int *comp);
+STBIDEF int      stbi_info_from_file  (FILE *f,                  int *x, int *y, int *comp);
+
+#endif
+
+
+
+// for image formats that explicitly notate that they have premultiplied alpha,
+// we just return the colors as stored in the file. set this flag to force
+// unpremultiplication. results are undefined if the unpremultiply overflow.
+STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply);
+
+// indicate whether we should process iphone images back to canonical format,
+// or just pass them through "as-is"
+STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert);
+
+// flip the image vertically, so the first pixel in the output array is the bottom left
+STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip);
+
+// ZLIB client - used by PNG, available for other purposes
+
+STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen);
+STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header);
+STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen);
+STBIDEF int   stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
+
+STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen);
+STBIDEF int   stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+//
+//
+////   end header file   /////////////////////////////////////////////////////
+#endif // STBI_INCLUDE_STB_IMAGE_H
+
+#ifdef STB_IMAGE_IMPLEMENTATION
+
+#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \
+  || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \
+  || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \
+  || defined(STBI_ONLY_ZLIB)
+   #ifndef STBI_ONLY_JPEG
+   #define STBI_NO_JPEG
+   #endif
+   #ifndef STBI_ONLY_PNG
+   #define STBI_NO_PNG
+   #endif
+   #ifndef STBI_ONLY_BMP
+   #define STBI_NO_BMP
+   #endif
+   #ifndef STBI_ONLY_PSD
+   #define STBI_NO_PSD
+   #endif
+   #ifndef STBI_ONLY_TGA
+   #define STBI_NO_TGA
+   #endif
+   #ifndef STBI_ONLY_GIF
+   #define STBI_NO_GIF
+   #endif
+   #ifndef STBI_ONLY_HDR
+   #define STBI_NO_HDR
+   #endif
+   #ifndef STBI_ONLY_PIC
+   #define STBI_NO_PIC
+   #endif
+   #ifndef STBI_ONLY_PNM
+   #define STBI_NO_PNM
+   #endif
+#endif
+
+#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB)
+#define STBI_NO_ZLIB
+#endif
+
+
+#include <stdarg.h>
+#include <stddef.h> // ptrdiff_t on osx
+#include <stdlib.h>
+#include <string.h>
+
+#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
+#include <math.h>  // ldexp
+#endif
+
+#ifndef STBI_NO_STDIO
+#include <stdio.h>
+#endif
+
+#ifndef STBI_ASSERT
+#include <assert.h>
+#define STBI_ASSERT(x) assert(x)
+#endif
+
+
+#ifndef _MSC_VER
+   #ifdef __cplusplus
+   #define stbi_inline inline
+   #else
+   #define stbi_inline
+   #endif
+#else
+   #define stbi_inline __forceinline
+#endif
+
+
+#ifdef _MSC_VER
+typedef unsigned short stbi__uint16;
+typedef   signed short stbi__int16;
+typedef unsigned int   stbi__uint32;
+typedef   signed int   stbi__int32;
+#else
+#include <stdint.h>
+typedef uint16_t stbi__uint16;
+typedef int16_t  stbi__int16;
+typedef uint32_t stbi__uint32;
+typedef int32_t  stbi__int32;
+#endif
+
+// should produce compiler error if size is wrong
+typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1];
+
+#ifdef _MSC_VER
+#define STBI_NOTUSED(v)  (void)(v)
+#else
+#define STBI_NOTUSED(v)  (void)sizeof(v)
+#endif
+
+#ifdef _MSC_VER
+#define STBI_HAS_LROTL
+#endif
+
+#ifdef STBI_HAS_LROTL
+   #define stbi_lrot(x,y)  _lrotl(x,y)
+#else
+   #define stbi_lrot(x,y)  (((x) << (y)) | ((x) >> (32 - (y))))
+#endif
+
+#if defined(STBI_MALLOC) && defined(STBI_FREE) && defined(STBI_REALLOC)
+// ok
+#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC)
+// ok
+#else
+#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC."
+#endif
+
+#ifndef STBI_MALLOC
+#define STBI_MALLOC(sz)    malloc(sz)
+#define STBI_REALLOC(p,sz) realloc(p,sz)
+#define STBI_FREE(p)       free(p)
+#endif
+
+// x86/x64 detection
+#if defined(__x86_64__) || defined(_M_X64)
+#define STBI__X64_TARGET
+#elif defined(__i386) || defined(_M_IX86)
+#define STBI__X86_TARGET
+#endif
+
+#if defined(__GNUC__) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET)) && !defined(__SSE2__) && !defined(STBI_NO_SIMD)
+// NOTE: not clear do we actually need this for the 64-bit path?
+// gcc doesn't support sse2 intrinsics unless you compile with -msse2,
+// (but compiling with -msse2 allows the compiler to use SSE2 everywhere;
+// this is just broken and gcc are jerks for not fixing it properly
+// http://www.virtualdub.org/blog/pivot/entry.php?id=363 )
+#define STBI_NO_SIMD
+#endif
+
+#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD)
+// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET
+//
+// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the
+// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant.
+// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not
+// simultaneously enabling "-mstackrealign".
+//
+// See https://github.com/nothings/stb/issues/81 for more information.
+//
+// So default to no SSE2 on 32-bit MinGW. If you've read this far and added
+// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2.
+#define STBI_NO_SIMD
+#endif
+
+#if !defined(STBI_NO_SIMD) && defined(STBI__X86_TARGET)
+#define STBI_SSE2
+#include <emmintrin.h>
+
+#ifdef _MSC_VER
+
+#if _MSC_VER >= 1400  // not VC6
+#include <intrin.h> // __cpuid
+static int stbi__cpuid3(void)
+{
+   int info[4];
+   __cpuid(info,1);
+   return info[3];
+}
+#else
+static int stbi__cpuid3(void)
+{
+   int res;
+   __asm {
+      mov  eax,1
+      cpuid
+      mov  res,edx
+   }
+   return res;
+}
+#endif
+
+#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name
+
+static int stbi__sse2_available()
+{
+   int info3 = stbi__cpuid3();
+   return ((info3 >> 26) & 1) != 0;
+}
+#else // assume GCC-style if not VC++
+#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
+
+static int stbi__sse2_available()
+{
+#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 // GCC 4.8 or later
+   // GCC 4.8+ has a nice way to do this
+   return __builtin_cpu_supports("sse2");
+#else
+   // portable way to do this, preferably without using GCC inline ASM?
+   // just bail for now.
+   return 0;
+#endif
+}
+#endif
+#endif
+
+// ARM NEON
+#if defined(STBI_NO_SIMD) && defined(STBI_NEON)
+#undef STBI_NEON
+#endif
+
+#ifdef STBI_NEON
+#include <arm_neon.h>
+// assume GCC or Clang on ARM targets
+#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
+#endif
+
+#ifndef STBI_SIMD_ALIGN
+#define STBI_SIMD_ALIGN(type, name) type name
+#endif
+
+///////////////////////////////////////////////
+//
+//  stbi__context struct and start_xxx functions
+
+// stbi__context structure is our basic context used by all images, so it
+// contains all the IO context, plus some basic image information
+typedef struct
+{
+   stbi__uint32 img_x, img_y;
+   int img_n, img_out_n;
+
+   stbi_io_callbacks io;
+   void *io_user_data;
+
+   int read_from_callbacks;
+   int buflen;
+   stbi_uc buffer_start[128];
+
+   stbi_uc *img_buffer, *img_buffer_end;
+   stbi_uc *img_buffer_original, *img_buffer_original_end;
+} stbi__context;
+
+
+static void stbi__refill_buffer(stbi__context *s);
+
+// initialize a memory-decode context
+static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len)
+{
+   s->io.read = NULL;
+   s->read_from_callbacks = 0;
+   s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer;
+   s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len;
+}
+
+// initialize a callback-based context
+static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user)
+{
+   s->io = *c;
+   s->io_user_data = user;
+   s->buflen = sizeof(s->buffer_start);
+   s->read_from_callbacks = 1;
+   s->img_buffer_original = s->buffer_start;
+   stbi__refill_buffer(s);
+   s->img_buffer_original_end = s->img_buffer_end;
+}
+
+#ifndef STBI_NO_STDIO
+
+static int stbi__stdio_read(void *user, char *data, int size)
+{
+   return (int) fread(data,1,size,(FILE*) user);
+}
+
+static void stbi__stdio_skip(void *user, int n)
+{
+   fseek((FILE*) user, n, SEEK_CUR);
+}
+
+static int stbi__stdio_eof(void *user)
+{
+   return feof((FILE*) user);
+}
+
+static stbi_io_callbacks stbi__stdio_callbacks =
+{
+   stbi__stdio_read,
+   stbi__stdio_skip,
+   stbi__stdio_eof,
+};
+
+static void stbi__start_file(stbi__context *s, FILE *f)
+{
+   stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f);
+}
+
+//static void stop_file(stbi__context *s) { }
+
+#endif // !STBI_NO_STDIO
+
+static void stbi__rewind(stbi__context *s)
+{
+   // conceptually rewind SHOULD rewind to the beginning of the stream,
+   // but we just rewind to the beginning of the initial buffer, because
+   // we only use it after doing 'test', which only ever looks at at most 92 bytes
+   s->img_buffer = s->img_buffer_original;
+   s->img_buffer_end = s->img_buffer_original_end;
+}
+
+#ifndef STBI_NO_JPEG
+static int      stbi__jpeg_test(stbi__context *s);
+static stbi_uc *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static int      stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PNG
+static int      stbi__png_test(stbi__context *s);
+static stbi_uc *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static int      stbi__png_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_BMP
+static int      stbi__bmp_test(stbi__context *s);
+static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static int      stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_TGA
+static int      stbi__tga_test(stbi__context *s);
+static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static int      stbi__tga_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PSD
+static int      stbi__psd_test(stbi__context *s);
+static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static int      stbi__psd_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_HDR
+static int      stbi__hdr_test(stbi__context *s);
+static float   *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static int      stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PIC
+static int      stbi__pic_test(stbi__context *s);
+static stbi_uc *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static int      stbi__pic_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_GIF
+static int      stbi__gif_test(stbi__context *s);
+static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static int      stbi__gif_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PNM
+static int      stbi__pnm_test(stbi__context *s);
+static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp);
+static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+// this is not threadsafe
+static const char *stbi__g_failure_reason;
+
+STBIDEF const char *stbi_failure_reason(void)
+{
+   return stbi__g_failure_reason;
+}
+
+static int stbi__err(const char *str)
+{
+   stbi__g_failure_reason = str;
+   return 0;
+}
+
+static void *stbi__malloc(size_t size)
+{
+    return STBI_MALLOC(size);
+}
+
+// stbi__err - error
+// stbi__errpf - error returning pointer to float
+// stbi__errpuc - error returning pointer to unsigned char
+
+#ifdef STBI_NO_FAILURE_STRINGS
+   #define stbi__err(x,y)  0
+#elif defined(STBI_FAILURE_USERMSG)
+   #define stbi__err(x,y)  stbi__err(y)
+#else
+   #define stbi__err(x,y)  stbi__err(x)
+#endif
+
+#define stbi__errpf(x,y)   ((float *)(size_t) (stbi__err(x,y)?NULL:NULL))
+#define stbi__errpuc(x,y)  ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL))
+
+STBIDEF void stbi_image_free(void *retval_from_stbi_load)
+{
+   STBI_FREE(retval_from_stbi_load);
+}
+
+#ifndef STBI_NO_LINEAR
+static float   *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp);
+#endif
+
+#ifndef STBI_NO_HDR
+static stbi_uc *stbi__hdr_to_ldr(float   *data, int x, int y, int comp);
+#endif
+
+static int stbi__vertically_flip_on_load = 0;
+
+STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip)
+{
+    stbi__vertically_flip_on_load = flag_true_if_should_flip;
+}
+
+static unsigned char *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   #ifndef STBI_NO_JPEG
+   if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp);
+   #endif
+   #ifndef STBI_NO_PNG
+   if (stbi__png_test(s))  return stbi__png_load(s,x,y,comp,req_comp);
+   #endif
+   #ifndef STBI_NO_BMP
+   if (stbi__bmp_test(s))  return stbi__bmp_load(s,x,y,comp,req_comp);
+   #endif
+   #ifndef STBI_NO_GIF
+   if (stbi__gif_test(s))  return stbi__gif_load(s,x,y,comp,req_comp);
+   #endif
+   #ifndef STBI_NO_PSD
+   if (stbi__psd_test(s))  return stbi__psd_load(s,x,y,comp,req_comp);
+   #endif
+   #ifndef STBI_NO_PIC
+   if (stbi__pic_test(s))  return stbi__pic_load(s,x,y,comp,req_comp);
+   #endif
+   #ifndef STBI_NO_PNM
+   if (stbi__pnm_test(s))  return stbi__pnm_load(s,x,y,comp,req_comp);
+   #endif
+
+   #ifndef STBI_NO_HDR
+   if (stbi__hdr_test(s)) {
+      float *hdr = stbi__hdr_load(s, x,y,comp,req_comp);
+      return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp);
+   }
+   #endif
+
+   #ifndef STBI_NO_TGA
+   // test tga last because it's a crappy test!
+   if (stbi__tga_test(s))
+      return stbi__tga_load(s,x,y,comp,req_comp);
+   #endif
+
+   return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt");
+}
+
+static unsigned char *stbi__load_flip(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   unsigned char *result = stbi__load_main(s, x, y, comp, req_comp);
+
+   if (stbi__vertically_flip_on_load && result != NULL) {
+      int w = *x, h = *y;
+      int depth = req_comp ? req_comp : *comp;
+      int row,col,z;
+      stbi_uc temp;
+
+      // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once
+      for (row = 0; row < (h>>1); row++) {
+         for (col = 0; col < w; col++) {
+            for (z = 0; z < depth; z++) {
+               temp = result[(row * w + col) * depth + z];
+               result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z];
+               result[((h - row - 1) * w + col) * depth + z] = temp;
+            }
+         }
+      }
+   }
+
+   return result;
+}
+
+#ifndef STBI_NO_HDR
+static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp)
+{
+   if (stbi__vertically_flip_on_load && result != NULL) {
+      int w = *x, h = *y;
+      int depth = req_comp ? req_comp : *comp;
+      int row,col,z;
+      float temp;
+
+      // @OPTIMIZE: use a bigger temp buffer and memcpy multiple pixels at once
+      for (row = 0; row < (h>>1); row++) {
+         for (col = 0; col < w; col++) {
+            for (z = 0; z < depth; z++) {
+               temp = result[(row * w + col) * depth + z];
+               result[(row * w + col) * depth + z] = result[((h - row - 1) * w + col) * depth + z];
+               result[((h - row - 1) * w + col) * depth + z] = temp;
+            }
+         }
+      }
+   }
+}
+#endif
+
+#ifndef STBI_NO_STDIO
+
+static FILE *stbi__fopen(char const *filename, char const *mode)
+{
+   FILE *f;
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+   if (0 != fopen_s(&f, filename, mode))
+      f=0;
+#else
+   f = fopen(filename, mode);
+#endif
+   return f;
+}
+
+
+STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp)
+{
+   FILE *f = stbi__fopen(filename, "rb");
+   unsigned char *result;
+   if (!f) return stbi__errpuc("can't fopen", "Unable to open file");
+   result = stbi_load_from_file(f,x,y,comp,req_comp);
+   fclose(f);
+   return result;
+}
+
+STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
+{
+   unsigned char *result;
+   stbi__context s;
+   stbi__start_file(&s,f);
+   result = stbi__load_flip(&s,x,y,comp,req_comp);
+   if (result) {
+      // need to 'unget' all the characters in the IO buffer
+      fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
+   }
+   return result;
+}
+#endif //!STBI_NO_STDIO
+
+STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__load_flip(&s,x,y,comp,req_comp);
+}
+
+STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
+   return stbi__load_flip(&s,x,y,comp,req_comp);
+}
+
+#ifndef STBI_NO_LINEAR
+static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   unsigned char *data;
+   #ifndef STBI_NO_HDR
+   if (stbi__hdr_test(s)) {
+      float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp);
+      if (hdr_data)
+         stbi__float_postprocess(hdr_data,x,y,comp,req_comp);
+      return hdr_data;
+   }
+   #endif
+   data = stbi__load_flip(s, x, y, comp, req_comp);
+   if (data)
+      return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp);
+   return stbi__errpf("unknown image type", "Image not of any known type, or corrupt");
+}
+
+STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__loadf_main(&s,x,y,comp,req_comp);
+}
+
+STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
+   return stbi__loadf_main(&s,x,y,comp,req_comp);
+}
+
+#ifndef STBI_NO_STDIO
+STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp)
+{
+   float *result;
+   FILE *f = stbi__fopen(filename, "rb");
+   if (!f) return stbi__errpf("can't fopen", "Unable to open file");
+   result = stbi_loadf_from_file(f,x,y,comp,req_comp);
+   fclose(f);
+   return result;
+}
+
+STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_file(&s,f);
+   return stbi__loadf_main(&s,x,y,comp,req_comp);
+}
+#endif // !STBI_NO_STDIO
+
+#endif // !STBI_NO_LINEAR
+
+// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is
+// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always
+// reports false!
+
+STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len)
+{
+   #ifndef STBI_NO_HDR
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__hdr_test(&s);
+   #else
+   STBI_NOTUSED(buffer);
+   STBI_NOTUSED(len);
+   return 0;
+   #endif
+}
+
+#ifndef STBI_NO_STDIO
+STBIDEF int      stbi_is_hdr          (char const *filename)
+{
+   FILE *f = stbi__fopen(filename, "rb");
+   int result=0;
+   if (f) {
+      result = stbi_is_hdr_from_file(f);
+      fclose(f);
+   }
+   return result;
+}
+
+STBIDEF int      stbi_is_hdr_from_file(FILE *f)
+{
+   #ifndef STBI_NO_HDR
+   stbi__context s;
+   stbi__start_file(&s,f);
+   return stbi__hdr_test(&s);
+   #else
+   STBI_NOTUSED(f);
+   return 0;
+   #endif
+}
+#endif // !STBI_NO_STDIO
+
+STBIDEF int      stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user)
+{
+   #ifndef STBI_NO_HDR
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
+   return stbi__hdr_test(&s);
+   #else
+   STBI_NOTUSED(clbk);
+   STBI_NOTUSED(user);
+   return 0;
+   #endif
+}
+
+static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f;
+static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f;
+
+#ifndef STBI_NO_LINEAR
+STBIDEF void   stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; }
+STBIDEF void   stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; }
+#endif
+
+STBIDEF void   stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; }
+STBIDEF void   stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; }
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Common code used by all image loaders
+//
+
+enum
+{
+   STBI__SCAN_load=0,
+   STBI__SCAN_type,
+   STBI__SCAN_header
+};
+
+static void stbi__refill_buffer(stbi__context *s)
+{
+   int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen);
+   if (n == 0) {
+      // at end of file, treat same as if from memory, but need to handle case
+      // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file
+      s->read_from_callbacks = 0;
+      s->img_buffer = s->buffer_start;
+      s->img_buffer_end = s->buffer_start+1;
+      *s->img_buffer = 0;
+   } else {
+      s->img_buffer = s->buffer_start;
+      s->img_buffer_end = s->buffer_start + n;
+   }
+}
+
+stbi_inline static stbi_uc stbi__get8(stbi__context *s)
+{
+   if (s->img_buffer < s->img_buffer_end)
+      return *s->img_buffer++;
+   if (s->read_from_callbacks) {
+      stbi__refill_buffer(s);
+      return *s->img_buffer++;
+   }
+   return 0;
+}
+
+stbi_inline static int stbi__at_eof(stbi__context *s)
+{
+   if (s->io.read) {
+      if (!(s->io.eof)(s->io_user_data)) return 0;
+      // if feof() is true, check if buffer = end
+      // special case: we've only got the special 0 character at the end
+      if (s->read_from_callbacks == 0) return 1;
+   }
+
+   return s->img_buffer >= s->img_buffer_end;
+}
+
+static void stbi__skip(stbi__context *s, int n)
+{
+   if (n < 0) {
+      s->img_buffer = s->img_buffer_end;
+      return;
+   }
+   if (s->io.read) {
+      int blen = (int) (s->img_buffer_end - s->img_buffer);
+      if (blen < n) {
+         s->img_buffer = s->img_buffer_end;
+         (s->io.skip)(s->io_user_data, n - blen);
+         return;
+      }
+   }
+   s->img_buffer += n;
+}
+
+static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n)
+{
+   if (s->io.read) {
+      int blen = (int) (s->img_buffer_end - s->img_buffer);
+      if (blen < n) {
+         int res, count;
+
+         memcpy(buffer, s->img_buffer, blen);
+
+         count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen);
+         res = (count == (n-blen));
+         s->img_buffer = s->img_buffer_end;
+         return res;
+      }
+   }
+
+   if (s->img_buffer+n <= s->img_buffer_end) {
+      memcpy(buffer, s->img_buffer, n);
+      s->img_buffer += n;
+      return 1;
+   } else
+      return 0;
+}
+
+static int stbi__get16be(stbi__context *s)
+{
+   int z = stbi__get8(s);
+   return (z << 8) + stbi__get8(s);
+}
+
+static stbi__uint32 stbi__get32be(stbi__context *s)
+{
+   stbi__uint32 z = stbi__get16be(s);
+   return (z << 16) + stbi__get16be(s);
+}
+
+#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF)
+// nothing
+#else
+static int stbi__get16le(stbi__context *s)
+{
+   int z = stbi__get8(s);
+   return z + (stbi__get8(s) << 8);
+}
+#endif
+
+#ifndef STBI_NO_BMP
+static stbi__uint32 stbi__get32le(stbi__context *s)
+{
+   stbi__uint32 z = stbi__get16le(s);
+   return z + (stbi__get16le(s) << 16);
+}
+#endif
+
+#define STBI__BYTECAST(x)  ((stbi_uc) ((x) & 255))  // truncate int to byte without warnings
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  generic converter from built-in img_n to req_comp
+//    individual types do this automatically as much as possible (e.g. jpeg
+//    does all cases internally since it needs to colorspace convert anyway,
+//    and it never has alpha, so very few cases ). png can automatically
+//    interleave an alpha=255 channel, but falls back to this for other cases
+//
+//  assume data buffer is malloced, so malloc a new one and free that one
+//  only failure mode is malloc failing
+
+static stbi_uc stbi__compute_y(int r, int g, int b)
+{
+   return (stbi_uc) (((r*77) + (g*150) +  (29*b)) >> 8);
+}
+
+static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y)
+{
+   int i,j;
+   unsigned char *good;
+
+   if (req_comp == img_n) return data;
+   STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
+
+   good = (unsigned char *) stbi__malloc(req_comp * x * y);
+   if (good == NULL) {
+      STBI_FREE(data);
+      return stbi__errpuc("outofmem", "Out of memory");
+   }
+
+   for (j=0; j < (int) y; ++j) {
+      unsigned char *src  = data + j * x * img_n   ;
+      unsigned char *dest = good + j * x * req_comp;
+
+      #define COMBO(a,b)  ((a)*8+(b))
+      #define CASE(a,b)   case COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
+      // convert source image with img_n components to one with req_comp components;
+      // avoid switch per pixel, so use switch per scanline and massive macros
+      switch (COMBO(img_n, req_comp)) {
+         CASE(1,2) dest[0]=src[0], dest[1]=255; break;
+         CASE(1,3) dest[0]=dest[1]=dest[2]=src[0]; break;
+         CASE(1,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=255; break;
+         CASE(2,1) dest[0]=src[0]; break;
+         CASE(2,3) dest[0]=dest[1]=dest[2]=src[0]; break;
+         CASE(2,4) dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1]; break;
+         CASE(3,4) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255; break;
+         CASE(3,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break;
+         CASE(3,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = 255; break;
+         CASE(4,1) dest[0]=stbi__compute_y(src[0],src[1],src[2]); break;
+         CASE(4,2) dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = src[3]; break;
+         CASE(4,3) dest[0]=src[0],dest[1]=src[1],dest[2]=src[2]; break;
+         default: STBI_ASSERT(0);
+      }
+      #undef CASE
+   }
+
+   STBI_FREE(data);
+   return good;
+}
+
+#ifndef STBI_NO_LINEAR
+static float   *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp)
+{
+   int i,k,n;
+   float *output = (float *) stbi__malloc(x * y * comp * sizeof(float));
+   if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); }
+   // compute number of non-alpha components
+   if (comp & 1) n = comp; else n = comp-1;
+   for (i=0; i < x*y; ++i) {
+      for (k=0; k < n; ++k) {
+         output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale);
+      }
+      if (k < comp) output[i*comp + k] = data[i*comp+k]/255.0f;
+   }
+   STBI_FREE(data);
+   return output;
+}
+#endif
+
+#ifndef STBI_NO_HDR
+#define stbi__float2int(x)   ((int) (x))
+static stbi_uc *stbi__hdr_to_ldr(float   *data, int x, int y, int comp)
+{
+   int i,k,n;
+   stbi_uc *output = (stbi_uc *) stbi__malloc(x * y * comp);
+   if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); }
+   // compute number of non-alpha components
+   if (comp & 1) n = comp; else n = comp-1;
+   for (i=0; i < x*y; ++i) {
+      for (k=0; k < n; ++k) {
+         float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f;
+         if (z < 0) z = 0;
+         if (z > 255) z = 255;
+         output[i*comp + k] = (stbi_uc) stbi__float2int(z);
+      }
+      if (k < comp) {
+         float z = data[i*comp+k] * 255 + 0.5f;
+         if (z < 0) z = 0;
+         if (z > 255) z = 255;
+         output[i*comp + k] = (stbi_uc) stbi__float2int(z);
+      }
+   }
+   STBI_FREE(data);
+   return output;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  "baseline" JPEG/JFIF decoder
+//
+//    simple implementation
+//      - doesn't support delayed output of y-dimension
+//      - simple interface (only one output format: 8-bit interleaved RGB)
+//      - doesn't try to recover corrupt jpegs
+//      - doesn't allow partial loading, loading multiple at once
+//      - still fast on x86 (copying globals into locals doesn't help x86)
+//      - allocates lots of intermediate memory (full size of all components)
+//        - non-interleaved case requires this anyway
+//        - allows good upsampling (see next)
+//    high-quality
+//      - upsampled channels are bilinearly interpolated, even across blocks
+//      - quality integer IDCT derived from IJG's 'slow'
+//    performance
+//      - fast huffman; reasonable integer IDCT
+//      - some SIMD kernels for common paths on targets with SSE2/NEON
+//      - uses a lot of intermediate memory, could cache poorly
+
+#ifndef STBI_NO_JPEG
+
+// huffman decoding acceleration
+#define FAST_BITS   9  // larger handles more cases; smaller stomps less cache
+
+typedef struct
+{
+   stbi_uc  fast[1 << FAST_BITS];
+   // weirdly, repacking this into AoS is a 10% speed loss, instead of a win
+   stbi__uint16 code[256];
+   stbi_uc  values[256];
+   stbi_uc  size[257];
+   unsigned int maxcode[18];
+   int    delta[17];   // old 'firstsymbol' - old 'firstcode'
+} stbi__huffman;
+
+typedef struct
+{
+   stbi__context *s;
+   stbi__huffman huff_dc[4];
+   stbi__huffman huff_ac[4];
+   stbi_uc dequant[4][64];
+   stbi__int16 fast_ac[4][1 << FAST_BITS];
+
+// sizes for components, interleaved MCUs
+   int img_h_max, img_v_max;
+   int img_mcu_x, img_mcu_y;
+   int img_mcu_w, img_mcu_h;
+
+// definition of jpeg image component
+   struct
+   {
+      int id;
+      int h,v;
+      int tq;
+      int hd,ha;
+      int dc_pred;
+
+      int x,y,w2,h2;
+      stbi_uc *data;
+      void *raw_data, *raw_coeff;
+      stbi_uc *linebuf;
+      short   *coeff;   // progressive only
+      int      coeff_w, coeff_h; // number of 8x8 coefficient blocks
+   } img_comp[4];
+
+   stbi__uint32   code_buffer; // jpeg entropy-coded buffer
+   int            code_bits;   // number of valid bits
+   unsigned char  marker;      // marker seen while filling entropy buffer
+   int            nomore;      // flag if we saw a marker so must stop
+
+   int            progressive;
+   int            spec_start;
+   int            spec_end;
+   int            succ_high;
+   int            succ_low;
+   int            eob_run;
+
+   int scan_n, order[4];
+   int restart_interval, todo;
+
+// kernels
+   void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]);
+   void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step);
+   stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs);
+} stbi__jpeg;
+
+static int stbi__build_huffman(stbi__huffman *h, int *count)
+{
+   int i,j,k=0,code;
+   // build size list for each symbol (from JPEG spec)
+   for (i=0; i < 16; ++i)
+      for (j=0; j < count[i]; ++j)
+         h->size[k++] = (stbi_uc) (i+1);
+   h->size[k] = 0;
+
+   // compute actual symbols (from jpeg spec)
+   code = 0;
+   k = 0;
+   for(j=1; j <= 16; ++j) {
+      // compute delta to add to code to compute symbol id
+      h->delta[j] = k - code;
+      if (h->size[k] == j) {
+         while (h->size[k] == j)
+            h->code[k++] = (stbi__uint16) (code++);
+         if (code-1 >= (1 << j)) return stbi__err("bad code lengths","Corrupt JPEG");
+      }
+      // compute largest code + 1 for this size, preshifted as needed later
+      h->maxcode[j] = code << (16-j);
+      code <<= 1;
+   }
+   h->maxcode[j] = 0xffffffff;
+
+   // build non-spec acceleration table; 255 is flag for not-accelerated
+   memset(h->fast, 255, 1 << FAST_BITS);
+   for (i=0; i < k; ++i) {
+      int s = h->size[i];
+      if (s <= FAST_BITS) {
+         int c = h->code[i] << (FAST_BITS-s);
+         int m = 1 << (FAST_BITS-s);
+         for (j=0; j < m; ++j) {
+            h->fast[c+j] = (stbi_uc) i;
+         }
+      }
+   }
+   return 1;
+}
+
+// build a table that decodes both magnitude and value of small ACs in
+// one go.
+static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h)
+{
+   int i;
+   for (i=0; i < (1 << FAST_BITS); ++i) {
+      stbi_uc fast = h->fast[i];
+      fast_ac[i] = 0;
+      if (fast < 255) {
+         int rs = h->values[fast];
+         int run = (rs >> 4) & 15;
+         int magbits = rs & 15;
+         int len = h->size[fast];
+
+         if (magbits && len + magbits <= FAST_BITS) {
+            // magnitude code followed by receive_extend code
+            int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits);
+            int m = 1 << (magbits - 1);
+            if (k < m) k += (-1 << magbits) + 1;
+            // if the result is small enough, we can fit it in fast_ac table
+            if (k >= -128 && k <= 127)
+               fast_ac[i] = (stbi__int16) ((k << 8) + (run << 4) + (len + magbits));
+         }
+      }
+   }
+}
+
+static void stbi__grow_buffer_unsafe(stbi__jpeg *j)
+{
+   do {
+      int b = j->nomore ? 0 : stbi__get8(j->s);
+      if (b == 0xff) {
+         int c = stbi__get8(j->s);
+         if (c != 0) {
+            j->marker = (unsigned char) c;
+            j->nomore = 1;
+            return;
+         }
+      }
+      j->code_buffer |= b << (24 - j->code_bits);
+      j->code_bits += 8;
+   } while (j->code_bits <= 24);
+}
+
+// (1 << n) - 1
+static stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535};
+
+// decode a jpeg huffman value from the bitstream
+stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h)
+{
+   unsigned int temp;
+   int c,k;
+
+   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+
+   // look at the top FAST_BITS and determine what symbol ID it is,
+   // if the code is <= FAST_BITS
+   c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
+   k = h->fast[c];
+   if (k < 255) {
+      int s = h->size[k];
+      if (s > j->code_bits)
+         return -1;
+      j->code_buffer <<= s;
+      j->code_bits -= s;
+      return h->values[k];
+   }
+
+   // naive test is to shift the code_buffer down so k bits are
+   // valid, then test against maxcode. To speed this up, we've
+   // preshifted maxcode left so that it has (16-k) 0s at the
+   // end; in other words, regardless of the number of bits, it
+   // wants to be compared against something shifted to have 16;
+   // that way we don't need to shift inside the loop.
+   temp = j->code_buffer >> 16;
+   for (k=FAST_BITS+1 ; ; ++k)
+      if (temp < h->maxcode[k])
+         break;
+   if (k == 17) {
+      // error! code not found
+      j->code_bits -= 16;
+      return -1;
+   }
+
+   if (k > j->code_bits)
+      return -1;
+
+   // convert the huffman code to the symbol id
+   c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k];
+   STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]);
+
+   // convert the id to a symbol
+   j->code_bits -= k;
+   j->code_buffer <<= k;
+   return h->values[c];
+}
+
+// bias[n] = (-1<<n) + 1
+static int const stbi__jbias[16] = {0,-1,-3,-7,-15,-31,-63,-127,-255,-511,-1023,-2047,-4095,-8191,-16383,-32767};
+
+// combined JPEG 'receive' and JPEG 'extend', since baseline
+// always extends everything it receives.
+stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n)
+{
+   unsigned int k;
+   int sgn;
+   if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
+
+   sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB
+   k = stbi_lrot(j->code_buffer, n);
+   STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask)));
+   j->code_buffer = k & ~stbi__bmask[n];
+   k &= stbi__bmask[n];
+   j->code_bits -= n;
+   return k + (stbi__jbias[n] & ~sgn);
+}
+
+// get some unsigned bits
+stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n)
+{
+   unsigned int k;
+   if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
+   k = stbi_lrot(j->code_buffer, n);
+   j->code_buffer = k & ~stbi__bmask[n];
+   k &= stbi__bmask[n];
+   j->code_bits -= n;
+   return k;
+}
+
+stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j)
+{
+   unsigned int k;
+   if (j->code_bits < 1) stbi__grow_buffer_unsafe(j);
+   k = j->code_buffer;
+   j->code_buffer <<= 1;
+   --j->code_bits;
+   return k & 0x80000000;
+}
+
+// given a value that's at position X in the zigzag stream,
+// where does it appear in the 8x8 matrix coded as row-major?
+static stbi_uc stbi__jpeg_dezigzag[64+15] =
+{
+    0,  1,  8, 16,  9,  2,  3, 10,
+   17, 24, 32, 25, 18, 11,  4,  5,
+   12, 19, 26, 33, 40, 48, 41, 34,
+   27, 20, 13,  6,  7, 14, 21, 28,
+   35, 42, 49, 56, 57, 50, 43, 36,
+   29, 22, 15, 23, 30, 37, 44, 51,
+   58, 59, 52, 45, 38, 31, 39, 46,
+   53, 60, 61, 54, 47, 55, 62, 63,
+   // let corrupt input sample past end
+   63, 63, 63, 63, 63, 63, 63, 63,
+   63, 63, 63, 63, 63, 63, 63
+};
+
+// decode one 64-entry block--
+static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi_uc *dequant)
+{
+   int diff,dc,k;
+   int t;
+
+   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+   t = stbi__jpeg_huff_decode(j, hdc);
+   if (t < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+
+   // 0 all the ac values now so we can do it 32-bits at a time
+   memset(data,0,64*sizeof(data[0]));
+
+   diff = t ? stbi__extend_receive(j, t) : 0;
+   dc = j->img_comp[b].dc_pred + diff;
+   j->img_comp[b].dc_pred = dc;
+   data[0] = (short) (dc * dequant[0]);
+
+   // decode AC components, see JPEG spec
+   k = 1;
+   do {
+      unsigned int zig;
+      int c,r,s;
+      if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+      c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
+      r = fac[c];
+      if (r) { // fast-AC path
+         k += (r >> 4) & 15; // run
+         s = r & 15; // combined length
+         j->code_buffer <<= s;
+         j->code_bits -= s;
+         // decode into unzigzag'd location
+         zig = stbi__jpeg_dezigzag[k++];
+         data[zig] = (short) ((r >> 8) * dequant[zig]);
+      } else {
+         int rs = stbi__jpeg_huff_decode(j, hac);
+         if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+         s = rs & 15;
+         r = rs >> 4;
+         if (s == 0) {
+            if (rs != 0xf0) break; // end block
+            k += 16;
+         } else {
+            k += r;
+            // decode into unzigzag'd location
+            zig = stbi__jpeg_dezigzag[k++];
+            data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]);
+         }
+      }
+   } while (k < 64);
+   return 1;
+}
+
+static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b)
+{
+   int diff,dc;
+   int t;
+   if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
+
+   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+
+   if (j->succ_high == 0) {
+      // first scan for DC coefficient, must be first
+      memset(data,0,64*sizeof(data[0])); // 0 all the ac values now
+      t = stbi__jpeg_huff_decode(j, hdc);
+      diff = t ? stbi__extend_receive(j, t) : 0;
+
+      dc = j->img_comp[b].dc_pred + diff;
+      j->img_comp[b].dc_pred = dc;
+      data[0] = (short) (dc << j->succ_low);
+   } else {
+      // refinement scan for DC coefficient
+      if (stbi__jpeg_get_bit(j))
+         data[0] += (short) (1 << j->succ_low);
+   }
+   return 1;
+}
+
+// @OPTIMIZE: store non-zigzagged during the decode passes,
+// and only de-zigzag when dequantizing
+static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac)
+{
+   int k;
+   if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
+
+   if (j->succ_high == 0) {
+      int shift = j->succ_low;
+
+      if (j->eob_run) {
+         --j->eob_run;
+         return 1;
+      }
+
+      k = j->spec_start;
+      do {
+         unsigned int zig;
+         int c,r,s;
+         if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+         c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
+         r = fac[c];
+         if (r) { // fast-AC path
+            k += (r >> 4) & 15; // run
+            s = r & 15; // combined length
+            j->code_buffer <<= s;
+            j->code_bits -= s;
+            zig = stbi__jpeg_dezigzag[k++];
+            data[zig] = (short) ((r >> 8) << shift);
+         } else {
+            int rs = stbi__jpeg_huff_decode(j, hac);
+            if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+            s = rs & 15;
+            r = rs >> 4;
+            if (s == 0) {
+               if (r < 15) {
+                  j->eob_run = (1 << r);
+                  if (r)
+                     j->eob_run += stbi__jpeg_get_bits(j, r);
+                  --j->eob_run;
+                  break;
+               }
+               k += 16;
+            } else {
+               k += r;
+               zig = stbi__jpeg_dezigzag[k++];
+               data[zig] = (short) (stbi__extend_receive(j,s) << shift);
+            }
+         }
+      } while (k <= j->spec_end);
+   } else {
+      // refinement scan for these AC coefficients
+
+      short bit = (short) (1 << j->succ_low);
+
+      if (j->eob_run) {
+         --j->eob_run;
+         for (k = j->spec_start; k <= j->spec_end; ++k) {
+            short *p = &data[stbi__jpeg_dezigzag[k]];
+            if (*p != 0)
+               if (stbi__jpeg_get_bit(j))
+                  if ((*p & bit)==0) {
+                     if (*p > 0)
+                        *p += bit;
+                     else
+                        *p -= bit;
+                  }
+         }
+      } else {
+         k = j->spec_start;
+         do {
+            int r,s;
+            int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh
+            if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+            s = rs & 15;
+            r = rs >> 4;
+            if (s == 0) {
+               if (r < 15) {
+                  j->eob_run = (1 << r) - 1;
+                  if (r)
+                     j->eob_run += stbi__jpeg_get_bits(j, r);
+                  r = 64; // force end of block
+               } else {
+                  // r=15 s=0 should write 16 0s, so we just do
+                  // a run of 15 0s and then write s (which is 0),
+                  // so we don't have to do anything special here
+               }
+            } else {
+               if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG");
+               // sign bit
+               if (stbi__jpeg_get_bit(j))
+                  s = bit;
+               else
+                  s = -bit;
+            }
+
+            // advance by r
+            while (k <= j->spec_end) {
+               short *p = &data[stbi__jpeg_dezigzag[k++]];
+               if (*p != 0) {
+                  if (stbi__jpeg_get_bit(j))
+                     if ((*p & bit)==0) {
+                        if (*p > 0)
+                           *p += bit;
+                        else
+                           *p -= bit;
+                     }
+               } else {
+                  if (r == 0) {
+                     *p = (short) s;
+                     break;
+                  }
+                  --r;
+               }
+            }
+         } while (k <= j->spec_end);
+      }
+   }
+   return 1;
+}
+
+// take a -128..127 value and stbi__clamp it and convert to 0..255
+stbi_inline static stbi_uc stbi__clamp(int x)
+{
+   // trick to use a single test to catch both cases
+   if ((unsigned int) x > 255) {
+      if (x < 0) return 0;
+      if (x > 255) return 255;
+   }
+   return (stbi_uc) x;
+}
+
+#define stbi__f2f(x)  ((int) (((x) * 4096 + 0.5)))
+#define stbi__fsh(x)  ((x) << 12)
+
+// derived from jidctint -- DCT_ISLOW
+#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \
+   int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \
+   p2 = s2;                                    \
+   p3 = s6;                                    \
+   p1 = (p2+p3) * stbi__f2f(0.5411961f);       \
+   t2 = p1 + p3*stbi__f2f(-1.847759065f);      \
+   t3 = p1 + p2*stbi__f2f( 0.765366865f);      \
+   p2 = s0;                                    \
+   p3 = s4;                                    \
+   t0 = stbi__fsh(p2+p3);                      \
+   t1 = stbi__fsh(p2-p3);                      \
+   x0 = t0+t3;                                 \
+   x3 = t0-t3;                                 \
+   x1 = t1+t2;                                 \
+   x2 = t1-t2;                                 \
+   t0 = s7;                                    \
+   t1 = s5;                                    \
+   t2 = s3;                                    \
+   t3 = s1;                                    \
+   p3 = t0+t2;                                 \
+   p4 = t1+t3;                                 \
+   p1 = t0+t3;                                 \
+   p2 = t1+t2;                                 \
+   p5 = (p3+p4)*stbi__f2f( 1.175875602f);      \
+   t0 = t0*stbi__f2f( 0.298631336f);           \
+   t1 = t1*stbi__f2f( 2.053119869f);           \
+   t2 = t2*stbi__f2f( 3.072711026f);           \
+   t3 = t3*stbi__f2f( 1.501321110f);           \
+   p1 = p5 + p1*stbi__f2f(-0.899976223f);      \
+   p2 = p5 + p2*stbi__f2f(-2.562915447f);      \
+   p3 = p3*stbi__f2f(-1.961570560f);           \
+   p4 = p4*stbi__f2f(-0.390180644f);           \
+   t3 += p1+p4;                                \
+   t2 += p2+p3;                                \
+   t1 += p2+p4;                                \
+   t0 += p1+p3;
+
+static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64])
+{
+   int i,val[64],*v=val;
+   stbi_uc *o;
+   short *d = data;
+
+   // columns
+   for (i=0; i < 8; ++i,++d, ++v) {
+      // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing
+      if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0
+           && d[40]==0 && d[48]==0 && d[56]==0) {
+         //    no shortcut                 0     seconds
+         //    (1|2|3|4|5|6|7)==0          0     seconds
+         //    all separate               -0.047 seconds
+         //    1 && 2|3 && 4|5 && 6|7:    -0.047 seconds
+         int dcterm = d[0] << 2;
+         v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm;
+      } else {
+         STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56])
+         // constants scaled things up by 1<<12; let's bring them back
+         // down, but keep 2 extra bits of precision
+         x0 += 512; x1 += 512; x2 += 512; x3 += 512;
+         v[ 0] = (x0+t3) >> 10;
+         v[56] = (x0-t3) >> 10;
+         v[ 8] = (x1+t2) >> 10;
+         v[48] = (x1-t2) >> 10;
+         v[16] = (x2+t1) >> 10;
+         v[40] = (x2-t1) >> 10;
+         v[24] = (x3+t0) >> 10;
+         v[32] = (x3-t0) >> 10;
+      }
+   }
+
+   for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) {
+      // no fast case since the first 1D IDCT spread components out
+      STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7])
+      // constants scaled things up by 1<<12, plus we had 1<<2 from first
+      // loop, plus horizontal and vertical each scale by sqrt(8) so together
+      // we've got an extra 1<<3, so 1<<17 total we need to remove.
+      // so we want to round that, which means adding 0.5 * 1<<17,
+      // aka 65536. Also, we'll end up with -128 to 127 that we want
+      // to encode as 0..255 by adding 128, so we'll add that before the shift
+      x0 += 65536 + (128<<17);
+      x1 += 65536 + (128<<17);
+      x2 += 65536 + (128<<17);
+      x3 += 65536 + (128<<17);
+      // tried computing the shifts into temps, or'ing the temps to see
+      // if any were out of range, but that was slower
+      o[0] = stbi__clamp((x0+t3) >> 17);
+      o[7] = stbi__clamp((x0-t3) >> 17);
+      o[1] = stbi__clamp((x1+t2) >> 17);
+      o[6] = stbi__clamp((x1-t2) >> 17);
+      o[2] = stbi__clamp((x2+t1) >> 17);
+      o[5] = stbi__clamp((x2-t1) >> 17);
+      o[3] = stbi__clamp((x3+t0) >> 17);
+      o[4] = stbi__clamp((x3-t0) >> 17);
+   }
+}
+
+#ifdef STBI_SSE2
+// sse2 integer IDCT. not the fastest possible implementation but it
+// produces bit-identical results to the generic C version so it's
+// fully "transparent".
+static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64])
+{
+   // This is constructed to match our regular (generic) integer IDCT exactly.
+   __m128i row0, row1, row2, row3, row4, row5, row6, row7;
+   __m128i tmp;
+
+   // dot product constant: even elems=x, odd elems=y
+   #define dct_const(x,y)  _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y))
+
+   // out(0) = c0[even]*x + c0[odd]*y   (c0, x, y 16-bit, out 32-bit)
+   // out(1) = c1[even]*x + c1[odd]*y
+   #define dct_rot(out0,out1, x,y,c0,c1) \
+      __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \
+      __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \
+      __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \
+      __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \
+      __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \
+      __m128i out1##_h = _mm_madd_epi16(c0##hi, c1)
+
+   // out = in << 12  (in 16-bit, out 32-bit)
+   #define dct_widen(out, in) \
+      __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \
+      __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4)
+
+   // wide add
+   #define dct_wadd(out, a, b) \
+      __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \
+      __m128i out##_h = _mm_add_epi32(a##_h, b##_h)
+
+   // wide sub
+   #define dct_wsub(out, a, b) \
+      __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \
+      __m128i out##_h = _mm_sub_epi32(a##_h, b##_h)
+
+   // butterfly a/b, add bias, then shift by "s" and pack
+   #define dct_bfly32o(out0, out1, a,b,bias,s) \
+      { \
+         __m128i abiased_l = _mm_add_epi32(a##_l, bias); \
+         __m128i abiased_h = _mm_add_epi32(a##_h, bias); \
+         dct_wadd(sum, abiased, b); \
+         dct_wsub(dif, abiased, b); \
+         out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \
+         out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \
+      }
+
+   // 8-bit interleave step (for transposes)
+   #define dct_interleave8(a, b) \
+      tmp = a; \
+      a = _mm_unpacklo_epi8(a, b); \
+      b = _mm_unpackhi_epi8(tmp, b)
+
+   // 16-bit interleave step (for transposes)
+   #define dct_interleave16(a, b) \
+      tmp = a; \
+      a = _mm_unpacklo_epi16(a, b); \
+      b = _mm_unpackhi_epi16(tmp, b)
+
+   #define dct_pass(bias,shift) \
+      { \
+         /* even part */ \
+         dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \
+         __m128i sum04 = _mm_add_epi16(row0, row4); \
+         __m128i dif04 = _mm_sub_epi16(row0, row4); \
+         dct_widen(t0e, sum04); \
+         dct_widen(t1e, dif04); \
+         dct_wadd(x0, t0e, t3e); \
+         dct_wsub(x3, t0e, t3e); \
+         dct_wadd(x1, t1e, t2e); \
+         dct_wsub(x2, t1e, t2e); \
+         /* odd part */ \
+         dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \
+         dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \
+         __m128i sum17 = _mm_add_epi16(row1, row7); \
+         __m128i sum35 = _mm_add_epi16(row3, row5); \
+         dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \
+         dct_wadd(x4, y0o, y4o); \
+         dct_wadd(x5, y1o, y5o); \
+         dct_wadd(x6, y2o, y5o); \
+         dct_wadd(x7, y3o, y4o); \
+         dct_bfly32o(row0,row7, x0,x7,bias,shift); \
+         dct_bfly32o(row1,row6, x1,x6,bias,shift); \
+         dct_bfly32o(row2,row5, x2,x5,bias,shift); \
+         dct_bfly32o(row3,row4, x3,x4,bias,shift); \
+      }
+
+   __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f));
+   __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f));
+   __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f));
+   __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f));
+   __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f));
+   __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f));
+   __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f));
+   __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f));
+
+   // rounding biases in column/row passes, see stbi__idct_block for explanation.
+   __m128i bias_0 = _mm_set1_epi32(512);
+   __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17));
+
+   // load
+   row0 = _mm_load_si128((const __m128i *) (data + 0*8));
+   row1 = _mm_load_si128((const __m128i *) (data + 1*8));
+   row2 = _mm_load_si128((const __m128i *) (data + 2*8));
+   row3 = _mm_load_si128((const __m128i *) (data + 3*8));
+   row4 = _mm_load_si128((const __m128i *) (data + 4*8));
+   row5 = _mm_load_si128((const __m128i *) (data + 5*8));
+   row6 = _mm_load_si128((const __m128i *) (data + 6*8));
+   row7 = _mm_load_si128((const __m128i *) (data + 7*8));
+
+   // column pass
+   dct_pass(bias_0, 10);
+
+   {
+      // 16bit 8x8 transpose pass 1
+      dct_interleave16(row0, row4);
+      dct_interleave16(row1, row5);
+      dct_interleave16(row2, row6);
+      dct_interleave16(row3, row7);
+
+      // transpose pass 2
+      dct_interleave16(row0, row2);
+      dct_interleave16(row1, row3);
+      dct_interleave16(row4, row6);
+      dct_interleave16(row5, row7);
+
+      // transpose pass 3
+      dct_interleave16(row0, row1);
+      dct_interleave16(row2, row3);
+      dct_interleave16(row4, row5);
+      dct_interleave16(row6, row7);
+   }
+
+   // row pass
+   dct_pass(bias_1, 17);
+
+   {
+      // pack
+      __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7
+      __m128i p1 = _mm_packus_epi16(row2, row3);
+      __m128i p2 = _mm_packus_epi16(row4, row5);
+      __m128i p3 = _mm_packus_epi16(row6, row7);
+
+      // 8bit 8x8 transpose pass 1
+      dct_interleave8(p0, p2); // a0e0a1e1...
+      dct_interleave8(p1, p3); // c0g0c1g1...
+
+      // transpose pass 2
+      dct_interleave8(p0, p1); // a0c0e0g0...
+      dct_interleave8(p2, p3); // b0d0f0h0...
+
+      // transpose pass 3
+      dct_interleave8(p0, p2); // a0b0c0d0...
+      dct_interleave8(p1, p3); // a4b4c4d4...
+
+      // store
+      _mm_storel_epi64((__m128i *) out, p0); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, p2); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, p1); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, p3); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e));
+   }
+
+#undef dct_const
+#undef dct_rot
+#undef dct_widen
+#undef dct_wadd
+#undef dct_wsub
+#undef dct_bfly32o
+#undef dct_interleave8
+#undef dct_interleave16
+#undef dct_pass
+}
+
+#endif // STBI_SSE2
+
+#ifdef STBI_NEON
+
+// NEON integer IDCT. should produce bit-identical
+// results to the generic C version.
+static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64])
+{
+   int16x8_t row0, row1, row2, row3, row4, row5, row6, row7;
+
+   int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f));
+   int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f));
+   int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f));
+   int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f));
+   int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f));
+   int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f));
+   int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f));
+   int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f));
+   int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f));
+   int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f));
+   int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f));
+   int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f));
+
+#define dct_long_mul(out, inq, coeff) \
+   int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \
+   int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff)
+
+#define dct_long_mac(out, acc, inq, coeff) \
+   int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \
+   int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff)
+
+#define dct_widen(out, inq) \
+   int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \
+   int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12)
+
+// wide add
+#define dct_wadd(out, a, b) \
+   int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \
+   int32x4_t out##_h = vaddq_s32(a##_h, b##_h)
+
+// wide sub
+#define dct_wsub(out, a, b) \
+   int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \
+   int32x4_t out##_h = vsubq_s32(a##_h, b##_h)
+
+// butterfly a/b, then shift using "shiftop" by "s" and pack
+#define dct_bfly32o(out0,out1, a,b,shiftop,s) \
+   { \
+      dct_wadd(sum, a, b); \
+      dct_wsub(dif, a, b); \
+      out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \
+      out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \
+   }
+
+#define dct_pass(shiftop, shift) \
+   { \
+      /* even part */ \
+      int16x8_t sum26 = vaddq_s16(row2, row6); \
+      dct_long_mul(p1e, sum26, rot0_0); \
+      dct_long_mac(t2e, p1e, row6, rot0_1); \
+      dct_long_mac(t3e, p1e, row2, rot0_2); \
+      int16x8_t sum04 = vaddq_s16(row0, row4); \
+      int16x8_t dif04 = vsubq_s16(row0, row4); \
+      dct_widen(t0e, sum04); \
+      dct_widen(t1e, dif04); \
+      dct_wadd(x0, t0e, t3e); \
+      dct_wsub(x3, t0e, t3e); \
+      dct_wadd(x1, t1e, t2e); \
+      dct_wsub(x2, t1e, t2e); \
+      /* odd part */ \
+      int16x8_t sum15 = vaddq_s16(row1, row5); \
+      int16x8_t sum17 = vaddq_s16(row1, row7); \
+      int16x8_t sum35 = vaddq_s16(row3, row5); \
+      int16x8_t sum37 = vaddq_s16(row3, row7); \
+      int16x8_t sumodd = vaddq_s16(sum17, sum35); \
+      dct_long_mul(p5o, sumodd, rot1_0); \
+      dct_long_mac(p1o, p5o, sum17, rot1_1); \
+      dct_long_mac(p2o, p5o, sum35, rot1_2); \
+      dct_long_mul(p3o, sum37, rot2_0); \
+      dct_long_mul(p4o, sum15, rot2_1); \
+      dct_wadd(sump13o, p1o, p3o); \
+      dct_wadd(sump24o, p2o, p4o); \
+      dct_wadd(sump23o, p2o, p3o); \
+      dct_wadd(sump14o, p1o, p4o); \
+      dct_long_mac(x4, sump13o, row7, rot3_0); \
+      dct_long_mac(x5, sump24o, row5, rot3_1); \
+      dct_long_mac(x6, sump23o, row3, rot3_2); \
+      dct_long_mac(x7, sump14o, row1, rot3_3); \
+      dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \
+      dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \
+      dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \
+      dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \
+   }
+
+   // load
+   row0 = vld1q_s16(data + 0*8);
+   row1 = vld1q_s16(data + 1*8);
+   row2 = vld1q_s16(data + 2*8);
+   row3 = vld1q_s16(data + 3*8);
+   row4 = vld1q_s16(data + 4*8);
+   row5 = vld1q_s16(data + 5*8);
+   row6 = vld1q_s16(data + 6*8);
+   row7 = vld1q_s16(data + 7*8);
+
+   // add DC bias
+   row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0));
+
+   // column pass
+   dct_pass(vrshrn_n_s32, 10);
+
+   // 16bit 8x8 transpose
+   {
+// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively.
+// whether compilers actually get this is another story, sadly.
+#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; }
+#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); }
+#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); }
+
+      // pass 1
+      dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6
+      dct_trn16(row2, row3);
+      dct_trn16(row4, row5);
+      dct_trn16(row6, row7);
+
+      // pass 2
+      dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4
+      dct_trn32(row1, row3);
+      dct_trn32(row4, row6);
+      dct_trn32(row5, row7);
+
+      // pass 3
+      dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0
+      dct_trn64(row1, row5);
+      dct_trn64(row2, row6);
+      dct_trn64(row3, row7);
+
+#undef dct_trn16
+#undef dct_trn32
+#undef dct_trn64
+   }
+
+   // row pass
+   // vrshrn_n_s32 only supports shifts up to 16, we need
+   // 17. so do a non-rounding shift of 16 first then follow
+   // up with a rounding shift by 1.
+   dct_pass(vshrn_n_s32, 16);
+
+   {
+      // pack and round
+      uint8x8_t p0 = vqrshrun_n_s16(row0, 1);
+      uint8x8_t p1 = vqrshrun_n_s16(row1, 1);
+      uint8x8_t p2 = vqrshrun_n_s16(row2, 1);
+      uint8x8_t p3 = vqrshrun_n_s16(row3, 1);
+      uint8x8_t p4 = vqrshrun_n_s16(row4, 1);
+      uint8x8_t p5 = vqrshrun_n_s16(row5, 1);
+      uint8x8_t p6 = vqrshrun_n_s16(row6, 1);
+      uint8x8_t p7 = vqrshrun_n_s16(row7, 1);
+
+      // again, these can translate into one instruction, but often don't.
+#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; }
+#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); }
+#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); }
+
+      // sadly can't use interleaved stores here since we only write
+      // 8 bytes to each scan line!
+
+      // 8x8 8-bit transpose pass 1
+      dct_trn8_8(p0, p1);
+      dct_trn8_8(p2, p3);
+      dct_trn8_8(p4, p5);
+      dct_trn8_8(p6, p7);
+
+      // pass 2
+      dct_trn8_16(p0, p2);
+      dct_trn8_16(p1, p3);
+      dct_trn8_16(p4, p6);
+      dct_trn8_16(p5, p7);
+
+      // pass 3
+      dct_trn8_32(p0, p4);
+      dct_trn8_32(p1, p5);
+      dct_trn8_32(p2, p6);
+      dct_trn8_32(p3, p7);
+
+      // store
+      vst1_u8(out, p0); out += out_stride;
+      vst1_u8(out, p1); out += out_stride;
+      vst1_u8(out, p2); out += out_stride;
+      vst1_u8(out, p3); out += out_stride;
+      vst1_u8(out, p4); out += out_stride;
+      vst1_u8(out, p5); out += out_stride;
+      vst1_u8(out, p6); out += out_stride;
+      vst1_u8(out, p7);
+
+#undef dct_trn8_8
+#undef dct_trn8_16
+#undef dct_trn8_32
+   }
+
+#undef dct_long_mul
+#undef dct_long_mac
+#undef dct_widen
+#undef dct_wadd
+#undef dct_wsub
+#undef dct_bfly32o
+#undef dct_pass
+}
+
+#endif // STBI_NEON
+
+#define STBI__MARKER_none  0xff
+// if there's a pending marker from the entropy stream, return that
+// otherwise, fetch from the stream and get a marker. if there's no
+// marker, return 0xff, which is never a valid marker value
+static stbi_uc stbi__get_marker(stbi__jpeg *j)
+{
+   stbi_uc x;
+   if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; }
+   x = stbi__get8(j->s);
+   if (x != 0xff) return STBI__MARKER_none;
+   while (x == 0xff)
+      x = stbi__get8(j->s);
+   return x;
+}
+
+// in each scan, we'll have scan_n components, and the order
+// of the components is specified by order[]
+#define STBI__RESTART(x)     ((x) >= 0xd0 && (x) <= 0xd7)
+
+// after a restart interval, stbi__jpeg_reset the entropy decoder and
+// the dc prediction
+static void stbi__jpeg_reset(stbi__jpeg *j)
+{
+   j->code_bits = 0;
+   j->code_buffer = 0;
+   j->nomore = 0;
+   j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = 0;
+   j->marker = STBI__MARKER_none;
+   j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff;
+   j->eob_run = 0;
+   // no more than 1<<31 MCUs if no restart_interal? that's plenty safe,
+   // since we don't even allow 1<<30 pixels
+}
+
+static int stbi__parse_entropy_coded_data(stbi__jpeg *z)
+{
+   stbi__jpeg_reset(z);
+   if (!z->progressive) {
+      if (z->scan_n == 1) {
+         int i,j;
+         STBI_SIMD_ALIGN(short, data[64]);
+         int n = z->order[0];
+         // non-interleaved data, we just need to process one block at a time,
+         // in trivial scanline order
+         // number of blocks to do just depends on how many actual "pixels" this
+         // component has, independent of interleaved MCU blocking and such
+         int w = (z->img_comp[n].x+7) >> 3;
+         int h = (z->img_comp[n].y+7) >> 3;
+         for (j=0; j < h; ++j) {
+            for (i=0; i < w; ++i) {
+               int ha = z->img_comp[n].ha;
+               if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0;
+               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data);
+               // every data block is an MCU, so countdown the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  // if it's NOT a restart, then just bail, so we get corrupt data
+                  // rather than no data
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      } else { // interleaved
+         int i,j,k,x,y;
+         STBI_SIMD_ALIGN(short, data[64]);
+         for (j=0; j < z->img_mcu_y; ++j) {
+            for (i=0; i < z->img_mcu_x; ++i) {
+               // scan an interleaved mcu... process scan_n components in order
+               for (k=0; k < z->scan_n; ++k) {
+                  int n = z->order[k];
+                  // scan out an mcu's worth of this component; that's just determined
+                  // by the basic H and V specified for the component
+                  for (y=0; y < z->img_comp[n].v; ++y) {
+                     for (x=0; x < z->img_comp[n].h; ++x) {
+                        int x2 = (i*z->img_comp[n].h + x)*8;
+                        int y2 = (j*z->img_comp[n].v + y)*8;
+                        int ha = z->img_comp[n].ha;
+                        if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0;
+                        z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data);
+                     }
+                  }
+               }
+               // after all interleaved components, that's an interleaved MCU,
+               // so now count down the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      }
+   } else {
+      if (z->scan_n == 1) {
+         int i,j;
+         int n = z->order[0];
+         // non-interleaved data, we just need to process one block at a time,
+         // in trivial scanline order
+         // number of blocks to do just depends on how many actual "pixels" this
+         // component has, independent of interleaved MCU blocking and such
+         int w = (z->img_comp[n].x+7) >> 3;
+         int h = (z->img_comp[n].y+7) >> 3;
+         for (j=0; j < h; ++j) {
+            for (i=0; i < w; ++i) {
+               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
+               if (z->spec_start == 0) {
+                  if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
+                     return 0;
+               } else {
+                  int ha = z->img_comp[n].ha;
+                  if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha]))
+                     return 0;
+               }
+               // every data block is an MCU, so countdown the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      } else { // interleaved
+         int i,j,k,x,y;
+         for (j=0; j < z->img_mcu_y; ++j) {
+            for (i=0; i < z->img_mcu_x; ++i) {
+               // scan an interleaved mcu... process scan_n components in order
+               for (k=0; k < z->scan_n; ++k) {
+                  int n = z->order[k];
+                  // scan out an mcu's worth of this component; that's just determined
+                  // by the basic H and V specified for the component
+                  for (y=0; y < z->img_comp[n].v; ++y) {
+                     for (x=0; x < z->img_comp[n].h; ++x) {
+                        int x2 = (i*z->img_comp[n].h + x);
+                        int y2 = (j*z->img_comp[n].v + y);
+                        short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w);
+                        if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
+                           return 0;
+                     }
+                  }
+               }
+               // after all interleaved components, that's an interleaved MCU,
+               // so now count down the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      }
+   }
+}
+
+static void stbi__jpeg_dequantize(short *data, stbi_uc *dequant)
+{
+   int i;
+   for (i=0; i < 64; ++i)
+      data[i] *= dequant[i];
+}
+
+static void stbi__jpeg_finish(stbi__jpeg *z)
+{
+   if (z->progressive) {
+      // dequantize and idct the data
+      int i,j,n;
+      for (n=0; n < z->s->img_n; ++n) {
+         int w = (z->img_comp[n].x+7) >> 3;
+         int h = (z->img_comp[n].y+7) >> 3;
+         for (j=0; j < h; ++j) {
+            for (i=0; i < w; ++i) {
+               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
+               stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]);
+               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data);
+            }
+         }
+      }
+   }
+}
+
+static int stbi__process_marker(stbi__jpeg *z, int m)
+{
+   int L;
+   switch (m) {
+      case STBI__MARKER_none: // no marker found
+         return stbi__err("expected marker","Corrupt JPEG");
+
+      case 0xDD: // DRI - specify restart interval
+         if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG");
+         z->restart_interval = stbi__get16be(z->s);
+         return 1;
+
+      case 0xDB: // DQT - define quantization table
+         L = stbi__get16be(z->s)-2;
+         while (L > 0) {
+            int q = stbi__get8(z->s);
+            int p = q >> 4;
+            int t = q & 15,i;
+            if (p != 0) return stbi__err("bad DQT type","Corrupt JPEG");
+            if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG");
+            for (i=0; i < 64; ++i)
+               z->dequant[t][stbi__jpeg_dezigzag[i]] = stbi__get8(z->s);
+            L -= 65;
+         }
+         return L==0;
+
+      case 0xC4: // DHT - define huffman table
+         L = stbi__get16be(z->s)-2;
+         while (L > 0) {
+            stbi_uc *v;
+            int sizes[16],i,n=0;
+            int q = stbi__get8(z->s);
+            int tc = q >> 4;
+            int th = q & 15;
+            if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG");
+            for (i=0; i < 16; ++i) {
+               sizes[i] = stbi__get8(z->s);
+               n += sizes[i];
+            }
+            L -= 17;
+            if (tc == 0) {
+               if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0;
+               v = z->huff_dc[th].values;
+            } else {
+               if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0;
+               v = z->huff_ac[th].values;
+            }
+            for (i=0; i < n; ++i)
+               v[i] = stbi__get8(z->s);
+            if (tc != 0)
+               stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th);
+            L -= n;
+         }
+         return L==0;
+   }
+   // check for comment block or APP blocks
+   if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) {
+      stbi__skip(z->s, stbi__get16be(z->s)-2);
+      return 1;
+   }
+   return 0;
+}
+
+// after we see SOS
+static int stbi__process_scan_header(stbi__jpeg *z)
+{
+   int i;
+   int Ls = stbi__get16be(z->s);
+   z->scan_n = stbi__get8(z->s);
+   if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG");
+   if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG");
+   for (i=0; i < z->scan_n; ++i) {
+      int id = stbi__get8(z->s), which;
+      int q = stbi__get8(z->s);
+      for (which = 0; which < z->s->img_n; ++which)
+         if (z->img_comp[which].id == id)
+            break;
+      if (which == z->s->img_n) return 0; // no match
+      z->img_comp[which].hd = q >> 4;   if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG");
+      z->img_comp[which].ha = q & 15;   if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG");
+      z->order[i] = which;
+   }
+
+   {
+      int aa;
+      z->spec_start = stbi__get8(z->s);
+      z->spec_end   = stbi__get8(z->s); // should be 63, but might be 0
+      aa = stbi__get8(z->s);
+      z->succ_high = (aa >> 4);
+      z->succ_low  = (aa & 15);
+      if (z->progressive) {
+         if (z->spec_start > 63 || z->spec_end > 63  || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13)
+            return stbi__err("bad SOS", "Corrupt JPEG");
+      } else {
+         if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG");
+         if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG");
+         z->spec_end = 63;
+      }
+   }
+
+   return 1;
+}
+
+static int stbi__process_frame_header(stbi__jpeg *z, int scan)
+{
+   stbi__context *s = z->s;
+   int Lf,p,i,q, h_max=1,v_max=1,c;
+   Lf = stbi__get16be(s);         if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG
+   p  = stbi__get8(s);            if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline
+   s->img_y = stbi__get16be(s);   if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG
+   s->img_x = stbi__get16be(s);   if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires
+   c = stbi__get8(s);
+   if (c != 3 && c != 1) return stbi__err("bad component count","Corrupt JPEG");    // JFIF requires
+   s->img_n = c;
+   for (i=0; i < c; ++i) {
+      z->img_comp[i].data = NULL;
+      z->img_comp[i].linebuf = NULL;
+   }
+
+   if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG");
+
+   for (i=0; i < s->img_n; ++i) {
+      z->img_comp[i].id = stbi__get8(s);
+      if (z->img_comp[i].id != i+1)   // JFIF requires
+         if (z->img_comp[i].id != i)  // some version of jpegtran outputs non-JFIF-compliant files!
+            return stbi__err("bad component ID","Corrupt JPEG");
+      q = stbi__get8(s);
+      z->img_comp[i].h = (q >> 4);  if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG");
+      z->img_comp[i].v = q & 15;    if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG");
+      z->img_comp[i].tq = stbi__get8(s);  if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG");
+   }
+
+   if (scan != STBI__SCAN_load) return 1;
+
+   if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode");
+
+   for (i=0; i < s->img_n; ++i) {
+      if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h;
+      if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v;
+   }
+
+   // compute interleaved mcu info
+   z->img_h_max = h_max;
+   z->img_v_max = v_max;
+   z->img_mcu_w = h_max * 8;
+   z->img_mcu_h = v_max * 8;
+   z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w;
+   z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h;
+
+   for (i=0; i < s->img_n; ++i) {
+      // number of effective pixels (e.g. for non-interleaved MCU)
+      z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max;
+      z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max;
+      // to simplify generation, we'll allocate enough memory to decode
+      // the bogus oversized data from using interleaved MCUs and their
+      // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't
+      // discard the extra data until colorspace conversion
+      z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8;
+      z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8;
+      z->img_comp[i].raw_data = stbi__malloc(z->img_comp[i].w2 * z->img_comp[i].h2+15);
+
+      if (z->img_comp[i].raw_data == NULL) {
+         for(--i; i >= 0; --i) {
+            STBI_FREE(z->img_comp[i].raw_data);
+            z->img_comp[i].raw_data = NULL;
+         }
+         return stbi__err("outofmem", "Out of memory");
+      }
+      // align blocks for idct using mmx/sse
+      z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15);
+      z->img_comp[i].linebuf = NULL;
+      if (z->progressive) {
+         z->img_comp[i].coeff_w = (z->img_comp[i].w2 + 7) >> 3;
+         z->img_comp[i].coeff_h = (z->img_comp[i].h2 + 7) >> 3;
+         z->img_comp[i].raw_coeff = STBI_MALLOC(z->img_comp[i].coeff_w * z->img_comp[i].coeff_h * 64 * sizeof(short) + 15);
+         z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15);
+      } else {
+         z->img_comp[i].coeff = 0;
+         z->img_comp[i].raw_coeff = 0;
+      }
+   }
+
+   return 1;
+}
+
+// use comparisons since in some cases we handle more than one case (e.g. SOF)
+#define stbi__DNL(x)         ((x) == 0xdc)
+#define stbi__SOI(x)         ((x) == 0xd8)
+#define stbi__EOI(x)         ((x) == 0xd9)
+#define stbi__SOF(x)         ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2)
+#define stbi__SOS(x)         ((x) == 0xda)
+
+#define stbi__SOF_progressive(x)   ((x) == 0xc2)
+
+static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan)
+{
+   int m;
+   z->marker = STBI__MARKER_none; // initialize cached marker to empty
+   m = stbi__get_marker(z);
+   if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG");
+   if (scan == STBI__SCAN_type) return 1;
+   m = stbi__get_marker(z);
+   while (!stbi__SOF(m)) {
+      if (!stbi__process_marker(z,m)) return 0;
+      m = stbi__get_marker(z);
+      while (m == STBI__MARKER_none) {
+         // some files have extra padding after their blocks, so ok, we'll scan
+         if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG");
+         m = stbi__get_marker(z);
+      }
+   }
+   z->progressive = stbi__SOF_progressive(m);
+   if (!stbi__process_frame_header(z, scan)) return 0;
+   return 1;
+}
+
+// decode image to YCbCr format
+static int stbi__decode_jpeg_image(stbi__jpeg *j)
+{
+   int m;
+   for (m = 0; m < 4; m++) {
+      j->img_comp[m].raw_data = NULL;
+      j->img_comp[m].raw_coeff = NULL;
+   }
+   j->restart_interval = 0;
+   if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0;
+   m = stbi__get_marker(j);
+   while (!stbi__EOI(m)) {
+      if (stbi__SOS(m)) {
+         if (!stbi__process_scan_header(j)) return 0;
+         if (!stbi__parse_entropy_coded_data(j)) return 0;
+         if (j->marker == STBI__MARKER_none ) {
+            // handle 0s at the end of image data from IP Kamera 9060
+            while (!stbi__at_eof(j->s)) {
+               int x = stbi__get8(j->s);
+               if (x == 255) {
+                  j->marker = stbi__get8(j->s);
+                  break;
+               } else if (x != 0) {
+                  return stbi__err("junk before marker", "Corrupt JPEG");
+               }
+            }
+            // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0
+         }
+      } else {
+         if (!stbi__process_marker(j, m)) return 0;
+      }
+      m = stbi__get_marker(j);
+   }
+   if (j->progressive)
+      stbi__jpeg_finish(j);
+   return 1;
+}
+
+// static jfif-centered resampling (across block boundaries)
+
+typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1,
+                                    int w, int hs);
+
+#define stbi__div4(x) ((stbi_uc) ((x) >> 2))
+
+static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   STBI_NOTUSED(out);
+   STBI_NOTUSED(in_far);
+   STBI_NOTUSED(w);
+   STBI_NOTUSED(hs);
+   return in_near;
+}
+
+static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate two samples vertically for every one in input
+   int i;
+   STBI_NOTUSED(hs);
+   for (i=0; i < w; ++i)
+      out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2);
+   return out;
+}
+
+static stbi_uc*  stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate two samples horizontally for every one in input
+   int i;
+   stbi_uc *input = in_near;
+
+   if (w == 1) {
+      // if only one sample, can't do any interpolation
+      out[0] = out[1] = input[0];
+      return out;
+   }
+
+   out[0] = input[0];
+   out[1] = stbi__div4(input[0]*3 + input[1] + 2);
+   for (i=1; i < w-1; ++i) {
+      int n = 3*input[i]+2;
+      out[i*2+0] = stbi__div4(n+input[i-1]);
+      out[i*2+1] = stbi__div4(n+input[i+1]);
+   }
+   out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2);
+   out[i*2+1] = input[w-1];
+
+   STBI_NOTUSED(in_far);
+   STBI_NOTUSED(hs);
+
+   return out;
+}
+
+#define stbi__div16(x) ((stbi_uc) ((x) >> 4))
+
+static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate 2x2 samples for every one in input
+   int i,t0,t1;
+   if (w == 1) {
+      out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2);
+      return out;
+   }
+
+   t1 = 3*in_near[0] + in_far[0];
+   out[0] = stbi__div4(t1+2);
+   for (i=1; i < w; ++i) {
+      t0 = t1;
+      t1 = 3*in_near[i]+in_far[i];
+      out[i*2-1] = stbi__div16(3*t0 + t1 + 8);
+      out[i*2  ] = stbi__div16(3*t1 + t0 + 8);
+   }
+   out[w*2-1] = stbi__div4(t1+2);
+
+   STBI_NOTUSED(hs);
+
+   return out;
+}
+
+#if defined(STBI_SSE2) || defined(STBI_NEON)
+static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate 2x2 samples for every one in input
+   int i=0,t0,t1;
+
+   if (w == 1) {
+      out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2);
+      return out;
+   }
+
+   t1 = 3*in_near[0] + in_far[0];
+   // process groups of 8 pixels for as long as we can.
+   // note we can't handle the last pixel in a row in this loop
+   // because we need to handle the filter boundary conditions.
+   for (; i < ((w-1) & ~7); i += 8) {
+#if defined(STBI_SSE2)
+      // load and perform the vertical filtering pass
+      // this uses 3*x + y = 4*x + (y - x)
+      __m128i zero  = _mm_setzero_si128();
+      __m128i farb  = _mm_loadl_epi64((__m128i *) (in_far + i));
+      __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i));
+      __m128i farw  = _mm_unpacklo_epi8(farb, zero);
+      __m128i nearw = _mm_unpacklo_epi8(nearb, zero);
+      __m128i diff  = _mm_sub_epi16(farw, nearw);
+      __m128i nears = _mm_slli_epi16(nearw, 2);
+      __m128i curr  = _mm_add_epi16(nears, diff); // current row
+
+      // horizontal filter works the same based on shifted vers of current
+      // row. "prev" is current row shifted right by 1 pixel; we need to
+      // insert the previous pixel value (from t1).
+      // "next" is current row shifted left by 1 pixel, with first pixel
+      // of next block of 8 pixels added in.
+      __m128i prv0 = _mm_slli_si128(curr, 2);
+      __m128i nxt0 = _mm_srli_si128(curr, 2);
+      __m128i prev = _mm_insert_epi16(prv0, t1, 0);
+      __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7);
+
+      // horizontal filter, polyphase implementation since it's convenient:
+      // even pixels = 3*cur + prev = cur*4 + (prev - cur)
+      // odd  pixels = 3*cur + next = cur*4 + (next - cur)
+      // note the shared term.
+      __m128i bias  = _mm_set1_epi16(8);
+      __m128i curs = _mm_slli_epi16(curr, 2);
+      __m128i prvd = _mm_sub_epi16(prev, curr);
+      __m128i nxtd = _mm_sub_epi16(next, curr);
+      __m128i curb = _mm_add_epi16(curs, bias);
+      __m128i even = _mm_add_epi16(prvd, curb);
+      __m128i odd  = _mm_add_epi16(nxtd, curb);
+
+      // interleave even and odd pixels, then undo scaling.
+      __m128i int0 = _mm_unpacklo_epi16(even, odd);
+      __m128i int1 = _mm_unpackhi_epi16(even, odd);
+      __m128i de0  = _mm_srli_epi16(int0, 4);
+      __m128i de1  = _mm_srli_epi16(int1, 4);
+
+      // pack and write output
+      __m128i outv = _mm_packus_epi16(de0, de1);
+      _mm_storeu_si128((__m128i *) (out + i*2), outv);
+#elif defined(STBI_NEON)
+      // load and perform the vertical filtering pass
+      // this uses 3*x + y = 4*x + (y - x)
+      uint8x8_t farb  = vld1_u8(in_far + i);
+      uint8x8_t nearb = vld1_u8(in_near + i);
+      int16x8_t diff  = vreinterpretq_s16_u16(vsubl_u8(farb, nearb));
+      int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2));
+      int16x8_t curr  = vaddq_s16(nears, diff); // current row
+
+      // horizontal filter works the same based on shifted vers of current
+      // row. "prev" is current row shifted right by 1 pixel; we need to
+      // insert the previous pixel value (from t1).
+      // "next" is current row shifted left by 1 pixel, with first pixel
+      // of next block of 8 pixels added in.
+      int16x8_t prv0 = vextq_s16(curr, curr, 7);
+      int16x8_t nxt0 = vextq_s16(curr, curr, 1);
+      int16x8_t prev = vsetq_lane_s16(t1, prv0, 0);
+      int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7);
+
+      // horizontal filter, polyphase implementation since it's convenient:
+      // even pixels = 3*cur + prev = cur*4 + (prev - cur)
+      // odd  pixels = 3*cur + next = cur*4 + (next - cur)
+      // note the shared term.
+      int16x8_t curs = vshlq_n_s16(curr, 2);
+      int16x8_t prvd = vsubq_s16(prev, curr);
+      int16x8_t nxtd = vsubq_s16(next, curr);
+      int16x8_t even = vaddq_s16(curs, prvd);
+      int16x8_t odd  = vaddq_s16(curs, nxtd);
+
+      // undo scaling and round, then store with even/odd phases interleaved
+      uint8x8x2_t o;
+      o.val[0] = vqrshrun_n_s16(even, 4);
+      o.val[1] = vqrshrun_n_s16(odd,  4);
+      vst2_u8(out + i*2, o);
+#endif
+
+      // "previous" value for next iter
+      t1 = 3*in_near[i+7] + in_far[i+7];
+   }
+
+   t0 = t1;
+   t1 = 3*in_near[i] + in_far[i];
+   out[i*2] = stbi__div16(3*t1 + t0 + 8);
+
+   for (++i; i < w; ++i) {
+      t0 = t1;
+      t1 = 3*in_near[i]+in_far[i];
+      out[i*2-1] = stbi__div16(3*t0 + t1 + 8);
+      out[i*2  ] = stbi__div16(3*t1 + t0 + 8);
+   }
+   out[w*2-1] = stbi__div4(t1+2);
+
+   STBI_NOTUSED(hs);
+
+   return out;
+}
+#endif
+
+static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // resample with nearest-neighbor
+   int i,j;
+   STBI_NOTUSED(in_far);
+   for (i=0; i < w; ++i)
+      for (j=0; j < hs; ++j)
+         out[i*hs+j] = in_near[i];
+   return out;
+}
+
+#ifdef STBI_JPEG_OLD
+// this is the same YCbCr-to-RGB calculation that stb_image has used
+// historically before the algorithm changes in 1.49
+#define float2fixed(x)  ((int) ((x) * 65536 + 0.5))
+static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step)
+{
+   int i;
+   for (i=0; i < count; ++i) {
+      int y_fixed = (y[i] << 16) + 32768; // rounding
+      int r,g,b;
+      int cr = pcr[i] - 128;
+      int cb = pcb[i] - 128;
+      r = y_fixed + cr*float2fixed(1.40200f);
+      g = y_fixed - cr*float2fixed(0.71414f) - cb*float2fixed(0.34414f);
+      b = y_fixed                            + cb*float2fixed(1.77200f);
+      r >>= 16;
+      g >>= 16;
+      b >>= 16;
+      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
+      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
+      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
+      out[0] = (stbi_uc)r;
+      out[1] = (stbi_uc)g;
+      out[2] = (stbi_uc)b;
+      out[3] = 255;
+      out += step;
+   }
+}
+#else
+// this is a reduced-precision calculation of YCbCr-to-RGB introduced
+// to make sure the code produces the same results in both SIMD and scalar
+#define float2fixed(x)  (((int) ((x) * 4096.0f + 0.5f)) << 8)
+static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step)
+{
+   int i;
+   for (i=0; i < count; ++i) {
+      int y_fixed = (y[i] << 20) + (1<<19); // rounding
+      int r,g,b;
+      int cr = pcr[i] - 128;
+      int cb = pcb[i] - 128;
+      r = y_fixed +  cr* float2fixed(1.40200f);
+      g = y_fixed + (cr*-float2fixed(0.71414f)) + ((cb*-float2fixed(0.34414f)) & 0xffff0000);
+      b = y_fixed                               +   cb* float2fixed(1.77200f);
+      r >>= 20;
+      g >>= 20;
+      b >>= 20;
+      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
+      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
+      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
+      out[0] = (stbi_uc)r;
+      out[1] = (stbi_uc)g;
+      out[2] = (stbi_uc)b;
+      out[3] = 255;
+      out += step;
+   }
+}
+#endif
+
+#if defined(STBI_SSE2) || defined(STBI_NEON)
+static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step)
+{
+   int i = 0;
+
+#ifdef STBI_SSE2
+   // step == 3 is pretty ugly on the final interleave, and i'm not convinced
+   // it's useful in practice (you wouldn't use it for textures, for example).
+   // so just accelerate step == 4 case.
+   if (step == 4) {
+      // this is a fairly straightforward implementation and not super-optimized.
+      __m128i signflip  = _mm_set1_epi8(-0x80);
+      __m128i cr_const0 = _mm_set1_epi16(   (short) ( 1.40200f*4096.0f+0.5f));
+      __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f));
+      __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f));
+      __m128i cb_const1 = _mm_set1_epi16(   (short) ( 1.77200f*4096.0f+0.5f));
+      __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128);
+      __m128i xw = _mm_set1_epi16(255); // alpha channel
+
+      for (; i+7 < count; i += 8) {
+         // load
+         __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i));
+         __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i));
+         __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i));
+         __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128
+         __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128
+
+         // unpack to short (and left-shift cr, cb by 8)
+         __m128i yw  = _mm_unpacklo_epi8(y_bias, y_bytes);
+         __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased);
+         __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased);
+
+         // color transform
+         __m128i yws = _mm_srli_epi16(yw, 4);
+         __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw);
+         __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw);
+         __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1);
+         __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1);
+         __m128i rws = _mm_add_epi16(cr0, yws);
+         __m128i gwt = _mm_add_epi16(cb0, yws);
+         __m128i bws = _mm_add_epi16(yws, cb1);
+         __m128i gws = _mm_add_epi16(gwt, cr1);
+
+         // descale
+         __m128i rw = _mm_srai_epi16(rws, 4);
+         __m128i bw = _mm_srai_epi16(bws, 4);
+         __m128i gw = _mm_srai_epi16(gws, 4);
+
+         // back to byte, set up for transpose
+         __m128i brb = _mm_packus_epi16(rw, bw);
+         __m128i gxb = _mm_packus_epi16(gw, xw);
+
+         // transpose to interleave channels
+         __m128i t0 = _mm_unpacklo_epi8(brb, gxb);
+         __m128i t1 = _mm_unpackhi_epi8(brb, gxb);
+         __m128i o0 = _mm_unpacklo_epi16(t0, t1);
+         __m128i o1 = _mm_unpackhi_epi16(t0, t1);
+
+         // store
+         _mm_storeu_si128((__m128i *) (out + 0), o0);
+         _mm_storeu_si128((__m128i *) (out + 16), o1);
+         out += 32;
+      }
+   }
+#endif
+
+#ifdef STBI_NEON
+   // in this version, step=3 support would be easy to add. but is there demand?
+   if (step == 4) {
+      // this is a fairly straightforward implementation and not super-optimized.
+      uint8x8_t signflip = vdup_n_u8(0x80);
+      int16x8_t cr_const0 = vdupq_n_s16(   (short) ( 1.40200f*4096.0f+0.5f));
+      int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f));
+      int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f));
+      int16x8_t cb_const1 = vdupq_n_s16(   (short) ( 1.77200f*4096.0f+0.5f));
+
+      for (; i+7 < count; i += 8) {
+         // load
+         uint8x8_t y_bytes  = vld1_u8(y + i);
+         uint8x8_t cr_bytes = vld1_u8(pcr + i);
+         uint8x8_t cb_bytes = vld1_u8(pcb + i);
+         int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip));
+         int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip));
+
+         // expand to s16
+         int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4));
+         int16x8_t crw = vshll_n_s8(cr_biased, 7);
+         int16x8_t cbw = vshll_n_s8(cb_biased, 7);
+
+         // color transform
+         int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0);
+         int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0);
+         int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1);
+         int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1);
+         int16x8_t rws = vaddq_s16(yws, cr0);
+         int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1);
+         int16x8_t bws = vaddq_s16(yws, cb1);
+
+         // undo scaling, round, convert to byte
+         uint8x8x4_t o;
+         o.val[0] = vqrshrun_n_s16(rws, 4);
+         o.val[1] = vqrshrun_n_s16(gws, 4);
+         o.val[2] = vqrshrun_n_s16(bws, 4);
+         o.val[3] = vdup_n_u8(255);
+
+         // store, interleaving r/g/b/a
+         vst4_u8(out, o);
+         out += 8*4;
+      }
+   }
+#endif
+
+   for (; i < count; ++i) {
+      int y_fixed = (y[i] << 20) + (1<<19); // rounding
+      int r,g,b;
+      int cr = pcr[i] - 128;
+      int cb = pcb[i] - 128;
+      r = y_fixed + cr* float2fixed(1.40200f);
+      g = y_fixed + cr*-float2fixed(0.71414f) + ((cb*-float2fixed(0.34414f)) & 0xffff0000);
+      b = y_fixed                             +   cb* float2fixed(1.77200f);
+      r >>= 20;
+      g >>= 20;
+      b >>= 20;
+      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
+      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
+      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
+      out[0] = (stbi_uc)r;
+      out[1] = (stbi_uc)g;
+      out[2] = (stbi_uc)b;
+      out[3] = 255;
+      out += step;
+   }
+}
+#endif
+
+// set up the kernels
+static void stbi__setup_jpeg(stbi__jpeg *j)
+{
+   j->idct_block_kernel = stbi__idct_block;
+   j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row;
+   j->resample_row_hv_2_kernel = stbi__resample_row_hv_2;
+
+#ifdef STBI_SSE2
+   if (stbi__sse2_available()) {
+      j->idct_block_kernel = stbi__idct_simd;
+      #ifndef STBI_JPEG_OLD
+      j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
+      #endif
+      j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
+   }
+#endif
+
+#ifdef STBI_NEON
+   j->idct_block_kernel = stbi__idct_simd;
+   #ifndef STBI_JPEG_OLD
+   j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
+   #endif
+   j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
+#endif
+}
+
+// clean up the temporary component buffers
+static void stbi__cleanup_jpeg(stbi__jpeg *j)
+{
+   int i;
+   for (i=0; i < j->s->img_n; ++i) {
+      if (j->img_comp[i].raw_data) {
+         STBI_FREE(j->img_comp[i].raw_data);
+         j->img_comp[i].raw_data = NULL;
+         j->img_comp[i].data = NULL;
+      }
+      if (j->img_comp[i].raw_coeff) {
+         STBI_FREE(j->img_comp[i].raw_coeff);
+         j->img_comp[i].raw_coeff = 0;
+         j->img_comp[i].coeff = 0;
+      }
+      if (j->img_comp[i].linebuf) {
+         STBI_FREE(j->img_comp[i].linebuf);
+         j->img_comp[i].linebuf = NULL;
+      }
+   }
+}
+
+typedef struct
+{
+   resample_row_func resample;
+   stbi_uc *line0,*line1;
+   int hs,vs;   // expansion factor in each axis
+   int w_lores; // horizontal pixels pre-expansion
+   int ystep;   // how far through vertical expansion we are
+   int ypos;    // which pre-expansion row we're on
+} stbi__resample;
+
+static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp)
+{
+   int n, decode_n;
+   z->s->img_n = 0; // make stbi__cleanup_jpeg safe
+
+   // validate req_comp
+   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
+
+   // load a jpeg image from whichever source, but leave in YCbCr format
+   if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; }
+
+   // determine actual number of components to generate
+   n = req_comp ? req_comp : z->s->img_n;
+
+   if (z->s->img_n == 3 && n < 3)
+      decode_n = 1;
+   else
+      decode_n = z->s->img_n;
+
+   // resample and color-convert
+   {
+      int k;
+      unsigned int i,j;
+      stbi_uc *output;
+      stbi_uc *coutput[4];
+
+      stbi__resample res_comp[4];
+
+      for (k=0; k < decode_n; ++k) {
+         stbi__resample *r = &res_comp[k];
+
+         // allocate line buffer big enough for upsampling off the edges
+         // with upsample factor of 4
+         z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3);
+         if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
+
+         r->hs      = z->img_h_max / z->img_comp[k].h;
+         r->vs      = z->img_v_max / z->img_comp[k].v;
+         r->ystep   = r->vs >> 1;
+         r->w_lores = (z->s->img_x + r->hs-1) / r->hs;
+         r->ypos    = 0;
+         r->line0   = r->line1 = z->img_comp[k].data;
+
+         if      (r->hs == 1 && r->vs == 1) r->resample = resample_row_1;
+         else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2;
+         else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2;
+         else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel;
+         else                               r->resample = stbi__resample_row_generic;
+      }
+
+      // can't error after this so, this is safe
+      output = (stbi_uc *) stbi__malloc(n * z->s->img_x * z->s->img_y + 1);
+      if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
+
+      // now go ahead and resample
+      for (j=0; j < z->s->img_y; ++j) {
+         stbi_uc *out = output + n * z->s->img_x * j;
+         for (k=0; k < decode_n; ++k) {
+            stbi__resample *r = &res_comp[k];
+            int y_bot = r->ystep >= (r->vs >> 1);
+            coutput[k] = r->resample(z->img_comp[k].linebuf,
+                                     y_bot ? r->line1 : r->line0,
+                                     y_bot ? r->line0 : r->line1,
+                                     r->w_lores, r->hs);
+            if (++r->ystep >= r->vs) {
+               r->ystep = 0;
+               r->line0 = r->line1;
+               if (++r->ypos < z->img_comp[k].y)
+                  r->line1 += z->img_comp[k].w2;
+            }
+         }
+         if (n >= 3) {
+            stbi_uc *y = coutput[0];
+            if (z->s->img_n == 3) {
+               z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+            } else
+               for (i=0; i < z->s->img_x; ++i) {
+                  out[0] = out[1] = out[2] = y[i];
+                  out[3] = 255; // not used if n==3
+                  out += n;
+               }
+         } else {
+            stbi_uc *y = coutput[0];
+            if (n == 1)
+               for (i=0; i < z->s->img_x; ++i) out[i] = y[i];
+            else
+               for (i=0; i < z->s->img_x; ++i) *out++ = y[i], *out++ = 255;
+         }
+      }
+      stbi__cleanup_jpeg(z);
+      *out_x = z->s->img_x;
+      *out_y = z->s->img_y;
+      if (comp) *comp  = z->s->img_n; // report original components, not output
+      return output;
+   }
+}
+
+static unsigned char *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__jpeg j;
+   j.s = s;
+   stbi__setup_jpeg(&j);
+   return load_jpeg_image(&j, x,y,comp,req_comp);
+}
+
+static int stbi__jpeg_test(stbi__context *s)
+{
+   int r;
+   stbi__jpeg j;
+   j.s = s;
+   stbi__setup_jpeg(&j);
+   r = stbi__decode_jpeg_header(&j, STBI__SCAN_type);
+   stbi__rewind(s);
+   return r;
+}
+
+static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp)
+{
+   if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) {
+      stbi__rewind( j->s );
+      return 0;
+   }
+   if (x) *x = j->s->img_x;
+   if (y) *y = j->s->img_y;
+   if (comp) *comp = j->s->img_n;
+   return 1;
+}
+
+static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   stbi__jpeg j;
+   j.s = s;
+   return stbi__jpeg_info_raw(&j, x, y, comp);
+}
+#endif
+
+// public domain zlib decode    v0.2  Sean Barrett 2006-11-18
+//    simple implementation
+//      - all input must be provided in an upfront buffer
+//      - all output is written to a single output buffer (can malloc/realloc)
+//    performance
+//      - fast huffman
+
+#ifndef STBI_NO_ZLIB
+
+// fast-way is faster to check than jpeg huffman, but slow way is slower
+#define STBI__ZFAST_BITS  9 // accelerate all cases in default tables
+#define STBI__ZFAST_MASK  ((1 << STBI__ZFAST_BITS) - 1)
+
+// zlib-style huffman encoding
+// (jpegs packs from left, zlib from right, so can't share code)
+typedef struct
+{
+   stbi__uint16 fast[1 << STBI__ZFAST_BITS];
+   stbi__uint16 firstcode[16];
+   int maxcode[17];
+   stbi__uint16 firstsymbol[16];
+   stbi_uc  size[288];
+   stbi__uint16 value[288];
+} stbi__zhuffman;
+
+stbi_inline static int stbi__bitreverse16(int n)
+{
+  n = ((n & 0xAAAA) >>  1) | ((n & 0x5555) << 1);
+  n = ((n & 0xCCCC) >>  2) | ((n & 0x3333) << 2);
+  n = ((n & 0xF0F0) >>  4) | ((n & 0x0F0F) << 4);
+  n = ((n & 0xFF00) >>  8) | ((n & 0x00FF) << 8);
+  return n;
+}
+
+stbi_inline static int stbi__bit_reverse(int v, int bits)
+{
+   STBI_ASSERT(bits <= 16);
+   // to bit reverse n bits, reverse 16 and shift
+   // e.g. 11 bits, bit reverse and shift away 5
+   return stbi__bitreverse16(v) >> (16-bits);
+}
+
+static int stbi__zbuild_huffman(stbi__zhuffman *z, stbi_uc *sizelist, int num)
+{
+   int i,k=0;
+   int code, next_code[16], sizes[17];
+
+   // DEFLATE spec for generating codes
+   memset(sizes, 0, sizeof(sizes));
+   memset(z->fast, 0, sizeof(z->fast));
+   for (i=0; i < num; ++i)
+      ++sizes[sizelist[i]];
+   sizes[0] = 0;
+   for (i=1; i < 16; ++i)
+      if (sizes[i] > (1 << i))
+         return stbi__err("bad sizes", "Corrupt PNG");
+   code = 0;
+   for (i=1; i < 16; ++i) {
+      next_code[i] = code;
+      z->firstcode[i] = (stbi__uint16) code;
+      z->firstsymbol[i] = (stbi__uint16) k;
+      code = (code + sizes[i]);
+      if (sizes[i])
+         if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG");
+      z->maxcode[i] = code << (16-i); // preshift for inner loop
+      code <<= 1;
+      k += sizes[i];
+   }
+   z->maxcode[16] = 0x10000; // sentinel
+   for (i=0; i < num; ++i) {
+      int s = sizelist[i];
+      if (s) {
+         int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s];
+         stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i);
+         z->size [c] = (stbi_uc     ) s;
+         z->value[c] = (stbi__uint16) i;
+         if (s <= STBI__ZFAST_BITS) {
+            int j = stbi__bit_reverse(next_code[s],s);
+            while (j < (1 << STBI__ZFAST_BITS)) {
+               z->fast[j] = fastv;
+               j += (1 << s);
+            }
+         }
+         ++next_code[s];
+      }
+   }
+   return 1;
+}
+
+// zlib-from-memory implementation for PNG reading
+//    because PNG allows splitting the zlib stream arbitrarily,
+//    and it's annoying structurally to have PNG call ZLIB call PNG,
+//    we require PNG read all the IDATs and combine them into a single
+//    memory buffer
+
+typedef struct
+{
+   stbi_uc *zbuffer, *zbuffer_end;
+   int num_bits;
+   stbi__uint32 code_buffer;
+
+   char *zout;
+   char *zout_start;
+   char *zout_end;
+   int   z_expandable;
+
+   stbi__zhuffman z_length, z_distance;
+} stbi__zbuf;
+
+stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z)
+{
+   if (z->zbuffer >= z->zbuffer_end) return 0;
+   return *z->zbuffer++;
+}
+
+static void stbi__fill_bits(stbi__zbuf *z)
+{
+   do {
+      STBI_ASSERT(z->code_buffer < (1U << z->num_bits));
+      z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits;
+      z->num_bits += 8;
+   } while (z->num_bits <= 24);
+}
+
+stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n)
+{
+   unsigned int k;
+   if (z->num_bits < n) stbi__fill_bits(z);
+   k = z->code_buffer & ((1 << n) - 1);
+   z->code_buffer >>= n;
+   z->num_bits -= n;
+   return k;
+}
+
+static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
+{
+   int b,s,k;
+   // not resolved by fast table, so compute it the slow way
+   // use jpeg approach, which requires MSbits at top
+   k = stbi__bit_reverse(a->code_buffer, 16);
+   for (s=STBI__ZFAST_BITS+1; ; ++s)
+      if (k < z->maxcode[s])
+         break;
+   if (s == 16) return -1; // invalid code!
+   // code size is s, so:
+   b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
+   STBI_ASSERT(z->size[b] == s);
+   a->code_buffer >>= s;
+   a->num_bits -= s;
+   return z->value[b];
+}
+
+stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
+{
+   int b,s;
+   if (a->num_bits < 16) stbi__fill_bits(a);
+   b = z->fast[a->code_buffer & STBI__ZFAST_MASK];
+   if (b) {
+      s = b >> 9;
+      a->code_buffer >>= s;
+      a->num_bits -= s;
+      return b & 511;
+   }
+   return stbi__zhuffman_decode_slowpath(a, z);
+}
+
+static int stbi__zexpand(stbi__zbuf *z, char *zout, int n)  // need to make room for n bytes
+{
+   char *q;
+   int cur, limit;
+   z->zout = zout;
+   if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG");
+   cur   = (int) (z->zout     - z->zout_start);
+   limit = (int) (z->zout_end - z->zout_start);
+   while (cur + n > limit)
+      limit *= 2;
+   q = (char *) STBI_REALLOC(z->zout_start, limit);
+   if (q == NULL) return stbi__err("outofmem", "Out of memory");
+   z->zout_start = q;
+   z->zout       = q + cur;
+   z->zout_end   = q + limit;
+   return 1;
+}
+
+static int stbi__zlength_base[31] = {
+   3,4,5,6,7,8,9,10,11,13,
+   15,17,19,23,27,31,35,43,51,59,
+   67,83,99,115,131,163,195,227,258,0,0 };
+
+static int stbi__zlength_extra[31]=
+{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 };
+
+static int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,
+257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0};
+
+static int stbi__zdist_extra[32] =
+{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+static int stbi__parse_huffman_block(stbi__zbuf *a)
+{
+   char *zout = a->zout;
+   for(;;) {
+      int z = stbi__zhuffman_decode(a, &a->z_length);
+      if (z < 256) {
+         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes
+         if (zout >= a->zout_end) {
+            if (!stbi__zexpand(a, zout, 1)) return 0;
+            zout = a->zout;
+         }
+         *zout++ = (char) z;
+      } else {
+         stbi_uc *p;
+         int len,dist;
+         if (z == 256) {
+            a->zout = zout;
+            return 1;
+         }
+         z -= 257;
+         len = stbi__zlength_base[z];
+         if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]);
+         z = stbi__zhuffman_decode(a, &a->z_distance);
+         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG");
+         dist = stbi__zdist_base[z];
+         if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]);
+         if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG");
+         if (zout + len > a->zout_end) {
+            if (!stbi__zexpand(a, zout, len)) return 0;
+            zout = a->zout;
+         }
+         p = (stbi_uc *) (zout - dist);
+         if (dist == 1) { // run of one byte; common in images.
+            stbi_uc v = *p;
+            if (len) { do *zout++ = v; while (--len); }
+         } else {
+            if (len) { do *zout++ = *p++; while (--len); }
+         }
+      }
+   }
+}
+
+static int stbi__compute_huffman_codes(stbi__zbuf *a)
+{
+   static stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
+   stbi__zhuffman z_codelength;
+   stbi_uc lencodes[286+32+137];//padding for maximum single op
+   stbi_uc codelength_sizes[19];
+   int i,n;
+
+   int hlit  = stbi__zreceive(a,5) + 257;
+   int hdist = stbi__zreceive(a,5) + 1;
+   int hclen = stbi__zreceive(a,4) + 4;
+
+   memset(codelength_sizes, 0, sizeof(codelength_sizes));
+   for (i=0; i < hclen; ++i) {
+      int s = stbi__zreceive(a,3);
+      codelength_sizes[length_dezigzag[i]] = (stbi_uc) s;
+   }
+   if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0;
+
+   n = 0;
+   while (n < hlit + hdist) {
+      int c = stbi__zhuffman_decode(a, &z_codelength);
+      if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG");
+      if (c < 16)
+         lencodes[n++] = (stbi_uc) c;
+      else if (c == 16) {
+         c = stbi__zreceive(a,2)+3;
+         memset(lencodes+n, lencodes[n-1], c);
+         n += c;
+      } else if (c == 17) {
+         c = stbi__zreceive(a,3)+3;
+         memset(lencodes+n, 0, c);
+         n += c;
+      } else {
+         STBI_ASSERT(c == 18);
+         c = stbi__zreceive(a,7)+11;
+         memset(lencodes+n, 0, c);
+         n += c;
+      }
+   }
+   if (n != hlit+hdist) return stbi__err("bad codelengths","Corrupt PNG");
+   if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0;
+   if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0;
+   return 1;
+}
+
+static int stbi__parse_uncomperssed_block(stbi__zbuf *a)
+{
+   stbi_uc header[4];
+   int len,nlen,k;
+   if (a->num_bits & 7)
+      stbi__zreceive(a, a->num_bits & 7); // discard
+   // drain the bit-packed data into header
+   k = 0;
+   while (a->num_bits > 0) {
+      header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check
+      a->code_buffer >>= 8;
+      a->num_bits -= 8;
+   }
+   STBI_ASSERT(a->num_bits == 0);
+   // now fill header the normal way
+   while (k < 4)
+      header[k++] = stbi__zget8(a);
+   len  = header[1] * 256 + header[0];
+   nlen = header[3] * 256 + header[2];
+   if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG");
+   if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG");
+   if (a->zout + len > a->zout_end)
+      if (!stbi__zexpand(a, a->zout, len)) return 0;
+   memcpy(a->zout, a->zbuffer, len);
+   a->zbuffer += len;
+   a->zout += len;
+   return 1;
+}
+
+static int stbi__parse_zlib_header(stbi__zbuf *a)
+{
+   int cmf   = stbi__zget8(a);
+   int cm    = cmf & 15;
+   /* int cinfo = cmf >> 4; */
+   int flg   = stbi__zget8(a);
+   if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec
+   if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png
+   if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png
+   // window = 1 << (8 + cinfo)... but who cares, we fully buffer output
+   return 1;
+}
+
+// @TODO: should statically initialize these for optimal thread safety
+static stbi_uc stbi__zdefault_length[288], stbi__zdefault_distance[32];
+static void stbi__init_zdefaults(void)
+{
+   int i;   // use <= to match clearly with spec
+   for (i=0; i <= 143; ++i)     stbi__zdefault_length[i]   = 8;
+   for (   ; i <= 255; ++i)     stbi__zdefault_length[i]   = 9;
+   for (   ; i <= 279; ++i)     stbi__zdefault_length[i]   = 7;
+   for (   ; i <= 287; ++i)     stbi__zdefault_length[i]   = 8;
+
+   for (i=0; i <=  31; ++i)     stbi__zdefault_distance[i] = 5;
+}
+
+static int stbi__parse_zlib(stbi__zbuf *a, int parse_header)
+{
+   int final, type;
+   if (parse_header)
+      if (!stbi__parse_zlib_header(a)) return 0;
+   a->num_bits = 0;
+   a->code_buffer = 0;
+   do {
+      final = stbi__zreceive(a,1);
+      type = stbi__zreceive(a,2);
+      if (type == 0) {
+         if (!stbi__parse_uncomperssed_block(a)) return 0;
+      } else if (type == 3) {
+         return 0;
+      } else {
+         if (type == 1) {
+            // use fixed code lengths
+            if (!stbi__zdefault_distance[31]) stbi__init_zdefaults();
+            if (!stbi__zbuild_huffman(&a->z_length  , stbi__zdefault_length  , 288)) return 0;
+            if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance,  32)) return 0;
+         } else {
+            if (!stbi__compute_huffman_codes(a)) return 0;
+         }
+         if (!stbi__parse_huffman_block(a)) return 0;
+      }
+   } while (!final);
+   return 1;
+}
+
+static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header)
+{
+   a->zout_start = obuf;
+   a->zout       = obuf;
+   a->zout_end   = obuf + olen;
+   a->z_expandable = exp;
+
+   return stbi__parse_zlib(a, parse_header);
+}
+
+STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen)
+{
+   stbi__zbuf a;
+   char *p = (char *) stbi__malloc(initial_size);
+   if (p == NULL) return NULL;
+   a.zbuffer = (stbi_uc *) buffer;
+   a.zbuffer_end = (stbi_uc *) buffer + len;
+   if (stbi__do_zlib(&a, p, initial_size, 1, 1)) {
+      if (outlen) *outlen = (int) (a.zout - a.zout_start);
+      return a.zout_start;
+   } else {
+      STBI_FREE(a.zout_start);
+      return NULL;
+   }
+}
+
+STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen)
+{
+   return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen);
+}
+
+STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header)
+{
+   stbi__zbuf a;
+   char *p = (char *) stbi__malloc(initial_size);
+   if (p == NULL) return NULL;
+   a.zbuffer = (stbi_uc *) buffer;
+   a.zbuffer_end = (stbi_uc *) buffer + len;
+   if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) {
+      if (outlen) *outlen = (int) (a.zout - a.zout_start);
+      return a.zout_start;
+   } else {
+      STBI_FREE(a.zout_start);
+      return NULL;
+   }
+}
+
+STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen)
+{
+   stbi__zbuf a;
+   a.zbuffer = (stbi_uc *) ibuffer;
+   a.zbuffer_end = (stbi_uc *) ibuffer + ilen;
+   if (stbi__do_zlib(&a, obuffer, olen, 0, 1))
+      return (int) (a.zout - a.zout_start);
+   else
+      return -1;
+}
+
+STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen)
+{
+   stbi__zbuf a;
+   char *p = (char *) stbi__malloc(16384);
+   if (p == NULL) return NULL;
+   a.zbuffer = (stbi_uc *) buffer;
+   a.zbuffer_end = (stbi_uc *) buffer+len;
+   if (stbi__do_zlib(&a, p, 16384, 1, 0)) {
+      if (outlen) *outlen = (int) (a.zout - a.zout_start);
+      return a.zout_start;
+   } else {
+      STBI_FREE(a.zout_start);
+      return NULL;
+   }
+}
+
+STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen)
+{
+   stbi__zbuf a;
+   a.zbuffer = (stbi_uc *) ibuffer;
+   a.zbuffer_end = (stbi_uc *) ibuffer + ilen;
+   if (stbi__do_zlib(&a, obuffer, olen, 0, 0))
+      return (int) (a.zout - a.zout_start);
+   else
+      return -1;
+}
+#endif
+
+// public domain "baseline" PNG decoder   v0.10  Sean Barrett 2006-11-18
+//    simple implementation
+//      - only 8-bit samples
+//      - no CRC checking
+//      - allocates lots of intermediate memory
+//        - avoids problem of streaming data between subsystems
+//        - avoids explicit window management
+//    performance
+//      - uses stb_zlib, a PD zlib implementation with fast huffman decoding
+
+#ifndef STBI_NO_PNG
+typedef struct
+{
+   stbi__uint32 length;
+   stbi__uint32 type;
+} stbi__pngchunk;
+
+static stbi__pngchunk stbi__get_chunk_header(stbi__context *s)
+{
+   stbi__pngchunk c;
+   c.length = stbi__get32be(s);
+   c.type   = stbi__get32be(s);
+   return c;
+}
+
+static int stbi__check_png_header(stbi__context *s)
+{
+   static stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 };
+   int i;
+   for (i=0; i < 8; ++i)
+      if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG");
+   return 1;
+}
+
+typedef struct
+{
+   stbi__context *s;
+   stbi_uc *idata, *expanded, *out;
+} stbi__png;
+
+
+enum {
+   STBI__F_none=0,
+   STBI__F_sub=1,
+   STBI__F_up=2,
+   STBI__F_avg=3,
+   STBI__F_paeth=4,
+   // synthetic filters used for first scanline to avoid needing a dummy row of 0s
+   STBI__F_avg_first,
+   STBI__F_paeth_first
+};
+
+static stbi_uc first_row_filter[5] =
+{
+   STBI__F_none,
+   STBI__F_sub,
+   STBI__F_none,
+   STBI__F_avg_first,
+   STBI__F_paeth_first
+};
+
+static int stbi__paeth(int a, int b, int c)
+{
+   int p = a + b - c;
+   int pa = abs(p-a);
+   int pb = abs(p-b);
+   int pc = abs(p-c);
+   if (pa <= pb && pa <= pc) return a;
+   if (pb <= pc) return b;
+   return c;
+}
+
+static stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 };
+
+// create the png data from post-deflated data
+static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color)
+{
+   stbi__context *s = a->s;
+   stbi__uint32 i,j,stride = x*out_n;
+   stbi__uint32 img_len, img_width_bytes;
+   int k;
+   int img_n = s->img_n; // copy it into a local for later
+
+   STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1);
+   a->out = (stbi_uc *) stbi__malloc(x * y * out_n); // extra bytes to write off the end into
+   if (!a->out) return stbi__err("outofmem", "Out of memory");
+
+   img_width_bytes = (((img_n * x * depth) + 7) >> 3);
+   img_len = (img_width_bytes + 1) * y;
+   if (s->img_x == x && s->img_y == y) {
+      if (raw_len != img_len) return stbi__err("not enough pixels","Corrupt PNG");
+   } else { // interlaced:
+      if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG");
+   }
+
+   for (j=0; j < y; ++j) {
+      stbi_uc *cur = a->out + stride*j;
+      stbi_uc *prior = cur - stride;
+      int filter = *raw++;
+      int filter_bytes = img_n;
+      int width = x;
+      if (filter > 4)
+         return stbi__err("invalid filter","Corrupt PNG");
+
+      if (depth < 8) {
+         STBI_ASSERT(img_width_bytes <= x);
+         cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place
+         filter_bytes = 1;
+         width = img_width_bytes;
+      }
+
+      // if first row, use special filter that doesn't sample previous row
+      if (j == 0) filter = first_row_filter[filter];
+
+      // handle first byte explicitly
+      for (k=0; k < filter_bytes; ++k) {
+         switch (filter) {
+            case STBI__F_none       : cur[k] = raw[k]; break;
+            case STBI__F_sub        : cur[k] = raw[k]; break;
+            case STBI__F_up         : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
+            case STBI__F_avg        : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break;
+            case STBI__F_paeth      : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break;
+            case STBI__F_avg_first  : cur[k] = raw[k]; break;
+            case STBI__F_paeth_first: cur[k] = raw[k]; break;
+         }
+      }
+
+      if (depth == 8) {
+         if (img_n != out_n)
+            cur[img_n] = 255; // first pixel
+         raw += img_n;
+         cur += out_n;
+         prior += out_n;
+      } else {
+         raw += 1;
+         cur += 1;
+         prior += 1;
+      }
+
+      // this is a little gross, so that we don't switch per-pixel or per-component
+      if (depth < 8 || img_n == out_n) {
+         int nk = (width - 1)*img_n;
+         #define CASE(f) \
+             case f:     \
+                for (k=0; k < nk; ++k)
+         switch (filter) {
+            // "none" filter turns into a memcpy here; make that explicit.
+            case STBI__F_none:         memcpy(cur, raw, nk); break;
+            CASE(STBI__F_sub)          cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); break;
+            CASE(STBI__F_up)           cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
+            CASE(STBI__F_avg)          cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); break;
+            CASE(STBI__F_paeth)        cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); break;
+            CASE(STBI__F_avg_first)    cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); break;
+            CASE(STBI__F_paeth_first)  cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); break;
+         }
+         #undef CASE
+         raw += nk;
+      } else {
+         STBI_ASSERT(img_n+1 == out_n);
+         #define CASE(f) \
+             case f:     \
+                for (i=x-1; i >= 1; --i, cur[img_n]=255,raw+=img_n,cur+=out_n,prior+=out_n) \
+                   for (k=0; k < img_n; ++k)
+         switch (filter) {
+            CASE(STBI__F_none)         cur[k] = raw[k]; break;
+            CASE(STBI__F_sub)          cur[k] = STBI__BYTECAST(raw[k] + cur[k-out_n]); break;
+            CASE(STBI__F_up)           cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
+            CASE(STBI__F_avg)          cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-out_n])>>1)); break;
+            CASE(STBI__F_paeth)        cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-out_n],prior[k],prior[k-out_n])); break;
+            CASE(STBI__F_avg_first)    cur[k] = STBI__BYTECAST(raw[k] + (cur[k-out_n] >> 1)); break;
+            CASE(STBI__F_paeth_first)  cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-out_n],0,0)); break;
+         }
+         #undef CASE
+      }
+   }
+
+   // we make a separate pass to expand bits to pixels; for performance,
+   // this could run two scanlines behind the above code, so it won't
+   // intefere with filtering but will still be in the cache.
+   if (depth < 8) {
+      for (j=0; j < y; ++j) {
+         stbi_uc *cur = a->out + stride*j;
+         stbi_uc *in  = a->out + stride*j + x*out_n - img_width_bytes;
+         // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit
+         // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop
+         stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range
+
+         // note that the final byte might overshoot and write more data than desired.
+         // we can allocate enough data that this never writes out of memory, but it
+         // could also overwrite the next scanline. can it overwrite non-empty data
+         // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel.
+         // so we need to explicitly clamp the final ones
+
+         if (depth == 4) {
+            for (k=x*img_n; k >= 2; k-=2, ++in) {
+               *cur++ = scale * ((*in >> 4)       );
+               *cur++ = scale * ((*in     ) & 0x0f);
+            }
+            if (k > 0) *cur++ = scale * ((*in >> 4)       );
+         } else if (depth == 2) {
+            for (k=x*img_n; k >= 4; k-=4, ++in) {
+               *cur++ = scale * ((*in >> 6)       );
+               *cur++ = scale * ((*in >> 4) & 0x03);
+               *cur++ = scale * ((*in >> 2) & 0x03);
+               *cur++ = scale * ((*in     ) & 0x03);
+            }
+            if (k > 0) *cur++ = scale * ((*in >> 6)       );
+            if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03);
+            if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03);
+         } else if (depth == 1) {
+            for (k=x*img_n; k >= 8; k-=8, ++in) {
+               *cur++ = scale * ((*in >> 7)       );
+               *cur++ = scale * ((*in >> 6) & 0x01);
+               *cur++ = scale * ((*in >> 5) & 0x01);
+               *cur++ = scale * ((*in >> 4) & 0x01);
+               *cur++ = scale * ((*in >> 3) & 0x01);
+               *cur++ = scale * ((*in >> 2) & 0x01);
+               *cur++ = scale * ((*in >> 1) & 0x01);
+               *cur++ = scale * ((*in     ) & 0x01);
+            }
+            if (k > 0) *cur++ = scale * ((*in >> 7)       );
+            if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01);
+            if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01);
+            if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01);
+            if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01);
+            if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01);
+            if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01);
+         }
+         if (img_n != out_n) {
+            int q;
+            // insert alpha = 255
+            cur = a->out + stride*j;
+            if (img_n == 1) {
+               for (q=x-1; q >= 0; --q) {
+                  cur[q*2+1] = 255;
+                  cur[q*2+0] = cur[q];
+               }
+            } else {
+               STBI_ASSERT(img_n == 3);
+               for (q=x-1; q >= 0; --q) {
+                  cur[q*4+3] = 255;
+                  cur[q*4+2] = cur[q*3+2];
+                  cur[q*4+1] = cur[q*3+1];
+                  cur[q*4+0] = cur[q*3+0];
+               }
+            }
+         }
+      }
+   }
+
+   return 1;
+}
+
+static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced)
+{
+   stbi_uc *final;
+   int p;
+   if (!interlaced)
+      return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color);
+
+   // de-interlacing
+   final = (stbi_uc *) stbi__malloc(a->s->img_x * a->s->img_y * out_n);
+   for (p=0; p < 7; ++p) {
+      int xorig[] = { 0,4,0,2,0,1,0 };
+      int yorig[] = { 0,0,4,0,2,0,1 };
+      int xspc[]  = { 8,8,4,4,2,2,1 };
+      int yspc[]  = { 8,8,8,4,4,2,2 };
+      int i,j,x,y;
+      // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1
+      x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p];
+      y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p];
+      if (x && y) {
+         stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y;
+         if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) {
+            STBI_FREE(final);
+            return 0;
+         }
+         for (j=0; j < y; ++j) {
+            for (i=0; i < x; ++i) {
+               int out_y = j*yspc[p]+yorig[p];
+               int out_x = i*xspc[p]+xorig[p];
+               memcpy(final + out_y*a->s->img_x*out_n + out_x*out_n,
+                      a->out + (j*x+i)*out_n, out_n);
+            }
+         }
+         STBI_FREE(a->out);
+         image_data += img_len;
+         image_data_len -= img_len;
+      }
+   }
+   a->out = final;
+
+   return 1;
+}
+
+static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n)
+{
+   stbi__context *s = z->s;
+   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
+   stbi_uc *p = z->out;
+
+   // compute color-based transparency, assuming we've
+   // already got 255 as the alpha value in the output
+   STBI_ASSERT(out_n == 2 || out_n == 4);
+
+   if (out_n == 2) {
+      for (i=0; i < pixel_count; ++i) {
+         p[1] = (p[0] == tc[0] ? 0 : 255);
+         p += 2;
+      }
+   } else {
+      for (i=0; i < pixel_count; ++i) {
+         if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
+            p[3] = 0;
+         p += 4;
+      }
+   }
+   return 1;
+}
+
+static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n)
+{
+   stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y;
+   stbi_uc *p, *temp_out, *orig = a->out;
+
+   p = (stbi_uc *) stbi__malloc(pixel_count * pal_img_n);
+   if (p == NULL) return stbi__err("outofmem", "Out of memory");
+
+   // between here and free(out) below, exitting would leak
+   temp_out = p;
+
+   if (pal_img_n == 3) {
+      for (i=0; i < pixel_count; ++i) {
+         int n = orig[i]*4;
+         p[0] = palette[n  ];
+         p[1] = palette[n+1];
+         p[2] = palette[n+2];
+         p += 3;
+      }
+   } else {
+      for (i=0; i < pixel_count; ++i) {
+         int n = orig[i]*4;
+         p[0] = palette[n  ];
+         p[1] = palette[n+1];
+         p[2] = palette[n+2];
+         p[3] = palette[n+3];
+         p += 4;
+      }
+   }
+   STBI_FREE(a->out);
+   a->out = temp_out;
+
+   STBI_NOTUSED(len);
+
+   return 1;
+}
+
+static int stbi__unpremultiply_on_load = 0;
+static int stbi__de_iphone_flag = 0;
+
+STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply)
+{
+   stbi__unpremultiply_on_load = flag_true_if_should_unpremultiply;
+}
+
+STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert)
+{
+   stbi__de_iphone_flag = flag_true_if_should_convert;
+}
+
+static void stbi__de_iphone(stbi__png *z)
+{
+   stbi__context *s = z->s;
+   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
+   stbi_uc *p = z->out;
+
+   if (s->img_out_n == 3) {  // convert bgr to rgb
+      for (i=0; i < pixel_count; ++i) {
+         stbi_uc t = p[0];
+         p[0] = p[2];
+         p[2] = t;
+         p += 3;
+      }
+   } else {
+      STBI_ASSERT(s->img_out_n == 4);
+      if (stbi__unpremultiply_on_load) {
+         // convert bgr to rgb and unpremultiply
+         for (i=0; i < pixel_count; ++i) {
+            stbi_uc a = p[3];
+            stbi_uc t = p[0];
+            if (a) {
+               p[0] = p[2] * 255 / a;
+               p[1] = p[1] * 255 / a;
+               p[2] =  t   * 255 / a;
+            } else {
+               p[0] = p[2];
+               p[2] = t;
+            }
+            p += 4;
+         }
+      } else {
+         // convert bgr to rgb
+         for (i=0; i < pixel_count; ++i) {
+            stbi_uc t = p[0];
+            p[0] = p[2];
+            p[2] = t;
+            p += 4;
+         }
+      }
+   }
+}
+
+#define STBI__PNG_TYPE(a,b,c,d)  (((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
+
+static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
+{
+   stbi_uc palette[1024], pal_img_n=0;
+   stbi_uc has_trans=0, tc[3];
+   stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0;
+   int first=1,k,interlace=0, color=0, depth=0, is_iphone=0;
+   stbi__context *s = z->s;
+
+   z->expanded = NULL;
+   z->idata = NULL;
+   z->out = NULL;
+
+   if (!stbi__check_png_header(s)) return 0;
+
+   if (scan == STBI__SCAN_type) return 1;
+
+   for (;;) {
+      stbi__pngchunk c = stbi__get_chunk_header(s);
+      switch (c.type) {
+         case STBI__PNG_TYPE('C','g','B','I'):
+            is_iphone = 1;
+            stbi__skip(s, c.length);
+            break;
+         case STBI__PNG_TYPE('I','H','D','R'): {
+            int comp,filter;
+            if (!first) return stbi__err("multiple IHDR","Corrupt PNG");
+            first = 0;
+            if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG");
+            s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
+            s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
+            depth = stbi__get8(s);  if (depth != 1 && depth != 2 && depth != 4 && depth != 8)  return stbi__err("1/2/4/8-bit only","PNG not supported: 1/2/4/8-bit only");
+            color = stbi__get8(s);  if (color > 6)         return stbi__err("bad ctype","Corrupt PNG");
+            if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG");
+            comp  = stbi__get8(s);  if (comp) return stbi__err("bad comp method","Corrupt PNG");
+            filter= stbi__get8(s);  if (filter) return stbi__err("bad filter method","Corrupt PNG");
+            interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG");
+            if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG");
+            if (!pal_img_n) {
+               s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0);
+               if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode");
+               if (scan == STBI__SCAN_header) return 1;
+            } else {
+               // if paletted, then pal_n is our final components, and
+               // img_n is # components to decompress/filter.
+               s->img_n = 1;
+               if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG");
+               // if SCAN_header, have to scan to see if we have a tRNS
+            }
+            break;
+         }
+
+         case STBI__PNG_TYPE('P','L','T','E'):  {
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG");
+            pal_len = c.length / 3;
+            if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG");
+            for (i=0; i < pal_len; ++i) {
+               palette[i*4+0] = stbi__get8(s);
+               palette[i*4+1] = stbi__get8(s);
+               palette[i*4+2] = stbi__get8(s);
+               palette[i*4+3] = 255;
+            }
+            break;
+         }
+
+         case STBI__PNG_TYPE('t','R','N','S'): {
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG");
+            if (pal_img_n) {
+               if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; }
+               if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG");
+               if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG");
+               pal_img_n = 4;
+               for (i=0; i < c.length; ++i)
+                  palette[i*4+3] = stbi__get8(s);
+            } else {
+               if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG");
+               if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG");
+               has_trans = 1;
+               for (k=0; k < s->img_n; ++k)
+                  tc[k] = (stbi_uc) (stbi__get16be(s) & 255) * stbi__depth_scale_table[depth]; // non 8-bit images will be larger
+            }
+            break;
+         }
+
+         case STBI__PNG_TYPE('I','D','A','T'): {
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG");
+            if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; }
+            if ((int)(ioff + c.length) < (int)ioff) return 0;
+            if (ioff + c.length > idata_limit) {
+               stbi_uc *p;
+               if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096;
+               while (ioff + c.length > idata_limit)
+                  idata_limit *= 2;
+               p = (stbi_uc *) STBI_REALLOC(z->idata, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory");
+               z->idata = p;
+            }
+            if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG");
+            ioff += c.length;
+            break;
+         }
+
+         case STBI__PNG_TYPE('I','E','N','D'): {
+            stbi__uint32 raw_len, bpl;
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (scan != STBI__SCAN_load) return 1;
+            if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG");
+            // initial guess for decoded data size to avoid unnecessary reallocs
+            bpl = (s->img_x * depth + 7) / 8; // bytes per line, per component
+            raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */;
+            z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone);
+            if (z->expanded == NULL) return 0; // zlib should set error
+            STBI_FREE(z->idata); z->idata = NULL;
+            if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans)
+               s->img_out_n = s->img_n+1;
+            else
+               s->img_out_n = s->img_n;
+            if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, depth, color, interlace)) return 0;
+            if (has_trans)
+               if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0;
+            if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2)
+               stbi__de_iphone(z);
+            if (pal_img_n) {
+               // pal_img_n == 3 or 4
+               s->img_n = pal_img_n; // record the actual colors we had
+               s->img_out_n = pal_img_n;
+               if (req_comp >= 3) s->img_out_n = req_comp;
+               if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n))
+                  return 0;
+            }
+            STBI_FREE(z->expanded); z->expanded = NULL;
+            return 1;
+         }
+
+         default:
+            // if critical, fail
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if ((c.type & (1 << 29)) == 0) {
+               #ifndef STBI_NO_FAILURE_STRINGS
+               // not threadsafe
+               static char invalid_chunk[] = "XXXX PNG chunk not known";
+               invalid_chunk[0] = STBI__BYTECAST(c.type >> 24);
+               invalid_chunk[1] = STBI__BYTECAST(c.type >> 16);
+               invalid_chunk[2] = STBI__BYTECAST(c.type >>  8);
+               invalid_chunk[3] = STBI__BYTECAST(c.type >>  0);
+               #endif
+               return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type");
+            }
+            stbi__skip(s, c.length);
+            break;
+      }
+      // end of PNG chunk, read and skip CRC
+      stbi__get32be(s);
+   }
+}
+
+static unsigned char *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp)
+{
+   unsigned char *result=NULL;
+   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
+   if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) {
+      result = p->out;
+      p->out = NULL;
+      if (req_comp && req_comp != p->s->img_out_n) {
+         result = stbi__convert_format(result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
+         p->s->img_out_n = req_comp;
+         if (result == NULL) return result;
+      }
+      *x = p->s->img_x;
+      *y = p->s->img_y;
+      if (n) *n = p->s->img_out_n;
+   }
+   STBI_FREE(p->out);      p->out      = NULL;
+   STBI_FREE(p->expanded); p->expanded = NULL;
+   STBI_FREE(p->idata);    p->idata    = NULL;
+
+   return result;
+}
+
+static unsigned char *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__png p;
+   p.s = s;
+   return stbi__do_png(&p, x,y,comp,req_comp);
+}
+
+static int stbi__png_test(stbi__context *s)
+{
+   int r;
+   r = stbi__check_png_header(s);
+   stbi__rewind(s);
+   return r;
+}
+
+static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp)
+{
+   if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) {
+      stbi__rewind( p->s );
+      return 0;
+   }
+   if (x) *x = p->s->img_x;
+   if (y) *y = p->s->img_y;
+   if (comp) *comp = p->s->img_n;
+   return 1;
+}
+
+static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   stbi__png p;
+   p.s = s;
+   return stbi__png_info_raw(&p, x, y, comp);
+}
+#endif
+
+// Microsoft/Windows BMP image
+
+#ifndef STBI_NO_BMP
+static int stbi__bmp_test_raw(stbi__context *s)
+{
+   int r;
+   int sz;
+   if (stbi__get8(s) != 'B') return 0;
+   if (stbi__get8(s) != 'M') return 0;
+   stbi__get32le(s); // discard filesize
+   stbi__get16le(s); // discard reserved
+   stbi__get16le(s); // discard reserved
+   stbi__get32le(s); // discard data offset
+   sz = stbi__get32le(s);
+   r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124);
+   return r;
+}
+
+static int stbi__bmp_test(stbi__context *s)
+{
+   int r = stbi__bmp_test_raw(s);
+   stbi__rewind(s);
+   return r;
+}
+
+
+// returns 0..31 for the highest set bit
+static int stbi__high_bit(unsigned int z)
+{
+   int n=0;
+   if (z == 0) return -1;
+   if (z >= 0x10000) n += 16, z >>= 16;
+   if (z >= 0x00100) n +=  8, z >>=  8;
+   if (z >= 0x00010) n +=  4, z >>=  4;
+   if (z >= 0x00004) n +=  2, z >>=  2;
+   if (z >= 0x00002) n +=  1, z >>=  1;
+   return n;
+}
+
+static int stbi__bitcount(unsigned int a)
+{
+   a = (a & 0x55555555) + ((a >>  1) & 0x55555555); // max 2
+   a = (a & 0x33333333) + ((a >>  2) & 0x33333333); // max 4
+   a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits
+   a = (a + (a >> 8)); // max 16 per 8 bits
+   a = (a + (a >> 16)); // max 32 per 8 bits
+   return a & 0xff;
+}
+
+static int stbi__shiftsigned(int v, int shift, int bits)
+{
+   int result;
+   int z=0;
+
+   if (shift < 0) v <<= -shift;
+   else v >>= shift;
+   result = v;
+
+   z = bits;
+   while (z < 8) {
+      result += v >> z;
+      z += bits;
+   }
+   return result;
+}
+
+static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   stbi_uc *out;
+   unsigned int mr=0,mg=0,mb=0,ma=0, all_a=255;
+   stbi_uc pal[256][4];
+   int psize=0,i,j,compress=0,width;
+   int bpp, flip_vertically, pad, target, offset, hsz;
+   if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP");
+   stbi__get32le(s); // discard filesize
+   stbi__get16le(s); // discard reserved
+   stbi__get16le(s); // discard reserved
+   offset = stbi__get32le(s);
+   hsz = stbi__get32le(s);
+   if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown");
+   if (hsz == 12) {
+      s->img_x = stbi__get16le(s);
+      s->img_y = stbi__get16le(s);
+   } else {
+      s->img_x = stbi__get32le(s);
+      s->img_y = stbi__get32le(s);
+   }
+   if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP");
+   bpp = stbi__get16le(s);
+   if (bpp == 1) return stbi__errpuc("monochrome", "BMP type not supported: 1-bit");
+   flip_vertically = ((int) s->img_y) > 0;
+   s->img_y = abs((int) s->img_y);
+   if (hsz == 12) {
+      if (bpp < 24)
+         psize = (offset - 14 - 24) / 3;
+   } else {
+      compress = stbi__get32le(s);
+      if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE");
+      stbi__get32le(s); // discard sizeof
+      stbi__get32le(s); // discard hres
+      stbi__get32le(s); // discard vres
+      stbi__get32le(s); // discard colorsused
+      stbi__get32le(s); // discard max important
+      if (hsz == 40 || hsz == 56) {
+         if (hsz == 56) {
+            stbi__get32le(s);
+            stbi__get32le(s);
+            stbi__get32le(s);
+            stbi__get32le(s);
+         }
+         if (bpp == 16 || bpp == 32) {
+            mr = mg = mb = 0;
+            if (compress == 0) {
+               if (bpp == 32) {
+                  mr = 0xffu << 16;
+                  mg = 0xffu <<  8;
+                  mb = 0xffu <<  0;
+                  ma = 0xffu << 24;
+                  all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0
+               } else {
+                  mr = 31u << 10;
+                  mg = 31u <<  5;
+                  mb = 31u <<  0;
+               }
+            } else if (compress == 3) {
+               mr = stbi__get32le(s);
+               mg = stbi__get32le(s);
+               mb = stbi__get32le(s);
+               // not documented, but generated by photoshop and handled by mspaint
+               if (mr == mg && mg == mb) {
+                  // ?!?!?
+                  return stbi__errpuc("bad BMP", "bad BMP");
+               }
+            } else
+               return stbi__errpuc("bad BMP", "bad BMP");
+         }
+      } else {
+         STBI_ASSERT(hsz == 108 || hsz == 124);
+         mr = stbi__get32le(s);
+         mg = stbi__get32le(s);
+         mb = stbi__get32le(s);
+         ma = stbi__get32le(s);
+         stbi__get32le(s); // discard color space
+         for (i=0; i < 12; ++i)
+            stbi__get32le(s); // discard color space parameters
+         if (hsz == 124) {
+            stbi__get32le(s); // discard rendering intent
+            stbi__get32le(s); // discard offset of profile data
+            stbi__get32le(s); // discard size of profile data
+            stbi__get32le(s); // discard reserved
+         }
+      }
+      if (bpp < 16)
+         psize = (offset - 14 - hsz) >> 2;
+   }
+   s->img_n = ma ? 4 : 3;
+   if (req_comp && req_comp >= 3) // we can directly decode 3 or 4
+      target = req_comp;
+   else
+      target = s->img_n; // if they want monochrome, we'll post-convert
+   out = (stbi_uc *) stbi__malloc(target * s->img_x * s->img_y);
+   if (!out) return stbi__errpuc("outofmem", "Out of memory");
+   if (bpp < 16) {
+      int z=0;
+      if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); }
+      for (i=0; i < psize; ++i) {
+         pal[i][2] = stbi__get8(s);
+         pal[i][1] = stbi__get8(s);
+         pal[i][0] = stbi__get8(s);
+         if (hsz != 12) stbi__get8(s);
+         pal[i][3] = 255;
+      }
+      stbi__skip(s, offset - 14 - hsz - psize * (hsz == 12 ? 3 : 4));
+      if (bpp == 4) width = (s->img_x + 1) >> 1;
+      else if (bpp == 8) width = s->img_x;
+      else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); }
+      pad = (-width)&3;
+      for (j=0; j < (int) s->img_y; ++j) {
+         for (i=0; i < (int) s->img_x; i += 2) {
+            int v=stbi__get8(s),v2=0;
+            if (bpp == 4) {
+               v2 = v & 15;
+               v >>= 4;
+            }
+            out[z++] = pal[v][0];
+            out[z++] = pal[v][1];
+            out[z++] = pal[v][2];
+            if (target == 4) out[z++] = 255;
+            if (i+1 == (int) s->img_x) break;
+            v = (bpp == 8) ? stbi__get8(s) : v2;
+            out[z++] = pal[v][0];
+            out[z++] = pal[v][1];
+            out[z++] = pal[v][2];
+            if (target == 4) out[z++] = 255;
+         }
+         stbi__skip(s, pad);
+      }
+   } else {
+      int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0;
+      int z = 0;
+      int easy=0;
+      stbi__skip(s, offset - 14 - hsz);
+      if (bpp == 24) width = 3 * s->img_x;
+      else if (bpp == 16) width = 2*s->img_x;
+      else /* bpp = 32 and pad = 0 */ width=0;
+      pad = (-width) & 3;
+      if (bpp == 24) {
+         easy = 1;
+      } else if (bpp == 32) {
+         if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000)
+            easy = 2;
+      }
+      if (!easy) {
+         if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); }
+         // right shift amt to put high bit in position #7
+         rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr);
+         gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg);
+         bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb);
+         ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma);
+      }
+      for (j=0; j < (int) s->img_y; ++j) {
+         if (easy) {
+            for (i=0; i < (int) s->img_x; ++i) {
+               unsigned char a;
+               out[z+2] = stbi__get8(s);
+               out[z+1] = stbi__get8(s);
+               out[z+0] = stbi__get8(s);
+               z += 3;
+               a = (easy == 2 ? stbi__get8(s) : 255);
+               all_a |= a;
+               if (target == 4) out[z++] = a;
+            }
+         } else {
+            for (i=0; i < (int) s->img_x; ++i) {
+               stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s));
+               int a;
+               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount));
+               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount));
+               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount));
+               a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255);
+               all_a |= a;
+               if (target == 4) out[z++] = STBI__BYTECAST(a);
+            }
+         }
+         stbi__skip(s, pad);
+      }
+   }
+   
+   // if alpha channel is all 0s, replace with all 255s
+   if (target == 4 && all_a == 0)
+      for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4)
+         out[i] = 255;
+
+   if (flip_vertically) {
+      stbi_uc t;
+      for (j=0; j < (int) s->img_y>>1; ++j) {
+         stbi_uc *p1 = out +      j     *s->img_x*target;
+         stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target;
+         for (i=0; i < (int) s->img_x*target; ++i) {
+            t = p1[i], p1[i] = p2[i], p2[i] = t;
+         }
+      }
+   }
+
+   if (req_comp && req_comp != target) {
+      out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y);
+      if (out == NULL) return out; // stbi__convert_format frees input on failure
+   }
+
+   *x = s->img_x;
+   *y = s->img_y;
+   if (comp) *comp = s->img_n;
+   return out;
+}
+#endif
+
+// Targa Truevision - TGA
+// by Jonathan Dummer
+#ifndef STBI_NO_TGA
+static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp)
+{
+    int tga_w, tga_h, tga_comp;
+    int sz;
+    stbi__get8(s);                   // discard Offset
+    sz = stbi__get8(s);              // color type
+    if( sz > 1 ) {
+        stbi__rewind(s);
+        return 0;      // only RGB or indexed allowed
+    }
+    sz = stbi__get8(s);              // image type
+    // only RGB or grey allowed, +/- RLE
+    if ((sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11)) return 0;
+    stbi__skip(s,9);
+    tga_w = stbi__get16le(s);
+    if( tga_w < 1 ) {
+        stbi__rewind(s);
+        return 0;   // test width
+    }
+    tga_h = stbi__get16le(s);
+    if( tga_h < 1 ) {
+        stbi__rewind(s);
+        return 0;   // test height
+    }
+    sz = stbi__get8(s);               // bits per pixel
+    // only RGB or RGBA or grey allowed
+    if ((sz != 8) && (sz != 16) && (sz != 24) && (sz != 32)) {
+        stbi__rewind(s);
+        return 0;
+    }
+    tga_comp = sz;
+    if (x) *x = tga_w;
+    if (y) *y = tga_h;
+    if (comp) *comp = tga_comp / 8;
+    return 1;                   // seems to have passed everything
+}
+
+static int stbi__tga_test(stbi__context *s)
+{
+   int res;
+   int sz;
+   stbi__get8(s);      //   discard Offset
+   sz = stbi__get8(s);   //   color type
+   if ( sz > 1 ) return 0;   //   only RGB or indexed allowed
+   sz = stbi__get8(s);   //   image type
+   if ( (sz != 1) && (sz != 2) && (sz != 3) && (sz != 9) && (sz != 10) && (sz != 11) ) return 0;   //   only RGB or grey allowed, +/- RLE
+   stbi__get16be(s);      //   discard palette start
+   stbi__get16be(s);      //   discard palette length
+   stbi__get8(s);         //   discard bits per palette color entry
+   stbi__get16be(s);      //   discard x origin
+   stbi__get16be(s);      //   discard y origin
+   if ( stbi__get16be(s) < 1 ) return 0;      //   test width
+   if ( stbi__get16be(s) < 1 ) return 0;      //   test height
+   sz = stbi__get8(s);   //   bits per pixel
+   if ( (sz != 8) && (sz != 16) && (sz != 24) && (sz != 32) )
+      res = 0;
+   else
+      res = 1;
+   stbi__rewind(s);
+   return res;
+}
+
+static stbi_uc *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   //   read in the TGA header stuff
+   int tga_offset = stbi__get8(s);
+   int tga_indexed = stbi__get8(s);
+   int tga_image_type = stbi__get8(s);
+   int tga_is_RLE = 0;
+   int tga_palette_start = stbi__get16le(s);
+   int tga_palette_len = stbi__get16le(s);
+   int tga_palette_bits = stbi__get8(s);
+   int tga_x_origin = stbi__get16le(s);
+   int tga_y_origin = stbi__get16le(s);
+   int tga_width = stbi__get16le(s);
+   int tga_height = stbi__get16le(s);
+   int tga_bits_per_pixel = stbi__get8(s);
+   int tga_comp = tga_bits_per_pixel / 8;
+   int tga_inverted = stbi__get8(s);
+   //   image data
+   unsigned char *tga_data;
+   unsigned char *tga_palette = NULL;
+   int i, j;
+   unsigned char raw_data[4];
+   int RLE_count = 0;
+   int RLE_repeating = 0;
+   int read_next_pixel = 1;
+
+   //   do a tiny bit of precessing
+   if ( tga_image_type >= 8 )
+   {
+      tga_image_type -= 8;
+      tga_is_RLE = 1;
+   }
+   /* int tga_alpha_bits = tga_inverted & 15; */
+   tga_inverted = 1 - ((tga_inverted >> 5) & 1);
+
+   //   error check
+   if ( //(tga_indexed) ||
+      (tga_width < 1) || (tga_height < 1) ||
+      (tga_image_type < 1) || (tga_image_type > 3) ||
+      ((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16) &&
+      (tga_bits_per_pixel != 24) && (tga_bits_per_pixel != 32))
+      )
+   {
+      return NULL; // we don't report this as a bad TGA because we don't even know if it's TGA
+   }
+
+   //   If I'm paletted, then I'll use the number of bits from the palette
+   if ( tga_indexed )
+   {
+      tga_comp = tga_palette_bits / 8;
+   }
+
+   //   tga info
+   *x = tga_width;
+   *y = tga_height;
+   if (comp) *comp = tga_comp;
+
+   tga_data = (unsigned char*)stbi__malloc( (size_t)tga_width * tga_height * tga_comp );
+   if (!tga_data) return stbi__errpuc("outofmem", "Out of memory");
+
+   // skip to the data's starting position (offset usually = 0)
+   stbi__skip(s, tga_offset );
+
+   if ( !tga_indexed && !tga_is_RLE) {
+      for (i=0; i < tga_height; ++i) {
+         int row = tga_inverted ? tga_height -i - 1 : i;
+         stbi_uc *tga_row = tga_data + row*tga_width*tga_comp;
+         stbi__getn(s, tga_row, tga_width * tga_comp);
+      }
+   } else  {
+      //   do I need to load a palette?
+      if ( tga_indexed)
+      {
+         //   any data to skip? (offset usually = 0)
+         stbi__skip(s, tga_palette_start );
+         //   load the palette
+         tga_palette = (unsigned char*)stbi__malloc( tga_palette_len * tga_palette_bits / 8 );
+         if (!tga_palette) {
+            STBI_FREE(tga_data);
+            return stbi__errpuc("outofmem", "Out of memory");
+         }
+         if (!stbi__getn(s, tga_palette, tga_palette_len * tga_palette_bits / 8 )) {
+            STBI_FREE(tga_data);
+            STBI_FREE(tga_palette);
+            return stbi__errpuc("bad palette", "Corrupt TGA");
+         }
+      }
+      //   load the data
+      for (i=0; i < tga_width * tga_height; ++i)
+      {
+         //   if I'm in RLE mode, do I need to get a RLE stbi__pngchunk?
+         if ( tga_is_RLE )
+         {
+            if ( RLE_count == 0 )
+            {
+               //   yep, get the next byte as a RLE command
+               int RLE_cmd = stbi__get8(s);
+               RLE_count = 1 + (RLE_cmd & 127);
+               RLE_repeating = RLE_cmd >> 7;
+               read_next_pixel = 1;
+            } else if ( !RLE_repeating )
+            {
+               read_next_pixel = 1;
+            }
+         } else
+         {
+            read_next_pixel = 1;
+         }
+         //   OK, if I need to read a pixel, do it now
+         if ( read_next_pixel )
+         {
+            //   load however much data we did have
+            if ( tga_indexed )
+            {
+               //   read in 1 byte, then perform the lookup
+               int pal_idx = stbi__get8(s);
+               if ( pal_idx >= tga_palette_len )
+               {
+                  //   invalid index
+                  pal_idx = 0;
+               }
+               pal_idx *= tga_bits_per_pixel / 8;
+               for (j = 0; j*8 < tga_bits_per_pixel; ++j)
+               {
+                  raw_data[j] = tga_palette[pal_idx+j];
+               }
+            } else
+            {
+               //   read in the data raw
+               for (j = 0; j*8 < tga_bits_per_pixel; ++j)
+               {
+                  raw_data[j] = stbi__get8(s);
+               }
+            }
+            //   clear the reading flag for the next pixel
+            read_next_pixel = 0;
+         } // end of reading a pixel
+
+         // copy data
+         for (j = 0; j < tga_comp; ++j)
+           tga_data[i*tga_comp+j] = raw_data[j];
+
+         //   in case we're in RLE mode, keep counting down
+         --RLE_count;
+      }
+      //   do I need to invert the image?
+      if ( tga_inverted )
+      {
+         for (j = 0; j*2 < tga_height; ++j)
+         {
+            int index1 = j * tga_width * tga_comp;
+            int index2 = (tga_height - 1 - j) * tga_width * tga_comp;
+            for (i = tga_width * tga_comp; i > 0; --i)
+            {
+               unsigned char temp = tga_data[index1];
+               tga_data[index1] = tga_data[index2];
+               tga_data[index2] = temp;
+               ++index1;
+               ++index2;
+            }
+         }
+      }
+      //   clear my palette, if I had one
+      if ( tga_palette != NULL )
+      {
+         STBI_FREE( tga_palette );
+      }
+   }
+
+   // swap RGB
+   if (tga_comp >= 3)
+   {
+      unsigned char* tga_pixel = tga_data;
+      for (i=0; i < tga_width * tga_height; ++i)
+      {
+         unsigned char temp = tga_pixel[0];
+         tga_pixel[0] = tga_pixel[2];
+         tga_pixel[2] = temp;
+         tga_pixel += tga_comp;
+      }
+   }
+
+   // convert to target component count
+   if (req_comp && req_comp != tga_comp)
+      tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height);
+
+   //   the things I do to get rid of an error message, and yet keep
+   //   Microsoft's C compilers happy... [8^(
+   tga_palette_start = tga_palette_len = tga_palette_bits =
+         tga_x_origin = tga_y_origin = 0;
+   //   OK, done
+   return tga_data;
+}
+#endif
+
+// *************************************************************************************************
+// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB
+
+#ifndef STBI_NO_PSD
+static int stbi__psd_test(stbi__context *s)
+{
+   int r = (stbi__get32be(s) == 0x38425053);
+   stbi__rewind(s);
+   return r;
+}
+
+static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   int   pixelCount;
+   int channelCount, compression;
+   int channel, i, count, len;
+   int bitdepth;
+   int w,h;
+   stbi_uc *out;
+
+   // Check identifier
+   if (stbi__get32be(s) != 0x38425053)   // "8BPS"
+      return stbi__errpuc("not PSD", "Corrupt PSD image");
+
+   // Check file type version.
+   if (stbi__get16be(s) != 1)
+      return stbi__errpuc("wrong version", "Unsupported version of PSD image");
+
+   // Skip 6 reserved bytes.
+   stbi__skip(s, 6 );
+
+   // Read the number of channels (R, G, B, A, etc).
+   channelCount = stbi__get16be(s);
+   if (channelCount < 0 || channelCount > 16)
+      return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image");
+
+   // Read the rows and columns of the image.
+   h = stbi__get32be(s);
+   w = stbi__get32be(s);
+
+   // Make sure the depth is 8 bits.
+   bitdepth = stbi__get16be(s);
+   if (bitdepth != 8 && bitdepth != 16)
+      return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit");
+
+   // Make sure the color mode is RGB.
+   // Valid options are:
+   //   0: Bitmap
+   //   1: Grayscale
+   //   2: Indexed color
+   //   3: RGB color
+   //   4: CMYK color
+   //   7: Multichannel
+   //   8: Duotone
+   //   9: Lab color
+   if (stbi__get16be(s) != 3)
+      return stbi__errpuc("wrong color format", "PSD is not in RGB color format");
+
+   // Skip the Mode Data.  (It's the palette for indexed color; other info for other modes.)
+   stbi__skip(s,stbi__get32be(s) );
+
+   // Skip the image resources.  (resolution, pen tool paths, etc)
+   stbi__skip(s, stbi__get32be(s) );
+
+   // Skip the reserved data.
+   stbi__skip(s, stbi__get32be(s) );
+
+   // Find out if the data is compressed.
+   // Known values:
+   //   0: no compression
+   //   1: RLE compressed
+   compression = stbi__get16be(s);
+   if (compression > 1)
+      return stbi__errpuc("bad compression", "PSD has an unknown compression format");
+
+   // Create the destination image.
+   out = (stbi_uc *) stbi__malloc(4 * w*h);
+   if (!out) return stbi__errpuc("outofmem", "Out of memory");
+   pixelCount = w*h;
+
+   // Initialize the data to zero.
+   //memset( out, 0, pixelCount * 4 );
+
+   // Finally, the image data.
+   if (compression) {
+      // RLE as used by .PSD and .TIFF
+      // Loop until you get the number of unpacked bytes you are expecting:
+      //     Read the next source byte into n.
+      //     If n is between 0 and 127 inclusive, copy the next n+1 bytes literally.
+      //     Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times.
+      //     Else if n is 128, noop.
+      // Endloop
+
+      // The RLE-compressed data is preceeded by a 2-byte data count for each row in the data,
+      // which we're going to just skip.
+      stbi__skip(s, h * channelCount * 2 );
+
+      // Read the RLE data by channel.
+      for (channel = 0; channel < 4; channel++) {
+         stbi_uc *p;
+
+         p = out+channel;
+         if (channel >= channelCount) {
+            // Fill this channel with default data.
+            for (i = 0; i < pixelCount; i++, p += 4)
+               *p = (channel == 3 ? 255 : 0);
+         } else {
+            // Read the RLE data.
+            count = 0;
+            while (count < pixelCount) {
+               len = stbi__get8(s);
+               if (len == 128) {
+                  // No-op.
+               } else if (len < 128) {
+                  // Copy next len+1 bytes literally.
+                  len++;
+                  count += len;
+                  while (len) {
+                     *p = stbi__get8(s);
+                     p += 4;
+                     len--;
+                  }
+               } else if (len > 128) {
+                  stbi_uc   val;
+                  // Next -len+1 bytes in the dest are replicated from next source byte.
+                  // (Interpret len as a negative 8-bit int.)
+                  len ^= 0x0FF;
+                  len += 2;
+                  val = stbi__get8(s);
+                  count += len;
+                  while (len) {
+                     *p = val;
+                     p += 4;
+                     len--;
+                  }
+               }
+            }
+         }
+      }
+
+   } else {
+      // We're at the raw image data.  It's each channel in order (Red, Green, Blue, Alpha, ...)
+      // where each channel consists of an 8-bit value for each pixel in the image.
+
+      // Read the data by channel.
+      for (channel = 0; channel < 4; channel++) {
+         stbi_uc *p;
+
+         p = out + channel;
+         if (channel >= channelCount) {
+            // Fill this channel with default data.
+            stbi_uc val = channel == 3 ? 255 : 0;
+            for (i = 0; i < pixelCount; i++, p += 4)
+               *p = val;
+         } else {
+            // Read the data.
+            if (bitdepth == 16) {
+               for (i = 0; i < pixelCount; i++, p += 4)
+                  *p = (stbi_uc) (stbi__get16be(s) >> 8);
+            } else {
+               for (i = 0; i < pixelCount; i++, p += 4)
+                  *p = stbi__get8(s);
+            }
+         }
+      }
+   }
+
+   if (req_comp && req_comp != 4) {
+      out = stbi__convert_format(out, 4, req_comp, w, h);
+      if (out == NULL) return out; // stbi__convert_format frees input on failure
+   }
+
+   if (comp) *comp = 4;
+   *y = h;
+   *x = w;
+
+   return out;
+}
+#endif
+
+// *************************************************************************************************
+// Softimage PIC loader
+// by Tom Seddon
+//
+// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format
+// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/
+
+#ifndef STBI_NO_PIC
+static int stbi__pic_is4(stbi__context *s,const char *str)
+{
+   int i;
+   for (i=0; i<4; ++i)
+      if (stbi__get8(s) != (stbi_uc)str[i])
+         return 0;
+
+   return 1;
+}
+
+static int stbi__pic_test_core(stbi__context *s)
+{
+   int i;
+
+   if (!stbi__pic_is4(s,"\x53\x80\xF6\x34"))
+      return 0;
+
+   for(i=0;i<84;++i)
+      stbi__get8(s);
+
+   if (!stbi__pic_is4(s,"PICT"))
+      return 0;
+
+   return 1;
+}
+
+typedef struct
+{
+   stbi_uc size,type,channel;
+} stbi__pic_packet;
+
+static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest)
+{
+   int mask=0x80, i;
+
+   for (i=0; i<4; ++i, mask>>=1) {
+      if (channel & mask) {
+         if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short");
+         dest[i]=stbi__get8(s);
+      }
+   }
+
+   return dest;
+}
+
+static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src)
+{
+   int mask=0x80,i;
+
+   for (i=0;i<4; ++i, mask>>=1)
+      if (channel&mask)
+         dest[i]=src[i];
+}
+
+static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result)
+{
+   int act_comp=0,num_packets=0,y,chained;
+   stbi__pic_packet packets[10];
+
+   // this will (should...) cater for even some bizarre stuff like having data
+    // for the same channel in multiple packets.
+   do {
+      stbi__pic_packet *packet;
+
+      if (num_packets==sizeof(packets)/sizeof(packets[0]))
+         return stbi__errpuc("bad format","too many packets");
+
+      packet = &packets[num_packets++];
+
+      chained = stbi__get8(s);
+      packet->size    = stbi__get8(s);
+      packet->type    = stbi__get8(s);
+      packet->channel = stbi__get8(s);
+
+      act_comp |= packet->channel;
+
+      if (stbi__at_eof(s))          return stbi__errpuc("bad file","file too short (reading packets)");
+      if (packet->size != 8)  return stbi__errpuc("bad format","packet isn't 8bpp");
+   } while (chained);
+
+   *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel?
+
+   for(y=0; y<height; ++y) {
+      int packet_idx;
+
+      for(packet_idx=0; packet_idx < num_packets; ++packet_idx) {
+         stbi__pic_packet *packet = &packets[packet_idx];
+         stbi_uc *dest = result+y*width*4;
+
+         switch (packet->type) {
+            default:
+               return stbi__errpuc("bad format","packet has bad compression type");
+
+            case 0: {//uncompressed
+               int x;
+
+               for(x=0;x<width;++x, dest+=4)
+                  if (!stbi__readval(s,packet->channel,dest))
+                     return 0;
+               break;
+            }
+
+            case 1://Pure RLE
+               {
+                  int left=width, i;
+
+                  while (left>0) {
+                     stbi_uc count,value[4];
+
+                     count=stbi__get8(s);
+                     if (stbi__at_eof(s))   return stbi__errpuc("bad file","file too short (pure read count)");
+
+                     if (count > left)
+                        count = (stbi_uc) left;
+
+                     if (!stbi__readval(s,packet->channel,value))  return 0;
+
+                     for(i=0; i<count; ++i,dest+=4)
+                        stbi__copyval(packet->channel,dest,value);
+                     left -= count;
+                  }
+               }
+               break;
+
+            case 2: {//Mixed RLE
+               int left=width;
+               while (left>0) {
+                  int count = stbi__get8(s), i;
+                  if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (mixed read count)");
+
+                  if (count >= 128) { // Repeated
+                     stbi_uc value[4];
+
+                     if (count==128)
+                        count = stbi__get16be(s);
+                     else
+                        count -= 127;
+                     if (count > left)
+                        return stbi__errpuc("bad file","scanline overrun");
+
+                     if (!stbi__readval(s,packet->channel,value))
+                        return 0;
+
+                     for(i=0;i<count;++i, dest += 4)
+                        stbi__copyval(packet->channel,dest,value);
+                  } else { // Raw
+                     ++count;
+                     if (count>left) return stbi__errpuc("bad file","scanline overrun");
+
+                     for(i=0;i<count;++i, dest+=4)
+                        if (!stbi__readval(s,packet->channel,dest))
+                           return 0;
+                  }
+                  left-=count;
+               }
+               break;
+            }
+         }
+      }
+   }
+
+   return result;
+}
+
+static stbi_uc *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp)
+{
+   stbi_uc *result;
+   int i, x,y;
+
+   for (i=0; i<92; ++i)
+      stbi__get8(s);
+
+   x = stbi__get16be(s);
+   y = stbi__get16be(s);
+   if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (pic header)");
+   if ((1 << 28) / x < y) return stbi__errpuc("too large", "Image too large to decode");
+
+   stbi__get32be(s); //skip `ratio'
+   stbi__get16be(s); //skip `fields'
+   stbi__get16be(s); //skip `pad'
+
+   // intermediate buffer is RGBA
+   result = (stbi_uc *) stbi__malloc(x*y*4);
+   memset(result, 0xff, x*y*4);
+
+   if (!stbi__pic_load_core(s,x,y,comp, result)) {
+      STBI_FREE(result);
+      result=0;
+   }
+   *px = x;
+   *py = y;
+   if (req_comp == 0) req_comp = *comp;
+   result=stbi__convert_format(result,4,req_comp,x,y);
+
+   return result;
+}
+
+static int stbi__pic_test(stbi__context *s)
+{
+   int r = stbi__pic_test_core(s);
+   stbi__rewind(s);
+   return r;
+}
+#endif
+
+// *************************************************************************************************
+// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb
+
+#ifndef STBI_NO_GIF
+typedef struct
+{
+   stbi__int16 prefix;
+   stbi_uc first;
+   stbi_uc suffix;
+} stbi__gif_lzw;
+
+typedef struct
+{
+   int w,h;
+   stbi_uc *out, *old_out;             // output buffer (always 4 components)
+   int flags, bgindex, ratio, transparent, eflags, delay;
+   stbi_uc  pal[256][4];
+   stbi_uc lpal[256][4];
+   stbi__gif_lzw codes[4096];
+   stbi_uc *color_table;
+   int parse, step;
+   int lflags;
+   int start_x, start_y;
+   int max_x, max_y;
+   int cur_x, cur_y;
+   int line_size;
+} stbi__gif;
+
+static int stbi__gif_test_raw(stbi__context *s)
+{
+   int sz;
+   if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0;
+   sz = stbi__get8(s);
+   if (sz != '9' && sz != '7') return 0;
+   if (stbi__get8(s) != 'a') return 0;
+   return 1;
+}
+
+static int stbi__gif_test(stbi__context *s)
+{
+   int r = stbi__gif_test_raw(s);
+   stbi__rewind(s);
+   return r;
+}
+
+static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp)
+{
+   int i;
+   for (i=0; i < num_entries; ++i) {
+      pal[i][2] = stbi__get8(s);
+      pal[i][1] = stbi__get8(s);
+      pal[i][0] = stbi__get8(s);
+      pal[i][3] = transp == i ? 0 : 255;
+   }
+}
+
+static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info)
+{
+   stbi_uc version;
+   if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8')
+      return stbi__err("not GIF", "Corrupt GIF");
+
+   version = stbi__get8(s);
+   if (version != '7' && version != '9')    return stbi__err("not GIF", "Corrupt GIF");
+   if (stbi__get8(s) != 'a')                return stbi__err("not GIF", "Corrupt GIF");
+
+   stbi__g_failure_reason = "";
+   g->w = stbi__get16le(s);
+   g->h = stbi__get16le(s);
+   g->flags = stbi__get8(s);
+   g->bgindex = stbi__get8(s);
+   g->ratio = stbi__get8(s);
+   g->transparent = -1;
+
+   if (comp != 0) *comp = 4;  // can't actually tell whether it's 3 or 4 until we parse the comments
+
+   if (is_info) return 1;
+
+   if (g->flags & 0x80)
+      stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1);
+
+   return 1;
+}
+
+static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp)
+{
+   stbi__gif g;
+   if (!stbi__gif_header(s, &g, comp, 1)) {
+      stbi__rewind( s );
+      return 0;
+   }
+   if (x) *x = g.w;
+   if (y) *y = g.h;
+   return 1;
+}
+
+static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code)
+{
+   stbi_uc *p, *c;
+
+   // recurse to decode the prefixes, since the linked-list is backwards,
+   // and working backwards through an interleaved image would be nasty
+   if (g->codes[code].prefix >= 0)
+      stbi__out_gif_code(g, g->codes[code].prefix);
+
+   if (g->cur_y >= g->max_y) return;
+
+   p = &g->out[g->cur_x + g->cur_y];
+   c = &g->color_table[g->codes[code].suffix * 4];
+
+   if (c[3] >= 128) {
+      p[0] = c[2];
+      p[1] = c[1];
+      p[2] = c[0];
+      p[3] = c[3];
+   }
+   g->cur_x += 4;
+
+   if (g->cur_x >= g->max_x) {
+      g->cur_x = g->start_x;
+      g->cur_y += g->step;
+
+      while (g->cur_y >= g->max_y && g->parse > 0) {
+         g->step = (1 << g->parse) * g->line_size;
+         g->cur_y = g->start_y + (g->step >> 1);
+         --g->parse;
+      }
+   }
+}
+
+static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g)
+{
+   stbi_uc lzw_cs;
+   stbi__int32 len, init_code;
+   stbi__uint32 first;
+   stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear;
+   stbi__gif_lzw *p;
+
+   lzw_cs = stbi__get8(s);
+   if (lzw_cs > 12) return NULL;
+   clear = 1 << lzw_cs;
+   first = 1;
+   codesize = lzw_cs + 1;
+   codemask = (1 << codesize) - 1;
+   bits = 0;
+   valid_bits = 0;
+   for (init_code = 0; init_code < clear; init_code++) {
+      g->codes[init_code].prefix = -1;
+      g->codes[init_code].first = (stbi_uc) init_code;
+      g->codes[init_code].suffix = (stbi_uc) init_code;
+   }
+
+   // support no starting clear code
+   avail = clear+2;
+   oldcode = -1;
+
+   len = 0;
+   for(;;) {
+      if (valid_bits < codesize) {
+         if (len == 0) {
+            len = stbi__get8(s); // start new block
+            if (len == 0)
+               return g->out;
+         }
+         --len;
+         bits |= (stbi__int32) stbi__get8(s) << valid_bits;
+         valid_bits += 8;
+      } else {
+         stbi__int32 code = bits & codemask;
+         bits >>= codesize;
+         valid_bits -= codesize;
+         // @OPTIMIZE: is there some way we can accelerate the non-clear path?
+         if (code == clear) {  // clear code
+            codesize = lzw_cs + 1;
+            codemask = (1 << codesize) - 1;
+            avail = clear + 2;
+            oldcode = -1;
+            first = 0;
+         } else if (code == clear + 1) { // end of stream code
+            stbi__skip(s, len);
+            while ((len = stbi__get8(s)) > 0)
+               stbi__skip(s,len);
+            return g->out;
+         } else if (code <= avail) {
+            if (first) return stbi__errpuc("no clear code", "Corrupt GIF");
+
+            if (oldcode >= 0) {
+               p = &g->codes[avail++];
+               if (avail > 4096)        return stbi__errpuc("too many codes", "Corrupt GIF");
+               p->prefix = (stbi__int16) oldcode;
+               p->first = g->codes[oldcode].first;
+               p->suffix = (code == avail) ? p->first : g->codes[code].first;
+            } else if (code == avail)
+               return stbi__errpuc("illegal code in raster", "Corrupt GIF");
+
+            stbi__out_gif_code(g, (stbi__uint16) code);
+
+            if ((avail & codemask) == 0 && avail <= 0x0FFF) {
+               codesize++;
+               codemask = (1 << codesize) - 1;
+            }
+
+            oldcode = code;
+         } else {
+            return stbi__errpuc("illegal code in raster", "Corrupt GIF");
+         }
+      }
+   }
+}
+
+static void stbi__fill_gif_background(stbi__gif *g, int x0, int y0, int x1, int y1)
+{
+   int x, y;
+   stbi_uc *c = g->pal[g->bgindex];
+   for (y = y0; y < y1; y += 4 * g->w) {
+      for (x = x0; x < x1; x += 4) {
+         stbi_uc *p  = &g->out[y + x];
+         p[0] = c[2];
+         p[1] = c[1];
+         p[2] = c[0];
+         p[3] = 0;
+      }
+   }
+}
+
+// this function is designed to support animated gifs, although stb_image doesn't support it
+static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp)
+{
+   int i;
+   stbi_uc *prev_out = 0;
+
+   if (g->out == 0 && !stbi__gif_header(s, g, comp,0))
+      return 0; // stbi__g_failure_reason set by stbi__gif_header
+
+   prev_out = g->out;
+   g->out = (stbi_uc *) stbi__malloc(4 * g->w * g->h);
+   if (g->out == 0) return stbi__errpuc("outofmem", "Out of memory");
+
+   switch ((g->eflags & 0x1C) >> 2) {
+      case 0: // unspecified (also always used on 1st frame)
+         stbi__fill_gif_background(g, 0, 0, 4 * g->w, 4 * g->w * g->h);
+         break;
+      case 1: // do not dispose
+         if (prev_out) memcpy(g->out, prev_out, 4 * g->w * g->h);
+         g->old_out = prev_out;
+         break;
+      case 2: // dispose to background
+         if (prev_out) memcpy(g->out, prev_out, 4 * g->w * g->h);
+         stbi__fill_gif_background(g, g->start_x, g->start_y, g->max_x, g->max_y);
+         break;
+      case 3: // dispose to previous
+         if (g->old_out) {
+            for (i = g->start_y; i < g->max_y; i += 4 * g->w)
+               memcpy(&g->out[i + g->start_x], &g->old_out[i + g->start_x], g->max_x - g->start_x);
+         }
+         break;
+   }
+
+   for (;;) {
+      switch (stbi__get8(s)) {
+         case 0x2C: /* Image Descriptor */
+         {
+            int prev_trans = -1;
+            stbi__int32 x, y, w, h;
+            stbi_uc *o;
+
+            x = stbi__get16le(s);
+            y = stbi__get16le(s);
+            w = stbi__get16le(s);
+            h = stbi__get16le(s);
+            if (((x + w) > (g->w)) || ((y + h) > (g->h)))
+               return stbi__errpuc("bad Image Descriptor", "Corrupt GIF");
+
+            g->line_size = g->w * 4;
+            g->start_x = x * 4;
+            g->start_y = y * g->line_size;
+            g->max_x   = g->start_x + w * 4;
+            g->max_y   = g->start_y + h * g->line_size;
+            g->cur_x   = g->start_x;
+            g->cur_y   = g->start_y;
+
+            g->lflags = stbi__get8(s);
+
+            if (g->lflags & 0x40) {
+               g->step = 8 * g->line_size; // first interlaced spacing
+               g->parse = 3;
+            } else {
+               g->step = g->line_size;
+               g->parse = 0;
+            }
+
+            if (g->lflags & 0x80) {
+               stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1);
+               g->color_table = (stbi_uc *) g->lpal;
+            } else if (g->flags & 0x80) {
+               if (g->transparent >= 0 && (g->eflags & 0x01)) {
+                  prev_trans = g->pal[g->transparent][3];
+                  g->pal[g->transparent][3] = 0;
+               }
+               g->color_table = (stbi_uc *) g->pal;
+            } else
+               return stbi__errpuc("missing color table", "Corrupt GIF");
+
+            o = stbi__process_gif_raster(s, g);
+            if (o == NULL) return NULL;
+
+            if (prev_trans != -1)
+               g->pal[g->transparent][3] = (stbi_uc) prev_trans;
+
+            return o;
+         }
+
+         case 0x21: // Comment Extension.
+         {
+            int len;
+            if (stbi__get8(s) == 0xF9) { // Graphic Control Extension.
+               len = stbi__get8(s);
+               if (len == 4) {
+                  g->eflags = stbi__get8(s);
+                  g->delay = stbi__get16le(s);
+                  g->transparent = stbi__get8(s);
+               } else {
+                  stbi__skip(s, len);
+                  break;
+               }
+            }
+            while ((len = stbi__get8(s)) != 0)
+               stbi__skip(s, len);
+            break;
+         }
+
+         case 0x3B: // gif stream termination code
+            return (stbi_uc *) s; // using '1' causes warning on some compilers
+
+         default:
+            return stbi__errpuc("unknown code", "Corrupt GIF");
+      }
+   }
+
+   STBI_NOTUSED(req_comp);
+}
+
+static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   stbi_uc *u = 0;
+   stbi__gif g;
+   memset(&g, 0, sizeof(g));
+
+   u = stbi__gif_load_next(s, &g, comp, req_comp);
+   if (u == (stbi_uc *) s) u = 0;  // end of animated gif marker
+   if (u) {
+      *x = g.w;
+      *y = g.h;
+      if (req_comp && req_comp != 4)
+         u = stbi__convert_format(u, 4, req_comp, g.w, g.h);
+   }
+   else if (g.out)
+      STBI_FREE(g.out);
+
+   return u;
+}
+
+static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   return stbi__gif_info_raw(s,x,y,comp);
+}
+#endif
+
+// *************************************************************************************************
+// Radiance RGBE HDR loader
+// originally by Nicolas Schulz
+#ifndef STBI_NO_HDR
+static int stbi__hdr_test_core(stbi__context *s)
+{
+   const char *signature = "#?RADIANCE\n";
+   int i;
+   for (i=0; signature[i]; ++i)
+      if (stbi__get8(s) != signature[i])
+         return 0;
+   return 1;
+}
+
+static int stbi__hdr_test(stbi__context* s)
+{
+   int r = stbi__hdr_test_core(s);
+   stbi__rewind(s);
+   return r;
+}
+
+#define STBI__HDR_BUFLEN  1024
+static char *stbi__hdr_gettoken(stbi__context *z, char *buffer)
+{
+   int len=0;
+   char c = '\0';
+
+   c = (char) stbi__get8(z);
+
+   while (!stbi__at_eof(z) && c != '\n') {
+      buffer[len++] = c;
+      if (len == STBI__HDR_BUFLEN-1) {
+         // flush to end of line
+         while (!stbi__at_eof(z) && stbi__get8(z) != '\n')
+            ;
+         break;
+      }
+      c = (char) stbi__get8(z);
+   }
+
+   buffer[len] = 0;
+   return buffer;
+}
+
+static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp)
+{
+   if ( input[3] != 0 ) {
+      float f1;
+      // Exponent
+      f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8));
+      if (req_comp <= 2)
+         output[0] = (input[0] + input[1] + input[2]) * f1 / 3;
+      else {
+         output[0] = input[0] * f1;
+         output[1] = input[1] * f1;
+         output[2] = input[2] * f1;
+      }
+      if (req_comp == 2) output[1] = 1;
+      if (req_comp == 4) output[3] = 1;
+   } else {
+      switch (req_comp) {
+         case 4: output[3] = 1; /* fallthrough */
+         case 3: output[0] = output[1] = output[2] = 0;
+                 break;
+         case 2: output[1] = 1; /* fallthrough */
+         case 1: output[0] = 0;
+                 break;
+      }
+   }
+}
+
+static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   char buffer[STBI__HDR_BUFLEN];
+   char *token;
+   int valid = 0;
+   int width, height;
+   stbi_uc *scanline;
+   float *hdr_data;
+   int len;
+   unsigned char count, value;
+   int i, j, k, c1,c2, z;
+
+
+   // Check identifier
+   if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0)
+      return stbi__errpf("not HDR", "Corrupt HDR image");
+
+   // Parse header
+   for(;;) {
+      token = stbi__hdr_gettoken(s,buffer);
+      if (token[0] == 0) break;
+      if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
+   }
+
+   if (!valid)    return stbi__errpf("unsupported format", "Unsupported HDR format");
+
+   // Parse width and height
+   // can't use sscanf() if we're not using stdio!
+   token = stbi__hdr_gettoken(s,buffer);
+   if (strncmp(token, "-Y ", 3))  return stbi__errpf("unsupported data layout", "Unsupported HDR format");
+   token += 3;
+   height = (int) strtol(token, &token, 10);
+   while (*token == ' ') ++token;
+   if (strncmp(token, "+X ", 3))  return stbi__errpf("unsupported data layout", "Unsupported HDR format");
+   token += 3;
+   width = (int) strtol(token, NULL, 10);
+
+   *x = width;
+   *y = height;
+
+   if (comp) *comp = 3;
+   if (req_comp == 0) req_comp = 3;
+
+   // Read data
+   hdr_data = (float *) stbi__malloc(height * width * req_comp * sizeof(float));
+
+   // Load image data
+   // image data is stored as some number of sca
+   if ( width < 8 || width >= 32768) {
+      // Read flat data
+      for (j=0; j < height; ++j) {
+         for (i=0; i < width; ++i) {
+            stbi_uc rgbe[4];
+           main_decode_loop:
+            stbi__getn(s, rgbe, 4);
+            stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp);
+         }
+      }
+   } else {
+      // Read RLE-encoded data
+      scanline = NULL;
+
+      for (j = 0; j < height; ++j) {
+         c1 = stbi__get8(s);
+         c2 = stbi__get8(s);
+         len = stbi__get8(s);
+         if (c1 != 2 || c2 != 2 || (len & 0x80)) {
+            // not run-length encoded, so we have to actually use THIS data as a decoded
+            // pixel (note this can't be a valid pixel--one of RGB must be >= 128)
+            stbi_uc rgbe[4];
+            rgbe[0] = (stbi_uc) c1;
+            rgbe[1] = (stbi_uc) c2;
+            rgbe[2] = (stbi_uc) len;
+            rgbe[3] = (stbi_uc) stbi__get8(s);
+            stbi__hdr_convert(hdr_data, rgbe, req_comp);
+            i = 1;
+            j = 0;
+            STBI_FREE(scanline);
+            goto main_decode_loop; // yes, this makes no sense
+         }
+         len <<= 8;
+         len |= stbi__get8(s);
+         if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); }
+         if (scanline == NULL) scanline = (stbi_uc *) stbi__malloc(width * 4);
+
+         for (k = 0; k < 4; ++k) {
+            i = 0;
+            while (i < width) {
+               count = stbi__get8(s);
+               if (count > 128) {
+                  // Run
+                  value = stbi__get8(s);
+                  count -= 128;
+                  for (z = 0; z < count; ++z)
+                     scanline[i++ * 4 + k] = value;
+               } else {
+                  // Dump
+                  for (z = 0; z < count; ++z)
+                     scanline[i++ * 4 + k] = stbi__get8(s);
+               }
+            }
+         }
+         for (i=0; i < width; ++i)
+            stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp);
+      }
+      STBI_FREE(scanline);
+   }
+
+   return hdr_data;
+}
+
+static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   char buffer[STBI__HDR_BUFLEN];
+   char *token;
+   int valid = 0;
+
+   if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0) {
+       stbi__rewind( s );
+       return 0;
+   }
+
+   for(;;) {
+      token = stbi__hdr_gettoken(s,buffer);
+      if (token[0] == 0) break;
+      if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
+   }
+
+   if (!valid) {
+       stbi__rewind( s );
+       return 0;
+   }
+   token = stbi__hdr_gettoken(s,buffer);
+   if (strncmp(token, "-Y ", 3)) {
+       stbi__rewind( s );
+       return 0;
+   }
+   token += 3;
+   *y = (int) strtol(token, &token, 10);
+   while (*token == ' ') ++token;
+   if (strncmp(token, "+X ", 3)) {
+       stbi__rewind( s );
+       return 0;
+   }
+   token += 3;
+   *x = (int) strtol(token, NULL, 10);
+   *comp = 3;
+   return 1;
+}
+#endif // STBI_NO_HDR
+
+#ifndef STBI_NO_BMP
+static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int hsz;
+   if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') {
+       stbi__rewind( s );
+       return 0;
+   }
+   stbi__skip(s,12);
+   hsz = stbi__get32le(s);
+   if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) {
+       stbi__rewind( s );
+       return 0;
+   }
+   if (hsz == 12) {
+      *x = stbi__get16le(s);
+      *y = stbi__get16le(s);
+   } else {
+      *x = stbi__get32le(s);
+      *y = stbi__get32le(s);
+   }
+   if (stbi__get16le(s) != 1) {
+       stbi__rewind( s );
+       return 0;
+   }
+   *comp = stbi__get16le(s) / 8;
+   return 1;
+}
+#endif
+
+#ifndef STBI_NO_PSD
+static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int channelCount;
+   if (stbi__get32be(s) != 0x38425053) {
+       stbi__rewind( s );
+       return 0;
+   }
+   if (stbi__get16be(s) != 1) {
+       stbi__rewind( s );
+       return 0;
+   }
+   stbi__skip(s, 6);
+   channelCount = stbi__get16be(s);
+   if (channelCount < 0 || channelCount > 16) {
+       stbi__rewind( s );
+       return 0;
+   }
+   *y = stbi__get32be(s);
+   *x = stbi__get32be(s);
+   if (stbi__get16be(s) != 8) {
+       stbi__rewind( s );
+       return 0;
+   }
+   if (stbi__get16be(s) != 3) {
+       stbi__rewind( s );
+       return 0;
+   }
+   *comp = 4;
+   return 1;
+}
+#endif
+
+#ifndef STBI_NO_PIC
+static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int act_comp=0,num_packets=0,chained;
+   stbi__pic_packet packets[10];
+
+   if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) {
+      stbi__rewind(s);
+      return 0;
+   }
+
+   stbi__skip(s, 88);
+
+   *x = stbi__get16be(s);
+   *y = stbi__get16be(s);
+   if (stbi__at_eof(s)) {
+      stbi__rewind( s);
+      return 0;
+   }
+   if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) {
+      stbi__rewind( s );
+      return 0;
+   }
+
+   stbi__skip(s, 8);
+
+   do {
+      stbi__pic_packet *packet;
+
+      if (num_packets==sizeof(packets)/sizeof(packets[0]))
+         return 0;
+
+      packet = &packets[num_packets++];
+      chained = stbi__get8(s);
+      packet->size    = stbi__get8(s);
+      packet->type    = stbi__get8(s);
+      packet->channel = stbi__get8(s);
+      act_comp |= packet->channel;
+
+      if (stbi__at_eof(s)) {
+          stbi__rewind( s );
+          return 0;
+      }
+      if (packet->size != 8) {
+          stbi__rewind( s );
+          return 0;
+      }
+   } while (chained);
+
+   *comp = (act_comp & 0x10 ? 4 : 3);
+
+   return 1;
+}
+#endif
+
+// *************************************************************************************************
+// Portable Gray Map and Portable Pixel Map loader
+// by Ken Miller
+//
+// PGM: http://netpbm.sourceforge.net/doc/pgm.html
+// PPM: http://netpbm.sourceforge.net/doc/ppm.html
+//
+// Known limitations:
+//    Does not support comments in the header section
+//    Does not support ASCII image data (formats P2 and P3)
+//    Does not support 16-bit-per-channel
+
+#ifndef STBI_NO_PNM
+
+static int      stbi__pnm_test(stbi__context *s)
+{
+   char p, t;
+   p = (char) stbi__get8(s);
+   t = (char) stbi__get8(s);
+   if (p != 'P' || (t != '5' && t != '6')) {
+       stbi__rewind( s );
+       return 0;
+   }
+   return 1;
+}
+
+static stbi_uc *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   stbi_uc *out;
+   if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n))
+      return 0;
+   *x = s->img_x;
+   *y = s->img_y;
+   *comp = s->img_n;
+
+   out = (stbi_uc *) stbi__malloc(s->img_n * s->img_x * s->img_y);
+   if (!out) return stbi__errpuc("outofmem", "Out of memory");
+   stbi__getn(s, out, s->img_n * s->img_x * s->img_y);
+
+   if (req_comp && req_comp != s->img_n) {
+      out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y);
+      if (out == NULL) return out; // stbi__convert_format frees input on failure
+   }
+   return out;
+}
+
+static int      stbi__pnm_isspace(char c)
+{
+   return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
+}
+
+static void     stbi__pnm_skip_whitespace(stbi__context *s, char *c)
+{
+   while (!stbi__at_eof(s) && stbi__pnm_isspace(*c))
+      *c = (char) stbi__get8(s);
+}
+
+static int      stbi__pnm_isdigit(char c)
+{
+   return c >= '0' && c <= '9';
+}
+
+static int      stbi__pnm_getinteger(stbi__context *s, char *c)
+{
+   int value = 0;
+
+   while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) {
+      value = value*10 + (*c - '0');
+      *c = (char) stbi__get8(s);
+   }
+
+   return value;
+}
+
+static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int maxv;
+   char c, p, t;
+
+   stbi__rewind( s );
+
+   // Get identifier
+   p = (char) stbi__get8(s);
+   t = (char) stbi__get8(s);
+   if (p != 'P' || (t != '5' && t != '6')) {
+       stbi__rewind( s );
+       return 0;
+   }
+
+   *comp = (t == '6') ? 3 : 1;  // '5' is 1-component .pgm; '6' is 3-component .ppm
+
+   c = (char) stbi__get8(s);
+   stbi__pnm_skip_whitespace(s, &c);
+
+   *x = stbi__pnm_getinteger(s, &c); // read width
+   stbi__pnm_skip_whitespace(s, &c);
+
+   *y = stbi__pnm_getinteger(s, &c); // read height
+   stbi__pnm_skip_whitespace(s, &c);
+
+   maxv = stbi__pnm_getinteger(s, &c);  // read max value
+
+   if (maxv > 255)
+      return stbi__err("max value > 255", "PPM image not 8-bit");
+   else
+      return 1;
+}
+#endif
+
+static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp)
+{
+   #ifndef STBI_NO_JPEG
+   if (stbi__jpeg_info(s, x, y, comp)) return 1;
+   #endif
+
+   #ifndef STBI_NO_PNG
+   if (stbi__png_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_GIF
+   if (stbi__gif_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_BMP
+   if (stbi__bmp_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PSD
+   if (stbi__psd_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PIC
+   if (stbi__pic_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PNM
+   if (stbi__pnm_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_HDR
+   if (stbi__hdr_info(s, x, y, comp))  return 1;
+   #endif
+
+   // test tga last because it's a crappy test!
+   #ifndef STBI_NO_TGA
+   if (stbi__tga_info(s, x, y, comp))
+       return 1;
+   #endif
+   return stbi__err("unknown image type", "Image not of any known type, or corrupt");
+}
+
+#ifndef STBI_NO_STDIO
+STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp)
+{
+    FILE *f = stbi__fopen(filename, "rb");
+    int result;
+    if (!f) return stbi__err("can't fopen", "Unable to open file");
+    result = stbi_info_from_file(f, x, y, comp);
+    fclose(f);
+    return result;
+}
+
+STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp)
+{
+   int r;
+   stbi__context s;
+   long pos = ftell(f);
+   stbi__start_file(&s, f);
+   r = stbi__info_main(&s,x,y,comp);
+   fseek(f,pos,SEEK_SET);
+   return r;
+}
+#endif // !STBI_NO_STDIO
+
+STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__info_main(&s,x,y,comp);
+}
+
+STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user);
+   return stbi__info_main(&s,x,y,comp);
+}
+
+#endif // STB_IMAGE_IMPLEMENTATION
+
+/*
+   revision history:
+      2.08  (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA
+      2.07  (2015-09-13) fix compiler warnings
+                         partial animated GIF support
+                         limited 16-bit PSD support
+                         #ifdef unused functions
+                         bug with < 92 byte PIC,PNM,HDR,TGA
+      2.06  (2015-04-19) fix bug where PSD returns wrong '*comp' value
+      2.05  (2015-04-19) fix bug in progressive JPEG handling, fix warning
+      2.04  (2015-04-15) try to re-enable SIMD on MinGW 64-bit
+      2.03  (2015-04-12) extra corruption checking (mmozeiko)
+                         stbi_set_flip_vertically_on_load (nguillemot)
+                         fix NEON support; fix mingw support
+      2.02  (2015-01-19) fix incorrect assert, fix warning
+      2.01  (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2
+      2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG
+      2.00  (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg)
+                         progressive JPEG (stb)
+                         PGM/PPM support (Ken Miller)
+                         STBI_MALLOC,STBI_REALLOC,STBI_FREE
+                         GIF bugfix -- seemingly never worked
+                         STBI_NO_*, STBI_ONLY_*
+      1.48  (2014-12-14) fix incorrectly-named assert()
+      1.47  (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb)
+                         optimize PNG (ryg)
+                         fix bug in interlaced PNG with user-specified channel count (stb)
+      1.46  (2014-08-26)
+              fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG
+      1.45  (2014-08-16)
+              fix MSVC-ARM internal compiler error by wrapping malloc
+      1.44  (2014-08-07)
+              various warning fixes from Ronny Chevalier
+      1.43  (2014-07-15)
+              fix MSVC-only compiler problem in code changed in 1.42
+      1.42  (2014-07-09)
+              don't define _CRT_SECURE_NO_WARNINGS (affects user code)
+              fixes to stbi__cleanup_jpeg path
+              added STBI_ASSERT to avoid requiring assert.h
+      1.41  (2014-06-25)
+              fix search&replace from 1.36 that messed up comments/error messages
+      1.40  (2014-06-22)
+              fix gcc struct-initialization warning
+      1.39  (2014-06-15)
+              fix to TGA optimization when req_comp != number of components in TGA;
+              fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite)
+              add support for BMP version 5 (more ignored fields)
+      1.38  (2014-06-06)
+              suppress MSVC warnings on integer casts truncating values
+              fix accidental rename of 'skip' field of I/O
+      1.37  (2014-06-04)
+              remove duplicate typedef
+      1.36  (2014-06-03)
+              convert to header file single-file library
+              if de-iphone isn't set, load iphone images color-swapped instead of returning NULL
+      1.35  (2014-05-27)
+              various warnings
+              fix broken STBI_SIMD path
+              fix bug where stbi_load_from_file no longer left file pointer in correct place
+              fix broken non-easy path for 32-bit BMP (possibly never used)
+              TGA optimization by Arseny Kapoulkine
+      1.34  (unknown)
+              use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case
+      1.33  (2011-07-14)
+              make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements
+      1.32  (2011-07-13)
+              support for "info" function for all supported filetypes (SpartanJ)
+      1.31  (2011-06-20)
+              a few more leak fixes, bug in PNG handling (SpartanJ)
+      1.30  (2011-06-11)
+              added ability to load files via callbacks to accomidate custom input streams (Ben Wenger)
+              removed deprecated format-specific test/load functions
+              removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway
+              error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha)
+              fix inefficiency in decoding 32-bit BMP (David Woo)
+      1.29  (2010-08-16)
+              various warning fixes from Aurelien Pocheville
+      1.28  (2010-08-01)
+              fix bug in GIF palette transparency (SpartanJ)
+      1.27  (2010-08-01)
+              cast-to-stbi_uc to fix warnings
+      1.26  (2010-07-24)
+              fix bug in file buffering for PNG reported by SpartanJ
+      1.25  (2010-07-17)
+              refix trans_data warning (Won Chun)
+      1.24  (2010-07-12)
+              perf improvements reading from files on platforms with lock-heavy fgetc()
+              minor perf improvements for jpeg
+              deprecated type-specific functions so we'll get feedback if they're needed
+              attempt to fix trans_data warning (Won Chun)
+      1.23    fixed bug in iPhone support
+      1.22  (2010-07-10)
+              removed image *writing* support
+              stbi_info support from Jetro Lauha
+              GIF support from Jean-Marc Lienher
+              iPhone PNG-extensions from James Brown
+              warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva)
+      1.21    fix use of 'stbi_uc' in header (reported by jon blow)
+      1.20    added support for Softimage PIC, by Tom Seddon
+      1.19    bug in interlaced PNG corruption check (found by ryg)
+      1.18  (2008-08-02)
+              fix a threading bug (local mutable static)
+      1.17    support interlaced PNG
+      1.16    major bugfix - stbi__convert_format converted one too many pixels
+      1.15    initialize some fields for thread safety
+      1.14    fix threadsafe conversion bug
+              header-file-only version (#define STBI_HEADER_FILE_ONLY before including)
+      1.13    threadsafe
+      1.12    const qualifiers in the API
+      1.11    Support installable IDCT, colorspace conversion routines
+      1.10    Fixes for 64-bit (don't use "unsigned long")
+              optimized upsampling by Fabian "ryg" Giesen
+      1.09    Fix format-conversion for PSD code (bad global variables!)
+      1.08    Thatcher Ulrich's PSD code integrated by Nicolas Schulz
+      1.07    attempt to fix C++ warning/errors again
+      1.06    attempt to fix C++ warning/errors again
+      1.05    fix TGA loading to return correct *comp and use good luminance calc
+      1.04    default float alpha is 1, not 255; use 'void *' for stbi_image_free
+      1.03    bugfixes to STBI_NO_STDIO, STBI_NO_HDR
+      1.02    support for (subset of) HDR files, float interface for preferred access to them
+      1.01    fix bug: possible bug in handling right-side up bmps... not sure
+              fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all
+      1.00    interface to zlib that skips zlib header
+      0.99    correct handling of alpha in palette
+      0.98    TGA loader by lonesock; dynamically add loaders (untested)
+      0.97    jpeg errors on too large a file; also catch another malloc failure
+      0.96    fix detection of invalid v value - particleman@mollyrocket forum
+      0.95    during header scan, seek to markers in case of padding
+      0.94    STBI_NO_STDIO to disable stdio usage; rename all #defines the same
+      0.93    handle jpegtran output; verbose errors
+      0.92    read 4,8,16,24,32-bit BMP files of several formats
+      0.91    output 24-bit Windows 3.0 BMP files
+      0.90    fix a few more warnings; bump version number to approach 1.0
+      0.61    bugfixes due to Marc LeBlanc, Christopher Lloyd
+      0.60    fix compiling as c++
+      0.59    fix warnings: merge Dave Moore's -Wall fixes
+      0.58    fix bug: zlib uncompressed mode len/nlen was wrong endian
+      0.57    fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available
+      0.56    fix bug: zlib uncompressed mode len vs. nlen
+      0.55    fix bug: restart_interval not initialized to 0
+      0.54    allow NULL for 'int *comp'
+      0.53    fix bug in png 3->4; speedup png decoding
+      0.52    png handles req_comp=3,4 directly; minor cleanup; jpeg comments
+      0.51    obey req_comp requests, 1-component jpegs return as 1-component,
+              on 'test' only check type, not whether we support this variant
+      0.50  (2006-11-19)
+              first released version
+*/
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/stb_image_write.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/stb_image_write.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/stb_image_write.h	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/stb_image_write.h	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,1831 @@
+/* stb_image_write - v1.09 - public domain -
+http://nothings.org/stb/stb_image_write.h writes out PNG/BMP/TGA/JPEG/HDR images
+to C stdio - Sean Barrett 2010-2015 no warranty implied; use at your own risk
+
+   Before #including,
+
+       #define STB_IMAGE_WRITE_IMPLEMENTATION
+
+   in the file that you want to have the implementation.
+
+   Will probably not work correctly with strict-aliasing optimizations.
+
+   If using a modern Microsoft Compiler, non-safe versions of CRT calls may
+cause compilation warnings or even errors. To avoid this, also before
+#including,
+
+       #define STBI_MSC_SECURE_CRT
+
+ABOUT:
+
+   This header file is a library for writing images to C stdio. It could be
+   adapted to write to memory or a general streaming interface; let me know.
+
+   The PNG output is not optimal; it is 20-50% larger than the file
+   written by a decent optimizing implementation; though providing a custom
+   zlib compress function (see STBIW_ZLIB_COMPRESS) can mitigate that.
+   This library is designed for source code compactness and simplicity,
+   not optimal image file size or run-time performance.
+
+BUILDING:
+
+   You can #define STBIW_ASSERT(x) before the #include to avoid using assert.h.
+   You can #define STBIW_MALLOC(), STBIW_REALLOC(), and STBIW_FREE() to replace
+   malloc,realloc,free.
+   You can #define STBIW_MEMMOVE() to replace memmove()
+   You can #define STBIW_ZLIB_COMPRESS to use a custom zlib-style compress
+function for PNG compression (instead of the builtin one), it must have the
+following signature: unsigned char * my_compress(unsigned char *data, int
+data_len, int *out_len, int quality); The returned data will be freed with
+STBIW_FREE() (free() by default), so it must be heap allocated with
+STBIW_MALLOC() (malloc() by default),
+
+USAGE:
+
+   There are five functions, one for each image file format:
+
+     int stbi_write_png(char const *filename, int w, int h, int comp, const void
+*data, int stride_in_bytes); int stbi_write_bmp(char const *filename, int w, int
+h, int comp, const void *data); int stbi_write_tga(char const *filename, int w,
+int h, int comp, const void *data); int stbi_write_jpg(char const *filename, int
+w, int h, int comp, const void *data, int quality); int stbi_write_hdr(char
+const *filename, int w, int h, int comp, const float *data);
+
+     void stbi_flip_vertically_on_write(int flag); // flag is non-zero to flip
+data vertically
+
+   There are also five equivalent functions that use an arbitrary write
+function. You are expected to open/close your file-equivalent before and after
+calling these:
+
+     int stbi_write_png_to_func(stbi_write_func *func, void *context, int w, int
+h, int comp, const void  *data, int stride_in_bytes); int
+stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w, int h, int
+comp, const void  *data); int stbi_write_tga_to_func(stbi_write_func *func, void
+*context, int w, int h, int comp, const void  *data); int
+stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w, int h, int
+comp, const float *data); int stbi_write_jpg_to_func(stbi_write_func *func, void
+*context, int x, int y, int comp, const void *data, int quality);
+
+   where the callback is:
+      void stbi_write_func(void *context, void *data, int size);
+
+   You can configure it with these global variables:
+      int stbi_write_tga_with_rle;             // defaults to true; set to 0 to
+disable RLE int stbi_write_png_compression_level;    // defaults to 8; set to
+higher for more compression int stbi_write_force_png_filter;         // defaults
+to -1; set to 0..5 to force a filter mode
+
+
+   You can define STBI_WRITE_NO_STDIO to disable the file variant of these
+   functions, so the library will not use stdio.h at all. However, this will
+   also disable HDR writing, because it requires stdio for formatted output.
+
+   Each function returns 0 on failure and non-0 on success.
+
+   The functions create an image file defined by the parameters. The image
+   is a rectangle of pixels stored from left-to-right, top-to-bottom.
+   Each pixel contains 'comp' channels of data stored interleaved with 8-bits
+   per channel, in the following order: 1=Y, 2=YA, 3=RGB, 4=RGBA. (Y is
+   monochrome color.) The rectangle is 'w' pixels wide and 'h' pixels tall.
+   The *data pointer points to the first byte of the top-left-most pixel.
+   For PNG, "stride_in_bytes" is the distance in bytes from the first byte of
+   a row of pixels to the first byte of the next row of pixels.
+
+   PNG creates output files with the same number of components as the input.
+   The BMP format expands Y to RGB in the file format and does not
+   output alpha.
+
+   PNG supports writing rectangles of data even when the bytes storing rows of
+   data are not consecutive in memory (e.g. sub-rectangles of a larger image),
+   by supplying the stride between the beginning of adjacent rows. The other
+   formats do not. (Thus you cannot write a native-format BMP through the BMP
+   writer, both because it is in BGR order and because it may have padding
+   at the end of the line.)
+
+   PNG allows you to set the deflate compression level by setting the global
+   variable 'stbi_write_png_compression_level' (it defaults to 8).
+
+   HDR expects linear float data. Since the format is always 32-bit rgb(e)
+   data, alpha (if provided) is discarded, and for monochrome data it is
+   replicated across all three channels.
+
+   TGA supports RLE or non-RLE compressed data. To use non-RLE-compressed
+   data, set the global variable 'stbi_write_tga_with_rle' to 0.
+   
+
+   JPEG does ignore alpha channels in input data; quality is between 1 and 100.
+   Higher quality looks better but results in a bigger image.
+   JPEG baseline (no JPEG progressive).
+
+CREDITS:
+
+
+   Sean Barrett           -    PNG/BMP/TGA
+   Baldur Karlsson        -    HDR
+   Jean-Sebastien Guay    -    TGA monochrome
+   Tim Kelsey             -    misc enhancements
+   Alan Hickman           -    TGA RLE
+   Emmanuel Julien        -    initial file IO callback implementation
+   Jon Olick              -    original jo_jpeg.cpp code
+   Daniel Gibson          -    integrate JPEG, allow external zlib
+   Aarni Koskela          -    allow choosing PNG filter
+
+   bugfixes:
+      github:Chribba
+      Guillaume Chereau
+      github:jry2
+      github:romigrou
+      Sergio Gonzalez
+      Jonas Karlsson
+      Filip Wasil
+      Thatcher Ulrich
+      github:poppolopoppo
+      Patrick Boettcher
+      github:xeekworx
+      Cap Petschulat
+      Simon Rodriguez
+      Ivan Tikhonov
+      github:ignotion
+      Adam Schackart
+
+LICENSE
+
+  See end of file for license information.
+
+*/
+
+#ifndef INCLUDE_STB_IMAGE_WRITE_H
+#define INCLUDE_STB_IMAGE_WRITE_H
+
+// if STB_IMAGE_WRITE_STATIC causes problems, try defining STBIWDEF to 'inline'
+// or 'static inline'
+#ifndef STBIWDEF
+#ifdef STB_IMAGE_WRITE_STATIC
+#define STBIWDEF static
+#else
+#ifdef __cplusplus
+#define STBIWDEF extern "C"
+#else
+#define STBIWDEF extern
+#endif
+#endif
+#endif
+
+#ifndef STB_IMAGE_WRITE_STATIC  // C++ forbids static forward declarations
+extern int stbi_write_tga_with_rle;
+extern int stbi_write_png_compression_level;
+extern int stbi_write_force_png_filter;
+#endif
+
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_png(char const *filename, int w, int h, int comp,
+                            const void *data, int stride_in_bytes);
+STBIWDEF int stbi_write_bmp(char const *filename, int w, int h, int comp,
+                            const void *data);
+STBIWDEF int stbi_write_tga(char const *filename, int w, int h, int comp,
+                            const void *data);
+STBIWDEF int stbi_write_hdr(char const *filename, int w, int h, int comp,
+                            const float *data);
+STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp,
+                            const void *data, int quality);
+#endif
+
+typedef void stbi_write_func(void *context, void *data, int size);
+
+STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int w,
+                                    int h, int comp, const void *data,
+                                    int stride_in_bytes);
+STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int w,
+                                    int h, int comp, const void *data);
+STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int w,
+                                    int h, int comp, const void *data);
+STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w,
+                                    int h, int comp, const float *data);
+STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x,
+                                    int y, int comp, const void *data,
+                                    int quality);
+
+STBIWDEF void stbi_flip_vertically_on_write(int flip_boolean);
+
+#endif  // INCLUDE_STB_IMAGE_WRITE_H
+
+#ifdef STB_IMAGE_WRITE_IMPLEMENTATION
+
+#ifdef _WIN32
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+#ifndef _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif
+#endif
+
+#ifndef STBI_WRITE_NO_STDIO
+#include <stdio.h>
+#endif  // STBI_WRITE_NO_STDIO
+
+#include <math.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(STBIW_MALLOC) && defined(STBIW_FREE) && \
+    (defined(STBIW_REALLOC) || defined(STBIW_REALLOC_SIZED))
+// ok
+#elif !defined(STBIW_MALLOC) && !defined(STBIW_FREE) && \
+    !defined(STBIW_REALLOC) && !defined(STBIW_REALLOC_SIZED)
+// ok
+#else
+#error \
+    "Must define all or none of STBIW_MALLOC, STBIW_FREE, and STBIW_REALLOC (or STBIW_REALLOC_SIZED)."
+#endif
+
+#ifndef STBIW_MALLOC
+#define STBIW_MALLOC(sz) malloc(sz)
+#define STBIW_REALLOC(p, newsz) realloc(p, newsz)
+#define STBIW_FREE(p) free(p)
+#endif
+
+#ifndef STBIW_REALLOC_SIZED
+#define STBIW_REALLOC_SIZED(p, oldsz, newsz) STBIW_REALLOC(p, newsz)
+#endif
+
+#ifndef STBIW_MEMMOVE
+#define STBIW_MEMMOVE(a, b, sz) memmove(a, b, sz)
+#endif
+
+#ifndef STBIW_ASSERT
+#include <assert.h>
+#define STBIW_ASSERT(x) assert(x)
+#endif
+
+#define STBIW_UCHAR(x) (unsigned char)((x)&0xff)
+
+#ifdef STB_IMAGE_WRITE_STATIC
+static int stbi__flip_vertically_on_write = 0;
+static int stbi_write_png_compression_level = 8;
+static int stbi_write_tga_with_rle = 1;
+static int stbi_write_force_png_filter = -1;
+#else
+int stbi_write_png_compression_level = 8;
+int stbi__flip_vertically_on_write = 0;
+int stbi_write_tga_with_rle = 1;
+int stbi_write_force_png_filter = -1;
+#endif
+
+STBIWDEF void stbi_flip_vertically_on_write(int flag) {
+  stbi__flip_vertically_on_write = flag;
+}
+
+typedef struct {
+  stbi_write_func *func;
+  void *context;
+} stbi__write_context;
+
+// initialize a callback-based context
+static void stbi__start_write_callbacks(stbi__write_context *s,
+                                        stbi_write_func *c, void *context) {
+  s->func = c;
+  s->context = context;
+}
+
+#ifndef STBI_WRITE_NO_STDIO
+
+static void stbi__stdio_write(void *context, void *data, int size) {
+  fwrite(data, 1, size, (FILE *)context);
+}
+
+static int stbi__start_write_file(stbi__write_context *s,
+                                  const char *filename) {
+  FILE *f;
+#ifdef STBI_MSC_SECURE_CRT
+  if (fopen_s(&f, filename, "wb")) f = NULL;
+#else
+  f = fopen(filename, "wb");
+#endif
+  stbi__start_write_callbacks(s, stbi__stdio_write, (void *)f);
+  return f != NULL;
+}
+
+static void stbi__end_write_file(stbi__write_context *s) {
+  fclose((FILE *)s->context);
+}
+
+#endif  // !STBI_WRITE_NO_STDIO
+
+typedef unsigned int stbiw_uint32;
+typedef int stb_image_write_test[sizeof(stbiw_uint32) == 4 ? 1 : -1];
+
+static void stbiw__writefv(stbi__write_context *s, const char *fmt, va_list v) {
+  while (*fmt) {
+    switch (*fmt++) {
+      case ' ':
+        break;
+      case '1': {
+        unsigned char x = STBIW_UCHAR(va_arg(v, int));
+        s->func(s->context, &x, 1);
+        break;
+      }
+      case '2': {
+        int x = va_arg(v, int);
+        unsigned char b[2];
+        b[0] = STBIW_UCHAR(x);
+        b[1] = STBIW_UCHAR(x >> 8);
+        s->func(s->context, b, 2);
+        break;
+      }
+      case '4': {
+        stbiw_uint32 x = va_arg(v, int);
+        unsigned char b[4];
+        b[0] = STBIW_UCHAR(x);
+        b[1] = STBIW_UCHAR(x >> 8);
+        b[2] = STBIW_UCHAR(x >> 16);
+        b[3] = STBIW_UCHAR(x >> 24);
+        s->func(s->context, b, 4);
+        break;
+      }
+      default:
+        STBIW_ASSERT(0);
+        return;
+    }
+  }
+}
+
+static void stbiw__writef(stbi__write_context *s, const char *fmt, ...) {
+  va_list v;
+  va_start(v, fmt);
+  stbiw__writefv(s, fmt, v);
+  va_end(v);
+}
+
+static void stbiw__putc(stbi__write_context *s, unsigned char c) {
+  s->func(s->context, &c, 1);
+}
+
+static void stbiw__write3(stbi__write_context *s, unsigned char a,
+                          unsigned char b, unsigned char c) {
+  unsigned char arr[3];
+  arr[0] = a, arr[1] = b, arr[2] = c;
+  s->func(s->context, arr, 3);
+}
+
+static void stbiw__write_pixel(stbi__write_context *s, int rgb_dir, int comp,
+                               int write_alpha, int expand_mono,
+                               unsigned char *d) {
+  unsigned char bg[3] = {255, 0, 255}, px[3];
+  int k;
+
+  if (write_alpha < 0) s->func(s->context, &d[comp - 1], 1);
+
+  switch (comp) {
+    case 2:  // 2 pixels = mono + alpha, alpha is written separately, so same as
+             // 1-channel case
+    case 1:
+      if (expand_mono)
+        stbiw__write3(s, d[0], d[0], d[0]);  // monochrome bmp
+      else
+        s->func(s->context, d, 1);  // monochrome TGA
+      break;
+    case 4:
+      if (!write_alpha) {
+        // composite against pink background
+        for (k = 0; k < 3; ++k) px[k] = bg[k] + ((d[k] - bg[k]) * d[3]) / 255;
+        stbiw__write3(s, px[1 - rgb_dir], px[1], px[1 + rgb_dir]);
+        break;
+      }
+      /* FALLTHROUGH */
+    case 3:
+      stbiw__write3(s, d[1 - rgb_dir], d[1], d[1 + rgb_dir]);
+      break;
+  }
+  if (write_alpha > 0) s->func(s->context, &d[comp - 1], 1);
+}
+
+static void stbiw__write_pixels(stbi__write_context *s, int rgb_dir, int vdir,
+                                int x, int y, int comp, void *data,
+                                int write_alpha, int scanline_pad,
+                                int expand_mono) {
+  stbiw_uint32 zero = 0;
+  int i, j, j_end;
+
+  if (y <= 0) return;
+
+  if (stbi__flip_vertically_on_write) vdir *= -1;
+
+  if (vdir < 0)
+    j_end = -1, j = y - 1;
+  else
+    j_end = y, j = 0;
+
+  for (; j != j_end; j += vdir) {
+    for (i = 0; i < x; ++i) {
+      unsigned char *d = (unsigned char *)data + (j * x + i) * comp;
+      stbiw__write_pixel(s, rgb_dir, comp, write_alpha, expand_mono, d);
+    }
+    s->func(s->context, &zero, scanline_pad);
+  }
+}
+
+static int stbiw__outfile(stbi__write_context *s, int rgb_dir, int vdir, int x,
+                          int y, int comp, int expand_mono, void *data,
+                          int alpha, int pad, const char *fmt, ...) {
+  if (y < 0 || x < 0) {
+    return 0;
+  } else {
+    va_list v;
+    va_start(v, fmt);
+    stbiw__writefv(s, fmt, v);
+    va_end(v);
+    stbiw__write_pixels(s, rgb_dir, vdir, x, y, comp, data, alpha, pad,
+                        expand_mono);
+    return 1;
+  }
+}
+
+static int stbi_write_bmp_core(stbi__write_context *s, int x, int y, int comp,
+                               const void *data) {
+  int pad = (-x * 3) & 3;
+  return stbiw__outfile(s, -1, -1, x, y, comp, 1, (void *)data, 0, pad,
+                        "11 4 22 4"
+                        "4 44 22 444444",
+                        'B', 'M', 14 + 40 + (x * 3 + pad) * y, 0, 0,
+                        14 + 40,                             // file header
+                        40, x, y, 1, 24, 0, 0, 0, 0, 0, 0);  // bitmap header
+}
+
+STBIWDEF int stbi_write_bmp_to_func(stbi_write_func *func, void *context, int x,
+                                    int y, int comp, const void *data) {
+  stbi__write_context s;
+  stbi__start_write_callbacks(&s, func, context);
+  return stbi_write_bmp_core(&s, x, y, comp, data);
+}
+
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_bmp(char const *filename, int x, int y, int comp,
+                            const void *data) {
+  stbi__write_context s;
+  if (stbi__start_write_file(&s, filename)) {
+    int r = stbi_write_bmp_core(&s, x, y, comp, data);
+    stbi__end_write_file(&s);
+    return r;
+  } else
+    return 0;
+}
+#endif  //! STBI_WRITE_NO_STDIO
+
+static int stbi_write_tga_core(stbi__write_context *s, int x, int y, int comp,
+                               void *data) {
+  int has_alpha = (comp == 2 || comp == 4);
+  int colorbytes = has_alpha ? comp - 1 : comp;
+  int format =
+      colorbytes < 2
+          ? 3
+          : 2;  // 3 color channels (RGB/RGBA) = 2, 1 color channel (Y/YA) = 3
+
+  if (y < 0 || x < 0) return 0;
+
+  if (!stbi_write_tga_with_rle) {
+    return stbiw__outfile(s, -1, -1, x, y, comp, 0, (void *)data, has_alpha, 0,
+                          "111 221 2222 11", 0, 0, format, 0, 0, 0, 0, 0, x, y,
+                          (colorbytes + has_alpha) * 8, has_alpha * 8);
+  } else {
+    int i, j, k;
+    int jend, jdir;
+
+    stbiw__writef(s, "111 221 2222 11", 0, 0, format + 8, 0, 0, 0, 0, 0, x, y,
+                  (colorbytes + has_alpha) * 8, has_alpha * 8);
+
+    if (stbi__flip_vertically_on_write) {
+      j = 0;
+      jend = y;
+      jdir = 1;
+    } else {
+      j = y - 1;
+      jend = -1;
+      jdir = -1;
+    }
+    for (; j != jend; j += jdir) {
+      unsigned char *row = (unsigned char *)data + j * x * comp;
+      int len;
+
+      for (i = 0; i < x; i += len) {
+        unsigned char *begin = row + i * comp;
+        int diff = 1;
+        len = 1;
+
+        if (i < x - 1) {
+          ++len;
+          diff = memcmp(begin, row + (i + 1) * comp, comp);
+          if (diff) {
+            const unsigned char *prev = begin;
+            for (k = i + 2; k < x && len < 128; ++k) {
+              if (memcmp(prev, row + k * comp, comp)) {
+                prev += comp;
+                ++len;
+              } else {
+                --len;
+                break;
+              }
+            }
+          } else {
+            for (k = i + 2; k < x && len < 128; ++k) {
+              if (!memcmp(begin, row + k * comp, comp)) {
+                ++len;
+              } else {
+                break;
+              }
+            }
+          }
+        }
+
+        if (diff) {
+          unsigned char header = STBIW_UCHAR(len - 1);
+          s->func(s->context, &header, 1);
+          for (k = 0; k < len; ++k) {
+            stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin + k * comp);
+          }
+        } else {
+          unsigned char header = STBIW_UCHAR(len - 129);
+          s->func(s->context, &header, 1);
+          stbiw__write_pixel(s, -1, comp, has_alpha, 0, begin);
+        }
+      }
+    }
+  }
+  return 1;
+}
+
+STBIWDEF int stbi_write_tga_to_func(stbi_write_func *func, void *context, int x,
+                                    int y, int comp, const void *data) {
+  stbi__write_context s;
+  stbi__start_write_callbacks(&s, func, context);
+  return stbi_write_tga_core(&s, x, y, comp, (void *)data);
+}
+
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_tga(char const *filename, int x, int y, int comp,
+                            const void *data) {
+  stbi__write_context s;
+  if (stbi__start_write_file(&s, filename)) {
+    int r = stbi_write_tga_core(&s, x, y, comp, (void *)data);
+    stbi__end_write_file(&s);
+    return r;
+  } else
+    return 0;
+}
+#endif
+
+// *************************************************************************************************
+// Radiance RGBE HDR writer
+// by Baldur Karlsson
+
+#define stbiw__max(a, b) ((a) > (b) ? (a) : (b))
+
+void stbiw__linear_to_rgbe(unsigned char *rgbe, float *linear) {
+  int exponent;
+  float maxcomp = stbiw__max(linear[0], stbiw__max(linear[1], linear[2]));
+
+  if (maxcomp < 1e-32f) {
+    rgbe[0] = rgbe[1] = rgbe[2] = rgbe[3] = 0;
+  } else {
+    float normalize = (float)frexp(maxcomp, &exponent) * 256.0f / maxcomp;
+
+    rgbe[0] = (unsigned char)(linear[0] * normalize);
+    rgbe[1] = (unsigned char)(linear[1] * normalize);
+    rgbe[2] = (unsigned char)(linear[2] * normalize);
+    rgbe[3] = (unsigned char)(exponent + 128);
+  }
+}
+
+void stbiw__write_run_data(stbi__write_context *s, int length,
+                           unsigned char databyte) {
+  unsigned char lengthbyte = STBIW_UCHAR(length + 128);
+  STBIW_ASSERT(length + 128 <= 255);
+  s->func(s->context, &lengthbyte, 1);
+  s->func(s->context, &databyte, 1);
+}
+
+void stbiw__write_dump_data(stbi__write_context *s, int length,
+                            unsigned char *data) {
+  unsigned char lengthbyte = STBIW_UCHAR(length);
+  STBIW_ASSERT(
+      length <=
+      128);  // inconsistent with spec but consistent with official code
+  s->func(s->context, &lengthbyte, 1);
+  s->func(s->context, data, length);
+}
+
+void stbiw__write_hdr_scanline(stbi__write_context *s, int width, int ncomp,
+                               unsigned char *scratch, float *scanline) {
+  unsigned char scanlineheader[4] = {2, 2, 0, 0};
+  unsigned char rgbe[4];
+  float linear[3];
+  int x;
+
+  scanlineheader[2] = (width & 0xff00) >> 8;
+  scanlineheader[3] = (width & 0x00ff);
+
+  /* skip RLE for images too small or large */
+  if (width < 8 || width >= 32768) {
+    for (x = 0; x < width; x++) {
+      switch (ncomp) {
+        case 4: /* fallthrough */
+        case 3:
+          linear[2] = scanline[x * ncomp + 2];
+          linear[1] = scanline[x * ncomp + 1];
+          linear[0] = scanline[x * ncomp + 0];
+          break;
+        default:
+          linear[0] = linear[1] = linear[2] = scanline[x * ncomp + 0];
+          break;
+      }
+      stbiw__linear_to_rgbe(rgbe, linear);
+      s->func(s->context, rgbe, 4);
+    }
+  } else {
+    int c, r;
+    /* encode into scratch buffer */
+    for (x = 0; x < width; x++) {
+      switch (ncomp) {
+        case 4: /* fallthrough */
+        case 3:
+          linear[2] = scanline[x * ncomp + 2];
+          linear[1] = scanline[x * ncomp + 1];
+          linear[0] = scanline[x * ncomp + 0];
+          break;
+        default:
+          linear[0] = linear[1] = linear[2] = scanline[x * ncomp + 0];
+          break;
+      }
+      stbiw__linear_to_rgbe(rgbe, linear);
+      scratch[x + width * 0] = rgbe[0];
+      scratch[x + width * 1] = rgbe[1];
+      scratch[x + width * 2] = rgbe[2];
+      scratch[x + width * 3] = rgbe[3];
+    }
+
+    s->func(s->context, scanlineheader, 4);
+
+    /* RLE each component separately */
+    for (c = 0; c < 4; c++) {
+      unsigned char *comp = &scratch[width * c];
+
+      x = 0;
+      while (x < width) {
+        // find first run
+        r = x;
+        while (r + 2 < width) {
+          if (comp[r] == comp[r + 1] && comp[r] == comp[r + 2]) break;
+          ++r;
+        }
+        if (r + 2 >= width) r = width;
+        // dump up to first run
+        while (x < r) {
+          int len = r - x;
+          if (len > 128) len = 128;
+          stbiw__write_dump_data(s, len, &comp[x]);
+          x += len;
+        }
+        // if there's a run, output it
+        if (r + 2 < width) {  // same test as what we break out of in search
+                              // loop, so only true if we break'd
+          // find next byte after run
+          while (r < width && comp[r] == comp[x]) ++r;
+          // output run up to r
+          while (x < r) {
+            int len = r - x;
+            if (len > 127) len = 127;
+            stbiw__write_run_data(s, len, comp[x]);
+            x += len;
+          }
+        }
+      }
+    }
+  }
+}
+
+static int stbi_write_hdr_core(stbi__write_context *s, int x, int y, int comp,
+                               float *data) {
+  if (y <= 0 || x <= 0 || data == NULL)
+    return 0;
+  else {
+    // Each component is stored separately. Allocate scratch space for full
+    // output scanline.
+    unsigned char *scratch = (unsigned char *)STBIW_MALLOC(x * 4);
+    int i, len;
+    char buffer[128];
+    char header[] =
+        "#?RADIANCE\n# Written by stb_image_write.h\nFORMAT=32-bit_rle_rgbe\n";
+    s->func(s->context, header, sizeof(header) - 1);
+
+#ifdef STBI_MSC_SECURE_CRT
+    len = sprintf_s(
+        buffer, "EXPOSURE=          1.0000000000000\n\n-Y %d +X %d\n", y, x);
+#else
+    len = sprintf(buffer, "EXPOSURE=          1.0000000000000\n\n-Y %d +X %d\n",
+                  y, x);
+#endif
+    s->func(s->context, buffer, len);
+
+    for (i = 0; i < y; i++)
+      stbiw__write_hdr_scanline(
+          s, x, comp, scratch,
+          data +
+              comp * x * (stbi__flip_vertically_on_write ? y - 1 - i : i) * x);
+    STBIW_FREE(scratch);
+    return 1;
+  }
+}
+
+STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int x,
+                                    int y, int comp, const float *data) {
+  stbi__write_context s;
+  stbi__start_write_callbacks(&s, func, context);
+  return stbi_write_hdr_core(&s, x, y, comp, (float *)data);
+}
+
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_hdr(char const *filename, int x, int y, int comp,
+                            const float *data) {
+  stbi__write_context s;
+  if (stbi__start_write_file(&s, filename)) {
+    int r = stbi_write_hdr_core(&s, x, y, comp, (float *)data);
+    stbi__end_write_file(&s);
+    return r;
+  } else
+    return 0;
+}
+#endif  // STBI_WRITE_NO_STDIO
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// PNG writer
+//
+
+#ifndef STBIW_ZLIB_COMPRESS
+// stretchy buffer; stbiw__sbpush() == vector<>::push_back() -- stbiw__sbcount()
+// == vector<>::size()
+#define stbiw__sbraw(a) ((int *)(a)-2)
+#define stbiw__sbm(a) stbiw__sbraw(a)[0]
+#define stbiw__sbn(a) stbiw__sbraw(a)[1]
+
+#define stbiw__sbneedgrow(a, n) ((a) == 0 || stbiw__sbn(a) + n >= stbiw__sbm(a))
+#define stbiw__sbmaybegrow(a, n) \
+  (stbiw__sbneedgrow(a, (n)) ? stbiw__sbgrow(a, n) : 0)
+#define stbiw__sbgrow(a, n) stbiw__sbgrowf((void **)&(a), (n), sizeof(*(a)))
+
+#define stbiw__sbpush(a, v) \
+  (stbiw__sbmaybegrow(a, 1), (a)[stbiw__sbn(a)++] = (v))
+#define stbiw__sbcount(a) ((a) ? stbiw__sbn(a) : 0)
+#define stbiw__sbfree(a) ((a) ? STBIW_FREE(stbiw__sbraw(a)), 0 : 0)
+
+static void *stbiw__sbgrowf(void **arr, int increment, int itemsize) {
+  int m = *arr ? 2 * stbiw__sbm(*arr) + increment : increment + 1;
+  void *p = STBIW_REALLOC_SIZED(
+      *arr ? stbiw__sbraw(*arr) : 0,
+      *arr ? (stbiw__sbm(*arr) * itemsize + sizeof(int) * 2) : 0,
+      itemsize * m + sizeof(int) * 2);
+  STBIW_ASSERT(p);
+  if (p) {
+    if (!*arr) ((int *)p)[1] = 0;
+    *arr = (void *)((int *)p + 2);
+    stbiw__sbm(*arr) = m;
+  }
+  return *arr;
+}
+
+static unsigned char *stbiw__zlib_flushf(unsigned char *data,
+                                         unsigned int *bitbuffer,
+                                         int *bitcount) {
+  while (*bitcount >= 8) {
+    stbiw__sbpush(data, STBIW_UCHAR(*bitbuffer));
+    *bitbuffer >>= 8;
+    *bitcount -= 8;
+  }
+  return data;
+}
+
+static int stbiw__zlib_bitrev(int code, int codebits) {
+  int res = 0;
+  while (codebits--) {
+    res = (res << 1) | (code & 1);
+    code >>= 1;
+  }
+  return res;
+}
+
+static unsigned int stbiw__zlib_countm(unsigned char *a, unsigned char *b,
+                                       int limit) {
+  int i;
+  for (i = 0; i < limit && i < 258; ++i)
+    if (a[i] != b[i]) break;
+  return i;
+}
+
+static unsigned int stbiw__zhash(unsigned char *data) {
+  stbiw_uint32 hash = data[0] + (data[1] << 8) + (data[2] << 16);
+  hash ^= hash << 3;
+  hash += hash >> 5;
+  hash ^= hash << 4;
+  hash += hash >> 17;
+  hash ^= hash << 25;
+  hash += hash >> 6;
+  return hash;
+}
+
+#define stbiw__zlib_flush() (out = stbiw__zlib_flushf(out, &bitbuf, &bitcount))
+#define stbiw__zlib_add(code, codebits) \
+  (bitbuf |= (code) << bitcount, bitcount += (codebits), stbiw__zlib_flush())
+#define stbiw__zlib_huffa(b, c) stbiw__zlib_add(stbiw__zlib_bitrev(b, c), c)
+// default huffman tables
+#define stbiw__zlib_huff1(n) stbiw__zlib_huffa(0x30 + (n), 8)
+#define stbiw__zlib_huff2(n) stbiw__zlib_huffa(0x190 + (n)-144, 9)
+#define stbiw__zlib_huff3(n) stbiw__zlib_huffa(0 + (n)-256, 7)
+#define stbiw__zlib_huff4(n) stbiw__zlib_huffa(0xc0 + (n)-280, 8)
+#define stbiw__zlib_huff(n)                                    \
+  ((n) <= 143 ? stbiw__zlib_huff1(n)                           \
+              : (n) <= 255 ? stbiw__zlib_huff2(n)              \
+                           : (n) <= 279 ? stbiw__zlib_huff3(n) \
+                                        : stbiw__zlib_huff4(n))
+#define stbiw__zlib_huffb(n) \
+  ((n) <= 143 ? stbiw__zlib_huff1(n) : stbiw__zlib_huff2(n))
+
+#define stbiw__ZHASH 16384
+
+#endif  // STBIW_ZLIB_COMPRESS
+
+unsigned char *stbi_zlib_compress(unsigned char *data, int data_len,
+                                  int *out_len, int quality) {
+#ifdef STBIW_ZLIB_COMPRESS
+  // user provided a zlib compress implementation, use that
+  return STBIW_ZLIB_COMPRESS(data, data_len, out_len, quality);
+#else   // use builtin
+  static unsigned short lengthc[] = {
+      3,  4,  5,  6,  7,  8,  9,  10, 11,  13,  15,  17,  19,  23,  27,
+      31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 259};
+  static unsigned char lengtheb[] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
+                                     1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
+                                     4, 4, 4, 4, 5, 5, 5, 5, 0};
+  static unsigned short distc[] = {
+      1,    2,    3,    4,    5,    7,     9,     13,    17,   25,   33,
+      49,   65,   97,   129,  193,  257,   385,   513,   769,  1025, 1537,
+      2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 32768};
+  static unsigned char disteb[] = {0, 0, 0,  0,  1,  1,  2,  2,  3,  3,
+                                   4, 4, 5,  5,  6,  6,  7,  7,  8,  8,
+                                   9, 9, 10, 10, 11, 11, 12, 12, 13, 13};
+  unsigned int bitbuf = 0;
+  int i, j, bitcount = 0;
+  unsigned char *out = NULL;
+  unsigned char ***hash_table =
+      (unsigned char ***)STBIW_MALLOC(stbiw__ZHASH * sizeof(char **));
+  if (hash_table == NULL) return NULL;
+  if (quality < 5) quality = 5;
+
+  stbiw__sbpush(out, 0x78);  // DEFLATE 32K window
+  stbiw__sbpush(out, 0x5e);  // FLEVEL = 1
+  stbiw__zlib_add(1, 1);     // BFINAL = 1
+  stbiw__zlib_add(1, 2);     // BTYPE = 1 -- fixed huffman
+
+  for (i = 0; i < stbiw__ZHASH; ++i) hash_table[i] = NULL;
+
+  i = 0;
+  while (i < data_len - 3) {
+    // hash next 3 bytes of data to be compressed
+    int h = stbiw__zhash(data + i) & (stbiw__ZHASH - 1), best = 3;
+    unsigned char *bestloc = 0;
+    unsigned char **hlist = hash_table[h];
+    int n = stbiw__sbcount(hlist);
+    for (j = 0; j < n; ++j) {
+      if (hlist[j] - data > i - 32768) {  // if entry lies within window
+        int d = stbiw__zlib_countm(hlist[j], data + i, data_len - i);
+        if (d >= best) best = d, bestloc = hlist[j];
+      }
+    }
+    // when hash table entry is too long, delete half the entries
+    if (hash_table[h] && stbiw__sbn(hash_table[h]) == 2 * quality) {
+      STBIW_MEMMOVE(hash_table[h], hash_table[h] + quality,
+                    sizeof(hash_table[h][0]) * quality);
+      stbiw__sbn(hash_table[h]) = quality;
+    }
+    stbiw__sbpush(hash_table[h], data + i);
+
+    if (bestloc) {
+      // "lazy matching" - check match at *next* byte, and if it's better, do
+      // cur byte as literal
+      h = stbiw__zhash(data + i + 1) & (stbiw__ZHASH - 1);
+      hlist = hash_table[h];
+      n = stbiw__sbcount(hlist);
+      for (j = 0; j < n; ++j) {
+        if (hlist[j] - data > i - 32767) {
+          int e = stbiw__zlib_countm(hlist[j], data + i + 1, data_len - i - 1);
+          if (e > best) {  // if next match is better, bail on current match
+            bestloc = NULL;
+            break;
+          }
+        }
+      }
+    }
+
+    if (bestloc) {
+      int d = (int)(data + i - bestloc);  // distance back
+      STBIW_ASSERT(d <= 32767 && best <= 258);
+      for (j = 0; best > lengthc[j + 1] - 1; ++j)
+        ;
+      stbiw__zlib_huff(j + 257);
+      if (lengtheb[j]) stbiw__zlib_add(best - lengthc[j], lengtheb[j]);
+      for (j = 0; d > distc[j + 1] - 1; ++j)
+        ;
+      stbiw__zlib_add(stbiw__zlib_bitrev(j, 5), 5);
+      if (disteb[j]) stbiw__zlib_add(d - distc[j], disteb[j]);
+      i += best;
+    } else {
+      stbiw__zlib_huffb(data[i]);
+      ++i;
+    }
+  }
+  // write out final bytes
+  for (; i < data_len; ++i) stbiw__zlib_huffb(data[i]);
+  stbiw__zlib_huff(256);  // end of block
+  // pad with 0 bits to byte boundary
+  while (bitcount) stbiw__zlib_add(0, 1);
+
+  for (i = 0; i < stbiw__ZHASH; ++i) (void)stbiw__sbfree(hash_table[i]);
+  STBIW_FREE(hash_table);
+
+  {
+    // compute adler32 on input
+    unsigned int s1 = 1, s2 = 0;
+    int blocklen = (int)(data_len % 5552);
+    j = 0;
+    while (j < data_len) {
+      for (i = 0; i < blocklen; ++i) s1 += data[j + i], s2 += s1;
+      s1 %= 65521, s2 %= 65521;
+      j += blocklen;
+      blocklen = 5552;
+    }
+    stbiw__sbpush(out, STBIW_UCHAR(s2 >> 8));
+    stbiw__sbpush(out, STBIW_UCHAR(s2));
+    stbiw__sbpush(out, STBIW_UCHAR(s1 >> 8));
+    stbiw__sbpush(out, STBIW_UCHAR(s1));
+  }
+  *out_len = stbiw__sbn(out);
+  // make returned pointer freeable
+  STBIW_MEMMOVE(stbiw__sbraw(out), out, *out_len);
+  return (unsigned char *)stbiw__sbraw(out);
+#endif  // STBIW_ZLIB_COMPRESS
+}
+
+static unsigned int stbiw__crc32(unsigned char *buffer, int len) {
+  static unsigned int crc_table[256] = {
+      0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
+      0xE963A535, 0x9E6495A3, 0x0eDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+      0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
+      0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+      0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
+      0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+      0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
+      0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+      0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
+      0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+      0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106,
+      0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+      0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
+      0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+      0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
+      0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+      0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
+      0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+      0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA,
+      0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+      0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
+      0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+      0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84,
+      0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+      0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
+      0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+      0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
+      0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+      0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
+      0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+      0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28,
+      0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+      0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
+      0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+      0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
+      0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+      0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
+      0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+      0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
+      0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+      0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
+      0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+      0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D};
+
+  unsigned int crc = ~0u;
+  int i;
+  for (i = 0; i < len; ++i)
+    crc = (crc >> 8) ^ crc_table[buffer[i] ^ (crc & 0xff)];
+  return ~crc;
+}
+
+#define stbiw__wpng4(o, a, b, c, d)                                           \
+  ((o)[0] = STBIW_UCHAR(a), (o)[1] = STBIW_UCHAR(b), (o)[2] = STBIW_UCHAR(c), \
+   (o)[3] = STBIW_UCHAR(d), (o) += 4)
+#define stbiw__wp32(data, v) \
+  stbiw__wpng4(data, (v) >> 24, (v) >> 16, (v) >> 8, (v));
+#define stbiw__wptag(data, s) stbiw__wpng4(data, s[0], s[1], s[2], s[3])
+
+static void stbiw__wpcrc(unsigned char **data, int len) {
+  unsigned int crc = stbiw__crc32(*data - len - 4, len + 4);
+  stbiw__wp32(*data, crc);
+}
+
+static unsigned char stbiw__paeth(int a, int b, int c) {
+  int p = a + b - c, pa = abs(p - a), pb = abs(p - b), pc = abs(p - c);
+  if (pa <= pb && pa <= pc) return STBIW_UCHAR(a);
+  if (pb <= pc) return STBIW_UCHAR(b);
+  return STBIW_UCHAR(c);
+}
+
+// @OPTIMIZE: provide an option that always forces left-predict or paeth predict
+static void stbiw__encode_png_line(unsigned char *pixels, int stride_bytes,
+                                   int width, int height, int y, int n,
+                                   int filter_type, signed char *line_buffer) {
+  static int mapping[] = {0, 1, 2, 3, 4};
+  static int firstmap[] = {0, 1, 0, 5, 6};
+  int *mymap = (y != 0) ? mapping : firstmap;
+  int i;
+  int type = mymap[filter_type];
+  unsigned char *z =
+      pixels +
+      stride_bytes * (stbi__flip_vertically_on_write ? height - 1 - y : y);
+  int signed_stride =
+      stbi__flip_vertically_on_write ? -stride_bytes : stride_bytes;
+  for (i = 0; i < n; ++i) {
+    switch (type) {
+      case 0:
+        line_buffer[i] = z[i];
+        break;
+      case 1:
+        line_buffer[i] = z[i];
+        break;
+      case 2:
+        line_buffer[i] = z[i] - z[i - signed_stride];
+        break;
+      case 3:
+        line_buffer[i] = z[i] - (z[i - signed_stride] >> 1);
+        break;
+      case 4:
+        line_buffer[i] =
+            (signed char)(z[i] - stbiw__paeth(0, z[i - signed_stride], 0));
+        break;
+      case 5:
+        line_buffer[i] = z[i];
+        break;
+      case 6:
+        line_buffer[i] = z[i];
+        break;
+    }
+  }
+  for (i = n; i < width * n; ++i) {
+    switch (type) {
+      case 0:
+        line_buffer[i] = z[i];
+        break;
+      case 1:
+        line_buffer[i] = z[i] - z[i - n];
+        break;
+      case 2:
+        line_buffer[i] = z[i] - z[i - signed_stride];
+        break;
+      case 3:
+        line_buffer[i] = z[i] - ((z[i - n] + z[i - signed_stride]) >> 1);
+        break;
+      case 4:
+        line_buffer[i] = z[i] - stbiw__paeth(z[i - n], z[i - signed_stride],
+                                             z[i - signed_stride - n]);
+        break;
+      case 5:
+        line_buffer[i] = z[i] - (z[i - n] >> 1);
+        break;
+      case 6:
+        line_buffer[i] = z[i] - stbiw__paeth(z[i - n], 0, 0);
+        break;
+    }
+  }
+}
+
+unsigned char *stbi_write_png_to_mem(unsigned char *pixels, int stride_bytes,
+                                     int x, int y, int n, int *out_len) {
+  int force_filter = stbi_write_force_png_filter;
+  int ctype[5] = {-1, 0, 4, 2, 6};
+  unsigned char sig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+  unsigned char *out, *o, *filt, *zlib;
+  signed char *line_buffer;
+  int j, zlen;
+
+  if (stride_bytes == 0) stride_bytes = x * n;
+
+  if (force_filter >= 5) {
+    force_filter = -1;
+  }
+
+  filt = (unsigned char *)STBIW_MALLOC((x * n + 1) * y);
+  if (!filt) return 0;
+  line_buffer = (signed char *)STBIW_MALLOC(x * n);
+  if (!line_buffer) {
+    STBIW_FREE(filt);
+    return 0;
+  }
+  for (j = 0; j < y; ++j) {
+    int filter_type;
+    if (force_filter > -1) {
+      filter_type = force_filter;
+      stbiw__encode_png_line(pixels, stride_bytes, x, y, j, n, force_filter,
+                             line_buffer);
+    } else {  // Estimate the best filter by running through all of them:
+      int best_filter = 0, best_filter_val = 0x7fffffff, est, i;
+      for (filter_type = 0; filter_type < 5; filter_type++) {
+        stbiw__encode_png_line(pixels, stride_bytes, x, y, j, n, filter_type,
+                               line_buffer);
+
+        // Estimate the entropy of the line using this filter; the less, the
+        // better.
+        est = 0;
+        for (i = 0; i < x * n; ++i) {
+          est += abs((signed char)line_buffer[i]);
+        }
+        if (est < best_filter_val) {
+          best_filter_val = est;
+          best_filter = filter_type;
+        }
+      }
+      if (filter_type != best_filter) {  // If the last iteration already got us
+                                         // the best filter, don't redo it
+        stbiw__encode_png_line(pixels, stride_bytes, x, y, j, n, best_filter,
+                               line_buffer);
+        filter_type = best_filter;
+      }
+    }
+    // when we get here, filter_type contains the filter type, and line_buffer
+    // contains the data
+    filt[j * (x * n + 1)] = (unsigned char)filter_type;
+    STBIW_MEMMOVE(filt + j * (x * n + 1) + 1, line_buffer, x * n);
+  }
+  STBIW_FREE(line_buffer);
+  zlib = stbi_zlib_compress(filt, y * (x * n + 1), &zlen,
+                            stbi_write_png_compression_level);
+  STBIW_FREE(filt);
+  if (!zlib) return 0;
+
+  // each tag requires 12 bytes of overhead
+  out = (unsigned char *)STBIW_MALLOC(8 + 12 + 13 + 12 + zlen + 12);
+  if (!out) return 0;
+  *out_len = 8 + 12 + 13 + 12 + zlen + 12;
+
+  o = out;
+  STBIW_MEMMOVE(o, sig, 8);
+  o += 8;
+  stbiw__wp32(o, 13);  // header length
+  stbiw__wptag(o, "IHDR");
+  stbiw__wp32(o, x);
+  stbiw__wp32(o, y);
+  *o++ = 8;
+  *o++ = STBIW_UCHAR(ctype[n]);
+  *o++ = 0;
+  *o++ = 0;
+  *o++ = 0;
+  stbiw__wpcrc(&o, 13);
+
+  stbiw__wp32(o, zlen);
+  stbiw__wptag(o, "IDAT");
+  STBIW_MEMMOVE(o, zlib, zlen);
+  o += zlen;
+  STBIW_FREE(zlib);
+  stbiw__wpcrc(&o, zlen);
+
+  stbiw__wp32(o, 0);
+  stbiw__wptag(o, "IEND");
+  stbiw__wpcrc(&o, 0);
+
+  STBIW_ASSERT(o == out + *out_len);
+
+  return out;
+}
+
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_png(char const *filename, int x, int y, int comp,
+                            const void *data, int stride_bytes) {
+  FILE *f;
+  int len;
+  unsigned char *png = stbi_write_png_to_mem((unsigned char *)data,
+                                             stride_bytes, x, y, comp, &len);
+  if (png == NULL) return 0;
+#ifdef STBI_MSC_SECURE_CRT
+  if (fopen_s(&f, filename, "wb")) f = NULL;
+#else
+  f = fopen(filename, "wb");
+#endif
+  if (!f) {
+    STBIW_FREE(png);
+    return 0;
+  }
+  fwrite(png, 1, len, f);
+  fclose(f);
+  STBIW_FREE(png);
+  return 1;
+}
+#endif
+
+STBIWDEF int stbi_write_png_to_func(stbi_write_func *func, void *context, int x,
+                                    int y, int comp, const void *data,
+                                    int stride_bytes) {
+  int len;
+  unsigned char *png = stbi_write_png_to_mem((unsigned char *)data,
+                                             stride_bytes, x, y, comp, &len);
+  if (png == NULL) return 0;
+  func(context, png, len);
+  STBIW_FREE(png);
+  return 1;
+}
+
+/* ***************************************************************************
+ *
+ * JPEG writer
+ *
+ * This is based on Jon Olick's jo_jpeg.cpp:
+ * public domain Simple, Minimalistic JPEG writer -
+ * http://www.jonolick.com/code.html
+ */
+
+static const unsigned char stbiw__jpg_ZigZag[] = {
+    0,  1,  5,  6,  14, 15, 27, 28, 2,  4,  7,  13, 16, 26, 29, 42,
+    3,  8,  12, 17, 25, 30, 41, 43, 9,  11, 18, 24, 31, 40, 44, 53,
+    10, 19, 23, 32, 39, 45, 52, 54, 20, 22, 33, 38, 46, 51, 55, 60,
+    21, 34, 37, 47, 50, 56, 59, 61, 35, 36, 48, 49, 57, 58, 62, 63};
+
+static void stbiw__jpg_writeBits(stbi__write_context *s, int *bitBufP,
+                                 int *bitCntP, const unsigned short *bs) {
+  int bitBuf = *bitBufP, bitCnt = *bitCntP;
+  bitCnt += bs[1];
+  bitBuf |= bs[0] << (24 - bitCnt);
+  while (bitCnt >= 8) {
+    unsigned char c = (bitBuf >> 16) & 255;
+    stbiw__putc(s, c);
+    if (c == 255) {
+      stbiw__putc(s, 0);
+    }
+    bitBuf <<= 8;
+    bitCnt -= 8;
+  }
+  *bitBufP = bitBuf;
+  *bitCntP = bitCnt;
+}
+
+static void stbiw__jpg_DCT(float *d0p, float *d1p, float *d2p, float *d3p,
+                           float *d4p, float *d5p, float *d6p, float *d7p) {
+  float d0 = *d0p, d1 = *d1p, d2 = *d2p, d3 = *d3p, d4 = *d4p, d5 = *d5p,
+        d6 = *d6p, d7 = *d7p;
+  float z1, z2, z3, z4, z5, z11, z13;
+
+  float tmp0 = d0 + d7;
+  float tmp7 = d0 - d7;
+  float tmp1 = d1 + d6;
+  float tmp6 = d1 - d6;
+  float tmp2 = d2 + d5;
+  float tmp5 = d2 - d5;
+  float tmp3 = d3 + d4;
+  float tmp4 = d3 - d4;
+
+  // Even part
+  float tmp10 = tmp0 + tmp3;  // phase 2
+  float tmp13 = tmp0 - tmp3;
+  float tmp11 = tmp1 + tmp2;
+  float tmp12 = tmp1 - tmp2;
+
+  d0 = tmp10 + tmp11;  // phase 3
+  d4 = tmp10 - tmp11;
+
+  z1 = (tmp12 + tmp13) * 0.707106781f;  // c4
+  d2 = tmp13 + z1;                      // phase 5
+  d6 = tmp13 - z1;
+
+  // Odd part
+  tmp10 = tmp4 + tmp5;  // phase 2
+  tmp11 = tmp5 + tmp6;
+  tmp12 = tmp6 + tmp7;
+
+  // The rotator is modified from fig 4-8 to avoid extra negations.
+  z5 = (tmp10 - tmp12) * 0.382683433f;  // c6
+  z2 = tmp10 * 0.541196100f + z5;       // c2-c6
+  z4 = tmp12 * 1.306562965f + z5;       // c2+c6
+  z3 = tmp11 * 0.707106781f;            // c4
+
+  z11 = tmp7 + z3;  // phase 5
+  z13 = tmp7 - z3;
+
+  *d5p = z13 + z2;  // phase 6
+  *d3p = z13 - z2;
+  *d1p = z11 + z4;
+  *d7p = z11 - z4;
+
+  *d0p = d0;
+  *d2p = d2;
+  *d4p = d4;
+  *d6p = d6;
+}
+
+static void stbiw__jpg_calcBits(int val, unsigned short bits[2]) {
+  int tmp1 = val < 0 ? -val : val;
+  val = val < 0 ? val - 1 : val;
+  bits[1] = 1;
+  while (tmp1 >>= 1) {
+    ++bits[1];
+  }
+  bits[0] = val & ((1 << bits[1]) - 1);
+}
+
+static int stbiw__jpg_processDU(stbi__write_context *s, int *bitBuf,
+                                int *bitCnt, float *CDU, float *fdtbl, int DC,
+                                const unsigned short HTDC[256][2],
+                                const unsigned short HTAC[256][2]) {
+  const unsigned short EOB[2] = {HTAC[0x00][0], HTAC[0x00][1]};
+  const unsigned short M16zeroes[2] = {HTAC[0xF0][0], HTAC[0xF0][1]};
+  int dataOff, i, diff, end0pos;
+  int DU[64];
+
+  // DCT rows
+  for (dataOff = 0; dataOff < 64; dataOff += 8) {
+    stbiw__jpg_DCT(&CDU[dataOff], &CDU[dataOff + 1], &CDU[dataOff + 2],
+                   &CDU[dataOff + 3], &CDU[dataOff + 4], &CDU[dataOff + 5],
+                   &CDU[dataOff + 6], &CDU[dataOff + 7]);
+  }
+  // DCT columns
+  for (dataOff = 0; dataOff < 8; ++dataOff) {
+    stbiw__jpg_DCT(&CDU[dataOff], &CDU[dataOff + 8], &CDU[dataOff + 16],
+                   &CDU[dataOff + 24], &CDU[dataOff + 32], &CDU[dataOff + 40],
+                   &CDU[dataOff + 48], &CDU[dataOff + 56]);
+  }
+  // Quantize/descale/zigzag the coefficients
+  for (i = 0; i < 64; ++i) {
+    float v = CDU[i] * fdtbl[i];
+    // DU[stbiw__jpg_ZigZag[i]] = (int)(v < 0 ? ceilf(v - 0.5f) : floorf(v +
+    // 0.5f)); ceilf() and floorf() are C99, not C89, but I /think/ they're not
+    // needed here anyway?
+    DU[stbiw__jpg_ZigZag[i]] = (int)(v < 0 ? v - 0.5f : v + 0.5f);
+  }
+
+  // Encode DC
+  diff = DU[0] - DC;
+  if (diff == 0) {
+    stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTDC[0]);
+  } else {
+    unsigned short bits[2];
+    stbiw__jpg_calcBits(diff, bits);
+    stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTDC[bits[1]]);
+    stbiw__jpg_writeBits(s, bitBuf, bitCnt, bits);
+  }
+  // Encode ACs
+  end0pos = 63;
+  for (; (end0pos > 0) && (DU[end0pos] == 0); --end0pos) {
+  }
+  // end0pos = first element in reverse order !=0
+  if (end0pos == 0) {
+    stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB);
+    return DU[0];
+  }
+  for (i = 1; i <= end0pos; ++i) {
+    int startpos = i;
+    int nrzeroes;
+    unsigned short bits[2];
+    for (; DU[i] == 0 && i <= end0pos; ++i) {
+    }
+    nrzeroes = i - startpos;
+    if (nrzeroes >= 16) {
+      int lng = nrzeroes >> 4;
+      int nrmarker;
+      for (nrmarker = 1; nrmarker <= lng; ++nrmarker)
+        stbiw__jpg_writeBits(s, bitBuf, bitCnt, M16zeroes);
+      nrzeroes &= 15;
+    }
+    stbiw__jpg_calcBits(DU[i], bits);
+    stbiw__jpg_writeBits(s, bitBuf, bitCnt, HTAC[(nrzeroes << 4) + bits[1]]);
+    stbiw__jpg_writeBits(s, bitBuf, bitCnt, bits);
+  }
+  if (end0pos != 63) {
+    stbiw__jpg_writeBits(s, bitBuf, bitCnt, EOB);
+  }
+  return DU[0];
+}
+
+static int stbi_write_jpg_core(stbi__write_context *s, int width, int height,
+                               int comp, const void *data, int quality) {
+  // Constants that don't pollute global namespace
+  static const unsigned char std_dc_luminance_nrcodes[] = {
+      0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0};
+  static const unsigned char std_dc_luminance_values[] = {0, 1, 2, 3, 4,  5,
+                                                          6, 7, 8, 9, 10, 11};
+  static const unsigned char std_ac_luminance_nrcodes[] = {
+      0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d};
+  static const unsigned char std_ac_luminance_values[] = {
+      0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06,
+      0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
+      0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72,
+      0x82, 0x09, 0x0a, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
+      0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45,
+      0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
+      0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75,
+      0x76, 0x77, 0x78, 0x79, 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+      0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3,
+      0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
+      0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9,
+      0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
+      0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4,
+      0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa};
+  static const unsigned char std_dc_chrominance_nrcodes[] = {
+      0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0};
+  static const unsigned char std_dc_chrominance_values[] = {0, 1, 2, 3, 4,  5,
+                                                            6, 7, 8, 9, 10, 11};
+  static const unsigned char std_ac_chrominance_nrcodes[] = {
+      0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77};
+  static const unsigned char std_ac_chrominance_values[] = {
+      0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41,
+      0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
+      0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, 0x15, 0x62, 0x72, 0xd1,
+      0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
+      0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44,
+      0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+      0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74,
+      0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+      0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a,
+      0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
+      0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+      0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
+      0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf2, 0xf3, 0xf4,
+      0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa};
+  // Huffman tables
+  static const unsigned short YDC_HT[256][2] = {
+      {0, 2},  {2, 3},  {3, 3},  {4, 3},   {5, 3},   {6, 3},
+      {14, 4}, {30, 5}, {62, 6}, {126, 7}, {254, 8}, {510, 9}};
+  static const unsigned short UVDC_HT[256][2] = {
+      {0, 2},  {1, 2},   {2, 2},   {6, 3},   {14, 4},    {30, 5},
+      {62, 6}, {126, 7}, {254, 8}, {510, 9}, {1022, 10}, {2046, 11}};
+  static const unsigned short YAC_HT[256][2] = {
+      {10, 4},     {0, 2},      {1, 2},      {4, 3},      {11, 4},
+      {26, 5},     {120, 7},    {248, 8},    {1014, 10},  {65410, 16},
+      {65411, 16}, {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {12, 4},     {27, 5},     {121, 7},
+      {502, 9},    {2038, 11},  {65412, 16}, {65413, 16}, {65414, 16},
+      {65415, 16}, {65416, 16}, {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {28, 5},     {249, 8},
+      {1015, 10},  {4084, 12},  {65417, 16}, {65418, 16}, {65419, 16},
+      {65420, 16}, {65421, 16}, {65422, 16}, {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {58, 6},
+      {503, 9},    {4085, 12},  {65423, 16}, {65424, 16}, {65425, 16},
+      {65426, 16}, {65427, 16}, {65428, 16}, {65429, 16}, {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {59, 6},     {1016, 10},  {65430, 16}, {65431, 16}, {65432, 16},
+      {65433, 16}, {65434, 16}, {65435, 16}, {65436, 16}, {65437, 16},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {122, 7},    {2039, 11},  {65438, 16}, {65439, 16},
+      {65440, 16}, {65441, 16}, {65442, 16}, {65443, 16}, {65444, 16},
+      {65445, 16}, {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {123, 7},    {4086, 12},  {65446, 16},
+      {65447, 16}, {65448, 16}, {65449, 16}, {65450, 16}, {65451, 16},
+      {65452, 16}, {65453, 16}, {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {250, 8},    {4087, 12},
+      {65454, 16}, {65455, 16}, {65456, 16}, {65457, 16}, {65458, 16},
+      {65459, 16}, {65460, 16}, {65461, 16}, {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {504, 9},
+      {32704, 15}, {65462, 16}, {65463, 16}, {65464, 16}, {65465, 16},
+      {65466, 16}, {65467, 16}, {65468, 16}, {65469, 16}, {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {505, 9},    {65470, 16}, {65471, 16}, {65472, 16}, {65473, 16},
+      {65474, 16}, {65475, 16}, {65476, 16}, {65477, 16}, {65478, 16},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {506, 9},    {65479, 16}, {65480, 16}, {65481, 16},
+      {65482, 16}, {65483, 16}, {65484, 16}, {65485, 16}, {65486, 16},
+      {65487, 16}, {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {1017, 10},  {65488, 16}, {65489, 16},
+      {65490, 16}, {65491, 16}, {65492, 16}, {65493, 16}, {65494, 16},
+      {65495, 16}, {65496, 16}, {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {1018, 10},  {65497, 16},
+      {65498, 16}, {65499, 16}, {65500, 16}, {65501, 16}, {65502, 16},
+      {65503, 16}, {65504, 16}, {65505, 16}, {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {2040, 11},
+      {65506, 16}, {65507, 16}, {65508, 16}, {65509, 16}, {65510, 16},
+      {65511, 16}, {65512, 16}, {65513, 16}, {65514, 16}, {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {65515, 16}, {65516, 16}, {65517, 16}, {65518, 16}, {65519, 16},
+      {65520, 16}, {65521, 16}, {65522, 16}, {65523, 16}, {65524, 16},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {2041, 11},  {65525, 16}, {65526, 16}, {65527, 16}, {65528, 16},
+      {65529, 16}, {65530, 16}, {65531, 16}, {65532, 16}, {65533, 16},
+      {65534, 16}, {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0}};
+  static const unsigned short UVAC_HT[256][2] = {
+      {0, 2},      {1, 2},      {4, 3},      {10, 4},     {24, 5},
+      {25, 5},     {56, 6},     {120, 7},    {500, 9},    {1014, 10},
+      {4084, 12},  {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {11, 4},     {57, 6},     {246, 8},
+      {501, 9},    {2038, 11},  {4085, 12},  {65416, 16}, {65417, 16},
+      {65418, 16}, {65419, 16}, {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {26, 5},     {247, 8},
+      {1015, 10},  {4086, 12},  {32706, 15}, {65420, 16}, {65421, 16},
+      {65422, 16}, {65423, 16}, {65424, 16}, {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {27, 5},
+      {248, 8},    {1016, 10},  {4087, 12},  {65425, 16}, {65426, 16},
+      {65427, 16}, {65428, 16}, {65429, 16}, {65430, 16}, {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {58, 6},     {502, 9},    {65431, 16}, {65432, 16}, {65433, 16},
+      {65434, 16}, {65435, 16}, {65436, 16}, {65437, 16}, {65438, 16},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {59, 6},     {1017, 10},  {65439, 16}, {65440, 16},
+      {65441, 16}, {65442, 16}, {65443, 16}, {65444, 16}, {65445, 16},
+      {65446, 16}, {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {121, 7},    {2039, 11},  {65447, 16},
+      {65448, 16}, {65449, 16}, {65450, 16}, {65451, 16}, {65452, 16},
+      {65453, 16}, {65454, 16}, {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {122, 7},    {2040, 11},
+      {65455, 16}, {65456, 16}, {65457, 16}, {65458, 16}, {65459, 16},
+      {65460, 16}, {65461, 16}, {65462, 16}, {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {249, 8},
+      {65463, 16}, {65464, 16}, {65465, 16}, {65466, 16}, {65467, 16},
+      {65468, 16}, {65469, 16}, {65470, 16}, {65471, 16}, {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {503, 9},    {65472, 16}, {65473, 16}, {65474, 16}, {65475, 16},
+      {65476, 16}, {65477, 16}, {65478, 16}, {65479, 16}, {65480, 16},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {504, 9},    {65481, 16}, {65482, 16}, {65483, 16},
+      {65484, 16}, {65485, 16}, {65486, 16}, {65487, 16}, {65488, 16},
+      {65489, 16}, {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {505, 9},    {65490, 16}, {65491, 16},
+      {65492, 16}, {65493, 16}, {65494, 16}, {65495, 16}, {65496, 16},
+      {65497, 16}, {65498, 16}, {0, 0},      {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {506, 9},    {65499, 16},
+      {65500, 16}, {65501, 16}, {65502, 16}, {65503, 16}, {65504, 16},
+      {65505, 16}, {65506, 16}, {65507, 16}, {0, 0},      {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {2041, 11},
+      {65508, 16}, {65509, 16}, {65510, 16}, {65511, 16}, {65512, 16},
+      {65513, 16}, {65514, 16}, {65515, 16}, {65516, 16}, {0, 0},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {16352, 14}, {65517, 16}, {65518, 16}, {65519, 16}, {65520, 16},
+      {65521, 16}, {65522, 16}, {65523, 16}, {65524, 16}, {65525, 16},
+      {0, 0},      {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {1018, 10},  {32707, 15}, {65526, 16}, {65527, 16}, {65528, 16},
+      {65529, 16}, {65530, 16}, {65531, 16}, {65532, 16}, {65533, 16},
+      {65534, 16}, {0, 0},      {0, 0},      {0, 0},      {0, 0},
+      {0, 0}};
+  static const int YQT[] = {
+      16, 11, 10, 16, 24,  40,  51,  61,  12, 12, 14, 19, 26,  58,  60,  55,
+      14, 13, 16, 24, 40,  57,  69,  56,  14, 17, 22, 29, 51,  87,  80,  62,
+      18, 22, 37, 56, 68,  109, 103, 77,  24, 35, 55, 64, 81,  104, 113, 92,
+      49, 64, 78, 87, 103, 121, 120, 101, 72, 92, 95, 98, 112, 100, 103, 99};
+  static const int UVQT[] = {17, 18, 24, 47, 99, 99, 99, 99, 18, 21, 26, 66, 99,
+                             99, 99, 99, 24, 26, 56, 99, 99, 99, 99, 99, 47, 66,
+                             99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+                             99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+                             99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99};
+  static const float aasf[] = {
+      1.0f * 2.828427125f,         1.387039845f * 2.828427125f,
+      1.306562965f * 2.828427125f, 1.175875602f * 2.828427125f,
+      1.0f * 2.828427125f,         0.785694958f * 2.828427125f,
+      0.541196100f * 2.828427125f, 0.275899379f * 2.828427125f};
+
+  int row, col, i, k;
+  float fdtbl_Y[64], fdtbl_UV[64];
+  unsigned char YTable[64], UVTable[64];
+
+  if (!data || !width || !height || comp > 4 || comp < 1) {
+    return 0;
+  }
+
+  quality = quality ? quality : 90;
+  quality = quality < 1 ? 1 : quality > 100 ? 100 : quality;
+  quality = quality < 50 ? 5000 / quality : 200 - quality * 2;
+
+  for (i = 0; i < 64; ++i) {
+    int uvti, yti = (YQT[i] * quality + 50) / 100;
+    YTable[stbiw__jpg_ZigZag[i]] =
+        (unsigned char)(yti < 1 ? 1 : yti > 255 ? 255 : yti);
+    uvti = (UVQT[i] * quality + 50) / 100;
+    UVTable[stbiw__jpg_ZigZag[i]] =
+        (unsigned char)(uvti < 1 ? 1 : uvti > 255 ? 255 : uvti);
+  }
+
+  for (row = 0, k = 0; row < 8; ++row) {
+    for (col = 0; col < 8; ++col, ++k) {
+      fdtbl_Y[k] = 1 / (YTable[stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]);
+      fdtbl_UV[k] = 1 / (UVTable[stbiw__jpg_ZigZag[k]] * aasf[row] * aasf[col]);
+    }
+  }
+
+  // Write Headers
+  {
+    static const unsigned char head0[] = {
+        0xFF, 0xD8, 0xFF, 0xE0, 0, 0x10, 'J', 'F',  'I',  'F', 0,    1, 1,
+        0,    0,    1,    0,    1, 0,    0,   0xFF, 0xDB, 0,   0x84, 0};
+    static const unsigned char head2[] = {0xFF, 0xDA, 0, 0xC,  3, 1,    0,
+                                          2,    0x11, 3, 0x11, 0, 0x3F, 0};
+    const unsigned char head1[] = {0xFF,
+                                   0xC0,
+                                   0,
+                                   0x11,
+                                   8,
+                                   (unsigned char)(height >> 8),
+                                   STBIW_UCHAR(height),
+                                   (unsigned char)(width >> 8),
+                                   STBIW_UCHAR(width),
+                                   3,
+                                   1,
+                                   0x11,
+                                   0,
+                                   2,
+                                   0x11,
+                                   1,
+                                   3,
+                                   0x11,
+                                   1,
+                                   0xFF,
+                                   0xC4,
+                                   0x01,
+                                   0xA2,
+                                   0};
+    s->func(s->context, (void *)head0, sizeof(head0));
+    s->func(s->context, (void *)YTable, sizeof(YTable));
+    stbiw__putc(s, 1);
+    s->func(s->context, UVTable, sizeof(UVTable));
+    s->func(s->context, (void *)head1, sizeof(head1));
+    s->func(s->context, (void *)(std_dc_luminance_nrcodes + 1),
+            sizeof(std_dc_luminance_nrcodes) - 1);
+    s->func(s->context, (void *)std_dc_luminance_values,
+            sizeof(std_dc_luminance_values));
+    stbiw__putc(s, 0x10);  // HTYACinfo
+    s->func(s->context, (void *)(std_ac_luminance_nrcodes + 1),
+            sizeof(std_ac_luminance_nrcodes) - 1);
+    s->func(s->context, (void *)std_ac_luminance_values,
+            sizeof(std_ac_luminance_values));
+    stbiw__putc(s, 1);  // HTUDCinfo
+    s->func(s->context, (void *)(std_dc_chrominance_nrcodes + 1),
+            sizeof(std_dc_chrominance_nrcodes) - 1);
+    s->func(s->context, (void *)std_dc_chrominance_values,
+            sizeof(std_dc_chrominance_values));
+    stbiw__putc(s, 0x11);  // HTUACinfo
+    s->func(s->context, (void *)(std_ac_chrominance_nrcodes + 1),
+            sizeof(std_ac_chrominance_nrcodes) - 1);
+    s->func(s->context, (void *)std_ac_chrominance_values,
+            sizeof(std_ac_chrominance_values));
+    s->func(s->context, (void *)head2, sizeof(head2));
+  }
+
+  // Encode 8x8 macroblocks
+  {
+    static const unsigned short fillBits[] = {0x7F, 7};
+    const unsigned char *imageData = (const unsigned char *)data;
+    int DCY = 0, DCU = 0, DCV = 0;
+    int bitBuf = 0, bitCnt = 0;
+    // comp == 2 is grey+alpha (alpha is ignored)
+    int ofsG = comp > 2 ? 1 : 0, ofsB = comp > 2 ? 2 : 0;
+    int x, y, pos;
+    for (y = 0; y < height; y += 8) {
+      for (x = 0; x < width; x += 8) {
+        float YDU[64], UDU[64], VDU[64];
+        for (row = y, pos = 0; row < y + 8; ++row) {
+          for (col = x; col < x + 8; ++col, ++pos) {
+            int p = (stbi__flip_vertically_on_write ? height - 1 - row : row) *
+                        width * comp +
+                    col * comp;
+            float r, g, b;
+            if (row >= height) {
+              p -= width * comp * (row + 1 - height);
+            }
+            if (col >= width) {
+              p -= comp * (col + 1 - width);
+            }
+
+            r = imageData[p + 0];
+            g = imageData[p + ofsG];
+            b = imageData[p + ofsB];
+            YDU[pos] = +0.29900f * r + 0.58700f * g + 0.11400f * b - 128;
+            UDU[pos] = -0.16874f * r - 0.33126f * g + 0.50000f * b;
+            VDU[pos] = +0.50000f * r - 0.41869f * g - 0.08131f * b;
+          }
+        }
+
+        DCY = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, YDU, fdtbl_Y, DCY,
+                                   YDC_HT, YAC_HT);
+        DCU = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, UDU, fdtbl_UV, DCU,
+                                   UVDC_HT, UVAC_HT);
+        DCV = stbiw__jpg_processDU(s, &bitBuf, &bitCnt, VDU, fdtbl_UV, DCV,
+                                   UVDC_HT, UVAC_HT);
+      }
+    }
+
+    // Do the bit alignment of the EOI marker
+    stbiw__jpg_writeBits(s, &bitBuf, &bitCnt, fillBits);
+  }
+
+  // EOI
+  stbiw__putc(s, 0xFF);
+  stbiw__putc(s, 0xD9);
+
+  return 1;
+}
+
+STBIWDEF int stbi_write_jpg_to_func(stbi_write_func *func, void *context, int x,
+                                    int y, int comp, const void *data,
+                                    int quality) {
+  stbi__write_context s;
+  stbi__start_write_callbacks(&s, func, context);
+  return stbi_write_jpg_core(&s, x, y, comp, (void *)data, quality);
+}
+
+#ifndef STBI_WRITE_NO_STDIO
+STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp,
+                            const void *data, int quality) {
+  stbi__write_context s;
+  if (stbi__start_write_file(&s, filename)) {
+    int r = stbi_write_jpg_core(&s, x, y, comp, data, quality);
+    stbi__end_write_file(&s);
+    return r;
+  } else
+    return 0;
+}
+#endif
+
+#endif  // STB_IMAGE_WRITE_IMPLEMENTATION
+
+/* Revision history
+      1.09  (2018-02-11)
+             fix typo in zlib quality API, improve STB_I_W_STATIC in C++
+      1.08  (2018-01-29)
+             add stbi__flip_vertically_on_write, external zlib, zlib quality,
+   choose PNG filter 1.07  (2017-07-24) doc fix 1.06 (2017-07-23) writing JPEG
+   (using Jon Olick's code) 1.05   ??? 1.04 (2017-03-03) monochrome BMP
+   expansion 1.03   ??? 1.02 (2016-04-02) avoid allocating large structures on
+   the stack 1.01 (2016-01-16) STBIW_REALLOC_SIZED: support allocators with no
+   realloc support avoid race-condition in crc initialization minor compile
+   issues 1.00 (2015-09-14) installable file IO function 0.99 (2015-09-13)
+             warning fixes; TGA rle support
+      0.98 (2015-04-08)
+             added STBIW_MALLOC, STBIW_ASSERT etc
+      0.97 (2015-01-18)
+             fixed HDR asserts, rewrote HDR rle logic
+      0.96 (2015-01-17)
+             add HDR output
+             fix monochrome BMP
+      0.95 (2014-08-17)
+           add monochrome TGA output
+      0.94 (2014-05-31)
+             rename private functions to avoid conflicts with stb_image.h
+      0.93 (2014-05-27)
+             warning fixes
+      0.92 (2010-08-01)
+             casts to unsigned char to fix warnings
+      0.91 (2010-07-17)
+             first public release
+      0.90   first internal release
+*/
+
+/*
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------
+*/
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/tiny_gltf.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/tiny_gltf.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/gltf/tiny_gltf.h	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/gltf/tiny_gltf.h	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,5389 @@
+//
+// Header-only tiny glTF 2.0 loader and serializer.
+//
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2015 - 2018 Syoyo Fujita, Aurélien Chatelain and many
+// contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+// Version:
+//  - v2.1.0 Add draco compression.
+//  - v2.0.1 Add comparsion feature(Thanks to @Selmar).
+//  - v2.0.0 glTF 2.0!.
+//
+// Tiny glTF loader is using following third party libraries:
+//
+//  - jsonhpp: C++ JSON library.
+//  - base64: base64 decode/encode library.
+//  - stb_image: Image loading library.
+//
+#ifndef TINY_GLTF_H_
+#define TINY_GLTF_H_
+
+#include <array>
+#include <cassert>
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <map>
+#include <string>
+#include <vector>
+
+#ifdef __ANDROID__
+#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
+#include <android/asset_manager.h>
+#endif
+#endif
+
+namespace tinygltf {
+
+#define TINYGLTF_MODE_POINTS (0)
+#define TINYGLTF_MODE_LINE (1)
+#define TINYGLTF_MODE_LINE_LOOP (2)
+#define TINYGLTF_MODE_LINE_STRIP (3)
+#define TINYGLTF_MODE_TRIANGLES (4)
+#define TINYGLTF_MODE_TRIANGLE_STRIP (5)
+#define TINYGLTF_MODE_TRIANGLE_FAN (6)
+
+#define TINYGLTF_COMPONENT_TYPE_BYTE (5120)
+#define TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE (5121)
+#define TINYGLTF_COMPONENT_TYPE_SHORT (5122)
+#define TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT (5123)
+#define TINYGLTF_COMPONENT_TYPE_INT (5124)
+#define TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT (5125)
+#define TINYGLTF_COMPONENT_TYPE_FLOAT (5126)
+#define TINYGLTF_COMPONENT_TYPE_DOUBLE (5130)
+
+#define TINYGLTF_TEXTURE_FILTER_NEAREST (9728)
+#define TINYGLTF_TEXTURE_FILTER_LINEAR (9729)
+#define TINYGLTF_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST (9984)
+#define TINYGLTF_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST (9985)
+#define TINYGLTF_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR (9986)
+#define TINYGLTF_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR (9987)
+
+#define TINYGLTF_TEXTURE_WRAP_REPEAT (10497)
+#define TINYGLTF_TEXTURE_WRAP_CLAMP_TO_EDGE (33071)
+#define TINYGLTF_TEXTURE_WRAP_MIRRORED_REPEAT (33648)
+
+// Redeclarations of the above for technique.parameters.
+#define TINYGLTF_PARAMETER_TYPE_BYTE (5120)
+#define TINYGLTF_PARAMETER_TYPE_UNSIGNED_BYTE (5121)
+#define TINYGLTF_PARAMETER_TYPE_SHORT (5122)
+#define TINYGLTF_PARAMETER_TYPE_UNSIGNED_SHORT (5123)
+#define TINYGLTF_PARAMETER_TYPE_INT (5124)
+#define TINYGLTF_PARAMETER_TYPE_UNSIGNED_INT (5125)
+#define TINYGLTF_PARAMETER_TYPE_FLOAT (5126)
+
+#define TINYGLTF_PARAMETER_TYPE_FLOAT_VEC2 (35664)
+#define TINYGLTF_PARAMETER_TYPE_FLOAT_VEC3 (35665)
+#define TINYGLTF_PARAMETER_TYPE_FLOAT_VEC4 (35666)
+
+#define TINYGLTF_PARAMETER_TYPE_INT_VEC2 (35667)
+#define TINYGLTF_PARAMETER_TYPE_INT_VEC3 (35668)
+#define TINYGLTF_PARAMETER_TYPE_INT_VEC4 (35669)
+
+#define TINYGLTF_PARAMETER_TYPE_BOOL (35670)
+#define TINYGLTF_PARAMETER_TYPE_BOOL_VEC2 (35671)
+#define TINYGLTF_PARAMETER_TYPE_BOOL_VEC3 (35672)
+#define TINYGLTF_PARAMETER_TYPE_BOOL_VEC4 (35673)
+
+#define TINYGLTF_PARAMETER_TYPE_FLOAT_MAT2 (35674)
+#define TINYGLTF_PARAMETER_TYPE_FLOAT_MAT3 (35675)
+#define TINYGLTF_PARAMETER_TYPE_FLOAT_MAT4 (35676)
+
+#define TINYGLTF_PARAMETER_TYPE_SAMPLER_2D (35678)
+
+// End parameter types
+
+#define TINYGLTF_TYPE_VEC2 (2)
+#define TINYGLTF_TYPE_VEC3 (3)
+#define TINYGLTF_TYPE_VEC4 (4)
+#define TINYGLTF_TYPE_MAT2 (32 + 2)
+#define TINYGLTF_TYPE_MAT3 (32 + 3)
+#define TINYGLTF_TYPE_MAT4 (32 + 4)
+#define TINYGLTF_TYPE_SCALAR (64 + 1)
+#define TINYGLTF_TYPE_VECTOR (64 + 4)
+#define TINYGLTF_TYPE_MATRIX (64 + 16)
+
+#define TINYGLTF_IMAGE_FORMAT_JPEG (0)
+#define TINYGLTF_IMAGE_FORMAT_PNG (1)
+#define TINYGLTF_IMAGE_FORMAT_BMP (2)
+#define TINYGLTF_IMAGE_FORMAT_GIF (3)
+
+#define TINYGLTF_TEXTURE_FORMAT_ALPHA (6406)
+#define TINYGLTF_TEXTURE_FORMAT_RGB (6407)
+#define TINYGLTF_TEXTURE_FORMAT_RGBA (6408)
+#define TINYGLTF_TEXTURE_FORMAT_LUMINANCE (6409)
+#define TINYGLTF_TEXTURE_FORMAT_LUMINANCE_ALPHA (6410)
+
+#define TINYGLTF_TEXTURE_TARGET_TEXTURE2D (3553)
+#define TINYGLTF_TEXTURE_TYPE_UNSIGNED_BYTE (5121)
+
+#define TINYGLTF_TARGET_ARRAY_BUFFER (34962)
+#define TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER (34963)
+
+#define TINYGLTF_SHADER_TYPE_VERTEX_SHADER (35633)
+#define TINYGLTF_SHADER_TYPE_FRAGMENT_SHADER (35632)
+
+#define TINYGLTF_DOUBLE_EPS (1.e-12)
+#define TINYGLTF_DOUBLE_EQUAL(a, b) (std::fabs((b) - (a)) < TINYGLTF_DOUBLE_EPS)
+
+#ifdef __ANDROID__
+#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
+  AAssetManager* asset_manager = nullptr;
+#endif
+#endif
+
+typedef enum {
+  NULL_TYPE = 0,
+  NUMBER_TYPE = 1,
+  INT_TYPE = 2,
+  BOOL_TYPE = 3,
+  STRING_TYPE = 4,
+  ARRAY_TYPE = 5,
+  BINARY_TYPE = 6,
+  OBJECT_TYPE = 7
+} Type;
+
+static inline int32_t GetComponentSizeInBytes(uint32_t componentType) {
+  if (componentType == TINYGLTF_COMPONENT_TYPE_BYTE) {
+    return 1;
+  } else if (componentType == TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE) {
+    return 1;
+  } else if (componentType == TINYGLTF_COMPONENT_TYPE_SHORT) {
+    return 2;
+  } else if (componentType == TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT) {
+    return 2;
+  } else if (componentType == TINYGLTF_COMPONENT_TYPE_INT) {
+    return 4;
+  } else if (componentType == TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT) {
+    return 4;
+  } else if (componentType == TINYGLTF_COMPONENT_TYPE_FLOAT) {
+    return 4;
+  } else if (componentType == TINYGLTF_COMPONENT_TYPE_DOUBLE) {
+    return 8;
+  } else {
+    // Unknown componenty type
+    return -1;
+  }
+}
+
+static inline int32_t GetTypeSizeInBytes(uint32_t ty) {
+  if (ty == TINYGLTF_TYPE_SCALAR) {
+    return 1;
+  } else if (ty == TINYGLTF_TYPE_VEC2) {
+    return 2;
+  } else if (ty == TINYGLTF_TYPE_VEC3) {
+    return 3;
+  } else if (ty == TINYGLTF_TYPE_VEC4) {
+    return 4;
+  } else if (ty == TINYGLTF_TYPE_MAT2) {
+    return 4;
+  } else if (ty == TINYGLTF_TYPE_MAT3) {
+    return 9;
+  } else if (ty == TINYGLTF_TYPE_MAT4) {
+    return 16;
+  } else {
+    // Unknown componenty type
+    return -1;
+  }
+}
+
+bool IsDataURI(const std::string &in);
+bool DecodeDataURI(std::vector<unsigned char> *out, std::string &mime_type,
+                   const std::string &in, size_t reqBytes, bool checkSize);
+
+#ifdef __clang__
+#pragma clang diagnostic push
+// Suppress warning for : static Value null_value
+// https://stackoverflow.com/questions/15708411/how-to-deal-with-global-constructor-warning-in-clang
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// Simple class to represent JSON object
+class Value {
+ public:
+  typedef std::vector<Value> Array;
+  typedef std::map<std::string, Value> Object;
+
+  Value() : type_(NULL_TYPE) {}
+
+  explicit Value(bool b) : type_(BOOL_TYPE) { boolean_value_ = b; }
+  explicit Value(int i) : type_(INT_TYPE) { int_value_ = i; }
+  explicit Value(double n) : type_(NUMBER_TYPE) { number_value_ = n; }
+  explicit Value(const std::string &s) : type_(STRING_TYPE) {
+    string_value_ = s;
+  }
+  explicit Value(const unsigned char *p, size_t n) : type_(BINARY_TYPE) {
+    binary_value_.resize(n);
+    memcpy(binary_value_.data(), p, n);
+  }
+  explicit Value(const Array &a) : type_(ARRAY_TYPE) {
+    array_value_ = Array(a);
+  }
+  explicit Value(const Object &o) : type_(OBJECT_TYPE) {
+    object_value_ = Object(o);
+  }
+
+  char Type() const { return static_cast<const char>(type_); }
+
+  bool IsBool() const { return (type_ == BOOL_TYPE); }
+
+  bool IsInt() const { return (type_ == INT_TYPE); }
+
+  bool IsNumber() const { return (type_ == NUMBER_TYPE); }
+
+  bool IsString() const { return (type_ == STRING_TYPE); }
+
+  bool IsBinary() const { return (type_ == BINARY_TYPE); }
+
+  bool IsArray() const { return (type_ == ARRAY_TYPE); }
+
+  bool IsObject() const { return (type_ == OBJECT_TYPE); }
+
+  // Accessor
+  template <typename T>
+  const T &Get() const;
+  template <typename T>
+  T &Get();
+
+  // Lookup value from an array
+  const Value &Get(int idx) const {
+    static Value null_value;
+    assert(IsArray());
+    assert(idx >= 0);
+    return (static_cast<size_t>(idx) < array_value_.size())
+               ? array_value_[static_cast<size_t>(idx)]
+               : null_value;
+  }
+
+  // Lookup value from a key-value pair
+  const Value &Get(const std::string &key) const {
+    static Value null_value;
+    assert(IsObject());
+    Object::const_iterator it = object_value_.find(key);
+    return (it != object_value_.end()) ? it->second : null_value;
+  }
+
+  size_t ArrayLen() const {
+    if (!IsArray()) return 0;
+    return array_value_.size();
+  }
+
+  // Valid only for object type.
+  bool Has(const std::string &key) const {
+    if (!IsObject()) return false;
+    Object::const_iterator it = object_value_.find(key);
+    return (it != object_value_.end()) ? true : false;
+  }
+
+  // List keys
+  std::vector<std::string> Keys() const {
+    std::vector<std::string> keys;
+    if (!IsObject()) return keys;  // empty
+
+    for (Object::const_iterator it = object_value_.begin();
+         it != object_value_.end(); ++it) {
+      keys.push_back(it->first);
+    }
+
+    return keys;
+  }
+
+  size_t Size() const { return (IsArray() ? ArrayLen() : Keys().size()); }
+
+  bool operator==(const tinygltf::Value &other) const;
+
+ protected:
+  int type_;
+
+  int int_value_;
+  double number_value_;
+  std::string string_value_;
+  std::vector<unsigned char> binary_value_;
+  Array array_value_;
+  Object object_value_;
+  bool boolean_value_;
+};
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#define TINYGLTF_VALUE_GET(ctype, var)            \
+  template <>                                     \
+  inline const ctype &Value::Get<ctype>() const { \
+    return var;                                   \
+  }                                               \
+  template <>                                     \
+  inline ctype &Value::Get<ctype>() {             \
+    return var;                                   \
+  }
+TINYGLTF_VALUE_GET(bool, boolean_value_)
+TINYGLTF_VALUE_GET(double, number_value_)
+TINYGLTF_VALUE_GET(int, int_value_)
+TINYGLTF_VALUE_GET(std::string, string_value_)
+TINYGLTF_VALUE_GET(std::vector<unsigned char>, binary_value_)
+TINYGLTF_VALUE_GET(Value::Array, array_value_)
+TINYGLTF_VALUE_GET(Value::Object, object_value_)
+#undef TINYGLTF_VALUE_GET
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat"
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+/// Agregate object for representing a color
+using ColorValue = std::array<double, 4>;
+
+struct Parameter {
+  bool bool_value = false;
+  bool has_number_value = false;
+  std::string string_value;
+  std::vector<double> number_array;
+  std::map<std::string, double> json_double_value;
+  double number_value = 0.0;
+  // context sensitive methods. depending the type of the Parameter you are
+  // accessing, these are either valid or not
+  // If this parameter represent a texture map in a material, will return the
+  // texture index
+
+  /// Return the index of a texture if this Parameter is a texture map.
+  /// Returned value is only valid if the parameter represent a texture from a
+  /// material
+  int TextureIndex() const {
+    const auto it = json_double_value.find("index");
+    if (it != std::end(json_double_value)) {
+      return int(it->second);
+    }
+    return -1;
+  }
+
+  /// Material factor, like the roughness or metalness of a material
+  /// Returned value is only valid if the parameter represent a texture from a
+  /// material
+  double Factor() const { return number_value; }
+
+  /// Return the color of a material
+  /// Returned value is only valid if the parameter represent a texture from a
+  /// material
+  ColorValue ColorFactor() const {
+    return {
+        {// this agregate intialize the std::array object, and uses C++11 RVO.
+         number_array[0], number_array[1], number_array[2],
+         (number_array.size() > 3 ? number_array[3] : 1.0)}};
+  }
+
+  bool operator==(const Parameter &) const;
+};
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+typedef std::map<std::string, Parameter> ParameterMap;
+typedef std::map<std::string, Value> ExtensionMap;
+
+struct AnimationChannel {
+  int sampler;              // required
+  int target_node;          // required (index of the node to target)
+  std::string target_path;  // required in ["translation", "rotation", "scale",
+                            // "weights"]
+  Value extras;
+
+  AnimationChannel() : sampler(-1), target_node(-1) {}
+  bool operator==(const AnimationChannel &) const;
+};
+
+struct AnimationSampler {
+  int input;                  // required
+  int output;                 // required
+  std::string interpolation;  // in ["LINEAR", "STEP", "CATMULLROMSPLINE",
+                              // "CUBICSPLINE"], default "LINEAR"
+  Value extras;
+
+  AnimationSampler() : input(-1), output(-1), interpolation("LINEAR") {}
+  bool operator==(const AnimationSampler &) const;
+};
+
+struct Animation {
+  std::string name;
+  std::vector<AnimationChannel> channels;
+  std::vector<AnimationSampler> samplers;
+  Value extras;
+
+  bool operator==(const Animation &) const;
+};
+
+struct Skin {
+  std::string name;
+  int inverseBindMatrices;  // required here but not in the spec
+  int skeleton;             // The index of the node used as a skeleton root
+  std::vector<int> joints;  // Indices of skeleton nodes
+
+  Skin() {
+    inverseBindMatrices = -1;
+    skeleton = -1;
+  }
+  bool operator==(const Skin &) const;
+};
+
+struct Sampler {
+  std::string name;
+  int minFilter;  // ["NEAREST", "LINEAR", "NEAREST_MIPMAP_LINEAR",
+                  // "LINEAR_MIPMAP_NEAREST", "NEAREST_MIPMAP_LINEAR",
+                  // "LINEAR_MIPMAP_LINEAR"]
+  int magFilter;  // ["NEAREST", "LINEAR"]
+  int wrapS;      // ["CLAMP_TO_EDGE", "MIRRORED_REPEAT", "REPEAT"], default
+                  // "REPEAT"
+  int wrapT;      // ["CLAMP_TO_EDGE", "MIRRORED_REPEAT", "REPEAT"], default
+                  // "REPEAT"
+  int wrapR;      // TinyGLTF extension
+  Value extras;
+
+  Sampler()
+      : wrapS(TINYGLTF_TEXTURE_WRAP_REPEAT),
+        wrapT(TINYGLTF_TEXTURE_WRAP_REPEAT),
+        wrapR(TINYGLTF_TEXTURE_WRAP_REPEAT){}
+  bool operator==(const Sampler &) const;
+};
+
+struct Image {
+  std::string name;
+  int width;
+  int height;
+  int component;
+  std::vector<unsigned char> image;
+  int bufferView;        // (required if no uri)
+  std::string mimeType;  // (required if no uri) ["image/jpeg", "image/png",
+                         // "image/bmp", "image/gif"]
+  std::string uri;       // (required if no mimeType)
+  Value extras;
+  ExtensionMap extensions;
+
+  // When this flag is true, data is stored to `image` in as-is format(e.g. jpeg
+  // compressed for "image/jpeg" mime) This feature is good if you use custom
+  // image loader function. (e.g. delayed decoding of images for faster glTF
+  // parsing) Default parser for Image does not provide as-is loading feature at
+  // the moment. (You can manipulate this by providing your own LoadImageData
+  // function)
+  bool as_is;
+
+  Image() : as_is(false) {
+    bufferView = -1;
+    width = -1;
+    height = -1;
+    component = -1;
+  }
+  bool operator==(const Image &) const;
+};
+
+struct Texture {
+  std::string name;
+
+  int sampler;
+  int source;
+  Value extras;
+  ExtensionMap extensions;
+
+  Texture() : sampler(-1), source(-1) {}
+  bool operator==(const Texture &) const;
+};
+
+// Each extension should be stored in a ParameterMap.
+// members not in the values could be included in the ParameterMap
+// to keep a single material model
+struct Material {
+  std::string name;
+
+  ParameterMap values;            // PBR metal/roughness workflow
+  ParameterMap additionalValues;  // normal/occlusion/emissive values
+
+  ExtensionMap extensions;
+  Value extras;
+
+  bool operator==(const Material &) const;
+};
+
+struct BufferView {
+  std::string name;
+  int buffer;         // Required
+  size_t byteOffset;  // minimum 0, default 0
+  size_t byteLength;  // required, minimum 1
+  size_t byteStride;  // minimum 4, maximum 252 (multiple of 4), default 0 =
+                      // understood to be tightly packed
+  int target;         // ["ARRAY_BUFFER", "ELEMENT_ARRAY_BUFFER"]
+  Value extras;
+  bool dracoDecoded;  // Flag indicating this has been draco decoded
+
+  BufferView() : byteOffset(0), byteStride(0), dracoDecoded(false) {}
+  bool operator==(const BufferView &) const;
+};
+
+struct Accessor {
+  int bufferView;  // optional in spec but required here since sparse accessor
+                   // are not supported
+  std::string name;
+  size_t byteOffset;
+  bool normalized;    // optinal.
+  int componentType;  // (required) One of TINYGLTF_COMPONENT_TYPE_***
+  size_t count;       // required
+  int type;           // (required) One of TINYGLTF_TYPE_***   ..
+  Value extras;
+
+  std::vector<double> minValues;  // optional
+  std::vector<double> maxValues;  // optional
+
+  // TODO(syoyo): "sparse"
+
+  ///
+  /// Utility function to compute byteStride for a given bufferView object.
+  /// Returns -1 upon invalid glTF value or parameter configuration.
+  ///
+  int ByteStride(const BufferView &bufferViewObject) const {
+    if (bufferViewObject.byteStride == 0) {
+      // Assume data is tightly packed.
+      int componentSizeInBytes =
+          GetComponentSizeInBytes(static_cast<uint32_t>(componentType));
+      if (componentSizeInBytes <= 0) {
+        return -1;
+      }
+
+      int typeSizeInBytes = GetTypeSizeInBytes(static_cast<uint32_t>(type));
+      if (typeSizeInBytes <= 0) {
+        return -1;
+      }
+
+      return componentSizeInBytes * typeSizeInBytes;
+    } else {
+      // Check if byteStride is a mulple of the size of the accessor's component
+      // type.
+      int componentSizeInBytes =
+          GetComponentSizeInBytes(static_cast<uint32_t>(componentType));
+      if (componentSizeInBytes <= 0) {
+        return -1;
+      }
+
+      if ((bufferViewObject.byteStride % uint32_t(componentSizeInBytes)) != 0) {
+        return -1;
+      }
+      return static_cast<int>(bufferViewObject.byteStride);
+    }
+
+    return 0;
+  }
+
+  Accessor() { bufferView = -1; }
+  bool operator==(const tinygltf::Accessor &) const;
+};
+
+struct PerspectiveCamera {
+  double aspectRatio;  // min > 0
+  double yfov;         // required. min > 0
+  double zfar;         // min > 0
+  double znear;        // required. min > 0
+
+  PerspectiveCamera()
+      : aspectRatio(0.0),
+        yfov(0.0),
+        zfar(0.0)  // 0 = use infinite projecton matrix
+        ,
+        znear(0.0) {}
+  bool operator==(const PerspectiveCamera &) const;
+
+  ExtensionMap extensions;
+  Value extras;
+};
+
+struct OrthographicCamera {
+  double xmag;   // required. must not be zero.
+  double ymag;   // required. must not be zero.
+  double zfar;   // required. `zfar` must be greater than `znear`.
+  double znear;  // required
+
+  OrthographicCamera() : xmag(0.0), ymag(0.0), zfar(0.0), znear(0.0) {}
+  bool operator==(const OrthographicCamera &) const;
+
+  ExtensionMap extensions;
+  Value extras;
+};
+
+struct Camera {
+  std::string type;  // required. "perspective" or "orthographic"
+  std::string name;
+
+  PerspectiveCamera perspective;
+  OrthographicCamera orthographic;
+
+  Camera() {}
+  bool operator==(const Camera &) const;
+
+  ExtensionMap extensions;
+  Value extras;
+};
+
+struct Primitive {
+  std::map<std::string, int> attributes;  // (required) A dictionary object of
+                                          // integer, where each integer
+                                          // is the index of the accessor
+                                          // containing an attribute.
+  int material;  // The index of the material to apply to this primitive
+                 // when rendering.
+  int indices;   // The index of the accessor that contains the indices.
+  int mode;      // one of TINYGLTF_MODE_***
+  std::vector<std::map<std::string, int> > targets;  // array of morph targets,
+  // where each target is a dict with attribues in ["POSITION, "NORMAL",
+  // "TANGENT"] pointing
+  // to their corresponding accessors
+  ExtensionMap extensions;
+  Value extras;
+
+  Primitive() {
+    material = -1;
+    indices = -1;
+  }
+  bool operator==(const Primitive &) const;
+};
+
+struct Mesh {
+  std::string name;
+  std::vector<Primitive> primitives;
+  std::vector<double> weights;  // weights to be applied to the Morph Targets
+  std::vector<std::map<std::string, int> > targets;
+  ExtensionMap extensions;
+  Value extras;
+
+  bool operator==(const Mesh &) const;
+};
+
+class Node {
+ public:
+  Node() : camera(-1), skin(-1), mesh(-1) {}
+
+  Node(const Node &rhs) {
+    camera = rhs.camera;
+
+    name = rhs.name;
+    skin = rhs.skin;
+    mesh = rhs.mesh;
+    children = rhs.children;
+    rotation = rhs.rotation;
+    scale = rhs.scale;
+    translation = rhs.translation;
+    matrix = rhs.matrix;
+    weights = rhs.weights;
+
+    extensions = rhs.extensions;
+    extras = rhs.extras;
+  }
+  ~Node() {}
+  bool operator==(const Node &) const;
+
+  int camera;  // the index of the camera referenced by this node
+
+  std::string name;
+  int skin;
+  int mesh;
+  std::vector<int> children;
+  std::vector<double> rotation;     // length must be 0 or 4
+  std::vector<double> scale;        // length must be 0 or 3
+  std::vector<double> translation;  // length must be 0 or 3
+  std::vector<double> matrix;       // length must be 0 or 16
+  std::vector<double> weights;  // The weights of the instantiated Morph Target
+
+  ExtensionMap extensions;
+  Value extras;
+};
+
+struct Buffer {
+  std::string name;
+  std::vector<unsigned char> data;
+  std::string
+      uri;  // considered as required here but not in the spec (need to clarify)
+  Value extras;
+
+  bool operator==(const Buffer &) const;
+};
+
+struct Asset {
+  std::string version;  // required
+  std::string generator;
+  std::string minVersion;
+  std::string copyright;
+  ExtensionMap extensions;
+  Value extras;
+
+  bool operator==(const Asset &) const;
+};
+
+struct Scene {
+  std::string name;
+  std::vector<int> nodes;
+
+  ExtensionMap extensions;
+  Value extras;
+
+  bool operator==(const Scene &) const;
+};
+
+struct Light {
+  std::string name;
+  std::vector<double> color;
+  std::string type;
+
+  bool operator==(const Light &) const;
+};
+
+class Model {
+ public:
+  Model() {}
+  ~Model() {}
+  bool operator==(const Model &) const;
+
+  std::vector<Accessor> accessors;
+  std::vector<Animation> animations;
+  std::vector<Buffer> buffers;
+  std::vector<BufferView> bufferViews;
+  std::vector<Material> materials;
+  std::vector<Mesh> meshes;
+  std::vector<Node> nodes;
+  std::vector<Texture> textures;
+  std::vector<Image> images;
+  std::vector<Skin> skins;
+  std::vector<Sampler> samplers;
+  std::vector<Camera> cameras;
+  std::vector<Scene> scenes;
+  std::vector<Light> lights;
+  ExtensionMap extensions;
+
+  int defaultScene;
+  std::vector<std::string> extensionsUsed;
+  std::vector<std::string> extensionsRequired;
+
+  Asset asset;
+
+  Value extras;
+};
+
+enum SectionCheck {
+  NO_REQUIRE = 0x00,
+  REQUIRE_SCENE = 0x01,
+  REQUIRE_SCENES = 0x02,
+  REQUIRE_NODES = 0x04,
+  REQUIRE_ACCESSORS = 0x08,
+  REQUIRE_BUFFERS = 0x10,
+  REQUIRE_BUFFER_VIEWS = 0x20,
+  REQUIRE_ALL = 0x3f
+};
+
+///
+/// LoadImageDataFunction type. Signature for custom image loading callbacks.
+///
+typedef bool (*LoadImageDataFunction)(Image *, const int, std::string *, std::string *,
+                                      int, int, const unsigned char *, int,
+                                      void *);
+
+///
+/// WriteImageDataFunction type. Signature for custom image writing callbacks.
+///
+typedef bool (*WriteImageDataFunction)(const std::string *, const std::string *,
+                                       Image *, bool, void *);
+
+#ifndef TINYGLTF_NO_STB_IMAGE
+// Declaration of default image loader callback
+bool LoadImageData(Image *image, const int image_idx, std::string *err, std::string *warn,
+                   int req_width, int req_height, const unsigned char *bytes,
+                   int size, void *);
+#endif
+
+#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
+// Declaration of default image writer callback
+bool WriteImageData(const std::string *basepath, const std::string *filename,
+                    Image *image, bool embedImages, void *);
+#endif
+
+///
+/// FilExistsFunction type. Signature for custom filesystem callbacks.
+///
+typedef bool (*FileExistsFunction)(const std::string &abs_filename, void *);
+
+///
+/// ExpandFilePathFunction type. Signature for custom filesystem callbacks.
+///
+typedef std::string (*ExpandFilePathFunction)(const std::string &, void *);
+
+///
+/// ReadWholeFileFunction type. Signature for custom filesystem callbacks.
+///
+typedef bool (*ReadWholeFileFunction)(std::vector<unsigned char> *,
+                                      std::string *, const std::string &,
+                                      void *);
+
+///
+/// WriteWholeFileFunction type. Signature for custom filesystem callbacks.
+///
+typedef bool (*WriteWholeFileFunction)(std::string *, const std::string &,
+                                       const std::vector<unsigned char> &,
+                                       void *);
+
+///
+/// A structure containing all required filesystem callbacks and a pointer to
+/// their user data.
+///
+struct FsCallbacks {
+  FileExistsFunction FileExists;
+  ExpandFilePathFunction ExpandFilePath;
+  ReadWholeFileFunction ReadWholeFile;
+  WriteWholeFileFunction WriteWholeFile;
+
+  void *user_data;  // An argument that is passed to all fs callbacks
+};
+
+#ifndef TINYGLTF_NO_FS
+// Declaration of default filesystem callbacks
+
+bool FileExists(const std::string &abs_filename, void *);
+
+std::string ExpandFilePath(const std::string &filepath, void *);
+
+bool ReadWholeFile(std::vector<unsigned char> *out, std::string *err,
+                   const std::string &filepath, void *);
+
+bool WriteWholeFile(std::string *err, const std::string &filepath,
+                    const std::vector<unsigned char> &contents, void *);
+#endif
+
+class TinyGLTF {
+ public:
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat"
+#endif
+
+  TinyGLTF() : bin_data_(nullptr), bin_size_(0), is_binary_(false) {}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+  ~TinyGLTF() {}
+
+  ///
+  /// Loads glTF ASCII asset from a file.
+  /// Set warning message to `warn` for example it fails to load asserts.
+  /// Returns false and set error string to `err` if there's an error.
+  ///
+  bool LoadASCIIFromFile(Model *model, std::string *err, std::string *warn,
+                         const std::string &filename,
+                         unsigned int check_sections = REQUIRE_ALL);
+
+  ///
+  /// Loads glTF ASCII asset from string(memory).
+  /// `length` = strlen(str);
+  /// Set warning message to `warn` for example it fails to load asserts.
+  /// Returns false and set error string to `err` if there's an error.
+  ///
+  bool LoadASCIIFromString(Model *model, std::string *err, std::string *warn,
+                           const char *str, const unsigned int length,
+                           const std::string &base_dir,
+                           unsigned int check_sections = REQUIRE_ALL);
+
+  ///
+  /// Loads glTF binary asset from a file.
+  /// Set warning message to `warn` for example it fails to load asserts.
+  /// Returns false and set error string to `err` if there's an error.
+  ///
+  bool LoadBinaryFromFile(Model *model, std::string *err, std::string *warn,
+                          const std::string &filename,
+                          unsigned int check_sections = REQUIRE_ALL);
+
+  ///
+  /// Loads glTF binary asset from memory.
+  /// `length` = strlen(str);
+  /// Set warning message to `warn` for example it fails to load asserts.
+  /// Returns false and set error string to `err` if there's an error.
+  ///
+  bool LoadBinaryFromMemory(Model *model, std::string *err, std::string *warn,
+                            const unsigned char *bytes,
+                            const unsigned int length,
+                            const std::string &base_dir = "",
+                            unsigned int check_sections = REQUIRE_ALL);
+
+  ///
+  /// Write glTF to file.
+  ///
+  bool WriteGltfSceneToFile(Model *model, const std::string &filename,
+                            bool embedImages,
+                            bool embedBuffers,
+                            bool prettyPrint,
+                            bool writeBinary);
+  ///
+  /// Write glTF to binary stream.
+  ///
+  bool WriteGltfSceneToBinaryStream(Model *model,
+                              const std::string& filename,
+                              std::ostream& output,
+                              bool embedImages,
+                              bool embedBuffers);
+
+  ///
+  /// Set callback to use for loading image data
+  ///
+  void SetImageLoader(LoadImageDataFunction LoadImageData, void *user_data);
+
+  ///
+  /// Set callback to use for writing image data
+  ///
+  void SetImageWriter(WriteImageDataFunction WriteImageData, void *user_data);
+
+  ///
+  /// Set callbacks to use for filesystem (fs) access and their user data
+  ///
+  void SetFsCallbacks(FsCallbacks callbacks);
+
+ private:
+  ///
+  /// Loads glTF asset from string(memory).
+  /// `length` = strlen(str);
+  /// Set warning message to `warn` for example it fails to load asserts
+  /// Returns false and set error string to `err` if there's an error.
+  ///
+  bool LoadFromString(Model *model, std::string *err, std::string *warn,
+                      const char *str, const unsigned int length,
+                      const std::string &base_dir, unsigned int check_sections);
+
+  const unsigned char *bin_data_;
+  size_t bin_size_;
+  bool is_binary_;
+
+  FsCallbacks fs = {
+#ifndef TINYGLTF_NO_FS
+      &tinygltf::FileExists, &tinygltf::ExpandFilePath,
+      &tinygltf::ReadWholeFile, &tinygltf::WriteWholeFile,
+
+      nullptr  // Fs callback user data
+#else
+      nullptr, nullptr, nullptr, nullptr,
+
+      nullptr  // Fs callback user data
+#endif
+  };
+
+  LoadImageDataFunction LoadImageData =
+#ifndef TINYGLTF_NO_STB_IMAGE
+      &tinygltf::LoadImageData;
+#else
+      nullptr;
+#endif
+  void *load_image_user_data_ = reinterpret_cast<void *>(&fs);
+
+  WriteImageDataFunction WriteImageData =
+#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
+      &tinygltf::WriteImageData;
+#else
+      nullptr;
+#endif
+  void *write_image_user_data_ = reinterpret_cast<void *>(&fs);
+};
+
+#ifdef __clang__
+#pragma clang diagnostic pop  // -Wpadded
+#endif
+
+}  // namespace tinygltf
+
+#endif  // TINY_GLTF_H_
+
+#if defined(TINYGLTF_IMPLEMENTATION) || defined(__INTELLISENSE__)
+#include <algorithm>
+//#include <cassert>
+#ifndef TINYGLTF_NO_FS
+#include <fstream>
+#endif
+#include <sstream>
+
+#ifdef __clang__
+// Disable some warnings for external files.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wfloat-equal"
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wconversion"
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic ignored "-Wglobal-constructors"
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
+#pragma clang diagnostic ignored "-Wpadded"
+#pragma clang diagnostic ignored "-Wc++98-compat"
+#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
+#pragma clang diagnostic ignored "-Wswitch-enum"
+#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#pragma clang diagnostic ignored "-Wcovered-switch-default"
+#if __has_warning("-Wdouble-promotion")
+#pragma clang diagnostic ignored "-Wdouble-promotion"
+#endif
+#if __has_warning("-Wcomma")
+#pragma clang diagnostic ignored "-Wcomma"
+#endif
+#if __has_warning("-Wzero-as-null-pointer-constant")
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+#if __has_warning("-Wcast-qual")
+#pragma clang diagnostic ignored "-Wcast-qual"
+#endif
+#if __has_warning("-Wmissing-variable-declarations")
+#pragma clang diagnostic ignored "-Wmissing-variable-declarations"
+#endif
+#if __has_warning("-Wmissing-prototypes")
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
+#endif
+#if __has_warning("-Wcast-align")
+#pragma clang diagnostic ignored "-Wcast-align"
+#endif
+#if __has_warning("-Wnewline-eof")
+#pragma clang diagnostic ignored "-Wnewline-eof"
+#endif
+#endif
+
+#include "json.hpp"
+
+#ifdef TINYGLTF_ENABLE_DRACO
+#include "draco/core/decoder_buffer.h"
+#include "draco/compression/decode.h"
+#endif
+
+#ifndef TINYGLTF_NO_STB_IMAGE
+#include "stb_image.h"
+#endif
+
+#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
+#include "stb_image_write.h"
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#ifdef _WIN32
+#include <windows.h>
+#elif !defined(__ANDROID__)
+#include <wordexp.h>
+#endif
+
+#if defined(__sparcv9)
+// Big endian
+#else
+#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || MINIZ_X86_OR_X64_CPU
+#define TINYGLTF_LITTLE_ENDIAN 1
+#endif
+#endif
+
+using nlohmann::json;
+
+#ifdef __APPLE__
+#include "TargetConditionals.h"
+#endif
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat"
+#endif
+
+namespace tinygltf {
+
+// Equals function for Value, for recursivity
+static bool Equals(const tinygltf::Value &one, const tinygltf::Value &other) {
+  if (one.Type() != other.Type()) return false;
+
+  switch (one.Type()) {
+    case NULL_TYPE:
+      return true;
+    case BOOL_TYPE:
+      return one.Get<bool>() == other.Get<bool>();
+    case NUMBER_TYPE:
+      return TINYGLTF_DOUBLE_EQUAL(one.Get<double>(), other.Get<double>());
+    case INT_TYPE:
+      return one.Get<int>() == other.Get<int>();
+    case OBJECT_TYPE: {
+      auto oneObj = one.Get<tinygltf::Value::Object>();
+      auto otherObj = other.Get<tinygltf::Value::Object>();
+      if (oneObj.size() != otherObj.size()) return false;
+      for (auto &it : oneObj) {
+        auto otherIt = otherObj.find(it.first);
+        if (otherIt == otherObj.end()) return false;
+
+        if (!Equals(it.second, otherIt->second)) return false;
+      }
+      return true;
+    }
+    case ARRAY_TYPE: {
+      if (one.Size() != other.Size()) return false;
+      for (int i = 0; i < int(one.Size()); ++i)
+        if (Equals(one.Get(i), other.Get(i))) return false;
+      return true;
+    }
+    case STRING_TYPE:
+      return one.Get<std::string>() == other.Get<std::string>();
+    case BINARY_TYPE:
+      return one.Get<std::vector<unsigned char> >() ==
+             other.Get<std::vector<unsigned char> >();
+    default: {
+      // unhandled type
+      return false;
+    }
+  }
+}
+
+// Equals function for std::vector<double> using TINYGLTF_DOUBLE_EPSILON
+static bool Equals(const std::vector<double> &one,
+                   const std::vector<double> &other) {
+  if (one.size() != other.size()) return false;
+  for (int i = 0; i < int(one.size()); ++i) {
+    if (!TINYGLTF_DOUBLE_EQUAL(one[size_t(i)], other[size_t(i)])) return false;
+  }
+  return true;
+}
+
+bool Accessor::operator==(const Accessor &other) const {
+  return this->bufferView == other.bufferView &&
+         this->byteOffset == other.byteOffset &&
+         this->componentType == other.componentType &&
+         this->count == other.count && this->extras == other.extras &&
+         Equals(this->maxValues, other.maxValues) &&
+         Equals(this->minValues, other.minValues) && this->name == other.name &&
+         this->normalized == other.normalized && this->type == other.type;
+}
+bool Animation::operator==(const Animation &other) const {
+  return this->channels == other.channels && this->extras == other.extras &&
+         this->name == other.name && this->samplers == other.samplers;
+}
+bool AnimationChannel::operator==(const AnimationChannel &other) const {
+  return this->extras == other.extras &&
+         this->target_node == other.target_node &&
+         this->target_path == other.target_path &&
+         this->sampler == other.sampler;
+}
+bool AnimationSampler::operator==(const AnimationSampler &other) const {
+  return this->extras == other.extras && this->input == other.input &&
+         this->interpolation == other.interpolation &&
+         this->output == other.output;
+}
+bool Asset::operator==(const Asset &other) const {
+  return this->copyright == other.copyright &&
+         this->extensions == other.extensions && this->extras == other.extras &&
+         this->generator == other.generator &&
+         this->minVersion == other.minVersion && this->version == other.version;
+}
+bool Buffer::operator==(const Buffer &other) const {
+  return this->data == other.data && this->extras == other.extras &&
+         this->name == other.name && this->uri == other.uri;
+}
+bool BufferView::operator==(const BufferView &other) const {
+  return this->buffer == other.buffer && this->byteLength == other.byteLength &&
+         this->byteOffset == other.byteOffset &&
+         this->byteStride == other.byteStride && this->name == other.name &&
+         this->target == other.target && this->extras == other.extras &&
+         this->dracoDecoded == other.dracoDecoded;
+}
+bool Camera::operator==(const Camera &other) const {
+  return this->name == other.name && this->extensions == other.extensions &&
+         this->extras == other.extras &&
+         this->orthographic == other.orthographic &&
+         this->perspective == other.perspective && this->type == other.type;
+}
+bool Image::operator==(const Image &other) const {
+  return this->bufferView == other.bufferView &&
+         this->component == other.component && this->extras == other.extras &&
+         this->height == other.height && this->image == other.image &&
+         this->mimeType == other.mimeType && this->name == other.name &&
+         this->uri == other.uri && this->width == other.width;
+}
+bool Light::operator==(const Light &other) const {
+  return Equals(this->color, other.color) && this->name == other.name &&
+         this->type == other.type;
+}
+bool Material::operator==(const Material &other) const {
+  return this->additionalValues == other.additionalValues &&
+         this->extensions == other.extensions && this->extras == other.extras &&
+         this->name == other.name && this->values == other.values;
+}
+bool Mesh::operator==(const Mesh &other) const {
+  return this->extensions == other.extensions && this->extras == other.extras &&
+         this->name == other.name && this->primitives == other.primitives &&
+         this->targets == other.targets && Equals(this->weights, other.weights);
+}
+bool Model::operator==(const Model &other) const {
+  return this->accessors == other.accessors &&
+         this->animations == other.animations && this->asset == other.asset &&
+         this->buffers == other.buffers &&
+         this->bufferViews == other.bufferViews &&
+         this->cameras == other.cameras &&
+         this->defaultScene == other.defaultScene &&
+         this->extensions == other.extensions &&
+         this->extensionsRequired == other.extensionsRequired &&
+         this->extensionsUsed == other.extensionsUsed &&
+         this->extras == other.extras && this->images == other.images &&
+         this->lights == other.lights && this->materials == other.materials &&
+         this->meshes == other.meshes && this->nodes == other.nodes &&
+         this->samplers == other.samplers && this->scenes == other.scenes &&
+         this->skins == other.skins && this->textures == other.textures;
+}
+bool Node::operator==(const Node &other) const {
+  return this->camera == other.camera && this->children == other.children &&
+         this->extensions == other.extensions && this->extras == other.extras &&
+         Equals(this->matrix, other.matrix) && this->mesh == other.mesh &&
+         this->name == other.name && Equals(this->rotation, other.rotation) &&
+         Equals(this->scale, other.scale) && this->skin == other.skin &&
+         Equals(this->translation, other.translation) &&
+         Equals(this->weights, other.weights);
+}
+bool OrthographicCamera::operator==(const OrthographicCamera &other) const {
+  return this->extensions == other.extensions && this->extras == other.extras &&
+         TINYGLTF_DOUBLE_EQUAL(this->xmag, other.xmag) &&
+         TINYGLTF_DOUBLE_EQUAL(this->ymag, other.ymag) &&
+         TINYGLTF_DOUBLE_EQUAL(this->zfar, other.zfar) &&
+         TINYGLTF_DOUBLE_EQUAL(this->znear, other.znear);
+}
+bool Parameter::operator==(const Parameter &other) const {
+  if (this->bool_value != other.bool_value ||
+      this->has_number_value != other.has_number_value)
+    return false;
+
+  if (!TINYGLTF_DOUBLE_EQUAL(this->number_value, other.number_value))
+    return false;
+
+  if (this->json_double_value.size() != other.json_double_value.size())
+    return false;
+  for (auto &it : this->json_double_value) {
+    auto otherIt = other.json_double_value.find(it.first);
+    if (otherIt == other.json_double_value.end()) return false;
+
+    if (!TINYGLTF_DOUBLE_EQUAL(it.second, otherIt->second)) return false;
+  }
+
+  if (!Equals(this->number_array, other.number_array)) return false;
+
+  if (this->string_value != other.string_value) return false;
+
+  return true;
+}
+bool PerspectiveCamera::operator==(const PerspectiveCamera &other) const {
+  return TINYGLTF_DOUBLE_EQUAL(this->aspectRatio, other.aspectRatio) &&
+         this->extensions == other.extensions && this->extras == other.extras &&
+         TINYGLTF_DOUBLE_EQUAL(this->yfov, other.yfov) &&
+         TINYGLTF_DOUBLE_EQUAL(this->zfar, other.zfar) &&
+         TINYGLTF_DOUBLE_EQUAL(this->znear, other.znear);
+}
+bool Primitive::operator==(const Primitive &other) const {
+  return this->attributes == other.attributes && this->extras == other.extras &&
+         this->indices == other.indices && this->material == other.material &&
+         this->mode == other.mode && this->targets == other.targets;
+}
+bool Sampler::operator==(const Sampler &other) const {
+  return this->extras == other.extras && this->magFilter == other.magFilter &&
+         this->minFilter == other.minFilter && this->name == other.name &&
+         this->wrapR == other.wrapR && this->wrapS == other.wrapS &&
+         this->wrapT == other.wrapT;
+}
+bool Scene::operator==(const Scene &other) const {
+  return this->extensions == other.extensions && this->extras == other.extras &&
+         this->name == other.name && this->nodes == other.nodes;
+  ;
+}
+bool Skin::operator==(const Skin &other) const {
+  return this->inverseBindMatrices == other.inverseBindMatrices &&
+         this->joints == other.joints && this->name == other.name &&
+         this->skeleton == other.skeleton;
+}
+bool Texture::operator==(const Texture &other) const {
+  return this->extensions == other.extensions && this->extras == other.extras &&
+         this->name == other.name && this->sampler == other.sampler &&
+         this->source == other.source;
+}
+bool Value::operator==(const Value &other) const {
+  return Equals(*this, other);
+}
+
+static void swap4(unsigned int *val) {
+#ifdef TINYGLTF_LITTLE_ENDIAN
+  (void)val;
+#else
+  unsigned int tmp = *val;
+  unsigned char *dst = reinterpret_cast<unsigned char *>(val);
+  unsigned char *src = reinterpret_cast<unsigned char *>(&tmp);
+
+  dst[0] = src[3];
+  dst[1] = src[2];
+  dst[2] = src[1];
+  dst[3] = src[0];
+#endif
+}
+
+static std::string JoinPath(const std::string &path0,
+                            const std::string &path1) {
+  if (path0.empty()) {
+    return path1;
+  } else {
+    // check '/'
+    char lastChar = *path0.rbegin();
+    if (lastChar != '/') {
+      return path0 + std::string("/") + path1;
+    } else {
+      return path0 + path1;
+    }
+  }
+}
+
+static std::string FindFile(const std::vector<std::string> &paths,
+                            const std::string &filepath, FsCallbacks *fs) {
+  if (fs == nullptr || fs->ExpandFilePath == nullptr ||
+      fs->FileExists == nullptr) {
+    // Error, fs callback[s] missing
+    return std::string();
+  }
+
+  for (size_t i = 0; i < paths.size(); i++) {
+    std::string absPath =
+        fs->ExpandFilePath(JoinPath(paths[i], filepath), fs->user_data);
+    if (fs->FileExists(absPath, fs->user_data)) {
+      return absPath;
+    }
+  }
+
+  return std::string();
+}
+
+static std::string GetFilePathExtension(const std::string &FileName) {
+  if (FileName.find_last_of(".") != std::string::npos)
+    return FileName.substr(FileName.find_last_of(".") + 1);
+  return "";
+}
+
+static std::string GetBaseDir(const std::string &filepath) {
+  if (filepath.find_last_of("/\\") != std::string::npos)
+    return filepath.substr(0, filepath.find_last_of("/\\"));
+  return "";
+}
+
+// https://stackoverflow.com/questions/8520560/get-a-file-name-from-a-path
+static std::string GetBaseFilename(const std::string &filepath) {
+  return filepath.substr(filepath.find_last_of("/\\") + 1);
+}
+
+std::string base64_encode(unsigned char const *, unsigned int len);
+std::string base64_decode(std::string const &s);
+
+/*
+   base64.cpp and base64.h
+
+   Copyright (C) 2004-2008 René Nyffenegger
+
+   This source code is provided 'as-is', without any express or implied
+   warranty. In no event will the author be held liable for any damages
+   arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any purpose,
+   including commercial applications, and to alter it and redistribute it
+   freely, subject to the following restrictions:
+
+   1. The origin of this source code must not be misrepresented; you must not
+      claim that you wrote the original source code. If you use this source code
+      in a product, an acknowledgment in the product documentation would be
+      appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and must not be
+      misrepresented as being the original source code.
+
+   3. This notice may not be removed or altered from any source distribution.
+
+   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
+
+*/
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wglobal-constructors"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wconversion"
+#endif
+static const std::string base64_chars =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "abcdefghijklmnopqrstuvwxyz"
+    "0123456789+/";
+
+static inline bool is_base64(unsigned char c) {
+  return (isalnum(c) || (c == '+') || (c == '/'));
+}
+
+std::string base64_encode(unsigned char const *bytes_to_encode,
+                          unsigned int in_len) {
+  std::string ret;
+  int i = 0;
+  int j = 0;
+  unsigned char char_array_3[3];
+  unsigned char char_array_4[4];
+
+  while (in_len--) {
+    char_array_3[i++] = *(bytes_to_encode++);
+    if (i == 3) {
+      char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+      char_array_4[1] =
+          ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+      char_array_4[2] =
+          ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+      char_array_4[3] = char_array_3[2] & 0x3f;
+
+      for (i = 0; (i < 4); i++) ret += base64_chars[char_array_4[i]];
+      i = 0;
+    }
+  }
+
+  if (i) {
+    for (j = i; j < 3; j++) char_array_3[j] = '\0';
+
+    char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+    char_array_4[1] =
+        ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+    char_array_4[2] =
+        ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+
+    for (j = 0; (j < i + 1); j++) ret += base64_chars[char_array_4[j]];
+
+    while ((i++ < 3)) ret += '=';
+  }
+
+  return ret;
+}
+
+std::string base64_decode(std::string const &encoded_string) {
+  int in_len = static_cast<int>(encoded_string.size());
+  int i = 0;
+  int j = 0;
+  int in_ = 0;
+  unsigned char char_array_4[4], char_array_3[3];
+  std::string ret;
+
+  while (in_len-- && (encoded_string[in_] != '=') &&
+         is_base64(encoded_string[in_])) {
+    char_array_4[i++] = encoded_string[in_];
+    in_++;
+    if (i == 4) {
+      for (i = 0; i < 4; i++)
+        char_array_4[i] =
+            static_cast<unsigned char>(base64_chars.find(char_array_4[i]));
+
+      char_array_3[0] =
+          (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+      char_array_3[1] =
+          ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+      char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+      for (i = 0; (i < 3); i++) ret += char_array_3[i];
+      i = 0;
+    }
+  }
+
+  if (i) {
+    for (j = i; j < 4; j++) char_array_4[j] = 0;
+
+    for (j = 0; j < 4; j++)
+      char_array_4[j] =
+          static_cast<unsigned char>(base64_chars.find(char_array_4[j]));
+
+    char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+    char_array_3[1] =
+        ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+    char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+    for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
+  }
+
+  return ret;
+}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+static bool LoadExternalFile(std::vector<unsigned char> *out, std::string *err,
+                             std::string *warn, const std::string &filename,
+                             const std::string &basedir, bool required,
+                             size_t reqBytes, bool checkSize, FsCallbacks *fs) {
+  if (fs == nullptr || fs->FileExists == nullptr ||
+      fs->ExpandFilePath == nullptr || fs->ReadWholeFile == nullptr) {
+    // This is a developer error, assert() ?
+    if (err) {
+      (*err) += "FS callback[s] not set\n";
+    }
+    return false;
+  }
+
+  std::string *failMsgOut = required ? err : warn;
+
+  out->clear();
+
+  std::vector<std::string> paths;
+  paths.push_back(basedir);
+  paths.push_back(".");
+
+  std::string filepath = FindFile(paths, filename, fs);
+  if (filepath.empty() || filename.empty()) {
+    if (failMsgOut) {
+      (*failMsgOut) += "File not found : " + filename + "\n";
+    }
+    return false;
+  }
+
+  std::vector<unsigned char> buf;
+  std::string fileReadErr;
+  bool fileRead =
+      fs->ReadWholeFile(&buf, &fileReadErr, filepath, fs->user_data);
+  if (!fileRead) {
+    if (failMsgOut) {
+      (*failMsgOut) +=
+          "File read error : " + filepath + " : " + fileReadErr + "\n";
+    }
+    return false;
+  }
+
+  size_t sz = buf.size();
+  if (sz == 0) {
+    if (failMsgOut) {
+      (*failMsgOut) += "File is empty : " + filepath + "\n";
+    }
+    return false;
+  }
+
+  if (checkSize) {
+    if (reqBytes == sz) {
+      out->swap(buf);
+      return true;
+    } else {
+      std::stringstream ss;
+      ss << "File size mismatch : " << filepath << ", requestedBytes "
+         << reqBytes << ", but got " << sz << std::endl;
+      if (failMsgOut) {
+        (*failMsgOut) += ss.str();
+      }
+      return false;
+    }
+  }
+
+  out->swap(buf);
+  return true;
+}
+
+void TinyGLTF::SetImageLoader(LoadImageDataFunction func, void *user_data) {
+  LoadImageData = func;
+  load_image_user_data_ = user_data;
+}
+
+#ifndef TINYGLTF_NO_STB_IMAGE
+bool LoadImageData(Image *image, const int image_idx, std::string *err, std::string *warn,
+                   int req_width, int req_height, const unsigned char *bytes,
+                   int size, void *user_data) {
+  (void)warn;
+
+  int w, h, comp, req_comp;
+
+  // force 32-bit textures for common Vulkan compatibility. It appears that
+  // some GPU drivers do not support 24-bit images for Vulkan
+  req_comp = 4;
+
+  // if image cannot be decoded, ignore parsing and keep it by its path
+  // don't break in this case
+  // FIXME we should only enter this function if the image is embedded. If
+  // image->uri references
+  // an image file, it should be left as it is. Image loading should not be
+  // mandatory (to support other formats)
+  unsigned char *data =
+      stbi_load_from_memory(bytes, size, &w, &h, &comp, req_comp);
+  if (!data) {
+    // NOTE: you can use `warn` instead of `err`
+    if (err) {
+      (*err) += "Unknown image format. STB cannot decode image data for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\". Proably 16bit PNG?\n";
+    }
+    return false;
+  }
+
+  if (w < 1 || h < 1) {
+    free(data);
+    if (err) {
+      (*err) += "Invalid image data for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\"\n";
+    }
+    return false;
+  }
+
+  if (req_width > 0) {
+    if (req_width != w) {
+      free(data);
+      if (err) {
+        (*err) += "Image width mismatch for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\"\n";
+      }
+      return false;
+    }
+  }
+
+  if (req_height > 0) {
+    if (req_height != h) {
+      free(data);
+      if (err) {
+        (*err) += "Image height mismatch. for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\"\n";
+      }
+      return false;
+    }
+  }
+
+  image->width = w;
+  image->height = h;
+  image->component = req_comp;
+  image->image.resize(static_cast<size_t>(w * h * req_comp));
+  std::copy(data, data + w * h * req_comp, image->image.begin());
+
+  free(data);
+
+  return true;
+}
+#endif
+
+void TinyGLTF::SetImageWriter(WriteImageDataFunction func, void *user_data) {
+  WriteImageData = func;
+  write_image_user_data_ = user_data;
+}
+
+#ifndef TINYGLTF_NO_STB_IMAGE_WRITE
+static void WriteToMemory_stbi(void *context, void *data, int size) {
+  std::vector<unsigned char> *buffer =
+      reinterpret_cast<std::vector<unsigned char> *>(context);
+
+  unsigned char *pData = reinterpret_cast<unsigned char *>(data);
+
+  buffer->insert(buffer->end(), pData, pData + size);
+}
+
+bool WriteImageData(const std::string *basepath, const std::string *filename,
+                    Image *image, bool embedImages, void *fsPtr) {
+  const std::string ext = GetFilePathExtension(*filename);
+
+  // Write image to temporary buffer
+  std::string header;
+  std::vector<unsigned char> data;
+
+  if (ext == "png") {
+    if (!stbi_write_png_to_func(WriteToMemory_stbi, &data, image->width,
+                                image->height, image->component,
+                                &image->image[0], 0)) {
+      return false;
+    }
+    header = "data:image/png;base64,";
+  } else if (ext == "jpg") {
+    if (!stbi_write_jpg_to_func(WriteToMemory_stbi, &data, image->width,
+                                image->height, image->component,
+                                &image->image[0], 100)) {
+      return false;
+    }
+    header = "data:image/jpeg;base64,";
+  } else if (ext == "bmp") {
+    if (!stbi_write_bmp_to_func(WriteToMemory_stbi, &data, image->width,
+                                image->height, image->component,
+                                &image->image[0])) {
+      return false;
+    }
+    header = "data:image/bmp;base64,";
+  } else if (!embedImages) {
+    // Error: can't output requested format to file
+    return false;
+  }
+
+  if (embedImages) {
+    // Embed base64-encoded image into URI
+    if (data.size()) {
+      image->uri =
+          header +
+          base64_encode(&data[0], static_cast<unsigned int>(data.size()));
+    } else {
+      // Throw error?
+    }
+  } else {
+    // Write image to disc
+    FsCallbacks *fs = reinterpret_cast<FsCallbacks *>(fsPtr);
+    if ((fs != nullptr) && (fs->WriteWholeFile != nullptr)) {
+      const std::string imagefilepath = JoinPath(*basepath, *filename);
+      std::string writeError;
+      if (!fs->WriteWholeFile(&writeError, imagefilepath, data,
+                              fs->user_data)) {
+        // Could not write image file to disc; Throw error ?
+        return false;
+      }
+    } else {
+      // Throw error?
+    }
+    image->uri = *filename;
+  }
+
+  return true;
+}
+#endif
+
+void TinyGLTF::SetFsCallbacks(FsCallbacks callbacks) { fs = callbacks; }
+
+#ifndef TINYGLTF_NO_FS
+// Default implementations of filesystem functions
+
+bool FileExists(const std::string &abs_filename, void *) {
+  bool ret;
+#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
+    if (asset_manager) {
+        AAsset* asset = AAssetManager_open(asset_manager, abs_filename.c_str(), AASSET_MODE_STREAMING);
+        if (!asset) {
+            return false;
+        }
+        AAsset_close(asset);
+        ret = true;
+    } else {
+      return false;
+    }
+#else
+#ifdef _WIN32
+  FILE *fp;
+  errno_t err = fopen_s(&fp, abs_filename.c_str(), "rb");
+  if (err != 0) {
+    return false;
+  }
+#else
+  FILE *fp = fopen(abs_filename.c_str(), "rb");
+#endif
+  if (fp) {
+    ret = true;
+    fclose(fp);
+  } else {
+    ret = false;
+  }
+#endif
+
+  return ret;
+}
+
+std::string ExpandFilePath(const std::string &filepath, void *) {
+#ifdef _WIN32
+  DWORD len = ExpandEnvironmentStringsA(filepath.c_str(), NULL, 0);
+  char *str = new char[len];
+  ExpandEnvironmentStringsA(filepath.c_str(), str, len);
+
+  std::string s(str);
+
+  delete[] str;
+
+  return s;
+#else
+
+#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) || \
+    defined(__ANDROID__) || defined(__EMSCRIPTEN__)
+  // no expansion
+  std::string s = filepath;
+#else
+  std::string s;
+  wordexp_t p;
+
+  if (filepath.empty()) {
+    return "";
+  }
+
+  // char** w;
+  int ret = wordexp(filepath.c_str(), &p, 0);
+  if (ret) {
+    // err
+    s = filepath;
+    return s;
+  }
+
+  // Use first element only.
+  if (p.we_wordv) {
+    s = std::string(p.we_wordv[0]);
+    wordfree(&p);
+  } else {
+    s = filepath;
+  }
+
+#endif
+
+  return s;
+#endif
+}
+
+bool ReadWholeFile(std::vector<unsigned char> *out, std::string *err,
+                   const std::string &filepath, void *) {
+#ifdef TINYGLTF_ANDROID_LOAD_FROM_ASSETS
+  if (asset_manager) {
+    AAsset* asset = AAssetManager_open(asset_manager, filepath.c_str(), AASSET_MODE_STREAMING);
+    if (!asset) {
+      if (err) {
+        (*err) += "File open error : " + filepath + "\n";
+      }
+      return false;
+    }
+    size_t size = AAsset_getLength(asset);
+    if (size <= 0) {
+      if (err) {
+        (*err) += "Invalid file size : " + filepath +
+                  " (does the path point to a directory?)";
+      }
+    }
+    out->resize(size);
+    AAsset_read(asset, reinterpret_cast<char *>(&out->at(0)), size);
+    AAsset_close(asset);
+    return true;
+  } else {
+    if (err) {
+      (*err) += "No asset manager specified : " + filepath + "\n";
+    }
+    return false;
+  }
+#else
+  std::ifstream f(filepath.c_str(), std::ifstream::binary);
+  if (!f) {
+    if (err) {
+      (*err) += "File open error : " + filepath + "\n";
+    }
+    return false;
+  }
+
+  f.seekg(0, f.end);
+  size_t sz = static_cast<size_t>(f.tellg());
+  f.seekg(0, f.beg);
+
+  if (int(sz) < 0) {
+    if (err) {
+      (*err) += "Invalid file size : " + filepath +
+                " (does the path point to a directory?)";
+    }
+    return false;
+  } else if (sz == 0) {
+    if (err) {
+      (*err) += "File is empty : " + filepath + "\n";
+    }
+    return false;
+  }
+
+  out->resize(sz);
+  f.read(reinterpret_cast<char *>(&out->at(0)),
+         static_cast<std::streamsize>(sz));
+  f.close();
+
+  return true;
+#endif
+}
+
+bool WriteWholeFile(std::string *err, const std::string &filepath,
+                    const std::vector<unsigned char> &contents, void *) {
+  std::ofstream f(filepath.c_str(), std::ofstream::binary);
+  if (!f) {
+    if (err) {
+      (*err) += "File open error for writing : " + filepath + "\n";
+    }
+    return false;
+  }
+
+  f.write(reinterpret_cast<const char *>(&contents.at(0)),
+          static_cast<std::streamsize>(contents.size()));
+  if (!f) {
+    if (err) {
+      (*err) += "File write error: " + filepath + "\n";
+    }
+    return false;
+  }
+
+  f.close();
+  return true;
+}
+
+#endif  // TINYGLTF_NO_FS
+
+static std::string MimeToExt(const std::string &mimeType) {
+  if (mimeType == "image/jpeg") {
+    return "jpg";
+  } else if (mimeType == "image/png") {
+    return "png";
+  } else if (mimeType == "image/bmp") {
+    return "bmp";
+  } else if (mimeType == "image/gif") {
+    return "gif";
+  }
+
+  return "";
+}
+
+static void UpdateImageObject(Image &image, std::string &baseDir, int index,
+                              bool embedImages,
+                              WriteImageDataFunction *WriteImageData = nullptr,
+                              void *user_data = nullptr) {
+  std::string filename;
+  std::string ext;
+
+  // If image have uri. Use it it as a filename
+  if (image.uri.size()) {
+    filename = GetBaseFilename(image.uri);
+    ext = GetFilePathExtension(filename);
+
+  } else if (image.name.size()) {
+    ext = MimeToExt(image.mimeType);
+    // Otherwise use name as filename
+    filename = image.name + "." + ext;
+  } else {
+    ext = MimeToExt(image.mimeType);
+    // Fallback to index of image as filename
+    filename = std::to_string(index) + "." + ext;
+  }
+
+  // If callback is set, modify image data object
+  if (*WriteImageData != nullptr) {
+    std::string uri;
+    (*WriteImageData)(&baseDir, &filename, &image, embedImages, user_data);
+  }
+}
+
+bool IsDataURI(const std::string &in) {
+  std::string header = "data:application/octet-stream;base64,";
+  if (in.find(header) == 0) {
+    return true;
+  }
+
+  header = "data:image/jpeg;base64,";
+  if (in.find(header) == 0) {
+    return true;
+  }
+
+  header = "data:image/png;base64,";
+  if (in.find(header) == 0) {
+    return true;
+  }
+
+  header = "data:image/bmp;base64,";
+  if (in.find(header) == 0) {
+    return true;
+  }
+
+  header = "data:image/gif;base64,";
+  if (in.find(header) == 0) {
+    return true;
+  }
+
+  header = "data:text/plain;base64,";
+  if (in.find(header) == 0) {
+    return true;
+  }
+
+  header = "data:application/gltf-buffer;base64,";
+  if (in.find(header) == 0) {
+    return true;
+  }
+
+  return false;
+}
+
+bool DecodeDataURI(std::vector<unsigned char> *out, std::string &mime_type,
+                   const std::string &in, size_t reqBytes, bool checkSize) {
+  std::string header = "data:application/octet-stream;base64,";
+  std::string data;
+  if (in.find(header) == 0) {
+    data = base64_decode(in.substr(header.size()));  // cut mime string.
+  }
+
+  if (data.empty()) {
+    header = "data:image/jpeg;base64,";
+    if (in.find(header) == 0) {
+      mime_type = "image/jpeg";
+      data = base64_decode(in.substr(header.size()));  // cut mime string.
+    }
+  }
+
+  if (data.empty()) {
+    header = "data:image/png;base64,";
+    if (in.find(header) == 0) {
+      mime_type = "image/png";
+      data = base64_decode(in.substr(header.size()));  // cut mime string.
+    }
+  }
+
+  if (data.empty()) {
+    header = "data:image/bmp;base64,";
+    if (in.find(header) == 0) {
+      mime_type = "image/bmp";
+      data = base64_decode(in.substr(header.size()));  // cut mime string.
+    }
+  }
+
+  if (data.empty()) {
+    header = "data:image/gif;base64,";
+    if (in.find(header) == 0) {
+      mime_type = "image/gif";
+      data = base64_decode(in.substr(header.size()));  // cut mime string.
+    }
+  }
+
+  if (data.empty()) {
+    header = "data:text/plain;base64,";
+    if (in.find(header) == 0) {
+      mime_type = "text/plain";
+      data = base64_decode(in.substr(header.size()));
+    }
+  }
+
+  if (data.empty()) {
+    header = "data:application/gltf-buffer;base64,";
+    if (in.find(header) == 0) {
+      data = base64_decode(in.substr(header.size()));
+    }
+  }
+
+  if (data.empty()) {
+    return false;
+  }
+
+  if (checkSize) {
+    if (data.size() != reqBytes) {
+      return false;
+    }
+    out->resize(reqBytes);
+  } else {
+    out->resize(data.size());
+  }
+  std::copy(data.begin(), data.end(), out->begin());
+  return true;
+}
+
+static bool ParseJsonAsValue(Value *ret, const json &o) {
+  Value val{};
+  switch (o.type()) {
+    case json::value_t::object: {
+      Value::Object value_object;
+      for (auto it = o.begin(); it != o.end(); it++) {
+        Value entry;
+        ParseJsonAsValue(&entry, it.value());
+        if (entry.Type() != NULL_TYPE) value_object[it.key()] = entry;
+      }
+      if (value_object.size() > 0) val = Value(value_object);
+    } break;
+    case json::value_t::array: {
+      Value::Array value_array;
+      for (auto it = o.begin(); it != o.end(); it++) {
+        Value entry;
+        ParseJsonAsValue(&entry, it.value());
+        if (entry.Type() != NULL_TYPE) value_array.push_back(entry);
+      }
+      if (value_array.size() > 0) val = Value(value_array);
+    } break;
+    case json::value_t::string:
+      val = Value(o.get<std::string>());
+      break;
+    case json::value_t::boolean:
+      val = Value(o.get<bool>());
+      break;
+    case json::value_t::number_integer:
+    case json::value_t::number_unsigned:
+      val = Value(static_cast<int>(o.get<int64_t>()));
+      break;
+    case json::value_t::number_float:
+      val = Value(o.get<double>());
+      break;
+    case json::value_t::null:
+    case json::value_t::discarded:
+      // default:
+      break;
+  }
+  if (ret) *ret = val;
+
+  return val.Type() != NULL_TYPE;
+}
+
+static bool ParseExtrasProperty(Value *ret, const json &o) {
+  json::const_iterator it = o.find("extras");
+  if (it == o.end()) {
+    return false;
+  }
+
+  return ParseJsonAsValue(ret, it.value());
+}
+
+static bool ParseBooleanProperty(bool *ret, std::string *err, const json &o,
+                                 const std::string &property,
+                                 const bool required,
+                                 const std::string &parent_node = "") {
+  json::const_iterator it = o.find(property);
+  if (it == o.end()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is missing";
+        if (!parent_node.empty()) {
+          (*err) += " in " + parent_node;
+        }
+        (*err) += ".\n";
+      }
+    }
+    return false;
+  }
+
+  if (!it.value().is_boolean()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is not a bool type.\n";
+      }
+    }
+    return false;
+  }
+
+  if (ret) {
+    (*ret) = it.value().get<bool>();
+  }
+
+  return true;
+}
+
+static bool ParseNumberProperty(double *ret, std::string *err, const json &o,
+                                const std::string &property,
+                                const bool required,
+                                const std::string &parent_node = "") {
+  json::const_iterator it = o.find(property);
+  if (it == o.end()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is missing";
+        if (!parent_node.empty()) {
+          (*err) += " in " + parent_node;
+        }
+        (*err) += ".\n";
+      }
+    }
+    return false;
+  }
+
+  if (!it.value().is_number()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is not a number type.\n";
+      }
+    }
+    return false;
+  }
+
+  if (ret) {
+    (*ret) = it.value().get<double>();
+  }
+
+  return true;
+}
+
+static bool ParseNumberArrayProperty(std::vector<double> *ret, std::string *err,
+                                     const json &o, const std::string &property,
+                                     bool required,
+                                     const std::string &parent_node = "") {
+  json::const_iterator it = o.find(property);
+  if (it == o.end()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is missing";
+        if (!parent_node.empty()) {
+          (*err) += " in " + parent_node;
+        }
+        (*err) += ".\n";
+      }
+    }
+    return false;
+  }
+
+  if (!it.value().is_array()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is not an array";
+        if (!parent_node.empty()) {
+          (*err) += " in " + parent_node;
+        }
+        (*err) += ".\n";
+      }
+    }
+    return false;
+  }
+
+  ret->clear();
+  for (json::const_iterator i = it.value().begin(); i != it.value().end();
+       i++) {
+    if (!i.value().is_number()) {
+      if (required) {
+        if (err) {
+          (*err) += "'" + property + "' property is not a number.\n";
+          if (!parent_node.empty()) {
+            (*err) += " in " + parent_node;
+          }
+          (*err) += ".\n";
+        }
+      }
+      return false;
+    }
+    ret->push_back(i.value());
+  }
+
+  return true;
+}
+
+static bool ParseStringProperty(
+    std::string *ret, std::string *err, const json &o,
+    const std::string &property, bool required,
+    const std::string &parent_node = std::string()) {
+  json::const_iterator it = o.find(property);
+  if (it == o.end()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is missing";
+        if (parent_node.empty()) {
+          (*err) += ".\n";
+        } else {
+          (*err) += " in `" + parent_node + "'.\n";
+        }
+      }
+    }
+    return false;
+  }
+
+  if (!it.value().is_string()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is not a string type.\n";
+      }
+    }
+    return false;
+  }
+
+  if (ret) {
+    (*ret) = it.value().get<std::string>();
+  }
+
+  return true;
+}
+
+static bool ParseStringIntProperty(std::map<std::string, int> *ret,
+                                   std::string *err, const json &o,
+                                   const std::string &property, bool required,
+                                   const std::string &parent = "") {
+  json::const_iterator it = o.find(property);
+  if (it == o.end()) {
+    if (required) {
+      if (err) {
+        if (!parent.empty()) {
+          (*err) +=
+              "'" + property + "' property is missing in " + parent + ".\n";
+        } else {
+          (*err) += "'" + property + "' property is missing.\n";
+        }
+      }
+    }
+    return false;
+  }
+
+  // Make sure we are dealing with an object / dictionary.
+  if (!it.value().is_object()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is not an object.\n";
+      }
+    }
+    return false;
+  }
+
+  ret->clear();
+  const json &dict = it.value();
+
+  json::const_iterator dictIt(dict.begin());
+  json::const_iterator dictItEnd(dict.end());
+
+  for (; dictIt != dictItEnd; ++dictIt) {
+    if (!dictIt.value().is_number()) {
+      if (required) {
+        if (err) {
+          (*err) += "'" + property + "' value is not an int.\n";
+        }
+      }
+      return false;
+    }
+
+    // Insert into the list.
+    (*ret)[dictIt.key()] = static_cast<int>(dictIt.value());
+  }
+  return true;
+}
+
+static bool ParseJSONProperty(std::map<std::string, double> *ret,
+                              std::string *err, const json &o,
+                              const std::string &property, bool required) {
+  json::const_iterator it = o.find(property);
+  if (it == o.end()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is missing. \n'";
+      }
+    }
+    return false;
+  }
+
+  if (!it.value().is_object()) {
+    if (required) {
+      if (err) {
+        (*err) += "'" + property + "' property is not a JSON object.\n";
+      }
+    }
+    return false;
+  }
+
+  ret->clear();
+  const json &obj = it.value();
+  json::const_iterator it2(obj.begin());
+  json::const_iterator itEnd(obj.end());
+  for (; it2 != itEnd; it2++) {
+    if (it2.value().is_number())
+      ret->insert(std::pair<std::string, double>(it2.key(), it2.value()));
+  }
+
+  return true;
+}
+
+static bool ParseParameterProperty(Parameter *param, std::string *err,
+                                   const json &o, const std::string &prop,
+                                   bool required) {
+  // A parameter value can either be a string or an array of either a boolean or
+  // a number. Booleans of any kind aren't supported here. Granted, it
+  // complicates the Parameter structure and breaks it semantically in the sense
+  // that the client probably works off the assumption that if the string is
+  // empty the vector is used, etc. Would a tagged union work?
+  if (ParseStringProperty(&param->string_value, err, o, prop, false)) {
+    // Found string property.
+    return true;
+  } else if (ParseNumberArrayProperty(&param->number_array, err, o, prop,
+                                      false)) {
+    // Found a number array.
+    return true;
+  } else if (ParseNumberProperty(&param->number_value, err, o, prop, false)) {
+    return param->has_number_value = true;
+  } else if (ParseJSONProperty(&param->json_double_value, err, o, prop,
+                               false)) {
+    return true;
+  } else if (ParseBooleanProperty(&param->bool_value, err, o, prop, false)) {
+    return true;
+  } else {
+    if (required) {
+      if (err) {
+        (*err) += "parameter must be a string or number / number array.\n";
+      }
+    }
+    return false;
+  }
+}
+
+static bool ParseExtensionsProperty(ExtensionMap *ret, std::string *err,
+                                    const json &o) {
+  (void)err;
+
+  json::const_iterator it = o.find("extensions");
+  if (it == o.end()) {
+    return false;
+  }
+  if (!it.value().is_object()) {
+    return false;
+  }
+  ExtensionMap extensions;
+  json::const_iterator extIt = it.value().begin();
+  for (; extIt != it.value().end(); extIt++) {
+    if (!extIt.value().is_object()) continue;
+	if (!ParseJsonAsValue(&extensions[extIt.key()], extIt.value())) {
+      if (!extIt.key().empty()) {
+        // create empty object so that an extension object is still of type object
+        extensions[extIt.key()] = Value{ Value::Object{} };
+      }
+	}
+  }
+  if (ret) {
+    (*ret) = extensions;
+  }
+  return true;
+}
+
+static bool ParseAsset(Asset *asset, std::string *err, const json &o) {
+  ParseStringProperty(&asset->version, err, o, "version", true, "Asset");
+  ParseStringProperty(&asset->generator, err, o, "generator", false, "Asset");
+  ParseStringProperty(&asset->minVersion, err, o, "minVersion", false, "Asset");
+
+  ParseExtensionsProperty(&asset->extensions, err, o);
+
+  // Unity exporter version is added as extra here
+  ParseExtrasProperty(&(asset->extras), o);
+
+  return true;
+}
+
+static bool ParseImage(Image *image, const int image_idx, std::string *err, std::string *warn,
+                       const json &o, const std::string &basedir,
+                       FsCallbacks *fs,
+                       LoadImageDataFunction *LoadImageData = nullptr,
+                       void *load_image_user_data = nullptr) {
+  // A glTF image must either reference a bufferView or an image uri
+
+  // schema says oneOf [`bufferView`, `uri`]
+  // TODO(syoyo): Check the type of each parameters.
+  bool hasBufferView = (o.find("bufferView") != o.end());
+  bool hasURI = (o.find("uri") != o.end());
+
+  ParseStringProperty(&image->name, err, o, "name", false);
+
+  if (hasBufferView && hasURI) {
+    // Should not both defined.
+    if (err) {
+      (*err) +=
+          "Only one of `bufferView` or `uri` should be defined, but both are "
+          "defined for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\"\n";
+    }
+    return false;
+  }
+
+  if (!hasBufferView && !hasURI) {
+    if (err) {
+      (*err) += "Neither required `bufferView` nor `uri` defined for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\"\n";
+    }
+    return false;
+  }
+
+  ParseExtensionsProperty(&image->extensions, err, o);
+  ParseExtrasProperty(&image->extras, o);
+
+  if (hasBufferView) {
+    double bufferView = -1;
+    if (!ParseNumberProperty(&bufferView, err, o, "bufferView", true)) {
+      if (err) {
+        (*err) += "Failed to parse `bufferView` for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\"\n";
+      }
+      return false;
+    }
+
+    std::string mime_type;
+    ParseStringProperty(&mime_type, err, o, "mimeType", false);
+
+    double width = 0.0;
+    ParseNumberProperty(&width, err, o, "width", false);
+
+    double height = 0.0;
+    ParseNumberProperty(&height, err, o, "height", false);
+
+    // Just only save some information here. Loading actual image data from
+    // bufferView is done after this `ParseImage` function.
+    image->bufferView = static_cast<int>(bufferView);
+    image->mimeType = mime_type;
+    image->width = static_cast<int>(width);
+    image->height = static_cast<int>(height);
+
+    return true;
+  }
+
+  // Parse URI & Load image data.
+
+  std::string uri;
+  std::string tmp_err;
+  if (!ParseStringProperty(&uri, &tmp_err, o, "uri", true)) {
+    if (err) {
+      (*err) += "Failed to parse `uri` for image[" + std::to_string(image_idx) + "] name = \"" + image->name + "\".\n";
+    }
+    return false;
+  }
+
+  std::vector<unsigned char> img;
+
+  if (IsDataURI(uri)) {
+    if (!DecodeDataURI(&img, image->mimeType, uri, 0, false)) {
+      if (err) {
+        (*err) += "Failed to decode 'uri' for image[" + std::to_string(image_idx) + "] name = [" + image->name + "]\n";
+      }
+      return false;
+    }
+  } else {
+    // Assume external file
+    // Keep texture path (for textures that cannot be decoded)
+    image->uri = uri;
+#ifdef TINYGLTF_NO_EXTERNAL_IMAGE
+    return true;
+#endif
+    if (!LoadExternalFile(&img, err, warn, uri, basedir, false, 0, false, fs)) {
+      if (warn) {
+        (*warn) += "Failed to load external 'uri' for image[" + std::to_string(image_idx) + "] name = [" + image->name + "]\n";
+      }
+      // If the image cannot be loaded, keep uri as image->uri.
+      return true;
+    }
+
+    if (img.empty()) {
+      if (warn) {
+        (*warn) += "Image data is empty for image[" + std::to_string(image_idx) + "] name = [" + image->name + "] \n";
+      }
+      return false;
+    }
+  }
+
+  if (*LoadImageData == nullptr) {
+    if (err) {
+      (*err) += "No LoadImageData callback specified.\n";
+    }
+    return false;
+  }
+  return (*LoadImageData)(image, image_idx, err, warn, 0, 0, &img.at(0),
+                          static_cast<int>(img.size()), load_image_user_data);
+}
+
+static bool ParseTexture(Texture *texture, std::string *err, const json &o,
+                         const std::string &basedir) {
+  (void)basedir;
+  double sampler = -1.0;
+  double source = -1.0;
+  ParseNumberProperty(&sampler, err, o, "sampler", false);
+
+  ParseNumberProperty(&source, err, o, "source", false);
+
+  texture->sampler = static_cast<int>(sampler);
+  texture->source = static_cast<int>(source);
+
+  ParseExtensionsProperty(&texture->extensions, err, o);
+  ParseExtrasProperty(&texture->extras, o);
+
+  ParseStringProperty(&texture->name, err, o, "name", false);
+
+  return true;
+}
+
+static bool ParseBuffer(Buffer *buffer, std::string *err, const json &o,
+                        FsCallbacks *fs, const std::string &basedir,
+                        bool is_binary = false,
+                        const unsigned char *bin_data = nullptr,
+                        size_t bin_size = 0) {
+  double byteLength;
+  if (!ParseNumberProperty(&byteLength, err, o, "byteLength", true, "Buffer")) {
+    return false;
+  }
+
+  // In glTF 2.0, uri is not mandatory anymore
+  buffer->uri.clear();
+  ParseStringProperty(&buffer->uri, err, o, "uri", false, "Buffer");
+
+  // having an empty uri for a non embedded image should not be valid
+  if (!is_binary && buffer->uri.empty()) {
+    if (err) {
+      (*err) += "'uri' is missing from non binary glTF file buffer.\n";
+    }
+  }
+
+  json::const_iterator type = o.find("type");
+  if (type != o.end()) {
+    if (type.value().is_string()) {
+      const std::string &ty = type.value();
+      if (ty.compare("arraybuffer") == 0) {
+        // buffer.type = "arraybuffer";
+      }
+    }
+  }
+
+  size_t bytes = static_cast<size_t>(byteLength);
+  if (is_binary) {
+    // Still binary glTF accepts external dataURI.
+    if (!buffer->uri.empty()) {
+      // First try embedded data URI.
+      if (IsDataURI(buffer->uri)) {
+        std::string mime_type;
+        if (!DecodeDataURI(&buffer->data, mime_type, buffer->uri, bytes,
+                           true)) {
+          if (err) {
+            (*err) +=
+                "Failed to decode 'uri' : " + buffer->uri + " in Buffer\n";
+          }
+          return false;
+        }
+      } else {
+        // External .bin file.
+        if (!LoadExternalFile(&buffer->data, err, /* warn */ nullptr,
+                              buffer->uri, basedir, true, bytes, true, fs)) {
+          return false;
+        }
+      }
+    } else {
+      // load data from (embedded) binary data
+
+      if ((bin_size == 0) || (bin_data == nullptr)) {
+        if (err) {
+          (*err) += "Invalid binary data in `Buffer'.\n";
+        }
+        return false;
+      }
+
+      if (byteLength > bin_size) {
+        if (err) {
+          std::stringstream ss;
+          ss << "Invalid `byteLength'. Must be equal or less than binary size: "
+                "`byteLength' = "
+             << byteLength << ", binary size = " << bin_size << std::endl;
+          (*err) += ss.str();
+        }
+        return false;
+      }
+
+      // Read buffer data
+      buffer->data.resize(static_cast<size_t>(byteLength));
+      memcpy(&(buffer->data.at(0)), bin_data, static_cast<size_t>(byteLength));
+    }
+
+  } else {
+    if (IsDataURI(buffer->uri)) {
+      std::string mime_type;
+      if (!DecodeDataURI(&buffer->data, mime_type, buffer->uri, bytes, true)) {
+        if (err) {
+          (*err) += "Failed to decode 'uri' : " + buffer->uri + " in Buffer\n";
+        }
+        return false;
+      }
+    } else {
+      // Assume external .bin file.
+      if (!LoadExternalFile(&buffer->data, err, /* warn */ nullptr, buffer->uri,
+                            basedir, true, bytes, true, fs)) {
+        return false;
+      }
+    }
+  }
+
+  ParseStringProperty(&buffer->name, err, o, "name", false);
+
+  return true;
+}
+
+static bool ParseBufferView(BufferView *bufferView, std::string *err,
+                            const json &o) {
+  double buffer = -1.0;
+  if (!ParseNumberProperty(&buffer, err, o, "buffer", true, "BufferView")) {
+    return false;
+  }
+
+  double byteOffset = 0.0;
+  ParseNumberProperty(&byteOffset, err, o, "byteOffset", false);
+
+  double byteLength = 1.0;
+  if (!ParseNumberProperty(&byteLength, err, o, "byteLength", true,
+                           "BufferView")) {
+    return false;
+  }
+
+  size_t byteStride = 0;
+  double byteStrideValue = 0.0;
+  if (!ParseNumberProperty(&byteStrideValue, err, o, "byteStride", false)) {
+    // Spec says: When byteStride of referenced bufferView is not defined, it
+    // means that accessor elements are tightly packed, i.e., effective stride
+    // equals the size of the element.
+    // We cannot determine the actual byteStride until Accessor are parsed, thus
+    // set 0(= tightly packed) here(as done in OpenGL's VertexAttribPoiner)
+    byteStride = 0;
+  } else {
+    byteStride = static_cast<size_t>(byteStrideValue);
+  }
+
+  if ((byteStride > 252) || ((byteStride % 4) != 0)) {
+    if (err) {
+      std::stringstream ss;
+      ss << "Invalid `byteStride' value. `byteStride' must be the multiple of "
+            "4 : "
+         << byteStride << std::endl;
+
+      (*err) += ss.str();
+    }
+    return false;
+  }
+
+  double target = 0.0;
+  ParseNumberProperty(&target, err, o, "target", false);
+  int targetValue = static_cast<int>(target);
+  if ((targetValue == TINYGLTF_TARGET_ARRAY_BUFFER) ||
+      (targetValue == TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER)) {
+    // OK
+  } else {
+    targetValue = 0;
+  }
+  bufferView->target = targetValue;
+
+  ParseStringProperty(&bufferView->name, err, o, "name", false);
+
+  bufferView->buffer = static_cast<int>(buffer);
+  bufferView->byteOffset = static_cast<size_t>(byteOffset);
+  bufferView->byteLength = static_cast<size_t>(byteLength);
+  bufferView->byteStride = static_cast<size_t>(byteStride);
+
+  return true;
+}
+
+static bool ParseAccessor(Accessor *accessor, std::string *err, const json &o) {
+  double bufferView = -1.0;
+  ParseNumberProperty(&bufferView, err, o, "bufferView", false, "Accessor");
+
+  double byteOffset = 0.0;
+  ParseNumberProperty(&byteOffset, err, o, "byteOffset", false, "Accessor");
+
+  bool normalized = false;
+  ParseBooleanProperty(&normalized, err, o, "normalized", false, "Accessor");
+
+  double componentType = 0.0;
+  if (!ParseNumberProperty(&componentType, err, o, "componentType", true,
+                           "Accessor")) {
+    return false;
+  }
+
+  double count = 0.0;
+  if (!ParseNumberProperty(&count, err, o, "count", true, "Accessor")) {
+    return false;
+  }
+
+  std::string type;
+  if (!ParseStringProperty(&type, err, o, "type", true, "Accessor")) {
+    return false;
+  }
+
+  if (type.compare("SCALAR") == 0) {
+    accessor->type = TINYGLTF_TYPE_SCALAR;
+  } else if (type.compare("VEC2") == 0) {
+    accessor->type = TINYGLTF_TYPE_VEC2;
+  } else if (type.compare("VEC3") == 0) {
+    accessor->type = TINYGLTF_TYPE_VEC3;
+  } else if (type.compare("VEC4") == 0) {
+    accessor->type = TINYGLTF_TYPE_VEC4;
+  } else if (type.compare("MAT2") == 0) {
+    accessor->type = TINYGLTF_TYPE_MAT2;
+  } else if (type.compare("MAT3") == 0) {
+    accessor->type = TINYGLTF_TYPE_MAT3;
+  } else if (type.compare("MAT4") == 0) {
+    accessor->type = TINYGLTF_TYPE_MAT4;
+  } else {
+    std::stringstream ss;
+    ss << "Unsupported `type` for accessor object. Got \"" << type << "\"\n";
+    if (err) {
+      (*err) += ss.str();
+    }
+    return false;
+  }
+
+  ParseStringProperty(&accessor->name, err, o, "name", false);
+
+  accessor->minValues.clear();
+  accessor->maxValues.clear();
+  ParseNumberArrayProperty(&accessor->minValues, err, o, "min", false,
+                           "Accessor");
+
+  ParseNumberArrayProperty(&accessor->maxValues, err, o, "max", false,
+                           "Accessor");
+
+  accessor->count = static_cast<size_t>(count);
+  accessor->bufferView = static_cast<int>(bufferView);
+  accessor->byteOffset = static_cast<size_t>(byteOffset);
+  accessor->normalized = normalized;
+  {
+    int comp = static_cast<int>(componentType);
+    if (comp >= TINYGLTF_COMPONENT_TYPE_BYTE &&
+        comp <= TINYGLTF_COMPONENT_TYPE_DOUBLE) {
+      // OK
+      accessor->componentType = comp;
+    } else {
+      std::stringstream ss;
+      ss << "Invalid `componentType` in accessor. Got " << comp << "\n";
+      if (err) {
+        (*err) += ss.str();
+      }
+      return false;
+    }
+  }
+
+  ParseExtrasProperty(&(accessor->extras), o);
+
+  return true;
+}
+
+#ifdef TINYGLTF_ENABLE_DRACO
+
+static void DecodeIndexBuffer(draco::Mesh* mesh, size_t componentSize, std::vector<uint8_t>& outBuffer)
+{
+  if (componentSize == 4)
+  {
+    assert(sizeof(mesh->face(draco::FaceIndex(0))[0]) == componentSize);
+    memcpy(outBuffer.data(), &mesh->face(draco::FaceIndex(0))[0], outBuffer.size());
+  }
+  else
+  {
+    size_t faceStride = componentSize * 3;
+    for (draco::FaceIndex f(0); f < mesh->num_faces(); ++f)
+    {
+      const draco::Mesh::Face& face = mesh->face(f);
+      if (componentSize == 2)
+      {
+        uint16_t indices[3] = { (uint16_t)face[0].value(), (uint16_t)face[1].value(), (uint16_t)face[2].value() };
+        memcpy(outBuffer.data() + f.value() * faceStride, &indices[0], faceStride);
+      }
+      else
+      {
+        uint8_t indices[3] = { (uint8_t)face[0].value(), (uint8_t)face[1].value(), (uint8_t)face[2].value() };
+        memcpy(outBuffer.data() + f.value() * faceStride, &indices[0], faceStride);
+      }
+    }
+  }
+}
+
+template<typename T>
+static bool GetAttributeForAllPoints(draco::Mesh* mesh, const draco::PointAttribute* pAttribute, std::vector<uint8_t>& outBuffer)
+{
+  size_t byteOffset = 0;
+  T values[4] = { 0, 0, 0, 0 };
+  for (draco::PointIndex i(0); i < mesh->num_points(); ++i)
+  {
+    const draco::AttributeValueIndex val_index = pAttribute->mapped_index(i);
+    if (!pAttribute->ConvertValue<T>(val_index, pAttribute->num_components(), values))
+      return false;
+
+    memcpy(outBuffer.data() + byteOffset, &values[0], sizeof(T) * pAttribute->num_components());
+    byteOffset += sizeof(T) * pAttribute->num_components();
+  }
+
+  return true;
+}
+
+static bool GetAttributeForAllPoints(uint32_t componentType, draco::Mesh* mesh, const draco::PointAttribute* pAttribute, std::vector<uint8_t>& outBuffer)
+{
+  bool decodeResult = false;
+  switch (componentType)
+  {
+  case TINYGLTF_COMPONENT_TYPE_UNSIGNED_BYTE:
+    decodeResult = GetAttributeForAllPoints<uint8_t>(mesh, pAttribute, outBuffer);
+    break;
+  case TINYGLTF_COMPONENT_TYPE_BYTE:
+    decodeResult = GetAttributeForAllPoints<int8_t>(mesh, pAttribute, outBuffer);
+    break;
+  case TINYGLTF_COMPONENT_TYPE_UNSIGNED_SHORT:
+    decodeResult = GetAttributeForAllPoints<uint16_t>(mesh, pAttribute, outBuffer);
+    break;
+  case TINYGLTF_COMPONENT_TYPE_SHORT:
+    decodeResult = GetAttributeForAllPoints<int16_t>(mesh, pAttribute, outBuffer);
+    break;
+  case TINYGLTF_COMPONENT_TYPE_INT:
+    decodeResult = GetAttributeForAllPoints<int32_t>(mesh, pAttribute, outBuffer);
+    break;
+  case TINYGLTF_COMPONENT_TYPE_UNSIGNED_INT:
+    decodeResult = GetAttributeForAllPoints<uint32_t>(mesh, pAttribute, outBuffer);
+    break;
+  case TINYGLTF_COMPONENT_TYPE_FLOAT:
+    decodeResult = GetAttributeForAllPoints<float>(mesh, pAttribute, outBuffer);
+    break;
+  case TINYGLTF_COMPONENT_TYPE_DOUBLE:
+    decodeResult = GetAttributeForAllPoints<double>(mesh, pAttribute, outBuffer);
+    break;
+  default:
+    return false;
+  }
+
+  return decodeResult;
+}
+
+static bool ParseDracoExtension(Primitive *primitive, Model *model, std::string *err, const Value &dracoExtensionValue)
+{
+  auto bufferViewValue = dracoExtensionValue.Get("bufferView");
+  if (!bufferViewValue.IsInt())
+    return false;
+  auto attributesValue = dracoExtensionValue.Get("attributes");
+  if (!attributesValue.IsObject())
+    return false;
+
+  auto attributesObject = attributesValue.Get<Value::Object>();
+  int bufferView = bufferViewValue.Get<int>();
+
+  BufferView& view = model->bufferViews[bufferView];
+  Buffer& buffer = model->buffers[view.buffer];
+  // BufferView has already been decoded
+  if (view.dracoDecoded)
+    return true;
+  view.dracoDecoded = true;
+
+  const char* bufferViewData = reinterpret_cast<const char*>(buffer.data.data() + view.byteOffset);
+  size_t bufferViewSize = view.byteLength;
+
+  // decode draco
+  draco::DecoderBuffer decoderBuffer;
+  decoderBuffer.Init(bufferViewData, bufferViewSize);
+  draco::Decoder decoder;
+  auto decodeResult = decoder.DecodeMeshFromBuffer(&decoderBuffer);
+  if (!decodeResult.ok()) {
+    return false;
+  }
+  const std::unique_ptr<draco::Mesh>& mesh = decodeResult.value();
+
+  // create new bufferView for indices
+  if (primitive->indices >= 0)
+  {
+    int32_t componentSize = GetComponentSizeInBytes(model->accessors[primitive->indices].componentType);
+    Buffer decodedIndexBuffer;
+    decodedIndexBuffer.data.resize(mesh->num_faces() * 3 * componentSize);
+
+    DecodeIndexBuffer(mesh.get(), componentSize, decodedIndexBuffer.data);
+
+    model->buffers.emplace_back(std::move(decodedIndexBuffer));
+
+    BufferView decodedIndexBufferView;
+    decodedIndexBufferView.buffer = int(model->buffers.size() - 1);
+    decodedIndexBufferView.byteLength = int(mesh->num_faces() * 3 * componentSize);
+    decodedIndexBufferView.byteOffset = 0;
+    decodedIndexBufferView.byteStride = 0;
+    decodedIndexBufferView.target = TINYGLTF_TARGET_ARRAY_BUFFER;
+    model->bufferViews.emplace_back(std::move(decodedIndexBufferView));
+
+    model->accessors[primitive->indices].bufferView = int(model->bufferViews.size() - 1);
+    model->accessors[primitive->indices].count = int(mesh->num_faces() * 3);
+  }
+
+  for (const auto& attribute : attributesObject)
+  {
+    if (!attribute.second.IsInt())
+      return false;
+    auto primitiveAttribute = primitive->attributes.find(attribute.first);
+    if (primitiveAttribute == primitive->attributes.end())
+      return false;
+
+    int dracoAttributeIndex = attribute.second.Get<int>();
+    const auto pAttribute = mesh->GetAttributeByUniqueId(dracoAttributeIndex);
+    const auto pBuffer = pAttribute->buffer();
+    const auto componentType = model->accessors[primitiveAttribute->second].componentType;
+
+    // Create a new buffer for this decoded buffer
+    Buffer decodedBuffer;
+    size_t bufferSize = mesh->num_points() * pAttribute->num_components() * GetComponentSizeInBytes(componentType);
+    decodedBuffer.data.resize(bufferSize);
+
+    if (!GetAttributeForAllPoints(componentType, mesh.get(), pAttribute, decodedBuffer.data))
+      return false;
+
+    model->buffers.emplace_back(std::move(decodedBuffer));
+
+    BufferView decodedBufferView;
+    decodedBufferView.buffer = int(model->buffers.size() - 1);
+    decodedBufferView.byteLength = bufferSize;
+    decodedBufferView.byteOffset = pAttribute->byte_offset();
+    decodedBufferView.byteStride = pAttribute->byte_stride();
+    decodedBufferView.target = primitive->indices >= 0 ? TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER : TINYGLTF_TARGET_ARRAY_BUFFER;
+    model->bufferViews.emplace_back(std::move(decodedBufferView));
+
+    model->accessors[primitiveAttribute->second].bufferView = int(model->bufferViews.size() - 1);
+    model->accessors[primitiveAttribute->second].count = int(mesh->num_points());
+  }
+
+  return true;
+}
+#endif
+
+static bool ParsePrimitive(Primitive *primitive, Model *model, std::string *err,
+                           const json &o) {
+  double material = -1.0;
+  ParseNumberProperty(&material, err, o, "material", false);
+  primitive->material = static_cast<int>(material);
+
+  double mode = static_cast<double>(TINYGLTF_MODE_TRIANGLES);
+  ParseNumberProperty(&mode, err, o, "mode", false);
+
+  int primMode = static_cast<int>(mode);
+  primitive->mode = primMode;  // Why only triangled were supported ?
+
+  double indices = -1.0;
+  ParseNumberProperty(&indices, err, o, "indices", false);
+  primitive->indices = static_cast<int>(indices);
+  if (!ParseStringIntProperty(&primitive->attributes, err, o, "attributes",
+                              true, "Primitive")) {
+    return false;
+  }
+
+  // Look for morph targets
+  json::const_iterator targetsObject = o.find("targets");
+  if ((targetsObject != o.end()) && targetsObject.value().is_array()) {
+    for (json::const_iterator i = targetsObject.value().begin();
+         i != targetsObject.value().end(); i++) {
+      std::map<std::string, int> targetAttribues;
+
+      const json &dict = i.value();
+      json::const_iterator dictIt(dict.begin());
+      json::const_iterator dictItEnd(dict.end());
+
+      for (; dictIt != dictItEnd; ++dictIt) {
+        targetAttribues[dictIt.key()] = static_cast<int>(dictIt.value());
+      }
+      primitive->targets.push_back(targetAttribues);
+    }
+  }
+
+  ParseExtrasProperty(&(primitive->extras), o);
+
+  ParseExtensionsProperty(&primitive->extensions, err, o);
+
+#ifdef TINYGLTF_ENABLE_DRACO
+  auto dracoExtension = primitive->extensions.find("KHR_draco_mesh_compression");
+  if (dracoExtension != primitive->extensions.end())
+  {
+      ParseDracoExtension(primitive, model, err, dracoExtension->second);
+  }
+#endif
+
+  return true;
+}
+
+static bool ParseMesh(Mesh *mesh, Model *model, std::string *err, const json &o) {
+  ParseStringProperty(&mesh->name, err, o, "name", false);
+
+  mesh->primitives.clear();
+  json::const_iterator primObject = o.find("primitives");
+  if ((primObject != o.end()) && primObject.value().is_array()) {
+    for (json::const_iterator i = primObject.value().begin();
+         i != primObject.value().end(); i++) {
+      Primitive primitive;
+      if (ParsePrimitive(&primitive, model, err, i.value())) {
+        // Only add the primitive if the parsing succeeds.
+        mesh->primitives.push_back(primitive);
+      }
+    }
+  }
+
+  // Look for morph targets
+  json::const_iterator targetsObject = o.find("targets");
+  if ((targetsObject != o.end()) && targetsObject.value().is_array()) {
+    for (json::const_iterator i = targetsObject.value().begin();
+         i != targetsObject.value().end(); i++) {
+      std::map<std::string, int> targetAttribues;
+
+      const json &dict = i.value();
+      json::const_iterator dictIt(dict.begin());
+      json::const_iterator dictItEnd(dict.end());
+
+      for (; dictIt != dictItEnd; ++dictIt) {
+        targetAttribues[dictIt.key()] = static_cast<int>(dictIt.value());
+      }
+      mesh->targets.push_back(targetAttribues);
+    }
+  }
+
+  // Should probably check if has targets and if dimensions fit
+  ParseNumberArrayProperty(&mesh->weights, err, o, "weights", false);
+
+  ParseExtensionsProperty(&mesh->extensions, err, o);
+  ParseExtrasProperty(&(mesh->extras), o);
+
+  return true;
+}
+
+static bool ParseLight(Light *light, std::string *err, const json &o) {
+  ParseStringProperty(&light->name, err, o, "name", false);
+  ParseNumberArrayProperty(&light->color, err, o, "color", false);
+  ParseStringProperty(&light->type, err, o, "type", false);
+  return true;
+}
+
+static bool ParseNode(Node *node, std::string *err, const json &o) {
+  ParseStringProperty(&node->name, err, o, "name", false);
+
+  double skin = -1.0;
+  ParseNumberProperty(&skin, err, o, "skin", false);
+  node->skin = static_cast<int>(skin);
+
+  // Matrix and T/R/S are exclusive
+  if (!ParseNumberArrayProperty(&node->matrix, err, o, "matrix", false)) {
+    ParseNumberArrayProperty(&node->rotation, err, o, "rotation", false);
+    ParseNumberArrayProperty(&node->scale, err, o, "scale", false);
+    ParseNumberArrayProperty(&node->translation, err, o, "translation", false);
+  }
+
+  double camera = -1.0;
+  ParseNumberProperty(&camera, err, o, "camera", false);
+  node->camera = static_cast<int>(camera);
+
+  double mesh = -1.0;
+  ParseNumberProperty(&mesh, err, o, "mesh", false);
+  node->mesh = int(mesh);
+
+  node->children.clear();
+  json::const_iterator childrenObject = o.find("children");
+  if ((childrenObject != o.end()) && childrenObject.value().is_array()) {
+    for (json::const_iterator i = childrenObject.value().begin();
+         i != childrenObject.value().end(); i++) {
+      if (!i.value().is_number()) {
+        if (err) {
+          (*err) += "Invalid `children` array.\n";
+        }
+        return false;
+      }
+      const int &childrenNode = static_cast<int>(i.value());
+      node->children.push_back(childrenNode);
+    }
+  }
+
+  ParseExtensionsProperty(&node->extensions, err, o);
+  ParseExtrasProperty(&(node->extras), o);
+
+  return true;
+}
+
+static bool ParseMaterial(Material *material, std::string *err, const json &o) {
+  material->values.clear();
+  material->extensions.clear();
+  material->additionalValues.clear();
+
+  json::const_iterator it(o.begin());
+  json::const_iterator itEnd(o.end());
+
+  for (; it != itEnd; it++) {
+    if (it.key() == "pbrMetallicRoughness") {
+      if (it.value().is_object()) {
+        const json &values_object = it.value();
+
+        json::const_iterator itVal(values_object.begin());
+        json::const_iterator itValEnd(values_object.end());
+
+        for (; itVal != itValEnd; itVal++) {
+          Parameter param;
+          if (ParseParameterProperty(&param, err, values_object, itVal.key(),
+                                     false)) {
+            material->values[itVal.key()] = param;
+          }
+        }
+      }
+    } else if (it.key() == "extensions" || it.key() == "extras") {
+      // done later, skip, otherwise poorly parsed contents will be saved in the
+      // parametermap and serialized again later
+    } else {
+      Parameter param;
+      if (ParseParameterProperty(&param, err, o, it.key(), false)) {
+        material->additionalValues[it.key()] = param;
+      }
+    }
+  }
+
+  ParseExtensionsProperty(&material->extensions, err, o);
+  ParseExtrasProperty(&(material->extras), o);
+
+  return true;
+}
+
+static bool ParseAnimationChannel(AnimationChannel *channel, std::string *err,
+                                  const json &o) {
+  double samplerIndex = -1.0;
+  double targetIndex = -1.0;
+  if (!ParseNumberProperty(&samplerIndex, err, o, "sampler", true,
+                           "AnimationChannel")) {
+    if (err) {
+      (*err) += "`sampler` field is missing in animation channels\n";
+    }
+    return false;
+  }
+
+  json::const_iterator targetIt = o.find("target");
+  if ((targetIt != o.end()) && targetIt.value().is_object()) {
+    const json &target_object = targetIt.value();
+
+    if (!ParseNumberProperty(&targetIndex, err, target_object, "node", true)) {
+      if (err) {
+        (*err) += "`node` field is missing in animation.channels.target\n";
+      }
+      return false;
+    }
+
+    if (!ParseStringProperty(&channel->target_path, err, target_object, "path",
+                             true)) {
+      if (err) {
+        (*err) += "`path` field is missing in animation.channels.target\n";
+      }
+      return false;
+    }
+  }
+
+  channel->sampler = static_cast<int>(samplerIndex);
+  channel->target_node = static_cast<int>(targetIndex);
+
+  ParseExtrasProperty(&(channel->extras), o);
+
+  return true;
+}
+
+static bool ParseAnimation(Animation *animation, std::string *err,
+                           const json &o) {
+  {
+    json::const_iterator channelsIt = o.find("channels");
+    if ((channelsIt != o.end()) && channelsIt.value().is_array()) {
+      for (json::const_iterator i = channelsIt.value().begin();
+           i != channelsIt.value().end(); i++) {
+        AnimationChannel channel;
+        if (ParseAnimationChannel(&channel, err, i.value())) {
+          // Only add the channel if the parsing succeeds.
+          animation->channels.push_back(channel);
+        }
+      }
+    }
+  }
+
+  {
+    json::const_iterator samplerIt = o.find("samplers");
+    if ((samplerIt != o.end()) && samplerIt.value().is_array()) {
+      const json &sampler_array = samplerIt.value();
+
+      json::const_iterator it = sampler_array.begin();
+      json::const_iterator itEnd = sampler_array.end();
+
+      for (; it != itEnd; it++) {
+        const json &s = it->get<json>();
+
+        AnimationSampler sampler;
+        double inputIndex = -1.0;
+        double outputIndex = -1.0;
+        if (!ParseNumberProperty(&inputIndex, err, s, "input", true)) {
+          if (err) {
+            (*err) += "`input` field is missing in animation.sampler\n";
+          }
+          return false;
+        }
+        if (!ParseStringProperty(&sampler.interpolation, err, s,
+                                 "interpolation", true)) {
+          if (err) {
+            (*err) += "`interpolation` field is missing in animation.sampler\n";
+          }
+          return false;
+        }
+        if (!ParseNumberProperty(&outputIndex, err, s, "output", true)) {
+          if (err) {
+            (*err) += "`output` field is missing in animation.sampler\n";
+          }
+          return false;
+        }
+        sampler.input = static_cast<int>(inputIndex);
+        sampler.output = static_cast<int>(outputIndex);
+        ParseExtrasProperty(&(sampler.extras), s);
+        animation->samplers.push_back(sampler);
+      }
+    }
+  }
+
+  ParseStringProperty(&animation->name, err, o, "name", false);
+
+  ParseExtrasProperty(&(animation->extras), o);
+
+  return true;
+}
+
+static bool ParseSampler(Sampler *sampler, std::string *err, const json &o) {
+  ParseStringProperty(&sampler->name, err, o, "name", false);
+
+  double minFilter =
+      static_cast<double>(TINYGLTF_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR);
+  double magFilter = static_cast<double>(TINYGLTF_TEXTURE_FILTER_LINEAR);
+  double wrapS = static_cast<double>(TINYGLTF_TEXTURE_WRAP_REPEAT);
+  double wrapT = static_cast<double>(TINYGLTF_TEXTURE_WRAP_REPEAT);
+  ParseNumberProperty(&minFilter, err, o, "minFilter", false);
+  ParseNumberProperty(&magFilter, err, o, "magFilter", false);
+  ParseNumberProperty(&wrapS, err, o, "wrapS", false);
+  ParseNumberProperty(&wrapT, err, o, "wrapT", false);
+
+  sampler->minFilter = static_cast<int>(minFilter);
+  sampler->magFilter = static_cast<int>(magFilter);
+  sampler->wrapS = static_cast<int>(wrapS);
+  sampler->wrapT = static_cast<int>(wrapT);
+
+  ParseExtrasProperty(&(sampler->extras), o);
+
+  return true;
+}
+
+static bool ParseSkin(Skin *skin, std::string *err, const json &o) {
+  ParseStringProperty(&skin->name, err, o, "name", false, "Skin");
+
+  std::vector<double> joints;
+  if (!ParseNumberArrayProperty(&joints, err, o, "joints", false, "Skin")) {
+    return false;
+  }
+
+  double skeleton = -1.0;
+  ParseNumberProperty(&skeleton, err, o, "skeleton", false, "Skin");
+  skin->skeleton = static_cast<int>(skeleton);
+
+  skin->joints.resize(joints.size());
+  for (size_t i = 0; i < joints.size(); i++) {
+    skin->joints[i] = static_cast<int>(joints[i]);
+  }
+
+  double invBind = -1.0;
+  ParseNumberProperty(&invBind, err, o, "inverseBindMatrices", true, "Skin");
+  skin->inverseBindMatrices = static_cast<int>(invBind);
+
+  return true;
+}
+
+static bool ParsePerspectiveCamera(PerspectiveCamera *camera, std::string *err,
+                                   const json &o) {
+  double yfov = 0.0;
+  if (!ParseNumberProperty(&yfov, err, o, "yfov", true, "OrthographicCamera")) {
+    return false;
+  }
+
+  double znear = 0.0;
+  if (!ParseNumberProperty(&znear, err, o, "znear", true,
+                           "PerspectiveCamera")) {
+    return false;
+  }
+
+  double aspectRatio = 0.0;  // = invalid
+  ParseNumberProperty(&aspectRatio, err, o, "aspectRatio", false,
+                      "PerspectiveCamera");
+
+  double zfar = 0.0;  // = invalid
+  ParseNumberProperty(&zfar, err, o, "zfar", false, "PerspectiveCamera");
+
+  camera->aspectRatio = aspectRatio;
+  camera->zfar = zfar;
+  camera->yfov = yfov;
+  camera->znear = znear;
+
+  ParseExtensionsProperty(&camera->extensions, err, o);
+  ParseExtrasProperty(&(camera->extras), o);
+
+  // TODO(syoyo): Validate parameter values.
+
+  return true;
+}
+
+static bool ParseOrthographicCamera(OrthographicCamera *camera,
+                                    std::string *err, const json &o) {
+  double xmag = 0.0;
+  if (!ParseNumberProperty(&xmag, err, o, "xmag", true, "OrthographicCamera")) {
+    return false;
+  }
+
+  double ymag = 0.0;
+  if (!ParseNumberProperty(&ymag, err, o, "ymag", true, "OrthographicCamera")) {
+    return false;
+  }
+
+  double zfar = 0.0;
+  if (!ParseNumberProperty(&zfar, err, o, "zfar", true, "OrthographicCamera")) {
+    return false;
+  }
+
+  double znear = 0.0;
+  if (!ParseNumberProperty(&znear, err, o, "znear", true,
+                           "OrthographicCamera")) {
+    return false;
+  }
+
+  ParseExtensionsProperty(&camera->extensions, err, o);
+  ParseExtrasProperty(&(camera->extras), o);
+
+  camera->xmag = xmag;
+  camera->ymag = ymag;
+  camera->zfar = zfar;
+  camera->znear = znear;
+
+  // TODO(syoyo): Validate parameter values.
+
+  return true;
+}
+
+static bool ParseCamera(Camera *camera, std::string *err, const json &o) {
+  if (!ParseStringProperty(&camera->type, err, o, "type", true, "Camera")) {
+    return false;
+  }
+
+  if (camera->type.compare("orthographic") == 0) {
+    if (o.find("orthographic") == o.end()) {
+      if (err) {
+        std::stringstream ss;
+        ss << "Orhographic camera description not found." << std::endl;
+        (*err) += ss.str();
+      }
+      return false;
+    }
+
+    const json &v = o.find("orthographic").value();
+    if (!v.is_object()) {
+      if (err) {
+        std::stringstream ss;
+        ss << "\"orthographic\" is not a JSON object." << std::endl;
+        (*err) += ss.str();
+      }
+      return false;
+    }
+
+    if (!ParseOrthographicCamera(&camera->orthographic, err, v.get<json>())) {
+      return false;
+    }
+  } else if (camera->type.compare("perspective") == 0) {
+    if (o.find("perspective") == o.end()) {
+      if (err) {
+        std::stringstream ss;
+        ss << "Perspective camera description not found." << std::endl;
+        (*err) += ss.str();
+      }
+      return false;
+    }
+
+    const json &v = o.find("perspective").value();
+    if (!v.is_object()) {
+      if (err) {
+        std::stringstream ss;
+        ss << "\"perspective\" is not a JSON object." << std::endl;
+        (*err) += ss.str();
+      }
+      return false;
+    }
+
+    if (!ParsePerspectiveCamera(&camera->perspective, err, v.get<json>())) {
+      return false;
+    }
+  } else {
+    if (err) {
+      std::stringstream ss;
+      ss << "Invalid camera type: \"" << camera->type
+         << "\". Must be \"perspective\" or \"orthographic\"" << std::endl;
+      (*err) += ss.str();
+    }
+    return false;
+  }
+
+  ParseStringProperty(&camera->name, err, o, "name", false);
+
+  ParseExtensionsProperty(&camera->extensions, err, o);
+  ParseExtrasProperty(&(camera->extras), o);
+
+  return true;
+}
+
+bool TinyGLTF::LoadFromString(Model *model, std::string *err, std::string *warn,
+                              const char *str, unsigned int length,
+                              const std::string &base_dir,
+                              unsigned int check_sections) {
+  if (length < 4) {
+    if (err) {
+      (*err) = "JSON string too short.\n";
+    }
+    return false;
+  }
+
+  json v;
+
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || \
+     defined(_CPPUNWIND)) &&                               \
+    not defined(TINYGLTF_NOEXCEPTION)
+  try {
+    v = json::parse(str, str + length);
+
+  } catch (const std::exception &e) {
+    if (err) {
+      (*err) = e.what();
+    }
+    return false;
+  }
+#else
+  {
+    v = json::parse(str, str + length, nullptr, /* exception */ false);
+
+    if (!v.is_object()) {
+      // Assume parsing was failed.
+      if (err) {
+        (*err) = "Failed to parse JSON object\n";
+      }
+      return false;
+    }
+  }
+#endif
+
+  if (!v.is_object()) {
+    // root is not an object.
+    if (err) {
+      (*err) = "Root element is not a JSON object\n";
+    }
+    return false;
+  }
+
+  // scene is not mandatory.
+  // FIXME Maybe a better way to handle it than removing the code
+
+  {
+    json::const_iterator it = v.find("scenes");
+    if ((it != v.end()) && it.value().is_array()) {
+      // OK
+    } else if (check_sections & REQUIRE_SCENES) {
+      if (err) {
+        (*err) += "\"scenes\" object not found in .gltf or not an array type\n";
+      }
+      return false;
+    }
+  }
+
+  {
+    json::const_iterator it = v.find("nodes");
+    if ((it != v.end()) && it.value().is_array()) {
+      // OK
+    } else if (check_sections & REQUIRE_NODES) {
+      if (err) {
+        (*err) += "\"nodes\" object not found in .gltf\n";
+      }
+      return false;
+    }
+  }
+
+  {
+    json::const_iterator it = v.find("accessors");
+    if ((it != v.end()) && it.value().is_array()) {
+      // OK
+    } else if (check_sections & REQUIRE_ACCESSORS) {
+      if (err) {
+        (*err) += "\"accessors\" object not found in .gltf\n";
+      }
+      return false;
+    }
+  }
+
+  {
+    json::const_iterator it = v.find("buffers");
+    if ((it != v.end()) && it.value().is_array()) {
+      // OK
+    } else if (check_sections & REQUIRE_BUFFERS) {
+      if (err) {
+        (*err) += "\"buffers\" object not found in .gltf\n";
+      }
+      return false;
+    }
+  }
+
+  {
+    json::const_iterator it = v.find("bufferViews");
+    if ((it != v.end()) && it.value().is_array()) {
+      // OK
+    } else if (check_sections & REQUIRE_BUFFER_VIEWS) {
+      if (err) {
+        (*err) += "\"bufferViews\" object not found in .gltf\n";
+      }
+      return false;
+    }
+  }
+
+  model->buffers.clear();
+  model->bufferViews.clear();
+  model->accessors.clear();
+  model->meshes.clear();
+  model->cameras.clear();
+  model->nodes.clear();
+  model->extensionsUsed.clear();
+  model->extensionsRequired.clear();
+  model->extensions.clear();
+  model->defaultScene = -1;
+
+  // 1. Parse Asset
+  {
+    json::const_iterator it = v.find("asset");
+    if ((it != v.end()) && it.value().is_object()) {
+      const json &root = it.value();
+
+      ParseAsset(&model->asset, err, root);
+    }
+  }
+
+  // 2. Parse extensionUsed
+  {
+    json::const_iterator it = v.find("extensionsUsed");
+    if ((it != v.end()) && it.value().is_array()) {
+      const json &root = it.value();
+      for (unsigned int i = 0; i < root.size(); ++i) {
+        model->extensionsUsed.push_back(root[i].get<std::string>());
+      }
+    }
+  }
+
+  {
+    json::const_iterator it = v.find("extensionsRequired");
+    if ((it != v.end()) && it.value().is_array()) {
+      const json &root = it.value();
+      for (unsigned int i = 0; i < root.size(); ++i) {
+        model->extensionsRequired.push_back(root[i].get<std::string>());
+      }
+    }
+  }
+
+  // 3. Parse Buffer
+  {
+    json::const_iterator rootIt = v.find("buffers");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; it++) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`buffers' does not contain an JSON object.";
+          }
+          return false;
+        }
+        Buffer buffer;
+        if (!ParseBuffer(&buffer, err, it->get<json>(), &fs, base_dir,
+                         is_binary_, bin_data_, bin_size_)) {
+          return false;
+        }
+
+        model->buffers.push_back(buffer);
+      }
+    }
+  }
+
+  // 4. Parse BufferView
+  {
+    json::const_iterator rootIt = v.find("bufferViews");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; it++) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`bufferViews' does not contain an JSON object.";
+          }
+          return false;
+        }
+        BufferView bufferView;
+        if (!ParseBufferView(&bufferView, err, it->get<json>())) {
+          return false;
+        }
+
+        model->bufferViews.push_back(bufferView);
+      }
+    }
+  }
+
+  // 5. Parse Accessor
+  {
+    json::const_iterator rootIt = v.find("accessors");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; it++) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`accessors' does not contain an JSON object.";
+          }
+          return false;
+        }
+        Accessor accessor;
+        if (!ParseAccessor(&accessor, err, it->get<json>())) {
+          return false;
+        }
+
+        model->accessors.push_back(accessor);
+      }
+    }
+  }
+
+  // 6. Parse Mesh
+  {
+    json::const_iterator rootIt = v.find("meshes");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; it++) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`meshes' does not contain an JSON object.";
+          }
+          return false;
+        }
+        Mesh mesh;
+        if (!ParseMesh(&mesh, model, err, it->get<json>())) {
+          return false;
+        }
+
+        model->meshes.push_back(mesh);
+      }
+    }
+  }
+
+  // Assign missing bufferView target types
+  // - Look for missing Mesh indices
+  // - Look for missing bufferView targets
+  for (auto &mesh : model->meshes)
+  {
+    for (auto &primitive : mesh.primitives)
+    {
+      if (primitive.indices > -1) // has indices from parsing step, must be Element Array Buffer
+      {
+        model->bufferViews[model->accessors[primitive.indices].bufferView]
+            .target = TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER;
+        // we could optionally check if acessors' bufferView type is Scalar, as it should be
+      }
+    }
+  }
+  // find any missing targets, must be an array buffer type if not fulfilled from previous check
+  for (auto &bufferView : model->bufferViews)
+  {
+    if (bufferView.target == 0) // missing target type
+    {
+      bufferView.target = TINYGLTF_TARGET_ARRAY_BUFFER;
+    }
+  }
+
+  // 7. Parse Node
+  {
+    json::const_iterator rootIt = v.find("nodes");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; it++) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`nodes' does not contain an JSON object.";
+          }
+          return false;
+        }
+        Node node;
+        if (!ParseNode(&node, err, it->get<json>())) {
+          return false;
+        }
+
+        model->nodes.push_back(node);
+      }
+    }
+  }
+
+  // 8. Parse scenes.
+  {
+    json::const_iterator rootIt = v.find("scenes");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; it++) {
+        if (!(it.value().is_object())) {
+          if (err) {
+            (*err) += "`scenes' does not contain an JSON object.";
+          }
+          return false;
+        }
+        const json &o = it->get<json>();
+        std::vector<double> nodes;
+        if (!ParseNumberArrayProperty(&nodes, err, o, "nodes", false)) {
+          return false;
+        }
+
+        Scene scene;
+        ParseStringProperty(&scene.name, err, o, "name", false);
+        std::vector<int> nodesIds;
+        for (size_t i = 0; i < nodes.size(); i++) {
+          nodesIds.push_back(static_cast<int>(nodes[i]));
+        }
+        scene.nodes = nodesIds;
+
+        ParseExtensionsProperty(&scene.extensions, err, o);
+        ParseExtrasProperty(&scene.extras, o);
+
+        model->scenes.push_back(scene);
+      }
+    }
+  }
+
+  // 9. Parse default scenes.
+  {
+    json::const_iterator rootIt = v.find("scene");
+    if ((rootIt != v.end()) && rootIt.value().is_number()) {
+      const int defaultScene = rootIt.value();
+
+      model->defaultScene = static_cast<int>(defaultScene);
+    }
+  }
+
+  // 10. Parse Material
+  {
+    json::const_iterator rootIt = v.find("materials");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; it++) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`materials' does not contain an JSON object.";
+          }
+          return false;
+        }
+        json jsonMaterial = it->get<json>();
+
+        Material material;
+        ParseStringProperty(&material.name, err, jsonMaterial, "name", false);
+
+        if (!ParseMaterial(&material, err, jsonMaterial)) {
+          return false;
+        }
+
+        model->materials.push_back(material);
+      }
+    }
+  }
+
+  // 11. Parse Image
+  {
+    json::const_iterator rootIt = v.find("images");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      int idx = 0;
+      for (; it != itEnd; it++, idx++) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "image[" + std::to_string(idx) + "] is not a JSON object.";
+          }
+          return false;
+        }
+        Image image;
+        if (!ParseImage(&image, idx, err, warn, it.value(), base_dir, &fs,
+                        &this->LoadImageData, load_image_user_data_)) {
+          return false;
+        }
+
+        if (image.bufferView != -1) {
+          // Load image from the buffer view.
+          if (size_t(image.bufferView) >= model->bufferViews.size()) {
+            if (err) {
+              std::stringstream ss;
+              ss << "image[" << idx << "] bufferView \"" << image.bufferView
+                 << "\" not found in the scene." << std::endl;
+              (*err) += ss.str();
+            }
+            return false;
+          }
+
+          const BufferView &bufferView =
+              model->bufferViews[size_t(image.bufferView)];
+          const Buffer &buffer = model->buffers[size_t(bufferView.buffer)];
+
+          if (*LoadImageData == nullptr) {
+            if (err) {
+              (*err) += "No LoadImageData callback specified.\n";
+            }
+            return false;
+          }
+          bool ret = LoadImageData(&image, idx, err, warn, image.width, image.height,
+                                   &buffer.data[bufferView.byteOffset],
+                                   static_cast<int>(bufferView.byteLength),
+                                   load_image_user_data_);
+          if (!ret) {
+            return false;
+          }
+        }
+
+        model->images.push_back(image);
+      }
+    }
+  }
+
+  // 12. Parse Texture
+  {
+    json::const_iterator rootIt = v.find("textures");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; it++) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`textures' does not contain an JSON object.";
+          }
+          return false;
+        }
+        Texture texture;
+        if (!ParseTexture(&texture, err, it->get<json>(), base_dir)) {
+          return false;
+        }
+
+        model->textures.push_back(texture);
+      }
+    }
+  }
+
+  // 13. Parse Animation
+  {
+    json::const_iterator rootIt = v.find("animations");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; ++it) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`animations' does not contain an JSON object.";
+          }
+          return false;
+        }
+        Animation animation;
+        if (!ParseAnimation(&animation, err, it->get<json>())) {
+          return false;
+        }
+
+        model->animations.push_back(animation);
+      }
+    }
+  }
+
+  // 14. Parse Skin
+  {
+    json::const_iterator rootIt = v.find("skins");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; ++it) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`skins' does not contain an JSON object.";
+          }
+          return false;
+        }
+        Skin skin;
+        if (!ParseSkin(&skin, err, it->get<json>())) {
+          return false;
+        }
+
+        model->skins.push_back(skin);
+      }
+    }
+  }
+
+  // 15. Parse Sampler
+  {
+    json::const_iterator rootIt = v.find("samplers");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; ++it) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`samplers' does not contain an JSON object.";
+          }
+          return false;
+        }
+        Sampler sampler;
+        if (!ParseSampler(&sampler, err, it->get<json>())) {
+          return false;
+        }
+
+        model->samplers.push_back(sampler);
+      }
+    }
+  }
+
+  // 16. Parse Camera
+  {
+    json::const_iterator rootIt = v.find("cameras");
+    if ((rootIt != v.end()) && rootIt.value().is_array()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; ++it) {
+        if (!it.value().is_object()) {
+          if (err) {
+            (*err) += "`cameras' does not contain an JSON object.";
+          }
+          return false;
+        }
+        Camera camera;
+        if (!ParseCamera(&camera, err, it->get<json>())) {
+          return false;
+        }
+
+        model->cameras.push_back(camera);
+      }
+    }
+  }
+
+  // 17. Parse Extensions
+  ParseExtensionsProperty(&model->extensions, err, v);
+
+  // 18. Specific extension implementations
+  {
+    json::const_iterator rootIt = v.find("extensions");
+    if ((rootIt != v.end()) && rootIt.value().is_object()) {
+      const json &root = rootIt.value();
+
+      json::const_iterator it(root.begin());
+      json::const_iterator itEnd(root.end());
+      for (; it != itEnd; ++it) {
+        // parse KHR_lights_cmn extension
+        if ((it.key().compare("KHR_lights_cmn") == 0) &&
+            it.value().is_object()) {
+          const json &object = it.value();
+          json::const_iterator itLight(object.find("lights"));
+          json::const_iterator itLightEnd(object.end());
+          if (itLight == itLightEnd) {
+            continue;
+          }
+
+          if (!itLight.value().is_array()) {
+            continue;
+          }
+
+          const json &lights = itLight.value();
+          json::const_iterator arrayIt(lights.begin());
+          json::const_iterator arrayItEnd(lights.end());
+          for (; arrayIt != arrayItEnd; ++arrayIt) {
+            Light light;
+            if (!ParseLight(&light, err, arrayIt.value())) {
+              return false;
+            }
+            model->lights.push_back(light);
+          }
+        }
+      }
+    }
+  }
+
+  // 19. Parse Extras
+  ParseExtrasProperty(&model->extras, v);
+
+  return true;
+}
+
+bool TinyGLTF::LoadASCIIFromString(Model *model, std::string *err,
+                                   std::string *warn, const char *str,
+                                   unsigned int length,
+                                   const std::string &base_dir,
+                                   unsigned int check_sections) {
+  is_binary_ = false;
+  bin_data_ = nullptr;
+  bin_size_ = 0;
+
+  return LoadFromString(model, err, warn, str, length, base_dir,
+                        check_sections);
+}
+
+bool TinyGLTF::LoadASCIIFromFile(Model *model, std::string *err,
+                                 std::string *warn, const std::string &filename,
+                                 unsigned int check_sections) {
+  std::stringstream ss;
+
+  if (fs.ReadWholeFile == nullptr) {
+    // Programmer error, assert() ?
+    ss << "Failed to read file: " << filename
+       << ": one or more FS callback not set" << std::endl;
+    if (err) {
+      (*err) = ss.str();
+    }
+    return false;
+  }
+
+  std::vector<unsigned char> data;
+  std::string fileerr;
+  bool fileread = fs.ReadWholeFile(&data, &fileerr, filename, fs.user_data);
+  if (!fileread) {
+    ss << "Failed to read file: " << filename << ": " << fileerr << std::endl;
+    if (err) {
+      (*err) = ss.str();
+    }
+    return false;
+  }
+
+  size_t sz = data.size();
+  if (sz == 0) {
+    if (err) {
+      (*err) = "Empty file.";
+    }
+    return false;
+  }
+
+  std::string basedir = GetBaseDir(filename);
+
+  bool ret = LoadASCIIFromString(
+      model, err, warn, reinterpret_cast<const char *>(&data.at(0)),
+      static_cast<unsigned int>(data.size()), basedir, check_sections);
+
+  return ret;
+}
+
+bool TinyGLTF::LoadBinaryFromMemory(Model *model, std::string *err,
+                                    std::string *warn,
+                                    const unsigned char *bytes,
+                                    unsigned int size,
+                                    const std::string &base_dir,
+                                    unsigned int check_sections) {
+  if (size < 20) {
+    if (err) {
+      (*err) = "Too short data size for glTF Binary.";
+    }
+    return false;
+  }
+
+  if (bytes[0] == 'g' && bytes[1] == 'l' && bytes[2] == 'T' &&
+      bytes[3] == 'F') {
+    // ok
+  } else {
+    if (err) {
+      (*err) = "Invalid magic.";
+    }
+    return false;
+  }
+
+  unsigned int version;       // 4 bytes
+  unsigned int length;        // 4 bytes
+  unsigned int model_length;  // 4 bytes
+  unsigned int model_format;  // 4 bytes;
+
+  // @todo { Endian swap for big endian machine. }
+  memcpy(&version, bytes + 4, 4);
+  swap4(&version);
+  memcpy(&length, bytes + 8, 4);
+  swap4(&length);
+  memcpy(&model_length, bytes + 12, 4);
+  swap4(&model_length);
+  memcpy(&model_format, bytes + 16, 4);
+  swap4(&model_format);
+
+  // In case the Bin buffer is not present, the size is exactly 20 + size of
+  // JSON contents,
+  // so use "greater than" operator.
+  if ((20 + model_length > size) || (model_length < 1) ||
+      (model_format != 0x4E4F534A)) {  // 0x4E4F534A = JSON format.
+    if (err) {
+      (*err) = "Invalid glTF binary.";
+    }
+    return false;
+  }
+
+  // Extract JSON string.
+  std::string jsonString(reinterpret_cast<const char *>(&bytes[20]),
+                         model_length);
+
+  is_binary_ = true;
+  bin_data_ = bytes + 20 + model_length +
+              8;  // 4 bytes (buffer_length) + 4 bytes(buffer_format)
+  bin_size_ =
+      length - (20 + model_length);  // extract header + JSON scene data.
+
+  bool ret = LoadFromString(model, err, warn,
+                            reinterpret_cast<const char *>(&bytes[20]),
+                            model_length, base_dir, check_sections);
+  if (!ret) {
+    return ret;
+  }
+
+  return true;
+}
+
+bool TinyGLTF::LoadBinaryFromFile(Model *model, std::string *err,
+                                  std::string *warn,
+                                  const std::string &filename,
+                                  unsigned int check_sections) {
+  std::stringstream ss;
+
+  if (fs.ReadWholeFile == nullptr) {
+    // Programmer error, assert() ?
+    ss << "Failed to read file: " << filename
+       << ": one or more FS callback not set" << std::endl;
+    if (err) {
+      (*err) = ss.str();
+    }
+    return false;
+  }
+
+  std::vector<unsigned char> data;
+  std::string fileerr;
+  bool fileread = fs.ReadWholeFile(&data, &fileerr, filename, fs.user_data);
+  if (!fileread) {
+    ss << "Failed to read file: " << filename << ": " << fileerr << std::endl;
+    if (err) {
+      (*err) = ss.str();
+    }
+    return false;
+  }
+
+  std::string basedir = GetBaseDir(filename);
+
+  bool ret = LoadBinaryFromMemory(model, err, warn, &data.at(0),
+                                  static_cast<unsigned int>(data.size()),
+                                  basedir, check_sections);
+
+  return ret;
+}
+
+///////////////////////
+// GLTF Serialization
+///////////////////////
+
+// typedef std::pair<std::string, json> json_object_pair;
+
+template <typename T>
+static void SerializeNumberProperty(const std::string &key, T number,
+                                    json &obj) {
+  // obj.insert(
+  //    json_object_pair(key, json(static_cast<double>(number))));
+  // obj[key] = static_cast<double>(number);
+  obj[key] = number;
+}
+
+template <typename T>
+static void SerializeNumberArrayProperty(const std::string &key,
+                                         const std::vector<T> &value,
+                                         json &obj) {
+  json o;
+  json vals;
+
+  for (unsigned int i = 0; i < value.size(); ++i) {
+    vals.push_back(static_cast<T>(value[i]));
+  }
+  if (!vals.is_null()) {
+    obj[key] = vals;
+  }
+}
+
+static void SerializeStringProperty(const std::string &key,
+                                    const std::string &value, json &obj) {
+  obj[key] = value;
+}
+
+static void SerializeStringArrayProperty(const std::string &key,
+                                         const std::vector<std::string> &value,
+                                         json &obj) {
+  json o;
+  json vals;
+
+  for (unsigned int i = 0; i < value.size(); ++i) {
+    vals.push_back(value[i]);
+  }
+
+  obj[key] = vals;
+}
+
+static bool ValueToJson(const Value &value, json *ret) {
+  json obj;
+  switch (value.Type()) {
+    case NUMBER_TYPE:
+      obj = json(value.Get<double>());
+      break;
+    case INT_TYPE:
+      obj = json(value.Get<int>());
+      break;
+    case BOOL_TYPE:
+      obj = json(value.Get<bool>());
+      break;
+    case STRING_TYPE:
+      obj = json(value.Get<std::string>());
+      break;
+    case ARRAY_TYPE: {
+      for (unsigned int i = 0; i < value.ArrayLen(); ++i) {
+        Value elementValue = value.Get(int(i));
+        json elementJson;
+        if (ValueToJson(value.Get(int(i)), &elementJson))
+          obj.push_back(elementJson);
+      }
+      break;
+    }
+    case BINARY_TYPE:
+      // TODO
+      // obj = json(value.Get<std::vector<unsigned char>>());
+      return false;
+      break;
+    case OBJECT_TYPE: {
+      Value::Object objMap = value.Get<Value::Object>();
+      for (auto &it : objMap) {
+        json elementJson;
+        if (ValueToJson(it.second, &elementJson)) obj[it.first] = elementJson;
+      }
+      break;
+    }
+    case NULL_TYPE:
+    default:
+      return false;
+  }
+  if (ret) *ret = obj;
+  return true;
+}
+
+static void SerializeValue(const std::string &key, const Value &value,
+                           json &obj) {
+  json ret;
+  if (ValueToJson(value, &ret)) obj[key] = ret;
+}
+
+static void SerializeGltfBufferData(const std::vector<unsigned char> &data,
+                                    json &o) {
+  std::string header = "data:application/octet-stream;base64,";
+  std::string encodedData =
+      base64_encode(&data[0], static_cast<unsigned int>(data.size()));
+  SerializeStringProperty("uri", header + encodedData, o);
+}
+
+static bool SerializeGltfBufferData(const std::vector<unsigned char> &data,
+                                    const std::string &binFilename) {
+  std::ofstream output(binFilename.c_str(), std::ofstream::binary);
+  if(!output.is_open()) return false;
+  output.write(reinterpret_cast<const char *>(&data[0]),
+               std::streamsize(data.size()));
+  output.close();
+  return true;
+}
+
+static void SerializeParameterMap(ParameterMap &param, json &o) {
+  for (ParameterMap::iterator paramIt = param.begin(); paramIt != param.end();
+       ++paramIt) {
+    if (paramIt->second.number_array.size()) {
+      SerializeNumberArrayProperty<double>(paramIt->first,
+                                           paramIt->second.number_array, o);
+    } else if (paramIt->second.json_double_value.size()) {
+      json json_double_value;
+      for (std::map<std::string, double>::iterator it =
+               paramIt->second.json_double_value.begin();
+           it != paramIt->second.json_double_value.end(); ++it) {
+        if (it->first == "index") {
+          json_double_value[it->first] = paramIt->second.TextureIndex();
+        } else {
+          json_double_value[it->first] = it->second;
+        }
+      }
+
+      o[paramIt->first] = json_double_value;
+    } else if (!paramIt->second.string_value.empty()) {
+      SerializeStringProperty(paramIt->first, paramIt->second.string_value, o);
+    } else if (paramIt->second.has_number_value) {
+      o[paramIt->first] = paramIt->second.number_value;
+    } else {
+      o[paramIt->first] = paramIt->second.bool_value;
+    }
+  }
+}
+
+static void SerializeExtensionMap(ExtensionMap &extensions, json &o) {
+  if (!extensions.size()) return;
+
+  json extMap;
+  for (ExtensionMap::iterator extIt = extensions.begin();
+       extIt != extensions.end(); ++extIt) {
+    json extension_values;
+
+    // Allow an empty object for extension(#97)
+    json ret;
+    if (ValueToJson(extIt->second, &ret)) {
+      extMap[extIt->first] = ret;
+    }
+    if(ret.is_null()) {
+      if (!(extIt->first.empty())) { // name should not be empty, but for sure
+        // create empty object so that an extension name is still included in json.
+        extMap[extIt->first] = json({});
+      }
+    }
+  }
+  o["extensions"] = extMap;
+}
+
+static void SerializeGltfAccessor(Accessor &accessor, json &o) {
+  SerializeNumberProperty<int>("bufferView", accessor.bufferView, o);
+
+  if (accessor.byteOffset != 0.0)
+    SerializeNumberProperty<int>("byteOffset", int(accessor.byteOffset), o);
+
+  SerializeNumberProperty<int>("componentType", accessor.componentType, o);
+  SerializeNumberProperty<size_t>("count", accessor.count, o);
+  SerializeNumberArrayProperty<double>("min", accessor.minValues, o);
+  SerializeNumberArrayProperty<double>("max", accessor.maxValues, o);
+  std::string type;
+  switch (accessor.type) {
+    case TINYGLTF_TYPE_SCALAR:
+      type = "SCALAR";
+      break;
+    case TINYGLTF_TYPE_VEC2:
+      type = "VEC2";
+      break;
+    case TINYGLTF_TYPE_VEC3:
+      type = "VEC3";
+      break;
+    case TINYGLTF_TYPE_VEC4:
+      type = "VEC4";
+      break;
+    case TINYGLTF_TYPE_MAT2:
+      type = "MAT2";
+      break;
+    case TINYGLTF_TYPE_MAT3:
+      type = "MAT3";
+      break;
+    case TINYGLTF_TYPE_MAT4:
+      type = "MAT4";
+      break;
+  }
+
+  SerializeStringProperty("type", type, o);
+  if (!accessor.name.empty()) SerializeStringProperty("name", accessor.name, o);
+
+  if (accessor.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", accessor.extras, o);
+  }
+}
+
+static void SerializeGltfAnimationChannel(AnimationChannel &channel, json &o) {
+  SerializeNumberProperty("sampler", channel.sampler, o);
+  json target;
+  SerializeNumberProperty("node", channel.target_node, target);
+  SerializeStringProperty("path", channel.target_path, target);
+
+  o["target"] = target;
+
+  if (channel.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", channel.extras, o);
+  }
+}
+
+static void SerializeGltfAnimationSampler(AnimationSampler &sampler, json &o) {
+  SerializeNumberProperty("input", sampler.input, o);
+  SerializeNumberProperty("output", sampler.output, o);
+  SerializeStringProperty("interpolation", sampler.interpolation, o);
+
+  if (sampler.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", sampler.extras, o);
+  }
+}
+
+static void SerializeGltfAnimation(Animation &animation, json &o) {
+  if (!animation.name.empty())
+    SerializeStringProperty("name", animation.name, o);
+  json channels;
+  for (unsigned int i = 0; i < animation.channels.size(); ++i) {
+    json channel;
+    AnimationChannel gltfChannel = animation.channels[i];
+    SerializeGltfAnimationChannel(gltfChannel, channel);
+    channels.push_back(channel);
+  }
+  o["channels"] = channels;
+
+  json samplers;
+  for (unsigned int i = 0; i < animation.samplers.size(); ++i) {
+    json sampler;
+    AnimationSampler gltfSampler = animation.samplers[i];
+    SerializeGltfAnimationSampler(gltfSampler, sampler);
+    samplers.push_back(sampler);
+  }
+
+  o["samplers"] = samplers;
+
+  if (animation.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", animation.extras, o);
+  }
+}
+
+static void SerializeGltfAsset(Asset &asset, json &o) {
+  if (!asset.generator.empty()) {
+    SerializeStringProperty("generator", asset.generator, o);
+  }
+
+  if (!asset.version.empty()) {
+    SerializeStringProperty("version", asset.version, o);
+  }
+
+  if (asset.extras.Keys().size()) {
+    SerializeValue("extras", asset.extras, o);
+  }
+
+  SerializeExtensionMap(asset.extensions, o);
+}
+
+static void SerializeGltfBuffer(Buffer &buffer, json &o) {
+  SerializeNumberProperty("byteLength", buffer.data.size(), o);
+  SerializeGltfBufferData(buffer.data, o);
+
+  if (buffer.name.size()) SerializeStringProperty("name", buffer.name, o);
+
+  if (buffer.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", buffer.extras, o);
+  }
+}
+
+static bool SerializeGltfBuffer(Buffer &buffer, json &o,
+                                const std::string &binFilename,
+                                const std::string &binBaseFilename) {
+  if(!SerializeGltfBufferData(buffer.data, binFilename)) return false;
+  SerializeNumberProperty("byteLength", buffer.data.size(), o);
+  SerializeStringProperty("uri", binBaseFilename, o);
+
+  if (buffer.name.size()) SerializeStringProperty("name", buffer.name, o);
+
+  if (buffer.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", buffer.extras, o);
+  }
+  return true;
+}
+
+static void SerializeGltfBufferView(BufferView &bufferView, json &o) {
+  SerializeNumberProperty("buffer", bufferView.buffer, o);
+  SerializeNumberProperty<size_t>("byteLength", bufferView.byteLength, o);
+
+  // byteStride is optional, minimum allowed is 4
+  if (bufferView.byteStride >= 4) {
+    SerializeNumberProperty<size_t>("byteStride", bufferView.byteStride, o);
+  }
+  // byteOffset is optional, default is 0
+  if (bufferView.byteOffset > 0) {
+    SerializeNumberProperty<size_t>("byteOffset", bufferView.byteOffset, o);
+  }
+  // Target is optional, check if it contains a valid value
+  if (bufferView.target == TINYGLTF_TARGET_ARRAY_BUFFER ||
+      bufferView.target == TINYGLTF_TARGET_ELEMENT_ARRAY_BUFFER) {
+    SerializeNumberProperty("target", bufferView.target, o);
+  }
+  if (bufferView.name.size()) {
+    SerializeStringProperty("name", bufferView.name, o);
+  }
+
+  if (bufferView.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", bufferView.extras, o);
+  }
+}
+
+static void SerializeGltfImage(Image &image, json &o) {
+  SerializeStringProperty("uri", image.uri, o);
+
+  if (image.name.size()) {
+    SerializeStringProperty("name", image.name, o);
+  }
+
+  if (image.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", image.extras, o);
+  }
+
+  SerializeExtensionMap(image.extensions, o);
+}
+
+static void SerializeGltfMaterial(Material &material, json &o) {
+  if (material.extras.Size()) SerializeValue("extras", material.extras, o);
+  SerializeExtensionMap(material.extensions, o);
+
+  if (material.values.size()) {
+    json pbrMetallicRoughness;
+    SerializeParameterMap(material.values, pbrMetallicRoughness);
+    o["pbrMetallicRoughness"] = pbrMetallicRoughness;
+  }
+
+  SerializeParameterMap(material.additionalValues, o);
+
+  if (material.name.size()) {
+    SerializeStringProperty("name", material.name, o);
+  }
+
+  if (material.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", material.extras, o);
+  }
+}
+
+static void SerializeGltfMesh(Mesh &mesh, json &o) {
+  json primitives;
+  for (unsigned int i = 0; i < mesh.primitives.size(); ++i) {
+    json primitive;
+    json attributes;
+    Primitive gltfPrimitive = mesh.primitives[i];
+    for (std::map<std::string, int>::iterator attrIt =
+             gltfPrimitive.attributes.begin();
+         attrIt != gltfPrimitive.attributes.end(); ++attrIt) {
+      SerializeNumberProperty<int>(attrIt->first, attrIt->second, attributes);
+    }
+
+    primitive["attributes"] = attributes;
+
+    // Indicies is optional
+    if (gltfPrimitive.indices > -1) {
+      SerializeNumberProperty<int>("indices", gltfPrimitive.indices, primitive);
+    }
+    // Material is optional
+    if (gltfPrimitive.material > -1) {
+      SerializeNumberProperty<int>("material", gltfPrimitive.material,
+                                   primitive);
+    }
+    SerializeNumberProperty<int>("mode", gltfPrimitive.mode, primitive);
+
+    // Morph targets
+    if (gltfPrimitive.targets.size()) {
+      json targets;
+      for (unsigned int k = 0; k < gltfPrimitive.targets.size(); ++k) {
+        json targetAttributes;
+        std::map<std::string, int> targetData = gltfPrimitive.targets[k];
+        for (std::map<std::string, int>::iterator attrIt = targetData.begin();
+             attrIt != targetData.end(); ++attrIt) {
+          SerializeNumberProperty<int>(attrIt->first, attrIt->second,
+                                       targetAttributes);
+        }
+
+        targets.push_back(targetAttributes);
+      }
+      primitive["targets"] = targets;
+    }
+
+    if (gltfPrimitive.extras.Type() != NULL_TYPE) {
+      SerializeValue("extras", gltfPrimitive.extras, primitive);
+    }
+
+    primitives.push_back(primitive);
+  }
+
+  o["primitives"] = primitives;
+  if (mesh.weights.size()) {
+    SerializeNumberArrayProperty<double>("weights", mesh.weights, o);
+  }
+
+  if (mesh.name.size()) {
+    SerializeStringProperty("name", mesh.name, o);
+  }
+
+  if (mesh.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", mesh.extras, o);
+  }
+}
+
+static void SerializeGltfLight(Light &light, json &o) {
+  if (!light.name.empty()) SerializeStringProperty("name", light.name, o);
+  SerializeNumberArrayProperty("color", light.color, o);
+  SerializeStringProperty("type", light.type, o);
+}
+
+static void SerializeGltfNode(Node &node, json &o) {
+  if (node.translation.size() > 0) {
+    SerializeNumberArrayProperty<double>("translation", node.translation, o);
+  }
+  if (node.rotation.size() > 0) {
+    SerializeNumberArrayProperty<double>("rotation", node.rotation, o);
+  }
+  if (node.scale.size() > 0) {
+    SerializeNumberArrayProperty<double>("scale", node.scale, o);
+  }
+  if (node.matrix.size() > 0) {
+    SerializeNumberArrayProperty<double>("matrix", node.matrix, o);
+  }
+  if (node.mesh != -1) {
+    SerializeNumberProperty<int>("mesh", node.mesh, o);
+  }
+
+  if (node.skin != -1) {
+    SerializeNumberProperty<int>("skin", node.skin, o);
+  }
+
+  if (node.camera != -1) {
+    SerializeNumberProperty<int>("camera", node.camera, o);
+  }
+
+  if (node.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", node.extras, o);
+  }
+
+  SerializeExtensionMap(node.extensions, o);
+  if (!node.name.empty()) SerializeStringProperty("name", node.name, o);
+  SerializeNumberArrayProperty<int>("children", node.children, o);
+}
+
+static void SerializeGltfSampler(Sampler &sampler, json &o) {
+  SerializeNumberProperty("magFilter", sampler.magFilter, o);
+  SerializeNumberProperty("minFilter", sampler.minFilter, o);
+  SerializeNumberProperty("wrapR", sampler.wrapR, o);
+  SerializeNumberProperty("wrapS", sampler.wrapS, o);
+  SerializeNumberProperty("wrapT", sampler.wrapT, o);
+
+  if (sampler.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", sampler.extras, o);
+  }
+}
+
+static void SerializeGltfOrthographicCamera(const OrthographicCamera &camera,
+                                            json &o) {
+  SerializeNumberProperty("zfar", camera.zfar, o);
+  SerializeNumberProperty("znear", camera.znear, o);
+  SerializeNumberProperty("xmag", camera.xmag, o);
+  SerializeNumberProperty("ymag", camera.ymag, o);
+
+  if (camera.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", camera.extras, o);
+  }
+}
+
+static void SerializeGltfPerspectiveCamera(const PerspectiveCamera &camera,
+                                           json &o) {
+  SerializeNumberProperty("zfar", camera.zfar, o);
+  SerializeNumberProperty("znear", camera.znear, o);
+  if (camera.aspectRatio > 0) {
+    SerializeNumberProperty("aspectRatio", camera.aspectRatio, o);
+  }
+
+  if (camera.yfov > 0) {
+    SerializeNumberProperty("yfov", camera.yfov, o);
+  }
+
+  if (camera.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", camera.extras, o);
+  }
+}
+
+static void SerializeGltfCamera(const Camera &camera, json &o) {
+  SerializeStringProperty("type", camera.type, o);
+  if (!camera.name.empty()) {
+    SerializeStringProperty("name", camera.name, o);
+  }
+
+  if (camera.type.compare("orthographic") == 0) {
+    json orthographic;
+    SerializeGltfOrthographicCamera(camera.orthographic, orthographic);
+    o["orthographic"] = orthographic;
+  } else if (camera.type.compare("perspective") == 0) {
+    json perspective;
+    SerializeGltfPerspectiveCamera(camera.perspective, perspective);
+    o["perspective"] = perspective;
+  } else {
+    // ???
+  }
+}
+
+static void SerializeGltfScene(Scene &scene, json &o) {
+  SerializeNumberArrayProperty<int>("nodes", scene.nodes, o);
+
+  if (scene.name.size()) {
+    SerializeStringProperty("name", scene.name, o);
+  }
+  if (scene.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", scene.extras, o);
+  }
+  SerializeExtensionMap(scene.extensions, o);
+}
+
+static void SerializeGltfSkin(Skin &skin, json &o) {
+  if (skin.inverseBindMatrices != -1)
+    SerializeNumberProperty("inverseBindMatrices", skin.inverseBindMatrices, o);
+
+  SerializeNumberArrayProperty<int>("joints", skin.joints, o);
+  SerializeNumberProperty("skeleton", skin.skeleton, o);
+  if (skin.name.size()) {
+    SerializeStringProperty("name", skin.name, o);
+  }
+}
+
+static void SerializeGltfTexture(Texture &texture, json &o) {
+  if (texture.sampler > -1) {
+    SerializeNumberProperty("sampler", texture.sampler, o);
+  }
+  if (texture.source > -1) {
+    SerializeNumberProperty("source", texture.source, o);
+  }
+  if (texture.extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", texture.extras, o);
+  }
+  SerializeExtensionMap(texture.extensions, o);
+}
+
+static bool WriteGltfFile(const std::string &output,
+                          const std::string &content) {
+  std::ofstream gltfFile(output.c_str());
+  if (!gltfFile.is_open()) return false;
+  gltfFile << content << std::endl;
+  return true;
+}
+
+static void WriteBinaryGltfFile(const std::string &output,
+                                const std::string &content) {
+  std::ofstream gltfFile(output.c_str(), std::ios::binary);
+
+  const std::string header = "glTF";
+  const int version = 2;
+  const int padding_size = content.size() % 4;
+
+  // 12 bytes for header, JSON content length, 8 bytes for JSON chunk info, padding
+  const int length = 12 + 8 + int(content.size()) + padding_size;
+  
+  gltfFile.write(header.c_str(), header.size());
+  gltfFile.write(reinterpret_cast<const char *>(&version), sizeof(version));
+  gltfFile.write(reinterpret_cast<const char *>(&length), sizeof(length));
+
+  // JSON chunk info, then JSON data
+  const int model_length = int(content.size()) + padding_size;
+  const int model_format = 0x4E4F534A;
+  gltfFile.write(reinterpret_cast<const char *>(&model_length), sizeof(model_length));
+  gltfFile.write(reinterpret_cast<const char *>(&model_format), sizeof(model_format));
+  gltfFile.write(content.c_str(), content.size());
+
+  // Chunk must be multiplies of 4, so pad with spaces
+  if (padding_size > 0) {
+    const std::string padding = std::string(padding_size, ' ');
+    gltfFile.write(padding.c_str(), padding.size());
+  }
+}
+
+static void WriteBinaryGltfStream(std::ostream& gltfFile,
+                                  const std::string &content) {
+    const std::string header = "glTF";
+    const int version = 2;
+    const int padding_size = content.size() % 4;
+
+    // 12 bytes for header, JSON content length, 8 bytes for JSON chunk info, padding
+    const int length = 12 + 8 + int(content.size()) + padding_size;
+
+    gltfFile.write(header.c_str(), header.size());
+    gltfFile.write(reinterpret_cast<const char *>(&version), sizeof(version));
+    gltfFile.write(reinterpret_cast<const char *>(&length), sizeof(length));
+
+    // JSON chunk info, then JSON data
+    const int model_length = int(content.size()) + padding_size;
+    const int model_format = 0x4E4F534A;
+    gltfFile.write(reinterpret_cast<const char *>(&model_length), sizeof(model_length));
+    gltfFile.write(reinterpret_cast<const char *>(&model_format), sizeof(model_format));
+    gltfFile.write(content.c_str(), content.size());
+
+    // Chunk must be multiplies of 4, so pad with spaces
+    if (padding_size > 0) {
+        const std::string padding = std::string(padding_size, ' ');
+        gltfFile.write(padding.c_str(), padding.size());
+    }
+}
+
+bool TinyGLTF::WriteGltfSceneToFile(Model *model, const std::string &filename,
+                                    bool embedImages = false,
+                                    bool embedBuffers = false,
+                                    bool prettyPrint = true,
+                                    bool writeBinary = false) {
+  json output;
+
+  // ACCESSORS
+  json accessors;
+  for (unsigned int i = 0; i < model->accessors.size(); ++i) {
+    json accessor;
+    SerializeGltfAccessor(model->accessors[i], accessor);
+    accessors.push_back(accessor);
+  }
+  output["accessors"] = accessors;
+
+  // ANIMATIONS
+  if (model->animations.size()) {
+    json animations;
+    for (unsigned int i = 0; i < model->animations.size(); ++i) {
+      if (model->animations[i].channels.size()) {
+        json animation;
+        SerializeGltfAnimation(model->animations[i], animation);
+        animations.push_back(animation);
+      }
+    }
+    output["animations"] = animations;
+  }
+
+  // ASSET
+  json asset;
+  SerializeGltfAsset(model->asset, asset);
+  output["asset"] = asset;
+
+  std::string defaultBinFilename = GetBaseFilename(filename);
+  std::string defaultBinFileExt = ".bin";
+  std::string::size_type pos = defaultBinFilename.rfind('.', defaultBinFilename.length());
+
+  if (pos != std::string::npos) {
+    defaultBinFilename = defaultBinFilename.substr(0, pos);
+  }
+  std::string baseDir = GetBaseDir(filename);
+  if (baseDir.empty()) {
+    baseDir = "./";
+  }
+
+  // BUFFERS
+  std::vector<std::string> usedUris;
+  json buffers;
+  for (unsigned int i = 0; i < model->buffers.size(); ++i) {
+    json buffer;
+    if (embedBuffers) {
+      SerializeGltfBuffer(model->buffers[i], buffer);
+    } else {
+      std::string binSavePath;
+      std::string binUri;
+      if (!model->buffers[i].uri.empty()
+        && !IsDataURI(model->buffers[i].uri)) {
+        binUri = model->buffers[i].uri;
+      }
+      else {
+        binUri = defaultBinFilename + defaultBinFileExt;
+        bool inUse = true;
+        int numUsed = 0;
+        while(inUse) {
+          inUse = false;
+          for (const std::string& usedName : usedUris) {
+            if (binUri.compare(usedName) != 0) continue;
+            inUse = true;
+            binUri = defaultBinFilename + std::to_string(numUsed++) + defaultBinFileExt;
+            break;
+          }
+        }
+      }
+      usedUris.push_back(binUri);
+	  binSavePath = JoinPath(baseDir, binUri);
+      if(!SerializeGltfBuffer(model->buffers[i], buffer, binSavePath,
+                          binUri)) {
+        return false;
+      }
+    }
+    buffers.push_back(buffer);
+  }
+  output["buffers"] = buffers;
+
+  // BUFFERVIEWS
+  json bufferViews;
+  for (unsigned int i = 0; i < model->bufferViews.size(); ++i) {
+    json bufferView;
+    SerializeGltfBufferView(model->bufferViews[i], bufferView);
+    bufferViews.push_back(bufferView);
+  }
+  output["bufferViews"] = bufferViews;
+
+  // Extensions used
+  if (model->extensionsUsed.size()) {
+    SerializeStringArrayProperty("extensionsUsed", model->extensionsUsed,
+                                 output);
+  }
+
+  // Extensions required
+  if (model->extensionsRequired.size()) {
+    SerializeStringArrayProperty("extensionsRequired",
+                                 model->extensionsRequired, output);
+  }
+
+  // IMAGES
+  if (model->images.size()) {
+    json images;
+    for (unsigned int i = 0; i < model->images.size(); ++i) {
+      json image;
+
+      UpdateImageObject(model->images[i], baseDir, int(i), embedImages,
+                        &this->WriteImageData, this->write_image_user_data_);
+      SerializeGltfImage(model->images[i], image);
+      images.push_back(image);
+    }
+    output["images"] = images;
+  }
+
+  // MATERIALS
+  if (model->materials.size()) {
+    json materials;
+    for (unsigned int i = 0; i < model->materials.size(); ++i) {
+      json material;
+      SerializeGltfMaterial(model->materials[i], material);
+      materials.push_back(material);
+    }
+    output["materials"] = materials;
+  }
+
+  // MESHES
+  if (model->meshes.size()) {
+    json meshes;
+    for (unsigned int i = 0; i < model->meshes.size(); ++i) {
+      json mesh;
+      SerializeGltfMesh(model->meshes[i], mesh);
+      meshes.push_back(mesh);
+    }
+    output["meshes"] = meshes;
+  }
+
+  // NODES
+  if (model->nodes.size()) {
+    json nodes;
+    for (unsigned int i = 0; i < model->nodes.size(); ++i) {
+      json node;
+      SerializeGltfNode(model->nodes[i], node);
+      nodes.push_back(node);
+    }
+    output["nodes"] = nodes;
+  }
+
+  // SCENE
+  if (model->defaultScene > -1) {
+    SerializeNumberProperty<int>("scene", model->defaultScene, output);
+  }
+
+  // SCENES
+  if (model->scenes.size()) {
+    json scenes;
+    for (unsigned int i = 0; i < model->scenes.size(); ++i) {
+      json currentScene;
+      SerializeGltfScene(model->scenes[i], currentScene);
+      scenes.push_back(currentScene);
+    }
+    output["scenes"] = scenes;
+  }
+
+  // SKINS
+  if (model->skins.size()) {
+    json skins;
+    for (unsigned int i = 0; i < model->skins.size(); ++i) {
+      json skin;
+      SerializeGltfSkin(model->skins[i], skin);
+      skins.push_back(skin);
+    }
+    output["skins"] = skins;
+  }
+
+  // TEXTURES
+  if (model->textures.size()) {
+    json textures;
+    for (unsigned int i = 0; i < model->textures.size(); ++i) {
+      json texture;
+      SerializeGltfTexture(model->textures[i], texture);
+      textures.push_back(texture);
+    }
+    output["textures"] = textures;
+  }
+
+  // SAMPLERS
+  if (model->samplers.size()) {
+    json samplers;
+    for (unsigned int i = 0; i < model->samplers.size(); ++i) {
+      json sampler;
+      SerializeGltfSampler(model->samplers[i], sampler);
+      samplers.push_back(sampler);
+    }
+    output["samplers"] = samplers;
+  }
+
+  // CAMERAS
+  if (model->cameras.size()) {
+    json cameras;
+    for (unsigned int i = 0; i < model->cameras.size(); ++i) {
+      json camera;
+      SerializeGltfCamera(model->cameras[i], camera);
+      cameras.push_back(camera);
+    }
+    output["cameras"] = cameras;
+  }
+
+  // EXTENSIONS
+  SerializeExtensionMap(model->extensions, output);
+
+  // LIGHTS as KHR_lights_cmn
+  if (model->lights.size()) {
+    json lights;
+    for (unsigned int i = 0; i < model->lights.size(); ++i) {
+      json light;
+      SerializeGltfLight(model->lights[i], light);
+      lights.push_back(light);
+    }
+    json khr_lights_cmn;
+    khr_lights_cmn["lights"] = lights;
+    json ext_j;
+
+    if (output.find("extensions") != output.end()) {
+      ext_j = output["extensions"];
+    }
+
+    ext_j["KHR_lights_cmn"] = khr_lights_cmn;
+
+    output["extensions"] = ext_j;
+  }
+
+  // EXTRAS
+  if (model->extras.Type() != NULL_TYPE) {
+    SerializeValue("extras", model->extras, output);
+  }
+
+  if (writeBinary) {
+    WriteBinaryGltfFile(filename, output.dump());
+  } else {
+    WriteGltfFile(filename, output.dump(prettyPrint ? 2 : -1));
+  }
+
+  return true;
+}
+
+
+bool TinyGLTF::WriteGltfSceneToBinaryStream(Model *model, 
+                                        const std::string& filename,
+                                        std::ostream& stream,
+                                        bool embedImages = false,
+                                        bool embedBuffers = false) {
+    json output;
+    bool prettyPrint = false;
+
+    // ACCESSORS
+    json accessors;
+    for (unsigned int i = 0; i < model->accessors.size(); ++i) {
+        json accessor;
+        SerializeGltfAccessor(model->accessors[i], accessor);
+        accessors.push_back(accessor);
+    }
+    output["accessors"] = accessors;
+
+    // ANIMATIONS
+    if (model->animations.size()) {
+        json animations;
+        for (unsigned int i = 0; i < model->animations.size(); ++i) {
+            if (model->animations[i].channels.size()) {
+                json animation;
+                SerializeGltfAnimation(model->animations[i], animation);
+                animations.push_back(animation);
+            }
+        }
+        output["animations"] = animations;
+    }
+
+    // ASSET
+    json asset;
+    SerializeGltfAsset(model->asset, asset);
+    output["asset"] = asset;
+
+    std::string defaultBinFilename = GetBaseFilename(filename);
+    std::string defaultBinFileExt = ".bin";
+    std::string::size_type pos = defaultBinFilename.rfind('.', defaultBinFilename.length());
+
+    if (pos != std::string::npos) {
+        defaultBinFilename = defaultBinFilename.substr(0, pos);
+    }
+    std::string baseDir = GetBaseDir(filename);
+    if (baseDir.empty()) {
+        baseDir = "./";
+    }
+
+    // BUFFERS
+    std::vector<std::string> usedUris;
+    json buffers;
+    for (unsigned int i = 0; i < model->buffers.size(); ++i) {
+        json buffer;
+        if (embedBuffers) {
+            SerializeGltfBuffer(model->buffers[i], buffer);
+        }
+        else {
+            std::string binSavePath;
+            std::string binUri;
+            if (!model->buffers[i].uri.empty()
+                && !IsDataURI(model->buffers[i].uri)) {
+                binUri = model->buffers[i].uri;
+            }
+            else {
+                binUri = defaultBinFilename + defaultBinFileExt;
+                bool inUse = true;
+                int numUsed = 0;
+                while (inUse) {
+                    inUse = false;
+                    for (const std::string& usedName : usedUris) {
+                        if (binUri.compare(usedName) != 0) continue;
+                        inUse = true;
+                        binUri = defaultBinFilename + std::to_string(numUsed++) + defaultBinFileExt;
+                        break;
+                    }
+                }
+            }
+            usedUris.push_back(binUri);
+            binSavePath = JoinPath(baseDir, binUri);
+            if (!SerializeGltfBuffer(model->buffers[i], buffer, binSavePath,
+                binUri)) {
+                return false;
+            }
+        }
+        buffers.push_back(buffer);
+    }
+    output["buffers"] = buffers;
+
+    // BUFFERVIEWS
+    json bufferViews;
+    for (unsigned int i = 0; i < model->bufferViews.size(); ++i) {
+        json bufferView;
+        SerializeGltfBufferView(model->bufferViews[i], bufferView);
+        bufferViews.push_back(bufferView);
+    }
+    output["bufferViews"] = bufferViews;
+
+    // Extensions used
+    if (model->extensionsUsed.size()) {
+        SerializeStringArrayProperty("extensionsUsed", model->extensionsUsed,
+            output);
+    }
+
+    // Extensions required
+    if (model->extensionsRequired.size()) {
+        SerializeStringArrayProperty("extensionsRequired",
+            model->extensionsRequired, output);
+    }
+
+    // IMAGES
+    if (model->images.size()) {
+        json images;
+        for (unsigned int i = 0; i < model->images.size(); ++i) {
+            json image;
+
+            UpdateImageObject(model->images[i], baseDir, int(i), embedImages,
+                &this->WriteImageData, this->write_image_user_data_);
+            SerializeGltfImage(model->images[i], image);
+            images.push_back(image);
+        }
+        output["images"] = images;
+    }
+
+    // MATERIALS
+    if (model->materials.size()) {
+        json materials;
+        for (unsigned int i = 0; i < model->materials.size(); ++i) {
+            json material;
+            SerializeGltfMaterial(model->materials[i], material);
+            materials.push_back(material);
+        }
+        output["materials"] = materials;
+    }
+
+    // MESHES
+    if (model->meshes.size()) {
+        json meshes;
+        for (unsigned int i = 0; i < model->meshes.size(); ++i) {
+            json mesh;
+            SerializeGltfMesh(model->meshes[i], mesh);
+            meshes.push_back(mesh);
+        }
+        output["meshes"] = meshes;
+    }
+
+    // NODES
+    if (model->nodes.size()) {
+        json nodes;
+        for (unsigned int i = 0; i < model->nodes.size(); ++i) {
+            json node;
+            SerializeGltfNode(model->nodes[i], node);
+            nodes.push_back(node);
+        }
+        output["nodes"] = nodes;
+    }
+
+    // SCENE
+    if (model->defaultScene > -1) {
+        SerializeNumberProperty<int>("scene", model->defaultScene, output);
+    }
+
+    // SCENES
+    if (model->scenes.size()) {
+        json scenes;
+        for (unsigned int i = 0; i < model->scenes.size(); ++i) {
+            json currentScene;
+            SerializeGltfScene(model->scenes[i], currentScene);
+            scenes.push_back(currentScene);
+        }
+        output["scenes"] = scenes;
+    }
+
+    // SKINS
+    if (model->skins.size()) {
+        json skins;
+        for (unsigned int i = 0; i < model->skins.size(); ++i) {
+            json skin;
+            SerializeGltfSkin(model->skins[i], skin);
+            skins.push_back(skin);
+        }
+        output["skins"] = skins;
+    }
+
+    // TEXTURES
+    if (model->textures.size()) {
+        json textures;
+        for (unsigned int i = 0; i < model->textures.size(); ++i) {
+            json texture;
+            SerializeGltfTexture(model->textures[i], texture);
+            textures.push_back(texture);
+        }
+        output["textures"] = textures;
+    }
+
+    // SAMPLERS
+    if (model->samplers.size()) {
+        json samplers;
+        for (unsigned int i = 0; i < model->samplers.size(); ++i) {
+            json sampler;
+            SerializeGltfSampler(model->samplers[i], sampler);
+            samplers.push_back(sampler);
+        }
+        output["samplers"] = samplers;
+    }
+
+    // CAMERAS
+    if (model->cameras.size()) {
+        json cameras;
+        for (unsigned int i = 0; i < model->cameras.size(); ++i) {
+            json camera;
+            SerializeGltfCamera(model->cameras[i], camera);
+            cameras.push_back(camera);
+        }
+        output["cameras"] = cameras;
+    }
+
+    // EXTENSIONS
+    SerializeExtensionMap(model->extensions, output);
+
+    // LIGHTS as KHR_lights_cmn
+    if (model->lights.size()) {
+        json lights;
+        for (unsigned int i = 0; i < model->lights.size(); ++i) {
+            json light;
+            SerializeGltfLight(model->lights[i], light);
+            lights.push_back(light);
+        }
+        json khr_lights_cmn;
+        khr_lights_cmn["lights"] = lights;
+        json ext_j;
+
+        if (output.find("extensions") != output.end()) {
+            ext_j = output["extensions"];
+        }
+
+        ext_j["KHR_lights_cmn"] = khr_lights_cmn;
+
+        output["extensions"] = ext_j;
+    }
+
+    // EXTRAS
+    if (model->extras.Type() != NULL_TYPE) {
+        SerializeValue("extras", model->extras, output);
+    }
+
+    WriteBinaryGltfStream(stream, output.dump());
+
+    return true;
+}
+
+}  // namespace tinygltf
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#endif  // TINYGLTF_IMPLEMENTATION
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Common osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Common
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Common	2019-07-11 18:30:19.000000000 +0000
@@ -1,7 +1,7 @@
 
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -103,6 +103,14 @@
 					{
 						url = link->value();
 					}
+
+					std::string httpQuery = getValue(link, "httpQuery");
+					if (!httpQuery.empty())
+					{
+					    std::stringstream buf;
+					    buf << url << "?" << httpQuery;
+						url = buf.str();
+					}
 					return url;
 				}
 				else
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Container osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Container
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Container	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Container	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Document osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Document
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Document	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Document	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Document.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Document.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Document.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Document.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Feature osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Feature
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Feature	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Feature	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Feature.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Feature.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Feature.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Feature.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Folder osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Folder
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Folder	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Folder	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Folder.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Folder.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Folder.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Folder.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Geometry osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Geometry
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Geometry	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Geometry	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Geometry.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Geometry.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Geometry.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Geometry.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -235,19 +235,13 @@
     // "absolute" means to treat the Z values as-is
     else if ( am == "absolute" )
     {
-        alt->clamping() = AltitudeSymbol::CLAMP_NONE;
+        alt->clamping() = AltitudeSymbol::CLAMP_ABSOLUTE;
     }
 
     if ( _extrude )
     {
         ExtrusionSymbol* es = style.getOrCreate<ExtrusionSymbol>();
         es->flatten() = false;
-        if (*alt->clamping() == AltitudeSymbol::CLAMP_NONE)
-        {
-            // Set the height to the max elevation + the approx depth of the mariana trench so that it will extend low enough to be always go to the surface of the earth.
-            // This lets us avoid clamping absolute absolute extruded polygons completely.
-            es->height() = -(maxElevation + 11100.0);
-        }
     }
     else
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_GroundOverlay osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_GroundOverlay
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_GroundOverlay	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_GroundOverlay	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_GroundOverlay.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_GroundOverlay.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_GroundOverlay.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_GroundOverlay.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -49,6 +49,7 @@
 
     // the extent of the overlay image
 	xml_node<>* llb = node->first_node("latlonbox", 0, false);
+    xml_node<>* llab = node->first_node("latlonaltbox", 0, false);
 	xml_node<>* llq = node->first_node("gx:latlonquad", 0, false);
     if ( llb)
     {
@@ -69,6 +70,25 @@
         im->setBoundsAndRotation( Bounds(west, south, east, north), rotation );
         cx._groupStack.top()->addChild( im );
     }
+    else if (llab)
+    {
+        double north = as<double>(getValue(llab, "north"), 0.0);
+        double south = as<double>(getValue(llab, "south"), 0.0);
+        double east = as<double>(getValue(llab, "east"), 0.0);;
+        double west = as<double>(getValue(llab, "west"), 0.0);;
+        Angular rotation(-as<double>(getValue(llab, "rotation"), 0.0), Units::DEGREES);
+
+        osg::ref_ptr<osg::Image> image = URI(href, cx._referrer).readImage().getImage();
+        if (!image.valid())
+        {
+            OE_WARN << LC << "GroundOverlay failed to read image from " << href << std::endl;
+            return;
+        }
+
+        im = new ImageOverlay(cx._mapNode, image.get());
+        im->setBoundsAndRotation(Bounds(west, south, east, north), rotation);
+        cx._groupStack.top()->addChild(im);
+    }
 
     else if ( llq )
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_IconStyle osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_IconStyle
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_IconStyle	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_IconStyle	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_IconStyle.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_IconStyle.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_IconStyle.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_IconStyle.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LabelStyle osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LabelStyle
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LabelStyle	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LabelStyle	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LabelStyle.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LabelStyle.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LabelStyle.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LabelStyle.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -23,4 +23,12 @@
 void 
 KML_LabelStyle::scan( xml_node<>* node, Style& style, KMLContext& cx )
 {
+    if (!node)
+      return;
+    TextSymbol* text = style.getOrCreate<TextSymbol>();
+    std::string color = getValue(node, "color");
+    if (!color.empty())
+    {
+      text->fill()->color() = Color(Stringify() << "#" << color, Color::ABGR);
+    } 
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LinearRing osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LinearRing
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LinearRing	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LinearRing	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LinearRing.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LinearRing.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LinearRing.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LinearRing.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LineString osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LineString
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LineString	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LineString	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LineString.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LineString.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LineString.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LineString.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LineStyle osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LineStyle
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LineStyle	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LineStyle	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LineStyle.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LineStyle.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_LineStyle.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_LineStyle.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Model osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Model
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Model	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Model	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Model.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Model.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Model.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Model.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_MultiGeometry osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_MultiGeometry
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_MultiGeometry	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_MultiGeometry	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_MultiGeometry.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_MultiGeometry.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_MultiGeometry.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_MultiGeometry.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_NetworkLink osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_NetworkLink
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_NetworkLink	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_NetworkLink	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2010 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_NetworkLinkControl osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_NetworkLinkControl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_NetworkLinkControl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_NetworkLinkControl	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_NetworkLinkControl.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_NetworkLinkControl.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_NetworkLinkControl.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_NetworkLinkControl.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_NetworkLink.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_NetworkLink.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_NetworkLink.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_NetworkLink.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -67,7 +67,7 @@
         double x, y;
         llaExtent.getCentroid( x, y );
         osg::Vec3d lodCenter;
-        llaExtent.getSRS()->transform( osg::Vec3d(x,y,0), geoSRS->getECEF(), lodCenter );
+        llaExtent.getSRS()->transform( osg::Vec3d(x,y,0), geoSRS->getGeocentricSRS(), lodCenter );
         //llaExtent.getSRS()->transformToECEF( osg::Vec3d(x,y,0), lodCenter );
 
         // figure the tile radius:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Object osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Object
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Object	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Object	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Object.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Object.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Object.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Object.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KMLOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KMLOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KMLOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KMLOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Overlay osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Overlay
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Overlay	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Overlay	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Overlay.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Overlay.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Overlay.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Overlay.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_PhotoOverlay osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_PhotoOverlay
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_PhotoOverlay	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_PhotoOverlay	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_PhotoOverlay.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_PhotoOverlay.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_PhotoOverlay.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_PhotoOverlay.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Placemark osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Placemark
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Placemark	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Placemark	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2010 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Placemark.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Placemark.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Placemark.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Placemark.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -160,13 +160,16 @@
                     // is there an icon?
                     if ( icon )
                     {
-                        iconNode = new PlaceNode( cx._mapNode, position, style, cx._dbOptions.get() );
+                        PlaceNode* placeNode = new PlaceNode( position );
+                        placeNode->setStyle(style, cx._dbOptions.get());
+                        iconNode = placeNode;
                     }
 
                     else if ( !model && text && !name.empty() )
                     {
                         // note: models do not get labels.
-                        iconNode = new LabelNode( cx._mapNode, position, style );
+                        iconNode = new LabelNode();
+                        iconNode->setStyle(style);
                     }
                 }
 
@@ -183,7 +186,8 @@
                         style.removeSymbol( text );
 
                     Feature* feature = new Feature(geom, cx._srs.get(), style);
-                    featureNode = new FeatureNode( cx._mapNode, feature );
+                    featureNode = new FeatureNode(feature );
+                    featureNode->setMapNode( cx._mapNode );
                 }
 
                 if ( iconNode )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Point osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Point
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Point	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Point	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Point.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Point.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Point.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Point.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Polygon osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Polygon
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Polygon	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Polygon	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Polygon.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Polygon.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Polygon.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Polygon.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_PolyStyle osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_PolyStyle
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_PolyStyle	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_PolyStyle	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_PolyStyle.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_PolyStyle.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_PolyStyle.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_PolyStyle.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KMLReader osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KMLReader
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KMLReader	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KMLReader	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KMLReader.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KMLReader.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KMLReader.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KMLReader.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -99,7 +99,7 @@
         cx._dbOptions = dbOptions;
     }
 
-    // intialize the KML options with the defaults if necessary:
+    // initialize the KML options with the defaults if necessary:
     KMLOptions blankOptions;
     if ( cx._options == 0L )
         cx._options = &blankOptions;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Root osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Root
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Root	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Root	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Root.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Root.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Root.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Root.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Schema osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Schema
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Schema	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Schema	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Schema.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Schema.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Schema.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Schema.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_ScreenOverlay osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_ScreenOverlay
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_ScreenOverlay	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_ScreenOverlay	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_ScreenOverlay.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_ScreenOverlay.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_ScreenOverlay.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_ScreenOverlay.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Style osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Style
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Style	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Style	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Style.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Style.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_Style.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_Style.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_StyleMap osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_StyleMap
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_StyleMap	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_StyleMap	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_StyleMap.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_StyleMap.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_StyleMap.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_StyleMap.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_StyleSelector osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_StyleSelector
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KML_StyleSelector	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KML_StyleSelector	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KMZArchive osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KMZArchive
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KMZArchive	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KMZArchive	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KMZArchive.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KMZArchive.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/KMZArchive.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/KMZArchive.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/rapidxml.hpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/rapidxml.hpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/rapidxml.hpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/rapidxml.hpp	2019-07-11 18:30:19.000000000 +0000
@@ -89,7 +89,7 @@
 
         //! Gets pointer to character data where error happened.
         //! Ch should be the same as char type of xml_document that produced the error.
-        //! \return Pointer to location within the parsed string where error occured.
+        //! \return Pointer to location within the parsed string where error occurred.
         template<class Ch>
         Ch *where() const
         {
@@ -164,7 +164,7 @@
 
     //! Parse flag instructing the parser to not use text of first data node as a value of parent element.
     //! Can be combined with other flags by use of | operator.
-    //! Note that child data nodes of element node take precendence over its value when printing. 
+    //! Note that child data nodes of element node take precedence over its value when printing. 
     //! That is, if element has one or more child data nodes <em>and</em> a value, the value will be ignored.
     //! Use rapidxml::parse_no_data_nodes flag to prevent creation of data nodes if you want to manipulate data using values of elements.
     //! <br><br>
@@ -403,7 +403,7 @@
         }
 
         //! Allocates a new node from the pool, and optionally assigns name and value to it. 
-        //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
+        //! If the allocation request cannot be accommodated, this function will throw <code>std::bad_alloc</code>.
         //! If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function
         //! will call rapidxml::parse_error_handler() function.
         //! \param type Type of node to create.
@@ -436,7 +436,7 @@
         }
 
         //! Allocates a new attribute from the pool, and optionally assigns name and value to it.
-        //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
+        //! If the allocation request cannot be accommodated, this function will throw <code>std::bad_alloc</code>.
         //! If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function
         //! will call rapidxml::parse_error_handler() function.
         //! \param name Name to assign to the attribute, or 0 to assign no name.
@@ -467,7 +467,7 @@
         }
 
         //! Allocates a char array of given size from the pool, and optionally copies a given string to it.
-        //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
+        //! If the allocation request cannot be accommodated, this function will throw <code>std::bad_alloc</code>.
         //! If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function
         //! will call rapidxml::parse_error_handler() function.
         //! \param source String to initialize the allocated memory with, or 0 to not initialize it.
@@ -710,7 +710,7 @@
         //! <br><br>
         //! Note that node does not own its name or value, it only stores a pointer to it. 
         //! It will not delete or otherwise free the pointer on destruction.
-        //! It is reponsibility of the user to properly manage lifetime of the string.
+        //! It is responsibility of the user to properly manage lifetime of the string.
         //! The easiest way to achieve it is to use memory_pool of the document to allocate the string -
         //! on destruction of the document the string will be automatically freed.
         //! <br><br>
@@ -737,7 +737,7 @@
         //! <br><br>
         //! Note that node does not own its name or value, it only stores a pointer to it. 
         //! It will not delete or otherwise free the pointer on destruction.
-        //! It is reponsibility of the user to properly manage lifetime of the string.
+        //! It is responsibility of the user to properly manage lifetime of the string.
         //! The easiest way to achieve it is to use memory_pool of the document to allocate the string -
         //! on destruction of the document the string will be automatically freed.
         //! <br><br>
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/ReaderWriterKML.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/ReaderWriterKML.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/kml/ReaderWriterKML.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/kml/ReaderWriterKML.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/label_annotation/AnnotationLabelSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/label_annotation/AnnotationLabelSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/label_annotation/AnnotationLabelSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/label_annotation/AnnotationLabelSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 #include <osgEarthAnnotation/PlaceNode>
 #include <osgEarth/DepthOffset>
 #include <osgEarth/VirtualProgram>
+#include <osgEarth/StateSetCache>
 #include <osgDB/FileNameUtils>
 #include <osgUtil/Optimizer>
 
@@ -56,6 +57,7 @@
         Style styleCopy = style;
         TextSymbol* text = styleCopy.get<TextSymbol>();
         IconSymbol* icon = styleCopy.get<IconSymbol>();
+        AltitudeSymbol* alt = styleCopy.get<AltitudeSymbol>();
 
         osg::Group* group = new osg::Group();
         
@@ -67,6 +69,7 @@
         StringExpression  iconUrlExpr     ( icon ? *icon->url()      : StringExpression() );
         NumericExpression iconScaleExpr   ( icon ? *icon->scale()    : NumericExpression() );
         NumericExpression iconHeadingExpr ( icon ? *icon->heading()  : NumericExpression() );
+        NumericExpression vertOffsetExpr  ( alt  ? *alt->verticalOffset() : NumericExpression() );
 
         for( FeatureList::const_iterator i = input.begin(); i != input.end(); ++i )
         {
@@ -125,14 +128,26 @@
                     tempStyle.get<IconSymbol>()->heading()->setLiteral( feature->eval(iconHeadingExpr, &context) );
             }
             
-            osg::Node* node = makePlaceNode(
+            PlaceNode* node = makePlaceNode(
                 context,
                 feature,
-                tempStyle,
-                textPriorityExpr);
+                tempStyle);
 
             if ( node )
             {
+                if (!textPriorityExpr.empty())
+                {
+                    float val = feature->eval(textPriorityExpr, &context);
+                    node->setPriority( val >= 0.0f ? val : FLT_MAX );
+                }
+
+                if (alt && alt->technique() == alt->TECHNIQUE_SCENE && !vertOffsetExpr.empty())
+                {
+                    float val = feature->eval(vertOffsetExpr, &context);
+                    const osg::Vec3d& off = node->getLocalOffset();
+                    node->setLocalOffset(osg::Vec3d(off.x(), off.y(), val));
+                }
+
                 if ( context.featureIndex() )
                 {
                     context.featureIndex()->tagNode(node, feature);
@@ -146,33 +161,47 @@
     }
 
 
-    osg::Node* makePlaceNode(FilterContext&     context,
+    PlaceNode* makePlaceNode(FilterContext&     context,
                              Feature*           feature, 
-                             const Style&       style, 
-                             NumericExpression& priorityExpr )
+                             const Style&       style )
     {
         osg::Vec3d center = feature->getGeometry()->getBounds().center();
 
         AltitudeMode mode = ALTMODE_ABSOLUTE;        
+        osg::Vec3d localOffset;
+
+        GeoPoint point;
 
-        const AltitudeSymbol* alt = style.getSymbol<AltitudeSymbol>();
-        if (alt &&
-           (alt->clamping() == AltitudeSymbol::CLAMP_TO_TERRAIN || alt->clamping() == AltitudeSymbol::CLAMP_RELATIVE_TO_TERRAIN) &&
-           alt->technique() == AltitudeSymbol::TECHNIQUE_SCENE)
+        const AltitudeSymbol* alt = style.get<AltitudeSymbol>();
+
+        // If the symbol asks for map-clamping, disable any auto-scene-clamping on the annotation:
+        if (alt != NULL &&
+            alt->clamping() != alt->CLAMP_NONE &&
+            alt->technique().isSetTo(alt->TECHNIQUE_MAP))
         {
-            mode = ALTMODE_RELATIVE;
-        }                              
+            point.set(feature->getSRS(), center.x(), center.y(), center.z(), ALTMODE_ABSOLUTE);
+        }
 
-        GeoPoint point(feature->getSRS(), center.x(), center.y(), center.z(), mode);        
+        // If the symbol says clamp to terrain (but not using the map), zero out the 
+        // Z value and dynamically clamp to the surface:
+        else if (
+            alt != NULL &&
+            alt->clamping() == alt->CLAMP_TO_TERRAIN &&
+            !alt->technique().isSetTo(alt->TECHNIQUE_MAP))
+        {
+            point.set(feature->getSRS(), center.x(), center.y(), 0.0, ALTMODE_RELATIVE);
+        }
 
-        PlaceNode* node = new PlaceNode(0L, point, style, context.getDBOptions());
-        
-        if ( !priorityExpr.empty() )
+        // By default, use terrain-relative scene clamping Zm above the terrain.
+        else
         {
-            float val = feature->eval(priorityExpr, &context);
-            node->setPriority( val >= 0.0f ? val : FLT_MAX );
+            point.set(feature->getSRS(), center.x(), center.y(), center.z(), ALTMODE_RELATIVE);
         }
 
+        PlaceNode* node = new PlaceNode();
+        node->setStyle(style, context.getDBOptions());
+        node->setPosition(point);
+
         return node;
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorExtension osgearth-2.10.2+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorExtension
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorExtension	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorExtension	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@
                                   public ExtensionInterface<Control>
     {
     public:
-        META_Object(osgearth_ext_MapInspector, MapInspectorExtension);
+        META_OE_Extension(osgEarth, MapInspectorExtension, mapinspector);
 
         // CTORs
         MapInspectorExtension();
@@ -63,11 +63,6 @@
         
 
 
-    protected: // Object
-
-        MapInspectorExtension(const MapInspectorExtension& rhs, const osg::CopyOp& op) { }
-
-
     private:
         osg::observer_ptr<MapNode> _mapNode;
         osg::ref_ptr<Control>      _ui;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorExtension.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorExtension.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorExtension.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorExtension.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorUI osgearth-2.10.2+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorUI
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorUI	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorUI	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorUI.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorUI.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorUI.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/mapinspector/MapInspectorUI.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@
 
     if ( mapNode )
     {
-        // install annotation group as neccesary
+        // install annotation group as necessary
         if (_annos->getNumParents() == 0 || _annos->getParent(0) != mapNode)
         {
             if ( _annos->getNumParents() > 0 )
@@ -131,7 +131,7 @@
             style.getOrCreate<RenderSymbol>()->lighting() = false;
 
             Feature* feature = new Feature(collection.get(), layer->getProfile()->getSRS(), style);
-            FeatureNode* node = new FeatureNode( mapNode, feature );
+            FeatureNode* node = new FeatureNode( feature );
             _annos->addChild( node );
         }
 
@@ -150,7 +150,8 @@
             osg::Vec2d center = collection->getBounds().center2d();
             GeoPoint position(layer->getProfile()->getSRS(), center.x(), center.y(), 0.0, ALTMODE_ABSOLUTE);
 
-            LabelNode* label = new LabelNode(mapNode, position, text, style);
+            LabelNode* label = new LabelNode(text, style);
+            label->setPosition(position);
             _annos->addChild( label );
         }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/mask_feature/FeatureMaskOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/mask_feature/FeatureMaskOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/mask_feature/FeatureMaskOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/mask_feature/FeatureMaskOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -52,7 +52,7 @@
     public:
         Config getConfig() const {
             Config conf = MaskSourceOptions::getConfig();
-            conf.setObj( "features", _featureOptions );
+            conf.set( "features", _featureOptions );
             return conf;
         }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/mask_feature/FeatureMaskSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/mask_feature/FeatureMaskSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/mask_feature/FeatureMaskSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/mask_feature/FeatureMaskSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -87,13 +87,13 @@
         {
             if ( _features->getFeatureProfile() )
             {
-                osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor();
+                osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor(progress);
                 if ( cursor.valid() && cursor->hasMore() )
                 {
                     Feature* f = cursor->nextFeature();
                     if ( f && f->getGeometry() )
                     {
-                        // Init a filter to tranform feature in desired SRS 
+                        // Init a filter to transform feature in desired SRS 
                         if (!srs->isEquivalentTo(_features->getFeatureProfile()->getSRS()))
                         {
                             FilterContext cx;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/mbtiles/MBTilesOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/mbtiles/MBTilesOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/mbtiles/MBTilesOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/mbtiles/MBTilesOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2010 Pelican Mapping
  * http://osgearth.org
  *
@@ -82,11 +82,11 @@
         }
 
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "filename", _filename );
-            conf.getIfSet( "url", _filename ); // compat for consistency with other drivers
-            conf.getIfSet( "format", _format );
-            conf.getIfSet( "compute_levels", _computeLevels );
-            conf.getIfSet( "compress", _compress );
+            conf.get( "filename", _filename );
+            conf.get( "url", _filename ); // compat for consistency with other drivers
+            conf.get( "format", _format );
+            conf.get( "compute_levels", _computeLevels );
+            conf.get( "compress", _compress );
         }
 
     private:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/mbtiles/MBTilesPlugin.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/mbtiles/MBTilesPlugin.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/mbtiles/MBTilesPlugin.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/mbtiles/MBTilesPlugin.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2010 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/mbtiles/MBTilesTileSource osgearth-2.10.2+dfsg/src/osgEarthDrivers/mbtiles/MBTilesTileSource
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/mbtiles/MBTilesTileSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/mbtiles/MBTilesTileSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2010 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/mbtiles/MBTilesTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/mbtiles/MBTilesTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/mbtiles/MBTilesTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/mbtiles/MBTilesTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2010 Pelican Mapping
 * http://osgearth.org
 *
@@ -174,7 +174,7 @@
         getMetaData( "profile", profileStr );
 
         // The data format (e.g., png, jpg, etc.). Any format passed in
-        // in the options is superceded by the one in the database metadata.
+        // in the options is superseded by the one in the database metadata.
         std::string metaDataFormat;
         getMetaData( "format", metaDataFormat );
         if ( !metaDataFormat.empty() )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/model_feature_geom/FeatureGeomModelSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/model_feature_geom/FeatureGeomModelSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/model_feature_geom/FeatureGeomModelSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/model_feature_geom/FeatureGeomModelSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/model_simple/SimpleModelOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/model_simple/SimpleModelOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/model_simple/SimpleModelOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/model_simple/SimpleModelOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -89,11 +89,11 @@
             conf.set( "loading_priority_offset", _loadingPriorityOffset );
             conf.set( "paged", _paged);
 
-            conf.addIfSet( "shader_policy", "disable",  _shaderPolicy, SHADERPOLICY_DISABLE );
-            conf.addIfSet( "shader_policy", "inherit",  _shaderPolicy, SHADERPOLICY_INHERIT );
-            conf.addIfSet( "shader_policy", "generate", _shaderPolicy, SHADERPOLICY_GENERATE );
+            conf.set( "shader_policy", "disable",  _shaderPolicy, SHADERPOLICY_DISABLE );
+            conf.set( "shader_policy", "inherit",  _shaderPolicy, SHADERPOLICY_INHERIT );
+            conf.set( "shader_policy", "generate", _shaderPolicy, SHADERPOLICY_GENERATE );
 
-            conf.updateNonSerializable( "SimpleModelOptions::Node", _node.get() );
+            conf.setNonSerializable( "SimpleModelOptions::Node", _node.get() );
             return conf;
         }
 
@@ -105,17 +105,17 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
-            conf.getIfSet( "lod_scale", _lod_scale );
-            conf.getIfSet( "location", _location);
-            conf.getIfSet( "orientation", _orientation);
-            conf.getIfSet( "loading_priority_scale", _loadingPriorityScale );
-            conf.getIfSet( "loading_priority_offset", _loadingPriorityOffset );
-            conf.getIfSet( "paged", _paged );
-
-            conf.getIfSet( "shader_policy", "disable",  _shaderPolicy, SHADERPOLICY_DISABLE );
-            conf.getIfSet( "shader_policy", "inherit",  _shaderPolicy, SHADERPOLICY_INHERIT );
-            conf.getIfSet( "shader_policy", "generate", _shaderPolicy, SHADERPOLICY_GENERATE );
+            conf.get( "url", _url );
+            conf.get( "lod_scale", _lod_scale );
+            conf.get( "location", _location);
+            conf.get( "orientation", _orientation);
+            conf.get( "loading_priority_scale", _loadingPriorityScale );
+            conf.get( "loading_priority_offset", _loadingPriorityOffset );
+            conf.get( "paged", _paged );
+
+            conf.get( "shader_policy", "disable",  _shaderPolicy, SHADERPOLICY_DISABLE );
+            conf.get( "shader_policy", "inherit",  _shaderPolicy, SHADERPOLICY_INHERIT );
+            conf.get( "shader_policy", "generate", _shaderPolicy, SHADERPOLICY_GENERATE );
 
             _node = conf.getNonSerializable<osg::Node>( "SimpleModelOptions::Node" );
         }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/model_simple/SimpleModelSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/model_simple/SimpleModelSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/model_simple/SimpleModelSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/model_simple/SimpleModelSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -231,7 +231,9 @@
                     osg::Vec3d center = result->getBound().center();
                     OE_DEBUG << "Radius=" << result->getBound().radius() << " center=" << center.x() << "," << center.y() << "," << center.z() << std::endl;                    
                     plod->setCenter(result->getBound().center());
-                    plod->setRadius(std::max(result->getBound().radius(), maxRange));
+                    plod->setRadius(osg::maximum(result->getBound().radius(), 
+                                             static_cast<osg::BoundingSphere::value_type>(maxRange)));
+
                 }
                 lod = plod;
             }   
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/monitor/MonitorExtension osgearth-2.10.2+dfsg/src/osgEarthDrivers/monitor/MonitorExtension
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/monitor/MonitorExtension	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/monitor/MonitorExtension	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -39,7 +39,7 @@
                              public ExtensionInterface<Control>
     {
     public:
-        META_Object(osgearth_ext_Monitor, MonitorExtension);
+        META_OE_Extension(osgEarth, MonitorExtension, monitor);
 
         // CTORs
         MonitorExtension();
@@ -63,16 +63,11 @@
         bool connect(Control* control);
 
         bool disconnect(Control* control);
-
-
-    protected: // Object
-
-        MonitorExtension(const MonitorExtension& rhs, const osg::CopyOp& op) { }
-
+        
 
     private:
         osg::observer_ptr<MapNode> _mapNode;
-        osg::ref_ptr<MonitorUI>      _ui;
+        osg::ref_ptr<MonitorUI>    _ui;
 
         void ctor();
     };
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/monitor/MonitorExtension.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/monitor/MonitorExtension.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/monitor/MonitorExtension.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/monitor/MonitorExtension.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/monitor/MonitorPlugin.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/monitor/MonitorPlugin.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/monitor/MonitorPlugin.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/monitor/MonitorPlugin.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/monitor/MonitorUI osgearth-2.10.2+dfsg/src/osgEarthDrivers/monitor/MonitorUI
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/monitor/MonitorUI	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/monitor/MonitorUI	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/monitor/MonitorUI.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/monitor/MonitorUI.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/monitor/MonitorUI.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/monitor/MonitorUI.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 
 MonitorUI::MonitorUI()
 {
-    this->setHorizAlign(ALIGN_RIGHT);
+    this->setHorizAlign(ALIGN_LEFT);
     this->setVertAlign(ALIGN_BOTTOM);
 
     int r=0;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/ElevationProxyImageLayer osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/ElevationProxyImageLayer
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/ElevationProxyImageLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/ElevationProxyImageLayer	2019-07-11 18:30:19.000000000 +0000
@@ -19,10 +19,13 @@
 #ifndef OSGEARTH_DRIVER_SIMPLE_OCEAN_ELEV_PROXY_IMAGE_LAYER
 #define OSGEARTH_DRIVER_SIMPLE_OCEAN_ELEV_PROXY_IMAGE_LAYER 1
 
-#include <osgEarth/MapFrame>
 #include <osgEarth/ImageLayer>
 #include <osgEarth/ThreadingUtils>
 
+namespace osgEarth {
+    class Map;
+}
+
 namespace osgEarth { namespace SimpleOcean
 {
     using namespace osgEarth;
@@ -53,11 +56,10 @@
 
         virtual bool isCached( const TileKey& key ) const;
 
-        virtual GeoImage createImage( const TileKey& key, ProgressCallback* progress);
+        virtual GeoImage createImageImplementation( const TileKey& key, ProgressCallback* progress);
 
     private:
-        MapFrame _mapf;
-        Threading::Mutex _mapfMutex;
+        osg::observer_ptr<const Map> _map;
     };
 
 } } // namespace osgEarth::SimpleOcean
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/ElevationProxyImageLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/ElevationProxyImageLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/ElevationProxyImageLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/ElevationProxyImageLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -18,6 +18,8 @@
  */
 #include "ElevationProxyImageLayer"
 
+#include <osgEarth/Map>
+#include <osgEarth/ElevationLayer>
 #include <osgEarth/HeightFieldUtils>
 #include <osgEarth/ImageUtils>
 
@@ -30,7 +32,7 @@
 ElevationProxyImageLayer::ElevationProxyImageLayer(const Map* sourceMap,
                                                    const ImageLayerOptions& inoptions ) :
 ImageLayer( inoptions ),
-_mapf     ( sourceMap )
+_map(sourceMap)
 {
     options().cachePolicy() = CachePolicy::NO_CACHE;
 }
@@ -54,24 +56,22 @@
 }
 
 GeoImage
-ElevationProxyImageLayer::createImage(const TileKey& key, ProgressCallback* progress)
+ElevationProxyImageLayer::createImageImplementation(const TileKey& key, ProgressCallback* progress)
 {
-    if ( _mapf.needsSync() )
-    {
-        Threading::ScopedMutexLock lock(_mapfMutex);
-        if ( _mapf.needsSync() )
-        {
-            _mapf.sync();
-        }
-    }
+    osg::ref_ptr<const Map> map;
+    if (!_map.lock(map))
+        return GeoImage::INVALID;
 
     osg::ref_ptr<osg::HeightField> hf = HeightFieldUtils::createReferenceHeightField(key.getExtent(), 64, 64, 0, true );
 
-    if ( _mapf.populateHeightField(hf, key, true, 0L) )
+    ElevationLayerVector elevation;
+    map->getLayers(elevation);
+
+    if (elevation.populateHeightFieldAndNormalMap(hf.get(), NULL, key, map->getProfileNoVDatum(), INTERP_BILINEAR, progress))
     {
         // encode the heightfield as a 16-bit normalized LUNIMANCE image
         osg::Image* image = new osg::Image();
-        image->allocateImage(hf->getNumColumns(), hf->getNumRows(), 1, GL_RED, GL_FLOAT); //GL_LUMINANCE, GL_UNSIGNED_SHORT);
+        image->allocateImage(hf->getNumColumns(), hf->getNumRows(), 1, GL_RED, GL_FLOAT);
         image->setInternalTextureFormat( GL_R32F );
         const osg::FloatArray* floats = hf->getFloatArray();
         ImageUtils::PixelWriter write(image);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanDriver.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanDriver.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanDriver.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanDriver.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -44,13 +44,15 @@
                                  public OceanNodeFactory
     {
     public:
-        META_Object(osgearth_ocean_simple, SimpleOceanExtension);
+        META_OE_Extension(osgEarth, SimpleOceanExtension, simple_oecan);
 
         SimpleOceanExtension() { }
 
         SimpleOceanExtension(const ConfigOptions& options) :
             SimpleOceanOptions(options) { }
 
+        const ConfigOptions& getConfigOptions() const { return *this; }
+
     public: // ExtensionInterface<MapNode>
 
         bool connect(MapNode* mapNode)
@@ -82,8 +84,6 @@
         }
 
     protected:
-        SimpleOceanExtension(const SimpleOceanExtension& rhs, const osg::CopyOp& op) { }
-
         virtual ~SimpleOceanExtension() { }
 
         osg::ref_ptr<OceanNode> _oceanNode;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOcean.FS.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOcean.FS.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOcean.FS.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOcean.FS.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -6,7 +6,8 @@
 #pragma vp_location   fragment_coloring
 #pragma vp_order      0.6
 
-#pragma import_defines(OE_SIMPLE_OCEAN_USE_TEXTURE, OE_SIMPLE_OCEAN_USE_MASK)
+#pragma import_defines(OE_SIMPLE_OCEAN_USE_TEXTURE)
+#pragma import_defines(OE_SIMPLE_OCEAN_USE_MASK)
 
 // clamps a value to the vmin/vmax range, then re-maps it to the r0/r1 range:
 float ocean_remap( float val, float vmin, float vmax, float r0, float r1 )  
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanNode.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -19,6 +19,7 @@
 #include "SimpleOceanNode"
 #include "ElevationProxyImageLayer"
 #include "SimpleOceanShaders"
+#include <osgEarth/Lighting>
 #include <osgEarth/Map>
 #include <osgEarth/ShaderFactory>
 #include <osgEarth/TerrainResources>
@@ -248,7 +249,7 @@
             osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE );
 
         // Material.
-        osg::Material* m = new osg::Material();
+        osg::Material* m = new osgEarth::MaterialGL3();
         m->setAmbient(m->FRONT_AND_BACK, osg::Vec4(.5,.5,.5,1));
         m->setDiffuse(m->FRONT_AND_BACK, osg::Vec4(1,1,1,1));
         m->setSpecular(m->FRONT_AND_BACK, osg::Vec4(0.2,0.2,0.2,1));
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOceanOptions	2019-07-11 18:30:19.000000000 +0000
@@ -60,7 +60,7 @@
         optional<Color>& baseColor() { return _baseColor; }
         const optional<Color>& baseColor() const { return _baseColor; }
 
-        /** Maximum visibile range of the ocean (at which is starts fading in) */
+        /** Maximum visible range of the ocean (at which is starts fading in) */
         optional<float>& maxRange() { return _maxRange; }
         const optional<float>& maxRange() const { return _maxRange; }
 
@@ -112,7 +112,7 @@
             conf.set("max_lod",             _maxLOD );
             conf.set("base_color",          _baseColor );
             conf.set("texture_url",         _textureURI );
-            conf.setObj("mask_layer",       _maskLayerOptions );
+            conf.set("mask_layer",          _maskLayerOptions );
             conf.set("render_bin_number",   _renderBinNumber);
             return conf;
         }
@@ -125,16 +125,16 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet("sea_level",           _seaLevel );
-            conf.getIfSet("high_feather_offset", _highFeatherOffset );
-            conf.getIfSet("low_feather_offset",  _lowFeatherOffset );
-            conf.getIfSet("max_range",           _maxRange );
-            conf.getIfSet("fade_range",          _fadeRange );
-            conf.getIfSet("max_lod",             _maxLOD );
-            conf.getIfSet("base_color",          _baseColor );
-            conf.getIfSet("texture_url",         _textureURI );
-            conf.getObjIfSet("mask_layer",       _maskLayerOptions );
-            conf.getIfSet("render_bin_number",   _renderBinNumber);
+            conf.get("sea_level",           _seaLevel );
+            conf.get("high_feather_offset", _highFeatherOffset );
+            conf.get("low_feather_offset",  _lowFeatherOffset );
+            conf.get("max_range",           _maxRange );
+            conf.get("fade_range",          _fadeRange );
+            conf.get("max_lod",             _maxLOD );
+            conf.get("base_color",          _baseColor );
+            conf.get("texture_url",         _textureURI );
+            conf.get("mask_layer",          _maskLayerOptions );
+            conf.get("render_bin_number",   _renderBinNumber);
         }
 
     private:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOcean.VS.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOcean.VS.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOcean.VS.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_simple/SimpleOcean.VS.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -5,7 +5,8 @@
 #pragma vp_entryPoint oe_ocean_vertex
 #pragma vp_location   vertex_view
 
-#pragma import_defines(OE_SIMPLE_OCEAN_USE_TEXTURE, OE_SIMPLE_OCEAN_USE_MASK)
+#pragma import_defines(OE_SIMPLE_OCEAN_USE_TEXTURE)
+#pragma import_defines(OE_SIMPLE_OCEAN_USE_MASK)
 
 // uniforms
 uniform mat4 osg_ViewMatrixInverse;  
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_triton/TritonDriver.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_triton/TritonDriver.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/ocean_triton/TritonDriver.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/ocean_triton/TritonDriver.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -47,7 +47,7 @@
                             public OceanNodeFactory
     {
     public:
-        META_Object(osgearth_ocean_triton, TritonExtension);
+        META_OE_Extension(osgEarthTriton, TritonExtension, triton);
 
         TritonExtension() { }
 
@@ -83,7 +83,6 @@
         }
 
     protected:
-        TritonExtension(const TritonExtension& rhs, const osg::CopyOp& op) { }
 
         virtual ~TritonExtension() { }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/osg/OSGOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/osg/OSGOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/osg/OSGOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/osg/OSGOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -69,9 +69,9 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
-            conf.getIfSet( "luminance_to_rgba", _lum2rgba );
-            conf.getIfSet( "add_alpha", _addAlpha);
+            conf.get( "url", _url );
+            conf.get( "luminance_to_rgba", _lum2rgba );
+            conf.get( "add_alpha", _addAlpha);
         }
 
         optional<URI>  _url;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/osg/OSGTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/osg/OSGTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/osg/OSGTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/osg/OSGTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -159,7 +159,7 @@
 
 /**
  * This driver defers loading of the source data to the appropriate OSG plugin. You
- * must explicity set an override profile when using this driver.
+ * must explicitly set an override profile when using this driver.
  *
  * For example, use this driver to load a simple jpeg file; then set the profile to
  * tell osgEarth its projection.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/script_engine_duktape/duktape.c osgearth-2.10.2+dfsg/src/osgEarthDrivers/script_engine_duktape/duktape.c
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/script_engine_duktape/duktape.c	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/script_engine_duktape/duktape.c	2019-07-11 18:30:19.000000000 +0000
@@ -57002,7 +57002,7 @@
 		 *
 		 * Note that the specification requires that the *same* thrower
 		 * built-in object is used here!  See E5 Section 10.6 main
-		 * algoritm, step 14, and Section 13.2.3 which describes the
+		 * algorithm, step 14, and Section 13.2.3 which describes the
 		 * thrower.  See test case test-arguments-throwers.js.
 		 */
 
@@ -61950,7 +61950,7 @@
  * identifier name.  Returns 1 if register-bound, 0 otherwise.  Caller can
  * also check (out_reg_varbind >= 0) to check whether or not identifier is
  * register bound.  The caller must NOT use out_rc_varname at all unless
- * return code is 0 or out_reg_varbind is < 0; this is becuase out_rc_varname
+ * return code is 0 or out_reg_varbind is < 0; this is because out_rc_varname
  * is unsigned and doesn't have a "unused" / none value.
  */
 DUK_LOCAL duk_bool_t duk__lookup_lhs(duk_compiler_ctx *comp_ctx, duk_reg_t *out_reg_varbind, duk_regconst_t *out_rc_varname) {
@@ -66860,7 +66860,7 @@
 	 *  parsing handles this retroactively.
 	 *
 	 *  For function expressions and declarations function name must
-	 *  be an Identifer (excludes reserved words).  For setter/getter
+	 *  be an Identifier (excludes reserved words).  For setter/getter
 	 *  it is a PropertyName which allows reserved words and also
 	 *  strings and numbers (e.g. "{ get 1() { ... } }").
 	 */
@@ -66905,7 +66905,7 @@
 	 *  Formal argument list
 	 *
 	 *  We don't check for prohibited names or for duplicate argument
-	 *  names here, becase we don't yet know whether the function will
+	 *  names here, because we don't yet know whether the function will
 	 *  be strict.  Function body parsing handles this retroactively.
 	 */
 
@@ -67677,7 +67677,7 @@
 		v1 = DUK_TVAL_GET_FASTINT(tv_x);
 		if (opcode == DUK_EXTRAOP_UNM) {
 			/* The smallest fastint is no longer 48-bit when
-			 * negated.  Positive zero becames negative zero
+			 * negated.  Positive zero becomes negative zero
 			 * (cannot be represented) when negated.
 			 */
 			if (DUK_LIKELY(v1 != DUK_FASTINT_MIN && v1 != 0)) {
@@ -69164,7 +69164,7 @@
  *  Other function calls are handled using duk_handle_call(), increasing
  *  C recursion depth.
  *
- *  Abrupt completions (= long control tranfers) are handled either
+ *  Abrupt completions (= long control transfers) are handled either
  *  directly by reconfiguring relevant stacks and restarting execution,
  *  or via a longjmp.  Longjmp-free handling is preferable for performance
  *  (especially Emscripten performance), and is used for: break, continue,
@@ -69847,7 +69847,7 @@
 			 * C -> num args (N)
 			 */
 
-			/* duk_new() will call the constuctor using duk_handle_call().
+			/* duk_new() will call the constructor using duk_handle_call().
 			 * A constructor call prevents a yield from inside the constructor,
 			 * even if the constructor is an Ecmascript function.
 			 */
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/script_engine_duktape/DuktapeEngine osgearth-2.10.2+dfsg/src/osgEarthDrivers/script_engine_duktape/DuktapeEngine
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/script_engine_duktape/DuktapeEngine	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/script_engine_duktape/DuktapeEngine	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/script_engine_duktape/DuktapeEngine.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/script_engine_duktape/DuktapeEngine.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/script_engine_duktape/DuktapeEngine.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/script_engine_duktape/DuktapeEngine.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -108,17 +108,23 @@
         }
 
         // save the geometry, if set:
-        if ( duk_get_prop_string(ctx, -1, "geometry")&& duk_is_object(ctx, -1) )
+        if ( duk_get_prop_string(ctx, -1, "geometry") )
         {
-            // [ptr, global, feature, geometry]
-            std::string json( duk_json_encode(ctx, -1) ); // [ptr, global, feature, json]
-            Geometry* newGeom = GeometryUtils::geometryFromGeoJSON(json);
-            if ( newGeom )
+            if (duk_is_object(ctx, -1))
             {
-                feature->setGeometry( newGeom );
+                // [ptr, global, feature, geometry]
+                std::string json( duk_json_encode(ctx, -1) ); // [ptr, global, feature, json]
+                Geometry* newGeom = GeometryUtils::geometryFromGeoJSON(json);
+                if ( newGeom )
+                {
+                    feature->setGeometry( newGeom );
+                }
+                duk_pop(ctx); // [ptr, global, feature]
+            }
+            else
+            {
+                feature->setGeometry(0L);
             }
-            duk_pop(ctx);
-            // [ptr, global, feature]
         }
         else
         {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/script_engine_duktape/JSGeometry osgearth-2.10.2+dfsg/src/osgEarthDrivers/script_engine_duktape/JSGeometry
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/script_engine_duktape/JSGeometry	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/script_engine_duktape/JSGeometry	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/script_engine_duktape/Plugin.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/script_engine_duktape/Plugin.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/script_engine_duktape/Plugin.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/script_engine_duktape/Plugin.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 #include <osgEarthFeatures/ScriptEngine>
 #include <osgEarth/Common>
 #include <osgDB/FileNameUtils>
+#include <osgDB/Registry>
 
 #include "DuktapeEngine"
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_gl/GLSkyExtension.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_gl/GLSkyExtension.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_gl/GLSkyExtension.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_gl/GLSkyExtension.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -44,11 +44,13 @@
                            public GLSkyOptions
     {
     public:
-        META_Object( osgEarth, GLSkyExtension );
+        META_OE_Extension( osgEarth, GLSkyExtension, sky_gl );
 
         GLSkyExtension() { }
         GLSkyExtension(const GLSkyOptions& options);
 
+        const ConfigOptions& getConfigOptions() const { return *this; }
+
     public: // ExtensionInterface<MapNode>
 
         bool connect( MapNode* );
@@ -66,10 +68,9 @@
 
     public: // SkyNodeFactory
 
-        SkyNode* createSkyNode(const Profile* profile);
+        SkyNode* createSkyNode();
 
     protected:
-        GLSkyExtension(const GLSkyExtension&, const osg::CopyOp&) { }
         virtual ~GLSkyExtension() { }
 
         osg::ref_ptr<ui::Control> _ui;
@@ -96,7 +97,16 @@
 bool
 GLSkyExtension::connect(MapNode* mapNode)
 {
-    _skyNode = createSkyNode(mapNode->getMap()->getProfile());
+    _skyNode = createSkyNode();
+
+    // Projected map? Set up a reference point at the center of the map
+    if (mapNode->getMapSRS()->isProjected())
+    {
+        GeoPoint refPoint;
+        mapNode->getMap()->getProfile()->getExtent().getCentroid(refPoint);
+        _skyNode->setReferencePoint(refPoint);
+    }
+
     osgEarth::insertParent(_skyNode.get(), mapNode);
     return true;
 }
@@ -138,7 +148,8 @@
 }
 
 SkyNode*
-GLSkyExtension::createSkyNode(const Profile* profile)
+GLSkyExtension::createSkyNode()
 {
-    return new GLSkyNode(profile, *this);
+    GLSkyNode* sky = new GLSkyNode(*this);
+    return sky;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_gl/GLSkyNode osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_gl/GLSkyNode
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_gl/GLSkyNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_gl/GLSkyNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include "GLSkyOptions"
 #include <osgEarthUtil/Sky>
-#include <osgEarth/MapNode>
 #include <osgEarth/PhongLightingEffect>
 #include <osg/MatrixTransform>
 
@@ -40,12 +39,7 @@
     class GLSkyNode : public SkyNode
     {
     public:
-        GLSkyNode(
-            const Profile* profile);
-
-        GLSkyNode(
-            const Profile*      profile,
-            const GLSkyOptions& options);
+        GLSkyNode(const GLSkyOptions& options);
 
     public: // SkyNode
 
@@ -61,10 +55,9 @@
         virtual ~GLSkyNode();
 
     private:
-        void initialize(const Profile* profile);
+        void construct();
 
         osg::ref_ptr<osg::Light>          _light;
-        osg::ref_ptr<const Profile>       _profile;
         osg::ref_ptr<PhongLightingEffect> _lighting;
         GLSkyOptions                      _options;
     };
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_gl/GLSkyNode.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_gl/GLSkyNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_gl/GLSkyNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_gl/GLSkyNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -38,25 +38,16 @@
 
 //---------------------------------------------------------------------------
 
-GLSkyNode::GLSkyNode(const Profile* profile) :
-SkyNode()
-{
-    initialize(profile);
-}
-
-GLSkyNode::GLSkyNode(const Profile*      profile,
-                     const GLSkyOptions& options) :
+GLSkyNode::GLSkyNode(const GLSkyOptions& options) :
 SkyNode ( options ),
 _options( options )
 {
-    initialize(profile);
+    construct();
 }
 
 void
-GLSkyNode::initialize(const Profile* profile)
+GLSkyNode::construct()
 {
-    _profile = profile;
-    //_light = new osg::Light(0);
     _light = new LightGL3(0);
     _light->setDataVariance(_light->DYNAMIC);
     _light->setAmbient(osg::Vec4(0.1f, 0.1f, 0.1f, 1.0f));
@@ -73,7 +64,6 @@
     osg::StateSet* stateset = this->getOrCreateStateSet();
 
     _lighting = new PhongLightingEffect();
-    //_lighting->setCreateLightingUniform( false );
     _lighting->attach( stateset );
 
     // install the Sun as a lightsource.
@@ -108,30 +98,22 @@
 void
 GLSkyNode::onSetDateTime()
 {
-    if ( !getSunLight() || !_profile.valid() )
+    if ( !getSunLight() )
         return;
 
-    const DateTime& dt = getDateTime();
-    osg::Vec3d sunPosECEF = getEphemeris()->getSunPositionECEF( dt );
+    CelestialBody sun = getEphemeris()->getSunPosition(getDateTime());   
 
-    if ( _profile->getSRS()->isGeographic() )
-    {
-        sunPosECEF.normalize();
-        _light->setPosition(osg::Vec4(sunPosECEF, 0.0)); // directional light
-    }
-    else
+    // If the user set a projected-map reference point, assume we are using
+    // a projected map and set the sun position acordingly.
+    if (getReferencePoint().isValid())
     {
         // pull the ref point:
         GeoPoint refpoint = getReferencePoint();
-        if ( !refpoint.isValid() )
-        {
-            // not found; use the center of the profile:
-            _profile->getExtent().getCentroid(refpoint);
-        }
 
         // convert to lat/long:
         GeoPoint refLatLong;
-        refpoint.transform(_profile->getSRS()->getGeographicSRS(), refLatLong);
+        osg::ref_ptr<const SpatialReference> wgs84 = SpatialReference::get("wgs84");
+        refpoint.transform(wgs84.get(), refLatLong);
 
         // Matrix to convert the ECEF sun position to the local tangent plane
         // centered on our reference point:
@@ -139,11 +121,25 @@
         refLatLong.createWorldToLocal(world2local);
 
         // convert the sun position:
-        osg::Vec3d sunPosLocal = sunPosECEF * world2local;
+        osg::Vec3d sunPosLocal = sun.geocentric * world2local;
         sunPosLocal.normalize();
 
         getSunLight()->setPosition( osg::Vec4(sunPosLocal, 0.0) );
     }
+
+    else if (_options.coordinateSystem() == SkyOptions::COORDSYS_ECEF)
+    {
+        osg::Vec3d pos = sun.geocentric;
+        pos.normalize();
+        _light->setPosition(osg::Vec4(pos, 0.0)); // directional light
+    }
+
+    else if (_options.coordinateSystem() == SkyOptions::COORDSYS_ECI)
+    {
+        osg::Vec3d pos = sun.eci;
+        pos.normalize();
+        _light->setPosition(osg::Vec4(pos, 0.0)); // directional light
+    }
 }
 
 void
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_gl/GLSkyOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_gl/GLSkyOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_gl/GLSkyOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_gl/GLSkyOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_silverlining/SilverLiningDriver.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_silverlining/SilverLiningDriver.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_silverlining/SilverLiningDriver.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_silverlining/SilverLiningDriver.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@
                                   public SkyNodeFactory
     {
     public:
-        META_Object(osgearth_sky_silverlining, SilverLiningExtension);
+        META_OE_Extension(osgEarth, SilverLiningExtension, sky_silverlining);
 
         // CTORs
         SilverLiningExtension() { }
@@ -57,7 +57,13 @@
 
         bool connect(MapNode* mapNode)
         {
-            _skynode = createSkyNode(mapNode->getMap()->getProfile());
+            _skynode = createSkyNode();
+            if (mapNode->getMapSRS()->isProjected())
+            {
+                GeoPoint refPoint;
+                mapNode->getMap()->getProfile()->getExtent().getCentroid(refPoint);
+                _skynode->setReferencePoint(refPoint);
+            }                
             osgEarth::insertParent(_skynode.get(), mapNode);
             return true;
         }
@@ -104,15 +110,13 @@
 
     public: // SkyNodeFactory
 
-        SkyNode* createSkyNode(const Profile* profile) {
-            return new SilverLiningNode(profile->getSRS(), *this);
+        SkyNode* createSkyNode() {
+            return new SilverLiningNode(*this);
         }
 
 
     protected: // Object
-
-        SilverLiningExtension(const SilverLiningExtension& rhs, const osg::CopyOp& op) { }
-
+        
         // DTOR
         virtual ~SilverLiningExtension() { }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Atmosphere.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Atmosphere.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Atmosphere.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Atmosphere.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -24,7 +24,10 @@
 } 
 
 void atmos_fragment_main(inout vec4 color) 
-{ 				
+{
+    if (gl_ProjectionMatrix[3][3] != 0.0)
+        discard;
+
     float fCos = dot(atmos_v3LightDir, atmos_v3Direction) / length(atmos_v3Direction); 
     float fRayleighPhase = 1.0;  // 0.75 * (1.0 + fCos*fCos); 
     float fMiePhase = 1.5 * ((1.0 - atmos_g2) / (2.0 + atmos_g2)) * (1.0 + fCos*fCos) / atmos_fastpow(1.0 + atmos_g2 - 2.0*atmos_g*fCos, 1.5); 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Atmosphere.vert.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Atmosphere.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Atmosphere.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Atmosphere.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -160,6 +160,6 @@
 
     // Transition from space to atmosphere
     atmos_renderFromSpace = 1.0 - clamp(
-        (atmos_fOuterRadius-atmos_fCameraHeight)/50000,
+        (atmos_fOuterRadius-atmos_fCameraHeight)/50000.0,
         0.0, 1.0 );
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyExtension.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyExtension.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyExtension.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyExtension.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@
                                public SkyNodeFactory
     {
     public:
-        META_Object(osgearth_sky_simple, SimpleSkyExtension);
+        META_OE_Extension(osgEarth, SimpleSkyExtension, sky_simple);
 
         // CTORs
         SimpleSkyExtension() { }
@@ -57,7 +57,13 @@
 
         bool connect(MapNode* mapNode)
         {
-            _skynode = createSkyNode(mapNode->getMap()->getProfile());
+            _skynode = createSkyNode();
+            if (mapNode->getMapSRS()->isProjected())
+            {
+                GeoPoint refPoint;
+                mapNode->getMap()->getProfile()->getExtent().getCentroid(refPoint);
+                _skynode->setReferencePoint(refPoint);
+            }                
             osgEarth::insertParent(_skynode.get(), mapNode);
             return true;
         }
@@ -107,15 +113,13 @@
 
     public: // SkyNodeFactory
 
-        SkyNode* createSkyNode(const Profile* profile) {
-            return new SimpleSkyNode(profile->getSRS(), *this);
+        SkyNode* createSkyNode() {
+            return new SimpleSkyNode(*this);
         }
 
 
     protected: // Object
 
-        SimpleSkyExtension(const SimpleSkyExtension& rhs, const osg::CopyOp& op) { }
-
         // DTOR
         virtual ~SimpleSkyExtension() { }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Ground.ONeil.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Ground.ONeil.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Ground.ONeil.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Ground.ONeil.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -5,7 +5,8 @@
 #pragma vp_location   fragment_lighting
 #pragma vp_order      0.8
 
-#pragma import_defines(OE_LIGHTING, OE_NUM_LIGHTS)
+#pragma import_defines(OE_LIGHTING)
+#pragma import_defines(OE_NUM_LIGHTS)
 
 uniform float oe_sky_exposure;           // HDR scene exposure (ground level)
 uniform float oe_sky_ambientBoostFactor; // ambient sunlight booster for daytime
@@ -60,46 +61,44 @@
     // https://en.wikipedia.org/wiki/Phong_reflection_model
     // https://www.opengl.org/sdk/docs/tutorials/ClockworkCoders/lighting.php
     // https://en.wikibooks.org/wiki/GLSL_Programming/GLUT/Multiple_Lights
+    // https://en.wikibooks.org/wiki/GLSL_Programming/GLUT/Specular_Highlights
 
+    // normal vector at vertex
     vec3 N = normalize(vp_Normal);
 
     float shine = clamp(osg_FrontMaterial.shininess, 1.0, 128.0); 
+    vec4 surfaceSpecularity = osg_FrontMaterial.specular;
     
+    // up vector at vertex
     vec3 U = normalize(atmos_up);
 
-    // Accumulate the lighting, starting with material emission. We are currently
-    // omitting the ambient term for now since we are not using LightModel ambience.
-    vec3 totalLighting =
-        osg_FrontMaterial.emission.rgb;
-        // + osg_FrontMaterial.ambient.rgb * osg_LightModel.ambient.rgb;
+    // Accumulate the lighting for each component separately.
+    vec3 totalDiffuse = vec3(0.0);
+    vec3 totalAmbient = vec3(0.0);
+    vec3 totalSpecular = vec3(0.0);
 
     int numLights = OE_NUM_LIGHTS;
 
     for (int i=0; i<numLights; ++i)
     {
-        const float attenuation = 1.0;
-
         if (osg_LightSource[i].enabled)
         {
             float attenuation = 1.0;
-            vec3 L; // vertex-to-light-source vector.
 
-            // directional light:
-            if (osg_LightSource[i].position.w == 0.0)
-            {
-                L = normalize(osg_LightSource[i].position.xyz);
-            }
+            // L is the normalized camera-to-light vector.
+            vec3 L = normalize(osg_LightSource[i].position.xyz);
+
+            // V is the normalized vertex-to-camera vector.
+            vec3 V = -normalize(atmos_vert);
 
             // point or spot light:
-            else
+            if (osg_LightSource[i].position.w != 0.0)
             {
-                // calculate VL, the vertex-to-light vector:
-                vec4 V = vec4(atmos_vert, 1.0) * osg_LightSource[i].position.w;
-                vec4 VL4 = osg_LightSource[i].position - V;
-                L = normalize(VL4.xyz);
+                // VLu is the unnormalized vertex-to-light vector
+                vec3 Lu = osg_LightSource[i].position.xyz - atmos_vert;
 
                 // calculate attenuation:
-                float distance = length(VL4);
+                float distance = length(Lu);
                 attenuation = 1.0 / (
                     osg_LightSource[i].constantAttenuation +
                     osg_LightSource[i].linearAttenuation * distance +
@@ -125,11 +124,10 @@
 
             vec3 ambientReflection =
                 attenuation
-                * osg_FrontMaterial.ambient.rgb
                 * osg_LightSource[i].ambient.rgb
                 * ambientBoost;
 
-            float NdotL = max(dot(N,L), 0.0); 
+            float NdotL = max(dot(N,L), 0.0);
 
             // this term, applied to light 0 (the sun), attenuates the diffuse light
             // during the nighttime, so that geometry doesn't get lit based on its
@@ -139,28 +137,44 @@
             vec3 diffuseReflection =
                 attenuation
                 * diffuseAttenuation
-                * osg_LightSource[i].diffuse.rgb * osg_FrontMaterial.diffuse.rgb
+                * osg_LightSource[i].diffuse.rgb
                 * NdotL;
                 
             vec3 specularReflection = vec3(0.0);
             if (NdotL > 0.0)
             {
-                vec3 H = reflect(-L,N); 
-                float HdotN = max(dot(H,N), 0.0); 
+                // prevent a sharp edge where NdotL becomes positive
+                // by fading in the spec between (0.0 and 0.1)
+                float specAttenuation = clamp(NdotL*10.0, 0.0, 1.0);
+
+                vec3 H = reflect(-L,N);
+                float HdotV = max(dot(H,V), 0.0); 
 
                 specularReflection =
-                    attenuation
+                      specAttenuation
+                    * attenuation
                     * osg_LightSource[i].specular.rgb
-                    * osg_FrontMaterial.specular.rgb
-                    * pow(HdotN, shine);
+                    * surfaceSpecularity.rgb
+                    * pow(HdotV, shine);
             }
 
-            totalLighting += ambientReflection + diffuseReflection + specularReflection;
+            totalDiffuse += diffuseReflection;
+            totalAmbient += ambientReflection;
+            totalSpecular += specularReflection;
         }
     }
     
-    // add the atmosphere color, and scale by the lighting.
-    color.rgb = (color.rgb + atmos_color) * totalLighting;
+    // add the atmosphere color, and incorpoate the lights.
+    color.rgb += atmos_color;
+
+    vec3 lightColor =
+        osg_FrontMaterial.emission.rgb +
+        totalDiffuse * osg_FrontMaterial.diffuse.rgb +
+        totalAmbient * osg_FrontMaterial.ambient.rgb;
+
+    color.rgb =
+        color.rgb * lightColor +
+        totalSpecular; // * osg_FrontMaterial.specular.rgb;
     
     // Simulate HDR by applying an exposure factor (1.0 is none, 2-3 are reasonable)
     color.rgb = 1.0 - exp(-oe_sky_exposure * color.rgb);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Ground.ONeil.vert.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Ground.ONeil.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Ground.ONeil.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Ground.ONeil.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -5,9 +5,8 @@
 #pragma vp_location   vertex_view
 #pragma vp_order      0.5
 
-#pragma import_defines(OE_LIGHTING, OE_NUM_LIGHTS)
-
-//uniform bool oe_mode_GL_LIGHTING; 
+#pragma import_defines(OE_LIGHTING)
+#pragma import_defines(OE_NUM_LIGHTS)
 
 uniform mat4 osg_ViewMatrixInverse;   // world camera position in [3].xyz 
 uniform mat4 osg_ViewMatrix;          // GL view matrix 
@@ -64,7 +63,7 @@
 
    bool enabled;
 };  
-uniform osg_LightSourceParameters osg_LightSource[1];
+uniform osg_LightSourceParameters osg_LightSource[OE_NUM_LIGHTS];
 
 
 
@@ -180,8 +179,6 @@
     return;
 #endif
 
-    //if ( oe_mode_GL_LIGHTING == false ) return; 
-
     atmos_fCameraHeight = length(osg_ViewMatrixInverse[3].xyz); 
     atmos_fCameraHeight2 = atmos_fCameraHeight*atmos_fCameraHeight; 
     atmos_lightDir = normalize(osg_LightSource[0].position.xyz);  // view space
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Moon.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Moon.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Moon.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Moon.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -2,11 +2,13 @@
 $GLSL_DEFAULT_PRECISION_FLOAT
 
 in vec4 moon_TexCoord;
+in float moon_Lighting;
 uniform sampler2D moonTex;
 
 out vec4 out_FragColor;
 
 void main( void ) 
 { 
-   out_FragColor = texture(moonTex, moon_TexCoord.st);
+    vec4 color = texture(moonTex, moon_TexCoord.st);
+    out_FragColor = vec4(color.rgb*moon_Lighting, color.a);
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Moon.vert.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Moon.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Moon.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Moon.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -1,10 +1,17 @@
 #version $GLSL_VERSION_STR
 $GLSL_DEFAULT_PRECISION_FLOAT
 
+uniform vec3 moonToSun;
 out vec4 moon_TexCoord;
+out float moon_Lighting;
 
 void main() 
 { 
-    moon_TexCoord = gl_MultiTexCoord0; 
+    moon_TexCoord = gl_MultiTexCoord0;
     gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; 
+
+    // dot product results in a "lighting" factor, 0=none, 1=full,
+    // to send to the fragment shader
+    moon_Lighting = clamp(dot(gl_Normal, moonToSun), 0, 1);
+    moon_Lighting = pow(moon_Lighting, 0.4);
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyNode osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyNode
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -39,12 +39,7 @@
     class SimpleSkyNode : public SkyNode
     {
     public:
-        SimpleSkyNode(
-            const SpatialReference* srs);
-
-        SimpleSkyNode(
-            const SpatialReference* srs,
-            const SimpleSkyOptions& options);
+        SimpleSkyNode(const SimpleSkyOptions& options);
 
     public: // SkyNode
 
@@ -59,6 +54,11 @@
         void onSetStarsVisible();
         void onSetAtmosphereVisible();
 
+    public: // osg::Object
+
+        void releaseGLObjects(osg::State* state) const;
+        void resizeGLObjectBuffers(unsigned maxSize);
+
     public: // osg::Node
 
         void traverse(osg::NodeVisitor&);
@@ -103,10 +103,10 @@
 
 		const SimpleSkyOptions _options;
 
-        void initialize(const SpatialReference* srs);
+        void construct();
 
         void makeSceneLighting();
-        void makeAtmosphere( const osg::EllipsoidModel* );
+        void makeAtmosphere(const osg::EllipsoidModel*);
         void makeSun();
         void makeMoon();
 
@@ -116,7 +116,7 @@
         bool parseStarFile(const std::string& starFile, std::vector<StarData>& out_stars);
 
         void setAmbientBrightness(float value);
-        void setSunPosition(const osg::Vec3& pos);
+        void setSunPosition(const osg::Vec3d& pos);
         void setMoonPosition(const osg::Vec3d& pos);
     };
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyNode.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -36,7 +36,9 @@
 #include <osgEarth/ShaderFactory>
 #include <osgEarth/ShaderGenerator>
 #include <osgEarth/Shaders>
+#include <osgEarth/GLUtils>
 #include <osgEarth/Lighting>
+#include <osgEarth/PointDrawable>
 
 #include <osg/MatrixTransform>
 #include <osg/ShapeDrawable>
@@ -95,16 +97,16 @@
 
         osg::Vec2Array* texCoords = 0;
         osg::Vec3Array* normals = 0;
+
         if (genTexCoords)
         {
             texCoords = new osg::Vec2Array();
             texCoords->reserve( latSegments * lonSegments );
             geom->setTexCoordArray( 0, texCoords );
 
-            normals = new osg::Vec3Array();
+            normals = new osg::Vec3Array(osg::Array::BIND_PER_VERTEX);
             normals->reserve( latSegments * lonSegments );
             geom->setNormalArray( normals );
-            geom->setNormalBinding(osg::Geometry::BIND_PER_VERTEX );
         }
 
         osg::DrawElementsUShort* el = new osg::DrawElementsUShort( GL_TRIANGLES );
@@ -129,9 +131,9 @@
 
                 if (normals)
                 {
-                    osg::Vec3 normal( gx, gy, gz);
+                    osg::Vec3d normal(gx, gy, gz);
                     normal.normalize();
-                    normals->push_back( normal );
+                    normals->push_back( osg::Vec3f(normal) );
                 }
 
 
@@ -140,11 +142,12 @@
                     int x_plus_1 = x < lonSegments-1 ? x+1 : 0;
                     int y_plus_1 = y+1;
                     el->push_back( y*lonSegments + x );
-                    el->push_back( y_plus_1*lonSegments + x );
-                    el->push_back( y*lonSegments + x_plus_1 );
                     el->push_back( y*lonSegments + x_plus_1 );
                     el->push_back( y_plus_1*lonSegments + x );
+
+                    el->push_back( y*lonSegments + x_plus_1 );
                     el->push_back( y_plus_1*lonSegments + x_plus_1 );
+                    el->push_back( y_plus_1*lonSegments + x );
                 }
             }
         }
@@ -193,22 +196,15 @@
 
 //---------------------------------------------------------------------------
 
-SimpleSkyNode::SimpleSkyNode(const SpatialReference* srs) :
-SkyNode()
-{
-    initialize(srs);
-}
-
-SimpleSkyNode::SimpleSkyNode(const SpatialReference* srs,
-                             const SimpleSkyOptions& options) :
+SimpleSkyNode::SimpleSkyNode(const SimpleSkyOptions& options) :
 SkyNode ( options ),
 _options( options )
 {
-    initialize(srs);
+    construct();
 }
 
 void
-SimpleSkyNode::initialize(const SpatialReference* srs)
+SimpleSkyNode::construct()
 {
     // protect us from the ShaderGenerator.
     ShaderGenerator::setIgnoreHint(this, true);
@@ -235,9 +231,9 @@
     }
 
     // only supports geocentric for now.
-    if ( srs && !srs->isGeographic() )
+    if (getReferencePoint().isValid())
     {
-        OE_WARN << LC << "Sorry, SimpleSky only supports geocentric maps." << std::endl;
+        OE_WARN << LC << "Found an ephemeris reference point, but SimpleSky does not support projected maps" << std::endl;
         return;
     }
 
@@ -245,12 +241,15 @@
     _cullContainer = new osg::Group();
     
     // set up the astronomical parameters:
-    _ellipsoidModel = srs ? srs->getEllipsoid() : new osg::EllipsoidModel();
+    osg::ref_ptr<const SpatialReference> wgs84 = SpatialReference::get("wgs84");
+    _ellipsoidModel = wgs84->getEllipsoid();
     _innerRadius = osg::minimum(
         _ellipsoidModel->getRadiusPolar(),
         _ellipsoidModel->getRadiusEquator() );
     _outerRadius = _innerRadius * 1.025f;
-    _sunDistance = _innerRadius * 12000.0f;
+
+    CelestialBody sun = getEphemeris()->getSunPosition(DateTime());
+    _sunDistance = sun.altitude.as(Units::METERS);
     
     if ( Registry::capabilities().supportsGLSL() )
     {
@@ -260,10 +259,6 @@
         _lightPosUniform->set( lightPos / lightPos.length() );
         stateset->addUniform( _lightPosUniform.get() );
 
-        // default GL_LIGHTING uniform setting
-        //stateset->addUniform(
-        //    Registry::shaderFactory()->createUniformForGLMode(GL_LIGHTING, 1) );
-
         stateset->setDefine(OE_LIGHTING_DEFINE, osg::StateAttribute::ON);
 
         // make the uniforms and the terrain lighting shaders.
@@ -277,6 +272,12 @@
         makeMoon();
 
         makeStars();
+
+        // Decorations are shown by default, so hide them as needed
+        if (_options.sunVisible() == false) setSunVisible(false);
+        if (_options.moonVisible() == false) setMoonVisible(false);
+        if (_options.starsVisible() == false) setStarsVisible(false);
+        if (_options.atmosphereVisible() == false) setAtmosphereVisible(false);
     }
 
     // Update everything based on the date/time.
@@ -322,7 +323,23 @@
     } 
 
     SkyNode::traverse( nv ); 
-} 
+}
+
+void
+SimpleSkyNode::releaseGLObjects(osg::State* state) const
+{
+    SkyNode::releaseGLObjects(state);
+    if (_cullContainer.valid())
+        _cullContainer->releaseGLObjects(state);
+}
+
+void
+SimpleSkyNode::resizeGLObjectBuffers(unsigned maxSize)
+{
+    SkyNode::resizeGLObjectBuffers(maxSize);
+    if (_cullContainer.valid())
+        _cullContainer->resizeGLObjectBuffers(maxSize);
+}
 
 void
 SimpleSkyNode::onSetEphemeris()
@@ -339,12 +356,11 @@
         osg::View* view = 0L;
         const DateTime& dt = getDateTime();
 
-        osg::Vec3d sunPos = getEphemeris()->getSunPositionECEF( dt );
-        osg::Vec3d moonPos = getEphemeris()->getMoonPositionECEF( dt );
+        CelestialBody sun = getEphemeris()->getSunPosition(dt);
+        setSunPosition( sun.geocentric );
 
-        sunPos.normalize();
-        setSunPosition( sunPos );
-        setMoonPosition( moonPos );
+        CelestialBody moon = getEphemeris()->getMoonPosition(dt);
+        setMoonPosition( moon.geocentric );
 
         // position the stars:
         double time_r = dt.hours()/24.0; // 0..1
@@ -377,33 +393,46 @@
 }
 
 void
-SimpleSkyNode::setSunPosition(const osg::Vec3& pos)
+SimpleSkyNode::setSunPosition(const osg::Vec3d& pos)
 {
-    osg::Vec3 npos = pos;
+    osg::Vec3d npos = pos;
+    _light->setPosition(osg::Vec4(npos, 0.0f)); // directional light
     npos.normalize();
-    _light->setPosition( osg::Vec4(npos, 0.0f) ); // directional light
 
     //OE_NOTICE << pos.x() << ", " << pos.y() << ", " << pos.z() << std::endl;
     
     if ( _lightPosUniform.valid() )
     {
-        _lightPosUniform->set( pos/pos.length() );
+        _lightPosUniform->set( osg::Vec3(npos) );
     }
 
     if ( _sunXform.valid() )
     {
-        _sunXform->setMatrix( osg::Matrix::translate( 
-            _sunDistance * pos.x(), 
-            _sunDistance * pos.y(),
-            _sunDistance * pos.z() ) );
+        _sunXform->setMatrix( osg::Matrix::translate(pos) );
+
+        if (_moonXform.valid())
+        {
+            osg::Vec3d moonToSun = _sunXform->getMatrix().getTrans() - _moonXform->getMatrix().getTrans();
+            moonToSun.normalize();
+            _moonXform->getOrCreateStateSet()->getOrCreateUniform("moonToSun", osg::Uniform::FLOAT_VEC3)->set(osg::Vec3f(moonToSun));
+        }
     }
 }
 
 void
 SimpleSkyNode::setMoonPosition(const osg::Vec3d& pos)
 {
-    if ( _moonXform.valid() )
-        _moonXform->setMatrix( osg::Matrixd::translate(pos.x(), pos.y(), pos.z()) );
+    if (_moonXform.valid())
+    {
+        _moonXform->setMatrix(osg::Matrixd::translate(pos));
+        
+        if (_sunXform.valid())
+        {
+            osg::Vec3d moonToSun = _sunXform->getMatrix().getTrans() - _moonXform->getMatrix().getTrans();
+            moonToSun.normalize();
+            _moonXform->getOrCreateStateSet()->getOrCreateUniform("moonToSun", osg::Uniform::FLOAT_VEC3)->set(osg::Vec3f(moonToSun));
+        }
+    }
 }
 
 void
@@ -443,7 +472,7 @@
     VirtualProgram* vp = VirtualProgram::getOrCreate( stateset );
     vp->setName( "SimpleSky Scene Lighting" );
 
-    if (_options.atmosphericLighting() == true)// && !Registry::capabilities().isGLES() )
+    if (_options.atmosphericLighting() == true)
     {
         Shaders pkg;
         pkg.load( vp, pkg.Ground_ONeil_Vert );
@@ -454,7 +483,6 @@
     else
     {
         _phong = new PhongLightingEffect();
-        //_phong->setCreateLightingUniform( false );
         _phong->attach( stateset );
         OE_INFO << LC << "Using Phong lighting\n";
     }
@@ -520,8 +548,8 @@
     
     // configure the state set:
     osg::StateSet* atmosSet = drawable->getOrCreateStateSet();
-    atmosSet->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
-    atmosSet->setAttributeAndModes( new osg::CullFace(osg::CullFace::BACK), osg::StateAttribute::ON );
+    GLUtils::setLighting(atmosSet, osg::StateAttribute::OFF);
+    atmosSet->setAttributeAndModes( new osg::CullFace(osg::CullFace::FRONT), osg::StateAttribute::ON );
     atmosSet->setAttributeAndModes( new osg::Depth( osg::Depth::LESS, 0, 1, false ) ); // no depth write
     atmosSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false) ); // no zbuffer
     atmosSet->setAttributeAndModes( new osg::BlendFunc( GL_ONE, GL_ONE ), osg::StateAttribute::ON );
@@ -558,9 +586,12 @@
     sun->setMode( osg::Billboard::POINT_ROT_EYE );
     sun->setNormal( osg::Vec3(0, 0, 1) );
 
-    float sunRadius = _innerRadius * 100.0f;
+    //float sunRadius = _innerRadius * 100.0f;
+    //sun->addDrawable( s_makeDiscGeometry( sunRadius*80.0f ) ); 
 
-    sun->addDrawable( s_makeDiscGeometry( sunRadius*80.0f ) ); 
+    const double zoomFactor = 80.0; // to account for the solare glare
+    const double sunRadius = 695508000.0; // radius of the run in meters
+    sun->addDrawable(s_makeDiscGeometry(sunRadius*zoomFactor));
 
     osg::StateSet* set = sun->getOrCreateStateSet();
     set->setMode( GL_BLEND, 1 );
@@ -595,7 +626,6 @@
     _sun = cam;
 
     // make the sun's transform:
-    // todo: move this?
     _sunXform = new osg::MatrixTransform();
     _sunXform->setMatrix( osg::Matrix::translate( 
         _sunDistance * _light->getPosition().x(),
@@ -610,35 +640,51 @@
 SimpleSkyNode::makeMoon()
 {
     osg::ref_ptr< osg::EllipsoidModel > em = new osg::EllipsoidModel( 1738140.0, 1735970.0 );   
-    osg::Geode* moon = new osg::Geode;
-    moon->getOrCreateStateSet()->setAttributeAndModes( new osg::Program(), osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED );
-    osg::Geometry* geom = s_makeEllipsoidGeometry( em.get(), em->getRadiusEquator(), true );    
+    
+    osg::Geometry* moonDrawable = s_makeEllipsoidGeometry( em.get(), em->getRadiusEquator()*_options.moonScale().get(), true );    
+    osg::StateSet* stateSet = moonDrawable->getOrCreateStateSet();
+
     //TODO:  Embed this texture in code or provide a way to have a default resource directory for osgEarth.
     //       Right now just need to have this file somewhere in your OSG_FILE_PATH
-    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile( "moon_1024x512.jpg" );
-    osg::Texture2D * texture = new osg::Texture2D( image );
+    //stateSet->setAttributeAndModes( new osg::Program(), osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED );
+    osg::ref_ptr<osg::Image> image = _options.moonImageURI()->getImage();
+    if (!image.valid())
+    {
+        OE_WARN << LC << "Failed to load moon texture from " << _options.moonImageURI()->full() << std::endl;
+    }
+
+    osg::Texture2D* texture = new osg::Texture2D( image.get() );
     texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
     texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
+    texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+    texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
     texture->setResizeNonPowerOfTwoHint(false);
-    geom->getOrCreateStateSet()->setTextureAttributeAndModes( 0, texture, osg::StateAttribute::ON | osg::StateAttribute::PROTECTED);
+    stateSet->setTextureAttributeAndModes( 0, texture, osg::StateAttribute::ON | osg::StateAttribute::PROTECTED);
+#ifdef OSG_GL3_AVAILABLE
+    // Adjust for loss of GL_LUMINANCE in glTexture2D's format parameter.  OSG handles the texture's internal format,
+    // but the format parameter comes from the image's pixel format field.
+    if (image.valid() && image->getPixelFormat() == GL_LUMINANCE)
+    {
+      image->setPixelFormat(GL_RED);
+      // Swizzle the RGB all to RED in order to match previous GL_LUMINANCE behavior
+      texture->setSwizzle(osg::Vec4i(GL_RED, GL_RED, GL_RED, GL_ONE));
+    }
+#endif
 
-    osg::Vec4Array* colors = new osg::Vec4Array(1);    
-    geom->setColorArray( colors );
-    geom->setColorBinding(osg::Geometry::BIND_OVERALL);
+    osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);    
+    moonDrawable->setColorArray( colors );
     (*colors)[0] = osg::Vec4(1, 1, 1, 1 );
-    moon->addDrawable( geom  ); 
 
-    osg::StateSet* set = moon->getOrCreateStateSet();
     // configure the stateset
-    set->setMode( GL_LIGHTING, osg::StateAttribute::ON );
-    set->setAttributeAndModes( new osg::CullFace( osg::CullFace::BACK ), osg::StateAttribute::ON);
-    set->setRenderBinDetails( BIN_MOON, "RenderBin" );
-    set->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), osg::StateAttribute::ON );
-    set->setAttributeAndModes( new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA), osg::StateAttribute::ON );
-    
-#if 1 //defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)
+    //GLUtils::setLighting(stateSet, osg::StateAttribute::ON );
 
-    set->addUniform(new osg::Uniform("moonTex", 0));
+    stateSet->setAttributeAndModes( new osg::CullFace( osg::CullFace::BACK ), osg::StateAttribute::ON);
+    stateSet->setRenderBinDetails( BIN_MOON, "RenderBin" );
+    stateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), osg::StateAttribute::ON );
+    stateSet->setAttributeAndModes( new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA), osg::StateAttribute::ON );
+    
+#if 1
+    stateSet->addUniform(new osg::Uniform("moonTex", 0));
 
     // create shaders
     Shaders pkg;
@@ -651,7 +697,58 @@
         osg::Shader::FRAGMENT,
         ShaderLoader::load(pkg.Moon_Frag, pkg) );
     program->addShader( fs );
-    set->setAttributeAndModes( program, osg::StateAttribute::ON | osg::StateAttribute::PROTECTED );
+    stateSet->setAttributeAndModes( program, osg::StateAttribute::ON | osg::StateAttribute::PROTECTED );
+
+#else
+
+    VirtualProgram* vp = VirtualProgram::getOrCreate(stateSet);
+
+    const char* VS =
+        "#version 330\n"
+        "#pragma import_defines(OE_NUM_LIGHTS) \n"
+        "out vec2 oe_SimpleSky_moonTexCoord;\n"
+        "out float oe_SimpleSky_lighting;\n"
+        "struct osg_LightSourceParameters  \n"
+        "{    \n"
+           "vec4 ambient;              // Aclarri    \n"
+           "vec4 diffuse;              // Dcli    \n"
+           "vec4 specular;             // Scli    \n"
+           "vec4 position;             // Ppli    \n"
+           "//vec4 halfVector;           // Derived: Hi    \n"
+           "vec3 spotDirection;        // Sdli    \n"
+           "float spotExponent;        // Srli    \n"
+           "float spotCutoff;          // Crli                               \n"
+                                      "// (range: [0.0,90.0], 180.0)    \n"
+           "float spotCosCutoff;       // Derived: cos(Crli)                  \n"
+                                      "// (range: [1.0,0.0],-1.0)    \n"
+           "float constantAttenuation; // K0    \n"
+           "float linearAttenuation;   // K1    \n"
+           "float quadraticAttenuation;// K2   \n"
+
+           "bool enabled; \n"
+        "};   \n"
+        "uniform osg_LightSourceParameters osg_LightSource[OE_NUM_LIGHTS]; \n"
+        "void oe_SimpleSky_moonVS(inout vec4 vertexModel) { \n"
+        "    oe_SimpleSky_moonTexCoord = gl_MultiTexCoord0.st; \n"
+        "    oe_SimpleSky_lighting = 1.0; \n"
+        "} \n";
+
+    const char* FS =
+        "#version 330\n"
+        "in vec2 oe_SimpleSky_moonTexCoord;\n"
+        "in float oe_SimpleSky_lighting;\n"
+        "uniform sampler2D oe_SimpleSky_moonTex; \n"
+        "void oe_SimpleSky_moonFS(inout vec4 color) { \n"
+        "    color = texture(oe_SimpleSky_moonTex, oe_SimpleSky_moonTexCoord); \n"
+        "    color.rgb *= oe_SimpleSky_lighting; \n"
+        "} \n";
+
+
+    vp->setFunction("oe_SimpleSky_moonVS", VS, ShaderComp::LOCATION_VERTEX_MODEL);
+    vp->setFunction("oe_SimpleSky_moonFS", FS, ShaderComp::LOCATION_FRAGMENT_COLORING);
+
+    stateSet->addUniform(new osg::Uniform("oe_SimpleSky_moonTex", 0));
+
 #endif
 
     // A nested camera isolates the projection matrix calculations so the node won't 
@@ -660,16 +757,19 @@
     cam->getOrCreateStateSet()->setRenderBinDetails( BIN_MOON, "RenderBin" );
     cam->setRenderOrder( osg::Camera::NESTED_RENDER );
     cam->setComputeNearFarMode( osg::CullSettings::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES );
-    cam->addChild( moon );
+    cam->addChild( moonDrawable );
 
     _moon = cam;
 
     // make the moon's transform:
-    _moonXform = new osg::MatrixTransform();    
-    osg::Vec3d moonPosECEF = getEphemeris()->getMoonPositionECEF( getDateTime() );
-    _moonXform->setMatrix( osg::Matrix::translate( moonPosECEF ) ); 
+    CelestialBody moon = getEphemeris()->getMoonPosition(getDateTime());
+
+    _moonXform = new osg::MatrixTransform();   
+    _moonXform->setMatrix( osg::Matrix::translate( moon.geocentric ) ); 
     _moonXform->addChild( _moon.get() );
 
+    //_moonXform->getOrCreateStateSet()->addUniform(new osg::Uniform("moonToSun", osg::Vec3f(0,0,1)));
+
     _cullContainer->addChild( _moonXform.get() );
 
     //If we couldn't load the moon texture, turn the moon off
@@ -738,77 +838,55 @@
 {
     double minMag = DBL_MAX, maxMag = DBL_MIN;
 
-    osg::Vec3Array* coords = new osg::Vec3Array();
-    std::vector<StarData>::const_iterator p;
-    for( p = stars.begin(); p != stars.end(); p++ )
+    PointDrawable* drawable = new PointDrawable();
+    drawable->setPointSize(_options.starSize().get());
+    drawable->allocate(stars.size());
+
+    for(unsigned p=0; p<stars.size(); ++p)
     {
+        const StarData& star = stars[p];
+
         osg::Vec3d v = getEphemeris()->getECEFfromRADecl(
-            p->right_ascension, 
-            p->declination, 
+            star.right_ascension, 
+            star.declination, 
             _starRadius );
 
-        coords->push_back( v );
+        drawable->setVertex(p, v);
 
-        if ( p->magnitude < minMag ) minMag = p->magnitude;
-        if ( p->magnitude > maxMag ) maxMag = p->magnitude;
+        if ( star.magnitude < minMag ) minMag = star.magnitude;
+        if ( star.magnitude > maxMag ) maxMag = star.magnitude;
     }
 
-    osg::Vec4Array* colors = new osg::Vec4Array();
-    for( p = stars.begin(); p != stars.end(); p++ )
+    for(unsigned p=0; p<stars.size(); ++p)
     {
-        float c = ( (p->magnitude-minMag) / (maxMag-minMag) );
-        colors->push_back( osg::Vec4(c,c,c,1.0f) );
+        const StarData& star = stars[p];
+        float c = (star.magnitude-minMag) / (maxMag-minMag);
+        drawable->setColor(p, osg::Vec4(c,c,c,1.0f));
     }
 
-    osg::Geometry* geometry = new osg::Geometry;
-    geometry->setUseVertexBufferObjects(true);
+    drawable->finish();
 
-    geometry->setVertexArray( coords );
-    geometry->setColorArray( colors );
-    geometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
-    geometry->addPrimitiveSet( new osg::DrawArrays(osg::PrimitiveSet::POINTS, 0, coords->size()));
+    osg::StateSet* sset = drawable->getOrCreateStateSet();
 
-    osg::StateSet* sset = geometry->getOrCreateStateSet();
+    const osgEarth::Capabilities& caps = osgEarth::Registry::capabilities();
 
-#if !defined(OSG_GL3_AVAILABLE)
-    // In GL3, PointSprite is no longer available, and is always on.
-    sset->setTextureAttributeAndModes( 0, new osg::PointSprite(), osg::StateAttribute::ON );
-#endif
-    sset->setMode( GL_VERTEX_PROGRAM_POINT_SIZE, osg::StateAttribute::ON );
-
-    Shaders pkg;
-    std::string starVertSource, starFragSource;
-    if ( Registry::capabilities().isGLES() )
-    {
-        starVertSource = ShaderLoader::load(pkg.Stars_GLES_Vert, pkg);
-        starFragSource = ShaderLoader::load(pkg.Stars_GLES_Frag, pkg);
-    }
-    else
-    {
-        starVertSource = ShaderLoader::load(pkg.Stars_Vert, pkg);
-        starFragSource = ShaderLoader::load(pkg.Stars_Frag, pkg);
-    }
-
-    osg::Program* program = new osg::Program;
-    program->addShader( new osg::Shader(osg::Shader::VERTEX, starVertSource) );
-    program->addShader( new osg::Shader(osg::Shader::FRAGMENT, starFragSource) );
-    sset->setAttributeAndModes( program, osg::StateAttribute::ON | osg::StateAttribute::PROTECTED );
+    VirtualProgram* vp = VirtualProgram::getOrCreate(drawable->getOrCreateStateSet());
+    vp->setName("SimpleSky Stars");
+    Shaders shaders;
+    shaders.load(vp, shaders.Stars_Vert);
+    shaders.load(vp, shaders.Stars_Frag);
+    vp->setInheritShaders(false);
 
     sset->setRenderBinDetails( BIN_STARS, "RenderBin");
     sset->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS, 0, 1, false), osg::StateAttribute::ON );
     sset->setMode(GL_BLEND, 1);
 
-    osg::Geode* starGeode = new osg::Geode;
-    starGeode->addDrawable( geometry );
-
     // A separate camera isolates the projection matrix calculations.
     osg::Camera* cam = new osg::Camera();
     cam->getOrCreateStateSet()->setRenderBinDetails( BIN_STARS, "RenderBin" );
     cam->setRenderOrder( osg::Camera::NESTED_RENDER );
-    cam->setNearFarRatio(1e-9);
-    cam->setComputeNearFarMode( osg::CullSettings::COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES );
-    cam->addChild( starGeode );
 
+    cam->addChild( drawable );
     return cam;
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 #define OSGEARTH_DRIVER_SIMPLE_SKY_OPTIONS 1
 
 #include <osgEarthUtil/Sky>
+#include <osgEarth/URI>
 
 namespace osgEarth { namespace SimpleSky
 {
@@ -35,9 +36,16 @@
         SimpleSkyOptions(const ConfigOptions& options =ConfigOptions()) :
           SkyOptions(options),
           _atmosphericLighting (true),
-          _exposure            (2.4f),
+          _exposure            (3.3f),
           _daytimeAmbientBoost (5.0f),
-          _allowWireframe      (false)
+          _allowWireframe      (false),
+          _starSize            (14.0f),
+          _moonScale           (2.0f),
+          _moonImageURI("moon_1024x512.jpg"),
+		  _sunVisible(true),
+          _moonVisible(true),
+          _starsVisible(true),
+          _atmosphereVisible(true)
         {
             setDriver( "simple" );
             fromConfig( _conf );
@@ -65,18 +73,53 @@
         optional<std::string>& starFile() { return _starFile; }
         const optional<std::string>& starFile() const { return _starFile; }
 
+        //! Point size to use for stars (default=14)
+        optional<float>& starSize() { return _starSize; }
+        const optional<float>& starSize() const { return _starSize; }
+
         /** Whether to permit wireframe/point polygonmode rendering. Default is false. */
         optional<bool>& allowWireframe() { return _allowWireframe; }
         const optional<bool>& allowWireframe() const { return _allowWireframe; }
 
+		/** Whether the Sun is visible. This has no effect on lighting. */
+        optional<bool>& sunVisible() { return _sunVisible; }
+        const optional<bool>& sunVisible() const { return _sunVisible; }
+
+        /** Whether the Moon is visible */
+        optional<bool>& moonVisible() { return _moonVisible; }
+        const optional<bool>& moonVisible() const { return _moonVisible; }
+
+        /** Whether the stars are visible */
+        optional<bool>& starsVisible() { return _starsVisible; }
+        const optional<bool>& starsVisible() const { return _starsVisible; }
+
+        /** Whether the Earth's atmosphere is visible */
+        optional<bool>& atmosphereVisible() { return _atmosphereVisible; }
+        const optional<bool>& atmosphereVisible() const { return _atmosphereVisible; }
+
+        /** Scale factor for the moon to compensate for apparent/expected size. Default=2.0 */
+        optional<float>& moonScale() { return _moonScale; }
+        const optional<float>& moonScale() const { return _moonScale; }
+
+        /** URI of texture to load for moon */
+        optional<URI>& moonImageURI() { return _moonImageURI; }
+        const optional<URI>& moonImageURI() const { return _moonImageURI; }
+
     public:
         Config getConfig() const {
             Config conf = SkyOptions::getConfig();
-            conf.addIfSet("atmospheric_lighting", _atmosphericLighting);
-            conf.addIfSet("exposure", _exposure);
-            conf.addIfSet("daytime_ambient_boost", _daytimeAmbientBoost);
-            conf.addIfSet("star_file", _starFile);
-            conf.addIfSet("allow_wireframe", _allowWireframe);
+            conf.set("atmospheric_lighting", _atmosphericLighting);
+            conf.set("exposure", _exposure);
+            conf.set("daytime_ambient_boost", _daytimeAmbientBoost);
+            conf.set("star_file", _starFile);
+            conf.set("star_size", _starSize);
+            conf.set("allow_wireframe", _allowWireframe);
+			conf.set("sun_visible", _sunVisible);
+            conf.set("moon_visible", _moonVisible);
+            conf.set("stars_visible", _starsVisible);
+            conf.set("atmosphere_visible", _atmosphereVisible);
+            conf.set("moon_scale", _moonScale);
+            conf.set("moon_image", _moonImageURI);
             return conf;
         }
 
@@ -88,18 +131,32 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet("atmospheric_lighting", _atmosphericLighting);
-            conf.getIfSet("exposure", _exposure);
-            conf.getIfSet("daytime_ambient_boost", _daytimeAmbientBoost);
-            conf.getIfSet("star_file", _starFile);
-            conf.getIfSet("allow_wireframe", _allowWireframe);
+            conf.get("atmospheric_lighting", _atmosphericLighting);
+            conf.get("exposure", _exposure);
+            conf.get("daytime_ambient_boost", _daytimeAmbientBoost);
+            conf.get("star_file", _starFile);
+            conf.get("star_size", _starSize);
+            conf.get("allow_wireframe", _allowWireframe);
+			conf.get("sun_visible", _sunVisible);
+            conf.get("moon_visible", _moonVisible);
+            conf.get("stars_visible", _starsVisible);
+            conf.get("atmosphere_visible", _atmosphereVisible);
+            conf.get("moon_scale", _moonScale);
+            conf.get("moon_image", _moonImageURI);
         }
 
         optional<bool>        _atmosphericLighting;
         optional<float>       _exposure;
         optional<float>       _daytimeAmbientBoost;
         optional<std::string> _starFile;
+        optional<float>       _starSize;
         optional<bool>        _allowWireframe;
+		optional<bool>        _sunVisible;
+        optional<bool>        _moonVisible;
+        optional<bool>        _starsVisible;
+        optional<bool>        _atmosphereVisible;
+        optional<float>       _moonScale;
+        optional<URI>         _moonImageURI;
     };
 
 } } // namespace osgEarth::SimpleSky
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyShaders osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyShaders
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyShaders	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSkyShaders	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -1,15 +1,15 @@
 #version $GLSL_VERSION_STR
 $GLSL_DEFAULT_PRECISION_FLOAT
 
-in float visibility; 
-in vec4 osg_FrontColor; 
+#pragma vp_entryPoint oe_Stars_FS
+#pragma vp_location fragment_coloring
 
-out vec4 out_FragColor;
+in float oe_Stars_visibility; 
 
-void main( void ) 
+void oe_Stars_FS(inout vec4 color)
 { 
     float b1 = 1.0-(2.0*abs(gl_PointCoord.s-0.5)); 
     float b2 = 1.0-(2.0*abs(gl_PointCoord.t-0.5)); 
     float i = b1*b1 * b2*b2; 
-    out_FragColor = osg_FrontColor * i * visibility; 
+    color = color * i * oe_Stars_visibility;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.GLES.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.GLES.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.GLES.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.GLES.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -1,7 +1,7 @@
 #version $GLSL_VERSION_STR
 $GLSL_DEFAULT_PRECISION_FLOAT
 
-varying float visibility; 
+in float visibility; 
 in vec4 osg_FrontColor; 
 
 out vec4 out_FragColor;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.vert.glsl osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/sky_simple/SimpleSky.Stars.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -1,13 +1,14 @@
 #version $GLSL_VERSION_STR
 $GLSL_DEFAULT_PRECISION_FLOAT
 
+#pragma vp_entryPoint oe_Stars_VS
+#pragma vp_location vertex_clip
+
+uniform float oe_GL_PointSize;
 uniform vec3 atmos_v3LightDir; 
 uniform mat4 osg_ViewMatrixInverse; 
-out float visibility; 
-out vec4 osg_FrontColor; 
-
-layout(location=0) in vec4 vertex;
-layout(location=3) in vec4 color;
+out float oe_Stars_visibility; 
+vec4 vp_Color;
 
 float remap( float val, float vmin, float vmax, float r0, float r1 ) 
 { 
@@ -15,17 +16,20 @@
     return r0 + vr * (r1-r0); 
 } 
 
-void main() 
+void oe_Stars_VS(inout vec4 vertexClip)
 { 
-    osg_FrontColor = color; //vec4(1,1,1,1); //gl_Color; 
-    gl_PointSize = color.r * 14.0; //gl_Color.r * 14.0; 
-    gl_Position = gl_ModelViewProjectionMatrix * vertex; 
+    gl_PointSize = vp_Color.r * oe_GL_PointSize;
     vec3 eye = osg_ViewMatrixInverse[3].xyz; 
     float hae = length(eye) - 6378137.0; 
     // highness: visibility increases with altitude
     float highness = remap( hae, 25000.0, 150000.0, 0.0, 1.0 ); 
     eye = normalize(eye); 
     // darkness: visibility increase as the sun goes around the other side of the earth
-    float darkness = 1.0-remap(dot(eye,atmos_v3LightDir), -0.25, 0.0, 0.0, 1.0); 
-    visibility = clamp(highness + darkness, 0.0, 1.0); 
+    float darkness = 1.0-remap(dot(eye, atmos_v3LightDir), -0.25, 0.0, 0.0, 1.0); 
+    oe_Stars_visibility = clamp(highness + darkness, 0.0, 1.0); 
+
+    // clamp stars to the far clip plane to prevent any flickering or precision
+    // issues based on the extreme distance.
+    vertexClip.z = vertexClip.w;
 }
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/skyview/SkyViewOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/skyview/SkyViewOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/skyview/SkyViewOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/skyview/SkyViewOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -47,7 +47,7 @@
     public:
         Config getConfig() const {
             Config conf = TileSourceOptions::getConfig();
-            conf.setObj("image", _imageOptions );
+            conf.set("image", _imageOptions );
             return conf;
         }
 
@@ -59,7 +59,7 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getObjIfSet("image", _imageOptions );
+            conf.get("image", _imageOptions );
         }
 
         optional<TileSourceOptions> _imageOptions;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/skyview/SkyViewTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/skyview/SkyViewTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/skyview/SkyViewTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/skyview/SkyViewTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderExtension osgearth-2.10.2+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderExtension
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderExtension	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderExtension	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
                                    public TerrainShaderOptions
     {
     public:
-        META_Object(osgearth_ext_terrainshader, TerrainShaderExtension);
+        META_OE_Extension(osgEarth, TerrainShaderExtension, terrainshader);
 
         // CTORs
         TerrainShaderExtension();
@@ -56,10 +56,6 @@
 
         bool disconnect(MapNode* mapNode);
 
-
-    protected: // Object
-        TerrainShaderExtension(const TerrainShaderExtension& rhs, const osg::CopyOp& op) { }
-
     private:
         osg::ref_ptr<const osgDB::Options> _dbOptions;
         osg::ref_ptr<TerrainEffect>        _effect;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderExtension.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderExtension.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderExtension.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderExtension.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -60,6 +60,7 @@
             osg::StateSet* stateSet = engine->getSurfaceStateSet();
             
             VirtualProgram* vp = VirtualProgram::getOrCreate(stateSet);
+            vp->setName("TerrainShader");
             _package.loadAll( vp, _dbOptions.get() );
 
 
@@ -156,14 +157,7 @@
 
         void onUninstall(TerrainEngineNode* engine)
         {
-            if ( engine )
-            {
-                if ( _options.landCoverGroup().isSet() )
-                {
-                    //TODO
-                    //engine->removeLandCoverGroup( _options.landCoverGroup().get() );
-                }
-            }
+            //nop
         }
 
         const TerrainShaderOptions              _options;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/terrainshader/TerrainShaderOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
     /**
      * Options for applying an inline shader to the terrain.
      */
-    class TerrainShaderOptions : public DriverConfigOptions // NO EXPORT; header only
+    class TerrainShaderOptions : public ConfigOptions // NO EXPORT; header only
     {
     public:
         struct Code
@@ -60,33 +60,27 @@
         std::vector<Uniform>& uniforms() { return _uniforms; }
         const std::vector<Uniform>& uniforms() const { return _uniforms; }
 
-        optional<std::string>& landCoverGroup() { return _landCoverGroup; }
-        const optional<std::string>& landCoverGroup() const { return _landCoverGroup; }
-
-        optional<unsigned>& landCoverLOD() { return _landCoverLOD; }
-        const optional<unsigned>& landCoverLOD() const { return _landCoverLOD; }
-
     public:
-        TerrainShaderOptions( const ConfigOptions& opt =ConfigOptions() ) : DriverConfigOptions( opt )
+        TerrainShaderOptions( const ConfigOptions& opt =ConfigOptions() ) : ConfigOptions( opt )
         {
-            setDriver( "terrainshader" );
-            _landCoverLOD.init(15);
             fromConfig( _conf );
         }
 
         virtual ~TerrainShaderOptions() { }
 
     public:
-        Config getConfig() const
+        virtual Config getConfig() const
         {
-            Config conf = DriverConfigOptions::getConfig();
+            Config conf = ConfigOptions::getConfig();
 
+            conf.remove("code");
             for(unsigned i=0; i<_code.size(); ++i) {
                 Config c("code", _code[i]._source);
-                c.addIfSet("url", _code[i]._uri);
+                c.set("url", _code[i]._uri);
                 conf.add( c );
             }
 
+            conf.remove("sampler");
             for(unsigned i=0; i<_samplers.size(); ++i) {
                 Config c("sampler");
                 c.add("name", _samplers[i]._name);
@@ -103,33 +97,35 @@
                 conf.add( c );
             }
 
+            conf.remove("uniform");
             for(unsigned i=0; i<_uniforms.size(); ++i) {
                 Config c("uniform");
-                c.add("name", _uniforms[i]._name);
-                c.addIfSet("value", _uniforms[i]._value);
+                c.set("name", _uniforms[i]._name);
+                c.set("value", _uniforms[i]._value);
                 conf.add( c );
             }
-
-            //conf.addIfSet("land_cover", _landCover);
-            conf.addIfSet("land_cover_group", _landCoverGroup);
-            conf.addIfSet("land_cover_lod",   _landCoverLOD);
+            
             return conf;
         }
 
     protected:
-        void mergeConfig( const Config& conf ) {
-            DriverConfigOptions::mergeConfig( conf );
+        virtual void mergeConfig( const Config& conf ) {
+            ConfigOptions::mergeConfig( conf );
             fromConfig( conf );
         }
 
     private:
         void fromConfig( const Config& conf ) {
 
+            _code.clear();
+            _samplers.clear();
+            _uniforms.clear();
+
             ConfigSet s = conf.children("code");
             for(ConfigSet::const_iterator i = s.begin(); i != s.end(); ++i) {
                 _code.push_back(Code());
                 _code.back()._source = i->value();
-                i->getIfSet("url", _code.back()._uri);
+                i->get("url", _code.back()._uri);
             }
 
             s = conf.children("sampler");
@@ -146,7 +142,7 @@
                 }
                 else {
                    optional<URI> uri;
-                   i->getIfSet("url", uri);
+                   i->get("url", uri);
                    if ( uri.isSet() )
                        _samplers.back()._uris.push_back( uri.get() );
                 }
@@ -156,19 +152,13 @@
             for(ConfigSet::const_iterator i = s.begin(); i != s.end(); ++i) {
                 _uniforms.push_back(Uniform());
                 _uniforms.back()._name = i->value("name");
-                i->getIfSet("value", _uniforms.back()._value);
+                i->get("value", _uniforms.back()._value);
             }
-            
-            //conf.getIfSet("land_cover", _landCover);
-            conf.getIfSet("land_cover_group", _landCoverGroup);
-            conf.getIfSet("land_cover_lod",   _landCoverLOD);
         }
 
         std::vector<Code>     _code;
         std::vector<Sampler>  _samplers;
         std::vector<Uniform>  _uniforms;
-        optional<std::string> _landCoverGroup;
-        optional<unsigned>    _landCoverLOD;
     };
 
 } } // namespace osgEarth::TerrainShader
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilecache/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilecache/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilecache/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilecache/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,15 @@
+SET(TARGET_SRC
+    ReaderWriterTileCache.cpp
+)
+SET(TARGET_H
+    TileCacheOptions
+)
+
+SET(TARGET_COMMON_LIBRARIES ${TARGET_COMMON_LIBRARIES} osgEarthUtil)
+
+SETUP_PLUGIN(osgearth_tilecache)
+
+# to install public driver includes:
+SET(LIB_NAME tilecache)
+SET(LIB_PUBLIC_HEADERS TileCacheOptions)
+INCLUDE(ModuleInstallOsgEarthDriverIncludes OPTIONAL)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilecache/ReaderWriterTileCache.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilecache/ReaderWriterTileCache.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilecache/ReaderWriterTileCache.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilecache/ReaderWriterTileCache.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,131 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include <osgEarth/TileSource>
+#include <osgEarth/Registry>
+#include <osgEarth/ImageToHeightFieldConverter>
+#include <osgEarth/FileUtils>
+#include <osgEarth/URI>
+
+#include <osg/Notify>
+#include <osgDB/FileNameUtils>
+#include <osgDB/FileUtils>
+#include <osgDB/Registry>
+#include <osgDB/ReadFile>
+#include <osgDB/WriteFile>
+
+#include "TileCacheOptions"
+
+#include <sstream>
+
+using namespace osgEarth;
+using namespace osgEarth::Drivers;
+
+
+class TileCacheSource : public TileSource
+{
+public:
+    TileCacheSource( const TileSourceOptions& options ) 
+        : TileSource( options ), _options( options )
+    {
+    }
+
+    Status initialize( const osgDB::Options* dbOptions )
+    {
+        _dbOptions = Registry::instance()->cloneOrCreateOptions(dbOptions);        
+
+        if ( !getProfile() )
+        {
+            // Assume it is global-geodetic
+            setProfile( osgEarth::Registry::instance()->getGlobalGeodeticProfile() );
+        }
+
+        return STATUS_OK;
+    }
+
+    osg::Image* createImage( const TileKey& key, ProgressCallback* progress)
+    {
+        unsigned int level, tile_x, tile_y;
+        level = key.getLevelOfDetail();
+        key.getTileXY( tile_x, tile_y );
+
+        unsigned int numCols, numRows;
+        key.getProfile()->getNumTiles(level, numCols, numRows);
+        
+        // need to invert the y-tile index
+        tile_y = numRows - tile_y - 1;
+
+        char buf[2048];
+        sprintf( buf, "%s/%s/%02d/%03d/%03d/%03d/%03d/%03d/%03d.%s",
+            _options.url()->full().c_str(),
+            _options.layer()->c_str(),
+            level,
+            (tile_x / 1000000),
+            (tile_x / 1000) % 1000,
+            (tile_x % 1000),
+            (tile_y / 1000000),
+            (tile_y / 1000) % 1000,
+            (tile_y % 1000),
+            _options.format()->c_str() );
+
+       
+        std::string path(buf);
+        return URI(path).readImage( _dbOptions.get(), progress ).releaseImage();
+    }
+
+    virtual std::string getExtension()  const 
+    {
+        return _options.format().value();
+    }
+
+private:
+    const TileCacheOptions       _options;
+    osg::ref_ptr<osgDB::Options> _dbOptions;
+};
+
+// Reads tiles from a TileCache disk cache.
+class TileCacheSourceFactory : public TileSourceDriver
+{
+    public:
+        TileCacheSourceFactory() {}
+
+        virtual const char* className() const
+        {
+            return "TileCache disk cache ReaderWriter";
+        }
+        
+        virtual bool acceptsExtension(const std::string& extension) const
+        {
+            return osgDB::equalCaseInsensitive( extension, "osgearth_tilecache" );
+        }
+
+        virtual ReadResult readObject(const std::string& file_name, const Options* options) const
+        {
+            std::string ext = osgDB::getFileExtension( file_name );
+            if ( !acceptsExtension( ext ) )
+            {
+                return ReadResult::FILE_NOT_HANDLED;
+            }
+
+            return new TileCacheSource( getTileSourceOptions(options) );
+        }
+};
+
+REGISTER_OSGPLUGIN(osgearth_tilecache, TileCacheSourceFactory)
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilecache/TileCacheOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilecache/TileCacheOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilecache/TileCacheOptions	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilecache/TileCacheOptions	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,79 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_DRIVER_TILECACHE_DRIVEROPTIONS
+#define OSGEARTH_DRIVER_TILECACHE_DRIVEROPTIONS 1
+
+#include <osgEarth/Common>
+#include <osgEarth/TileSource>
+
+namespace osgEarth { namespace Drivers
+{
+    using namespace osgEarth;
+
+    class TileCacheOptions : public TileSourceOptions // NO EXPORT; header only
+    {
+    public:
+        optional<URI>& url() { return _url; }
+        const optional<URI>& url() const { return _url; }
+
+        optional<std::string>& layer() { return _layer; }
+        const optional<std::string>& layer() const { return _layer; }
+
+        optional<std::string>& format() { return _format; }
+        const optional<std::string>& format() const { return _format; }
+
+    public:
+        TileCacheOptions( const TileSourceOptions& opt =TileSourceOptions() ) :
+            TileSourceOptions( opt )
+        {
+            setDriver( "tilecache" );
+            fromConfig( _conf );
+        }
+
+        /** dtor */
+        virtual ~TileCacheOptions() { }
+
+    protected:
+        Config getConfig() const {
+            Config conf = TileSourceOptions::getConfig();
+            conf.set("url", _url );
+            conf.set("layer", _layer);
+            conf.set("format", _format);
+            return conf;
+        }
+        void mergeConfig( const Config& conf ) {
+            TileSourceOptions::mergeConfig( conf );
+            fromConfig( conf );
+        }
+    private:
+        void fromConfig( const Config& conf ) {
+            conf.get( "url", _url );
+            conf.get( "layer", _layer );
+            conf.get( "format", _format );
+        }
+
+        optional<URI>         _url;
+        optional<std::string> _layer;
+        optional<std::string> _format;
+    };
+
+} } // namespace osgEarth::Drivers
+
+#endif // OSGEARTH_DRIVER_TILECACHE_DRIVEROPTIONS
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tileindex/ReaderWriterTileIndex.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/tileindex/ReaderWriterTileIndex.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tileindex/ReaderWriterTileIndex.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tileindex/ReaderWriterTileIndex.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tileindex/TileIndexOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/tileindex/TileIndexOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tileindex/TileIndexOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tileindex/TileIndexOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -61,7 +61,7 @@
         }
 
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
+            conf.get( "url", _url );
         }
 
         optional<URI>                    _url;        
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilepackage/BundleReader osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilepackage/BundleReader
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilepackage/BundleReader	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilepackage/BundleReader	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,101 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_BUNDLEREADER_H
+#define OSGEARTH_BUNDLEREADER_H 1
+
+#include <fstream>
+#include <vector>
+#include <sstream>
+
+#include <osgDB/FileNameUtils>
+#include <osgDB/FileUtils>
+
+#include <osgEarth/Notify>
+#include <osgEarth/StringUtils>
+#include <osgEarth/ImageUtils>
+#include <osgEarth/TileKey>
+
+using namespace osgEarth;
+
+#define INDEX_HEADER_SIZE 16
+#define INDEX_SIZE 5
+
+namespace
+{
+    unsigned int  computeOffset(const std::vector<char>& buffer) {
+        unsigned int sum = 0;
+        for (unsigned int i = 0; i < buffer.size(); i++) {
+            char v = buffer[i];
+            sum += ((unsigned int)v & 0xff) * pow(2.0, 8.0 * i);
+        }
+        return sum;
+    }
+
+    unsigned int hexFromString(const std::string& input)
+    {
+        unsigned int result;
+        std::stringstream ss;
+        ss << std::hex << input;
+        ss >> result;
+        return result;
+    }
+
+    std::string toHex(unsigned int value)
+    {
+        std::stringstream ss;
+        ss << std::hex << value;
+        return ss.str();
+    }
+}
+
+
+class BundleReader
+{
+public:
+    BundleReader(const std::string& bundleFile, unsigned int bundleSize);
+
+    void init();
+
+    /**
+    * Reads the index of a bundle file.
+    */
+    void readIndex(const std::string& filename, std::vector<int>& index);
+
+    osg::Image* readImage(const TileKey& key);
+
+    osg::Image* readImage(unsigned int index);
+
+protected:
+    std::string _bundleFile;
+    std::string _indexFile;
+    unsigned int _bundleSize;
+
+    std::ifstream _in;
+
+    std::vector< int > _index;
+
+    unsigned int _lod;
+    unsigned int _rowOffset;
+    unsigned int _colOffset;
+};
+
+
+
+#endif // OSGEARTH_BUNDLEREADER_H
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilepackage/BundleReader.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilepackage/BundleReader.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilepackage/BundleReader.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilepackage/BundleReader.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,103 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#include "BundleReader"
+
+BundleReader::BundleReader(const std::string& bundleFile, unsigned int bundleSize) :
+    _bundleFile(bundleFile),
+    _lod(0),
+    _colOffset(0),
+    _rowOffset(0),
+    _bundleSize(bundleSize)
+{
+    init();
+}
+
+void BundleReader::init()
+{
+
+    std::string base = osgDB::getNameLessExtension(_bundleFile);
+    _indexFile = base + ".bundlx";
+
+    // Open the bundle
+    _in.open(_bundleFile.c_str(), std::ofstream::binary);
+
+    // Read the index
+    readIndex(_indexFile, _index);
+
+    std::string baseName = osgDB::getSimpleFileName(base);
+
+    _rowOffset = hexFromString(baseName.substr(1, 4));
+    _colOffset = hexFromString(baseName.substr(6, 4));
+
+    std::string path = osgDB::getFilePath(_bundleFile);
+
+    std::string levelDir = osgDB::getSimpleFileName(path);
+    _lod = as<unsigned int>(levelDir.substr(1, 2), 0);
+}
+
+/**
+* Reads the index of a bundle file.
+*/
+void BundleReader::readIndex(const std::string& filename, std::vector<int>& index)
+{
+    std::ifstream input(filename.c_str(), std::ifstream::binary);
+    char header[INDEX_HEADER_SIZE];
+    input.read(header, INDEX_HEADER_SIZE);
+    while (input.good()) {
+        std::vector<char> buffer;
+        buffer.resize(5);
+        if (input.read(&buffer[0], INDEX_SIZE))
+        {
+            int offset = computeOffset(buffer);
+            index.push_back(offset);
+        }
+    }
+}
+
+osg::Image* BundleReader::readImage(const TileKey& key)
+{
+    // Figure out the index for the tilekey
+    unsigned int row = key.getTileX() - _colOffset;
+    unsigned int i = key.getTileY() - _rowOffset + (row * _bundleSize);
+    return readImage(i);
+}
+
+osg::Image* BundleReader::readImage(unsigned int index)
+{
+    if (index < 0 || index > _index.size()) return 0;
+
+    _in.seekg(_index[index], std::ios::beg);
+    std::vector<char> sizeBuffer;
+    sizeBuffer.resize(4);
+    _in.read(&sizeBuffer[0], 4);
+    int size = computeOffset(sizeBuffer);
+    if (size > 0)
+    {
+        std::string image;
+        image.resize(size);
+        _in.read(&image[0], size);
+        std::stringstream ss(image);
+        return ImageUtils::readStream(ss, 0);
+    }
+
+    return 0;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilepackage/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilepackage/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilepackage/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilepackage/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,18 @@
+
+SET(TARGET_SRC
+    BundleReader.cpp
+    ReaderWriterTilePackage.cpp
+)
+
+# headers to show in IDE
+SET(TARGET_H    
+    BundleReader
+    TilePackageOptions
+)
+
+SETUP_PLUGIN(osgearth_tilepackage)
+
+# to install public driver includes:
+SET(LIB_NAME tilepackage)
+SET(LIB_PUBLIC_HEADERS TilePackageOptions)
+INCLUDE(ModuleInstallOsgEarthDriverIncludes OPTIONAL)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilepackage/ReaderWriterTilePackage.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilepackage/ReaderWriterTilePackage.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilepackage/ReaderWriterTilePackage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilepackage/ReaderWriterTilePackage.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,226 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#include "TilePackageOptions"
+#include "BundleReader"
+
+#include <osgEarth/TileSource>
+#include <osgEarth/Registry>
+#include <osgEarth/URI>
+#include <osgEarth/XmlUtils>
+
+#include <osg/Notify>
+#include <osgDB/FileNameUtils>
+#include <osgDB/FileUtils>
+#include <osgDB/Registry>
+#include <osgDB/ReadFile>
+#include <osgDB/WriteFile>
+
+using namespace osgEarth;
+using namespace osgEarth::Drivers;
+
+#define LC "[ReaderWriterTilePackage] "
+
+std::string padLeft(std::string value, unsigned int length)
+{
+    std::stringstream ss;
+    if (value.size() < length)
+    {
+        for (unsigned int i = 0; i < (length - value.size()); i++)
+        {
+            ss << "0";
+        }
+        ss << value;
+        return ss.str();
+    }
+    else
+    {
+        return value;
+    }
+}
+
+
+/**
+ *  TileSource that reads tiles from ArcGIS TilePackage format.  This currently only supports the exploded (aka unzipped) version.
+ *  Thanks to https://github.com/consbio/tpkutils/tree/master/tpkutils for providing a great reference implementation
+ */
+class TilePackageSource : public TileSource
+{
+public:
+    TilePackageSource(const TileSourceOptions& options) :
+        TileSource(options),
+        _options(options),
+        _profileConf(ProfileOptions()),
+        _tileSize(256),
+        _bundleSize(128),
+        _extension("png")
+    {
+    }
+
+    // override
+    Status initialize(const osgDB::Options* dbOptions)
+    {
+
+        _dbOptions = Registry::instance()->cloneOrCreateOptions(dbOptions);
+
+        readConf();
+
+        // establish a profile if we don't already have one:
+        if (!getProfile())
+        {
+            const Profile* profile = NULL;
+
+            if (_profileConf.isSet())
+            {
+                profile = Profile::create(_profileConf.get());
+            }
+            else
+            {
+                // finally, fall back on mercator
+                profile = osgEarth::Registry::instance()->getSphericalMercatorProfile();
+            }
+            setProfile(profile);
+        }
+
+        return STATUS_OK;
+    }
+
+    /**
+     * Reads layer info from the the conf file if it exists.
+     */
+    void readConf()
+    {    
+        std::string confPath = _options.url()->full() + "/conf.xml";
+
+        osg::ref_ptr<XmlDocument> doc = XmlDocument::load(confPath);
+        if (doc.valid())
+        {
+            Config conf = doc->getConfig();
+            Config tileCacheInfo = conf.child("cacheinfo").child("tilecacheinfo");
+            std::string wkt = tileCacheInfo.child("spatialreference").value("wkt");
+            if (!wkt.empty())
+            {
+                SpatialReference* srs = SpatialReference::create(wkt);
+                if (srs)
+                {
+                    if (srs->isMercator())
+                    {                 
+                        setProfile(osgEarth::Registry::instance()->getSphericalMercatorProfile());
+                    }
+                    else
+                    {
+                        setProfile(osgEarth::Registry::instance()->getGlobalGeodeticProfile());
+                    }
+                }
+            }
+
+            _tileSize = as<unsigned int>(tileCacheInfo.value("tilecols"), 256);
+
+            std::string format = conf.child("cacheinfo").child("tileimageinfo").value("cachetileformat");
+            if (format == "JPEG")
+            {
+                _extension = "jpg";
+            }
+            // All other cases will use png, this includes mixed mode.
+            else
+            {
+                _extension = "png";
+            }
+
+            _bundleSize = as<unsigned int>(conf.child("cacheinfo").child("cachestorageinfo").value("packetsize"), 128);
+        }
+    }
+
+    // override
+    int getPixelsPerTile() const
+    {
+        return _tileSize;
+    }
+
+    // override
+    osg::Image* createImage(const TileKey& key, ProgressCallback* progress)
+    {
+        // Try to figure out which bundle file the incoming tilekey is in.
+        unsigned int numWide, numHigh;
+        getProfile()->getNumTiles(key.getLevelOfDetail(), numWide, numHigh);
+
+        std::stringstream buf;
+        buf << _options.url()->full() << "/_alllayers/";
+        buf << "L" << padLeft(toString<unsigned int>(key.getLevelOfDetail()), 2) << "/";
+
+        unsigned int colOffset = static_cast<unsigned int>(floor(static_cast<double>(key.getTileX() / _bundleSize) * _bundleSize));
+        unsigned int rowOffset = static_cast<unsigned int>(floor(static_cast<double>(key.getTileY() / _bundleSize) * _bundleSize));
+
+        buf << "R" << padLeft(toHex(rowOffset), 4) << "C" << padLeft(toHex(colOffset), 4);
+        buf << ".bundle";
+
+        std::string bundleFile = buf.str();
+        if (osgDB::fileExists(bundleFile))
+        {
+            BundleReader reader(bundleFile, _bundleSize);
+            osg::Image* result = reader.readImage(key);
+            return result;
+        }
+
+        return 0;
+    }
+
+    // override
+    virtual std::string getExtension() const
+    {
+        return _extension;
+    }
+
+private:
+    const TilePackageOptions _options;
+    optional<ProfileOptions> _profileConf;
+    osg::ref_ptr<osgDB::Options> _dbOptions;
+    unsigned int _tileSize;
+    std::string _extension;
+    unsigned int _bundleSize;
+};
+
+
+class TilePackageTileSourceFactory : public TileSourceDriver
+{
+public:
+    TilePackageTileSourceFactory()
+    {
+        supportsExtension("osgearth_tilepackage", "TilePackage");
+    }
+
+    virtual const char* className() const
+    {
+        return "TilePackage ReaderWriter";
+    }
+
+    virtual ReadResult readObject(const std::string& file_name, const Options* options) const
+    {
+        if (!acceptsExtension(osgDB::getLowerCaseFileExtension(file_name)))
+            return ReadResult::FILE_NOT_HANDLED;
+
+        return new TilePackageSource(getTileSourceOptions(options));
+    }
+};
+
+REGISTER_OSGPLUGIN(osgearth_tilepackage, TilePackageTileSourceFactory)
+
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilepackage/TilePackageOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilepackage/TilePackageOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tilepackage/TilePackageOptions	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tilepackage/TilePackageOptions	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,70 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_DRIVER_TILEPACKAGE_DRIVEROPTIONS
+#define OSGEARTH_DRIVER_TILEPACKAGE_DRIVEROPTIONS 1
+
+#include <osgEarth/Common>
+#include <osgEarth/TileSource>
+#include <osgEarth/URI>
+
+namespace osgEarth { namespace Drivers
+{
+    using namespace osgEarth;
+
+    class TilePackageOptions : public TileSourceOptions // NO EXPORT; header only
+    {
+    public:
+        /** URL of the MapService */
+        optional<URI>& url() { return _url; }
+        const optional<URI>& url() const { return _url; }        
+
+    public:
+        TilePackageOptions( const TileSourceOptions& opt =TileSourceOptions() ) : TileSourceOptions( opt )
+        {
+            setDriver( "tilepackage" );
+            fromConfig( _conf );
+        }
+
+        /** dtor */
+        virtual ~TilePackageOptions() { }
+
+    public:
+        Config getConfig() const {
+            Config conf = TileSourceOptions::getConfig();
+            conf.set("url", _url );
+            return conf;
+        }
+
+        void mergeConfig( const Config& conf ) {
+            TileSourceOptions::mergeConfig( conf );
+            fromConfig( conf );
+        }
+
+        void fromConfig( const Config& conf ) {
+            conf.get( "url", _url );
+        }
+
+    private:
+        optional<URI>         _url;
+    };
+
+} } // namespace osgEarth::Drivers
+
+#endif // OSGEARTH_DRIVER_TILEPACKAGE_DRIVEROPTIONS
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tms/TMSOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/tms/TMSOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tms/TMSOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tms/TMSOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -85,9 +85,9 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
-            conf.getIfSet( "format", _format );
-            conf.getIfSet( "tms_type", _tmsType );
+            conf.get( "url", _url );
+            conf.get( "format", _format );
+            conf.get( "tms_type", _tmsType );
         }
 
         optional<URI>         _url;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tms/TMSPlugin.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/tms/TMSPlugin.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tms/TMSPlugin.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tms/TMSPlugin.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tms/TMSTileSource osgearth-2.10.2+dfsg/src/osgEarthDrivers/tms/TMSTileSource
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tms/TMSTileSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tms/TMSTileSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/tms/TMSTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/tms/TMSTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/tms/TMSTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/tms/TMSTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -119,7 +119,7 @@
 
         if (!_tileMap.valid())
         {
-            return Status::Error( Status::ResourceUnavailable, Stringify() << "Failed to read tilemap from " << tmsURI.full() );
+            return Status::Error( Status::ResourceUnavailable, Stringify() << "Failed to read configuration from " << tmsURI.full() );
         }
 
         OE_INFO << LC
@@ -155,27 +155,7 @@
             {
                 this->getDataExtents().push_back(*itr);
             }
-        }
-        else
-        {
-            
-            GeoExtent extent;
-
-            // Push back a single area that covers the "bounds" present in the TMS dataset.
-            if (_tileMap.valid())
-            {
-                double minX, minY, maxX, maxY;
-                _tileMap->getExtents(minX, minY, maxX, maxY);
-                extent = GeoExtent(profile->getSRS(), minX, minY, maxX, maxY);
-            }
-
-            // If the extent isn't valid, use the profile's extent.
-            if (!extent.isValid() || extent.width() <= 0.0 || extent.height() <= 0.0 )
-            {
-                extent = profile->getExtent();
-            }
-            this->getDataExtents().push_back(DataExtent(extent, 0, _tileMap->getMaxLevel()));
-        }
+        }        
     }
     return STATUS_OK;
 }
@@ -218,8 +198,9 @@
 
         osg::ref_ptr<osg::Image> image;
         if (!image_url.empty())
-        {
-            image = URI(image_url).readImage( _dbOptions.get(), progress ).getImage();
+        {     
+            URI uri(image_url, _options.url()->context());
+            image = uri.readImage( _dbOptions.get(), progress ).getImage();
         }
 
         if (!image.valid())
@@ -238,7 +219,7 @@
         
         if (image.valid() && _options.coverage() == true)
         {
-            image->setInternalTextureFormat(GL_LUMINANCE32F_ARB);
+            image->setInternalTextureFormat(GL_R16F);
             ImageUtils::markAsUnNormalized(image.get(), true);
         }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm2008/EGM2008.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm2008/EGM2008.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm2008/EGM2008.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm2008/EGM2008.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm2008/EGM2008Grid.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm2008/EGM2008Grid.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm2008/EGM2008Grid.h	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm2008/EGM2008Grid.h	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm84/EGM84.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm84/EGM84.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm84/EGM84.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm84/EGM84.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm84/EGM84Grid.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm84/EGM84Grid.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm84/EGM84Grid.h	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm84/EGM84Grid.h	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm96/EGM96.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm96/EGM96.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm96/EGM96.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm96/EGM96.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm96/EGM96Grid.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm96/EGM96Grid.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/vdatum_egm96/EGM96Grid.h	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/vdatum_egm96/EGM96Grid.h	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsExtension osgearth-2.10.2+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsExtension
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsExtension	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsExtension	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@
                                 public ConfigOptions
     {
     public:
-        META_Object(osgearth_ext_viewpoints, ViewpointsExtension);
+        META_OE_Extension(osgEarth, ViewpointsExtension, viewpoints);
 
         // CTORs
         ViewpointsExtension();
@@ -72,10 +72,6 @@
 
         bool disconnect(Control* control);
 
-
-    protected: // Object
-        ViewpointsExtension(const ViewpointsExtension& rhs, const osg::CopyOp& op) { }
-
     private:
         osg::ref_ptr<const osgDB::Options>   _dbOptions;
         osg::ref_ptr<osgGA::GUIEventHandler> _handler;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsExtension.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsExtension.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsExtension.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsExtension.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -130,6 +130,7 @@
         {
             // the viewpoint container:
             grid = new Grid();
+            grid->setBackColor(osg::Vec4(0,0,0,0.1));
             grid->setChildSpacing( 0 );
             grid->setChildVertAlign( Control::ALIGN_CENTER );
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsPlugin.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsPlugin.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsPlugin.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/viewpoints/ViewpointsPlugin.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/vpb/ReaderWriterVPB.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/vpb/ReaderWriterVPB.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/vpb/ReaderWriterVPB.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/vpb/ReaderWriterVPB.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/vpb/VPBOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/vpb/VPBOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/vpb/VPBOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/vpb/VPBOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -99,9 +99,9 @@
             conf.set("base_name", _baseName );
             conf.set("terrain_tile_cache_size", _terrainTileCacheSize);
             if ( _dirStruct.isSet() ) {
-                if ( _dirStruct == DS_FLAT ) conf.update("directory_structure", "flat");
-                else if ( _dirStruct == DS_TASK ) conf.update("directory_structure", "task");
-                else if ( _dirStruct == DS_NESTED ) conf.update("directory_structure", "nested");
+                if ( _dirStruct == DS_FLAT ) conf.set("directory_structure", "flat");
+                else if ( _dirStruct == DS_TASK ) conf.set("directory_structure", "task");
+                else if ( _dirStruct == DS_NESTED ) conf.set("directory_structure", "nested");
             }
             return conf;
         }
@@ -114,15 +114,15 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet("url", _url);
-            conf.getIfSet("primary_split_level", _primarySplitLevel);
-            conf.getIfSet("secondary_split_level", _secondarySplitLevel);
-            conf.getIfSet("layer", _layer);
-            conf.getIfSet("layer_setname", _layerSetName);
-            conf.getIfSet("num_tiles_wide_at_lod_0", _widthLod0 );
-            conf.getIfSet("num_tiles_high_at_lod_0", _heightLod0 );
-            conf.getIfSet("base_name", _baseName);
-            conf.getIfSet("terrain_tile_cache_size", _terrainTileCacheSize);
+            conf.get("url", _url);
+            conf.get("primary_split_level", _primarySplitLevel);
+            conf.get("secondary_split_level", _secondarySplitLevel);
+            conf.get("layer", _layer);
+            conf.get("layer_setname", _layerSetName);
+            conf.get("num_tiles_wide_at_lod_0", _widthLod0 );
+            conf.get("num_tiles_high_at_lod_0", _heightLod0 );
+            conf.get("base_name", _baseName);
+            conf.get("terrain_tile_cache_size", _terrainTileCacheSize);
             
             std::string ds = conf.value("directory_structure");
             if ( ds == "flat" ) _dirStruct = DS_FLAT;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/wcs/ReaderWriterWCS.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/wcs/ReaderWriterWCS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/wcs/ReaderWriterWCS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/wcs/ReaderWriterWCS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/wcs/WCS11Source.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/wcs/WCS11Source.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/wcs/WCS11Source.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/wcs/WCS11Source.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/wcs/WCS11Source.h osgearth-2.10.2+dfsg/src/osgEarthDrivers/wcs/WCS11Source.h
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/wcs/WCS11Source.h	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/wcs/WCS11Source.h	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/wcs/WCSOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/wcs/WCSOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/wcs/WCSOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/wcs/WCSOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -81,12 +81,12 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet("url", _url);
-            conf.getIfSet("identifier", _identifier);
-            conf.getIfSet("format", _format);
-            conf.getIfSet("elevation_unit", _elevationUnit);
-            conf.getIfSet("srs", _srs);
-            conf.getIfSet("range_subset", _rangeSubset);
+            conf.get("url", _url);
+            conf.get("identifier", _identifier);
+            conf.get("format", _format);
+            conf.get("elevation_unit", _elevationUnit);
+            conf.get("srs", _srs);
+            conf.get("range_subset", _rangeSubset);
         }
 
         optional<URI>         _url;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/webp/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthDrivers/webp/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/webp/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/webp/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,15 @@
+IF(WEBP_FOUND)
+
+find_package(WEBP REQUIRED)
+
+SET(TARGET_SRC
+	ReaderWriterWebP.cpp
+)
+
+INCLUDE_DIRECTORIES( ${WEBP_INCLUDE_DIR} )
+
+SET(TARGET_COMMON_LIBRARIES ${TARGET_COMMON_LIBRARIES} ${WEBP_LIBRARY})
+
+SETUP_PLUGIN(webp)
+
+ENDIF(WEBP_FOUND)
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/webp/ReaderWriterWebP.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/webp/ReaderWriterWebP.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/webp/ReaderWriterWebP.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/webp/ReaderWriterWebP.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,342 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#include <osg/Image>
+#include <osg/Notify>
+
+#include <osg/Geode>
+
+#include <osg/GL>
+
+#include <osgDB/FileNameUtils>
+#include <osgDB/FileUtils>
+#include <osgDB/Registry>
+
+#include <string>
+#include <sstream>
+#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+#include <iomanip>
+
+#include "webp/encode.h"
+#include "webp/decode.h"
+
+#if TARGET_OS_IPHONE
+#include "strings.h"
+#define stricmp strcasecmp
+#endif
+
+using namespace osg;
+
+class ReaderWriterWebP : public osgDB::ReaderWriter
+{
+public:
+  ReaderWriterWebP()
+  {
+    supportsExtension("webp", "WebP image format");
+  }
+
+  ~ReaderWriterWebP()
+  {
+  }
+
+  virtual const char *className() const { return "Google WebP Image Reader/Writer"; }
+
+  virtual ReadResult readObject(const std::string &file, const osgDB::ReaderWriter::Options *options) const
+  {
+    return readImage(file, options);
+  }
+
+  virtual ReadResult readObject(std::istream &fin, const Options *options) const
+  {
+    return readImage(fin, options);
+  }
+
+  virtual ReadResult readImage(const std::string &file, const osgDB::ReaderWriter::Options *options) const
+  {
+    std::string ext = osgDB::getFileExtension(file);
+    if (!acceptsExtension(ext))
+      return ReadResult::FILE_NOT_HANDLED;
+
+    std::string fileName = osgDB::findDataFile(file, options);
+    if (fileName.empty())
+      return ReadResult::FILE_NOT_FOUND;
+
+    osgDB::ifstream f(file.c_str(), std::ios_base::in | std::ios_base::binary);
+    if (!f)
+      return ReadResult::FILE_NOT_HANDLED;
+
+    ReadResult rr = readImage(f, options);
+
+    if (rr.validImage())
+      rr.getImage()->setFileName(file);
+    return rr;
+  }
+
+  virtual ReadResult readImage(std::istream &fin, const Options *options) const
+  {
+    Image *image = NULL;
+    unsigned long size_of_vp8_image_data = 0;
+    char *vp8_buffer = NULL;
+
+    fin.seekg(0, std::ios::end);
+    size_t stream_size = fin.tellg();
+    fin.seekg(0, std::ios::beg);
+
+    if (stream_size > 0)
+    {
+
+      size_of_vp8_image_data = stream_size;
+      vp8_buffer = new char[stream_size];
+
+      int version = WebPGetEncoderVersion();
+      size_of_vp8_image_data = fin.read(vp8_buffer, size_of_vp8_image_data).gcount();
+
+      WebPDecoderConfig config;
+      WebPInitDecoderConfig(&config);
+      int status = WebPGetFeatures((const uint8_t *)vp8_buffer, (uint32_t)size_of_vp8_image_data, &config.input);
+      if (status == VP8_STATUS_OK)
+      {
+
+        unsigned int pixelFormat;
+        unsigned int dataType = GL_UNSIGNED_BYTE;
+
+        if (config.input.has_alpha)
+        {
+          pixelFormat = GL_RGBA;
+          config.output.colorspace = MODE_RGBA;
+        }
+        else
+        {
+          /*
+            BUG of AMD driver: http://devgurus.amd.com/message/1302663
+            pixelFormat = GL_RGB;
+            config.output.colorspace = MODE_RGB;
+            */
+          pixelFormat = GL_RGBA;
+          config.output.colorspace = MODE_RGBA;
+        }
+        int internalFormat = pixelFormat;
+        int r = 1;
+
+        image = new Image();
+        image->allocateImage(config.input.width, config.input.height, 1, pixelFormat, dataType);
+
+        config.output.u.RGBA.rgba = (uint8_t *)image->data();
+        config.output.u.RGBA.stride = image->getRowSizeInBytes();
+        config.output.u.RGBA.size = image->getImageSizeInBytes();
+
+        config.options.no_fancy_upsampling = 1;
+
+        config.output.is_external_memory = 1;
+
+        status = WebPDecode((const uint8_t *)vp8_buffer, (uint32_t)size_of_vp8_image_data, &config);
+      }
+      delete[] vp8_buffer;
+    }
+    else
+    {
+      OSG_NOTICE << "read webp image: stream size is zero" << std::endl;
+    }
+
+    return image;
+  }
+
+  virtual WriteResult writeObject(const osg::Object &object, const std::string &file, const osgDB::ReaderWriter::Options *options) const
+  {
+    const osg::Image *image = dynamic_cast<const osg::Image *>(&object);
+    if (!image)
+      return WriteResult::FILE_NOT_HANDLED;
+
+    return writeImage(*image, file, options);
+  }
+
+  virtual WriteResult writeObject(const osg::Object &object, std::ostream &fout, const Options *options) const
+  {
+    const osg::Image *image = dynamic_cast<const osg::Image *>(&object);
+    if (!image)
+      return WriteResult::FILE_NOT_HANDLED;
+
+    return writeImage(*image, fout, options);
+  }
+
+  virtual WriteResult writeImage(const osg::Image &img, const std::string &fileName, const osgDB::ReaderWriter::Options *options) const
+  {
+    std::string ext = osgDB::getFileExtension(fileName);
+    if (!acceptsExtension(ext))
+      return WriteResult::FILE_NOT_HANDLED;
+
+    int internalFormat = osg::Image::computeNumComponents(img.getPixelFormat());
+
+    osgDB::ofstream f(fileName.c_str(), std::ios_base::out | std::ios_base::binary | std::ios_base::trunc);
+    if (!f)
+      return WriteResult::ERROR_IN_WRITING_FILE;
+
+    return writeImage(img, f, options);
+  }
+
+  static int ostream_writer(const uint8_t *data, size_t data_size,
+                            const WebPPicture *const pic)
+  {
+
+    std::ostream *const out = (std::ostream *)pic->custom_ptr;
+    return data_size ? (int)out->write((const char *)data, data_size).tellp() : 1;
+  }
+
+  WriteResult writeImage(const osg::Image &img, std::ostream &fout, const Options *options) const
+  {
+    int internalFormat = osg::Image::computeNumComponents(img.getPixelFormat());
+
+    WebPConfig config;
+    config.quality = 75;
+    config.method = 2;
+
+    if (options)
+    {
+      std::istringstream iss(options->getOptionString());
+      std::string opt;
+      while (iss >> opt)
+      {
+        if (strcmp(opt.c_str(), "lossless") == 0)
+        {
+          config.lossless = 1;
+          config.quality = 100;
+        }
+        else if (strcmp(opt.c_str(), "hint") == 0)
+        {
+          std::string v;
+          iss >> v;
+          if (strcmp(v.c_str(), "picture") == 0)
+          {
+            config.image_hint = WEBP_HINT_PICTURE;
+          }
+          else if (strcmp(v.c_str(), "photo") == 0)
+          {
+            config.image_hint = WEBP_HINT_PHOTO;
+          }
+          else if (strcmp(v.c_str(), "graph") == 0)
+          {
+            config.image_hint = WEBP_HINT_GRAPH;
+          }
+        }
+        else if (strcmp(opt.c_str(), "quality") == 0)
+        {
+          float v;
+          iss >> v;
+          if (v >= 0.0 && v <= 100.0)
+          {
+            config.quality = v;
+          }
+        }
+        else if (strcmp(opt.c_str(), "method") == 0)
+        {
+          int v;
+          iss >> v;
+          if (v >= 0 && v <= 6)
+          {
+            config.method = v;
+          }
+        }
+      }
+    }
+
+    WebPPicture picture;
+    WebPPreset preset;
+
+    if (!WebPPictureInit(&picture) || !WebPConfigInit(&config))
+    {
+      return WriteResult::ERROR_IN_WRITING_FILE;
+    }
+
+    picture.width = img.s();
+    picture.height = img.t();
+
+    switch (img.getPixelFormat())
+    {
+    case (GL_RGB):
+      WebPPictureImportRGB(&picture, img.data(), img.getRowSizeInBytes());
+      break;
+    case (GL_RGBA):
+      WebPPictureImportRGBA(&picture, img.data(), img.getRowSizeInBytes());
+      break;
+    case (GL_LUMINANCE):
+      WebPPictureImportRGBX(&picture, img.data(), img.getRowSizeInBytes());
+      break;
+    default:
+      return WriteResult::ERROR_IN_WRITING_FILE;
+      break;
+    }
+
+    switch (img.getPixelFormat())
+    {
+    case (GL_RGB):
+    case (GL_RGBA):
+      preset = WEBP_PRESET_PHOTO;
+      if (!WebPConfigPreset(&config, preset, config.quality))
+      {
+        return WriteResult::ERROR_IN_WRITING_FILE;
+      }
+
+      if (!WebPValidateConfig(&config))
+      {
+        return WriteResult::ERROR_IN_WRITING_FILE;
+      }
+
+      picture.writer = ReaderWriterWebP::ostream_writer;
+      picture.custom_ptr = (void *)&fout;
+      if (!WebPEncode(&config, &picture))
+      {
+        return WriteResult::ERROR_IN_WRITING_FILE;
+      }
+      break;
+    case (GL_LUMINANCE):
+      preset = WEBP_PRESET_DEFAULT;
+      if (!WebPConfigPreset(&config, preset, config.quality))
+      {
+        return WriteResult::ERROR_IN_WRITING_FILE;
+      }
+      config.lossless = 1;
+
+      if (!WebPValidateConfig(&config))
+      {
+        return WriteResult::ERROR_IN_WRITING_FILE;
+      }
+
+      picture.writer = ReaderWriterWebP::ostream_writer;
+      picture.custom_ptr = (void *)&fout;
+      if (!WebPEncode(&config, &picture))
+      {
+        return WriteResult::ERROR_IN_WRITING_FILE;
+      }
+      break;
+
+    default:
+      return WriteResult::ERROR_IN_WRITING_FILE;
+      break;
+    }
+
+    WebPPictureFree(&picture);
+    return WriteResult::FILE_SAVED;
+  }
+};
+
+// now register with Registry to instantiate the above
+// reader/writer.
+REGISTER_OSGPLUGIN(webp, ReaderWriterWebP)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/wms/ReaderWriterWMS.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/wms/ReaderWriterWMS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/wms/ReaderWriterWMS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/wms/ReaderWriterWMS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -46,6 +46,8 @@
 using namespace osgEarth::Util;
 using namespace osgEarth::Drivers;
 
+//#define SUPPORT_JPL_TILESERVICE
+
 //----------------------------------------------------------------------------
 
 namespace
@@ -114,7 +116,7 @@
         }
 
         //Try to read the WMS capabilities
-        osg::ref_ptr<WMSCapabilities> capabilities = WMSCapabilitiesReader::read( capUrl.full(), dbOptions );
+        osg::ref_ptr<WMSCapabilities> capabilities = WMSCapabilitiesReader::read( capUrl, dbOptions );
         if ( !capabilities.valid() )
         {
             return Status::Error( Status::ResourceUnavailable, "Unable to read WMS GetCapabilities." );
@@ -180,44 +182,37 @@
         // Next, try to glean the extents from the layer list
         if ( capabilities.valid() )
         {
-            //TODO: "layers" mights be a comma-separated list. need to loop through and
-            //combine the extents?? yes
-            WMSLayer* layer = capabilities->getLayerByName( _options.layers().value() );
-            if ( layer )
-            {
-                double minx, miny, maxx, maxy;                
-                minx = miny = maxx = maxy = 0;
-
-                //Check to see if the profile is equivalent to global-geodetic
-                if (wms_srs->isGeographic())
-                {
-                    //Try to get the lat lon extents if they are provided
-                    layer->getLatLonExtents(minx, miny, maxx, maxy);
-
-                    //If we still don't have any extents, just default to global geodetic.
-                    if (!result.valid() && minx == 0 && miny == 0 && maxx == 0 && maxy == 0)
-                    {
-                        result = osgEarth::Registry::instance()->getGlobalGeodeticProfile();
-                    }
-                }	
-
-                if (minx == 0 && miny == 0 && maxx == 0 && maxy == 0)
-                {
-                    layer->getExtents(minx, miny, maxx, maxy);
-                }
+            StringTokenizer tok(",");
+            StringVector tized;
+            tok.tokenize(_options.layers().value(), tized);
 
-
-                if (!result.valid())
+            for (StringVector::const_iterator itr = tized.begin(); itr != tized.end(); ++itr)
+            {
+                std::string layerName = *itr;
+                WMSLayer* layer = capabilities->getLayerByName(layerName);
+                if (layer)
                 {
-                    result = Profile::create( _srsToUse, minx, miny, maxx, maxy );
+                    // Get the lat/lon extents
+                    double minLon, minLat, maxLon, maxLat;
+                    layer->getLatLonExtents(minLon, minLat, maxLon, maxLat);
+                    GeoExtent wgs84Extent(SpatialReference::create("wgs84"), minLon, minLat, maxLon, maxLat);
+                    getDataExtents().push_back(DataExtent(wgs84Extent, 0));
                 }
+            }
 
-                //Add the layer extents to the list of valid areas
-                if (minx != 0 || maxx != 0 || miny != 0 || maxy != 0)
+            // If we don't have a profile yet, transform the lat/lon extents to the requested srs and use it as the extents of the profile.
+            if (!result.valid())
+            {
+                const SpatialReference* srs = SpatialReference::create(_srsToUse);
+                GeoExtent totalExtent(srs);
+                for (DataExtentList::const_iterator itr = getDataExtents().begin(); itr != getDataExtents().end(); ++itr)
                 {
-                    GeoExtent extent( result->getSRS(), minx, miny, maxx, maxy);
-                    getDataExtents().push_back( DataExtent(extent, 0) );
+                    GeoExtent dataExtent = *itr;
+                    GeoExtent nativeExtent;
+                    dataExtent.transform(srs, nativeExtent);
+                    totalExtent.expandToInclude(nativeExtent);
                 }
+                result = Profile::create(srs, totalExtent.xMin(), totalExtent.yMin(), totalExtent.xMax(), totalExtent.yMax());
             }
         }
 
@@ -225,23 +220,24 @@
         if ( !result.valid() && wms_srs->isGeographic())
         {
             result = osgEarth::Registry::instance()->getGlobalGeodeticProfile();
-        }
+        }    
 
+#ifdef SUPPORT_JPL_TILESERVICE
         // JPL uses an experimental interface called TileService -- ping to see if that's what
         // we are trying to read:
         URI tsUrl = _options.tileServiceUrl().value();
         if ( tsUrl.empty() )
         {
-            tsUrl = URI(_options.url()->full() + sep + std::string("request=GetTileService") );
+            tsUrl = URI(_options.url()->full() + sep + std::string("request=GetTileService"), tsUrl.context());
         }
 
         OE_INFO << LC << "Testing for JPL/TileService at " << tsUrl.full() << std::endl;
-        _tileService = TileServiceReader::read(tsUrl.full(), dbOptions);
-        if (_tileService.valid())
+        osg::ref_ptr<TileService> tileService = TileServiceReader::read(tsUrl.full(), dbOptions);
+        if (tileService.valid())
         {
             OE_INFO << LC << "Found JPL/TileService spec" << std::endl;
             TileService::TilePatternList patterns;
-            _tileService->getMatchingPatterns(
+            tileService->getMatchingPatterns(
                 _options.layers().value(),
                 _formatToUse,
                 _options.style().value(),
@@ -252,7 +248,7 @@
 
             if (patterns.size() > 0)
             {
-                result = _tileService->createProfile( patterns );
+                result = tileService->createProfile( patterns );
                 _prototype = _options.url()->full() + sep + patterns[0].getPrototype();
             }
         }
@@ -260,6 +256,7 @@
         {
             OE_INFO << LC << "No JPL/TileService spec found; assuming standard WMS" << std::endl;
         }
+#endif
 
         // Use the override profile if one is passed in.
         if ( getProfile() == 0L )
@@ -308,54 +305,12 @@
         }
 
         // Try to get the image first
-        out_response = URI( uri ).readImage( _dbOptions.get(), progress);
+        out_response = URI(uri, _options.url()->context()).readImage( _dbOptions.get(), progress);
 
         if ( out_response.succeeded() )
         {
             image = out_response.getImage();
         }
-        
-#if 0
-        if ( !out_response.succeeded() )
-        {
-            // If it failed, see whether there's any info in the response.
-            OE_WARN << LC << "Failed, response:\n" << out_response.metadata().toJSON(true);
-            
-            // BAD: caches string data in an image cache. -gw
-            out_response = URI( uri ).readString( _dbOptions.get(), progress );      
-
-            // get the mime type:
-            std::string mt = out_response.metadata().value( IOMetadata::CONTENT_TYPE );
-
-            if ( mt == "application/vnd.ogc.se_xml" || mt == "text/xml" )
-            {
-                std::istringstream content( out_response.getString() );
-
-                // an XML result means there was a WMS service exception:
-                Config se;
-                if ( se.fromXML(content) )
-                {
-                    Config ex = se.child("serviceexceptionreport").child("serviceexception");
-                    if ( !ex.empty() )
-                    {
-                        OE_INFO << LC << "WMS Service Exception: " << ex.toJSON(true) << std::endl;
-                    }
-                    else
-                    {
-                        OE_INFO << LC << "WMS Response: " << se.toJSON(true) << std::endl;
-                    }
-                }
-                else
-                {
-                    OE_INFO << LC << "WMS: unknown error." << std::endl;
-                }
-            }     
-        }
-        else
-        {
-            image = out_response.getImage();
-        }
-#endif
 
         return image.release();
     }
@@ -437,11 +392,7 @@
         }
 
         // Just return an empty image if we didn't get any images
-#if OSG_VERSION_LESS_THAN(3,1,4)
-        unsigned size = seq->getNumImages();
-#else
         unsigned size = seq->getNumImageData();
-#endif
 
         if (size == 0)
         {
@@ -557,7 +508,6 @@
     const WMSOptions                 _options;
     std::string                      _formatToUse;
     std::string                      _srsToUse;
-    osg::ref_ptr<TileService>        _tileService;
     osg::ref_ptr<const Profile>      _profile;
     std::string                      _prototype;
     std::vector<std::string>         _timesVec;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/wms/TileService osgearth-2.10.2+dfsg/src/osgEarthDrivers/wms/TileService
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/wms/TileService	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/wms/TileService	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/wms/TileService.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/wms/TileService.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/wms/TileService.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/wms/TileService.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/wms/WMSOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/wms/WMSOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/wms/WMSOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/wms/WMSOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -114,21 +114,21 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet("url", _url);
-            conf.getIfSet("capabilities_url", _capabilitiesUrl);
-            conf.getIfSet("tile_service_url", _tileServiceUrl);
-            conf.getIfSet("layers", _layers);
-            conf.getIfSet("style", _style);
-            conf.getIfSet("format", _format);
-            conf.getIfSet("wms_format", _wmsFormat);
-            conf.getIfSet("wms_version", _wmsVersion);
-            conf.getIfSet("elevation_unit", _elevationUnit);
-            conf.getIfSet("srs", _srs);
-            conf.getIfSet("crs", _crs);
-            conf.getIfSet("transparent", _transparent);
-            conf.getIfSet("times", _times);
-            conf.getIfSet("time", _times); // alternative
-            conf.getIfSet("seconds_per_frame", _secondsPerFrame );
+            conf.get("url", _url);
+            conf.get("capabilities_url", _capabilitiesUrl);
+            conf.get("tile_service_url", _tileServiceUrl);
+            conf.get("layers", _layers);
+            conf.get("style", _style);
+            conf.get("format", _format);
+            conf.get("wms_format", _wmsFormat);
+            conf.get("wms_version", _wmsVersion);
+            conf.get("elevation_unit", _elevationUnit);
+            conf.get("srs", _srs);
+            conf.get("crs", _crs);
+            conf.get("transparent", _transparent);
+            conf.get("times", _times);
+            conf.get("time", _times); // alternative
+            conf.get("seconds_per_frame", _secondsPerFrame );
         }
 
         optional<URI>         _url;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/xyz/ReaderWriterXYZ.cpp osgearth-2.10.2+dfsg/src/osgEarthDrivers/xyz/ReaderWriterXYZ.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/xyz/ReaderWriterXYZ.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/xyz/ReaderWriterXYZ.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -90,8 +90,7 @@
       }
 
 
-      osg::Image* createImage(const TileKey&     key,
-          ProgressCallback*  progress )
+      osg::Image* createImage(const TileKey& key, ProgressCallback*  progress )
       {
           unsigned x, y;
           key.getTileXY( x, y );
@@ -127,7 +126,9 @@
 
           URI uri( location, _options.url()->context() );
           if ( !cacheKey.empty() )
-              uri.setCacheKey( cacheKey );
+          {
+              uri.setCacheKey(Cache::makeCacheKey(location, "uri"));
+          }
 
           OE_TEST << LC << "URI: " << uri.full() << ", key: " << uri.cacheKey() << std::endl;
 
@@ -139,8 +140,7 @@
           return _format;
       }
 
-      osg::HeightField* createHeightField( const TileKey&        key,
-          ProgressCallback*     progress)
+      osg::HeightField* createHeightField( const TileKey& key, ProgressCallback* progress)
       {
           // MapBox encoded elevation PNG.
           // https://www.mapbox.com/blog/terrain-rgb/
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthDrivers/xyz/XYZOptions osgearth-2.10.2+dfsg/src/osgEarthDrivers/xyz/XYZOptions
--- osgearth-2.9.0+dfsg/src/osgEarthDrivers/xyz/XYZOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthDrivers/xyz/XYZOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -78,10 +78,10 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet( "url", _url );
-            conf.getIfSet( "format", _format );
-            conf.getIfSet( "invert_y", _invertY );
-            conf.getIfSet( "elevation_encoding", _elevationEncoding );
+            conf.get( "url", _url );
+            conf.get( "format", _format );
+            conf.get( "invert_y", _invertY );
+            conf.get( "elevation_encoding", _elevationEncoding );
         }
 
         optional<URI>         _url;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/AltitudeFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/AltitudeFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/AltitudeFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/AltitudeFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/AltitudeFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/AltitudeFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/AltitudeFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/AltitudeFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -91,6 +91,8 @@
             StringExpression temp( _altitude->script().get() );
             feature->eval( temp, &cx );
         }
+        if (feature->getGeometry() == 0L)
+            continue;
 
         double minHAT       =  DBL_MAX;
         double maxHAT       = -DBL_MAX;
@@ -151,13 +153,15 @@
     const Session* session = cx.getSession();
 
     // the map against which we'll be doing elevation clamping
-    MapFrame mapf = session->createMapFrame();
+    osg::ref_ptr<const Map> map = session->getMap();
+    if (!map.valid())
+        return;
 
-    const SpatialReference* mapSRS = mapf.getProfile()->getSRS();
+    const SpatialReference* mapSRS = map->getSRS();
     osg::ref_ptr<const SpatialReference> featureSRS = cx.profile()->getSRS();
 
     // establish an elevation query interface based on the features' SRS.
-    ElevationQuery eq( mapf );
+    ElevationQuery eq(map.get());
 
     NumericExpression scaleExpr;
     if ( _altitude->verticalScale().isSet() )
@@ -190,6 +194,8 @@
             StringExpression temp( _altitude->script().get() );
             feature->eval( temp, &cx );
         }
+        if (feature->getGeometry() == 0L)
+            continue;
 
         double maxTerrainZ  = -DBL_MAX;
         double minTerrainZ  =  DBL_MAX;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/BufferFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/BufferFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/BufferFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/BufferFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/BufferFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/BufferFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/BufferFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/BufferFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -66,14 +66,14 @@
 {
     if (conf.key() == "buffer")
     {
-        conf.getIfSet( "distance", _distance );
+        conf.get( "distance", _distance );
     }
 }
 
 Config BufferFilter::getConfig() const
 {
     Config config( "buffer" );
-    config.addIfSet( "distance", _distance);
+    config.set( "distance", _distance);
     return config;
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/BuildGeometryFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/BuildGeometryFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/BuildGeometryFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/BuildGeometryFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -97,11 +97,10 @@
         const optional<Angle>& maxCreaseAngle() const { return _maximumCreaseAngle; }
 
         /**
-         * Whether to use GPU-generated geometry for lines with pixel width, as a replacement
-         * for the deprecated glLineWidth arttribute
+         * Shader policy to use when appropriate
          */
-        optional<bool>& useGPULines() { return _useGPULines; }
-        const optional<bool>& useGPULines() const { return _useGPULines; }
+        optional<ShaderPolicy>& shaderPolicy() { return _shaderPolicy; }
+        const optional<ShaderPolicy>& shaderPolicy() const { return _shaderPolicy; }
 
     protected:
         Style                      _style;
@@ -112,7 +111,7 @@
         optional<float>            _maxPolyTilingAngle_deg;
         optional<bool>             _optimizeVertexOrdering;
         optional<Angle>            _maximumCreaseAngle;
-        optional<bool>             _useGPULines;
+        optional<ShaderPolicy>     _shaderPolicy;
         
         void tileAndBuildPolygon(
             Geometry*               input,
@@ -132,7 +131,7 @@
             const osg::Matrixd      &world2local);
 
         osg::Geode* processPolygons        (FeatureList& input, FilterContext& cx);
-        osg::Geode* processLines           (FeatureList& input, FilterContext& cx);
+        osg::Group* processLines           (FeatureList& input, FilterContext& cx);
         osg::Group* processPolygonizedLines(FeatureList& input, bool twosided, FilterContext& cx);
         osg::Geode* processPoints          (FeatureList& input, FilterContext& cx);
     };
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/BuildGeometryFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/BuildGeometryFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/BuildGeometryFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/BuildGeometryFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*_maxPolyTilingAngle_deg-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,20 +20,21 @@
 #include <osgEarthFeatures/Session>
 #include <osgEarthFeatures/FeatureSourceIndexNode>
 #include <osgEarthFeatures/PolygonizeLines>
-#include <osgEarthFeatures/GPULines>
 #include <osgEarthSymbology/TextSymbol>
 #include <osgEarthSymbology/PointSymbol>
 #include <osgEarthSymbology/LineSymbol>
 #include <osgEarthSymbology/PolygonSymbol>
 #include <osgEarthSymbology/MeshSubdivider>
 #include <osgEarthSymbology/ResourceCache>
-#include <osgEarthSymbology/MeshConsolidator>
 #include <osgEarth/Tessellator>
 #include <osgEarth/Utils>
 #include <osgEarth/Clamping>
+#include <osgEarth/LineDrawable>
+#include <osgEarth/PointDrawable>
+#include <osgEarth/StateSetCache>
+#include <osgEarth/ShaderGenerator>
 #include <osg/Geode>
 #include <osg/Geometry>
-#include <osg/LineWidth>
 #include <osg/LineStipple>
 #include <osg/Point>
 #include <osg/MatrixTransform>
@@ -98,7 +99,8 @@
 _geoInterp    ( GEOINTERP_RHUMB_LINE ),
 _maxPolyTilingAngle_deg( 45.0f ),
 _optimizeVertexOrdering( false ),
-_maximumCreaseAngle( 0.0f )
+_maximumCreaseAngle( 0.0f ),
+_shaderPolicy(SHADERPOLICY_GENERATE)
 {
     //nop
 }
@@ -142,6 +144,9 @@
             input->eval( temp, &context );
         }
 
+        if (input->getGeometry() == 0L)
+            continue;
+
         GeometryIterator parts( input->getGeometry(), false );
         while( parts.hasMore() )
         {
@@ -174,10 +179,8 @@
             osg::Matrixd w2l, l2w;
             if (makeECEF)
             {
-                osgEarth::GeoExtent featureExtent(featureSRS);
-                featureExtent.expandToInclude(part->getBounds());
-
-                computeLocalizers(context, featureExtent, w2l, l2w);
+                osgEarth::GeoExtent partExtent(featureSRS, part->getBounds());
+                computeLocalizers(context, partExtent, w2l, l2w);
             }
             else
             {
@@ -226,10 +229,9 @@
                 // assign the primary color array. PER_VERTEX required in order to support
                 // vertex optimization later
                 unsigned count = osgGeom->getVertexArray()->getNumElements();
-                osg::Vec4Array* colors = new osg::Vec4Array;
+                osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
                 colors->assign( count, primaryColor );
                 osgGeom->setColorArray( colors );
-                osgGeom->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
 
                 geode->addDrawable( osgGeom );
 
@@ -280,7 +282,7 @@
                                              bool           twosided,
                                              FilterContext& context)
 {
-    osg::Group* group = new osg::Group;    
+    osg::Group* group = new osg::Group;
 
     // establish some referencing
     bool                    makeECEF   = false;
@@ -296,7 +298,7 @@
 
     // We need to create a different geode for each texture that is used so they can share statesets.
     typedef std::map< std::string, osg::ref_ptr< osg::Geode > > TextureToGeodeMap;
-    TextureToGeodeMap geodes;    
+    TextureToGeodeMap geodes;
 
     // iterate over all features.
     for( FeatureList::iterator i = features.begin(); i != features.end(); ++i )
@@ -316,7 +318,7 @@
         if (line->imageURI().isSet() && context.getSession() && context.getSession()->getResourceCache())
         {
             StringExpression temp( *line->imageURI() );
-            imageURI = input->eval( temp, context.getSession());            
+            imageURI = URI(input->eval(temp, context.getSession()), temp.uriContext()).full();
         }
 
         // Try to find the existing geode, otherwise create one.
@@ -410,7 +412,7 @@
                 Clamping::applyDefaultClampingAttrs( geom, input->getDouble("__oe_verticalOffset", 0.0) );
                 Clamping::setHeights( geom, copyHeights._newHeights.get() );
                 //OE_WARN << "heights = " << hats->size() << ", new hats = " << copyHeights._newHeights->size() << ", verts=" << geom->getVertexArray()->getNumElements() << std::endl;
-            }            
+            }
         }
         polygonizer.installShaders( geode.get() );
     }
@@ -441,11 +443,12 @@
 }
 
 
-osg::Geode*
+osg::Group*
 BuildGeometryFilter::processLines(FeatureList& features, FilterContext& context)
 {
-    osg::Geode* geode = new osg::Geode();
-    
+    // Group to contain all the lines we create here
+    LineGroup* drawables = new LineGroup();
+
     bool makeECEF = false;
     const SpatialReference* featureSRS = 0L;
     const SpatialReference* outputSRS = 0L;
@@ -458,9 +461,13 @@
         makeECEF = outputSRS->isGeographic();
     }
 
-    optional<Stroke> masterStroke;
-    
-    for( FeatureList::iterator f = features.begin(); f != features.end(); ++f )
+    // Need to know if we are GPU clamping so we can add more attribs
+    bool doGpuClamping =
+        _style.has<AltitudeSymbol>() &&
+        _style.get<AltitudeSymbol>()->technique() == AltitudeSymbol::TECHNIQUE_GPU;
+
+    // For each input feature:
+    for (FeatureList::iterator f = features.begin(); f != features.end(); ++f)
     {
         Feature* input = f->get();
 
@@ -473,12 +480,6 @@
         if ( !line )
             continue;
 
-        // save the first stroke to use for shader generation of GPU lines if used
-        if (!masterStroke.isSet())
-        {
-            masterStroke = line->stroke().get();
-        }
-
         // run a symbol script if present.
         if ( line->script().isSet() )
         {
@@ -486,9 +487,6 @@
             input->eval( temp, &context );
         }
 
-        // GPU line generator (if used)
-        GPULinesOperator gpuLines(line->stroke().get());
-
         GeometryIterator parts( input->getGeometry(), true );
         while( parts.hasMore() )
         {
@@ -498,115 +496,93 @@
             if ( part->size() < 2 )
                 continue;
 
-            // collect all the pre-transformation HAT (Z) values.
-            // (Note: GPU Lines have doubled-up vertices, so for that case we 
-            // have to add 2 hats for every input point.)
-            osg::ref_ptr<osg::FloatArray> hats = new osg::FloatArray();
-
-            if (_useGPULines == true)
-                hats->reserve(part->size() * 2);
-            else
-                hats->reserve(part->size());
-
-            for(Geometry::const_iterator i = part->begin(); i != part->end(); ++i )
-            {
-                hats->push_back( i->z() );
-                if (_useGPULines == true)
-                    hats->push_back(i->z());
-            }
-
             // if the underlying geometry is a ring (or a polygon), use a line loop; otherwise
             // use a line strip.
             bool isRing = (dynamic_cast<Ring*>(part) != 0L);
-            
+
             // resolve the color:
             osg::Vec4f primaryColor = line->stroke()->color();
 
-            // generate the geometry:
-            osg::Vec3Array* allPoints = new osg::Vec3Array();
+            // generate the geometry and localize to the local tangent plane
+            osg::ref_ptr< osg::Vec3Array > allPoints = new osg::Vec3Array();
+            transformAndLocalize( part->asVector(), featureSRS, allPoints.get(), outputSRS, _world2local, makeECEF );
 
-            transformAndLocalize( part->asVector(), featureSRS, allPoints, outputSRS, _world2local, makeECEF );
+            // construct a drawable for the lines
+            LineDrawable* drawable = new LineDrawable(isRing? GL_LINE_LOOP : GL_LINE_STRIP);
 
-            osg::ref_ptr<osg::Geometry> osgGeom;
+            drawable->importVertexArray(allPoints.get());
 
-            if (_useGPULines == true)
+            if (line->stroke().isSet())
             {
-                // Lines tessellated on the GPU - replacement for deprecated glLineWidth
-                osgGeom = gpuLines(allPoints, isRing);
-            }
-            else
-            {
-                // normal GL lines
-                osgGeom = new osg::Geometry();
-                osgGeom->setUseVertexBufferObjects(true);
-                osgGeom->setUseDisplayList(false);
-                GLenum primMode = isRing ? GL_LINE_LOOP : GL_LINE_STRIP;
-                osgGeom->addPrimitiveSet(new osg::DrawArrays(primMode, 0, allPoints->getNumElements()));
-                osgGeom->setVertexArray(allPoints);
+                if (line->stroke()->width().isSet())
+                    drawable->setLineWidth(line->stroke()->width().get());
+
+                if (line->stroke()->stipplePattern().isSet())
+                    drawable->setStipplePattern(line->stroke()->stipplePattern().get());
+
+                if (line->stroke()->stippleFactor().isSet())
+                    drawable->setStippleFactor(line->stroke()->stippleFactor().get());
+
+                if (line->stroke()->smooth().isSet())
+                    drawable->setLineSmooth(line->stroke()->smooth().get());
             }
 
-            if (osgGeom.valid())
+            // For GPU clamping, we need an attribute array with Heights above Terrain in it.
+            if (doGpuClamping)
             {
-                // embed the feature name if requested. Warning: blocks geometry merge optimization!
-                if ( _featureNameExpr.isSet() )
+                osg::FloatArray* hats = new osg::FloatArray();
+                hats->setBinding(osg::Array::BIND_PER_VERTEX);
+                hats->setNormalize(false);
+                drawable->setVertexAttribArray(Clamping::HeightsAttrLocation, hats);
+                for (Geometry::const_iterator i = part->begin(); i != part->end(); ++i)
                 {
-                    const std::string& name = input->eval( _featureNameExpr.mutable_value(), &context );
-                    osgGeom->setName( name );
+                    drawable->pushVertexAttrib(hats, i->z());
                 }
+            }
 
-                // subdivide the mesh if necessary to conform to an ECEF globe;
-                // but if the tessellation is set to zero, or if the style specifies a
-                // tessellation size, skip this step.
-                if ( makeECEF && !line->tessellation().isSetTo(0) && !line->tessellationSize().isSet() )
-                {
-                    double threshold = osg::DegreesToRadians( *_maxAngle_deg );
-                    OE_DEBUG << "Running mesh subdivider with threshold " << *_maxAngle_deg << std::endl;
+            // assign the color:
+            drawable->setColor(primaryColor);
 
-                    MeshSubdivider ms( _world2local, _local2world );
-                    //ms.setMaxElementsPerEBO( INT_MAX );
-                    if ( input->geoInterp().isSet() )
-                        ms.run( *osgGeom, threshold, *input->geoInterp() );
-                    else
-                        ms.run( *osgGeom, threshold, *_geoInterp );
-                }
+            // embed the feature name if requested. Warning: blocks geometry merge optimization!
+            if ( _featureNameExpr.isSet() )
+            {
+                const std::string& name = input->eval( _featureNameExpr.mutable_value(), &context );
+                drawable->setName( name );
+            }
 
-                // assign the primary color (PER_VERTEX required for later optimization)
-                osg::Vec4Array* colors = new osg::Vec4Array;
-                colors->assign( osgGeom->getVertexArray()->getNumElements(), primaryColor );
-                osgGeom->setColorArray( colors );
-                osgGeom->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
+            // record the geometry's primitive set(s) in the index:
+            if ( context.featureIndex() )
+            {
+                context.featureIndex()->tagDrawable( drawable, input );
+            }
 
-                geode->addDrawable( osgGeom );
+            // install clamping attributes if necessary
+            if (doGpuClamping)
+            {
+                Clamping::applyDefaultClampingAttrs( drawable, input->getDouble("__oe_verticalOffset", 0.0) );
+            }
 
-                // record the geometry's primitive set(s) in the index:
-                if ( context.featureIndex() )
-                    context.featureIndex()->tagDrawable( osgGeom.get(), input );
+            // finalize the drawable and generate primitive sets
+            drawable->dirty();
 
-                // install clamping attributes if necessary
-                if (_style.has<AltitudeSymbol>() &&
-                    _style.get<AltitudeSymbol>()->technique() == AltitudeSymbol::TECHNIQUE_GPU)
-                {
-                    Clamping::applyDefaultClampingAttrs( osgGeom.get(), input->getDouble("__oe_verticalOffset", 0.0) );
-                    Clamping::setHeights( osgGeom.get(), hats.get() );
-                }
-            }
+            drawables->addChild(drawable);
         }
     }
 
-    if (_useGPULines == true)
+    // Finally, optimize the finished group for rendering.
+    if (drawables)
     {
-        GPULinesOperator op(masterStroke.get());
-        op.installShaders(geode);
+        drawables->optimize();
     }
 
-    return geode;
+    return drawables;
 }
 
 
 osg::Geode*
 BuildGeometryFilter::processPoints(FeatureList& features, FilterContext& context)
 {
-    osg::Geode* geode = new osg::Geode();
+    PointGroup* drawables = new PointGroup();
 
     bool makeECEF = false;
     const SpatialReference* featureSRS = 0L;
@@ -615,12 +591,16 @@
     // set up referencing information:
     if ( context.isGeoreferenced() )
     {
-        //makeECEF   = context.getSession()->getMapInfo().isGeocentric();
         featureSRS = context.extent()->getSRS();
         outputSRS  = context.getOutputSRS();
         makeECEF = outputSRS->isGeographic();
     }
 
+    // Need to know if we are GPU clamping so we can add more attribs
+    bool doGpuClamping =
+        _style.has<AltitudeSymbol>() &&
+        _style.get<AltitudeSymbol>()->technique() == AltitudeSymbol::TECHNIQUE_GPU;
+
     for( FeatureList::iterator f = features.begin(); f != features.end(); ++f )
     {
         Feature* input = f->get();
@@ -647,65 +627,82 @@
             // resolve the color:
             osg::Vec4f primaryColor = point->fill()->color();
 
-            osg::ref_ptr<osg::Geometry> osgGeom = new osg::Geometry();
-            osgGeom->setUseVertexBufferObjects( true );
-            osgGeom->setUseDisplayList( false );
-
-            // embed the feature name if requested. Warning: blocks geometry merge optimization!
-            if ( _featureNameExpr.isSet() )
-            {
-                const std::string& name = input->eval( _featureNameExpr.mutable_value(), &context );
-                osgGeom->setName( name );
-            }
-
             // build the geometry:
-            osg::Vec3Array* allPoints = new osg::Vec3Array();
+            osg::ref_ptr<osg::Vec3Array> allPoints = new osg::Vec3Array();
+            transformAndLocalize( part->asVector(), featureSRS, allPoints.get(), outputSRS, _world2local, makeECEF );
 
-            transformAndLocalize( part->asVector(), featureSRS, allPoints, outputSRS, _world2local, makeECEF );
+            PointDrawable* drawable = new PointDrawable();
 
-            osgGeom->addPrimitiveSet( new osg::DrawArrays(GL_POINTS, 0, allPoints->getNumElements()) );
-            osgGeom->setVertexArray( allPoints );
+            drawable->importVertexArray(allPoints.get());
+            
+            if (point->size().isSet())
+                drawable->setPointSize(point->size().get());
+
+            if (point->smooth().isSet())
+                drawable->setPointSmooth(point->smooth().get());
 
-            if ( input->style().isSet() )
+            // For GPU clamping, we need an attribute array with Heights above Terrain in it.
+            if (doGpuClamping)
             {
-                //TODO: re-evaluate this. does it hinder geometry merging?
-                applyPointSymbology( osgGeom->getOrCreateStateSet(), point );
+                osg::FloatArray* hats = new osg::FloatArray();
+                hats->setBinding(osg::Array::BIND_PER_VERTEX);
+                hats->setNormalize(false);
+                drawable->setVertexAttribArray(Clamping::HeightsAttrLocation, hats);
+                for (Geometry::const_iterator i = part->begin(); i != part->end(); ++i)
+                {
+                    drawable->pushVertexAttrib(hats, i->z());
+                }
             }
 
-            // assign the primary color (PER_VERTEX required for later optimization)
-            osg::Vec4Array* colors = new osg::Vec4Array;
-            colors->assign( osgGeom->getVertexArray()->getNumElements(), primaryColor );
-            osgGeom->setColorArray( colors );
-            osgGeom->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
+            // assign the color:
+            drawable->setColor(primaryColor);            
 
-            geode->addDrawable( osgGeom.get() );
+            // embed the feature name if requested. Warning: blocks geometry merge optimization!
+            if ( _featureNameExpr.isSet() )
+            {
+                const std::string& name = input->eval( _featureNameExpr.mutable_value(), &context );
+                drawable->setName( name );
+            }
 
             // record the geometry's primitive set(s) in the index:
             if ( context.featureIndex() )
-                context.featureIndex()->tagDrawable( osgGeom.get(), input );
+            {
+                context.featureIndex()->tagDrawable( drawable, input );
+            }
 
             // install clamping attributes if necessary
-            if (_style.has<AltitudeSymbol>() &&
-                _style.get<AltitudeSymbol>()->technique() == AltitudeSymbol::TECHNIQUE_GPU)
+            if (doGpuClamping)
             {
-                Clamping::applyDefaultClampingAttrs( osgGeom.get(), input->getDouble("__oe_verticalOffset", 0.0) );
-                Clamping::setHeights( osgGeom.get(), hats.get() );
+                Clamping::applyDefaultClampingAttrs( drawable, input->getDouble("__oe_verticalOffset", 0.0) );
             }
+
+            drawable->dirty();
+
+            drawables->addChild(drawable);
         }
     }
 
-    return geode;
+    // Finally, optimize the finished group for rendering.
+    if (drawables)
+    {
+        drawables->optimize();
+    }
+
+    return drawables;
 }
 
 // Borrowed from MeshConsolidator.cpp
-template<typename FROM, typename TO>
-osg::PrimitiveSet* copy( FROM* src, unsigned offset )
+namespace
 {
-    TO* newDE = new TO( src->getMode() );
-    newDE->reserve( src->size() );
-    for( typename FROM::const_iterator i = src->begin(); i != src->end(); ++i )
-        newDE->push_back( (*i) + offset );
-    return newDE;
+    template<typename FROM, typename TO>
+    osg::PrimitiveSet* copy( FROM* src, unsigned offset )
+    {
+        TO* newDE = new TO( src->getMode() );
+        newDE->reserve( src->size() );
+        for( typename FROM::const_iterator i = src->begin(); i != src->end(); ++i )
+            newDE->push_back( (*i) + offset );
+        return newDE;
+    }
 }
 
 
@@ -1231,7 +1228,7 @@
             // calc orientation of triangle.
             osg::Vec3 normal = (v2 - v1) ^ (v3 - v1);
             normal.normalize();
-            
+
             (*_normals)[i1] += normal;
             (*_normals)[i2] += normal;
             (*_normals)[i3] += normal;
@@ -1258,12 +1255,12 @@
         {
             osg::Geometry* geom = drawable.asGeometry();
             if (geom)
-            {                
+            {
                 osg::Vec3Array* verts = dynamic_cast<osg::Vec3Array*>(geom->getVertexArray());
 
                 osg::Vec3Array* normals = new osg::Vec3Array(verts->size());
                 normals->setBinding(normals->BIND_PER_VERTEX);
-                
+
                 osg::TriangleIndexFunctor<GenerateNormalFunctor> f;
                 f.set(verts, normals);
                 geom->accept(f);
@@ -1440,39 +1437,28 @@
     if ( lines.size() > 0 )
     {
         OE_TEST << LC << "Building " << lines.size() << " lines." << std::endl;
-        
-        osg::ref_ptr<osg::Geode> geode = processLines(lines, context);
-        if ( geode->getNumDrawables() > 0 )
-        {
-            osgUtil::Optimizer::MergeGeometryVisitor mg;
-            mg.setTargetMaximumNumberOfVertices(65536);
-            geode->accept(mg);
 
-            if (_useGPULines == false)
-            {
-                applyLineSymbology( geode->getOrCreateStateSet(), line );
-            }
+        osg::ref_ptr<osg::Group> group = processLines(lines, context);
 
-            result->addChild( geode.get() );
+        if ( group->getNumChildren() > 0 )
+        {
+            result->addChild(group.get());
         }
     }
 
     if ( points.size() > 0 )
     {
         OE_TEST << LC << "Building " << points.size() << " points." << std::endl;
-        osg::ref_ptr<osg::Geode> geode = processPoints(points, context);
-        if ( geode->getNumDrawables() > 0 )
-        {
-            osgUtil::Optimizer::MergeGeometryVisitor mg;
-            mg.setTargetMaximumNumberOfVertices(65536);
-            geode->accept(mg);
 
-            applyPointSymbology( geode->getOrCreateStateSet(), point );
-            result->addChild( geode.get() );
+        osg::ref_ptr<osg::Group> group = processPoints(points, context);
+
+        if ( group->getNumChildren() > 0 )
+        {
+            result->addChild(group.get());
         }
     }
 
-    // indicate that geometry contains clamping attributes
+    //// indicate that geometry contains clamping attributes
     if (_style.has<AltitudeSymbol>() &&
         _style.get<AltitudeSymbol>()->technique() == AltitudeSymbol::TECHNIQUE_GPU)
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/BuildTextFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/BuildTextFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/BuildTextFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/BuildTextFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/BuildTextFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/BuildTextFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/BuildTextFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/BuildTextFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/CentroidFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/CentroidFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/CentroidFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/CentroidFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/CentroidFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/CentroidFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/CentroidFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/CentroidFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthFeatures/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -11,7 +11,7 @@
 SET(LIB_NAME osgEarthFeatures)
 
 set(TARGET_GLSL
-    GPULinesScreenProj.glsl)
+)
 
 set(SHADERS_CPP "${CMAKE_CURRENT_BINARY_DIR}/AutoGenShaders.cpp")
 
@@ -51,7 +51,7 @@
     FilterContext
     GeometryCompiler
     GeometryUtils
-    GPULines
+    ImageToFeatureLayer
     LabelSource
     MVT
     OgrUtils
@@ -96,7 +96,7 @@
     FilterContext.cpp
     GeometryCompiler.cpp
     GeometryUtils.cpp
-    GPULines.cpp
+    ImageToFeatureLayer.cpp
     LabelSource.cpp
     MVT.cpp
     OgrUtils.cpp
@@ -115,9 +115,9 @@
     ${SHADERS_CPP}
 )
 
-IF(PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE)
+IF(Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE)
 
-  INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+  INCLUDE_DIRECTORIES(${Protobuf_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
   PROTOBUF_GENERATE_CPP(PROTO_VECTOR_TILE_CPP PROTO_VECTOR_TILE_H vector_tile.proto)
 
   SET(LIB_PUBLIC_HEADERS
@@ -131,6 +131,10 @@
   )
 
   ADD_DEFINITIONS(-DOSGEARTH_HAVE_MVT)
+  
+  IF (PROTOBUF_USE_DLLS)
+    ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS)
+  ENDIF()  
 
 ENDIF()
 
@@ -160,8 +164,8 @@
     OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGTERRAIN_LIBRARY OSGDB_LIBRARY OSGFX_LIBRARY
     OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OPENTHREADS_LIBRARY)
 
-IF(PROTOBUF_FOUND AND PROTOBUF_PROTOC_EXECUTABLE)
-  list(APPEND LINK_VARS PROTOBUF_LIBRARIES)
+IF(Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE)
+  list(APPEND LINK_VARS Protobuf_LIBRARIES)
 ENDIF()
 
 LINK_WITH_VARIABLES(${LIB_NAME} ${LINK_VARS})
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/Common osgearth-2.10.2+dfsg/src/osgEarthFeatures/Common
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/Common	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,11 +22,6 @@
 
 #include <osgEarth/Common>
 
-// define USE_DEPRECATED_API is used to include in API which is being fazed out
-// if you can compile your apps with this turned off you are
-// well placed for compatibility with future versions.
-#define USE_DEPRECATED_API
-
 #if defined(_MSC_VER)
     #pragma warning( disable : 4244 )
     #pragma warning( disable : 4251 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ConvertTypeFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/ConvertTypeFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ConvertTypeFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ConvertTypeFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ConvertTypeFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/ConvertTypeFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ConvertTypeFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ConvertTypeFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -49,9 +49,9 @@
     if (conf.key() == "convert")
     {
         optional<Geometry::Type> type = Geometry::TYPE_POINTSET;
-        conf.getIfSet( "type", "point",   type, Geometry::TYPE_POINTSET );
-        conf.getIfSet( "type", "line",    type, Geometry::TYPE_LINESTRING );
-        conf.getIfSet( "type", "polygon", type, Geometry::TYPE_POLYGON );
+        conf.get( "type", "point",   type, Geometry::TYPE_POINTSET );
+        conf.get( "type", "line",    type, Geometry::TYPE_LINESTRING );
+        conf.get( "type", "polygon", type, Geometry::TYPE_POLYGON );
         _toType = *type;        
     }
 }
@@ -60,9 +60,9 @@
 {
     Config config( "convert" );
     optional<Geometry::Type> type( _toType, _toType); // weird optional ctor :)
-    config.addIfSet( "type", "point",   type, Geometry::TYPE_POINTSET );
-    config.addIfSet( "type", "line",    type, Geometry::TYPE_LINESTRING );
-    config.addIfSet( "type", "polygon", type, Geometry::TYPE_POLYGON );    
+    config.set( "type", "point",   type, Geometry::TYPE_POINTSET );
+    config.set( "type", "line",    type, Geometry::TYPE_LINESTRING );
+    config.set( "type", "polygon", type, Geometry::TYPE_POLYGON );    
 
     return config;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/CropFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/CropFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/CropFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/CropFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/CropFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/CropFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/CropFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/CropFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -91,16 +91,16 @@
             if ( featureGeom && featureGeom->isValid() )
             {
                 // test for trivial acceptance:
-                const Bounds bounds = featureGeom->getBounds();
-                if ( !bounds.isValid() )
+                GeoExtent featureExtent = feature->getExtent();
+                if (featureExtent.isInvalid())
                 {
                     //nop
                 }
 
-                else if ( extent.contains( bounds ) )
+                else if ( extent.contains(featureExtent) )
                 {
                     keepFeature = true;
-                    newExtent.expandToInclude( bounds );
+                    newExtent.expandToInclude(featureExtent);
                 }
 
                 // then move on to the cropping operation:
@@ -122,7 +122,7 @@
                         {
                             feature->setGeometry( croppedGeometry.get() );
                             keepFeature = true;
-                            newExtent.expandToInclude( croppedGeometry->getBounds() );
+                            newExtent.expandToInclude(GeoExtent(newExtent.getSRS(), croppedGeometry->getBounds()));
                         }
                     }
                 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ExtrudeGeometryFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/ExtrudeGeometryFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ExtrudeGeometryFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ExtrudeGeometryFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -154,6 +154,7 @@
         // their texture usage
         typedef std::map<osg::StateSet*, osg::ref_ptr<osg::Geode> > SortedGeodeMap;
         SortedGeodeMap                 _geodes;
+        SortedGeodeMap                 _lineGroups;
         osg::ref_ptr<osg::StateSet>    _noTextureStateSet;
 
         bool                           _mergeGeometry;
@@ -169,6 +170,7 @@
         bool                           _gpuClamping;
 
         osg::ref_ptr<const ExtrusionSymbol> _extrusionSymbol;
+        osg::ref_ptr<const PolygonSymbol>   _polySymbol;
         osg::ref_ptr<const SkinSymbol>      _wallSkinSymbol;
         osg::ref_ptr<const PolygonSymbol>   _wallPolygonSymbol;
         osg::ref_ptr<const SkinSymbol>      _roofSkinSymbol;
@@ -210,10 +212,7 @@
                                const osg::Vec4&     roofColor,
                                const SkinResource*  roofSkin);
 
-        bool buildOutlineGeometry(const Structure&  structure,
-                                  osg::Geometry*    outline,
-                                  const osg::Vec4&  outlineColor,
-                                  float             minCreaseAngleDeg);
+        osg::Drawable* buildOutlineGeometry(const Structure& structure);
     };
 
 } } // namespace osgEarth::Features
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ExtrudeGeometryFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/ExtrudeGeometryFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ExtrudeGeometryFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ExtrudeGeometryFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -28,6 +28,8 @@
 #include <osgEarth/Clamping>
 #include <osgEarth/Utils>
 #include <osgEarth/Tessellator>
+#include <osgEarth/LineDrawable>
+#include <osgEarth/StateSetCache>
 
 #include <osg/Geode>
 #include <osg/Geometry>
@@ -186,13 +188,13 @@
         }
 
         // backup plan for poly symbols:
-        const PolygonSymbol* poly = _style.get<PolygonSymbol>();
-        if ( poly )
+        _polySymbol = _style.get<PolygonSymbol>();
+        if (_polySymbol.valid())
         {
             if ( !_wallPolygonSymbol.valid() )
-                _wallPolygonSymbol = poly;
+                _wallPolygonSymbol = _polySymbol.get();
             if ( !_roofPolygonSymbol.valid() )
-                _roofPolygonSymbol = poly;
+                _roofPolygonSymbol = _polySymbol.get();
         }
 
         _styleDirty = false;
@@ -216,8 +218,8 @@
     if ( cx.isGeoreferenced() )
     {
        srs      = cx.extent()->getSRS();
-       makeECEF = cx.getSession()->getMapInfo().isGeocentric();
-       mapSRS   = cx.getSession()->getMapInfo().getProfile()->getSRS();
+       mapSRS   = cx.getSession()->getMapSRS();
+       makeECEF = cx.getSession()->getMapSRS()->isGeographic(); //->getMapInfo().isGeocentric();
     }
 
     // whether this is a closed polygon structure.
@@ -429,11 +431,19 @@
                     // insert a new fake corner.
 					Corners::iterator new_corner;
 
-                    if ( isLastEdge )
+                    if (isLastEdge)
                     {
-						corners.push_back(Corner());
-						new_corner = c;
-						new_corner++;
+                        if (structure.isPolygon)
+                        {
+                            corners.push_back(Corner());
+                            new_corner = c;
+                            new_corner++;
+                        }
+                        else
+                        {
+                            // We only add a fake corner at the end for polygons
+                            break;
+                        }
                     }
                     else
                     {
@@ -556,9 +566,8 @@
     osg::Vec4Array* colors = 0L;
     if ( useColor )
     {
-        colors = new osg::Vec4Array( numWallVerts );
+        colors = new osg::Vec4Array( osg::Array::BIND_PER_VERTEX, numWallVerts );
         walls->setColorArray( colors );
-        walls->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
     }
 
     osg::Vec4Array* anchors = 0L;
@@ -566,10 +575,9 @@
     // If GPU clamping is in effect, create clamping attributes.
     if ( _gpuClamping )
     {
-        anchors = new osg::Vec4Array( numWallVerts );
+        anchors = new osg::Vec4Array( osg::Array::BIND_PER_VERTEX, numWallVerts );
+        anchors->setNormalize(false);
         walls->setVertexAttribArray    ( Clamping::AnchorAttrLocation, anchors );
-        walls->setVertexAttribBinding  ( Clamping::AnchorAttrLocation, osg::Geometry::BIND_PER_VERTEX );
-        walls->setVertexAttribNormalize( Clamping::AnchorAttrLocation, false );
     }
 
     unsigned vertptr = 0;
@@ -698,9 +706,8 @@
     osg::Vec3Array* verts = new osg::Vec3Array();
     roof->setVertexArray( verts );
 
-    osg::Vec4Array* color = new osg::Vec4Array();
+    osg::Vec4Array* color = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
     roof->setColorArray( color );
-    roof->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
 
     osg::Vec3Array* tex = 0L;
     if ( roofSkin )
@@ -766,9 +773,8 @@
         roof->addPrimitiveSet( new osg::DrawArrays(GL_LINE_LOOP, elevptr, vertptr-elevptr) );
     } 
 
-    osg::Vec3Array* normal = new osg::Vec3Array(verts->size());
+    osg::Vec3Array* normal = new osg::Vec3Array(osg::Array::BIND_PER_VERTEX, verts->size());
     roof->setNormalArray( normal );
-    roof->setNormalBinding( osg::Geometry::BIND_PER_VERTEX );
     normal->assign( verts->size(), osg::Vec3(0,0,1) );
 
     int v = verts->size();
@@ -792,9 +798,9 @@
         osg::Vec4Array* a = static_cast<osg::Vec4Array*>(roof->getTexCoordArray(1));
         if ( a )
         {
-            roof->setVertexAttribArray    ( Clamping::AnchorAttrLocation, a );
-            roof->setVertexAttribBinding  ( Clamping::AnchorAttrLocation, osg::Geometry::BIND_PER_VERTEX );
-            roof->setVertexAttribNormalize( Clamping::AnchorAttrLocation, false );
+            a->setBinding(osg::Array::BIND_PER_VERTEX);
+            a->setNormalize(false);
+            roof->setVertexAttribArray( Clamping::AnchorAttrLocation, a );
             roof->setTexCoordArray(1, 0L);
         }
     }
@@ -803,33 +809,35 @@
 }
 
 
-bool
-ExtrudeGeometryFilter::buildOutlineGeometry(const Structure&  structure,
-                                            osg::Geometry*    outline,
-                                            const osg::Vec4&  outlineColor,
-                                            float             minCreaseAngleDeg)
+osg::Drawable*
+ExtrudeGeometryFilter::buildOutlineGeometry(const Structure& structure)
 {
     // minimum angle between adjacent faces for which to draw a post.
-    const float cosMinAngle = cos(osg::DegreesToRadians(minCreaseAngleDeg));
+    const float cosMinAngle = cos(osg::DegreesToRadians(_outlineSymbol->creaseAngle().get()));
 
-    osg::Vec3Array* verts = new osg::Vec3Array();
-    outline->setVertexArray( verts );
+    osg::ref_ptr<LineDrawable> lines = new LineDrawable(GL_LINES);
+    
+    const optional<Stroke>& stroke = _outlineSymbol->stroke();
+    if (stroke.isSet())
+    {
+        lines->setColor(stroke->color());
+
+        if (stroke->width().isSet())
+            lines->setLineWidth(stroke->width().get());
+
+        if (stroke->stipplePattern().isSet())
+            lines->setStipplePattern(stroke->stipplePattern().get());
+
+        if (stroke->stippleFactor().isSet())
+            lines->setStippleFactor(stroke->stippleFactor().get());
+    }
 
-    osg::Vec4Array* color = new osg::Vec4Array();
-    outline->setColorArray( color );
-    outline->setColorBinding( osg::Geometry::BIND_OVERALL );
-    color->push_back( outlineColor );
-
-    osg::DrawElements* de = new osg::DrawElementsUInt(GL_LINES);
-    outline->addPrimitiveSet(de);
-        
     osg::Vec4Array* anchors = 0L;
     if ( _gpuClamping )
     {
         anchors = new osg::Vec4Array();
-        outline->setVertexAttribArray    ( Clamping::AnchorAttrLocation, anchors );
-        outline->setVertexAttribBinding  ( Clamping::AnchorAttrLocation, osg::Geometry::BIND_PER_VERTEX );
-        outline->setVertexAttribNormalize( Clamping::AnchorAttrLocation, false );
+        anchors->setBinding(osg::Array::BIND_PER_VERTEX);
+        lines->setVertexAttribArray( Clamping::AnchorAttrLocation, anchors );
     }
 
     bool flatten =
@@ -841,11 +849,10 @@
         y  = structure.baseCentroid.y(),
         vo = structure.verticalOffset;
 
-    unsigned vertptr = 0;
     for(Elevations::const_iterator e = structure.elevations.begin(); e != structure.elevations.end(); ++e)
     {
         osg::Vec3d prev_vec;
-        unsigned elevptr = vertptr;
+
         for(Faces::const_iterator f = e->faces.begin(); f != e->faces.end(); ++f)
         {
             // Only use source verts for posts.
@@ -860,32 +867,46 @@
                 drawPost = (this_vec * prev_vec) < cosMinAngle;
             }
 
-            if ( drawPost || drawCrossbar )
-            {
-                verts->push_back( f->left.roof );
-                if ( anchors && flatten  ) anchors->push_back(osg::Vec4f(x, y, vo, Clamping::ClampToAnchor));
-                if ( anchors && !flatten ) anchors->push_back(osg::Vec4f(x, y, vo + f->left.height, Clamping::ClampToGround));
-            }
-
-            if ( drawPost )
+            if (drawPost)
             {
-                verts->push_back( f->left.base );
-                if ( anchors ) anchors->push_back( osg::Vec4f(x, y, vo, Clamping::ClampToGround) );
-                de->addElement(vertptr);
-                de->addElement(verts->size()-1);
+                lines->pushVertex(f->left.roof);
+                lines->pushVertex(f->left.base);
+                
+                if (anchors)
+                {
+                    if (flatten) 
+                    {
+                        lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo, Clamping::ClampToAnchor));
+                        lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo, Clamping::ClampToAnchor));
+                    }
+                    else
+                    {
+                        lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo + f->left.height, Clamping::ClampToGround));
+                        lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo, Clamping::ClampToGround));
+                    }
+                }
             }
 
-            if ( drawCrossbar )
+            if (drawCrossbar)
             {
-                verts->push_back( f->right.roof );
-                if ( anchors && flatten  ) anchors->push_back(osg::Vec4f(x, y, vo, Clamping::ClampToAnchor));
-                if ( anchors && !flatten ) anchors->push_back(osg::Vec4f(x, y, vo + f->right.height, Clamping::ClampToGround));
-                de->addElement(vertptr);
-                de->addElement(verts->size()-1);
+                lines->pushVertex(f->left.roof);
+                lines->pushVertex(f->right.roof);
+                
+                if (anchors)
+                {
+                    if (flatten) 
+                    {
+                        lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo, Clamping::ClampToAnchor));
+                        lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo, Clamping::ClampToAnchor));
+                    }
+                    else
+                    {
+                        lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo + f->left.height, Clamping::ClampToGround));
+                        lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo + f->right.height, Clamping::ClampToGround));
+                    }
+                }
             }
 
-            vertptr = verts->size();
-
             prev_vec = this_vec;
         }
 
@@ -893,17 +914,28 @@
         if ( !structure.isPolygon )
         {
             Faces::const_iterator last = e->faces.end()-1;
-            verts->push_back( last->right.roof );
-            if ( anchors && flatten  ) anchors->push_back(osg::Vec4f(x, y, vo, Clamping::ClampToAnchor));
-            if ( anchors && !flatten ) anchors->push_back(osg::Vec4f(x, y, vo + last->right.height, Clamping::ClampToGround));
-            de->addElement( verts->size()-1 );
-            verts->push_back( last->right.base );
-            if ( anchors ) anchors->push_back( osg::Vec4f(x, y, vo, Clamping::ClampToGround));
-            de->addElement( verts->size()-1 );
+
+            lines->pushVertex(last->right.roof);
+
+            if (anchors)
+            {
+                if (flatten)
+                    lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo, Clamping::ClampToAnchor));
+                else
+                    lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo + last->right.height, Clamping::ClampToGround));
+            }
+
+            lines->pushVertex(last->right.base);
+
+            if (anchors)
+                lines->pushVertexAttrib(anchors, osg::Vec4f(x, y, vo, Clamping::ClampToGround));
         }
     }
 
-    return true;
+    // finalize the line set
+    lines->dirty();
+
+    return lines->empty() ? 0L : lines.release();
 }
 
 void
@@ -915,12 +947,30 @@
 {
     // find the geode for the active stateset, creating a new one if necessary. NULL is a 
     // valid key as well.
-    osg::Geode* geode = _geodes[stateSet].get();
-    if ( !geode )
+    osg::Geode* geode;
+    
+    if (dynamic_cast<LineDrawable*>(drawable))
+    {
+        geode = _lineGroups[stateSet].get();
+        if (!geode)
+        {
+            geode = new LineGroup();
+            if (stateSet)
+            {
+                geode->getOrCreateStateSet()->merge(*stateSet);
+            }
+            _lineGroups[stateSet] = geode;
+        }
+    }
+    else
     {
-        geode = new osg::Geode();
-        geode->setStateSet( stateSet );
-        _geodes[stateSet] = geode;
+        geode = _geodes[stateSet].get();
+        if (!geode)
+        {
+            geode = new osg::Geode();
+            geode->setStateSet(stateSet);
+            _geodes[stateSet] = geode;
+        }
     }
 
     geode->addDrawable( drawable );
@@ -948,12 +998,25 @@
         Feature* input = f->get();
 
         // run a symbol script if present.
+        if (_polySymbol.valid() && _polySymbol->script().isSet())
+        {
+            StringExpression temp(_polySymbol->script().get());
+            input->eval(temp, &context);
+        }
+
+        if (input->getGeometry() == 0L)
+            continue;
+
+        // run a symbol script if present.
         if ( _extrusionSymbol->script().isSet() )
         {
             StringExpression temp( _extrusionSymbol->script().get() );
             input->eval( temp, &context );
         }
 
+        if (input->getGeometry() == 0L)
+            continue;
+
         // iterator over the parts.
         GeometryIterator iter( input->getGeometry(), false );
         while( iter.hasMore() )
@@ -964,7 +1027,7 @@
             
             osg::ref_ptr<osg::Geometry> rooflines = 0L;
             osg::ref_ptr<osg::Geometry> baselines = 0L;
-            osg::ref_ptr<osg::Geometry> outlines  = 0L;
+            osg::ref_ptr<osg::Drawable> outlines  = 0L;
             
             if ( part->getType() == Geometry::TYPE_POLYGON )
             {
@@ -974,12 +1037,6 @@
                 static_cast<Polygon*>(part)->open();
             }
 
-            // fire up the outline geometry if we have a line symbol.
-            if ( _outlineSymbol != 0L )
-            {
-                outlines = new osg::Geometry();
-            }
-
             // make a base cap if we're doing stencil volumes.
             if ( _makeStencilVolume )
             {
@@ -1099,16 +1156,9 @@
                 }
             }
 
-            if ( outlines.valid() )
+            if (_outlineSymbol.valid())
             {
-                osg::Vec4f outlineColor(1,1,1,1);
-                if ( _outlineSymbol.valid() )
-                {
-                    outlineColor = _outlineSymbol->stroke()->color();
-                }
-
-                float minCreaseAngle = _outlineSymbol->creaseAngle().value();
-                buildOutlineGeometry(structure, outlines.get(), outlineColor, minCreaseAngle);
+                outlines = buildOutlineGeometry(structure);
             }
 
             if ( baselines.valid() )
@@ -1142,7 +1192,7 @@
                 addDrawable( baselines.get(), 0L, name, input, index );
             }
 
-            if ( outlines.valid() && outlines->getVertexArray() && outlines->getVertexArray()->getNumElements() > 0 )
+            if ( outlines.valid() )
             {
                 addDrawable( outlines.get(), 0L, name, input, index );
             }
@@ -1205,28 +1255,26 @@
     // parent geometry with a delocalizer (if necessary)
     osg::Group* group = createDelocalizeGroup();
     
-    // add all the geodes
     for( SortedGeodeMap::iterator i = _geodes.begin(); i != _geodes.end(); ++i )
     {
         group->addChild( i->second.get() );
     }
     _geodes.clear();
 
+    for (SortedGeodeMap::iterator i = _lineGroups.begin(); i != _lineGroups.end(); ++i)
+    {
+        group->addChild(i->second.get());
+    }
+    _lineGroups.clear();
+
     if ( _mergeGeometry == true && _featureNameExpr.empty() )
     {
+        osg::ref_ptr<StateSetCache> cache = new StateSetCache();
+        cache->consolidateStateSets(group);
+
         osgUtil::Optimizer::MergeGeometryVisitor mg;
         mg.setTargetMaximumNumberOfVertices(65536);
         group->accept(mg);
-
-        // Because the mesh optimizers damaga line geometry.
-        if ( !_outlineSymbol.valid() )
-        {
-            osgUtil::Optimizer o;
-            o.optimize(group,
-                osgUtil::Optimizer::INDEX_MESH |
-                osgUtil::Optimizer::VERTEX_PRETRANSFORM |
-                osgUtil::Optimizer::VERTEX_POSTTRANSFORM );
-        }
     }
 
     // Prepare buffer objects.
@@ -1241,8 +1289,10 @@
     {
         osg::StateSet* groupStateSet = group->getOrCreateStateSet();
         groupStateSet->setAttributeAndModes( new osg::PolygonOffset(1,1), 1 );
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
         if ( _outlineSymbol->stroke()->width().isSet() )
             groupStateSet->setAttributeAndModes( new osg::LineWidth(*_outlineSymbol->stroke()->width()), 1 );
+#endif
     }
 
     return group;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/Feature osgearth-2.10.2+dfsg/src/osgEarthFeatures/Feature
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/Feature	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/Feature	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/Feature.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/Feature.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/Feature.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/Feature.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -95,6 +95,11 @@
 std::string
 AttributeValue::getString() const
 {
+    if (!second.set)
+    {
+        return "";
+    }
+
     switch( first ) {
         case ATTRTYPE_STRING: return second.stringValue;
         case ATTRTYPE_DOUBLE: return osgEarth::toString(second.doubleValue);
@@ -108,6 +113,11 @@
 double
 AttributeValue::getDouble( double defaultValue ) const 
 {
+    if (!second.set)
+    {
+        return defaultValue;
+    }
+
     switch( first ) {
         case ATTRTYPE_STRING: return osgEarth::as<double>(second.stringValue, defaultValue);
         case ATTRTYPE_DOUBLE: return second.doubleValue;
@@ -121,6 +131,11 @@
 int
 AttributeValue::getInt( int defaultValue ) const 
 {
+    if (!second.set)
+    {
+        return defaultValue;
+    }
+
     switch( first ) {
         case ATTRTYPE_STRING: return osgEarth::as<int>(second.stringValue, defaultValue);
         case ATTRTYPE_DOUBLE: return (int)second.doubleValue;
@@ -134,6 +149,11 @@
 bool
 AttributeValue::getBool( bool defaultValue ) const 
 {
+    if (!second.set)
+    {
+        return defaultValue;
+    }
+
     switch( first ) {
         case ATTRTYPE_STRING: return osgEarth::as<bool>(second.stringValue, defaultValue);
         case ATTRTYPE_DOUBLE: return second.doubleValue != 0.0;
@@ -531,13 +551,13 @@
 
         // for a projected feature, we're done. For a geocentric one, transform the polytope
         // into world (ECEF) space.
-        if ( srs->isGeographic() && !srs->isPlateCarre() )
+        if ( srs->isGeographic() )
         {
             const osg::EllipsoidModel* e = srs->getEllipsoid();
 
             // add a bottom cap, unless the bounds are sufficiently large.
-            double minRad = std::min(e->getRadiusPolar(), e->getRadiusEquator());
-            double maxRad = std::max(e->getRadiusPolar(), e->getRadiusEquator());
+            double minRad = osg::minimum(e->getRadiusPolar(), e->getRadiusEquator());
+            double maxRad = osg::maximum(e->getRadiusPolar(), e->getRadiusEquator());
             double zeroOffset = bs.center().length();
             if ( zeroOffset > minRad * 0.1 )
             {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureCursor osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureCursor
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureCursor	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureCursor	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -23,14 +23,13 @@
 #include <osgEarthFeatures/Common>
 #include <osgEarthFeatures/Feature>
 #include <osgEarthFeatures/Filter>
+#include <osgEarth/Progress>
 #include <osgEarth/Profile>
 
 namespace osgEarth { namespace Features
 {   
     using namespace osgEarth;
 
-    //class FeatureFilterChain;
-
     /**
      * A cursor that lets you iterate over a collection of features returned 
      * from a feature query performed on a FeatureStore.
@@ -39,12 +38,18 @@
     {
     public:
         virtual bool hasMore() const =0;
+
         virtual Feature* nextFeature() =0;
 
-    public:
+        void fill(FeatureList& output);
+
+    protected:
+
+        FeatureCursor(ProgressCallback* progress);
+
         virtual ~FeatureCursor();
 
-        void fill( FeatureList& output );
+        osg::ref_ptr<ProgressCallback> _progress;
     };
 
     /**
@@ -56,6 +61,7 @@
     public:
         FeatureListCursor(const FeatureList& input);
 
+    public: // FeatureCursor
         virtual bool hasMore() const;
         virtual Feature* nextFeature();
 
@@ -76,6 +82,8 @@
     public:
         GeometryFeatureCursor( Symbology::Geometry* geom );
         GeometryFeatureCursor( Symbology::Geometry* geom, const FeatureProfile* fp, const FeatureFilterChain* filters );
+
+    public: // FeatureCursor
         virtual bool hasMore() const;
         virtual Feature* nextFeature();
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureCursor.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureCursor.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureCursor.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureCursor.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,6 +18,7 @@
  */
 #include <osgEarthFeatures/FeatureCursor>
 #include <osgEarthFeatures/Filter>
+#include <osgEarth/Progress>
 
 using namespace osgEarth::Features;
 using namespace osgEarth::Symbology;
@@ -25,13 +26,19 @@
 
 //---------------------------------------------------------------------------
 
+FeatureCursor::FeatureCursor(ProgressCallback* progress) :
+_progress(progress)
+{
+    //nop
+}
+
 FeatureCursor::~FeatureCursor()
 {
     //nop
 }
 
 void
-FeatureCursor::fill( FeatureList& list )
+FeatureCursor::fill(FeatureList& list)
 {
     while( hasMore() )
     {
@@ -42,6 +49,7 @@
 //---------------------------------------------------------------------------
 
 FeatureListCursor::FeatureListCursor(const FeatureList& features) :
+FeatureCursor(0L),
 _features( features ),
 _clone   ( false )
 {
@@ -70,6 +78,7 @@
 //---------------------------------------------------------------------------
 
 GeometryFeatureCursor::GeometryFeatureCursor(Geometry* geom) :
+FeatureCursor(NULL),
 _geom( geom )
 {
     //nop
@@ -78,6 +87,7 @@
 GeometryFeatureCursor::GeometryFeatureCursor(Geometry* geom,
                                              const FeatureProfile* fp,
                                              const FeatureFilterChain* filters) :
+FeatureCursor(NULL),
 _geom          ( geom ),
 _featureProfile( fp ),
 _filterChain   ( filters )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureDisplayLayout osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureDisplayLayout
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureDisplayLayout	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureDisplayLayout	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -194,4 +194,8 @@
 
 } } // namespace osgEarth::Features
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Features::FeatureLevel);
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Features::FeatureDisplayLayout);
+
+
 #endif // OSGEARTHFEATURES_FEATURE_DISPLAY_LAYOUT_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureDisplayLayout.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureDisplayLayout.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureDisplayLayout.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureDisplayLayout.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -48,19 +48,19 @@
 void
 FeatureLevel::fromConfig( const Config& conf )
 {
-    conf.getIfSet( "min_range", _minRange );
-    conf.getIfSet( "max_range", _maxRange );
-    conf.getIfSet( "style",     _styleName ); 
-    conf.getIfSet( "class",     _styleName ); // alias
+    conf.get( "min_range", _minRange );
+    conf.get( "max_range", _maxRange );
+    conf.get( "style",     _styleName ); 
+    conf.get( "class",     _styleName ); // alias
 }
 
 Config
 FeatureLevel::getConfig() const
 {
     Config conf( "level" );
-    conf.addIfSet( "min_range", _minRange );
-    conf.addIfSet( "max_range", _maxRange );
-    conf.addIfSet( "style",     _styleName );
+    conf.set( "min_range", _minRange );
+    conf.set( "max_range", _maxRange );
+    conf.set( "style",     _styleName );
     return conf;
 }
 
@@ -82,15 +82,15 @@
 void
 FeatureDisplayLayout::fromConfig( const Config& conf )
 {
-    conf.getIfSet( "tile_size",        _tileSize );
-    conf.getIfSet( "tile_size_factor", _tileSizeFactor );
-    conf.getIfSet( "crop_features",    _cropFeatures );
-    conf.getIfSet( "priority_offset",  _priorityOffset );
-    conf.getIfSet( "priority_scale",   _priorityScale );
-    conf.getIfSet( "min_expiry_time",  _minExpiryTime );
-    conf.getIfSet( "min_range",        _minRange );
-    conf.getIfSet( "max_range",        _maxRange );
-    conf.getIfSet("paged", _paged);
+    conf.get( "tile_size",        _tileSize );
+    conf.get( "tile_size_factor", _tileSizeFactor );
+    conf.get( "crop_features",    _cropFeatures );
+    conf.get( "priority_offset",  _priorityOffset );
+    conf.get( "priority_scale",   _priorityScale );
+    conf.get( "min_expiry_time",  _minExpiryTime );
+    conf.get( "min_range",        _minRange );
+    conf.get( "max_range",        _maxRange );
+    conf.get("paged", _paged);
     ConfigSet children = conf.children( "level" );
     for( ConfigSet::const_iterator i = children.begin(); i != children.end(); ++i )
         addLevel( FeatureLevel( *i ) );
@@ -100,15 +100,15 @@
 FeatureDisplayLayout::getConfig() const
 {
     Config conf( "layout" );
-    conf.addIfSet( "tile_size",        _tileSize );
-    conf.addIfSet( "tile_size_factor", _tileSizeFactor );
-    conf.addIfSet( "crop_features",    _cropFeatures );
-    conf.addIfSet( "priority_offset",  _priorityOffset );
-    conf.addIfSet( "priority_scale",   _priorityScale );
-    conf.addIfSet( "min_expiry_time",  _minExpiryTime );
-    conf.addIfSet( "min_range",        _minRange );
-    conf.addIfSet( "max_range",        _maxRange );
-    conf.addIfSet("paged", _paged);
+    conf.set( "tile_size",        _tileSize );
+    conf.set( "tile_size_factor", _tileSizeFactor );
+    conf.set( "crop_features",    _cropFeatures );
+    conf.set( "priority_offset",  _priorityOffset );
+    conf.set( "priority_scale",   _priorityScale );
+    conf.set( "min_expiry_time",  _minExpiryTime );
+    conf.set( "min_range",        _minRange );
+    conf.set( "max_range",        _maxRange );
+    conf.set("paged", _paged);
     for( Levels::const_iterator i = _levels.begin(); i != _levels.end(); ++i )
         conf.add( i->second.getConfig() );
     return conf;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureIndex osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureIndex
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureIndex	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureIndex	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureListSource osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureListSource
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureListSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureListSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -35,7 +35,7 @@
     class FeatureCursor;
 
     /**
-     * @deprecated - use a FeatureNode instead
+     * @deprecated - use a FeatureNode instead (remove after 2.10)
      */
     class OSGEARTHFEATURES_EXPORT FeatureListSource : public FeatureSource
     {
@@ -56,7 +56,7 @@
         
         virtual Status initialize(const osgDB::Options* readOptions) { return Status::OK();  }
 
-        virtual FeatureCursor* createFeatureCursor( const Symbology::Query& query );
+        virtual FeatureCursor* createFeatureCursor(const Symbology::Query& query, ProgressCallback* progress);
 
         virtual bool isWritable() const { return true; }
         virtual bool deleteFeature(FeatureID fid);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureListSource.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureListSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureListSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureListSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,6 +19,7 @@
 #include <osgEarthFeatures/FeatureListSource>
 #include <osgEarthFeatures/FeatureCursor>
 #include <osgEarthFeatures/Filter>
+#include <osgEarth/Progress>
 
 using namespace osgEarth::Features;
 
@@ -36,7 +37,7 @@
 }
 
 FeatureCursor*
-FeatureListSource::createFeatureCursor( const Symbology::Query& query )
+FeatureListSource::createFeatureCursor(const Symbology::Query& query, ProgressCallback* progress)
 {
     if (getFeatureProfile() == 0L)
         setFeatureProfile(createFeatureProfile());
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureMaskLayer osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureMaskLayer
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureMaskLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureMaskLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -65,7 +65,7 @@
     class OSGEARTHFEATURES_EXPORT FeatureMaskLayer : public MaskLayer
     {
     public:
-        META_Layer(osgEarth, FeatureMaskLayer, FeatureMaskLayerOptions);
+        META_Layer(osgEarth, FeatureMaskLayer, FeatureMaskLayerOptions, feature_mask);
 
         /**
          * Constructs a new mask layer based on a configuration setup.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureMaskLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureMaskLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureMaskLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureMaskLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,6 +18,8 @@
  */
 #include <osgEarthFeatures/FeatureMaskLayer>
 #include <osgEarthFeatures/FeatureCursor>
+#include <osgEarth/Map>
+#include <osgEarth/Progress>
 
 using namespace osgEarth;
 using namespace osgEarth::Features;
@@ -25,7 +27,6 @@
 #define LC "[FeatureMaskLayer] "
 
 REGISTER_OSGEARTH_LAYER(feature_mask, FeatureMaskLayer);
-REGISTER_OSGEARTH_LAYER(mask, FeatureMaskLayer);
 
 //........................................................................
 
@@ -45,17 +46,16 @@
 void
 FeatureMaskLayerOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet("feature_source", _featureSourceLayer);
-    conf.getObjIfSet("features", _featureSource);
+    conf.get("feature_source", _featureSourceLayer);
+    conf.get("features", _featureSource);
 }
 
 Config
 FeatureMaskLayerOptions::getConfig() const
 {
     Config conf = MaskLayerOptions::getConfig();
-    conf.key() = "feature_mask";
-    conf.addIfSet("feature_source", _featureSourceLayer);
-    conf.addObjIfSet("features", _featureSource);
+    conf.set("feature_source", _featureSourceLayer);
+    conf.set("features", _featureSource);
     return conf;
 }
 
@@ -149,7 +149,7 @@
         Threading::ScopedMutexLock lock(_boundaryMutex);
         if (!_boundary.valid())
         {
-            osg::ref_ptr<FeatureCursor> cursor = _featureSource->createFeatureCursor();
+            osg::ref_ptr<FeatureCursor> cursor = _featureSource->createFeatureCursor(progress);
             if (cursor.valid() && cursor->hasMore())
             {
                 Feature* f = cursor->nextFeature();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelGraph osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelGraph
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelGraph	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelGraph	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* --*-c++-*-- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -143,7 +143,8 @@
             const Query&          baseQuery, 
             const GeoExtent&      extent, 
             FeatureIndexBuilder*  index,
-            const osgDB::Options* readOptions);
+            const osgDB::Options* readOptions,
+            ProgressCallback*     progress);
 
 
     private:
@@ -154,7 +155,8 @@
             const Style&          style, 
             const Query&          query, 
             FeatureIndexBuilder*  index,
-            const osgDB::Options* readOptions);
+            const osgDB::Options* readOptions,
+            ProgressCallback*     progress);
 
         osg::Group* createStyleGroup(
             const Style&          style, 
@@ -167,27 +169,27 @@
             const Query&          baseQuery,
             FeatureIndexBuilder*  index,
             osg::Group*           parent,
-            const osgDB::Options* readOptions);
+            const osgDB::Options* readOptions,
+            ProgressCallback*     progress);
 
         void queryAndSortIntoStyleGroups(
             const Query&            query,
             const StringExpression& styleExpr,
             FeatureIndexBuilder*    index,
             osg::Group*             parent,
-            const osgDB::Options*   readOptions);
+            const osgDB::Options*   readOptions,
+            ProgressCallback*       progress);
 
         osg::Group* getOrCreateStyleGroupFromFactory(
             const Style& style);
        
         osg::BoundingSphered getBoundInWorldCoords( 
-            const GeoExtent& extent, 
-            const MapFrame*  mapf ) const;
+            const GeoExtent& extent ) const;
 
         void buildSubTilePagedLODs(
             unsigned lod, unsigned tileX, unsigned tileY,
-            const MapFrame* mapFrame, osg::Group* parent,
+            osg::Group* parent,
             const osgDB::Options* readOptions);
-
         
         osg::Group* readTileFromCache(
             const std::string&    cacheKey,
@@ -228,6 +230,8 @@
 
         osg::ref_ptr<SceneGraphCallbacks> _sgCallbacks;
 
+        osg::ref_ptr<osgDB::ObjectCache> _nodeCachingImageCache;
+
         void runPreMergeOperations(osg::Node* node);
         void runPostMergeOperations(osg::Node* node);
         void applyRenderSymbology(const Style& style, osg::Node* node);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelGraph.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelGraph.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelGraph.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelGraph.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* --*-c++-*-- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 #include <osgEarthFeatures/FeatureSourceIndexNode>
 #include <osgEarthFeatures/FilterContext>
 
-#include <osgEarth/Map>
+#include <osgEarth/MapInfo>
 #include <osgEarth/Capabilities>
 #include <osgEarth/CullingUtils>
 #include <osgEarth/ElevationLOD>
@@ -32,6 +32,7 @@
 #include <osgEarth/Registry>
 #include <osgEarth/ThreadingUtils>
 #include <osgEarth/Utils>
+#include <osgEarth/GLUtils>
 
 #include <osg/CullFace>
 #include <osg/PagedLOD>
@@ -185,20 +186,10 @@
            return ReadResult::ERROR_IN_READING_FILE;
         }
 
-        //osg::ref_ptr<FeatureModelGraph> graph = getGraph(uid);
-        // graph is valid at this point, otherwise the above lock would not succeed
-        //if ( graph.valid() )
-        {
-            // Take a reference on the map to avoid map destruction during thread operation
-            //osg::ref_ptr<const Map> map = graph->getSession()->getMap();
-            //if (map.valid() == true)
-            {
-                Registry::instance()->startActivity(uri);
-                osg::Node* node = graph->load(lod, x, y, uri, readOptions);
-                Registry::instance()->endActivity(uri);
-                return ReadResult(node);
-            }
-        }
+        Registry::instance()->startActivity(uri);
+        osg::Node* node = graph->load(lod, x, y, uri, readOptions);
+        Registry::instance()->endActivity(uri);
+        return ReadResult(node);
     }
 };
 
@@ -227,7 +218,7 @@
 
     struct SetupFading : public SceneGraphCallback
     {
-        void onPostMergeNode( osg::Node* node )
+        void onPostMergeNode(osg::Node* node, osg::Object* sender)
         {
             osg::Uniform* u = FadeEffect::createStartTimeUniform();
             u->set( (float)osg::Timer::instance()->time_s() );
@@ -277,6 +268,8 @@
     
     OE_TEST << LC << "ctor" << std::endl;
 
+    _nodeCachingImageCache = new osgDB::ObjectCache();
+
     // an FLC that queues feature data on the high-latency thread.
     _defaultFileLocationCallback = new HighLatencyFileLocationCallback();
 
@@ -321,8 +314,15 @@
     // same, back into feature coords:
     _usableFeatureExtent = _usableMapExtent.transform( featureProfile->getSRS() );
 
+    // for projected data, contract the extent slightly to prevent precision errors
+    // when sampling edge vertices after cropping
+    if (_usableFeatureExtent.isValid() && _usableFeatureExtent.getSRS()->isProjected())
+    {
+        _usableFeatureExtent.expand(-0.001, -0.001);
+    }
+
     // world-space bounds of the feature layer
-    _fullWorldBound = getBoundInWorldCoords( _usableMapExtent, 0L );
+    _fullWorldBound = getBoundInWorldCoords( _usableMapExtent );
     
     // whether to request tiles from the source (if available). if the source is tiled, but the
     // user manually specified schema levels, don't use the tiles.
@@ -337,7 +337,7 @@
         if ( _options.layout()->maxRange().isSet() )
             userMaxRange = *_options.layout()->maxRange();
         if ( _options.maxRange().isSet() )
-            userMaxRange = std::min(userMaxRange, *_options.maxRange());
+            userMaxRange = osg::minimum(userMaxRange, *_options.maxRange());
         
         if ( featureProfile->getTiled() )
         {
@@ -353,16 +353,13 @@
                 // So automatically compute the tileSizeFactor based on the max range
                 double width, height;
                 featureProfile->getProfile()->getTileDimensions(featureProfile->getFirstLevel(), width, height);
-
-                MapFrame mapf = _session->createMapFrame();
-
-
+                
                 GeoExtent ext(featureProfile->getSRS(),
                     featureProfile->getExtent().west(),
                     featureProfile->getExtent().south(),
                     featureProfile->getExtent().west() + width,
                     featureProfile->getExtent().south() + height);
-                osg::BoundingSphered bounds = getBoundInWorldCoords( ext, &mapf );
+                osg::BoundingSphered bounds = getBoundInWorldCoords( ext );
 
                 float tileSizeFactor = userMaxRange / bounds.radius();
                 //The tilesize factor must be at least 1.0 to avoid culling the tile when you are within it's bounding sphere. 
@@ -387,7 +384,7 @@
             float maxRange = FLT_MAX;
             maxRange = _options.maxRange().getOrUse(maxRange);
             maxRange = _options.layout()->maxRange().getOrUse(maxRange);
-            maxRange = std::min( maxRange, _options.layout()->getLevel(0)->maxRange().get() );
+            maxRange = osg::minimum( maxRange, _options.layout()->getLevel(0)->maxRange().get() );
         
             _options.layout()->tileSizeFactor() = maxRange / _options.layout()->tileSize().get();
 
@@ -417,8 +414,7 @@
     if (featureProfile->getTiled() && _useTiledSource)
     {    
         // Get the max range of the root level
-        MapFrame mapf = _session->createMapFrame();
-        osg::BoundingSphered bounds = getBoundInWorldCoords( featureProfile->getExtent(), &mapf );
+        osg::BoundingSphered bounds = getBoundInWorldCoords( featureProfile->getExtent() );
         double maxRange = bounds.radius() * *_options.layout()->tileSizeFactor();
 
         _lodmap.resize(featureProfile->getMaxLevel() + 1);
@@ -453,7 +449,7 @@
 
     // Set up lighting, only if the option is set
     if ( _options.enableLighting().isSet() )
-        stateSet->setMode( GL_LIGHTING, *_options.enableLighting() ? 1 : 0 );
+        GLUtils::setLighting(stateSet, *_options.enableLighting() ? 1 : 0 );
 
     // If the user requests fade-in, install a post-merge operation that will set the 
     // proper fade time for paged nodes.
@@ -494,8 +490,7 @@
 //std::ostream& operator << (std::ostream& in, const osg::Vec3d& v) { in << v.x() << ", " << v.y() << ", " << v.z(); return in; }
 
 osg::BoundingSphered
-FeatureModelGraph::getBoundInWorldCoords(const GeoExtent& extent,
-                                         const MapFrame*  mapf ) const
+FeatureModelGraph::getBoundInWorldCoords(const GeoExtent& extent) const
 {
     osg::Vec3d center, corner;
     GeoExtent workingExtent;
@@ -576,8 +571,7 @@
 FeatureModelGraph::setupPaging()
 {
     // calculate the bounds of the full data extent:
-    MapFrame mapf = _session->createMapFrame();
-    osg::BoundingSphered bs = getBoundInWorldCoords( _usableMapExtent, &mapf );
+    osg::BoundingSphered bs = getBoundInWorldCoords( _usableMapExtent );
 
     const FeatureProfile* featureProfile = _session->getFeatureSource()->getFeatureProfile();
 
@@ -590,7 +584,7 @@
         if ( _options.layout()->maxRange().isSet() )
             userMaxRange = *_options.layout()->maxRange();
         if ( _options.maxRange().isSet() )
-            userMaxRange = std::min(userMaxRange, *_options.maxRange());
+            userMaxRange = osg::minimum(userMaxRange, *_options.maxRange());
         
         if ( !featureProfile->getTiled() )
         {
@@ -660,11 +654,7 @@
             GeoExtent tileExtent = s_getTileExtent( lod, tileX, tileY, _usableFeatureExtent );
 
             // Calculate the bounds of this new tile:
-            MapFrame mapf = _session->createMapFrame();
-            if (!mapf.isValid())
-                return 0L;
-
-            osg::BoundingSphered tileBound = getBoundInWorldCoords( tileExtent, &mapf );
+            osg::BoundingSphered tileBound = getBoundInWorldCoords( tileExtent );
 
             // Apply the tile range multiplier to calculate a max camera range. The max range is
             // the geographic radius of the tile times the multiplier.
@@ -701,8 +691,7 @@
                 // only build sub-pagedlods if we are expecting subtiles at some point:
                 if ( geometry != 0L || (int)lod < featureProfile->getFirstLevel() )
                 {
-                    MapFrame mapf = _session->createMapFrame();
-                    buildSubTilePagedLODs( lod, tileX, tileY, &mapf, group.get(), readOptions);
+                    buildSubTilePagedLODs( lod, tileX, tileY, group.get(), readOptions);
                     group->addChild( geometry );
                 }
 
@@ -749,8 +738,7 @@
             // PagedLODs that will load them.
             osg::ref_ptr<osg::Group> group = new osg::Group();
 
-            MapFrame mapf = _session->createMapFrame();
-            buildSubTilePagedLODs( lod, tileX, tileY, &mapf, group.get(), readOptions );
+            buildSubTilePagedLODs( lod, tileX, tileY, group.get(), readOptions );
 
             if ( geometry )
                 group->addChild( geometry );
@@ -791,7 +779,6 @@
 FeatureModelGraph::buildSubTilePagedLODs(unsigned        parentLOD,
                                          unsigned        parentTileX,
                                          unsigned        parentTileY,
-                                         const MapFrame* mapf,
                                          osg::Group*     parent,
                                          const osgDB::Options* readOptions)
 {
@@ -822,7 +809,7 @@
         for( unsigned v = subtileY; v <= subtileY + 1; ++v )
         {
             GeoExtent subtileFeatureExtent = s_getTileExtent( subtileLOD, u, v, _usableFeatureExtent );
-            osg::BoundingSphered subtile_bs = getBoundInWorldCoords( subtileFeatureExtent, mapf );
+            osg::BoundingSphered subtile_bs = getBoundInWorldCoords( subtileFeatureExtent );
       
             // Calculate the maximum camera range for the LOD.
             float maxRange;
@@ -894,12 +881,12 @@
     {
         if (key)
         {
-            return key->str();
+            return Cache::makeCacheKey(key->str(), "fmg");
         }
         else
         {
-            return Stringify() << osgEarth::hashString(
-                Stringify() << extent.toString() << level.styleName().get());
+            std::string b = Stringify() << extent.toString() << level.styleName().get();
+            return Cache::makeCacheKey(b, "fmg");
         }
     }
 }
@@ -921,8 +908,15 @@
     if (cacheBin && policy->isCacheReadable())
     {
         ++_cacheReads;
-        
+
+#if OSG_VERSION_GREATER_OR_EQUAL(3,6,3)
+        osg::ref_ptr<osgDB::Options> localOptions = Registry::instance()->cloneOrCreateOptions(readOptions);
+        localOptions->setObjectCache(_nodeCachingImageCache.get());
+        localOptions->setObjectCacheHint(osgDB::Options::CACHE_ALL);
+        ReadResult rr = cacheBin->readObject(cacheKey, localOptions.get());
+#else
         ReadResult rr = cacheBin->readObject(cacheKey, readOptions);
+#endif
 
         if (policy.isSet() && policy->isExpired(rr.lastModifiedTime()))
         {
@@ -941,6 +935,13 @@
             {
                 FeatureSourceIndexNode::reconstitute(group.get(), _featureIndex.get());
             }
+
+            // Share state between this newly loaded object and the rest of the session.
+            // This will prevent duplicated textures, etc. across cached tiles
+            if (_session->getStateSetCache())
+            {
+                _session->getStateSetCache()->optimize(group.get());
+            }
         }
         else if (rr.code() == ReadResult::RESULT_NOT_FOUND)
         {
@@ -1002,11 +1003,17 @@
 
     // Try to read it from a cache:
     std::string cacheKey = makeCacheKey(level, extent, key);
-    group = readTileFromCache(cacheKey, readOptions);
+
+    if (_options.nodeCaching() == true)
+    {
+        group = readTileFromCache(cacheKey, readOptions);
+    }
     
     // Not there? Build it
     if (!group.valid())
     {
+        osg::ref_ptr<ProgressCallback> progress = new ProgressCallback();
+
         // set up for feature indexing if appropriate:
         FeatureSourceIndexNode* index = 0L;
 
@@ -1037,8 +1044,6 @@
         if ( key )
             query.tileKey() = *key;
 
-        query.setMap(_session->createMapFrame());// _session->getMap() );
-
         // does the level have a style name set?
         if ( level.styleName().isSet() )
         {
@@ -1047,7 +1052,7 @@
             if ( style )
             {
                 // found a specific style to use.
-                node = createStyleGroup( *style, query, index, readOptions );
+                node = createStyleGroup( *style, query, index, readOptions, progress.get());
                 if ( node )
                     group->addChild( node );
             }
@@ -1056,7 +1061,7 @@
                 const StyleSelector* selector = _session->styles()->getSelector( *level.styleName() );
                 if ( selector )
                 {
-                    buildStyleGroups( selector, query, index, group.get(), readOptions );
+                    buildStyleGroups( selector, query, index, group.get(), readOptions, progress.get());
                 }
             }
         }
@@ -1072,13 +1077,18 @@
                     *_session->getFeatureSource()->getFeatureSourceOptions().name() );
             }
 
-            osg::Node* node = build(defaultStyle, query, extent, index, readOptions);
+            osg::Node* node = build(defaultStyle, query, extent, index, readOptions, progress.get());
             if ( node )
                 group->addChild( node );
         }
 
-        // cache it if appropriate.
-        if (_options.nodeCaching() == true)
+        if (progress->isCanceled())
+        {
+            group->removeChildren(0, group->getNumChildren());
+        }
+        
+        // cache it if appropriate (and not if it was canceled)
+        else if (_options.nodeCaching() == true)
         {
             writeTileToCache(cacheKey, group.get(), readOptions);
         }
@@ -1113,7 +1123,7 @@
                     ccExtent.getCentroid( tileCenter.x(), tileCenter.y() );
 
                     osg::Vec3d centerECEF;
-                    ccExtent.getSRS()->transform( tileCenter, _session->getMapSRS()->getECEF(), centerECEF );
+                    ccExtent.getSRS()->transform( tileCenter, _session->getMapSRS()->getGeocentricSRS(), centerECEF );
 
                     osg::NodeCallback* ccc = ClusterCullingFactory::create2( group.get(), centerECEF );
                     if ( ccc )
@@ -1137,7 +1147,8 @@
                          const Query&          baseQuery, 
                          const GeoExtent&      workingExtent,
                          FeatureIndexBuilder*  index,
-                         const osgDB::Options* readOptions)
+                         const osgDB::Options* readOptions,
+                         ProgressCallback*     progress)
 {
     OE_TEST << LC << "build " << workingExtent.toString() << std::endl;
 
@@ -1151,7 +1162,7 @@
         const FeatureProfile* featureProfile = source->getFeatureProfile();
 
         // each feature has its own style, so use that and ignore the style catalog.
-        osg::ref_ptr<FeatureCursor> cursor = source->createFeatureCursor( baseQuery );
+        osg::ref_ptr<FeatureCursor> cursor = source->createFeatureCursor( baseQuery, progress );
 
         while( cursor.valid() && cursor->hasMore() )
         {
@@ -1212,10 +1223,9 @@
                 {
                     // merge the selector's query into the existing query
                     Query combinedQuery = baseQuery.combineWith( *sel.query() );
-                    combinedQuery.setMap(_session->createMapFrame());// _session->getMap() );
 
                     // query, sort, and add each style group to th parent:
-                    queryAndSortIntoStyleGroups( combinedQuery, *sel.styleExpression(), index, group.get(), readOptions );
+                    queryAndSortIntoStyleGroups( combinedQuery, *sel.styleExpression(), index, group.get(), readOptions, progress);
                 }
 
                 // otherwise, all feature returned by this query will have the same style:
@@ -1227,10 +1237,9 @@
 
                     // .. and merge it's query into the existing query
                     Query combinedQuery = baseQuery.combineWith( *sel.query() );
-                    combinedQuery.setMap(_session->createMapFrame());// _session->getMap() );
 
                     // then create the node.
-                    osg::Group* styleGroup = createStyleGroup( combinedStyle, combinedQuery, index, readOptions );
+                    osg::Group* styleGroup = createStyleGroup( combinedStyle, combinedQuery, index, readOptions, progress);
 
                     if ( styleGroup && !group->containsNode(styleGroup) )
                         group->addChild( styleGroup );
@@ -1257,7 +1266,7 @@
             if ( defaultStyle.empty() )
                 combinedStyle = *styles->getDefaultStyle();
 
-            osg::Group* styleGroup = createStyleGroup( combinedStyle, baseQuery, index, readOptions );
+            osg::Group* styleGroup = createStyleGroup( combinedStyle, baseQuery, index, readOptions, progress);
 
             if ( styleGroup && !group->containsNode(styleGroup) )
                 group->addChild( styleGroup );
@@ -1286,7 +1295,8 @@
                                     const Query&          baseQuery,
                                     FeatureIndexBuilder*  index,
                                     osg::Group*           parent,
-                                    const osgDB::Options* readOptions)
+                                    const osgDB::Options* readOptions,
+                                    ProgressCallback*     progress)
 {
     OE_TEST << LC << "buildStyleGroups " << selector->name() << std::endl;
 
@@ -1296,10 +1306,9 @@
     {
         // merge the selector's query into the existing query
         Query combinedQuery = baseQuery.combineWith( *selector->query() );
-        combinedQuery.setMap(_session->createMapFrame());// _session->getMap() );
 
         // query, sort, and add each style group to the parent:
-        queryAndSortIntoStyleGroups( combinedQuery, *selector->styleExpression(), index, parent, readOptions );
+        queryAndSortIntoStyleGroups( combinedQuery, *selector->styleExpression(), index, parent, readOptions, progress);
     }
 
     // otherwise, all feature returned by this query will have the same style:
@@ -1313,10 +1322,9 @@
 
         // .. and merge it's query into the existing query
         Query combinedQuery = baseQuery.combineWith( *selector->query() );
-        combinedQuery.setMap(_session->createMapFrame());// _session->getMap() );
 
         // then create the node.
-        osg::Node* node = createStyleGroup(style, combinedQuery, index, readOptions);
+        osg::Node* node = createStyleGroup(style, combinedQuery, index, readOptions, progress);
         if ( node && !parent->containsNode(node) )
             parent->addChild( node );
     }
@@ -1335,7 +1343,8 @@
                                                const StringExpression& styleExpr,
                                                FeatureIndexBuilder*    index,
                                                osg::Group*             parent,
-                                               const osgDB::Options*   readOptions)
+                                               const osgDB::Options*   readOptions,
+                                               ProgressCallback*       progress)
 {
     OE_TEST << LC << "queryAndSortIntoStyleGroups " << std::endl;
 
@@ -1346,7 +1355,7 @@
     const GeoExtent& extent = featureProfile->getExtent();
     
     // query the feature source:
-    osg::ref_ptr<FeatureCursor> cursor = _session->getFeatureSource()->createFeatureCursor( query );
+    osg::ref_ptr<FeatureCursor> cursor = _session->getFeatureSource()->createFeatureCursor( query, progress );
     if ( !cursor.valid() )
         return;
 
@@ -1476,7 +1485,8 @@
 FeatureModelGraph::createStyleGroup(const Style&          style, 
                                     const Query&          query, 
                                     FeatureIndexBuilder*  index,
-                                    const osgDB::Options* readOptions)
+                                    const osgDB::Options* readOptions,
+                                    ProgressCallback*     progress)
 {
     OE_TEST << LC << "createStyleGroup " << style.getName() << std::endl;
 
@@ -1489,7 +1499,7 @@
     const GeoExtent& extent = featureProfile->getExtent();
     
     // query the feature source:
-    osg::ref_ptr<FeatureCursor> cursor = _session->getFeatureSource()->createFeatureCursor( query );
+    osg::ref_ptr<FeatureCursor> cursor = _session->getFeatureSource()->createFeatureCursor( query, progress );
 
     if ( cursor.valid() && cursor->hasMore() )
     {
@@ -1529,7 +1539,8 @@
             osg::StateSet* ss = node->getOrCreateStateSet();
             ss->setRenderBinDetails(
                 ss->getBinNumber(),
-                render->renderBin().get() );
+                render->renderBin().get(),
+                osg::StateSet::PROTECTED_RENDERBIN_DETAILS);
         }
 
         if ( render->order().isSet() )
@@ -1537,13 +1548,17 @@
             osg::StateSet* ss = node->getOrCreateStateSet();
             ss->setRenderBinDetails(
                 (int)render->order()->eval(),
-                ss->getBinName().empty() ? "DepthSortedBin" : ss->getBinName() );
+                ss->getBinName().empty() ? "DepthSortedBin" : ss->getBinName(),
+                osg::StateSet::PROTECTED_RENDERBIN_DETAILS );
         }
 
         if ( render->transparent() == true )
         {
             osg::StateSet* ss = node->getOrCreateStateSet();
-            ss->setRenderingHint( ss->TRANSPARENT_BIN );
+            ss->setRenderBinDetails(
+                10,
+                "DepthSortedBin",
+                osg::StateSet::PROTECTED_RENDERBIN_DETAILS);
         }
         
         if (render->decal() == true)
@@ -1656,17 +1671,17 @@
 
     float minRange = -FLT_MAX;
     if ( _options.minRange().isSet() ) 
-        minRange = std::max(minRange, *_options.minRange());
+        minRange = osg::maximum(minRange, *_options.minRange());
 
     if ( _options.layout().isSet() && _options.layout()->minRange().isSet() )
-        minRange = std::max(minRange, *_options.layout()->minRange());
+        minRange = osg::maximum(minRange, *_options.layout()->minRange());
 
     float maxRange = FLT_MAX;
     if ( _options.maxRange().isSet() ) 
-        maxRange = std::min(maxRange, *_options.maxRange());
+        maxRange = osg::minimum(maxRange, *_options.maxRange());
 
     if ( _options.layout().isSet() && _options.layout()->maxRange().isSet() )
-        maxRange = std::min(maxRange, *_options.layout()->maxRange());
+        maxRange = osg::minimum(maxRange, *_options.layout()->maxRange());
     
     //If they've specified a min/max range, setup an LOD
     if ( minRange != -FLT_MAX || maxRange != FLT_MAX )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelLayer osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelLayer
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -28,12 +28,17 @@
 #include <osgEarthSymbology/Style>
 #include <osgEarth/Layer>
 #include <osgEarth/LayerListener>
-#include <osgEarth/SceneGraphCallback>
+
+namespace osgEarth {
+    class Map;
+}
 
 namespace osgEarth { namespace Features
 {
     using namespace osgEarth;
 
+    class FeatureNodeFactory;
+
     /**
      * Serializable options to configure a FeatureModelLayer
      */
@@ -67,26 +72,42 @@
     class OSGEARTHFEATURES_EXPORT FeatureModelLayer : public VisibleLayer
     {
     public:
-        META_Layer(osgEarth, FeatureModelLayer, FeatureModelLayerOptions);
+        META_Layer(osgEarth, FeatureModelLayer, FeatureModelLayerOptions, feature_model);
 
-        // Create a feature layer with defaults. Use options() to set it up before adding
-        // the layer to a Map.
+        //! Create a feature layer with defaults. Use options() to set it up before adding
+        //! the layer to a Map.
         FeatureModelLayer();
 
-        // Create a layer with initial options.
+        //! Create a layer with initial options.
         FeatureModelLayer(const FeatureModelLayerOptions& options);
 
-        // Options used to initialize this layer.
+        //! Options used to initialize this layer.
         const FeatureModelLayerOptions& getFeatureModelLayerOptions() const { return *_options; }
 
-        // Feature source layer from which to get a feature source
+        //! Sets the options to initilize the layer
+        void setFeatureModelLayerOptions(const FeatureModelLayerOptions& options);
+
+        //! Feature source layer from which to get a feature source. Use this OR setFeatureSource
         void setFeatureSourceLayer(FeatureSourceLayer* layer);
         
-        // the feature source from which to read flattening geometry
+        //! The feature source from which to read geometry. Use this OR setFeatureLayer
         void setFeatureSource(FeatureSource* fs);
+        FeatureSource* getFeatureSource() const;
+
+        //! Forces a rebuild on this FeatureModelLayer.
+        void dirty();
+
+    public:
+        class CreateFeatureNodeFactoryCallback : public osg::Referenced {
+        public:
+            virtual FeatureNodeFactory* createFeatureNodeFactory(const FeatureModelLayerOptions&) =0;
+        };
+
+        //! Callback that will create a new FeatureNodeFactory for this layer to use
+        //! to transform feature data into OSG scene graphs
+        void setCreateFeatureNodeFactoryCallback(CreateFeatureNodeFactoryCallback* callback);
+        CreateFeatureNodeFactoryCallback* getCreateFeatureNodeFactoryCallback() const;
 
-        // access to scene graph callbacks
-        SceneGraphCallbacks* getSceneGraphCallbacks() { return _sgCallbacks.get(); }
 
     public: // Layer
 
@@ -94,7 +115,7 @@
         virtual const Status& open();
 
         // The Node representing this layer.
-        virtual osg::Node* getOrCreateNode();
+        virtual osg::Node* getNode() const;
 
         //! Extent of the feature layer, if available (INVALID if not)
         virtual const GeoExtent& getExtent() const;
@@ -102,10 +123,10 @@
     protected: // Layer
         
         // called by the map when this layer is added
-        virtual void addedToMap(const class Map*);
+        virtual void addedToMap(const Map*);
 
         // called by the map when this layer is removed
-        virtual void removedFromMap(const class Map*);
+        virtual void removedFromMap(const Map*);
 
         // post-ctor initialization
         virtual void init();
@@ -114,15 +135,19 @@
 
         virtual ~FeatureModelLayer();
 
+        //! You can override this as an alternative to setting the CreateFeatureNodeFactoryCallback
+        virtual FeatureNodeFactory* createFeatureNodeFactoryImplementation() const;
+
     private:
         osg::ref_ptr<FeatureSource> _featureSource;
         LayerListener<FeatureModelLayer, FeatureSourceLayer> _featureSourceLayerListener;
         osg::ref_ptr<class Session> _session;
         osg::ref_ptr<osg::Group> _root;
         bool _graphDirty;
+        osg::ref_ptr<CreateFeatureNodeFactoryCallback> _createFactoryCallback;
+        
         void create();
-
-        osg::ref_ptr<SceneGraphCallbacks> _sgCallbacks;
+        FeatureNodeFactory* createFeatureNodeFactory();
     };
 
 } } // namespace osgEarth::Features
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@
         
 void FeatureModelLayerOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet("feature_source", _featureSourceLayer);
+    conf.get("feature_source", _featureSourceLayer);
 }
 
 Config
@@ -50,7 +50,6 @@
     Config conf = VisibleLayerOptions::getConfig();
     conf.merge(FeatureModelOptions::getConfig());
     conf.merge(GeometryCompilerOptions::getConfig());
-    conf.key() = "feature_model";
 
     conf.set("feature_source", _featureSourceLayer);
     return conf;
@@ -94,15 +93,29 @@
     // Assign the layer's state set to the root node:
     _root->setStateSet(this->getOrCreateStateSet());
 
-    // Callbacks for paged data
-    _sgCallbacks = new SceneGraphCallbacks();
-
     // Graph needs rebuilding
     _graphDirty = true;
 
     // Depth sorting by default
     getOrCreateStateSet()->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
 
+    // activate opacity support
+    installDefaultOpacityShader();
+}
+
+void FeatureModelLayer::setFeatureModelLayerOptions(const FeatureModelLayerOptions& options)
+{
+    *_options = options;
+    dirty();
+}
+
+void FeatureModelLayer::dirty()
+{
+    // feature source changed, so the graph needs rebuilding
+    _graphDirty = true;
+
+    // create the scene graph
+    create();
 }
 
 void
@@ -138,16 +151,30 @@
             return;
         }
 
-        // feature source changed, so the graph needs rebuilding
-        _graphDirty = true;
-
-        // create the scene graph
-        create();
+        dirty();
     }
 }
 
+FeatureSource*
+FeatureModelLayer::getFeatureSource() const
+{
+    return _featureSource.get();
+}
+
+void
+FeatureModelLayer::setCreateFeatureNodeFactoryCallback(CreateFeatureNodeFactoryCallback* value)
+{
+    _createFactoryCallback = value;
+}
+
+FeatureModelLayer::CreateFeatureNodeFactoryCallback*
+FeatureModelLayer::getCreateFeatureNodeFactoryCallback() const
+{
+    return _createFactoryCallback.get();
+}
+
 osg::Node*
-FeatureModelLayer::getOrCreateNode()
+FeatureModelLayer::getNode() const
 {
     return _root.get();
 }
@@ -205,15 +232,24 @@
             this,
             &FeatureModelLayer::setFeatureSourceLayer);
     }
-
-    // re-create the graph if necessary.
-    create();
+    else
+    {
+        // re-create the graph if necessary.
+        create();
+    }
 }
 
 void
 FeatureModelLayer::removedFromMap(const Map* map)
 {
     _featureSourceLayerListener.clear();
+    
+    if (_root.valid())
+    {
+        _root->removeChildren(0, _root->getNumChildren());
+    }
+
+    _session = 0L;
 }
 
 void
@@ -229,14 +265,14 @@
             _session->setFeatureSource(_featureSource.get());
 
             // the factory builds nodes for the model graph:
-            FeatureNodeFactory* nodeFactory = new GeomFeatureNodeFactory(options());
+            FeatureNodeFactory* nodeFactory = createFeatureNodeFactory();
 
             // group that will build all the feature geometry:
             FeatureModelGraph* fmg = new FeatureModelGraph(
                 _session.get(),
                 options(),
                 nodeFactory,
-                _sgCallbacks.get());
+                getSceneGraphCallbacks());
 
             _root->removeChildren(0, _root->getNumChildren());
             _root->addChild(fmg);
@@ -247,9 +283,27 @@
             setStatus(Status::OK());
         }
 
-        else if (getStatus().isOK())
-        {
-            setStatus(Status(Status::ConfigurationError));
-        }
+        //else if (getStatus().isOK())
+        //{
+        //    if (!_featureSource.valid())
+        //        setStatus(Status(Status::ConfigurationError, "No feature source"));
+        //    else if (!_session.valid())
+        //        setStatus(Status(Status::ConfigurationError, "No Session"));
+        //}
     }
 }
+
+FeatureNodeFactory*
+FeatureModelLayer::createFeatureNodeFactoryImplementation() const
+{
+    return new GeomFeatureNodeFactory(options());
+}
+
+FeatureNodeFactory*
+FeatureModelLayer::createFeatureNodeFactory()
+{
+    if (_createFactoryCallback.valid())
+        return _createFactoryCallback->createFeatureNodeFactory(options());
+    else
+        return createFeatureNodeFactoryImplementation();
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelSource osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelSource
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelSource.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureModelSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureModelSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -25,13 +25,18 @@
 #include <osgEarth/Capabilities>
 #include <osgEarth/DrapeableNode>
 #include <osgEarth/ClampableNode>
-#include <osgEarth/Lighting>
+#include <osgEarth/GLUtils>
+#include <osgEarth/Progress>
 #include <osg/Notify>
 
 using namespace osgEarth;
 using namespace osgEarth::Features;
 using namespace osgEarth::Symbology;
 
+#ifndef GL_CLIP_DISTANCE0
+#define GL_CLIP_DISTANCE0 0x3000
+#endif
+
 #define LC "[FeatureModelSource] "
 
 //........................................................................
@@ -51,27 +56,26 @@
 void
 FeatureModelOptions::fromConfig(const Config& conf)
 {
-    conf.getObjIfSet("features", _featureSource);
+    conf.get("features", _featureSource);
 
-    conf.getObjIfSet( "styles",           _styles );
-    conf.getObjIfSet( "layout",           _layout );
-    conf.getObjIfSet( "paging",           _layout ); // backwards compat.. to be deprecated
-    conf.getObjIfSet( "fading",           _fading );
-    conf.getObjIfSet( "feature_name",     _featureNameExpr );
-    conf.getObjIfSet( "feature_indexing", _featureIndexing );
-
-    conf.getIfSet( "lighting",         _lit );
-    conf.getIfSet( "max_granularity",  _maxGranularity_deg );
-    conf.getIfSet( "cluster_culling",  _clusterCulling );
-    conf.getIfSet( "backface_culling", _backfaceCulling );
-    conf.getIfSet( "alpha_blending",   _alphaBlending );
-    conf.getIfSet( "node_caching",     _nodeCaching );
+    conf.get( "styles",           _styles );
+    conf.get( "layout",           _layout );
+    conf.get( "fading",           _fading );
+    conf.get( "feature_name",     _featureNameExpr );
+    conf.get( "feature_indexing", _featureIndexing );
+
+    conf.get( "lighting",         _lit );
+    conf.get( "max_granularity",  _maxGranularity_deg );
+    conf.get( "cluster_culling",  _clusterCulling );
+    conf.get( "backface_culling", _backfaceCulling );
+    conf.get( "alpha_blending",   _alphaBlending );
+    conf.get( "node_caching",     _nodeCaching );
     
-    conf.getIfSet( "session_wide_resource_cache", _sessionWideResourceCache );
+    conf.get( "session_wide_resource_cache", _sessionWideResourceCache );
 
     // Support a singleton style (convenience)
     optional<Style> style;
-    conf.getObjIfSet("style", style);
+    conf.get("style", style);
     if (style.isSet())
     {
         if (_styles.valid() == false) _styles = new StyleSheet();
@@ -83,13 +87,13 @@
 FeatureModelOptions::getConfig() const
 {
     Config conf;
-    conf.setObj("features", _featureSource);
+    conf.set("features", _featureSource);
 
-    conf.setObj( "styles",           _styles );
-    conf.setObj( "layout",           _layout );
-    conf.setObj( "fading",           _fading );
-    conf.setObj( "feature_name",     _featureNameExpr );
-    conf.setObj( "feature_indexing", _featureIndexing );
+    conf.set( "styles",           _styles );
+    conf.set( "layout",           _layout );
+    conf.set( "fading",           _fading );
+    conf.set( "feature_name",     _featureNameExpr );
+    conf.set( "feature_indexing", _featureIndexing );
 
     conf.set( "lighting",         _lit );
     conf.set( "max_granularity",  _maxGranularity_deg );
@@ -115,24 +119,23 @@
 void
 FeatureModelSourceOptions::fromConfig( const Config& conf )
 {
-    conf.getObjIfSet( "features", _featureOptions );
+    conf.get( "features", _featureOptions );
     _featureSource = conf.getNonSerializable<FeatureSource>("feature_source");
     
-    conf.getObjIfSet( "styles",           _styles );
-    conf.getObjIfSet( "layout",           _layout );
-    conf.getObjIfSet( "paging",           _layout ); // backwards compat.. to be deprecated
-    conf.getObjIfSet( "fading",           _fading );
-    conf.getObjIfSet( "feature_name",     _featureNameExpr );
-    conf.getObjIfSet( "feature_indexing", _featureIndexing );
-
-    conf.getIfSet( "lighting",         _lit );
-    conf.getIfSet( "max_granularity",  _maxGranularity_deg );
-    conf.getIfSet( "cluster_culling",  _clusterCulling );
-    conf.getIfSet( "backface_culling", _backfaceCulling );
-    conf.getIfSet( "alpha_blending",   _alphaBlending );
-    conf.getIfSet( "node_caching",     _nodeCaching );
+    conf.get( "styles",           _styles );
+    conf.get( "layout",           _layout );
+    conf.get( "fading",           _fading );
+    conf.get( "feature_name",     _featureNameExpr );
+    conf.get( "feature_indexing", _featureIndexing );
+
+    conf.get( "lighting",         _lit );
+    conf.get( "max_granularity",  _maxGranularity_deg );
+    conf.get( "cluster_culling",  _clusterCulling );
+    conf.get( "backface_culling", _backfaceCulling );
+    conf.get( "alpha_blending",   _alphaBlending );
+    conf.get( "node_caching",     _nodeCaching );
     
-    conf.getIfSet( "session_wide_resource_cache", _sessionWideResourceCache );
+    conf.get( "session_wide_resource_cache", _sessionWideResourceCache );
 }
 
 Config
@@ -140,18 +143,18 @@
 {
     Config conf = ModelSourceOptions::getConfig();
 
-    conf.setObj( "features", _featureOptions );    
+    conf.set( "features", _featureOptions );    
     if (_featureSource.valid())
     {
-        conf.addNonSerializable("feature_source", _featureSource.get());
+        conf.setNonSerializable("feature_source", _featureSource.get());
     }
     conf.set("feature_source", _featureSourceLayer);
 
-    conf.setObj( "styles",           _styles );
-    conf.setObj( "layout",           _layout );
-    conf.setObj( "fading",           _fading );
-    conf.setObj( "feature_name",     _featureNameExpr );
-    conf.setObj( "feature_indexing", _featureIndexing );
+    conf.set( "styles",           _styles );
+    conf.set( "layout",           _layout );
+    conf.set( "fading",           _fading );
+    conf.set( "feature_name",     _featureNameExpr );
+    conf.set( "feature_indexing", _featureIndexing );
 
     conf.set( "lighting",         _lit );
     conf.set( "max_granularity",  _maxGranularity_deg );
@@ -208,7 +211,9 @@
         return Status::Error(Status::ServiceUnavailable, "Failed to create a feature driver");
 
     // open the feature source if it exists:
-    const Status& featuresStatus = _features->open(_readOptions.get());
+    _features->setReadOptions(_readOptions.get());
+
+    const Status& featuresStatus = _features->open();
     if (featuresStatus.isError())
         return featuresStatus;
 
@@ -287,7 +292,7 @@
 
     // Graph that will render feature models. May included paged data.
     FeatureModelGraph* graph = new FeatureModelGraph(session, _options, factory, getSceneGraphCallbacks());
-    graph->setSceneGraphCallbacks(getSceneGraphCallbacks());
+
     return graph;
 }
 
@@ -339,16 +344,9 @@
         {
             osg::StateSet* stateset = group->getOrCreateStateSet();
 
-            stateset->setMode(
-                GL_LIGHTING,
+            GLUtils::setLighting(
+                stateset,
                 (render->lighting() == true ? osg::StateAttribute::ON : osg::StateAttribute::OFF) | osg::StateAttribute::OVERRIDE );
-
-            if ( Registry::capabilities().supportsGLSL() )
-            {
-                stateset->setDefine(OE_LIGHTING_DEFINE, render->lighting().get());
-                //stateset->addUniform( Registry::shaderFactory()->createUniformForGLMode(
-                //    GL_LIGHTING, render->lighting().value()));
-            }
         }
 
         if ( render->backfaceCulling().isSet() )
@@ -358,10 +356,10 @@
                 (render->backfaceCulling() == true ? osg::StateAttribute::ON : osg::StateAttribute::OFF) | osg::StateAttribute::OVERRIDE );
         }
 
-#if !(defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE) || defined(OSG_GL3_AVAILABLE) )
+#if !(defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE))
         if ( render->clipPlane().isSet() )
         {
-            GLenum mode = GL_CLIP_PLANE0 + (render->clipPlane().value());
+            GLenum mode = GL_CLIP_DISTANCE0 + (render->clipPlane().value());
             group->getOrCreateStateSet()->setMode(mode, 1);
         }
 #endif
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSource osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSource
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -107,18 +107,27 @@
     class OSGEARTHFEATURES_EXPORT FeatureSource : public osg::Object, public Revisioned
     {
     public:      
-        /**
-         * Constructs a new feature source with the provided read/write options.
-         */
-        FeatureSource(
-            const ConfigOptions&  options =ConfigOptions(),
-            const osgDB::Options* readOptions =0L );
+        //! Constructs a new feature source
+        FeatureSource();
+        
+        //! Constructs a new feature source with preset options
+        FeatureSource(const ConfigOptions& options);
+        
+        //! Apply the read options
+        void setReadOptions(const osgDB::Options* readOptions);
 
-        /**
-         * Opens the feature source and returns an initial status.
-         */
+        //! Opens the feature source and returns an initial status.
+        const Status& open();
+
+        //! Opens the feature source and returns an initial status.
+        //! Same as calling setReadOptions followed by open()
         const Status& open(const osgDB::Options* readOptions);
-        const Status& open() { return open(0L); }
+
+        virtual const Status& create(
+            const FeatureProfile* profile,
+            const FeatureSchema& schema,
+            const Geometry::Type& geometryType,
+            const osgDB::Options* readOptions);
 
         /**
          * Status of the feature source
@@ -143,8 +152,9 @@
          *
          * Caller takes ownership of the returned object.
          */
-        virtual FeatureCursor* createFeatureCursor(const Symbology::Query& query) =0;
-        FeatureCursor* createFeatureCursor();
+        virtual FeatureCursor* createFeatureCursor(const Symbology::Query& query, ProgressCallback* progress) =0;
+
+        FeatureCursor* createFeatureCursor(ProgressCallback* progress);
 
         /**
          * Whether this FeatureSource supports inserting and deleting features
@@ -258,9 +268,6 @@
          * Dirties the feature profile
          */
         void dirtyFeatureProfile() { _featureProfile = 0;}
-
-        
-        void setReadOptions(const osgDB::Options* readOptions) { _readOptions = readOptions; }
         
     protected:
         
@@ -302,7 +309,6 @@
 
         Status                             _status;
 
-        friend class Map;
         friend class FeatureSourceFactory;
     };
 
@@ -325,7 +331,9 @@
         static FeatureSource* create( const FeatureSourceOptions& options );
     };
 
-} } // namespace osgEarth::Features
+} }  // namespace osgEarth::Features
+
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Features::FeatureSourceOptions);
 
 #endif // OSGEARTHFEATURES_FEATURE_SOURCE_H
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSource.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -48,13 +48,13 @@
 {
     unsigned numResamples = 0;
 
-    conf.getIfSet   ( "open_write",   _openWrite );
-    conf.getIfSet   ( "name",         _name );
-    conf.getObjIfSet( "profile",      _profile );
-    conf.getObjIfSet( "cache_policy", _cachePolicy );
-    conf.getIfSet   ( "geo_interpolation", "great_circle", _geoInterp, GEOINTERP_GREAT_CIRCLE );
-    conf.getIfSet   ( "geo_interpolation", "rhumb_line",   _geoInterp, GEOINTERP_RHUMB_LINE );
-    conf.getIfSet   ( "fid_attribute", _fidAttribute );
+    conf.get( "open_write",   _openWrite );
+    conf.get( "name",         _name );
+    conf.get( "profile",      _profile );
+    conf.get( "cache_policy", _cachePolicy );
+    conf.get( "geo_interpolation", "great_circle", _geoInterp, GEOINTERP_GREAT_CIRCLE );
+    conf.get( "geo_interpolation", "rhumb_line",   _geoInterp, GEOINTERP_RHUMB_LINE );
+    conf.get( "fid_attribute", _fidAttribute );
 
     // For backwards-compatibility (before adding the "filters" block)
     // TODO: Remove at some point in the distant future.
@@ -75,13 +75,13 @@
 {
     Config conf = DriverConfigOptions::getConfig();
 
-    conf.updateIfSet   ( "open_write",   _openWrite );
-    conf.updateIfSet   ( "name",         _name );
-    conf.setObj( "profile",      _profile );
-    conf.setObj( "cache_policy", _cachePolicy );
-    conf.updateIfSet   ( "geo_interpolation", "great_circle", _geoInterp, GEOINTERP_GREAT_CIRCLE );
-    conf.updateIfSet   ( "geo_interpolation", "rhumb_line",   _geoInterp, GEOINTERP_RHUMB_LINE );
-    conf.updateIfSet   ( "fid_attribute", _fidAttribute );
+    conf.set( "open_write",   _openWrite );
+    conf.set( "name",         _name );
+    conf.set( "profile",      _profile );
+    conf.set( "cache_policy", _cachePolicy );
+    conf.set( "geo_interpolation", "great_circle", _geoInterp, GEOINTERP_GREAT_CIRCLE );
+    conf.set( "geo_interpolation", "rhumb_line",   _geoInterp, GEOINTERP_RHUMB_LINE );
+    conf.set( "fid_attribute", _fidAttribute );
 
     if ( !_filterOptions.empty() )
     {
@@ -90,7 +90,7 @@
         {
             filters.add( _filterOptions[i].getConfig() );
         }
-        conf.update( "filters", filters );
+        conf.set( "filters", filters );
     }
 
     return conf;
@@ -98,12 +98,16 @@
 
 //------------------------------------------------------------------------
 
-FeatureSource::FeatureSource(const ConfigOptions&  options,
-                             const osgDB::Options* readOptions) :
-_options( options )
+
+FeatureSource::FeatureSource()
 {    
-    _readOptions  = readOptions;
-    _uriContext  = URIContext( _readOptions.get() );
+    //nop
+}
+
+FeatureSource::FeatureSource(const ConfigOptions&  options) :
+_options( options )
+{
+    //nop
 }
 
 FeatureSource::~FeatureSource()
@@ -111,12 +115,23 @@
     //nop
 }
 
+void
+FeatureSource::setReadOptions(const osgDB::Options* readOptions)
+{
+    _readOptions = readOptions;
+    _uriContext = URIContext(_readOptions.get());
+}
+
 const Status&
 FeatureSource::open(const osgDB::Options* readOptions)
 {
-    if ( readOptions )
-        _readOptions = readOptions;
-    
+    setReadOptions(readOptions);
+    return open();
+}
+
+const Status&
+FeatureSource::open()
+{    
     // Create and initialize the filters.
     for(unsigned i=0; i<_options.filters().size(); ++i)
     {
@@ -128,11 +143,22 @@
                 _filters = new FeatureFilterChain();
 
             _filters->push_back( filter );
-            filter->initialize( readOptions );
+            filter->initialize(_readOptions.get());
         }
     }
 
-    _status = initialize(readOptions);
+    _status = initialize(_readOptions.get());
+    return _status;
+}
+
+const Status&
+FeatureSource::create(
+    const FeatureProfile* profile,
+    const FeatureSchema& schema,
+    const Geometry::Type& geometryType,
+    const osgDB::Options* readOptions)
+{
+    _status = Status::Error(Status::ResourceUnavailable, "Driver does not support create");
     return _status;
 }
 
@@ -149,9 +175,9 @@
 }
 
 FeatureCursor*
-FeatureSource::createFeatureCursor()
+FeatureSource::createFeatureCursor(ProgressCallback* progress)
 {
-    return createFeatureCursor(Symbology::Query());
+    return createFeatureCursor(Symbology::Query(), progress);
 }
 
 const FeatureSchema&
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSourceIndexNode osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSourceIndexNode
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSourceIndexNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSourceIndexNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -210,4 +210,6 @@
 
 } } // namespace osgEarth::Features
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Features::FeatureSourceIndexOptions);
+
 #endif // OSGEARTHFEATURES_FEATURE_SOURCE_INDEX_NODE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSourceIndexNode.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSourceIndexNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSourceIndexNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSourceIndexNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -32,21 +32,17 @@
 {
     // nifty template to iterate over a map's keys
     template<typename T>
-    struct KeyIter : public T::iterator
+    struct KeyIter : public std::iterator<std::input_iterator_tag, typename T::value_type>
     {
-        KeyIter() : T::iterator() { }
-        KeyIter(typename T::iterator i) : T::iterator(i) { }
-        typename T::key_type* operator->() { return (typename T::key_type* const)&(T::iterator::operator->()->first); }
-        typename T::key_type operator*() { return T::iterator::operator*().first; }
-    };
-
-    template<typename T>
-    struct ConstKeyIter : public T::const_iterator
-    {
-        ConstKeyIter() : T::const_iterator() { }
-        ConstKeyIter(typename T::const_iterator i) : T::const_iterator(i) { }
-        typename T::key_type* operator->() { return (typename T::key_type* const)&(T::const_iterator::operator->()->first); }
-        typename T::key_type operator*() { return T::const_iterator::operator*().first; }
+		typename T::const_iterator it;
+        KeyIter(typename T::const_iterator i) : it(i) { }
+		KeyIter &operator++() {	++it; return *this;	}
+		KeyIter operator++(int) { KeyIter t = *this; ++*this; return t; }
+
+		typename T::key_type const *operator->() const { return &(it->first); }
+		typename T::key_type const &operator*() const {	return it->first; }
+		friend bool operator==(KeyIter const &a, KeyIter const &b) { return a.it == b.it; }
+		friend bool operator!=(KeyIter const &a, KeyIter const &b) { return a.it != b.it; }
     };
 }
 
@@ -57,16 +53,16 @@
 _enabled      ( true ),
 _embedFeatures( false )
 {
-    conf.getIfSet( "enabled",        _enabled );
-    conf.getIfSet( "embed_features", _embedFeatures );
+    conf.get( "enabled",        _enabled );
+    conf.get( "embed_features", _embedFeatures );
 }
 
 Config
 FeatureSourceIndexOptions::getConfig() const
 {
     Config conf("feature_indexing");
-    conf.addIfSet( "enabled",        _enabled );
-    conf.addIfSet( "embed_features", _embedFeatures );
+    conf.set( "enabled",        _enabled );
+    conf.set( "embed_features", _embedFeatures );
     return conf;
 }
 
@@ -99,7 +95,7 @@
     {
         // must copy and clear the original list first to dereference the RefIDPair instances.
         std::set<FeatureID> fidsToRemove;
-        fidsToRemove.insert( KeyIter<FIDMap>(_fids.begin()), KeyIter<FIDMap>(_fids.end()) );
+        fidsToRemove.insert(KeyIter<FIDMap>(_fids.begin()), KeyIter<FIDMap>(_fids.end()));
         _fids.clear();
 
         OE_DEBUG << LC << "Removing " << fidsToRemove.size() << " fids\n";
@@ -137,9 +133,9 @@
 bool
 FeatureSourceIndexNode::getAllFIDs(std::vector<FeatureID>& output) const
 {
-    ConstKeyIter<FIDMap> start( _fids.begin() );
-    ConstKeyIter<FIDMap> end  ( _fids.end() );
-    for(ConstKeyIter<FIDMap> i = start; i != end; ++i )
+    KeyIter<FIDMap> start( _fids.begin() );
+    KeyIter<FIDMap> end  ( _fids.end() );
+    for(KeyIter<FIDMap> i = start; i != end; ++i )
     {
         output.push_back( *i );
     }
@@ -268,8 +264,10 @@
 #include <osgDB/InputStream>
 #include <osgDB/OutputStream>
 
-namespace
+namespace osgEarth { namespace Serializers { namespace FeatureSourceIndexNodeClass
 {
+    using namespace osgEarth::Features;
+
     bool checkFIDMap(const FeatureSourceIndexNode& node)
     {
         return !node.getFIDMap().empty();
@@ -314,23 +312,6 @@
         return true;
     }
 
-#if 0
-    bool checkEmbeddedFeatures(const FeatureSourceIndexNode& node)
-    {
-        return false; //todo
-    }
-
-    bool writeEmbeddedFeatures(osgDB::OutputStream& os, const FeatureSourceIndexNode& node)
-    {
-        return true;
-    }
-
-    bool readEmbeddedFeatures(osgDB::InputStream& is, FeatureSourceIndexNode& node)
-    {
-        return true;
-    }
-#endif
-
     REGISTER_OBJECT_WRAPPER(
         FeatureSourceIndexNode,
         new osgEarth::Features::FeatureSourceIndexNode,
@@ -339,7 +320,8 @@
     {
         ADD_USER_SERIALIZER(FIDMap);
     }
-}
+
+} } }
 
 //-----------------------------------------------------------------------------
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSourceLayer osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSourceLayer
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSourceLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSourceLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 #define OSGEARTH_FEATURES_FEATURE_SOURCE_LAYER_H 1
 
 #include <osgEarthFeatures/FeatureSource>
+#include <osgEarth/Layer>
 
 namespace osgEarth { namespace Features
 {
@@ -37,8 +38,11 @@
         const optional<FeatureSourceOptions>& featureSource() const { return _featureSource; }
 
     public:
-        Config getConfig() const {
-            return _featureSource->getConfig();
+        virtual Config getConfig() const {
+            Config conf = LayerOptions::getConfig();
+            if (_featureSource.isSet())
+                conf.merge(_featureSource->getConfig());
+            return conf;
         }
     private:
         optional<FeatureSourceOptions> _featureSource;
@@ -53,7 +57,7 @@
     class OSGEARTHFEATURES_EXPORT FeatureSourceLayer : public Layer
     {
     public:
-        META_Layer(osgEarth, FeatureSourceLayer, FeatureSourceLayerOptions);
+        META_Layer(osgEarth, FeatureSourceLayer, FeatureSourceLayerOptions, feature_source);
 
         /**
          * Construct an empty feature source layer.
@@ -80,12 +84,12 @@
          */
         virtual const Status& open();
 
-        // Serialize this layer.
-        virtual Config getConfig() const;
-
 
     protected:
         osg::ref_ptr<FeatureSource> _featureSource;
+
+        // constructor for subclasses
+        FeatureSourceLayer(FeatureSourceLayerOptions* options);
     };
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSourceLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSourceLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureSourceLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureSourceLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -46,6 +46,13 @@
     init();
 }
 
+FeatureSourceLayer::FeatureSourceLayer(FeatureSourceLayerOptions* optionsPtr) :
+Layer(optionsPtr? optionsPtr : &_optionsConcrete),
+_options(optionsPtr? optionsPtr : &_optionsConcrete)
+{
+    // init() will be called by base class
+}
+
 void
 FeatureSourceLayer::setFeatureSource(FeatureSource* value)
 {
@@ -84,11 +91,3 @@
 
     return getStatus();
 }
-
-Config
-FeatureSourceLayer::getConfig() const
-{
-    Config conf = Layer::getConfig();
-    conf.key() = "feature_source";
-    return conf;
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureTileSource osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureTileSource
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureTileSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureTileSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -26,8 +26,7 @@
 #include <osgEarth/TileSource>
 #include <osgEarth/Map>
 #include <osg/Node>
-#include <osgDB/ReaderWriter>
-#include <list>
+#include <osgDB/Options>
 
 namespace osgEarth { namespace Features
 {
@@ -163,7 +162,11 @@
          * Gets all of the features to be rendered for the given query.
          * If a TileKey is specified on the query this will attempt to fallback on previous levels to get feature data.
          */
-        void getFeatures(const Query& query, const GeoExtent& imageExtent, FeatureList& features);
+        void getFeatures(
+            const Query& query,
+            const GeoExtent& imageExtent,
+            FeatureList& features,
+            ProgressCallback* progress);
 
     public:
 
@@ -191,7 +194,8 @@
             const Query&     query,
             osg::Referenced* data,
             const GeoExtent& imageExtent,
-            osg::Image*      out_image );
+            osg::Image*      out_image,
+            ProgressCallback* progress);
     };
 
     } } // namespace osgEarth::Features
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FeatureTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FeatureTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 #include <osgEarthFeatures/FeatureCursor>
 
 #include <osgEarth/Registry>
+#include <osgEarth/Progress>
 
 #include <osgDB/WriteFile>
 #include <osg/Notify>
@@ -45,16 +46,16 @@
 {
     Config conf = TileSourceOptions::getConfig();
 
-    conf.setObj( "features", _featureOptions );
-    conf.setObj( "styles", _styles );
+    conf.set( "features", _featureOptions );
+    conf.set( "styles", _styles );
 
     if ( _geomTypeOverride.isSet() ) {
         if ( _geomTypeOverride == Geometry::TYPE_LINESTRING )
-            conf.update( "geometry_type", "line" );
+            conf.set( "geometry_type", "line" );
         else if ( _geomTypeOverride == Geometry::TYPE_POINTSET )
-            conf.update( "geometry_type", "point" );
+            conf.set( "geometry_type", "point" );
         else if ( _geomTypeOverride == Geometry::TYPE_POLYGON )
-            conf.update( "geometry_type", "polygon" );
+            conf.set( "geometry_type", "polygon" );
     }
 
     return conf;
@@ -70,9 +71,9 @@
 void
 FeatureTileSourceOptions::fromConfig( const Config& conf )
 {
-    conf.getObjIfSet( "features", _featureOptions );
+    conf.get( "features", _featureOptions );
 
-    conf.getObjIfSet( "styles", _styles );
+    conf.get( "styles", _styles );
     
     std::string gt = conf.value( "geometry_type" );
     if ( gt == "line" || gt == "lines" || gt == "linestring" )
@@ -188,7 +189,7 @@
     {
 
         // Each feature has its own embedded style data, so use that:
-        osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor(defaultQuery);
+        osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor(defaultQuery, progress);
         while( cursor.valid() && cursor->hasMore() )
         {
             osg::ref_ptr< Feature > feature = cursor->nextFeature();
@@ -224,7 +225,7 @@
                     StringExpression styleExprCopy(  sel.styleExpression().get() );
 
                     FeatureList features;
-                    getFeatures(defaultQuery, key.getExtent(), features);
+                    getFeatures(defaultQuery, key.getExtent(), features, progress);
                     if (!features.empty())
                     {
                         for (FeatureList::iterator itr = features.begin(); itr != features.end(); ++itr)
@@ -279,19 +280,19 @@
                     const Style* style = styles->getStyle( sel.getSelectedStyleName() );
                     Query query = sel.query().get();
                     query.tileKey() = key;
-                    queryAndRenderFeaturesForStyle( *style, query, buildData.get(), key.getExtent(), image.get() );
+                    queryAndRenderFeaturesForStyle( *style, query, buildData.get(), key.getExtent(), image.get(), progress);
                 }
             }
         }
         else
         {
             const Style* style = styles->getDefaultStyle();
-            queryAndRenderFeaturesForStyle( *style, defaultQuery, buildData.get(), key.getExtent(), image.get() );
+            queryAndRenderFeaturesForStyle( *style, defaultQuery, buildData.get(), key.getExtent(), image.get(), progress);
         }
     }
     else
     {
-        queryAndRenderFeaturesForStyle( Style(), defaultQuery, buildData.get(), key.getExtent(), image.get() );
+        queryAndRenderFeaturesForStyle( Style(), defaultQuery, buildData.get(), key.getExtent(), image.get(), progress);
     }
 
     // final tile processing after all styles are done
@@ -306,11 +307,16 @@
                                                   const Query&     query,
                                                   osg::Referenced* data,
                                                   const GeoExtent& imageExtent,
-                                                  osg::Image*      out_image)
+                                                  osg::Image*      out_image,
+                                                  ProgressCallback* progress)
 {   
     // Get the features
     FeatureList features;
-    getFeatures(query, imageExtent, features );
+    getFeatures(query, imageExtent, features, progress);
+
+    if (progress && progress->isCanceled())
+        return false;
+
     if (!features.empty())
     {
         // Render them.
@@ -320,7 +326,7 @@
 }
 
 void
-FeatureTileSource::getFeatures(const Query& query, const GeoExtent& imageExtent, FeatureList& features)
+FeatureTileSource::getFeatures(const Query& query, const GeoExtent& imageExtent, FeatureList& features, ProgressCallback* progress)
 {
     // first we need the overall extent of the layer:
     const GeoExtent& featuresExtent = getFeatureSource()->getFeatureProfile()->getExtent();
@@ -344,7 +350,7 @@
         while (features.empty())
         {
             // query the feature source:
-            osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor( localQuery );
+            osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor(localQuery, progress);
 
             while( cursor.valid() && cursor->hasMore() )
             {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/Filter osgearth-2.10.2+dfsg/src/osgEarthFeatures/Filter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/Filter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/Filter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -213,7 +213,6 @@
             const osg::Matrixd&            world2local,
             bool                           toECEF );
 
-        void applyLineSymbology(osg::StateSet*, const class LineSymbol*);
         void applyPointSymbology(osg::StateSet*, const class PointSymbol*);
 
         osg::Matrixd _world2local, _local2world;   // for coordinate localization
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FilterContext osgearth-2.10.2+dfsg/src/osgEarthFeatures/FilterContext
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FilterContext	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FilterContext	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/FilterContext.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/FilterContext.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/FilterContext.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/FilterContext.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@
         }
         else
         {
-            _resourceCache = new ResourceCache(); // session->getDBOptions() );
+            _resourceCache = new ResourceCache();
         }
     }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/Filter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/Filter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/Filter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/Filter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,10 +22,8 @@
 #include <osgEarthSymbology/PointSymbol>
 #include <osgEarth/ECEF>
 #include <osgEarth/Registry>
+#include <osgEarth/GLUtils>
 #include <osg/MatrixTransform>
-#include <osg/Point>
-#include <osg/LineWidth>
-#include <osg/LineStipple>
 #include <osgEarth/VirtualProgram>
 
 using namespace osgEarth;
@@ -156,8 +154,8 @@
             {
                 osg::Vec3d centroid, centroidECEF;
                 geodExtent.getCentroid( centroid.x(), centroid.y() );
-                geogSRS->transform( centroid, geogSRS->getECEF(), centroidECEF );
-                geogSRS->getECEF()->createLocalToWorld( centroidECEF, out_l2w );
+                geogSRS->transform( centroid, geogSRS->getGeocentricSRS(), centroidECEF );
+                geogSRS->getGeocentricSRS()->createLocalToWorld( centroidECEF, out_l2w );
                 out_w2l.invert( out_l2w );
             }
         }
@@ -331,40 +329,13 @@
     return group;
 }
 
-
-void 
-FeaturesToNodeFilter::applyLineSymbology(osg::StateSet*    stateset, 
-                                         const LineSymbol* line)
-{
-    if ( line && line->stroke().isSet() )
-    {
-        if ( line->stroke()->width().isSet() )
-        {
-            float width = std::max( 1.0f, *line->stroke()->width() );
-            if ( width != 1.0f )
-            {
-                stateset->setAttributeAndModes(new osg::LineWidth(width), 1);
-            }
-        }
-
-        if ( line->stroke()->stipplePattern().isSet() )
-        {
-            stateset->setAttributeAndModes(
-                new osg::LineStipple(
-                    line->stroke()->stippleFactor().value(),
-                    line->stroke()->stipplePattern().value()),
-                osg::StateAttribute::ON );
-        }
-    }
-}
-
 void 
 FeaturesToNodeFilter::applyPointSymbology(osg::StateSet*     stateset, 
                                           const PointSymbol* point)
 {
     if ( point )
     {
-        float size = std::max( 0.1f, *point->size() );
-        stateset->setAttributeAndModes(new osg::Point(size), 1);
+        float size = osg::maximum( 0.1f, *point->size() );
+        GLUtils::setPointSize(stateset, size, 1);
     }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/GeometryCompiler osgearth-2.10.2+dfsg/src/osgEarthFeatures/GeometryCompiler
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/GeometryCompiler	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/GeometryCompiler	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -82,10 +82,6 @@
         optional<double>& resampleMaxLength() { return _resampleMaxLength; }
         const optional<double>& resampleMaxLength() const { return _resampleMaxLength;}
 
-        /** @deprecated Whether to use VBOs in geometry */
-        optional<bool>& useVertexBufferObjects() { return _useVertexBufferObjects;}
-        const optional<bool>& useVertexBufferObjects() const { return _useVertexBufferObjects;}
-
         /** Whether to generate shader components on compiled geometry */
         optional<ShaderPolicy>& shaderPolicy() { return _shaderPolicy; }
         const optional<ShaderPolicy>& shaderPolicy() const { return _shaderPolicy; }
@@ -132,7 +128,6 @@
         optional<ResampleFilter::ResampleMode> _resampleMode;
         optional<double>               _resampleMaxLength;
         optional<bool>                 _ignoreAlt;
-        optional<bool>                 _useVertexBufferObjects;
         optional<ShaderPolicy>         _shaderPolicy;
         optional<bool>                 _optimizeStateSharing;
         optional<bool>                 _optimize;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/GeometryCompiler.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/GeometryCompiler.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/GeometryCompiler.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/GeometryCompiler.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -66,9 +66,8 @@
 _maxGranularity_deg    ( 10.0 ),
 _mergeGeometry         ( true ),
 _clustering            ( false ),
-_instancing            ( false ),
+_instancing            ( true ),
 _ignoreAlt             ( false ),
-_useVertexBufferObjects( true ),
 _shaderPolicy          ( SHADERPOLICY_GENERATE ),
 _geoInterp             ( GEOINTERP_GREAT_CIRCLE ),
 _optimizeStateSharing  ( true ),
@@ -92,7 +91,6 @@
 _clustering            ( s_defaults.clustering().value() ),
 _instancing            ( s_defaults.instancing().value() ),
 _ignoreAlt             ( s_defaults.ignoreAltitudeSymbol().value() ),
-_useVertexBufferObjects( s_defaults.useVertexBufferObjects().value() ),
 _shaderPolicy          ( s_defaults.shaderPolicy().value() ),
 _geoInterp             ( s_defaults.geoInterp().value() ),
 _optimizeStateSharing  ( s_defaults.optimizeStateSharing().value() ),
@@ -108,50 +106,48 @@
 void
 GeometryCompilerOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet   ( "max_granularity",  _maxGranularity_deg );
-    conf.getIfSet   ( "merge_geometry",   _mergeGeometry );
-    conf.getIfSet   ( "clustering",       _clustering );
-    conf.getIfSet   ( "instancing",       _instancing );
-    conf.getObjIfSet( "feature_name",     _featureNameExpr );
-    conf.getIfSet   ( "ignore_altitude",  _ignoreAlt );
-    conf.getIfSet   ( "geo_interpolation", "great_circle", _geoInterp, GEOINTERP_GREAT_CIRCLE );
-    conf.getIfSet   ( "geo_interpolation", "rhumb_line",   _geoInterp, GEOINTERP_RHUMB_LINE );
-    conf.getIfSet   ( "use_vbo", _useVertexBufferObjects);
-    conf.getIfSet   ( "optimize_state_sharing", _optimizeStateSharing );
-    conf.getIfSet   ( "optimize", _optimize );
-    conf.getIfSet   ( "optimize_vertex_ordering", _optimizeVertexOrdering);
-    conf.getIfSet   ( "validate", _validate );
-    conf.getIfSet   ( "max_polygon_tiling_angle", _maxPolyTilingAngle );
-    conf.getIfSet   ( "use_gpu_screen_space_lines", _useGPULines );
-
-    conf.getIfSet( "shader_policy", "disable",  _shaderPolicy, SHADERPOLICY_DISABLE );
-    conf.getIfSet( "shader_policy", "inherit",  _shaderPolicy, SHADERPOLICY_INHERIT );
-    conf.getIfSet( "shader_policy", "generate", _shaderPolicy, SHADERPOLICY_GENERATE );
+    conf.get( "max_granularity",  _maxGranularity_deg );
+    conf.get( "merge_geometry",   _mergeGeometry );
+    conf.get( "clustering",       _clustering );
+    conf.get( "instancing",       _instancing );
+    conf.get( "feature_name",     _featureNameExpr );
+    conf.get( "ignore_altitude",  _ignoreAlt );
+    conf.get( "geo_interpolation", "great_circle", _geoInterp, GEOINTERP_GREAT_CIRCLE );
+    conf.get( "geo_interpolation", "rhumb_line",   _geoInterp, GEOINTERP_RHUMB_LINE );
+    conf.get( "optimize_state_sharing", _optimizeStateSharing );
+    conf.get( "optimize", _optimize );
+    conf.get( "optimize_vertex_ordering", _optimizeVertexOrdering);
+    conf.get( "validate", _validate );
+    conf.get( "max_polygon_tiling_angle", _maxPolyTilingAngle );
+    conf.get( "use_gpu_screen_space_lines", _useGPULines );
+
+    conf.get( "shader_policy", "disable",  _shaderPolicy, SHADERPOLICY_DISABLE );
+    conf.get( "shader_policy", "inherit",  _shaderPolicy, SHADERPOLICY_INHERIT );
+    conf.get( "shader_policy", "generate", _shaderPolicy, SHADERPOLICY_GENERATE );
 }
 
 Config
 GeometryCompilerOptions::getConfig() const
 {
     Config conf;
-    conf.addIfSet   ( "max_granularity",  _maxGranularity_deg );
-    conf.addIfSet   ( "merge_geometry",   _mergeGeometry );
-    conf.addIfSet   ( "clustering",       _clustering );
-    conf.addIfSet   ( "instancing",       _instancing );
-    conf.addObjIfSet( "feature_name",     _featureNameExpr );
-    conf.addIfSet   ( "ignore_altitude",  _ignoreAlt );
-    conf.addIfSet   ( "geo_interpolation", "great_circle", _geoInterp, GEOINTERP_GREAT_CIRCLE );
-    conf.addIfSet   ( "geo_interpolation", "rhumb_line",   _geoInterp, GEOINTERP_RHUMB_LINE );
-    conf.addIfSet   ( "use_vbo", _useVertexBufferObjects);
-    conf.addIfSet   ( "optimize_state_sharing", _optimizeStateSharing );
-    conf.addIfSet   ( "optimize", _optimize );
-    conf.addIfSet   ( "optimize_vertex_ordering", _optimizeVertexOrdering);
-    conf.addIfSet   ( "validate", _validate );
-    conf.addIfSet   ( "max_polygon_tiling_angle", _maxPolyTilingAngle );
-    conf.addIfSet   ( "use_gpu_screen_space_lines", _useGPULines );
-
-    conf.addIfSet( "shader_policy", "disable",  _shaderPolicy, SHADERPOLICY_DISABLE );
-    conf.addIfSet( "shader_policy", "inherit",  _shaderPolicy, SHADERPOLICY_INHERIT );
-    conf.addIfSet( "shader_policy", "generate", _shaderPolicy, SHADERPOLICY_GENERATE );
+    conf.set( "max_granularity",  _maxGranularity_deg );
+    conf.set( "merge_geometry",   _mergeGeometry );
+    conf.set( "clustering",       _clustering );
+    conf.set( "instancing",       _instancing );
+    conf.set( "feature_name",     _featureNameExpr );
+    conf.set( "ignore_altitude",  _ignoreAlt );
+    conf.set( "geo_interpolation", "great_circle", _geoInterp, GEOINTERP_GREAT_CIRCLE );
+    conf.set( "geo_interpolation", "rhumb_line",   _geoInterp, GEOINTERP_RHUMB_LINE );
+    conf.set( "optimize_state_sharing", _optimizeStateSharing );
+    conf.set( "optimize", _optimize );
+    conf.set( "optimize_vertex_ordering", _optimizeVertexOrdering);
+    conf.set( "validate", _validate );
+    conf.set( "max_polygon_tiling_angle", _maxPolyTilingAngle );
+    conf.set( "use_gpu_screen_space_lines", _useGPULines );
+
+    conf.set( "shader_policy", "disable",  _shaderPolicy, SHADERPOLICY_DISABLE );
+    conf.set( "shader_policy", "inherit",  _shaderPolicy, SHADERPOLICY_INHERIT );
+    conf.set( "shader_policy", "generate", _shaderPolicy, SHADERPOLICY_GENERATE );
     return conf;
 }
 
@@ -259,7 +255,6 @@
     const ExtrusionSymbol* extrusion = style.get<ExtrusionSymbol>();
     const AltitudeSymbol*  altitude  = style.get<AltitudeSymbol>();
     const TextSymbol*      text      = style.get<TextSymbol>();
-    const MarkerSymbol*    marker    = style.get<MarkerSymbol>();    // to be deprecated
     const IconSymbol*      icon      = style.get<IconSymbol>();
     const ModelSymbol*     model     = style.get<ModelSymbol>();
     const RenderSymbol*    render    = style.get<RenderSymbol>();
@@ -287,7 +282,7 @@
 
     // if the style was empty, use some defaults based on the geometry type of the
     // first feature.
-    if ( !point && !line && !polygon && !marker && !extrusion && !text && !model && !icon && workingSet.size() > 0 )
+    if ( !point && !line && !polygon && !extrusion && !text && !model && !icon && workingSet.size() > 0 )
     {
         Feature* first = workingSet.begin()->get();
         Geometry* geom = first->getGeometry();
@@ -335,63 +330,10 @@
             altitude->clamping() != AltitudeSymbol::CLAMP_NONE ||
             altitude->verticalOffset().isSet() ||
             altitude->verticalScale().isSet() ||
-            altitude->script().isSet() );
-
-    // marker substitution -- to be deprecated in favor of model/icon
-    if ( marker )
-    {
-        if ( trackHistory ) history.push_back( "marker" );
-
-        // use a separate filter context since we'll be munging the data
-        FilterContext markerCX = sharedCX;
-
-        if ( marker->placement() == MarkerSymbol::PLACEMENT_RANDOM   ||
-             marker->placement() == MarkerSymbol::PLACEMENT_INTERVAL )
-        {
-            ScatterFilter scatter;
-            scatter.setDensity( *marker->density() );
-            scatter.setRandom( marker->placement() == MarkerSymbol::PLACEMENT_RANDOM );
-            scatter.setRandomSeed( *marker->randomSeed() );
-            markerCX = scatter.push( workingSet, markerCX );
-            if ( trackHistory ) history.push_back( "scatter" );
-        }
-        else if ( marker->placement() == MarkerSymbol::PLACEMENT_CENTROID )
-        {
-            CentroidFilter centroid;
-            markerCX = centroid.push( workingSet, markerCX );  
-            if ( trackHistory ) history.push_back( "centroid" );
-        }
-
-        if ( altRequired )
-        {
-            AltitudeFilter clamp;
-            clamp.setPropertiesFromStyle( style );
-            markerCX = clamp.push( workingSet, markerCX );
-            if ( trackHistory ) history.push_back( "altitude" );
-
-            // don't set this; we changed the input data.
-            //altRequired = false;
-        }
-
-        SubstituteModelFilter sub( style );
-
-        sub.setClustering( *_options.clustering() );
-
-        sub.setUseDrawInstanced( *_options.instancing() );
-
-        if ( _options.featureName().isSet() )
-            sub.setFeatureNameExpr( *_options.featureName() );
-
-        osg::Node* node = sub.push( workingSet, markerCX );
-        if ( node )
-        {
-            if ( trackHistory ) history.push_back( "substitute" );
-            resultGroup->addChild( node );
-        }
-    }
+            altitude->script().isSet() );    
 
     // instance substitution (replaces marker)
-    else if ( model )
+    if ( model )
     {
         const InstanceSymbol* instance = (const InstanceSymbol*)model;
 
@@ -494,7 +436,7 @@
 
         filter.maxGranularity() = *_options.maxGranularity();
         filter.geoInterp()      = *_options.geoInterp();
-        filter.useGPULines()    = *_options.useGPUScreenSpaceLines();
+        filter.shaderPolicy()   = *_options.shaderPolicy();
 
         if (_options.maxPolygonTilingAngle().isSet())
             filter.maxPolygonTilingAngle() = *_options.maxPolygonTilingAngle();
@@ -518,7 +460,14 @@
 
     if ( text || icon )
     {
-        if ( altRequired )
+        // Only clamp annotation types when the technique is 
+        // explicity set to MAP. Otherwise, the annotation subsystem
+        // will automatically use SCENE clamping.
+        bool altRequiredForAnnotations =
+            altRequired &&
+            altitude->technique().isSetTo(altitude->TECHNIQUE_MAP);
+
+        if ( altRequiredForAnnotations )
         {
             AltitudeFilter clamp;
             clamp.setPropertiesFromStyle( style );
@@ -543,7 +492,7 @@
             // no ss cache because we will optimize later.
             Registry::shaderGenerator().run( 
                 resultGroup.get(),
-                "osgEarth.GeomCompiler" );
+                "GeometryCompiler shadergen" );
         }
         else if ( _options.shaderPolicy() == SHADERPOLICY_DISABLE )
         {
@@ -606,7 +555,8 @@
     
 
     //test: dump the tile to disk
-    //osgDB::writeNodeFile( *(resultGroup.get()), "out.osg" );
+    //OE_WARN << "Writing GC node file to out.osgt..." << std::endl;
+    //osgDB::writeNodeFile( *(resultGroup.get()), "out.osgt" );
 
 #ifdef PROFILING
     static double totalTime = 0.0;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/GeometryUtils osgearth-2.10.2+dfsg/src/osgEarthFeatures/GeometryUtils
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/GeometryUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/GeometryUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/GeometryUtils.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/GeometryUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/GeometryUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/GeometryUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/GPULines osgearth-2.10.2+dfsg/src/osgEarthFeatures/GPULines
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/GPULines	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/GPULines	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#ifndef OSGEARTHFEATURES_GPU_LINES_H
-#define OSGEARTHFEATURES_GPU_LINES_H 1
-
-#include <osgEarthFeatures/Common>
-#include <osgEarthFeatures/Filter>
-#include <osgEarthSymbology/Style>
-#include <osg/Array>
-#include <osg/Geometry>
-
-namespace osgEarth { namespace Features
-{
-    using namespace osgEarth::Symbology;
-
-    /**
-     * Static application-wide settings for GPU Line Generation
-     * You can set these in your app if you don't like the defaults.
-     */
-    class OSGEARTHFEATURES_EXPORT GPULines
-    {        
-    public:
-        //! Binding location for "previous" vertex attribute
-        static int PreviousVertexAttrLocation;
-
-        //! Binding location for "next" vertex attribute
-        static int NextVertexAttrLocation;
-
-        //! Binding location for "width" attribute
-        static int WidthAttrLocation; 
-
-    private:
-        GPULines() { }
-    };
-
-    /**
-     * Assembles a drawable for rendering lines on the GPU.
-     */
-    class OSGEARTHFEATURES_EXPORT GPULinesOperator
-    {
-    public:
-        struct Callback {
-            virtual void operator()(unsigned i) = 0;
-        };
-
-    public:
-        /**
-         * Default constructor
-         */
-        GPULinesOperator();
-
-        /**
-         * Construct the operator
-         * @param[in ] stroke Line rendering properties
-         */
-        GPULinesOperator(const Stroke& stoke);
-
-        /**
-         * Run the GPU lines assembler.
-         *
-         * @param[in ] verts Array of vertices to use to build a GPU line strip
-         * @param[in ] closeTheLoop Whether to connect the last point to the first
-         *
-         * @return Geometry suitable for use with GPU line shader.
-         */
-        osg::Geometry* operator()(osg::Vec3Array* verts, bool closeTheLoop) const;
-
-        /**
-         * Installs the necessary shader to render GPU lines
-         */
-        void installShaders(osg::Node* node) const;
-
-    protected:
-        Stroke _stroke;
-        friend class GPULinesFilter;
-    };
-
-} } // namespace osgEarth::Features
-
-#endif // OSGEARTHFEATURES_GPU_LINES_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/GPULines.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/GPULines.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/GPULines.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/GPULines.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,206 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#include <osgEarthFeatures/GPULines>
-#include <osgEarthFeatures/FeatureSourceIndexNode>
-#include <osgEarthFeatures/Shaders>
-
-#include <osgEarth/VirtualProgram>
-#include <osgEarth/Utils>
-
-#include <osg/Depth>
-#include <osg/CullFace>
-
-#define LC "[GPULines] "
-
-#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)
-#define OE_GLES_AVAILABLE
-#endif
-
-using namespace osgEarth::Features;
-
-
-// References:
-// https://mattdesl.svbtle.com/drawing-lines-is-hard
-// https://github.com/mattdesl/webgl-lines
-
-
-// static attribute binding locations. Changable by the user.
-int GPULines::PreviousVertexAttrLocation = 9;
-int GPULines::NextVertexAttrLocation = 10;
-int GPULines::WidthAttrLocation = 11;
-
-
-GPULinesOperator::GPULinesOperator()
-{
-    //nop
-}
-
-GPULinesOperator::GPULinesOperator(const Stroke& stroke) :
-_stroke( stroke )
-{
-    //nop
-}
-
-osg::Geometry*
-GPULinesOperator::operator()(osg::Vec3Array* input, bool isLoop) const
-{
-    if (input == 0L || input->size() <= 1)
-        return 0L;
-
-    osg::Geometry* geom = new osg::Geometry();
-    geom->setUseVertexBufferObjects(true);
-    geom->setUseDisplayList(false);
-
-    bool frontEqualsBack = input->front() == input->back();
-
-    // is this a line loop even though the caller doesn't know it?
-    if (frontEqualsBack)
-        isLoop = true;
-    
-    // if this is a loop and the first and last elements are equal, trim the back:
-    int inputSize = input->size() - (frontEqualsBack? 1 : 0);
-
-    // two output elements per input element:
-    int outputSize = inputSize * 2;
-
-    osg::Vec3Array* positions = new osg::Vec3Array();
-    positions->reserve(outputSize);
-    geom->setVertexArray(positions);
-
-    osg::Vec3Array* previous = new osg::Vec3Array();
-    previous->reserve(outputSize);
-    previous->setBinding(previous->BIND_PER_VERTEX);
-    geom->setVertexAttribArray(GPULines::PreviousVertexAttrLocation, previous);
-    geom->setVertexAttribBinding(GPULines::PreviousVertexAttrLocation, osg::Geometry::BIND_PER_VERTEX);
-    geom->setVertexAttribNormalize(GPULines::PreviousVertexAttrLocation, false);
-
-    osg::Vec3Array* next = new osg::Vec3Array();
-    next->reserve(outputSize);
-    next->setBinding(next->BIND_PER_VERTEX);
-    geom->setVertexAttribArray(GPULines::NextVertexAttrLocation, next);
-    geom->setVertexAttribBinding(GPULines::NextVertexAttrLocation, osg::Geometry::BIND_PER_VERTEX);
-    geom->setVertexAttribNormalize(GPULines::NextVertexAttrLocation, false);
-
-    osg::FloatArray* widths = new osg::FloatArray();
-    widths->reserve(outputSize);
-    widths->setBinding(next->BIND_PER_VERTEX);
-    geom->setVertexAttribArray(GPULines::WidthAttrLocation, widths);
-    geom->setVertexAttribBinding(GPULines::WidthAttrLocation, osg::Geometry::BIND_PER_VERTEX);
-    geom->setVertexAttribNormalize(GPULines::WidthAttrLocation, false);
-
-    float thickness = _stroke.width().get();
-
-    // first populate the positions and direction attributes:
-    for (int i = 0; i < inputSize; ++i)
-    {
-        const osg::Vec3& c = (*input)[i];
-        positions->push_back(c);      
-        positions->push_back(c);
-
-        // opposite directions:
-        widths->push_back(-thickness); 
-        widths->push_back(thickness);
-
-        int prevIndex = i-1;
-        if (prevIndex < 0) 
-            prevIndex = isLoop ? inputSize-1 : i;
-
-        const osg::Vec3& p = (*input)[prevIndex];
-        previous->push_back(p);
-        previous->push_back(p);
-
-        int nextIndex = i+1;
-        if (nextIndex > inputSize-1)
-            nextIndex = isLoop ? 0 : i;
-
-        const osg::Vec3& n = (*input)[nextIndex];
-        next->push_back(n);
-        next->push_back(n);
-    }
-
-    // generate the triangle set.
-    unsigned numEls = (inputSize + (isLoop? 1 : 0)) * 6;
-    osg::DrawElements* els = 
-#ifndef OE_GLES_AVAILABLE
-        numEls > 0xFFFF ? (osg::DrawElements*)new osg::DrawElementsUInt  ( GL_TRIANGLES ) :
-#endif
-        numEls > 0xFF   ? (osg::DrawElements*)new osg::DrawElementsUShort( GL_TRIANGLES ) :
-                          (osg::DrawElements*)new osg::DrawElementsUByte ( GL_TRIANGLES );
-    els->reserveElements(numEls);
-
-    // IMPORTANT!
-    // Don't change the order of these elements! Because of the way
-    // GPU line stippling works, it is critical that the provoking vertex
-    // be at the beginning of each line segment. In this case we are using
-    // GL_TRIANGLES and thus the provoking vertex (PV) is the FINAL vert
-    // in each triangle.
-    int e;
-    for (e = 0; e < positions->size()-2; e += 2)
-    {
-        els->addElement(e+3);
-        els->addElement(e+1);
-        els->addElement(e+0); // PV
-        els->addElement(e+2);
-        els->addElement(e+3);
-        els->addElement(e+0); // PV
-    }
-
-    if (isLoop)
-    {
-        els->addElement(1);
-        els->addElement(e+1);
-        els->addElement(e+0); // PV
-        els->addElement(0);
-        els->addElement(1);
-        els->addElement(e+0); // PV
-    }
-
-    geom->addPrimitiveSet(els);
-    
-    if (_stroke.stipplePattern().isSet())
-    {
-        osg::StateSet* ss = geom->getOrCreateStateSet();
-
-        ss->setDefine(
-            "OE_GPULINES_STIPPLE_PATTERN", 
-            Stringify() << _stroke.stipplePattern().get() );
-
-        ss->setDefine(
-            "OE_GPULINES_STIPPLE_FACTOR",
-            Stringify() << _stroke.stippleFactor().get() );
-    }
-
-    return geom;
-}
-
-
-void
-GPULinesOperator::installShaders(osg::Node* node) const
-{
-    osg::StateSet* ss = node->getOrCreateStateSet();
-    VirtualProgram* vp = VirtualProgram::getOrCreate(ss);
-    GPULineShaders shaders;
-    shaders.loadAll(vp);
-    vp->addBindAttribLocation("oe_GPULines_prev", GPULines::PreviousVertexAttrLocation);
-    vp->addBindAttribLocation("oe_GPULines_next", GPULines::NextVertexAttrLocation);
-    vp->addBindAttribLocation("oe_GPULines_width", GPULines::WidthAttrLocation);
-    ss->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE | osg::StateAttribute::PROTECTED);
-    ss->setAttributeAndModes(new osg::Depth(osg::Depth::LEQUAL, 0.0, 1.0, false));
-    ss->setDefine("OE_GPU_LINES");
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/GPULinesScreenProj.glsl osgearth-2.10.2+dfsg/src/osgEarthFeatures/GPULinesScreenProj.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/GPULinesScreenProj.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/GPULinesScreenProj.glsl	1970-01-01 00:00:00.000000000 +0000
@@ -1,181 +0,0 @@
-#version $GLSL_VERSION_STR
-
-#pragma vp_name GPU Lines Screen Projected
-#pragma vp_entryPoint oe_GPULinesProj_VS_CLIP
-#pragma vp_location vertex_clip
-#pragma import_defines(OE_GPULINES_STIPPLE_PATTERN, OE_GPU_CLAMPING)
-
-uniform vec2 oe_ViewportSize;
-
-in vec3 oe_GPULines_prev;
-in vec3 oe_GPULines_next;
-in float oe_GPULines_width;
-
-#ifdef OE_GPULINES_STIPPLE_PATTERN
-flat out vec2 oe_GPULines_rv;
-#endif
-
-#ifdef OE_GPU_CLAMPING
-// Stage globals set in GPUClamping.vert.glsl only when OE_GPU_LINES is enabled
-vec4 oe_GPULines_prevViewClamped;
-vec4 oe_GPULines_nextViewClamped;
-#endif // OE_GPU_CLAMPING
-
-void oe_GPULinesProj_VS_CLIP(inout vec4 currClip)
-{
-    vec2 arVec = vec2(
-        oe_ViewportSize.x/oe_ViewportSize.y,
-        1.0);
-
-#if defined(OE_GPU_CLAMPING)
-    vec4 prevClip = gl_ProjectionMatrix * oe_GPULines_prevViewClamped;
-    vec4 nextClip = gl_ProjectionMatrix * oe_GPULines_nextViewClamped;
-#else
-    vec4 prevClip = gl_ModelViewProjectionMatrix * vec4(oe_GPULines_prev, 1.0);
-    vec4 nextClip = gl_ModelViewProjectionMatrix * vec4(oe_GPULines_next, 1.0);
-#endif
-
-    vec2 currUnit = currClip.xy/currClip.w * arVec;
-    vec2 prevUnit = prevClip.xy/prevClip.w * arVec;
-    vec2 nextUnit = nextClip.xy/nextClip.w * arVec;
-
-    float thickness = abs(oe_GPULines_width);
-    float len = thickness;
-    float orientation = sign(oe_GPULines_width);
-
-    vec2 dir = vec2(0.0);
-
-    // We will use this to calculate stippling data:
-    vec2 stippleDir;
-
-    // The following vertex comparisons must be done in model 
-    // space because the equivalency gets mashed after projection.
-
-    // starting point uses (next - current)
-    if (gl_Vertex.xyz == oe_GPULines_prev)
-    {
-        dir = normalize(nextUnit - currUnit);
-        stippleDir = dir;
-    }
-    
-    // ending point uses (current - previous)
-    else if (gl_Vertex.xyz == oe_GPULines_next)
-    {
-        dir = normalize(currUnit - prevUnit);
-        stippleDir = dir;
-    }
-
-    // middle? join
-    else
-    {
-        vec2 dirA = normalize(currUnit - prevUnit);
-        vec2 dirB = normalize(nextUnit - currUnit);
-
-        // Edge case: segment that doubles back on itself:
-        if (dot(dirA,dirB) < -0.99)
-        {
-            dir = dirA;
-        }
-
-        // Normal case - create a mitered corner:
-        else
-        {
-            vec2 tangent = normalize(dirA+dirB);
-            vec2 perp = vec2(-dirA.y, dirA.x);
-            vec2 miter = vec2(-tangent.y, tangent.x);
-            dir = tangent;
-            len = thickness / dot(miter, perp);
-
-            // limit the length of a mitered corner, to prevent unsightly spikes
-            const float limit = 2.0;
-            if (len > thickness*limit)
-            {
-                len = thickness;
-                dir = dirB;
-            }
-        }
-        stippleDir = dirB;
-    }
-
-    // calculate the extrusion vector in pixels
-    // note: seems like it should be len/2, BUT we are in [-1..1] space
-    vec2 extrudePixels = vec2(-dir.y, dir.x) * len;
-
-    // and convert to unit space:
-    vec2 extrudeUnit = extrudePixels / oe_ViewportSize;
-
-    // and from that make a clip-coord offset vector
-    vec4 offset = vec4(extrudeUnit*orientation*currClip.w, 0.0, 0.0);
-    currClip += offset;
-
-#ifdef OE_GPULINES_STIPPLE_PATTERN
-    // Line creation is done. Now, calculate a rotation angle
-    // for use by out fragment shader to do GPU stippling. 
-    // This "rotates" the fragment coordinate onto the X axis so that
-    // we can apply stippling along the direction of the line.
-    // Note: this depends on the GLSL "provoking vertex" being at the 
-    // beginning of the line segment!
-
-    // flip the vector so stippling always proceedes from left to right
-    // regardless of the direction of the segment
-    stippleDir = normalize(stippleDir.x < 0? -stippleDir : stippleDir);
-
-    // calculate the rotation angle that will project the
-    // fragment coord onto the X-axis for stipple pattern sampling.
-    float way = sign(cross(vec3(1, 0, 0), vec3(stippleDir, 0)).z);
-    float angle = acos(dot(vec2(1, 0), stippleDir)) * way;
-
-    // quantize the rotation angle to mitigate precision problems
-    // when connecting segments with slightly different vectors
-    const float pi = 3.14159265359;
-    const float q = pi/8.0;
-    angle = floor(angle/q) * q;
-
-    // send it to the fragment shader.
-    oe_GPULines_rv = vec2(cos(angle), sin(angle));
-#endif
-}
-
-
-[break]
-
-#version $GLSL_VERSION_STR
-
-#pragma vp_name GPU Lines Screen Projected FS
-#pragma vp_entryPoint oe_GPULinesProj_Stippler_FS
-#pragma vp_location fragment_coloring
-#pragma import_defines (OE_GPULINES_STIPPLE_PATTERN, OE_GPULINES_STIPPLE_FACTOR)
-
-#ifdef OE_GPULINES_STIPPLE_PATTERN
-flat in vec2 oe_GPULines_rv;
-#endif
-
-void oe_GPULinesProj_Stippler_FS(inout vec4 color)
-{
-#ifdef OE_GPULINES_STIPPLE_PATTERN
-
-    // we could make these unfiorms if necessary
-    const int pattern = OE_GPULINES_STIPPLE_PATTERN;
-    const int factor = OE_GPULINES_STIPPLE_FACTOR;
-
-    // coordinate of the fragment, shifted to 0:
-    vec2 coord = (gl_FragCoord.xy - 0.5);
-
-    // rotate the frag coord onto the X-axis so we can sample the 
-    // stipple pattern:
-    vec2 coordProj =
-        mat2(oe_GPULines_rv.x, -oe_GPULines_rv.y,
-             oe_GPULines_rv.y,  oe_GPULines_rv.x)
-        * coord;
-
-    // sample the stippling pattern (16-bits repeating)
-    int ci = int(mod(coordProj.x, 16 * factor)) / factor;
-    if ((pattern & (1 << ci)) == 0)
-        discard; 
-
-    // uncomment to debug stipple direction vectors
-    //color.b = 0;
-    //color.r = oe_GPULines_rv.x;
-    //color.g = oe_GPULines_rv.y;
-#endif
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ImageToFeatureLayer osgearth-2.10.2+dfsg/src/osgEarthFeatures/ImageToFeatureLayer
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ImageToFeatureLayer	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ImageToFeatureLayer	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,115 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+#ifndef OSGEARTH_FEATURES_IMAGE_TO_FEATURE_LAYER_H
+#define OSGEARTH_FEATURES_IMAGE_TO_FEATURE_LAYER_H 1
+
+#include <osgEarthFeatures/FeatureSourceLayer>
+#include <osgEarth/LayerListener>
+
+namespace osgEarth {
+    class ImageLayer;
+}
+
+namespace osgEarth { namespace Features
+{
+    /** Options structure for serialization of the FeatureSourceLayer */
+    class ImageToFeatureLayerOptions : public FeatureSourceLayerOptions
+    {
+    public:
+        ImageToFeatureLayerOptions(const ConfigOptions& co = ConfigOptions()) : FeatureSourceLayerOptions(co),
+            _level(0u),
+            _attribute("value")
+        {
+            fromConfig(_conf);
+        }
+
+        //! Name of the image layer to convert to feature data
+        optional<std::string>& imageLayer() { return _imageLayerName; }
+        const optional<std::string>& imageLayer() const { return _imageLayerName; }
+
+        //! Level of detail from which to extract features
+        optional<unsigned>& level() { return _level; }
+        const optional<unsigned>& level() const { return _level; }
+
+        //! Attribute name to set with feature value (default is "value")
+        optional<std::string>& attribute() { return _attribute; }
+        const optional<std::string>& attribute() const { return _attribute; }
+
+    public:
+        Config getConfig() const {
+            Config conf = FeatureSourceLayerOptions::getConfig();
+            conf.set("image", _imageLayerName);
+            conf.set("level", _level);
+            conf.set("attribute", _attribute);
+            return conf;
+        }
+
+        void fromConfig(const Config& conf) {
+            conf.get("image", _imageLayerName);
+            conf.get("level", _level);
+            conf.get("attribute", _attribute);
+        }
+
+        virtual void mergeConfig( const Config& conf ) {
+            FeatureSourceLayerOptions::mergeConfig( conf );
+            fromConfig( conf );
+        }
+
+    private:
+        optional<std::string> _imageLayerName;
+        optional<unsigned> _level;
+        optional<std::string> _attribute;
+    };
+
+
+    /**
+     * A FeatureSourceLayer that extracts features from raster data in
+     * an image layer.
+     */
+    class OSGEARTHFEATURES_EXPORT ImageToFeatureLayer : public FeatureSourceLayer
+    {
+    public:
+        META_Layer(osgEarth, ImageToFeatureLayer, ImageToFeatureLayerOptions, image_to_feature);
+
+        //! Create an empty layer
+        ImageToFeatureLayer();
+
+        //! Create a new layer with initialization options
+        ImageToFeatureLayer(const ImageToFeatureLayerOptions& options);
+
+        //! Image layer to use to convert raster data to features
+        void setImageLayer(ImageLayer* layer);
+
+    public: // Layer
+
+        virtual void init();
+
+        virtual void addedToMap(const Map*);
+
+        virtual void removedFromMap(const Map*);
+
+    protected:
+        
+        LayerListener<ImageToFeatureLayer, ImageLayer> _imageLayerListener;
+    };
+
+} } // namespace osgEarth::Features
+
+#endif // OSGEARTH_FEATURES_IMAGE_TO_FEATURE_LAYER_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ImageToFeatureLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/ImageToFeatureLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ImageToFeatureLayer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ImageToFeatureLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,253 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include <osgEarthFeatures/ImageToFeatureLayer>
+#include <osgEarth/ImageLayer>
+#include <osgEarth/Registry>
+#include <osgEarthFeatures/FeatureCursor>
+
+#define LC "[ImageToFeatureLayer] " << getName() << ": "
+
+using namespace osgEarth;
+using namespace osgEarth::Features;
+using namespace osgEarth::Symbology;
+
+
+namespace osgEarth {
+    namespace Features {
+        REGISTER_OSGEARTH_LAYER(image_to_feature, ImageToFeatureLayer);
+    }
+}
+
+namespace
+{
+    // feature source driver to turn raster data into polygons
+    class ImageToFeatureDriver : public FeatureSource
+    {
+    public:
+        osg::observer_ptr<ImageLayer> _layer;
+
+        ImageToFeatureDriver(const ImageToFeatureLayerOptions& options) :
+            FeatureSource(options),
+            _options(options)
+        {
+            //nop
+        }
+
+        FeatureCursor* createFeatureCursor(const Symbology::Query& query, ProgressCallback* progress)
+        {
+            TileKey key = *query.tileKey();
+
+            osg::ref_ptr<ImageLayer> layer;
+            if (_layer.lock(layer))
+            {
+                GeoImage image = layer->createImage(key, progress);
+
+                FeatureList features;
+
+                if (image.valid())
+                {
+                    double pixWidth = key.getExtent().width() / (double)image.getImage()->s();
+                    double pixHeight = key.getExtent().height() / (double)image.getImage()->t();
+                    ImageUtils::PixelReader reader(image.getImage());
+
+                    for (unsigned int r = 0; r < (unsigned)image.getImage()->t(); r++)
+                    {
+                        double y = key.getExtent().yMin() + (double)r * pixHeight;
+
+                        double minX = 0;
+                        double maxX = 0;
+                        float value = 0.0;
+
+                        for (unsigned int c = 0; c < (unsigned)image.getImage()->s(); c++)
+                        {
+                            double x = key.getExtent().xMin() + (double)c * pixWidth;
+
+                            osg::Vec4f color = reader(c, r);
+
+                            // Starting a new row.  Initialize the values.
+                            if (c == 0)
+                            {
+                                minX = x;
+                                maxX = x + pixWidth;
+                                value = color.r();
+                            }
+                            // Ending a row, finish the polygon.
+                            else if (c == image.getImage()->s() - 1)
+                            {
+                                // Increment the maxX to finish the row.
+                                maxX = x + pixWidth;
+                                Polygon* poly = new Polygon();
+                                poly->push_back(minX, y);
+                                poly->push_back(maxX, y);
+                                poly->push_back(maxX, y + pixHeight);
+                                poly->push_back(minX, y + pixHeight);
+                                Feature* feature = new Feature(poly, SpatialReference::create("wgs84"));
+                                feature->set(_options.attribute().get(), value);
+                                features.push_back(feature);
+                                minX = x;
+                                maxX = x + pixWidth;
+                                value = color.r();
+                            }
+                            // The value is different, so complete the polygon and start a new one.
+                            else if (color.r() != value)
+                            {
+                                Polygon* poly = new Polygon();
+                                poly->push_back(minX, y);
+                                poly->push_back(maxX, y);
+                                poly->push_back(maxX, y + pixHeight);
+                                poly->push_back(minX, y + pixHeight);
+                                Feature* feature = new Feature(poly, SpatialReference::create("wgs84"));
+                                feature->set(_options.attribute().get(), value);
+                                features.push_back(feature);
+                                minX = x;
+                                maxX = x + pixWidth;
+                                value = color.r();
+                            }
+                            // The value is the same as the previous value, continue the polygon by increasing the maxX.
+                            else if (color.r() == value)
+                            {
+                                maxX = x + pixWidth;
+                            }
+                        }
+
+
+                    }
+
+                    if (!features.empty())
+                    {
+                        //OE_NOTICE << LC << "Returning " << features.size() << " features" << std::endl;
+                        return new FeatureListCursor(features);
+                    }
+                }
+            }
+            return 0;
+        }
+
+        virtual bool supportsGetFeature() const
+        {
+            return false;
+        }
+
+        virtual Feature* getFeature(FeatureID fid)
+        {
+            return 0;
+        }
+
+        virtual bool isWritable() const
+        {
+            return false;
+        }
+
+        virtual const FeatureSchema& getSchema() const
+        {
+            //TODO:  Populate the schema from the DescribeFeatureType call
+            return _schema;
+        }
+
+        virtual osgEarth::Symbology::Geometry::Type getGeometryType() const
+        {
+            return Geometry::TYPE_UNKNOWN;
+        }
+
+    protected:
+
+        //override
+        Status initialize(const osgDB::Options* readOptions)
+        {
+            _readOptions = Registry::cloneOrCreateOptions(readOptions);
+
+            // Establish the feature profile.
+            const Profile* wgs84 = Registry::instance()->getGlobalGeodeticProfile();
+            GeoExtent extent(wgs84->getSRS(), -180, -90, 180, 90);
+
+            FeatureProfile* profile = new FeatureProfile(extent);
+            profile->setProfile(Profile::create("wgs84", extent.xMin(), extent.yMin(), extent.xMax(), extent.yMax(), "", 1, 1));
+            profile->setFirstLevel(_options.level().get());
+            profile->setMaxLevel(_options.level().get());
+            profile->setTiled(true);
+
+            setFeatureProfile(profile);
+            return Status::OK();
+        }
+
+
+    private:
+        const ImageToFeatureLayerOptions& _options;
+        FeatureSchema _schema;
+        osg::ref_ptr<osgDB::Options> _readOptions;
+    };
+}
+
+
+//.........................................................
+
+ImageToFeatureLayer::ImageToFeatureLayer() :
+FeatureSourceLayer(&_optionsConcrete),
+_options(&_optionsConcrete)
+{
+    init();
+}
+
+ImageToFeatureLayer::ImageToFeatureLayer(const ImageToFeatureLayerOptions& inOptions) :
+FeatureSourceLayer(&_optionsConcrete),
+_options(&_optionsConcrete),
+_optionsConcrete(inOptions)
+{
+    init();
+}
+
+void
+ImageToFeatureLayer::init()
+{
+    FeatureSourceLayer::init();    
+    setFeatureSource(new ImageToFeatureDriver(options()));
+}
+
+void
+ImageToFeatureLayer::setImageLayer(ImageLayer* layer)
+{
+    ImageToFeatureDriver* driver = dynamic_cast<ImageToFeatureDriver*>(getFeatureSource());
+    if (driver)
+    {
+        driver->_layer = layer;
+    }
+}
+
+void
+ImageToFeatureLayer::addedToMap(const Map* map)
+{
+    OE_DEBUG << LC << "addedToMap" << std::endl;
+
+    if (options().imageLayer().isSet())
+    {
+        _imageLayerListener.listen(
+            map,
+            options().imageLayer().get(),
+            this,
+            &ImageToFeatureLayer::setImageLayer);
+    }
+
+    FeatureSourceLayer::addedToMap(map);
+}
+
+void
+ImageToFeatureLayer::removedFromMap(const Map* map)
+{
+    FeatureSourceLayer::removedFromMap(map);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/LabelSource osgearth-2.10.2+dfsg/src/osgEarthFeatures/LabelSource
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/LabelSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/LabelSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/LabelSource.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/LabelSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/LabelSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/LabelSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/MVT osgearth-2.10.2+dfsg/src/osgEarthFeatures/MVT
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/MVT	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/MVT	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/MVT.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/MVT.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/MVT.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/MVT.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2014 Pelican Mapping
 * http://osgearth.org
 *
@@ -22,6 +22,7 @@
 #include <osgEarth/FileUtils>
 #include <osgEarth/GeoData>
 #include <osgEarthFeatures/FeatureSource>
+#include <osgDB/Registry>
 #include <list>
 #include <stdio.h>
 #include <stdlib.h>
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/OgrUtils osgearth-2.10.2+dfsg/src/osgEarthFeatures/OgrUtils
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/OgrUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/OgrUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -49,7 +49,11 @@
 
     static Feature* createFeature( OGRFeatureH handle, const FeatureProfile* profile );
     
-    static AttributeType getAttributeType( OGRFieldType type );  
+    static AttributeType getAttributeType( OGRFieldType type );
+
+    static OGRwkbGeometryType getOGRGeometryType(const Geometry::Type& type);
+    
+    static OGRwkbGeometryType getOGRGeometryType(const Geometry* geometry);
 
 private:
     
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/OgrUtils.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/OgrUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/OgrUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/OgrUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -33,11 +33,23 @@
 #  define GDAL_HAS_M_TYPES
 #endif
 
+int IsFieldSet(OGRFeatureH handle, int i)
+{
+    // https://github.com/Toblerity/Fiona/issues/460
+    // GDAL 2.2 changed the behavior of OGR_F_IsFieldSet so that null fields will still be considered set.
+    // We consider unset or null fields to be the same, so we use OGR_F_IsFieldSetAndNotNull
+#if GDAL_VERSION_AT_LEAST(2,2,0)
+    return OGR_F_IsFieldSetAndNotNull(handle, i);
+#else
+    return OGR_F_IsFieldSet(handle, i);
+#endif
+}
+
 
 void
 OgrUtils::populate( OGRGeometryH geomHandle, Symbology::Geometry* target, int numPoints )
 {
-    for( int v = numPoints-1; v >= 0; v-- ) // reverse winding.. we like ccw
+    for (unsigned int v = 0; v < numPoints; ++v)
     {
         double x=0, y=0, z=0;
         OGR_G_GetPoint( geomHandle, v, &x, &y, &z );
@@ -205,6 +217,72 @@
     return shape_handle;
 }
 
+OGRwkbGeometryType
+OgrUtils::getOGRGeometryType(const osgEarth::Symbology::Geometry::Type& geomType)
+{
+    OGRwkbGeometryType requestedType = wkbUnknown;
+
+    switch (geomType)
+    {
+    case osgEarth::Symbology::Geometry::TYPE_POLYGON:
+        requestedType = wkbPolygon;
+        break;
+    case osgEarth::Symbology::Geometry::TYPE_POINTSET:
+        requestedType = wkbPoint;
+        break;
+    case osgEarth::Symbology::Geometry::TYPE_LINESTRING:
+        requestedType = wkbLineString;
+        break;
+    case osgEarth::Symbology::Geometry::TYPE_RING:
+        requestedType = wkbLinearRing;
+        break;
+    default:
+    case Geometry::TYPE_UNKNOWN:
+        break;
+    }
+
+    return requestedType;
+}
+
+OGRwkbGeometryType
+OgrUtils::getOGRGeometryType(const osgEarth::Symbology::Geometry* geometry)
+{
+    OGRwkbGeometryType requestedType = wkbUnknown;
+
+    switch (geometry->getType())
+    {
+    case osgEarth::Symbology::Geometry::TYPE_POLYGON:
+        requestedType = wkbPolygon;
+        break;
+    case osgEarth::Symbology::Geometry::TYPE_POINTSET:
+        requestedType = wkbPoint;
+        break;
+    case osgEarth::Symbology::Geometry::TYPE_LINESTRING:
+        requestedType = wkbLineString;
+        break;
+    case osgEarth::Symbology::Geometry::TYPE_RING:
+        requestedType = wkbLinearRing;
+        break;
+    case Geometry::TYPE_UNKNOWN: 
+        break;
+    case Geometry::TYPE_MULTI:
+    {
+        const osgEarth::Symbology::MultiGeometry* multi = dynamic_cast<const MultiGeometry*>(geometry);
+        if (multi)
+        {
+            osgEarth::Symbology::Geometry::Type componentType = multi->getComponentType();
+            requestedType = componentType == Geometry::TYPE_POLYGON ? wkbMultiPolygon :
+                componentType == Geometry::TYPE_POINTSET ? wkbMultiPoint :
+                componentType == Geometry::TYPE_LINESTRING ? wkbMultiLineString :
+                wkbNone;
+        }
+    }
+    break;
+    }
+
+    return requestedType;
+}
+
 OGRGeometryH
 OgrUtils::createOgrGeometry(const osgEarth::Symbology::Geometry* geometry, OGRwkbGeometryType requestedType)
 {
@@ -212,36 +290,7 @@
 
     if (requestedType == wkbUnknown)
     {
-        osgEarth::Symbology::Geometry::Type geomType = geometry->getType();
-        switch( geomType)
-        {
-        case osgEarth::Symbology::Geometry::TYPE_POLYGON:  
-            requestedType = wkbPolygon;
-            break;
-        case osgEarth::Symbology::Geometry::TYPE_POINTSET:  
-            requestedType = wkbPoint;
-            break;
-        case osgEarth::Symbology::Geometry::TYPE_LINESTRING:
-            requestedType = wkbLineString;
-            break;
-        case osgEarth::Symbology::Geometry::TYPE_RING:
-            requestedType = wkbLinearRing;
-            break;            
-        case Geometry::TYPE_UNKNOWN: break;
-        case Geometry::TYPE_MULTI: 
-            {
-                const osgEarth::Symbology::MultiGeometry* multi = dynamic_cast<const MultiGeometry*>(geometry);
-                if (multi)
-                {
-                    osgEarth::Symbology::Geometry::Type componentType = multi->getComponentType();
-                    requestedType = componentType == Geometry::TYPE_POLYGON ? wkbMultiPolygon : 
-                        componentType == Geometry::TYPE_POINTSET ? wkbMultiPoint :
-                        componentType == Geometry::TYPE_LINESTRING ? wkbMultiLineString :
-                        wkbNone;                    
-                }
-            }
-            break;
-        }
+        requestedType = getOGRGeometryType(geometry);
     }
 
     OGRwkbGeometryType shape_type =
@@ -341,7 +390,7 @@
         {
         case OFTInteger:
             {     
-                if (OGR_F_IsFieldSet( handle, i ))
+                if (IsFieldSet( handle, i ))
                 {
                     int value = OGR_F_GetFieldAsInteger( handle, i );
                     feature->set( name, value );                    
@@ -354,7 +403,7 @@
             break;
         case OFTReal:
             {
-                if (OGR_F_IsFieldSet( handle, i ))
+                if (IsFieldSet( handle, i ))
                 {
                     double value = OGR_F_GetFieldAsDouble( handle, i );
                     feature->set( name, value );
@@ -367,7 +416,7 @@
             break;
         default:
             {
-                if (OGR_F_IsFieldSet( handle, i ))
+                if (IsFieldSet( handle, i ))
                 {
                     const char* value = OGR_F_GetFieldAsString(handle, i);
                     feature->set( name, std::string(value) );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/PolygonizeLines osgearth-2.10.2+dfsg/src/osgEarthFeatures/PolygonizeLines
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/PolygonizeLines	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/PolygonizeLines	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/PolygonizeLines.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/PolygonizeLines.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/PolygonizeLines.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/PolygonizeLines.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -156,11 +156,10 @@
     // Set up the normals array
     if ( !normals )
     {
-        normals = new osg::Vec3Array(verts->size());
+        normals = new osg::Vec3Array(osg::Array::BIND_PER_VERTEX, verts->size());
         normals->assign( normals->size(), osg::Vec3(0,0,1) );
     }
     geom->setNormalArray( normals );
-    geom->setNormalBinding( osg::Geometry::BIND_PER_VERTEX );
 
     // run the callback on the initial spine.
     if (callback)
@@ -175,8 +174,6 @@
     {
         spine = new osg::Vec3Array( *verts );
         geom->setVertexAttribArray    ( ATTR_LOCATION, spine );
-        geom->setVertexAttribBinding  ( ATTR_LOCATION, osg::Geometry::BIND_PER_VERTEX );
-        geom->setVertexAttribNormalize( ATTR_LOCATION, false );
     }
 
     // initialize the texture coordinates.
@@ -465,10 +462,9 @@
 
     // generate colors
     {
-        osg::Vec4Array* colors = new osg::Vec4Array( verts->size() );
+        osg::Vec4Array* colors = new osg::Vec4Array( osg::Array::BIND_PER_VERTEX, verts->size() );
         colors->assign( colors->size(), _stroke.color() );
         geom->setColorArray( colors );
-        geom->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
     }
 
     return geom;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ResampleFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/ResampleFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ResampleFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ResampleFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -56,21 +56,21 @@
         const optional<ResampleMode>& resampleMode() const { return _mode; }
 
         void fromConfig(const Config& conf) {
-            conf.getIfSet("min_length", _minLen);
-            conf.getIfSet("max_length", _maxLen);
-            conf.getIfSet("mode", "linear",       _mode, RESAMPLE_LINEAR);
-            conf.getIfSet("mode", "great_circle", _mode, RESAMPLE_GREATCIRCLE);
-            conf.getIfSet("mode", "rhumb_line",   _mode, RESAMPLE_RHUMB);
+            conf.get("min_length", _minLen);
+            conf.get("max_length", _maxLen);
+            conf.get("mode", "linear",       _mode, RESAMPLE_LINEAR);
+            conf.get("mode", "great_circle", _mode, RESAMPLE_GREATCIRCLE);
+            conf.get("mode", "rhumb_line",   _mode, RESAMPLE_RHUMB);
         }
 
         Config getConfig() const {
             Config conf = ConfigOptions::getConfig();
             conf.key() = "resample";
-            conf.addIfSet("min_length", _minLen);
-            conf.addIfSet("max_length", _maxLen);
-            conf.addIfSet("mode", "linear",       _mode, RESAMPLE_LINEAR);
-            conf.addIfSet("mode", "great_circle", _mode, RESAMPLE_GREATCIRCLE);
-            conf.addIfSet("mode", "rhumb_line",   _mode, RESAMPLE_RHUMB);
+            conf.set("min_length", _minLen);
+            conf.set("max_length", _maxLen);
+            conf.set("mode", "linear",       _mode, RESAMPLE_LINEAR);
+            conf.set("mode", "great_circle", _mode, RESAMPLE_GREATCIRCLE);
+            conf.set("mode", "rhumb_line",   _mode, RESAMPLE_RHUMB);
             return conf;
         }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ResampleFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/ResampleFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ResampleFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ResampleFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScaleFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScaleFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScaleFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScaleFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScaleFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScaleFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScaleFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScaleFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScatterFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScatterFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScatterFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScatterFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScatterFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScatterFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScatterFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScatterFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/Script osgearth-2.10.2+dfsg/src/osgEarthFeatures/Script
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/Script	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/Script	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScriptEngine osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScriptEngine
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScriptEngine	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScriptEngine	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -93,12 +93,6 @@
         return script ? run(script->getCode(), feature, context) : ScriptResult("", false);
     }
 
-    /** deprecated */
-    virtual ScriptResult call(const std::string& function, Feature const* feature=0L, FilterContext const* context=0L)
-    {
-        return ScriptResult("", false, "ScriptResult::call not implemented");
-    }
-
   public:
     // META_Object specialization:
     virtual osg::Object* cloneType() const { return 0; } // cloneType() not appropriate
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScriptEngine.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScriptEngine.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScriptEngine.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScriptEngine.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -30,14 +30,14 @@
 ScriptEngineOptions::fromConfig( const Config& conf )
 {
     optional<std::string> val;
-    if (conf.getIfSet<std::string>( "script_code", val))
+    if (conf.get<std::string>( "script_code", val))
     {
         Script cfgScript(val.get());
         
-        if (conf.getIfSet<std::string>( "script_language", val ))
+        if (conf.get<std::string>( "script_language", val ))
           cfgScript.setLanguage(val.get());
 
-        if (conf.getIfSet<std::string>( "script_name", val ))
+        if (conf.get<std::string>( "script_name", val ))
           cfgScript.setName(val.get());
     }
 }
@@ -56,9 +56,9 @@
 
     if (_script.isSet())
     {
-      if (!_script->getCode().empty()) conf.update("script_code", _script->getCode());
-      if (!_script->getLanguage().empty()) conf.update("script_language", _script->getLanguage());
-      if (!_script->getName().empty()) conf.update("script_name", _script->getName());
+      if (!_script->getCode().empty()) conf.set("script_code", _script->getCode());
+      if (!_script->getLanguage().empty()) conf.set("script_language", _script->getLanguage());
+      if (!_script->getName().empty()) conf.set("script_name", _script->getName());
     }
 
     return conf;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScriptFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScriptFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScriptFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScriptFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -54,15 +54,15 @@
 
         void fromConfig(const Config& conf) {
             _expression = conf.value();
-            conf.getIfSet("language", _language);
-            conf.getIfSet("profile", _profile);
+            conf.get("language", _language);
+            conf.get("profile", _profile);
         }
 
         Config getConfig() const {
             Config conf = ConfigOptions::getConfig();
-            conf.value() = _expression.get();
-            conf.addIfSet("language", _language);
-            conf.addIfSet("profile", _profile);
+            conf.setValue(_expression.get());
+            conf.set("language", _language);
+            conf.set("profile", _profile);
             return conf;
         }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScriptFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScriptFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/ScriptFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/ScriptFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/Session osgearth-2.10.2+dfsg/src/osgEarthFeatures/Session
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/Session	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/Session	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 #include <osgEarthFeatures/Common>
 
 #include <osgEarth/MapInfo>
-#include <osgEarth/MapFrame>
 #include <osgEarth/Map>
 #include <osgEarth/URI>
 
@@ -53,10 +52,6 @@
      * Whereas a FilterContext exists thoughout the life of a single compilation, a Session
      * exists one level above this and governs any number of "related" compilations
      * (e.g., the compilation of many grid cells comprising a single feature layer).
-     *
-     * Note: A Session holds a ref_ptr to a Map, so that it can yield MapFrame objects
-     * to be used and then discarded. Don't hold on to a Session reference indefinitely;
-     * use the Session and destroy it after compilation.
      */
     class OSGEARTHFEATURES_EXPORT Session : public osg::Object
     {
@@ -65,9 +60,11 @@
 
         //! New session
         Session(const Map* map);
-
+        
+        //! New session
         Session(const Map* map, StyleSheet* styles);
         
+        //! New session
         Session(const Map* map, StyleSheet* styles, FeatureSource* source, const osgDB::Options* dbOptions);
 
         virtual ~Session();
@@ -78,18 +75,14 @@
         void setURIContext( const URIContext& value ) { _uriContext = value; }
         const URIContext& uriContext() const { return _uriContext; }
 
-        /**
-         * Gets the underlying map (frame) interface in this session
-         */
-        MapFrame createMapFrame() const;
+        /** Underlying map. Check it for null before using! */
+        osg::ref_ptr<const Map> getMap() const;
 
-        /**
-         * Gets the map information backing up this session.
-         */
+        /** Map information */
         const MapInfo& getMapInfo() const { return _mapInfo; }
 
-        /** Gets the SRS of the map behind this session */
-        const SpatialReference* getMapSRS() const { return _mapInfo.getSRS(); }
+        /** SRS of the map */
+        const SpatialReference* getMapSRS() const;
 
         /** The style sheet governing this session. */
         void setStyles( StyleSheet* value );
@@ -129,7 +122,7 @@
         void initScriptEngine();
 
         URIContext                         _uriContext;         
-        osg::ref_ptr<const Map>            _map;
+        osg::observer_ptr<const Map>       _map;
         MapInfo                            _mapInfo;
         osg::ref_ptr<StyleSheet>           _styles;
         osg::ref_ptr<const osgDB::Options> _dbOptions;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/Session.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/Session.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/Session.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/Session.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -72,6 +72,15 @@
     init();
 }
 
+Session::Session(const Session& rhs, const osg::CopyOp& op) :
+osg::Object(rhs, op),
+_map(rhs._map.get()),
+_mapInfo(rhs._mapInfo)
+{
+    //nop
+}
+
+
 void
 Session::init()
 {
@@ -90,9 +99,6 @@
     //nop
 }
 
-Session::Session(const Session& rhs, const osg::CopyOp& op) : osg::Object(rhs, op), _mapInfo(0L) { }
-
-
 const osgDB::Options*
 Session::getDBOptions() const
 {
@@ -101,11 +107,9 @@
         return _dbOptions.get();
 
     // otherwise get them from the map if possible:
-    //osg::ref_ptr<const Map> map;
-    //if (_map.lock(map))
-    //    return map->getReadOptions();
-
-    return _map->getReadOptions();
+    osg::ref_ptr<const Map> map;
+    if (_map.lock(map))
+        return map->getReadOptions();
 
     return 0L;
 }
@@ -122,10 +126,18 @@
     return _resourceCache.get();
 }
 
-MapFrame
-Session::createMapFrame() const
+osg::ref_ptr<const Map>
+Session::getMap() const
+{
+    osg::ref_ptr<const Map> map;
+    _map.lock(map);
+    return map;
+}
+
+const SpatialReference*
+Session::getMapSRS() const
 {
-    return MapFrame( _map.get() );
+    return _mapInfo.getSRS();
 }
 
 StateSetCache*
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/Shaders osgearth-2.10.2+dfsg/src/osgEarthFeatures/Shaders
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/Shaders	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/Shaders	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -27,12 +27,12 @@
 
 namespace osgEarth { namespace Features
 {
-    class OSGEARTHFEATURES_EXPORT GPULineShaders : public ShaderPackage
+    class OSGEARTHFEATURES_EXPORT Shaders : public ShaderPackage
 	{
     public:
-        GPULineShaders();
-
-        std::string GPULinesScreenProj;
+        Shaders();
+        
+        // add here
 	};	
 
 } } // namespace osgEarth::Features
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/Shaders.cpp.in osgearth-2.10.2+dfsg/src/osgEarthFeatures/Shaders.cpp.in
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/Shaders.cpp.in	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/Shaders.cpp.in	2019-07-11 18:30:19.000000000 +0000
@@ -4,10 +4,8 @@
 
 namespace osgEarth { namespace Features
 {
-    GPULineShaders::GPULineShaders()
+    Shaders::Shaders()
     {
-        // GPU Screen Projected Lines
-        GPULinesScreenProj = "GPULinesScreenProj.glsl";
-        _sources[GPULinesScreenProj] = "@GPULinesScreenProj.glsl@";
+        // none yet
     }
 } }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/SubstituteModelFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/SubstituteModelFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/SubstituteModelFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/SubstituteModelFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -24,7 +24,6 @@
 #include <osgEarthFeatures/Feature>
 #include <osgEarthFeatures/Filter>
 #include <osgEarthSymbology/Style>
-#include <osgEarthSymbology/MarkerResource>
 #include <osgEarth/Containers>
 
 namespace osgEarth {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/SubstituteModelFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/SubstituteModelFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/SubstituteModelFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/SubstituteModelFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 #include <osgEarthFeatures/FilterContext>
 #include <osgEarthFeatures/GeometryUtils>
 
-#include <osgEarthSymbology/MeshConsolidator>
 #include <osgEarthSymbology/MeshFlattener>
 #include <osgEarthSymbology/StyleSheet>
 
@@ -42,6 +41,10 @@
 
 #define LC "[SubstituteModelFilter] "
 
+#ifndef GL_CLIP_DISTANCE0
+#define GL_CLIP_DISTANCE0 0x3000
+#endif
+
 using namespace osgEarth;
 using namespace osgEarth::Features;
 using namespace osgEarth::Symbology;
@@ -68,7 +71,7 @@
 SubstituteModelFilter::SubstituteModelFilter( const Style& style ) :
 _style                ( style ),
 _cluster              ( false ),
-_useDrawInstanced     ( false ),
+_useDrawInstanced     ( true ),
 _merge                ( true ),
 _normalScalingRequired( false ),
 _instanceCache        ( false )     // cache per object so MT not required
@@ -296,7 +299,7 @@
 
                     scaleMatrix = osg::Matrix::scale( scaleVec );
 
-                    if ( modelSymbol->heading().isSet() )
+                    if ( modelSymbol && modelSymbol->heading().isSet() )
                     {
                         float heading = input->eval(headingEx, &context);
                         rotationMatrix.makeRotate( osg::Quat(osg::DegreesToRadians(heading), osg::Vec3(0,0,1)) );
@@ -310,11 +313,11 @@
                         // but if the tile is big enough the up vectors won't be quite right.
                         osg::Matrixd rotation;
                         ECEF::transformAndGetRotationMatrix( point, context.profile()->getSRS(), point, targetSRS, rotation );
-                        mat = rotationMatrix * scaleMatrix * rotation * osg::Matrixd::translate( point ) * _world2local;
+                        mat = scaleMatrix * rotationMatrix * rotation * osg::Matrixd::translate( point ) * _world2local;
                     }
                     else
                     {
-                        mat = rotationMatrix * scaleMatrix *  osg::Matrixd::translate( point ) * _world2local;
+                        mat = scaleMatrix * rotationMatrix * osg::Matrixd::translate( point ) * _world2local;
                     }
 
                     osg::MatrixTransform* xform = new osg::MatrixTransform();
@@ -352,8 +355,11 @@
         // activate horizon culling if we are in geocentric space
         if ( context.getSession() && context.getSession()->getMapInfo().isGeocentric() )
         {
-            //TODO: re-evaluate this; use Horizon?
-            HorizonCullingProgram::install( attachPoint->getOrCreateStateSet() );
+            // should this use clipping, or a horizon cull callback?
+
+            //HorizonCullingProgram::install( attachPoint->getOrCreateStateSet() );
+
+            attachPoint->getOrCreateStateSet()->setMode(GL_CLIP_DISTANCE0, 1);
         }
     }
 
@@ -435,13 +441,6 @@
 
     osg::ref_ptr<const InstanceSymbol> symbol = _style.get<InstanceSymbol>();
 
-    // check for deprecated MarkerSymbol type.
-    if ( !symbol.valid() )
-    {
-        if ( _style.has<MarkerSymbol>() )
-            symbol = _style.get<MarkerSymbol>()->convertToInstanceSymbol();
-    }
-
     if ( !symbol.valid() )
     {
         OE_WARN << LC << "No appropriate symbol found in stylesheet; aborting." << std::endl;
@@ -499,23 +498,5 @@
     // return proper context
     context = newContext;
 
-#if 0
-    // TODO: OBE due to shader pipeline
-    // see if we need normalized normals
-    if ( _normalScalingRequired )
-    {
-        // TODO: carefully test for this, since GL_NORMALIZE hurts performance in 
-        // FFP mode (RESCALE_NORMAL is faster for uniform scaling); and I think auto-normal-scaling
-        // is disabled entirely when using shaders. For now I believe we are dropping to FFP
-        // when not using instancing ...so just check for that
-        if ( !_useDrawInstanced )
-        {
-            group->getOrCreateStateSet()->setMode( GL_NORMALIZE, osg::StateAttribute::ON );
-        }
-    }
-#endif
-
-    //osgDB::writeNodeFile(*group, "c:/temp/clustered.osg");
-
     return group;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/TessellateOperator osgearth-2.10.2+dfsg/src/osgEarthFeatures/TessellateOperator
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/TessellateOperator	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/TessellateOperator	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/TessellateOperator.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/TessellateOperator.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/TessellateOperator.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/TessellateOperator.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -45,6 +45,9 @@
 
     out.push_back( p0 );
 
+    GeoPoint beg(SpatialReference::get("wgs84"), p0);
+    GeoPoint end(SpatialReference::get("wgs84"), p1);
+
     for( unsigned i=1; i<parts; ++i )
     {
         double t = step*double(i);
@@ -52,13 +55,8 @@
 
         if ( interp == GEOINTERP_GREAT_CIRCLE )
         {
-            double lat, lon;
-            GeoMath::interpolate(
-                osg::DegreesToRadians(p0.y()), osg::DegreesToRadians(p0.x()),
-                osg::DegreesToRadians(p1.y()), osg::DegreesToRadians(p1.x()),
-                t,
-                lat, lon );
-            p.set( osg::RadiansToDegrees(lon), osg::RadiansToDegrees(lat), p0.z() + t*zdelta );
+            GeoPoint r = beg.interpolate(end, t);
+            p = r.vec3d();
         }
         else // GEOINTERP_RHUMB_LINE
         {
@@ -109,9 +107,6 @@
 
     if ( _maxDistance.isSet() )
     {
-        // copmpute the slice size in feature units.
-        double latitude = feature->getGeometry()->getBounds().center().y();
-        sliceSize = SpatialReference::transformUnits( _maxDistance.value(), feature->getSRS(), latitude );
         sliceSize = _maxDistance->as(Units::METERS);
     }
 
@@ -134,7 +129,7 @@
                 if ( sliceSize > 0.0 )
                 {
                     double dist = GeoMath::distance(*v, *(v + 1), feature->getSRS());
-                    slices = std::max( 1u, (unsigned)(dist / sliceSize) );
+                    slices = osg::maximum( 1u, (unsigned)(dist / sliceSize) );
                 }
 
                 if ( isGeo )
@@ -148,7 +143,7 @@
                 if ( sliceSize > 0.0 )
                 {
                     double dist = GeoMath::distance(*v, *g->begin(), feature->getSRS());
-                    slices = std::max( 1u, (unsigned)(dist / sliceSize) );
+                    slices = osg::maximum( 1u, (unsigned)(dist / sliceSize) );
                 }
 
                 if ( isGeo )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/TextSymbolizer osgearth-2.10.2+dfsg/src/osgEarthFeatures/TextSymbolizer
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/TextSymbolizer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/TextSymbolizer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -21,37 +21,40 @@
 #define OSGEARTHFEATURES_TEXT_SYMBOLIZER_H 1
 
 #include <osgEarthFeatures/Common>
-#include <osgEarthFeatures/Feature>
-#include <osgEarthFeatures/FilterContext>
 #include <osgEarthSymbology/TextSymbol>
-
 #include <osgText/Text>
+#include <osg/BoundingBox>
 
 namespace osgEarth { namespace Features
 {
+    class Feature;
+    class FilterContext;
+
     using namespace osgEarth::Symbology;
 
     /**
-     * Utilities that use a TextSymbol to create OSG text objects.
+     * Applies the TextSymbol to a Text object.
      */
     class OSGEARTHFEATURES_EXPORT TextSymbolizer
     {
     public:
-        TextSymbolizer( const TextSymbol* symbol );
+        //! Construct a new symbolizer
+        TextSymbolizer(const TextSymbol* symbol);
+
+        //! Translate the symbol's encoding to an OSG enum
+        osgText::String::Encoding getEncoding() const;
 
-        virtual ~TextSymbolizer() { }
+        //! Apply this symbol to a text object
+        void apply(osgText::Text* text) const;
 
-        /**
-         * Creates a drawable for the specified string.
-         */
-        osgText::Text* create(
-            Feature*             feature =0L,
-            const FilterContext* context =0L,
-            const std::string&   text    ="" ) const;
-
-        osgText::Text* create( const std::string& text ) const {
-            return create(0L, 0L, text);
-        }
+        //! Apply this symbol to a text object, using the optional
+        //! feature/context to evaluate expression fields. The optional
+        //! bounding box can be used for alignment support.
+        void apply(
+            osgText::Text* text,
+            Feature* feature,
+            const FilterContext* context,
+            const osg::BoundingBox* box) const;
 
     protected:
         osg::ref_ptr<const TextSymbol> _symbol;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/TextSymbolizer.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/TextSymbolizer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/TextSymbolizer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/TextSymbolizer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,9 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarthFeatures/TextSymbolizer>
+#include <osgEarthFeatures/Feature>
 #include <osgEarth/Registry>
-#include <osgText/Text>
-
 
 using namespace osgEarth;
 using namespace osgEarth::Features;
@@ -31,97 +30,221 @@
     //nop
 }
 
-osgText::Text*
-TextSymbolizer::create(Feature*             feature,
-                       const FilterContext* context,
-                       const std::string&   text     ) const
-{    
-    osgText::Text* t = new osgText::Text();
-
-    osgText::String::Encoding textEncoding = osgText::String::ENCODING_UNDEFINED;
-
-    if ( _symbol.valid() && _symbol->encoding().isSet() )
+namespace
+{
+    // rounds "x" up to the next power of 2
+    int nextPowerOf2(int x)
     {
-        switch(_symbol->encoding().value())
+        --x;
+        x |= x >> 1;
+        x |= x >> 2;
+        x |= x >> 4;
+        x |= x >> 8;
+        x |= x >> 16;
+        return x+1;
+    }
+    
+    // transcodes an OE encoding to an OSG encoding
+    osgText::String::Encoding convertEncoding(TextSymbol::Encoding enc)
+    {
+        switch(enc)
         {
-        case TextSymbol::ENCODING_ASCII: textEncoding = osgText::String::ENCODING_ASCII; break;
-        case TextSymbol::ENCODING_UTF8: textEncoding = osgText::String::ENCODING_UTF8; break;
-        case TextSymbol::ENCODING_UTF16: textEncoding = osgText::String::ENCODING_UTF16; break;
-        case TextSymbol::ENCODING_UTF32: textEncoding = osgText::String::ENCODING_UTF32; break;
-        default: textEncoding = osgText::String::ENCODING_UNDEFINED; break;
+        case TextSymbol::ENCODING_ASCII: return osgText::String::ENCODING_ASCII; break;
+        case TextSymbol::ENCODING_UTF8:  return osgText::String::ENCODING_UTF8; break;
+        case TextSymbol::ENCODING_UTF16: return osgText::String::ENCODING_UTF16; break;
+        case TextSymbol::ENCODING_UTF32: return osgText::String::ENCODING_UTF32; break;
+        default: return osgText::String::ENCODING_UNDEFINED;
         }
     }
 
-    if ( !text.empty() )
-    {
-        t->setText( text, textEncoding );
-    }
-    else if ( _symbol.valid() && _symbol->content().isSet() )
+    osgText::String::Encoding getEncodingFromSymbol(const TextSymbol* symbol)
     {
-        StringExpression expr = *_symbol->content();
-        std::string newText = feature ? feature->eval(expr, context) : expr.eval();
-        t->setText( newText, textEncoding );
+        return symbol && symbol->encoding().isSet() ?
+            convertEncoding(symbol->encoding().get()) :
+            osgText::String::ENCODING_UNDEFINED;
     }
+}
+
+osgText::String::Encoding
+TextSymbolizer::getEncoding() const
+{
+    return getEncodingFromSymbol(_symbol.get());
+}
+
+void
+TextSymbolizer::apply(osgText::Text* drawable,
+                      Feature* feature,
+                      const FilterContext* context,
+                      const osg::BoundingBox* box_in) const
+{
+    static TextSymbol s_defaultSymbol;
+    const TextSymbol* symbol = _symbol.valid() ? _symbol.get() : &s_defaultSymbol;
 
-    if ( _symbol.valid() && _symbol->pixelOffset().isSet() )
+    osgText::String::Encoding encoding = convertEncoding(symbol->encoding().get());
+    if (symbol->content().isSet())
     {
-        t->setPosition( osg::Vec3(_symbol->pixelOffset()->x(), _symbol->pixelOffset()->y(), 0.0f) );
+        StringExpression temp(symbol->content().get());
+        std::string content = feature ? feature->eval(temp, context) : symbol->content()->eval();
+        drawable->setText(content, encoding);
     }
 
-    //TODO: resonsider defaults here
-    t->setCharacterSizeMode( osgText::Text::OBJECT_COORDS );
+    // osgText::Text turns on depth writing by default, even if you turned it off.
+    // GW: move this to osgEarth::Text?
+    drawable->setEnableDepthWrites( false );
 
-    float size = 16.0f;
-    if (_symbol->size().isSet())
+    if ( symbol->layout().isSet() )
     {
-        NumericExpression sizeExpr = _symbol->size().value();
-        size = feature ? feature->eval(sizeExpr, context) : sizeExpr.eval();
+        if(symbol->layout().value() == TextSymbol::LAYOUT_RIGHT_TO_LEFT)
+        {
+            drawable->setLayout(osgText::TextBase::RIGHT_TO_LEFT);
+        }
+        else if(symbol->layout().value() == TextSymbol::LAYOUT_LEFT_TO_RIGHT)
+        {
+            drawable->setLayout(osgText::TextBase::LEFT_TO_RIGHT);
+        }
+        else if(symbol->layout().value() == TextSymbol::LAYOUT_VERTICAL)
+        {
+            drawable->setLayout(osgText::TextBase::VERTICAL);
+        }
     }
-    t->setCharacterSize( size );
 
-    t->setColor( _symbol.valid() && _symbol->fill().isSet() ? _symbol->fill()->color() : Color::White );
+    // calculate the text position relative to the alignment box.
+    static osg::BoundingBox s_defaultbbox(0,0,0,0,0,0);
+    const osg::BoundingBox& box = box_in? *box_in : s_defaultbbox;
+
+    osg::Vec3f pos;
+
+    osgText::Text::AlignmentType align = osgText::Text::CENTER_CENTER;
+    // they're the same enum, but we need to apply the BBOX offsets.
+    align = (osgText::Text::AlignmentType)symbol->alignment().value();
+
+    switch( align )
+    {
+    case osgText::Text::LEFT_TOP:
+        pos.x() = box.xMax();
+        pos.y() = box.yMin();
+        break;
+    case osgText::Text::LEFT_CENTER:
+        pos.x() = box.xMax();
+        pos.y() = box.center().y();
+        break;
+    case osgText::Text::LEFT_BOTTOM:
+    case osgText::Text::LEFT_BOTTOM_BASE_LINE:
+    case osgText::Text::LEFT_BASE_LINE:
+        pos.x() = box.xMax();
+        pos.y() = box.yMax();
+        break;
+
+    case osgText::Text::RIGHT_TOP:
+        pos.x() = box.xMin();
+        pos.y() = box.yMin();
+        break;
+    case osgText::Text::RIGHT_CENTER:
+        pos.x() = box.xMin();
+        pos.y() = box.center().y();
+        break;
+    case osgText::Text::RIGHT_BOTTOM:
+    case osgText::Text::RIGHT_BOTTOM_BASE_LINE:
+    case osgText::Text::RIGHT_BASE_LINE:
+        pos.x() = box.xMin();
+        pos.y() = box.yMax();
+        break;
+
+    case osgText::Text::CENTER_TOP:
+        pos.x() = box.center().x();
+        pos.y() = box.yMin();
+        break;
+    case osgText::Text::CENTER_BOTTOM:
+    case osgText::Text::CENTER_BOTTOM_BASE_LINE:
+    case osgText::Text::CENTER_BASE_LINE:
+        pos.x() = box.center().x();
+        pos.y() = box.yMax();
+        break;
+    case osgText::Text::CENTER_CENTER:
+    default:
+        pos = box.center();
+        break;
+    }
+
+    drawable->setPosition( pos );
+
+    drawable->setAlignment( align );
+
+    drawable->setAutoRotateToScreen(false);
+    drawable->setCharacterSizeMode( osgText::Text::OBJECT_COORDS );
+    
+    float size = symbol->size().isSet() ? (float)(symbol->size()->eval()) : 16.0f;    
+
+    drawable->setCharacterSize( size * Registry::instance()->getDevicePixelRatio() );
+
+    drawable->setColor( symbol->fill().isSet() ? symbol->fill()->color() : Color::White );
 
     osg::ref_ptr<osgText::Font> font;
-    if ( _symbol.valid() && _symbol->font().isSet() )
+    if ( symbol->font().isSet() )
     {
-        font = osgText::readRefFontFile( *_symbol->font() );
-        
-#if OSG_VERSION_LESS_THAN(3,5,8)
-        // mitigates mipmapping issues that cause rendering artifacts for some fonts/placement
-        if ( font )
-            font->setGlyphImageMargin( 2 );
-#endif
+        font = osgText::readRefFontFile( *symbol->font() );
     }
+
     if ( !font )
+    {
         font = Registry::instance()->getDefaultFont();
+    }
 
     if ( font )
     {
-        t->setFont( font );
-
-        // OSG 3.4.1+ adds a program, so we remove it since we're using VPs.
-        t->setStateSet(0L);
+        drawable->setFont( font );
+        
+#if OSG_VERSION_LESS_THAN(3,5,8)
+        // mitigates mipmapping issues that cause rendering artifacts for some fonts/placement
+        font->setGlyphImageMargin( 2 );
+#endif        
     }
 
-    if ( _symbol.valid() )
+#if OSG_VERSION_LESS_THAN(3,5,8)
+    float resFactor = 2.0f;
+    int res = nextPowerOf2((int)(size*resFactor));
+    drawable->setFontResolution(res, res);
+#endif
+    
+    if ( symbol->halo().isSet() )
     {
-        // they're the same enum.
-        osgText::Text::AlignmentType at = (osgText::Text::AlignmentType)_symbol->alignment().value();
-        t->setAlignment( at );
-    }
+        drawable->setBackdropColor( symbol->halo()->color() );
 
-    if ( _symbol.valid() && _symbol->halo().isSet() )
-    {
-        t->setBackdropColor( _symbol->halo()->color() );
-        t->setBackdropType( osgText::Text::OUTLINE );
+        if ( symbol->haloBackdropType().isSet() )
+        {
+            drawable->setBackdropType( *symbol->haloBackdropType() );
+        }
+        else
+        {
+            drawable->setBackdropType( osgText::Text::OUTLINE );
+        }
+
+#if OSG_VERSION_LESS_THAN(3,5,8)
+        // deprecated since OSG 3.5.8
+        if ( symbol->haloImplementation().isSet() )
+        {
+            drawable->setBackdropImplementation( *symbol->haloImplementation() );
+        }
+#endif
+
+        if ( symbol->haloOffset().isSet() )
+        {
+            drawable->setBackdropOffset( *symbol->haloOffset(), *symbol->haloOffset() );
+        }
     }
-    else if ( !_symbol.valid() )
+
+    // this disables the default rendering bin set by osgText::Font. 
+    // Necessary if we're going to do decluttering.
+    // gw: consider moving this into annotationutils
+    if ( drawable->getStateSet() )
     {
-        // if no symbol at all is provided, default to using a black halo.
-        t->setBackdropColor( osg::Vec4(.3,.3,.3,1) );
-        t->setBackdropType( osgText::Text::OUTLINE );
+        drawable->getStateSet()->setRenderBinToInherit();
     }
-
-    return t;
+    
 }
 
+void
+TextSymbolizer::apply(osgText::Text* drawable) const
+{
+    return apply(drawable, 0L, 0L, 0L);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/TransformFilter osgearth-2.10.2+dfsg/src/osgEarthFeatures/TransformFilter
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/TransformFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/TransformFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/TransformFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/TransformFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/TransformFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/TransformFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/VirtualFeatureSource osgearth-2.10.2+dfsg/src/osgEarthFeatures/VirtualFeatureSource
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/VirtualFeatureSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/VirtualFeatureSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -63,7 +63,7 @@
         void add( FeatureSource* source, FeaturePredicate* predicate );
 
     public: // FeatureSource
-        virtual FeatureCursor* createFeatureCursor( const Query& query );
+        virtual FeatureCursor* createFeatureCursor(const Query& query, ProgressCallback* progress);
         virtual const FeatureSchema& getSchema() const;
         virtual Feature* getFeature( FeatureID id ) { return 0L; }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthFeatures/VirtualFeatureSource.cpp osgearth-2.10.2+dfsg/src/osgEarthFeatures/VirtualFeatureSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthFeatures/VirtualFeatureSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthFeatures/VirtualFeatureSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -35,11 +35,11 @@
      */
     struct VirtualFeatureCursor : public FeatureCursor
     {
-        VirtualFeatureCursor( const FeatureSourceMappingVector& sources, const Query& query ) :
-          _sources(sources), _query(query)
+        VirtualFeatureCursor( const FeatureSourceMappingVector& sources, const Query& query, ProgressCallback* progress) :
+          FeatureCursor(progress), _sources(sources), _query(query)
         {
-            _si = _sources.begin();
             advance();
+            _si = _sources.begin();
         }
 
         bool hasMore() const
@@ -72,7 +72,7 @@
                 // if we're at the beginning, create the first cursor:
                 if ( _si == _sources.begin() && !_si_cursor.valid() )
                 {
-                    _si_cursor = _si->_source->createFeatureCursor( _query );
+                    _si_cursor = _si->_source->createFeatureCursor( _query, _progress.get() );
                 }
 
                 while ( !_si_cursor.valid() || !_si_cursor->hasMore() )
@@ -83,7 +83,7 @@
                         return;
 
                     // make a cursor for the next source
-                    _si_cursor = _si->_source->createFeatureCursor( _query );
+                    _si_cursor = _si->_source->createFeatureCursor( _query, _progress.get() );
                 }
 
                 // here, we have a valid cursor with pending data:
@@ -102,6 +102,7 @@
         osg::ref_ptr<FeatureCursor>          _si_cursor; // cursor into current source
         osg::ref_ptr<Feature>                _nextFeature;
         osg::ref_ptr<Feature>                _lastFeatureReturned; // to manage references during iteration
+        bool                                 _needsInit;
     };
 }
 
@@ -137,9 +138,9 @@
 }
 
 FeatureCursor* 
-VirtualFeatureSource::createFeatureCursor( const Query& query )
+VirtualFeatureSource::createFeatureCursor(const Query& query, ProgressCallback* progress)
 {
-    return new VirtualFeatureCursor( _sources, query );
+    return new VirtualFeatureCursor(_sources, query, progress);
 }
 
 Status 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthQt/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthQt/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -158,7 +158,8 @@
     LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY})
 
     IF ( Qt5Widgets_FOUND )
-        qt5_use_modules( ${LIB_NAME} Gui Widgets OpenGL )
+	FIND_PACKAGE(Qt5OpenGL REQUIRED)
+	TARGET_LINK_LIBRARIES( ${LIB_NAME} Qt5::Gui Qt5::Widgets Qt5::OpenGL )
     ENDIF( Qt5Widgets_FOUND )
 
     # Add this project to the NodeKits solution folder
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/Common osgearth-2.10.2+dfsg/src/osgEarthQt/Common
--- osgearth-2.9.0+dfsg/src/osgEarthQt/Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/Common	2019-07-11 18:30:19.000000000 +0000
@@ -24,11 +24,6 @@
 #include <osgEarthAnnotation/AnnotationNode>
 #include <osgViewer/Viewer>
 
-// define USE_DEPRECATED_API is used to include in API which is being phased out
-// if you can compile your apps with this turned off you are
-// well placed for compatibility with future versions.
-#define USE_DEPRECATED_API
-
 #if defined(_MSC_VER)
     #pragma warning( disable : 4244 )
     #pragma warning( disable : 4251 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/DataManager.cpp osgearth-2.10.2+dfsg/src/osgEarthQt/DataManager.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthQt/DataManager.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/DataManager.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -64,17 +64,17 @@
     osgEarth::ElevationLayerVector elevLayers;
     _map->getLayers(elevLayers);
     for (osgEarth::ElevationLayerVector::const_iterator it = elevLayers.begin(); it != elevLayers.end(); ++it)
-      (*it)->addCallback(_elevationCallback);
+      (*it)->addCallback(_elevationCallback.get());
 
     osgEarth::ImageLayerVector imageLayers;
     _map->getLayers(imageLayers);
     for (osgEarth::ImageLayerVector::const_iterator it = imageLayers.begin(); it != imageLayers.end(); ++it)
-      (*it)->addCallback(_imageCallback);
+      (*it)->addCallback(_imageCallback.get());
 
     osgEarth::ModelLayerVector modelLayers;
     _map->getLayers(modelLayers);
     for (osgEarth::ModelLayerVector::const_iterator it = modelLayers.begin(); it != modelLayers.end(); ++it)
-      (*it)->addCallback(_modelCallback);
+      (*it)->addCallback(_modelCallback.get());
 
     _map->addMapCallback(new DataManagerMapCallback(this));
   }
@@ -136,7 +136,7 @@
 
   if (removed)
   {
-    emit annotationRemoved(annoToRemove);
+    emit annotationRemoved(annoToRemove.get());
     emit mapChanged();
   }
 }
@@ -258,20 +258,20 @@
   {
   case MapModelChange::ADD_LAYER: 
       if (change.getElevationLayer())
-        change.getElevationLayer()->addCallback(_elevationCallback);
+        change.getElevationLayer()->addCallback(_elevationCallback.get());
       else if (change.getImageLayer())
-        change.getImageLayer()->addCallback(_imageCallback);
+        change.getImageLayer()->addCallback(_imageCallback.get());
       else if (change.getModelLayer())
-          change.getModelLayer()->addCallback(_modelCallback);
+          change.getModelLayer()->addCallback(_modelCallback.get());
       break;
 
   case MapModelChange::REMOVE_LAYER:
       if (change.getElevationLayer())
-        change.getElevationLayer()->removeCallback(_elevationCallback);
+        change.getElevationLayer()->removeCallback(_elevationCallback.get());
       else if (change.getImageLayer())
-        change.getImageLayer()->removeCallback(_imageCallback);
+        change.getImageLayer()->removeCallback(_imageCallback.get());
       else if (change.getModelLayer())
-          change.getModelLayer()->removeCallback(_modelCallback);
+          change.getModelLayer()->removeCallback(_modelCallback.get());
       break;
 
   default:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/LayerManagerWidget.cpp osgearth-2.10.2+dfsg/src/osgEarthQt/LayerManagerWidget.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthQt/LayerManagerWidget.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/LayerManagerWidget.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -26,6 +26,7 @@
 #include <osgEarth/Map>
 #include <osgEarth/ModelLayer>
 #include <osgEarth/Viewpoint>
+#include <osgEarth/Version>
 #include <osgEarthAnnotation/AnnotationNode>
 
 #include <osg/MatrixTransform>
@@ -112,9 +113,34 @@
   {
     LayerManagerMapCallback(LayerManagerWidget* manager) : _manager(manager) { }
 
-    //void onMapInfoEstablished( const MapInfo& mapInfo ) { } 
+#if OSGEARTH_VERSION_GREATER_OR_EQUAL(2,10,0)
 
-    //void onMapModelChanged( const MapModelChange& change );
+    void onLayerAdded(Layer* layer, unsigned index)
+    {
+        ImageLayer* imageLayer = dynamic_cast<ImageLayer*>(layer);
+        if (imageLayer)
+            _manager->addImageLayerItem(imageLayer, index);
+
+        ElevationLayer* elevationLayer = dynamic_cast<ElevationLayer*>(layer);
+        if (elevationLayer)
+            _manager->addElevationLayerItem(elevationLayer, index);
+
+        ModelLayer* modelLayer = dynamic_cast<ModelLayer*>(layer);
+        if (modelLayer)
+            _manager->addModelLayerItem(modelLayer, index);
+    }
+
+    void onLayerRemoved(Layer* layer)
+    {
+        _manager->removeLayerItem(layer);
+    }
+
+    void onLayerMoved(Layer* layer, unsigned oldIndex, unsigned newIndex)
+    {
+        _manager->moveLayerItem(layer, oldIndex, newIndex);
+    }
+
+#else
 
     void onImageLayerAdded(ImageLayer* layer, unsigned int index)
     {
@@ -163,6 +189,7 @@
 
     //void onMaskLayerAdded( MaskLayer* mask ) { }
     //void onMaskLayerRemoved( MaskLayer* mask ) { }
+#endif
 
     LayerManagerWidget* _manager;
   };
@@ -381,7 +408,7 @@
 void ElevationLayerControlWidget::onRemoveClicked(bool checked)
 {
   if (_parent && _parent->getMap())
-    _parent->getMap()->removeLayer(_layer);
+    _parent->getMap()->removeLayer(_layer.get());
 }
 
 void ElevationLayerControlWidget::setLayerVisible(bool visible)
@@ -497,7 +524,7 @@
 void ImageLayerControlWidget::onRemoveClicked(bool checked)
 {
   if (_parent && _parent->getMap())
-    _parent->getMap()->removeLayer(_layer);
+    _parent->getMap()->removeLayer(_layer.get());
 }
 
 void ImageLayerControlWidget::setLayerVisible(bool visible)
@@ -597,7 +624,7 @@
 void ModelLayerControlWidget::onRemoveClicked(bool checked)
 {
   if (_parent && _parent->getMap())
-    _parent->getMap()->removeLayer(_layer);
+    _parent->getMap()->removeLayer(_layer.get());
 }
 
 void ModelLayerControlWidget::setLayerVisible(bool visible)
@@ -619,7 +646,7 @@
 {
   if (!_doubleClick.valid() && _layer.valid() && _map.valid())
   {
-    osg::ref_ptr<osg::Node> temp = _layer->getOrCreateSceneGraph( _map.get(), _map->getReadOptions(), 0L );
+    osg::ref_ptr<osg::Node> temp = _layer->getNode();
     if (temp.valid())
     {
       osg::NodePathList nodePaths = temp->getParentalNodePaths();
@@ -751,21 +778,21 @@
     osgEarth::ImageLayerVector layers;
     _map->getLayers(layers);
     for (osgEarth::ImageLayerVector::const_iterator it = layers.begin(); it != layers.end(); ++it)
-      addImageLayerItem(*it);
+      addImageLayerItem(it->get());
   }
   else if (_type == MODEL_LAYERS)
   {
     osgEarth::ModelLayerVector layers;
     _map->getLayers(layers);
     for (osgEarth::ModelLayerVector::const_iterator it = layers.begin(); it != layers.end(); ++it)
-      addModelLayerItem(*it);
+      addModelLayerItem(it->get());
   }
   else if (_type == ELEVATION_LAYERS)
   {
     osgEarth::ElevationLayerVector layers;
     _map->getLayers(layers);
     for (osgEarth::ElevationLayerVector::const_iterator it = layers.begin(); it != layers.end(); ++it)
-      addElevationLayerItem(*it);
+      addElevationLayerItem(it->get());
   }
 }
 
@@ -812,7 +839,7 @@
   if (_type != MODEL_LAYERS)
     return;
 
-  ModelLayerControlWidget* itemWidget = new ModelLayerControlWidget(layer, this, _map);
+  ModelLayerControlWidget* itemWidget = new ModelLayerControlWidget(layer, this, _map.get());
   _stack->insertWidget(index, itemWidget);
   connect(itemWidget, SIGNAL(doubleClicked()), this, SLOT(onItemDoubleClicked()));
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/LOSControlWidget.cpp osgearth-2.10.2+dfsg/src/osgEarthQt/LOSControlWidget.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthQt/LOSControlWidget.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/LOSControlWidget.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -94,7 +94,7 @@
   removeViews();
 
   for (ViewVector::const_iterator it = views.begin(); it != views.end(); ++it)
-    addView(*it);
+    addView(it->get());
 }
 
 void LOSControlWidget::addView(osgViewer::View* view)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/LOSCreationDialog osgearth-2.10.2+dfsg/src/osgEarthQt/LOSCreationDialog
--- osgearth-2.9.0+dfsg/src/osgEarthQt/LOSCreationDialog	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/LOSCreationDialog	2019-07-11 18:30:19.000000000 +0000
@@ -53,12 +53,11 @@
 
       _lineVerts = new osg::Vec3Array();
       _lineVerts->reserve(2);
-      _lineGeometry->setVertexArray( _lineVerts );
+      _lineGeometry->setVertexArray( _lineVerts.get() );
 
-      osg::Vec4Array* colors = new osg::Vec4Array();
+      osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
       colors->reserve( 2 );
       _lineGeometry->setColorArray( colors );
-      _lineGeometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
 
       _lineVerts->push_back( osg::Vec3d(0.0, 0.0, 0.0) );
       _lineVerts->push_back( osg::Vec3d(0.0, 0.0, _heightAboveTerrain) );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/LOSCreationDialog.cpp osgearth-2.10.2+dfsg/src/osgEarthQt/LOSCreationDialog.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthQt/LOSCreationDialog.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/LOSCreationDialog.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -110,20 +110,20 @@
 
 
   // create map point draggers
-  _p1Dragger  = new LOSIntersectingDragger( _mapNode );
-  _p1Dragger->addPositionChangedCallback(new LOSPointDraggerCallback(_map, this, P2P_START));
+  _p1Dragger  = new LOSIntersectingDragger( _mapNode.get() );
+  _p1Dragger->addPositionChangedCallback(new LOSPointDraggerCallback(_map.get(), this, P2P_START));
   _p1Dragger->setColor(osg::Vec4(0,1,1,0));
   _p1Dragger->setPickColor(osg::Vec4(1,0,1,0));
   _p1BaseAlt = 0.0;
 
-  _p2Dragger  = new LOSIntersectingDragger(_mapNode);
-  _p2Dragger->addPositionChangedCallback(new LOSPointDraggerCallback(_map, this, P2P_END));    
+  _p2Dragger  = new LOSIntersectingDragger(_mapNode.get());
+  _p2Dragger->addPositionChangedCallback(new LOSPointDraggerCallback(_map.get(), this, P2P_END));    
   _p2Dragger->setColor(osg::Vec4(0,1,1,0));
   _p2Dragger->setPickColor(osg::Vec4(1,0,1,0));
   _p2BaseAlt = 0.0;
 
-  _radDragger  = new LOSIntersectingDragger(_mapNode);
-  _radDragger->addPositionChangedCallback(new LOSPointDraggerCallback(_map, this, RADIAL_CENTER));    
+  _radDragger  = new LOSIntersectingDragger(_mapNode.get());
+  _radDragger->addPositionChangedCallback(new LOSPointDraggerCallback(_map.get(), this, RADIAL_CENTER));    
   _radDragger->setColor(osg::Vec4(0,1,1,0));
   _radDragger->setPickColor(osg::Vec4(1,0,1,0));
   _radBaseAlt = 0.0;
@@ -484,7 +484,7 @@
       else
         _p1Dragger->setHeightAboveTerrain(0.0);
 
-      updateDragger(_p1Dragger, GeoPoint(_mapNode->getMapSRS(), _ui.p1LonBox->value(), _ui.p1LatBox->value(), _p1BaseAlt, ALTMODE_RELATIVE));
+      updateDragger(_p1Dragger.get(), GeoPoint(_mapNode->getMapSRS(), _ui.p1LonBox->value(), _ui.p1LatBox->value(), _p1BaseAlt, ALTMODE_RELATIVE));
       break;
     case P2P_END:
       if (_ui.p2pRelativeCheckBox->checkState() == Qt::Checked)
@@ -492,7 +492,7 @@
       else
         _p2Dragger->setHeightAboveTerrain(0.0);
 
-      updateDragger(_p2Dragger, GeoPoint(_mapNode->getMapSRS(), _ui.p2LonBox->value(), _ui.p2LatBox->value(), _p2BaseAlt, ALTMODE_RELATIVE));
+      updateDragger(_p2Dragger.get(), GeoPoint(_mapNode->getMapSRS(), _ui.p2LonBox->value(), _ui.p2LatBox->value(), _p2BaseAlt, ALTMODE_RELATIVE));
       break;
     case RADIAL_CENTER:
       if (_ui.radRelativeCheckBox->checkState() == Qt::Checked)
@@ -500,7 +500,7 @@
       else
         _radDragger->setHeightAboveTerrain(0.0);
 
-      updateDragger(_radDragger, GeoPoint(_mapNode->getMapSRS(), _ui.radLonBox->value(), _ui.radLatBox->value(), _radBaseAlt, ALTMODE_RELATIVE));
+      updateDragger(_radDragger.get(), GeoPoint(_mapNode->getMapSRS(), _ui.radLonBox->value(), _ui.radLatBox->value(), _radBaseAlt, ALTMODE_RELATIVE));
       break;
   }
 }
@@ -654,7 +654,7 @@
       p.altitudeMode() = ALTMODE_ABSOLUTE;
       _p2p->setStart( p );
       //_p2p->setStartAltitudeMode(ALTMODE_ABSOLUTE);
-      p1Node = _annotations[_ui.p1NodeCombo->currentIndex()];
+      p1Node = _annotations[_ui.p1NodeCombo->currentIndex()].get();
       p1Set = true;
     }
 
@@ -681,7 +681,7 @@
       p.altitudeMode() = ALTMODE_ABSOLUTE;
       _p2p->setEnd( p );
       //_p2p->setEndAltitudeMode(ALTMODE_ABSOLUTE);
-      p2Node = _annotations[_ui.p2NodeCombo->currentIndex()];
+      p2Node = _annotations[_ui.p2NodeCombo->currentIndex()].get();
       p2Set = true;
     }
 
@@ -728,7 +728,7 @@
       p.altitudeMode() = ALTMODE_ABSOLUTE;
       _radial->setCenter( p );
       //_radial->setAltitudeMode(ALTMODE_ABSOLUTE);
-      _radial->setUpdateCallback(new osgEarth::Util::RadialLineOfSightTether(_annotations[_ui.radNodeCombo->currentIndex()]));
+      _radial->setUpdateCallback(new osgEarth::Util::RadialLineOfSightTether(_annotations[_ui.radNodeCombo->currentIndex()].get()));
     }
   }
 }
@@ -847,19 +847,19 @@
 void LOSCreationDialog::onP1FindNodeButtonClicked(bool checked)
 {
   if (_ui.p1NodeCombo->currentIndex() >= 0 && (int)_annotations.size() > _ui.p1NodeCombo->currentIndex())
-    centerMapOnNode(_annotations[_ui.p1NodeCombo->currentIndex()]);
+    centerMapOnNode(_annotations[_ui.p1NodeCombo->currentIndex()].get());
 }
 
 void LOSCreationDialog::onP2FindNodeButtonClicked(bool checked)
 {
   if (_ui.p2NodeCombo->currentIndex() >= 0 && (int)_annotations.size() > _ui.p2NodeCombo->currentIndex())
-    centerMapOnNode(_annotations[_ui.p2NodeCombo->currentIndex()]);
+    centerMapOnNode(_annotations[_ui.p2NodeCombo->currentIndex()].get());
 }
 
 void LOSCreationDialog::onRadFindNodeButtonClicked(bool checked)
 {
   if (_ui.radNodeCombo->currentIndex() >= 0 && (int)_annotations.size() > _ui.radNodeCombo->currentIndex())
-    centerMapOnNode(_annotations[_ui.radNodeCombo->currentIndex()]);
+    centerMapOnNode(_annotations[_ui.radNodeCombo->currentIndex()].get());
 }
 
 void LOSCreationDialog::onLocationValueChanged(double d)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/MapCatalogWidget.cpp osgearth-2.10.2+dfsg/src/osgEarthQt/MapCatalogWidget.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthQt/MapCatalogWidget.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/MapCatalogWidget.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -116,7 +116,7 @@
           osgEarth::ModelLayer* model = dynamic_cast<osgEarth::ModelLayer*>(_layer.get());
           if (model && _map.valid())
           {
-            osg::ref_ptr<osg::Node> temp = model->getOrCreateSceneGraph( _map.get(), _map->getReadOptions(), 0L );
+            osg::ref_ptr<osg::Node> temp = model->getNode();
             if (temp.valid())
             {
               osg::NodePathList nodePaths = temp->getParentalNodePaths();
@@ -434,7 +434,7 @@
     _map->getLayers(layers);
     for (osgEarth::ElevationLayerVector::const_iterator it = layers.begin(); it != layers.end(); ++it)
     {
-      LayerTreeItem* layerItem = new LayerTreeItem(*it, _map);
+      LayerTreeItem* layerItem = new LayerTreeItem(it->get(), _map.get());
       layerItem->setText(0, QString( (*it)->getName().c_str() ) );
       //layerItem->setCheckState(0, (*it)->getVisible() ? Qt::Checked : Qt::Unchecked);
 			_elevationsItem->addChild(layerItem);
@@ -468,7 +468,7 @@
     _map->getLayers(layers);
     for (osgEarth::ImageLayerVector::const_iterator it = layers.begin(); it != layers.end(); ++it)
     {
-      LayerTreeItem* layerItem = new LayerTreeItem(*it, _map);
+      LayerTreeItem* layerItem = new LayerTreeItem(it->get(), _map.get());
       layerItem->setText(0, QString( (*it)->getName().c_str() ) );
 			layerItem->setCheckState(0, (*it)->getVisible() ? Qt::Checked : Qt::Unchecked);
 			_imagesItem->addChild(layerItem);
@@ -503,7 +503,7 @@
 
     for (osgEarth::ModelLayerVector::const_iterator it = layers.begin(); it != layers.end(); ++it)
     {
-      LayerTreeItem* layerItem = new LayerTreeItem(*it, _map);
+      LayerTreeItem* layerItem = new LayerTreeItem(it->get(), _map.get());
       layerItem->setText(0, QString( (*it)->getName().c_str() ) );
 			layerItem->setCheckState(0, (*it)->getVisible() ? Qt::Checked : Qt::Unchecked);
 			_modelsItem->addChild(layerItem);
@@ -537,12 +537,12 @@
     _manager->getAnnotations(annos);
     for (AnnotationVector::const_iterator it = annos.begin(); it != annos.end(); ++it)
     {
-        AnnotationTreeItem* annoItem = new AnnotationTreeItem(*it, _map);
+        AnnotationTreeItem* annoItem = new AnnotationTreeItem(it->get(), _map.get());
         annoItem->setText(0, QString( (*it)->getName().c_str() ) );
         annoItem->setCheckState(0, (*it)->getNodeMask() != 0 ? Qt::Checked : Qt::Unchecked);
         _annotationsItem->addChild(annoItem);
 
-      if (_manager->isSelected(*it))
+      if (_manager->isSelected(it->get()))
         annoItem->setSelected(true);
     }
 
@@ -575,7 +575,7 @@
 
     for (osgEarth::MaskLayerVector::const_iterator it = layers.begin(); it != layers.end(); ++it)
     {
-      CustomActionTreeItem* layerItem = new CustomActionTreeItem(*it);
+      CustomActionTreeItem* layerItem = new CustomActionTreeItem((*it).get());
       layerItem->setText(0, QString((*it)->getName().c_str()));
 			_masksItem->addChild(layerItem);
     }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/TerrainProfileGraph.cpp osgearth-2.10.2+dfsg/src/osgEarthQt/TerrainProfileGraph.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthQt/TerrainProfileGraph.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/TerrainProfileGraph.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -122,7 +122,7 @@
   //connect(_graphChangedCallback, SIGNAL(graphChanged()), this, SLOT(onGraphChanged()), Qt::QueuedConnection);
   if (_calculator.valid())
   {
-      _calculator->addChangedCallback(_graphChangedCallback);
+      _calculator->addChangedCallback(_graphChangedCallback.get());
   }
 
   _coordinateFormatter = new osgEarth::Util::LatLongFormatter(
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/TerrainProfileWidget osgearth-2.10.2+dfsg/src/osgEarthQt/TerrainProfileWidget
--- osgearth-2.9.0+dfsg/src/osgEarthQt/TerrainProfileWidget	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/TerrainProfileWidget	2019-07-11 18:30:19.000000000 +0000
@@ -233,7 +233,8 @@
 
         if (!_featureNode.valid())
         {
-          _featureNode = new osgEarth::Annotation::FeatureNode( _mapNode, feature );
+          _featureNode = new osgEarth::Annotation::FeatureNode( feature );
+          _featureNode->setMapNode( _mapNode.get() );
           _featureNode->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
           _root->addChild( _featureNode.get() );
         }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/TerrainProfileWidget.cpp osgearth-2.10.2+dfsg/src/osgEarthQt/TerrainProfileWidget.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthQt/TerrainProfileWidget.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/TerrainProfileWidget.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -119,7 +119,7 @@
   vStack->addWidget(buttonToolbar);
 
   // create graph widget
-  _graph = new TerrainProfileGraph(_calculator, new UpdatePositionShim(this));
+  _graph = new TerrainProfileGraph(_calculator.get(), new UpdatePositionShim(this));
   vStack->addWidget(_graph);
 
   // Connect the action signals/slots
@@ -179,7 +179,7 @@
   removeViews();
 
   for (ViewVector::const_iterator it = views.begin(); it != views.end(); ++it)
-    addView(*it);
+    addView(it->get());
 }
 
 void TerrainProfileWidget::addView(osgViewer::View* view)
@@ -256,15 +256,15 @@
   if (!_markerNode.valid())
   {
     _markerNode = new osgEarth::Annotation::PlaceNode(
-        _mapNode.get(),
         GeoPoint(_mapNode->getMapSRS(), lon, lat, 0, osgEarth::ALTMODE_RELATIVE),
-        _markerImage,
         text,
-        _placeStyle);
+        _placeStyle,
+        _markerImage.get());
+    _markerNode->setMapNode( _mapNode.get() );
 
     _markerNode->setDynamic(true);
 
-    _root->addChild(_markerNode);
+    _root->addChild(_markerNode.get());
   }
   else
   {
@@ -317,7 +317,8 @@
 
   if (!_lineNode.valid())
   {
-    _lineNode = new osgEarth::Annotation::FeatureNode( _mapNode, feature );
+    _lineNode = new osgEarth::Annotation::FeatureNode( feature );
+    _lineNode->setMapNode( _mapNode.get() );
     _lineNode->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
     _root->addChild( _lineNode.get() );
   }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/ViewerWidget.cpp osgearth-2.10.2+dfsg/src/osgEarthQt/ViewerWidget.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthQt/ViewerWidget.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/ViewerWidget.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -151,6 +151,15 @@
         traits->inheritedWindowData = new osgQt::GraphicsWindowQt::WindowData(this);
 
         _gc = new osgQt::GraphicsWindowQt( traits.get() );
+
+        // Update Qt OpenGL context to use the version of OpenGL requested 
+        // via the Qt graphics context setup.
+        unsigned int major, minor;
+        traits->getContextVersion(major, minor);
+        QGLFormat newFormat(format());
+        newFormat.setVersion(major, minor);
+        setFormat(newFormat);
+        makeCurrent();
     }
 
     // reconfigure this view's camera to use the Qt GC if necessary.
@@ -165,6 +174,9 @@
         camera->setProjectionMatrixAsPerspective(
             30.0f, camera->getViewport()->width()/camera->getViewport()->height(), 1.0f, 10000.0f );
     }
+    
+    camera->setDrawBuffer(_gc->getTraits()->doubleBuffer? GL_BACK : GL_FRONT);
+    camera->setReadBuffer(_gc->getTraits()->doubleBuffer? GL_BACK : GL_FRONT);
 }
 
       
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthQt/ViewWidget.cpp osgearth-2.10.2+dfsg/src/osgEarthQt/ViewWidget.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthQt/ViewWidget.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthQt/ViewWidget.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -62,6 +62,9 @@
     camera->setGraphicsContext( gc );
     camera->setViewport(new osg::Viewport(0, 0, gc->getTraits()->width, gc->getTraits()->height));
     camera->setProjectionMatrixAsPerspective( 30.0f, gc->getTraits()->width/gc->getTraits()->height, 1.0f, 10000.0f );
+    
+    camera->setDrawBuffer(gc->getTraits()->doubleBuffer? GL_BACK : GL_FRONT);
+    camera->setReadBuffer(gc->getTraits()->doubleBuffer? GL_BACK : GL_FRONT);
 }
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/Common osgearth-2.10.2+dfsg/src/osgEarthSilverLining/Common
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/Common	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/Export osgearth-2.10.2+dfsg/src/osgEarthSilverLining/Export
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/Export	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/Export	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -24,11 +24,6 @@
 #ifndef OSGEARTH_SILVERLINING_EXPORT_H
 #define OSGEARTH_SILVERLINING_EXPORT_H 1
 
-// define USE_DEPRECATED_API is used to include in API which is being fazed out
-// if you can compile your apps with this turned off you are
-// well placed for compatibility with future versions.
-#define USE_DEPRECATED_API
-
 #if defined(_MSC_VER)
     #pragma warning( disable : 4244 )
     #pragma warning( disable : 4251 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningAPIWrapper osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningAPIWrapper
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningAPIWrapper	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningAPIWrapper	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,6 +20,8 @@
 #define OSGEARTH_SILVERLINING_API_WRAPPER 1
 
 #include "Common"
+#include <osg/Vec3>
+#include <osg/GL>
 #include <stdint.h> // for uintptr_t
 
 
@@ -164,6 +166,8 @@
 
         void EnableTimePassage(bool enabled, long relightFrequencyMS);
 
+        void GetLocation(double &latitude, double &longitude, double &altitude) const;
+        void SetFog(double density, const osg::Vec3 &color);
     public:
         AtmosphericConditions(uintptr_t handle) : _handle(handle) { }
         uintptr_t _handle;
@@ -192,6 +196,11 @@
 
         AtmosphericConditions GetConditions() const;
 
+        bool GetFogEnabled() const; 
+        void GetFogSettings(float &density, osg::Vec3 &color) const;
+        void GetHorizonColor(float yaw, float pitch, osg::Vec3 &color) const;
+        bool GetEnvironmentMap(GLuint &environmentMapTex, int facesToRender = 6, bool floatingPoint = false, void* cameraID = 0,bool drawClouds = true, bool drawSunAndMoon = true, bool isGeocentric = false) const;
+        void SetHaze(const osg::Vec3 &color, double depth, double density);
     public:
         Atmosphere(uintptr_t handle) : _handle(handle) { }
         uintptr_t _handle;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningAPIWrapper.cpp osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningAPIWrapper.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningAPIWrapper.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningAPIWrapper.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,6 +19,10 @@
 #include "SilverLiningAPIWrapper"
 #include <SilverLining.h>
 
+#ifndef SILVERLINING_MAJOR_VERSION
+#include <Version.h>
+#endif
+
 #define LC "[SilverLiningAPI] "
 
 using namespace osgEarth::SilverLining;
@@ -35,9 +39,29 @@
 #define HANDLE ((::SilverLining::Atmosphere*)_handle)
 
 SETGET_EXPLICIT(Atmosphere, EnableLensFlare, GetLensFlareEnabled, bool);
+
 void Atmosphere::SetSkyModel(SkyModel skyModel) { HANDLE->SetSkyModel(static_cast< ::SkyModel >(skyModel)); }
 Atmosphere::SkyModel Atmosphere::GetSkyModel() const { return static_cast<SkyModel>(HANDLE->GetSkyModel()); }
 AtmosphericConditions Atmosphere::GetConditions() const { return AtmosphericConditions((uintptr_t)HANDLE->GetConditions()); }
+bool Atmosphere::GetFogEnabled() const { return HANDLE->GetFogEnabled(); }
+void Atmosphere::GetFogSettings(float &density, osg::Vec3f &color) const {HANDLE->GetFogSettings(&density, &color.x(), &color.y(), &color.z());}
+void Atmosphere::GetHorizonColor(float yawDeg, float pitchDeg, osg::Vec3f &color) const { HANDLE->GetHorizonColor(yawDeg, pitchDeg, &color.x(), &color.y(), &color.z());}
+void Atmosphere::SetHaze(const osg::Vec3 &color, double depth, double density) { HANDLE->SetHaze(color.x(), color.y(), color.z(),depth, density);}
+bool Atmosphere::GetEnvironmentMap(GLuint &environmentMapTex, int facesToRender, bool floatingPoint, void* cameraID, bool drawClouds, bool drawSunAndMoon, bool isGeocentric) const
+{
+    void* ptr;
+
+#if ((SILVERLINING_MAJOR_VERSION >= 5) && (SILVERLINING_MINOR_VERSION >= 30))
+    bool success = HANDLE->GetEnvironmentMap(ptr, facesToRender, floatingPoint, cameraID, drawClouds, drawSunAndMoon, isGeocentric);
+#else
+    bool success = HANDLE->GetEnvironmentMap(ptr, facesToRender, floatingPoint, cameraID, drawClouds, drawSunAndMoon);
+#endif
+
+    if (success)
+       environmentMapTex = static_cast<GLuint>(reinterpret_cast<size_t>(ptr));
+    return success;
+}
+
 SETGET(Atmosphere, Gamma, double);
 SETGET(Atmosphere, InfraRedMode, bool);
 
@@ -71,6 +95,8 @@
 void AtmosphericConditions::ClearWindVolumes() { HANDLE->ClearWindVolumes(); }
 void AtmosphericConditions::SetPresetConditions(ConditionPresets preset, Atmosphere& atm) { HANDLE->SetPresetConditions(static_cast< ::SilverLining::AtmosphericConditions::ConditionPresets >(preset), *(::SilverLining::Atmosphere*)atm._handle); }
 void AtmosphericConditions::EnableTimePassage(bool enabled, long relightFrequencyMS) { HANDLE->EnableTimePassage(enabled, relightFrequencyMS); }
+void AtmosphericConditions::GetLocation(double &latitude, double &longitude, double &altitude) const { latitude = HANDLE->GetLocation().GetLatitude(); longitude = HANDLE->GetLocation().GetLongitude(); altitude = HANDLE->GetLocation().GetAltitude(); }
+void AtmosphericConditions::SetFog(double density, const osg::Vec3 &color) { HANDLE->SetFog(density, color.x(), color.y(), color.z()); }
 
 //................................
 WindVolume::WindVolume() :
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningCallback osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningCallback
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningCallback	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningCallback	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningCloudsDrawable osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningCloudsDrawable
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningCloudsDrawable	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningCloudsDrawable	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -46,11 +46,7 @@
         void drawImplementation(osg::RenderInfo& ri) const;
         
         // custom bounds computation
-#if OSG_VERSION_GREATER_THAN(3,3,1)
         osg::BoundingBox computeBoundingBox() const;
-#else
-        osg::BoundingBox computeBound() const;
-#endif
 
     protected:
         virtual ~CloudsDrawable() { }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningCloudsDrawable.cpp osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningCloudsDrawable.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningCloudsDrawable.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningCloudsDrawable.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,6 +22,10 @@
 #include "SilverLiningContextNode"
 #include <osgEarth/SpatialReference>
 
+#ifndef SILVERLINING_MAJOR_VERSION
+#include <Version.h>
+#endif
+
 #undef  LC
 #define LC "[SilverLining:SkyDrawable] "
 
@@ -57,15 +61,15 @@
         osgEarth::NativeProgramAdapterCollection& adapters = _adapters[ state->getContextID() ]; // thread safe.
         if ( adapters.empty() )
         {
-            adapters.push_back( new osgEarth::NativeProgramAdapter(state, _SL->getAtmosphere()->GetSkyShader()) );
-            adapters.push_back( new osgEarth::NativeProgramAdapter(state, _SL->getAtmosphere()->GetBillboardShader()) );
-            adapters.push_back( new osgEarth::NativeProgramAdapter(state, _SL->getAtmosphere()->GetStarShader()) );
-            adapters.push_back( new osgEarth::NativeProgramAdapter(state, _SL->getAtmosphere()->GetPrecipitationShader()) );
-            //adapters.push_back(new osgEarth::NativeProgramAdapter(state, _SL->getAtmosphere()->GetAtmosphericLimbShader()) );
+            adapters.push_back( new osgEarth::NativeProgramAdapter(state, _SL->getAtmosphere()->GetSkyShader(), NULL, "SkyShader"));
+            adapters.push_back( new osgEarth::NativeProgramAdapter(state, _SL->getAtmosphere()->GetBillboardShader(), NULL, "BillboardShader"));
+            adapters.push_back( new osgEarth::NativeProgramAdapter(state, _SL->getAtmosphere()->GetStarShader(), NULL, "StarShader"));
+            adapters.push_back( new osgEarth::NativeProgramAdapter(state, _SL->getAtmosphere()->GetPrecipitationShader(), NULL, "PrecipitationShader"));
+            //adapters.push_back(new osgEarth::NativeProgramAdapter(state, _SL->getAtmosphere()->GetAtmosphericLimbShader(), NULL, "AtmosphericLimbShader"));
 
             SL_VECTOR(unsigned) handles = _SL->getAtmosphere()->GetActivePlanarCloudShaders();
             for(int i=0; i<handles.size(); ++i)          
-                adapters.push_back( new osgEarth::NativeProgramAdapter(state, handles[i]) );
+                adapters.push_back( new osgEarth::NativeProgramAdapter(state, handles[i], NULL, "PlanarCloudShader"));
         }
         adapters.apply( state );
 
@@ -74,7 +78,12 @@
             _SL->getCallback()->onDrawClouds(_SL->getAtmosphereWrapper());
 
         renderInfo.getState()->disableAllVertexArrays();
-        _SL->getAtmosphere()->DrawObjects( true, true, true );
+
+#if ((SILVERLINING_MAJOR_VERSION >= 5) && (SILVERLINING_MINOR_VERSION >= 30))
+        _SL->getAtmosphere()->DrawObjects(true, true, true, 0.0f, false, 0, true, true, true, _SL->getSRS()->isGeographic());
+#else
+        _SL->getAtmosphere()->DrawObjects(true, true, true);
+#endif
 
         // Restore the GL state to where it was before.
         state->dirtyAllVertexArrays();
@@ -86,11 +95,7 @@
 }
 
 osg::BoundingBox
-#if OSG_VERSION_GREATER_THAN(3,3,1)
 CloudsDrawable::computeBoundingBox() const
-#else
-CloudsDrawable::computeBound() const
-#endif
 {
     osg::BoundingBox cloudBoundBox;
     if ( !_SL->ready() )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningContext osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningContext
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningContext	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningContext	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -47,9 +47,6 @@
         /** Sets the light source that will represent the sun */
         void setLight(osg::Light* light);
 
-        /** Sets the spatial reference system of the map */
-        void setSRS(const SpatialReference* srs);
-
         /** Sets the minimum ambient lighting value */
         void setMinimumAmbient(const osg::Vec4f& value);
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningContext.cpp osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningContext.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningContext.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningContext.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -86,6 +86,8 @@
         options.licenseCode()->c_str() );
 
     _atmosphereWrapper = new Atmosphere((uintptr_t)_atmosphere);
+
+    _srs = osgEarth::SpatialReference::get("wgs84");
 }
 
 SilverLiningContext::~SilverLiningContext()
@@ -110,12 +112,6 @@
 }
 
 void
-SilverLiningContext::setSRS(const osgEarth::SpatialReference* srs)
-{
-    _srs = srs;
-}
-
-void
 SilverLiningContext::setMinimumAmbient(const osg::Vec4f& value)
 {
     _minAmbient = value;
@@ -142,8 +138,12 @@
                 resourcePath = osgDB::concatPaths(::getenv("SILVERLINING_PATH"), "Resources");
             }
 
+            int renderer = ::SilverLining::Atmosphere::OPENGL;
+#ifndef OSG_GL_FIXED_FUNCTION_AVAILABLE
+            renderer = ::SilverLining::Atmosphere::OPENGL32CORE;
+#endif
             int result = _atmosphere->Initialize(
-                ::SilverLining::Atmosphere::OPENGL,
+                renderer,
                 resourcePath.c_str(),
                 true,
                 0 );
@@ -220,7 +220,7 @@
     ::SilverLining::Location clampedLoc = savedLoc;
     if ( _maxAmbientLightingAlt > 0.0 )
     {
-        clampedLoc.SetAltitude( std::min(clampedLoc.GetAltitude(), _maxAmbientLightingAlt) );
+        clampedLoc.SetAltitude( osg::minimum(clampedLoc.GetAltitude(), _maxAmbientLightingAlt) );
         _atmosphere->GetConditions()->SetLocation( clampedLoc );
     }
 
@@ -259,37 +259,34 @@
 void
 SilverLiningContext::updateLocation()
 {
-    if ( !ready() || !_srs.valid() )
+    if ( !ready() )
         return;
 
-    if ( _srs->isGeographic() )
-    {
-        // Get new local orientation
-        osg::Vec3d up = _cameraPos;
-        up.normalize();
-        osg::Vec3d north = osg::Vec3d(0, 1, 0);
-        osg::Vec3d east = north ^ up;
+    // Get new local orientation
+    osg::Vec3d up = _cameraPos;
+    up.normalize();
+    osg::Vec3d north = osg::Vec3d(0, 1, 0);
+    osg::Vec3d east = north ^ up;
 
-        // Check for edge case of north or south pole
-        if (east.length2() == 0)
-        {
-            east = osg::Vec3d(1, 0, 0);
-        }
+    // Check for edge case of north or south pole
+    if (east.length2() == 0)
+    {
+        east = osg::Vec3d(1, 0, 0);
+    }
 
-        east.normalize();
+    east.normalize();
 
-        _atmosphere->SetUpVector(up.x(), up.y(), up.z());
-        _atmosphere->SetRightVector(east.x(), east.y(), east.z());
+    _atmosphere->SetUpVector(up.x(), up.y(), up.z());
+    _atmosphere->SetRightVector(east.x(), east.y(), east.z());
 
-        // Get new lat / lon / altitude
-        osg::Vec3d latLonAlt;
-        _srs->transformFromWorld(_cameraPos, latLonAlt);
+    // Get new lat / lon / altitude
+    osg::Vec3d latLonAlt;
+    _srs->transformFromWorld(_cameraPos, latLonAlt);
 
-        ::SilverLining::Location loc;
-        loc.SetAltitude ( latLonAlt.z() );
-        loc.SetLongitude( latLonAlt.x() ); //osg::DegreesToRadians(latLonAlt.x()) );
-        loc.SetLatitude ( latLonAlt.y() ); //osg::DegreesToRadians(latLonAlt.y()) );
+    ::SilverLining::Location loc;
+    loc.SetAltitude ( latLonAlt.z() );
+    loc.SetLongitude( latLonAlt.x() ); //osg::DegreesToRadians(latLonAlt.x()) );
+    loc.SetLatitude ( latLonAlt.y() ); //osg::DegreesToRadians(latLonAlt.y()) );
 
-        _atmosphere->GetConditions()->SetLocation( loc );
-    }
+    _atmosphere->GetConditions()->SetLocation( loc );
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningContextNode osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningContextNode
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningContextNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningContextNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -42,7 +42,6 @@
             SilverLiningNode*          node,
             osg::Camera*               camera,
             osg::Light*                light,
-            const osgEarth::SpatialReference*    mapSRS,
             const SilverLiningOptions& options,
             Callback*                  callback =0L);
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningContextNode.cpp osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningContextNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningContextNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningContextNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -37,7 +37,6 @@
 SilverLiningContextNode::SilverLiningContextNode(SilverLiningNode* node,
 								   osg::Camera*               camera,
                                    osg::Light*                light,
-	                               const osgEarth::SpatialReference*    mapSRS,
                                    const SilverLiningOptions& options,
                                    Callback*                  callback) :
 _silverLiningNode (node),
@@ -48,7 +47,6 @@
     // The main silver lining data:
     _SL = new SilverLiningContext( options );
     _SL->setLight( light);
-    _SL->setSRS  ( mapSRS );
     _SL->setCallback( callback );
     _SL->setMinimumAmbient( node->getMinimumAmbient() );
 
@@ -132,12 +130,8 @@
 				if(getTargetCamera() == camera)
 #endif
      			{
-
 					// TODO: make this multi-camera safe
 					_SL->setCameraPosition( nv.getEyePoint() );
-					osgUtil::CullVisitor* cv = Culling::asCullVisitor(nv);
-					_SL->getAtmosphere()->SetCameraMatrix( cv->getModelViewMatrix()->ptr() );
-					_SL->getAtmosphere()->SetProjectionMatrix( cv->getProjectionMatrix()->ptr() );
 
 					_lastAltitude = _SL->getSRS()->isGeographic() ?
 						cv->getEyePoint().length() - _SL->getSRS()->getEllipsoid()->getRadiusEquator() :
@@ -145,8 +139,6 @@
 
 					_SL->updateLocation();
 					_SL->updateLight();
-					//_SL->getAtmosphere()->UpdateSkyAndClouds();
-					//_SL->getAtmosphere()->CullObjects();
 				}
 			}
         }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningNode osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningNode
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningNode	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -40,6 +40,11 @@
     {
     public:
         SilverLiningNode(
+            const SilverLiningOptions& options,
+            Callback*                  callback =0L);
+
+        // @deprecated Use SilverLining(const SilverLiningOptions&, Callback*) (remove after 2.10)
+        SilverLiningNode(
             const osgEarth::SpatialReference* mapSRS,
             const SilverLiningOptions& options,
             Callback*                  callback =0L);
@@ -77,7 +82,6 @@
         osg::ref_ptr<osg::Light> _light;
         const SilverLiningOptions _options;
         osg::ref_ptr<osgEarth::PhongLightingEffect> _lighting;
-        const osgEarth::SpatialReference* _mapSRS;
         osg::ref_ptr<Callback> _callback;
 
         typedef std::map<osg::Camera*, osg::ref_ptr<osg::Node> > CameraContextMap;
@@ -86,6 +90,8 @@
 
         typedef std::set<osg::ref_ptr<osg::Camera> > CameraSet;
         CameraSet _camerasToAdd;
+
+        void construct();
     };
 
 } } // namespace osgEarth::SilverLining
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningNode.cpp osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -36,13 +36,27 @@
 
 using namespace osgEarth::SilverLining;
 
-SilverLiningNode::SilverLiningNode(const osgEarth::SpatialReference*    mapSRS,
+SilverLiningNode::SilverLiningNode(const SilverLiningOptions& options,
+                                   Callback*                  callback) :
+_options(options),
+_callback(callback)
+{
+    construct();
+}
+
+// DEPRECATED
+SilverLiningNode::SilverLiningNode(const osgEarth::SpatialReference* mapSRS,
                                    const SilverLiningOptions& options,
                                    Callback*                  callback) :
 _options(options),
-_mapSRS(mapSRS),
 _callback(callback)
 {
+    construct();
+}
+
+void
+SilverLiningNode::construct()
+{
     // Create a new Light for the Sun.
     _light = new LightGL3(0);
     _light->setDiffuse( osg::Vec4(1,1,1,1) );
@@ -66,7 +80,6 @@
     ADJUST_UPDATE_TRAV_COUNT(this, +1);
 }
 
-
 SilverLiningNode::~SilverLiningNode()
 {
     if ( _lighting.valid() )
@@ -172,7 +185,7 @@
             {
                 for (CameraSet::const_iterator i = _camerasToAdd.begin(); i != _camerasToAdd.end(); ++i)
                 {
-                    SilverLiningContextNode* newNode = new SilverLiningContextNode(this, i->get(), _light.get(), _mapSRS, _options, _callback.get());
+                    SilverLiningContextNode* newNode = new SilverLiningContextNode(this, i->get(), _light.get(), _options, _callback.get());
                     _contexts[i->get()] = newNode;
                     _contextList.push_back(newNode);
                 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningOptions osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningOptions
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -65,11 +65,11 @@
     public:
         osgEarth::Config getConfig() const {
             osgEarth::Config conf = osgEarth::Util::SkyOptions::getConfig();
-            conf.addIfSet("user", _user);
-            conf.addIfSet("license_code", _licenseCode);
-            conf.addIfSet("resource_path", _resourcePath);
-            conf.addIfSet("clouds", _drawClouds);
-			conf.addIfSet("clouds_max_altitude", _cloudsMaxAltitude);
+            conf.set("user", _user);
+            conf.set("license_code", _licenseCode);
+            conf.set("resource_path", _resourcePath);
+            conf.set("clouds", _drawClouds);
+			conf.set("clouds_max_altitude", _cloudsMaxAltitude);
             return conf;
         }
 
@@ -81,11 +81,11 @@
 
     private:
         void fromConfig( const osgEarth::Config& conf ) {
-            conf.getIfSet("user", _user);
-            conf.getIfSet("license_code", _licenseCode);
-            conf.getIfSet("resource_path", _resourcePath);
-            conf.getIfSet("clouds", _drawClouds);
-			conf.getIfSet("clouds_max_altitude", _cloudsMaxAltitude);
+            conf.get("user", _user);
+            conf.get("license_code", _licenseCode);
+            conf.get("resource_path", _resourcePath);
+            conf.get("clouds", _drawClouds);
+			conf.get("clouds_max_altitude", _cloudsMaxAltitude);
         }
 
         osgEarth::optional<std::string> _user;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningSkyDrawable osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningSkyDrawable
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningSkyDrawable	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningSkyDrawable	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -39,11 +39,7 @@
         void drawImplementation(osg::RenderInfo& ri) const;
 
         // custom bounds computation
-#if OSG_VERSION_GREATER_THAN(3,3,1)
         osg::BoundingBox computeBoundingBox() const;
-#else
-        osg::BoundingBox computeBound() const;
-#endif
 
     protected:
         virtual ~SkyDrawable() { }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningSkyDrawable.cpp osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningSkyDrawable.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSilverLining/SilverLiningSkyDrawable.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSilverLining/SilverLiningSkyDrawable.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -66,6 +66,11 @@
         if (_SL->getCallback())
             _SL->getCallback()->onDrawSky(_SL->getAtmosphereWrapper());
 
+        osg::Matrix projMat = renderInfo.getState()->getProjectionMatrix();
+        _SL->getAtmosphere()->SetProjectionMatrix(projMat.ptr());
+        osg::Matrix viewMat = renderInfo.getCurrentCamera()->getViewMatrix();
+        _SL->getAtmosphere()->SetCameraMatrix(viewMat.ptr());
+
         // draw the sky.
         _SL->getAtmosphere()->DrawSky(
             true,
@@ -78,27 +83,17 @@
         renderInfo.getState()->dirtyAllVertexArrays();
         renderInfo.getState()->dirtyAllAttributes();
 
-#if 0
-#if OSG_VERSION_GREATER_OR_EQUAL(3,4,0)
-        osg::GLExtensions* api = renderInfo.getState()->get<osg::GLExtensions>();
-#else
-        osg::GL2Extensions* api = osg::GL2Extensions::Get(renderInfo.getState()->getContextID(), true);
-#endif
-        api->glUseProgram((GLuint)0);
+        // Reset the saved program.  SilverLining exits its functionality with a glUseProgram(0). Without this line,
+        // GL Core 3.3 rendering will attempt to load uniforms without an active program, which is an error.  This
+        // tells the state that there is currently no installed program, so if it needs one, to load one.
         renderInfo.getState()->setLastAppliedProgramObject(0L);
-#endif
-
         renderInfo.getState()->apply();
     }
 	}
 }
 
 osg::BoundingBox
-#if OSG_VERSION_GREATER_THAN(3,3,1)
 SkyDrawable::computeBoundingBox() const
-#else
-SkyDrawable::computeBound() const
-#endif
 {
     osg::BoundingBox skyBoundBox;
     if ( !_SL->ready() )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/Coverage osgearth-2.10.2+dfsg/src/osgEarthSplat/Coverage
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/Coverage	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/Coverage	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -59,8 +59,8 @@
 
     public:
         void fromConfig(const Config& conf) {
-            conf.getIfSet("layer", _coverageLayer);
-            conf.getIfSet("legend", _legendURI);
+            conf.get("layer", _coverageLayer);
+            conf.get("legend", _legendURI);
         }
         
         Config getConfig() const {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/Coverage.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/Coverage.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/Coverage.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/Coverage.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/Export osgearth-2.10.2+dfsg/src/osgEarthSplat/Export
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/Export	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/Export	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -24,11 +24,6 @@
 #ifndef OSGEARTH_SPLAT_EXPORT_H
 #define OSGEARTH_SPLAT_EXPORT_H 1
 
-// define USE_DEPRECATED_API is used to include in API which is being phased out
-// if you can compile your apps with this turned off you are
-// well placed for compatibility with future versions.
-#define USE_DEPRECATED_API
-
 #if defined(_MSC_VER)
     #pragma warning( disable : 4244 )
     #pragma warning( disable : 4251 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -139,21 +139,42 @@
         GroundCoverBiomeOptionsVector _biomes;
     };
 
+    //! Base class for any ground cover object
+    class OSGEARTHSPLAT_EXPORT GroundCoverObject : public osg::Referenced
+    {
+    public:
+        enum Type {
+            TYPE_BILLBOARD
+        };
+        virtual Type getType() const =0;
+    };
+
+    //! Collection of ground cover objects
+    typedef std::vector<osg::ref_ptr<GroundCoverObject> > GroundCoverObjects;
 
-    class OSGEARTHSPLAT_EXPORT GroundCoverBillboard
+    /**
+     * Billboard object - camera-facing side image coupled with an optional
+     * top-down image.
+     */
+    class OSGEARTHSPLAT_EXPORT GroundCoverBillboard : public GroundCoverObject
     {
     public:
-        GroundCoverBillboard(osg::Image* image, float width, float height)
-            : _image(image), _width(width), _height(height) { }
+        GroundCoverBillboard(osg::Image* sideImage, osg::Image* topImage, float width, float height)
+            : _sideImage(sideImage), _topImage(topImage), _width(width), _height(height) { }
+
+        virtual Type getType() const { return TYPE_BILLBOARD; }
 
-        osg::ref_ptr<osg::Image> _image;
+        osg::ref_ptr<osg::Image> _sideImage;
+        osg::ref_ptr<osg::Image> _topImage;
         float                    _width;
         float                    _height;
     };
 
-    typedef std::vector<GroundCoverBillboard> GroundCoverBillboards;
-
-
+    /**
+     * A Biome is a collection of ground cover objects corresponding
+     * to a set of land cover classes. For example, the "forest" biome
+     * might map to three different tree billboards.
+     */
     class OSGEARTHSPLAT_EXPORT GroundCoverBiome : public osg::Referenced
     {
     public:
@@ -163,19 +184,20 @@
         void setClasses( const std::string& value ) { _classNames = value; }
         const std::string& getClasses() const { return _classNames; }
 
-        /** Resources that may be used to render land cover in this biome */
-        GroundCoverBillboards& getBillboards() { return _billboards; }
-        const GroundCoverBillboards& getBillboards() const { return _billboards; }
+        /** Objects that may be used to render land cover in this biome */
+        GroundCoverObjects& getObjects() { return _objects; }
+        const GroundCoverObjects& getObjects() const { return _objects; }
 
     protected:
         virtual ~GroundCoverBiome() { }
 
         std::string    _classNames;
         int            _code;
-        GroundCoverBillboards _billboards;
+        GroundCoverObjects _objects;
 
     public:
-        bool configure(const ConfigOptions& conf, const osgDB::Options* dbo);
+        typedef std::map<URI, osg::ref_ptr<osg::Image> > ImageCache;
+        bool configure(const ConfigOptions& conf, const osgDB::Options* dbo, ImageCache& cache);
     };
 
     typedef std::vector< osg::ref_ptr<GroundCoverBiome> > GroundCoverBiomes;
@@ -226,7 +248,8 @@
 
     public:
 
-        int getTotalNumBillboards() const;
+        //! Total number of individual objects this class can render
+        int getTotalNumObjects() const;
 
         /** Creates the shader that contains the GLSL APOI for accessing this layer's information */
         osg::Shader* createShader() const;
@@ -243,6 +266,10 @@
 
         osg::StateSet* getStateSet() const { return _stateSet.get(); }
 
+        void resizeGLObjectBuffers(unsigned maxSize);
+
+        void releaseGLObjects(osg::State* state) const;
+
     protected:
         virtual ~GroundCover() { }
 
@@ -257,4 +284,7 @@
 
 } } // namespace osgEarth::Splat
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Splat::GroundCoverOptions);
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Splat::GroundCoverBiomeOptions);
+
 #endif // OSGEARTH_PROCEDURAL_GroundCover
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -24,7 +24,7 @@
 void
 GroundCoverBiomeOptions::fromConfig(const Config& conf) 
 {
-    conf.getIfSet("classes", _biomeClasses);
+    conf.get("classes", _biomeClasses);
     const ConfigSet& symbols = conf.children();
     for (ConfigSet::const_iterator i = symbols.begin(); i != symbols.end(); ++i) {
         Symbol* s = SymbolRegistry::instance()->create(*i);
@@ -81,7 +81,7 @@
         for (int i = 0; i < _biomes.size(); ++i) {
             biomes.add("biome", _biomes[i].getConfig());
         }
-        conf.update(biomes);
+        conf.set(biomes);
     }
     return conf;
 }
@@ -89,14 +89,14 @@
 void
 GroundCoverOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet("name", _name);
-    conf.getIfSet("lod", _lod);
-    conf.getIfSet("max_distance", _maxDistance);
-    conf.getIfSet("density", _density);
-    conf.getIfSet("fill", _fill);
-    conf.getIfSet("wind", _wind);
-    conf.getIfSet("brightness", _brightness);
-    conf.getIfSet("contrast", _contrast);
+    conf.get("name", _name);
+    conf.get("lod", _lod);
+    conf.get("max_distance", _maxDistance);
+    conf.get("density", _density);
+    conf.get("fill", _fill);
+    conf.get("wind", _wind);
+    conf.get("brightness", _brightness);
+    conf.get("contrast", _contrast);
     const Config* biomes = conf.child_ptr("biomes");
     if (biomes) {
         const ConfigSet& biomesVec = biomes->children();
@@ -129,9 +129,11 @@
         _biomes.push_back( biome.get() );
     }
 
+    GroundCoverBiome::ImageCache cache;
+
     for (int i = 0; i<_biomes.size(); ++i)
     {
-        if ( _biomes[i]->configure( options().biomes()[i], readOptions ) == false )
+        if ( _biomes[i]->configure( options().biomes()[i], readOptions, cache ) == false )
         {
             OE_WARN << LC << "One of the biomes in layer \"" << getName() << "\" is improperly configured\n";
             return false;
@@ -142,12 +144,12 @@
 }
 
 int
-GroundCover::getTotalNumBillboards() const
+GroundCover::getTotalNumObjects() const
 {
     int count = 0;
     for(int i=0; i<_biomes.size(); ++i)
     {
-        count += _biomes[i]->getBillboards().size();
+        count += _biomes[i]->getObjects().size();
     }
     return count;
 }
@@ -191,57 +193,121 @@
 GroundCover::createShader() const
 {
     std::stringstream biomeBuf;
-    std::stringstream billboardBuf;
+    std::stringstream objectsBuf;
+    std::stringstream billboardsBuf;
+    //std::stringstream doubleBillboardsBuf;
+
+    int totalObjects = getTotalNumObjects();
 
-    int totalBillboards = getTotalNumBillboards();
+    unsigned numBillboards = 0;
+    //unsigned numDoubleBillboards = 0;
 
     // encode all the biome data.
     biomeBuf << 
         "struct oe_GroundCover_Biome { \n"
-        "    int firstBillboardIndex; \n"
-        "    int numBillboards; \n"
+        "    int firstObjectIndex; \n"
+        "    int numObjects; \n"
         "    float density; \n"
         "    float fill; \n"
         "    vec2 maxWidthHeight; \n"
         "}; \n"
-
         "const oe_GroundCover_Biome oe_GroundCover_biomes[" << getBiomes().size() << "] = oe_GroundCover_Biome[" << getBiomes().size() << "] ( \n";
 
-    billboardBuf <<
+    billboardsBuf <<
         "struct oe_GroundCover_Billboard { \n"
-        "    int arrayIndex; \n"
+        "    int atlasIndexSide; \n"
+        "    int atlasIndexTop; \n"
         "    float width; \n"
         "    float height; \n"
         "}; \n"
-
-        "const oe_GroundCover_Billboard oe_GroundCover_billboards[" << totalBillboards << "] = oe_GroundCover_Billboard[" << totalBillboards << "](\n";
+        "const oe_GroundCover_Billboard oe_GroundCover_billboards[%NUM_BILLBOARDS%] = oe_GroundCover_Billboard[%NUM_BILLBOARDS%](\n";
     
-    int index = 0;
+    objectsBuf <<
+        "struct oe_GroundCover_Object { \n"
+        "    int type; // 0=billboard \n"
+        "    int objectArrayIndex; // index into the type's object array \n"
+        "}; \n"
+        "const oe_GroundCover_Object oe_GroundCover_objects[%NUM_OBJECTS%] = oe_GroundCover_Object[%NUM_OBJECTS%](\n";
+
+    // Since the texture array containing the billboard images contains each
+    // unique image only once, we need to maps unique image to array indexes
+    // here as well. This table maps each unique image to its texture array index.
+    typedef std::map<osg::Image*, int> ImageSet;
+    ImageSet uniqueImages;
+
+    int objectIndex = 0;
+    int nextAtlasIndex = 0;
     for(int i=0; i<getBiomes().size(); ++i)
     {
         const GroundCoverBiome* biome = getBiomes()[i].get();
 
         float maxWidth = 0.0f, maxHeight = 0.0f;
         
-        int firstIndex = index;
+        int firstObjectIndexOfBiome = objectIndex;
 
-        for(int j=0; j<biome->getBillboards().size(); ++j)
+        for(int j=0; j<biome->getObjects().size(); ++j)
         {
-            const GroundCoverBillboard& bb = biome->getBillboards()[j];
+            const GroundCoverObject* object = biome->getObjects()[j];
 
-            billboardBuf
-                << "    oe_GroundCover_Billboard("
-                << index 
-                << ", float(" << bb._width << ")"
-                << ", float(" << bb._height << ")"
-                << ")";
-            
-            ++index;
-            if ( index < totalBillboards )
-                billboardBuf << ",\n";
+            if (object->getType() == GroundCoverObject::TYPE_BILLBOARD)
+            {
+                const GroundCoverBillboard* bb = dynamic_cast<const GroundCoverBillboard*>(object);
+
+                // If we already used this image, use its original tex array index; 
+                // otherwise use the next available index.
+                int atlasSideIndex = -1;
+                if (bb->_sideImage.valid())
+                {
+                    ImageSet::iterator u = uniqueImages.find(bb->_sideImage.get());
+                    if (u != uniqueImages.end())
+                    {
+                        atlasSideIndex = u->second;
+                    }
+                    else
+                    {
+                        atlasSideIndex = nextAtlasIndex++;
+                        uniqueImages[bb->_sideImage.get()] = atlasSideIndex;
+                    }
+                }
+
+                int atlasTopIndex = -1;
+                if (bb->_topImage.valid())
+                {
+                    ImageSet::iterator u = uniqueImages.find(bb->_topImage.get());
+                    if (u != uniqueImages.end())
+                    {
+                        atlasTopIndex = u->second;
+                    }
+                    else
+                    {
+                        atlasTopIndex = nextAtlasIndex++;
+                        uniqueImages[bb->_topImage.get()] = atlasTopIndex;
+                    }
+                }
+
+                if (numBillboards > 0)
+                    billboardsBuf << ", \n";
 
-            maxWidth = std::max(maxWidth, bb._width);
-            maxHeight = std::max(maxHeight, bb._height);
+                billboardsBuf
+                    << "    oe_GroundCover_Billboard("
+                    << atlasSideIndex << ", " << atlasTopIndex
+                    << ", float(" << bb->_width << ")"
+                    << ", float(" << bb->_height << ")"
+                    << ")";
+
+                maxWidth = osg::maximum(maxWidth, bb->_width);
+                maxHeight = osg::maximum(maxHeight, bb->_height);
+
+                objectsBuf 
+                    << (numBillboards>0?",\n":"")
+                    << "   oe_GroundCover_Object("
+                    << (int)object->getType() << ", "
+                    << (int)numBillboards
+                    << ")";
+
+                ++numBillboards;
+                ++objectIndex;
+            }
         }
 
         // We multiply the height x 2 below because billboards have their origin
@@ -251,9 +317,9 @@
         // directions, but that's OK since we are rarely if ever going to GPU-cull
         // a billboard at the top of the viewport. -gw
 
-        biomeBuf << "    oe_GroundCover_Biome(" 
-            << firstIndex << ", "
-            << biome->getBillboards().size() 
+        biomeBuf << "    oe_GroundCover_Biome("
+            << firstObjectIndexOfBiome << ", "
+            << biome->getObjects().size() 
             << ", float(" << options().density().get() << ")"
             << ", float(" << options().fill().get() << ")"
             << ", vec2(float(" << maxWidth << "),float(" << maxHeight*2.0f << ")))";
@@ -265,24 +331,45 @@
     biomeBuf
         << "\n);\n";
 
-    billboardBuf
+    billboardsBuf
+        << "\n); \n";
+
+    objectsBuf
         << "\n); \n";
 
     biomeBuf 
-        << "void oe_GroundCover_getBiome(in int biomeIndex, out oe_GroundCover_Biome biome) { \n"
-        << "    biome = oe_GroundCover_biomes[biomeIndex]; \n"
+        << "void oe_GroundCover_getBiome(in int index, out oe_GroundCover_Biome biome) { \n"
+        << "    biome = oe_GroundCover_biomes[index]; \n"
+        << "} \n";
+
+    objectsBuf
+        << "void oe_GroundCover_getObject(in int index, out oe_GroundCover_Object output) { \n"
+        << "    output = oe_GroundCover_objects[index]; \n"
         << "} \n";
         
-    billboardBuf
-        << "void oe_GroundCover_getBillboard(in int billboardIndex, out oe_GroundCover_Billboard billboard) { \n"
-        << "    billboard = oe_GroundCover_billboards[billboardIndex]; \n"
+    billboardsBuf
+        << "void oe_GroundCover_getBillboard(in int index, out oe_GroundCover_Billboard output) { \n"
+        << "    output = oe_GroundCover_billboards[index]; \n"
         << "} \n";
+
+    std::string biomeStr = biomeBuf.str();
+
+    std::string billboardsStr = billboardsBuf.str();
+    replaceIn(billboardsStr, "%NUM_BILLBOARDS%", Stringify()<<numBillboards);
+
+    std::string objectsStr = objectsBuf.str();
+    replaceIn(objectsStr, "%NUM_OBJECTS%", Stringify() << getTotalNumObjects());
     
     osg::ref_ptr<ImageLayer> layer;
 
     osg::Shader* shader = new osg::Shader();
     shader->setName( "GroundCoverLayer" );
-    shader->setShaderSource( Stringify() << "#version 330\n" << biomeBuf.str() << "\n" << billboardBuf.str() );
+    shader->setShaderSource( Stringify() 
+        << "#version 330\n" 
+        << biomeStr << "\n"
+        << objectsStr << "\n"
+        << billboardsStr << "\n" 
+    );
     return shader;
 }
 
@@ -292,7 +379,7 @@
     const char* defaultCode = "int oe_GroundCover_getBiomeIndex(in vec4 coords) { return -1; }\n";
 
     std::stringstream buf;
-    buf << "#version 330\n";
+    buf << "#version " GLSL_VERSION_STR "\n";
 
         if ( !landCoverDict )
     {
@@ -348,62 +435,116 @@
     return shader;
 }
 
+namespace
+{
+    int nextPowerOf2(int x) {
+        --x;
+        x |= x >> 1;
+        x |= x >> 2;
+        x |= x >> 4;
+        x |= x >> 8;
+        x |= x >> 16;
+        return x+1;
+    }
+}
+
 osg::Texture*
 GroundCover::createTexture() const
 {
+    // Creates a texture array containing all the billboard images.
+    // Each image is included only once.
     osg::Texture2DArray* tex = new osg::Texture2DArray();
 
     int arrayIndex = 0;
     float s = -1.0f, t = -1.0f;
 
+    typedef std::set<osg::Image*> ImageSet;
+    typedef std::vector<osg::Image*> ImageVector;
+    ImageSet uniqueImages;
+    ImageVector imagesToAdd;
+    
+
     for(int b=0; b<getBiomes().size(); ++b)
     {
         const GroundCoverBiome* biome = getBiomes()[b].get();
 
-        for(int i=0; i<biome->getBillboards().size(); ++i, ++arrayIndex)
+        for(int i=0; i<biome->getObjects().size(); ++i)
         {
-            const GroundCoverBillboard& bb = biome->getBillboards()[i];
-
-            osg::ref_ptr<osg::Image> im;
-
-            if ( s < 0 )
+            const GroundCoverObject* obj = biome->getObjects()[i].get();
+            if (obj->getType() == obj->TYPE_BILLBOARD)
             {
-                s  = bb._image->s();
-                t  = bb._image->t();
-                im = bb._image.get();
-                tex->setTextureSize(s, t, getTotalNumBillboards());                              
-            }
-            else
-            {
-                if ( bb._image->s() != s || bb._image->t() != t )
+                const GroundCoverBillboard* bb = dynamic_cast<const GroundCoverBillboard*>(obj);
+
+                if (bb->_sideImage.valid() && uniqueImages.find(bb->_sideImage.get()) == uniqueImages.end())
                 {
-                    ImageUtils::resizeImage( bb._image.get(), s, t, im );
+                    imagesToAdd.push_back(bb->_sideImage.get());
+                    uniqueImages.insert(bb->_sideImage.get());
                 }
-                else
+            
+                if (bb->_topImage.valid() && uniqueImages.find(bb->_topImage.get()) == uniqueImages.end())
                 {
-                    im = bb._image.get();
+                    imagesToAdd.push_back(bb->_topImage.get());
+                    uniqueImages.insert(bb->_topImage.get());
                 }
             }
+        }
+    }
+    
+    for(unsigned i=0; i<imagesToAdd.size(); ++i)
+    {
+        osg::Image* image = imagesToAdd[i];
+        osg::ref_ptr<osg::Image> im;
 
-            tex->setImage( arrayIndex, im.get() );
+        // make sure the texture array is POT - required now for mipmapping to work
+        if ( s < 0 )
+        {
+            s  = nextPowerOf2(image->s());
+            t  = nextPowerOf2(image->t());
+            tex->setTextureSize(s, t, imagesToAdd.size());
         }
+
+        if ( image->s() != s || image->t() != t )
+        {
+            ImageUtils::resizeImage( image, s, t, im );
+        }
+        else
+        {
+            im = image;
+        }
+
+        tex->setImage( i, im.get() );
     }
 
+    OE_INFO << LC << "Created texture with " << imagesToAdd.size() << " unique images" << std::endl; 
+
     tex->setFilter(tex->MIN_FILTER, tex->NEAREST_MIPMAP_LINEAR);
     tex->setFilter(tex->MAG_FILTER, tex->LINEAR);
     tex->setWrap  (tex->WRAP_S, tex->CLAMP_TO_EDGE);
     tex->setWrap  (tex->WRAP_T, tex->CLAMP_TO_EDGE);
     tex->setUnRefImageDataAfterApply( true );
     tex->setMaxAnisotropy( 4.0 );
-    tex->setResizeNonPowerOfTwoHint( false );
 
     return tex;
 }
 
+void
+GroundCover::resizeGLObjectBuffers(unsigned maxSize)
+{
+    if (getStateSet())
+        getStateSet()->resizeGLObjectBuffers(maxSize);
+}
+
+void
+GroundCover::releaseGLObjects(osg::State* state) const
+{
+    if (getStateSet())
+        getStateSet()->releaseGLObjects(state);
+}
+
 //............................................................................
 
 bool
-GroundCoverBiome::configure(const ConfigOptions& conf, const osgDB::Options* dbo)
+GroundCoverBiome::configure(const ConfigOptions& conf, const osgDB::Options* dbo, ImageCache& cache)
 {
     GroundCoverBiomeOptions in( conf );
 
@@ -415,30 +556,91 @@
         const BillboardSymbol* bs = dynamic_cast<BillboardSymbol*>( i->get() );
         if ( bs )
         {
-            URI imageURI = bs->url()->evalURI();
+            // Start with the side image, which is mandatory:
+            osg::ref_ptr<osg::Image> sideImage;
 
-            osg::Image* image = const_cast<osg::Image*>( bs->getImage() );
-            if ( !image )
+            // Symbol contains an image instance?
+            if (bs->getSideImage())
             {
-                image = imageURI.getImage(dbo);
+                sideImage = const_cast<osg::Image*>(bs->getSideImage());
             }
+            else if (bs->url().isSet())
+            {
+                // Load the image from the URI:
+                URI imageURI = bs->url()->evalURI();
+
+                // If image was already loaded into a biome, share it:
+                ImageCache::iterator ic = cache.find(imageURI);
+                if (ic != cache.end())
+                {
+                    sideImage = ic->second.get();
+                }
 
-            if ( image )
+                if (!sideImage.valid())
+                {
+                    sideImage = imageURI.getImage(dbo);
+                    if (sideImage.valid())
+                    {
+                        cache[imageURI] = sideImage.get();
+                    }
+                    else
+                    {
+                        OE_WARN << LC << "Failed to load billboard image from \"" << imageURI.full() << "\"" << std::endl;
+                    }
+                }
+            }
+
+            if (!sideImage.valid())
             {
-                getBillboards().push_back( GroundCoverBillboard(image, bs->width().get(), bs->height().get()) );
+                OE_WARN << LC << "A billboard is missing the mandatory image" << std::endl;
+                return false;
             }
-            else
+
+            // Next process the top image (optional)
+            // Check for an actual instance in the symbol:
+            osg::ref_ptr<osg::Image> topImage;
+
+            if (bs->getTopImage())
             {
-                OE_WARN << LC << "Failed to load billboard image from \"" << imageURI.full() << "\"\n";
+                topImage = const_cast<osg::Image*>(bs->getTopImage());
+            }
+            else if (bs->topURL().isSet())
+            {
+                // Load the image from the URI:
+                URI imageURI = bs->topURL()->evalURI();
+
+                // If image was already loaded into a biome, share it:
+                ImageCache::iterator ic = cache.find(imageURI);
+                if (ic != cache.end())
+                {
+                    topImage = ic->second.get();
+                }
+
+                if (!topImage.valid())
+                {
+                    topImage = imageURI.getImage(dbo);
+                    if (topImage.valid())
+                    {
+                        cache[imageURI] = topImage.get();
+                    }
+                    else
+                    {
+                        OE_WARN << LC << "Failed to load billboard top image from \"" << imageURI.full() << "\"\n";
+                    }
+                }
+            }
+
+
+            if ( sideImage.valid() )
+            {
+                getObjects().push_back( new GroundCoverBillboard(
+                    sideImage.get(), topImage.get(),
+                    bs->width().get(), bs->height().get()) );
             }
         } 
-        else
-        {
-            OE_WARN << LC << "Unrecognized symbol in land cover biome\n";
-        }
     }
 
-    if ( getBillboards().size() == 0 )
+    if ( getObjects().size() == 0 )
     {
         OE_WARN << LC << "A biome failed to install any billboards.\n";
         return false;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover.FS.glsl osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover.FS.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover.FS.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover.FS.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -1,29 +1,33 @@
-#version 330
+#version $GLSL_VERSION_STR
 #pragma vp_name       Land cover billboard texture application
 #pragma vp_entryPoint oe_GroundCover_fragment
 #pragma vp_location   fragment_coloring
 
 #pragma import_defines(OE_GROUNDCOVER_HAS_MULTISAMPLES)
-
+#pragma import_defines(OE_GROUNDCOVER_SHOW_TESSELLATION)
+#pragma import_defines(OE_IS_SHADOW_CAMERA)
 
 uniform sampler2DArray oe_GroundCover_billboardTex;
 uniform float oe_GroundCover_exposure;
+
 in vec2 oe_GroundCover_texCoord;
-in vec4 oe_layer_tilec;
 
-flat in float oe_GroundCover_arrayIndex; // from GroundCover.GS.glsl
+flat in float oe_GroundCover_atlasIndex; // from GroundCover.GS.glsl
 
 void oe_GroundCover_fragment(inout vec4 color)
 {    
+#ifdef OE_GROUNDCOVER_SHOW_TESSELLATION
+    color = vec4(1,1,1,1);
+    return;
+#endif
+
     // modulate the texture
-    color = texture(oe_GroundCover_billboardTex, vec3(oe_GroundCover_texCoord, oe_GroundCover_arrayIndex)) * color;
+    color = texture(oe_GroundCover_billboardTex, vec3(oe_GroundCover_texCoord, oe_GroundCover_atlasIndex)) * color;
     color.rgb *= oe_GroundCover_exposure;
     
     // if multisampling is off, use alpha-discard.
-#ifndef OE_GROUNDCOVER_HAS_MULTISAMPLES
+#if !defined(OE_GROUNDCOVER_HAS_MULTISAMPLES) || defined(OE_IS_SHADOW_CAMERA)
     if (color.a < 0.15)
         discard;
 #endif
-    //if ( !oe_terrain_hasMultiSamples && color.a < 0.15 )
-    //    discard;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover.GS.glsl osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover.GS.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover.GS.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover.GS.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -4,11 +4,18 @@
 #pragma vp_entryPoint oe_GroundCover_geom
 #pragma vp_location   geometry
 
-#pragma import_defines(OE_IS_SHADOW_CAMERA, OE_GROUNDCOVER_MASK_SAMPLER, OE_GROUNDCOVER_MASK_MATRIX)
+#pragma import_defines(OE_IS_SHADOW_CAMERA)
+#pragma import_defines(OE_GROUNDCOVER_MASK_SAMPLER)
+#pragma import_defines(OE_GROUNDCOVER_MASK_MATRIX)
+#pragma import_defines(OE_GROUNDCOVER_SHOW_TESSELLATION)
                 
-layout(triangles)        in;        // triangles from the TileDrawable
-layout(triangle_strip)   out;       // output a triangle-strip billboard
-layout(max_vertices = 8) out;       // four verts per billboard
+layout(triangles) in;        // triangles from the TileDrawable
+
+#ifdef OE_GROUNDCOVER_SHOW_TESSELLATION
+layout(line_strip, max_vertices=12) out;
+#else
+layout(triangle_strip, max_vertices=12) out;  // max of 12 verts per billboard
+#endif
                 
 // VP helper functions:
 void VP_LoadVertex(in int);
@@ -43,39 +50,42 @@
 // Input tile coordinates [0..1]
 in vec4 oe_layer_tilec;
 
+int oe_terrain_vertexMarker;
+#define VERTEX_MARKER_DISCARD 1
+
 // Output grass texture coordinates to the fragment shader
 out vec2 oe_GroundCover_texCoord;
 
-// Input from the TCS that 
-//flat in int oe_GroundCover_biomeIndex;
-
 // Output that selects the land cover texture from the texture array (non interpolated)
-flat out float oe_GroundCover_arrayIndex;
+flat out float oe_GroundCover_atlasIndex;
 
 struct oe_GroundCover_Biome {
-    int firstBillboardIndex;
-    int numBillboards;
+    int firstObjectIndex;
+    int numObjects;
     float density;
     float fill;
     vec2 maxWidthHeight;
 };
-void oe_GroundCover_getBiome(in int biomeIndex, out oe_GroundCover_Biome biome);
+void oe_GroundCover_getBiome(in int index, out oe_GroundCover_Biome biome);
+
+struct oe_GroundCover_Object {
+    int type;             // 0=billboard 
+    int objectArrayIndex; // index into the typed object array 
+};
+void oe_GroundCover_getObject(in int index, out oe_GroundCover_Object object);
 
 struct oe_GroundCover_Billboard {
-    int arrayIndex;
+    int atlasIndexSide;
+    int atlasIndexTop;
     float width;
     float height;
 };
-void oe_GroundCover_getBillboard(in int billboardIndex, out oe_GroundCover_Billboard bb);
-
+void oe_GroundCover_getBillboard(in int index, out oe_GroundCover_Billboard bb);
 
 // Output colors/normals:
 out vec4 vp_Color;
 out vec3 vp_Normal;
 
-// Up vector for clamping.
-in vec3 oe_UpVectorView;
-
 // SDK import
 float oe_terrain_getElevation(in vec2);
 
@@ -87,7 +97,6 @@
 uniform mat4 OE_GROUNDCOVER_MASK_MATRIX;
 #endif
 
-// Sample the elevation texture and move the vertex accordingly.
 void
 oe_GroundCover_clamp(inout vec4 vert_view, in vec3 up, vec2 UV)
 {
@@ -126,13 +135,37 @@
     return b;
 }
 
+float oe_GroundCover_fastpow(in float x, in float y)
+{
+    return x / (x + y - y * x);
+}
+
 // MAIN ENTRY POINT  
 void
 oe_GroundCover_geom()
-{    
+{
     vec4 center = vec4(0,0,0,1);
     vec2 tileUV = vec2(0,0);
-    
+
+#ifdef OE_GROUNDCOVER_SHOW_TESSELLATION
+    for(int i=0; i < 3; ++i)
+    {
+        VP_LoadVertex(i);      
+        gl_Position = gl_in[i].gl_Position;
+        gl_Position.z += 10.0;
+        gl_Position = gl_ModelViewMatrix * gl_Position;
+        VP_EmitViewVertex();
+    }
+    VP_LoadVertex(0);    
+    gl_Position = gl_in[0].gl_Position;
+    gl_Position.z += 10.0;
+    gl_Position = gl_ModelViewMatrix * gl_Position;
+    VP_EmitViewVertex();
+
+    EndPrimitive();
+    return;
+#endif
+        
     // gen a random point within the input triangle
     vec3 b = oe_GroundCover_getRandomBarycentricPoint(gl_in[0].gl_Position.xy);
     
@@ -140,8 +173,12 @@
     // using the barycentric coordinates.
     for(int i=0; i < 3; ++i)
     {
-        VP_LoadVertex(i);      
-        
+        VP_LoadVertex(i);
+
+        // check for the marker (set in GroundCover.TES.glsl)
+        if (oe_terrain_vertexMarker == VERTEX_MARKER_DISCARD)
+            return;
+
         center.x += b[i] * gl_in[i].gl_Position.x;
         center.y += b[i] * gl_in[i].gl_Position.y;
         center.z += b[i] * gl_in[i].gl_Position.z;
@@ -170,7 +207,7 @@
     
     // Transform to view space.
     vec4 center_view = gl_ModelViewMatrix * center;
-    vec3 up_view     = oe_UpVectorView;
+    vec3 up_view     = gl_NormalMatrix * vp_Normal; //oe_UpVectorView;
     
     // Clamp the center point to the elevation.
     oe_GroundCover_clamp(center_view, up_view, tileUV);
@@ -212,31 +249,27 @@
         noise[NOISE_SMOOTH] /= oe_GroundCover_fill;
 
     // select a billboard seemingly at random. Need to scale n to account for the fill limit first though.
-    int billboardIndex = biome.firstBillboardIndex + int( floor(noise[NOISE_RANDOM] * float(biome.numBillboards) ) );
-    billboardIndex = min(billboardIndex, biome.firstBillboardIndex + biome.numBillboards - 1);
+    int objectIndex = biome.firstObjectIndex + int(floor(noise[NOISE_RANDOM] * float(biome.numObjects)));
+    objectIndex = min(objectIndex, biome.firstObjectIndex + biome.numObjects - 1);
 
+    // Recover the object we randomly picked:
+    oe_GroundCover_Object object;
+    oe_GroundCover_getObject(objectIndex, object);
+
+    // for now, assume type == BILLBOARD.
+    // Find the billboard associated with the object:
     oe_GroundCover_Billboard billboard;
-    oe_GroundCover_getBillboard(billboardIndex, billboard);
-    
-    // pass the billboard's array index along to the fragment shader.
-    oe_GroundCover_arrayIndex = float(billboard.arrayIndex);
-    
-	
+    oe_GroundCover_getBillboard(object.objectArrayIndex, billboard);
+
+    oe_GroundCover_atlasIndex = float(billboard.atlasIndexSide);
+
     // push the falloff closer to the max distance.
     float falloff = 1.0-(nRange*nRange*nRange);
 
     // billboard width, which shrinks into the distance
-    float width = billboard.width * falloff * sizeScale;
-    
+    float width = billboard.width * falloff * sizeScale;    
     float height = billboard.height * falloff * sizeScale;
 
-    // vary the height of each instance and shrink it as it disappears into the distance.
-    // TODO: consider parameterizing this so we can toggle the feature
-    //height *= sizeScale;
-
-    // shrink land cover as it dissappears into the distance:
-    //height *= falloff;
-
 	// compute the billboard corners in view space.
     vec4 LL, LR, UL, UR;
     
@@ -283,7 +316,7 @@
 
 #else // normal render camera - draw as a billboard:
 
-    vec3 tangentVector = normalize(cross(vec3(0,0,-1), up_view));
+    vec3 tangentVector = normalize(cross(center_view.xyz, up_view));
     vec3 halfWidthTangentVector = tangentVector * 0.5 * width;
     vec3 heightVector = up_view*height;
         
@@ -301,43 +334,110 @@
     // Color variation, brightness, and contrast:
     vec3 color = vec3( noise[NOISE_RANDOM_2] );
     color = ( ((color - 0.5) * oe_GroundCover_contrast + 0.5) * oe_GroundCover_brightness);
-
-    vp_Color = vec4(color*oe_GroundCover_ao, falloff);
-
+    
     // calculates normals:
     vec3 faceNormalVector = normalize(cross(tangentVector, heightVector));
 
     // if we are looking straight-ish down on the billboard, don't bother with it
-    if (abs(dot(normalize(center_view.xyz), faceNormalVector)) < 0.01)
+    if (billboard.atlasIndexTop < 0 && 
+        abs(dot(normalize(center_view.xyz), faceNormalVector)) < 0.01)
+    {
         return;
+    }
 
     float blend = 0.25 + (noise[NOISE_RANDOM_2]*0.25);
     vec3 Lnormal = mix(-tangentVector, faceNormalVector, blend);
     vec3 Rnormal = mix( tangentVector, faceNormalVector, blend);
 
-    gl_Position = LL;
-    oe_GroundCover_texCoord = vec2(0,0);
-    vp_Normal = Lnormal;
-    VP_EmitViewVertex();
-    
-    gl_Position = LR;
-    oe_GroundCover_texCoord = vec2(1,0);
-    vp_Normal = Rnormal;
-    VP_EmitViewVertex();
+    float billboardAmount = 1.0;
+    float topDownAmount = 0.0;
 
-    vp_Color = vec4(color, falloff);      
+    if (billboard.atlasIndexTop >= 0)
+    {
+        // calculate a [0..1] factor for interpolating from a front billboard view
+        // to a top-down view of the tree (0.0=billboard, 1.0=topdown)
+        topDownAmount = abs(dot(vec3(0, 0, -1), up_view));
+        billboardAmount = 1.0 - oe_GroundCover_fastpow(topDownAmount, 10.0);
+        topDownAmount = clamp(topDownAmount*1.5, 0.0, 1.0);
+    }
 
-    gl_Position = UL;
-    oe_GroundCover_texCoord = vec2(0,1);
-    vp_Normal = Lnormal;
-    VP_EmitViewVertex();
+    const float billboardThreshold = 0.15;
 
-    oe_GroundCover_texCoord = vec2(1,1);
-    vp_Normal = Rnormal;
-    gl_Position = UR;
-    VP_EmitViewVertex();
-                    
-    EndPrimitive();
+    if (billboardAmount > billboardThreshold)
+    {
+        vp_Color = vec4(color*oe_GroundCover_ao, falloff * billboardAmount);
+
+        gl_Position = LL;
+        oe_GroundCover_texCoord = vec2(0.0, 0.0);
+        vp_Normal = Lnormal;
+        VP_EmitViewVertex();
+
+        gl_Position = LR;
+        oe_GroundCover_texCoord = vec2(1.0, 0.0);
+        vp_Normal = Rnormal;
+        VP_EmitViewVertex();
+
+        vp_Color = vec4(color, falloff * billboardAmount);
+
+        gl_Position = UL;
+        oe_GroundCover_texCoord = vec2(0.0, 1.0);
+        vp_Normal = Lnormal;
+        VP_EmitViewVertex();
+
+        oe_GroundCover_texCoord = vec2(1.0, 1.0);
+        vp_Normal = Rnormal;
+        gl_Position = UR;
+        VP_EmitViewVertex();
+
+        EndPrimitive();
+    }
+
+    const float topDownThreshold = 0.5;
+
+    if (topDownAmount > topDownThreshold && billboard.atlasIndexTop >= 0)
+    {
+        oe_GroundCover_atlasIndex = float(billboard.atlasIndexTop);
+        // estiblish the local tangent plane:
+        vec3 U = gl_NormalMatrix * vec3(0, 0, 1);
+        vec3 E = cross(U, up_view);
+        vec3 N = cross(up_view, E);
+
+        // now introduce a "random" rotation (using barycentric coords)
+        b = b * 2.0 - 1.0;  // from [0..1] to [-1..1]
+        N = normalize(E*b.x + N * b.y);
+        E = normalize(cross(N, U));
+
+        float k = width * 0.5;
+        vec3 C = center_view.xyz + (heightVector*0.4);
+        LL = vec4(C - E*k - N*k, 1.0);
+        LR = vec4(C + E*k - N*k, 1.0);
+        UL = vec4(C - E*k + N*k, 1.0);
+        UR = vec4(C + E*k + N*k, 1.0);
+
+        vp_Color = vec4(color, (topDownAmount - topDownThreshold)*(topDownAmount / topDownThreshold));
+
+        gl_Position = LL;
+        oe_GroundCover_texCoord = vec2(0.0, 0.0);
+        vp_Normal = (LL.xyz - C);
+        VP_EmitViewVertex();
+
+        gl_Position = LR;
+        oe_GroundCover_texCoord = vec2(1.0, 0.0);
+        vp_Normal = (LR.xyz - C);
+        VP_EmitViewVertex();
+
+        gl_Position = UL;
+        oe_GroundCover_texCoord = vec2(0.0, 1.0);
+        vp_Normal = (UL.xyz - C);
+        VP_EmitViewVertex();
+
+        gl_Position = UR;
+        oe_GroundCover_texCoord = vec2(1.0, 1.0);
+        vp_Normal = (UR.xyz - C);
+        VP_EmitViewVertex();
+
+        EndPrimitive();
+    }
     
 #endif // !OE_IS_SHADOW_CAMERA
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCoverLayer osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCoverLayer
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCoverLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCoverLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -94,7 +94,7 @@
     class OSGEARTHSPLAT_EXPORT GroundCoverLayer : public PatchLayer
     {
     public:
-        META_Layer(osgEarthSplat, GroundCoverLayer, GroundCoverLayerOptions);
+        META_Layer(osgEarthSplat, GroundCoverLayer, GroundCoverLayerOptions, splat_groundcover);
 
         //! Construct a layer with default configuration
         GroundCoverLayer();
@@ -118,11 +118,6 @@
         Zones& zones() { return _zones; }
         const Zones& zones() const { return _zones; }
 
-    public: // Layer
-
-        //! Override
-        bool cull(const osgUtil::CullVisitor* cv, osg::State::StateSetStack& ssStack) const;
-
     protected:
 
         //! Override post-ctor init
@@ -138,6 +133,9 @@
         virtual void removedFromMap(const Map* map);
         virtual void setTerrainResources(TerrainResources*);
 
+        virtual void resizeGLObjectBuffers(unsigned maxSize);
+        virtual void releaseGLObjects(osg::State* state) const;
+
     protected:
         virtual ~GroundCoverLayer() { }
 
@@ -156,6 +154,23 @@
         bool _zonesConfigured;
 
         void buildStateSets();
+
+        struct LayerAcceptor : public PatchLayer::AcceptCallback
+        {
+            GroundCoverLayer* _layer;
+            LayerAcceptor(GroundCoverLayer* layer) : _layer(layer) { }
+            bool acceptLayer(osg::NodeVisitor& nv, const osg::Camera* camera) const;
+            bool acceptKey(const TileKey& key) const;
+        };
+        friend struct LayerAcceptor;
+
+        struct ZoneSelector : public Layer::TraversalCallback
+        {
+            GroundCoverLayer* _layer;
+            ZoneSelector(GroundCoverLayer* layer) : _layer(layer) { }
+            void operator()(osg::Node*, osg::NodeVisitor*) const;
+        };
+        friend struct ZoneSelector;
     };
 
 } } // namespace osgEarth::Splat
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCoverLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCoverLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCoverLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCoverLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -24,6 +24,7 @@
 #include "NoiseTextureFactory"
 #include <osgEarth/VirtualProgram>
 #include <osgEarth/Shadowing>
+#include <osgEarth/ClampableNode>
 #include <osgEarthFeatures/FeatureSource>
 #include <osgEarthFeatures/FeatureSourceLayer>
 #include <osgUtil/CullVisitor>
@@ -49,7 +50,6 @@
 GroundCoverLayerOptions::getConfig() const
 {
     Config conf = PatchLayerOptions::getConfig();
-    conf.key() = "splat_groundcover";
     conf.set("land_cover_layer", _landCoverLayerName);
     conf.set("mask_layer", _maskLayerName);
     conf.set("lod", _lod);
@@ -62,17 +62,17 @@
             zones.add(zone);
     }
     if (!zones.empty())
-        conf.update(zones);
+        conf.set(zones);
     return conf;
 }
 
 void
 GroundCoverLayerOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet("land_cover_layer", _landCoverLayerName);
-    conf.getIfSet("mask_layer", _maskLayerName);
-    conf.getIfSet("lod", _lod);
-    conf.getIfSet("cast_shadows", _castShadows);
+    conf.get("land_cover_layer", _landCoverLayerName);
+    conf.get("mask_layer", _maskLayerName);
+    conf.get("lod", _lod);
+    conf.get("cast_shadows", _castShadows);
 
     const Config* zones = conf.child_ptr("zones");
     if (zones) {
@@ -85,39 +85,77 @@
 
 //........................................................................
 
-namespace
+bool
+GroundCoverLayer::LayerAcceptor::acceptLayer(osg::NodeVisitor& nv, const osg::Camera* camera) const
 {
-    struct GroundCoverLayerAcceptor : public PatchLayer::AcceptCallback
+    // if this is a shadow camera and the layer is configured to cast shadows, accept it.
+    if (osgEarth::Shadowing::isShadowCamera(camera))
     {
-        GroundCoverLayer* _layer;
+        bool use = (_layer->options().castShadows() == true);
+        return use;
+    }
+
+    // if this is a depth-pass camera (and not a shadow cam), reject it.
+    bool isDepthCamera = ClampableNode::isDepthCamera(camera);
+    if (isDepthCamera)
+        return false;
+
+    // otherwise accept the layer.
+    return true;
+}
+
+bool
+GroundCoverLayer::LayerAcceptor::acceptKey(const TileKey& key) const
+{
+    return _layer->getLOD() == key.getLOD();
+}
 
-        GroundCoverLayerAcceptor(GroundCoverLayer* layer) : _layer(layer) { }
+//........................................................................
 
-        bool acceptLayer(osg::NodeVisitor& nv, const osg::Camera* camera) const
+void
+GroundCoverLayer::ZoneSelector::operator()(osg::Node* node, osg::NodeVisitor* nv) const
+{
+    if (nv->getVisitorType() == nv->CULL_VISITOR)
+    {
+        osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
+
+        // If we have zones, select the current one and apply its state set.
+        if (_layer->_zones.size() > 0)
         {
-            // if this is a shadow camera and the layer is configured to cast shadows, accept it.
-            if (osgEarth::Shadowing::isShadowCamera(camera))
+            int zoneIndex = 0;
+            osg::Vec3d vp = cv->getViewPoint();
+
+            for(int z=_layer->_zones.size()-1; z > 0 && zoneIndex == 0; --z)
             {
-                bool use = (_layer->options().castShadows() == true);
-                return use;
+                if ( _layer->_zones[z]->contains(vp) )
+                {
+                    zoneIndex = z;
+                }
             }
 
-            // if this is a depth-pass camera (and not a shadow cam), reject it.
-            unsigned clearMask = camera->getClearMask();
-            bool isDepthCamera = ((clearMask & GL_COLOR_BUFFER_BIT) == 0u) && ((clearMask & GL_DEPTH_BUFFER_BIT) != 0u);
-            if (isDepthCamera)
-                return false;
-
-            // otherwise accept the layer.
-            return true;
-        }
+            osg::StateSet* zoneStateSet = 0L;
+            GroundCover* gc = _layer->_zones[zoneIndex]->getGroundCover();
+            if (gc)
+            {
+                zoneStateSet = gc->getStateSet();
+            }
 
-        bool acceptKey(const TileKey& key) const
-        {
-            return _layer->getLOD() == key.getLOD();
+            if (zoneStateSet == 0L)
+            {
+                OE_FATAL << LC << "ASSERTION FAILURE - zoneStateSet is null\n";
+            }
+            else
+            {            
+                cv->pushStateSet(zoneStateSet);
+                traverse(node, nv);
+                cv->popStateSet();
+            }
         }
-
-    };
+    }
+    else
+    {
+        traverse(node, nv);
+    }
 }
 
 //........................................................................
@@ -153,7 +191,9 @@
         _zones.push_back(zone.get());
     }
 
-    setAcceptCallback(new GroundCoverLayerAcceptor(this));
+    setAcceptCallback(new LayerAcceptor(this));
+
+    setCullCallback(new ZoneSelector(this));
 }
 
 const Status&
@@ -234,6 +274,8 @@
 void
 GroundCoverLayer::setTerrainResources(TerrainResources* res)
 {
+    PatchLayer::setTerrainResources(res);
+
     if (res)
     {
         if (_groundCoverTexBinding.valid() == false)
@@ -259,46 +301,6 @@
     }
 }
 
-bool
-GroundCoverLayer::cull(const osgUtil::CullVisitor* cv, osg::State::StateSetStack& stateSetStack) const
-{
-    if (Layer::cull(cv, stateSetStack) == false)
-        return false;
-
-    // If we have zones, select the current one and apply its state set.
-    if (_zones.size() > 0)
-    {
-        int zoneIndex = 0;
-        osg::Vec3d vp = cv->getViewPoint();
-
-        for(int z=_zones.size()-1; z > 0 && zoneIndex == 0; --z)
-        {
-            if ( _zones[z]->contains(vp) )
-            {
-                zoneIndex = z;
-            }
-        }
-
-        osg::StateSet* zoneStateSet = 0L;
-        GroundCover* gc = _zones[zoneIndex]->getGroundCover();
-        if (gc)
-        {
-            zoneStateSet = gc->getStateSet();
-        }
-
-        //osg::StateSet* zoneStateSet = _zones[zoneIndex]->getGroundCover()getStateSet();
-
-        if (zoneStateSet == 0L)
-        {
-            OE_FATAL << LC << "ASSERTION FAILURE - zoneStateSet is null\n";
-            exit(-1);
-        }
-        
-        stateSetStack.push_back(zoneStateSet);
-    }
-    return true;
-}
-
 void
 GroundCoverLayer::buildStateSets()
 {
@@ -360,6 +362,7 @@
         new osg::BlendFunc(GL_ONE, GL_ZERO, GL_ONE, GL_ZERO),
         osg::StateAttribute::OVERRIDE);
 
+    float maxRange = 0.0f;
 
     for (Zones::iterator z = _zones.begin(); z != _zones.end(); ++z)
     {
@@ -367,7 +370,7 @@
         GroundCover* groundCover = zone->getGroundCover();
         if (groundCover)
         {
-            if (!groundCover->getBiomes().empty() || groundCover->getTotalNumBillboards() > 0)
+            if (!groundCover->getBiomes().empty() || groundCover->getTotalNumObjects() > 0)
             {
                 osg::StateSet* zoneStateSet = groundCover->getOrCreateStateSet();
                             
@@ -398,7 +401,10 @@
                 zoneStateSet->setTextureAttribute(_groundCoverTexBinding.unit(), tex);
                 zoneStateSet->addUniform(new osg::Uniform(GCTEX_SAMPLER, _groundCoverTexBinding.unit()));
 
-                OE_DEBUG << LC << "buildStateSets completed!\n";
+                if (groundCover->getMaxDistance() > maxRange)
+                {
+                    maxRange = groundCover->getMaxDistance();
+                }
             }
             else
             {
@@ -411,4 +417,37 @@
             OE_DEBUG << LC << "zone contains no ground cover information\n";
         }
     }
+
+    if (maxRange > 0.0f && !options().maxVisibleRange().isSet())
+    {
+        setMaxVisibleRange(maxRange);
+        OE_INFO << LC << "Max visible range set to " << maxRange << std::endl;
+    }
+}
+
+void
+GroundCoverLayer::resizeGLObjectBuffers(unsigned maxSize)
+{
+    for (Zones::const_iterator z = _zones.begin(); z != _zones.end(); ++z)
+    {
+        z->get()->resizeGLObjectBuffers(maxSize);
+    }
+
+    PatchLayer::resizeGLObjectBuffers(maxSize);
+}
+
+void
+GroundCoverLayer::releaseGLObjects(osg::State* state) const
+{
+    for (Zones::const_iterator z = _zones.begin(); z != _zones.end(); ++z)
+    {
+        z->get()->releaseGLObjects(state);
+    }
+
+    PatchLayer::releaseGLObjects(state);
+
+    // For some unknown reason, release doesn't work on the zone 
+    // texture def data (SplatTextureDef). So we have to recreate
+    // it here.
+    const_cast<GroundCoverLayer*>(this)->buildStateSets();
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover.TCS.glsl osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover.TCS.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover.TCS.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover.TCS.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -15,11 +15,13 @@
 // per-vertex tile coordinates
 vec4 oe_layer_tilec;
 
+#ifdef OE_GROUNDCOVER_COVERAGE_PRECHECK
 // SDK function to sample the coverage data
 int oe_GroundCover_getBiomeIndex(in vec4);
 
 // SDK function to load per-vertex data
 void VP_LoadVertex(in int);
+#endif
 
 // MAIN ENTRY POINT                
 void oe_GroundCover_configureTess()
@@ -28,6 +30,11 @@
 	{
         float d = oe_GroundCover_density;
 
+#ifdef OE_GROUNDCOVER_COVERAGE_PRECHECK
+        // Samples the three corner points to see whether the triangle
+        // is likely to contain a groundcover biome. This is not perfect
+        // since it only samples the corner points, and the performance
+        // benefits are questionable. -gw
         VP_LoadVertex(0);
         if ( oe_GroundCover_getBiomeIndex(oe_layer_tilec) >= 0 ) {
             d = oe_GroundCover_density;
@@ -46,10 +53,11 @@
                 }
             }
         }
+#endif
 
         gl_TessLevelOuter[0] = d;
         gl_TessLevelOuter[1] = d;
         gl_TessLevelOuter[2] = d;
-        gl_TessLevelInner[0] = d;
+        gl_TessLevelInner[0] = d+1;
 	}
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover.TES.glsl osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover.TES.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/GroundCover.TES.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/GroundCover.TES.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -5,9 +5,10 @@
 #pragma vp_location   tess_eval
 
 // osgEarth terrain is always CCW winding
-layout(triangles, fractional_odd_spacing, ccw) in;
+layout(triangles, equal_spacing, ccw) in;
 
 // Internal helpers:
+void VP_LoadVertex(int);
 void VP_Interpolate3();
 void VP_EmitVertex();
 
@@ -39,12 +40,38 @@
 
                 
 vec3 vp_Normal;
+vec4 oe_layer_tilec;
+int oe_terrain_vertexMarker;
+
+// Vertex Markers:
+#define VERTEX_MARKER_DISCARD  1
+#define VERTEX_MARKER_BOUNDARY 8
 
 // simplest possible pass-though:
 void oe_GroundCover_tessellate()
 {
+    // check for special vertex types that will not support ground cover.
+    // if any of the 3 is BOUNDARY or DISCARD, mark all 3 as DISCARD
+    // and the GS will not emit any ground cover.
+    bool skipVertex = false;
+    for(int i=0; i<3; ++i)
+    {
+        VP_LoadVertex(i);
+        if ((oe_terrain_vertexMarker & VERTEX_MARKER_BOUNDARY) != 0 ||
+            (oe_terrain_vertexMarker & VERTEX_MARKER_DISCARD) != 0)
+        {
+            skipVertex = true;
+        }
+    }
+
     VP_Interpolate3();
     // Must re-normalize the normal vector since interpolation was linear?
 	//vp_Normal = normalize(vp_Normal);
+
+    if (skipVertex)
+    {
+        oe_terrain_vertexMarker = VERTEX_MARKER_DISCARD;
+    }
+
     VP_EmitVertex();
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/LandUseTileSource osgearth-2.10.2+dfsg/src/osgEarthSplat/LandUseTileSource
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/LandUseTileSource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/LandUseTileSource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -75,9 +75,9 @@
         Config getConfig() const
         {
             Config conf;
-            conf.addIfSet("warp",      _warp);
-            conf.addIfSet("base_lod",  _baseLOD);
-            conf.addIfSet("bits",      _bits);
+            conf.set("warp",      _warp);
+            conf.set("base_lod",  _baseLOD);
+            conf.set("bits",      _bits);
 
             // multiple
             if ( _imageLayerOptionsVec.size() > 0 )
@@ -89,7 +89,7 @@
                 {
                     images.add( "image", i->getConfig() );
                 }
-                conf.add( images );
+                conf.set( images );
             }
 
             return conf;
@@ -104,9 +104,9 @@
     private:
         void fromConfig( const Config& conf )
         {
-            conf.getIfSet("warp", _warp);
-            conf.getIfSet("base_lod", _baseLOD);
-            conf.getIfSet("bits",      _bits);
+            conf.get("warp", _warp);
+            conf.get("base_lod", _baseLOD);
+            conf.get("bits",      _bits);
             
             ConfigSet layerConfs = conf.child("images").children("image");
             for(ConfigSet::const_iterator i = layerConfs.begin(); i != layerConfs.end(); ++i)
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/LandUseTileSource.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/LandUseTileSource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/LandUseTileSource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/LandUseTileSource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,7 +18,6 @@
  */
 #include "LandUseTileSource"
 #include <osgEarth/ImageLayer>
-#include <osgEarth/MapFrame>
 #include <osgEarth/Registry>
 #include <osgEarth/ImageUtils>
 #include <osgEarth/SimplexNoise>
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/NoiseTextureFactory osgearth-2.10.2+dfsg/src/osgEarthSplat/NoiseTextureFactory
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/NoiseTextureFactory	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/NoiseTextureFactory	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/NoiseTextureFactory.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/NoiseTextureFactory.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/NoiseTextureFactory.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/NoiseTextureFactory.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 {
     chans = osg::clampBetween(chans, 1u, 4u);
 
-    GLenum type = chans >= 2u ? GL_RGBA : GL_LUMINANCE;
+    GLenum type = chans >= 2u ? GL_RGBA : GL_RED;
     
     osg::Image* image = new osg::Image();
     image->allocateImage(dim, dim, 1, type, GL_UNSIGNED_BYTE);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/RoadSurfaceLayer osgearth-2.10.2+dfsg/src/osgEarthSplat/RoadSurfaceLayer
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/RoadSurfaceLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/RoadSurfaceLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -66,11 +66,10 @@
         Config getConfig() const
         {
             Config conf = ImageLayerOptions::getConfig();
-            conf.key() = "road_surface";
-            conf.addObjIfSet("features",  _featureSourceOptions);
-            conf.addIfSet("feature_source", _featureSourceLayer);
-            conf.addIfSet("buffer_width", _bufferWidth);
-            conf.addObjIfSet("styles", _styles);
+            conf.set("features",  _featureSourceOptions);
+            conf.set("feature_source", _featureSourceLayer);
+            conf.set("buffer_width", _bufferWidth);
+            conf.set("styles", _styles);
             return conf;
         }
 
@@ -83,10 +82,10 @@
     private:
         void fromConfig( const Config& conf )
         {
-            conf.getObjIfSet("features",  _featureSourceOptions);
-            conf.getIfSet("feature_source", _featureSourceLayer);
-            conf.getIfSet("buffer_width", _bufferWidth);
-            conf.getObjIfSet("styles", _styles);
+            conf.get("features",  _featureSourceOptions);
+            conf.get("feature_source", _featureSourceLayer);
+            conf.get("buffer_width", _bufferWidth);
+            conf.get("styles", _styles);
         }
         
     private:
@@ -103,7 +102,7 @@
     class OSGEARTHSPLAT_EXPORT RoadSurfaceLayer : public osgEarth::ImageLayer
     {
     public:
-        META_Layer(osgEarth, RoadSurfaceLayer, RoadSurfaceLayerOptions);
+        META_Layer(osgEarth, RoadSurfaceLayer, RoadSurfaceLayerOptions, road_surface);
 
         //! Create a blank layer to be configured with options()
         RoadSurfaceLayer();
@@ -141,7 +140,7 @@
         virtual void init();
 
         // A node to add to the scene graph for this layer.
-        virtual osg::Node* getOrCreateNode();
+        virtual osg::Node* getNode() const;
 
     protected:
 
@@ -150,7 +149,7 @@
     private:
         osg::ref_ptr<FeatureSource> _features;
         osg::ref_ptr<Session> _session;
-        osg::observer_ptr<TileRasterizer> _rasterizer;
+        osg::ref_ptr<TileRasterizer> _rasterizer;
 
         LayerListener<RoadSurfaceLayer, FeatureSourceLayer> _layerListener;
     };
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/RoadSurfaceLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/RoadSurfaceLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/RoadSurfaceLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/RoadSurfaceLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -132,7 +132,7 @@
 }
 
 osg::Node*
-RoadSurfaceLayer::getOrCreateNode()
+RoadSurfaceLayer::getNode() const
 {
     // adds the Rasterizer to the scene graph so we can rasterize tiles
     return _rasterizer.get();
@@ -293,6 +293,9 @@
     GeoExtent featureExtent = key.getExtent().transform(featureSRS);
     GeoExtent queryExtent = featureExtent;
 
+    if (!featureExtent.isValid())
+        return GeoImage::INVALID;
+
     // Buffer the incoming extent, if requested.
     if (options().featureBufferWidth().isSet())
     {
@@ -326,7 +329,7 @@
             Query query;        
             query.tileKey() = *i;
 
-            osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor(query);
+            osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor(query, progress);
             if (cursor.valid())
             {
                 cursor->fill(features);
@@ -340,7 +343,7 @@
         query.bounds() = queryExtent.bounds();
 
         // Run the query and fill the list.
-        osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor(query);
+        osg::ref_ptr<FeatureCursor> cursor = _features->createFeatureCursor(query, progress);
         if (cursor.valid())
         {
             cursor->fill(features);
@@ -384,17 +387,10 @@
             Threading::Future<osg::Image> imageFuture;
 
             // Schedule the rasterization and get the future.
-            osg::ref_ptr<TileRasterizer> rasterizer;
-            if (_rasterizer.lock(rasterizer))
-            {
-                imageFuture = rasterizer->push(group.release(), getTileSize(), outputExtent);
-
-                // Immediately discard the temporary reference to the rasterizer, because
-                // otherwise a deadlock can occur if the application exits while the call
-                // to release() below is blocked.
-                rasterizer = 0L;
-            }
+            imageFuture = _rasterizer->push(group.release(), getTileSize(), outputExtent);
 
+            // Block until the image is ready.
+            // NULL means there was nothing to render.
             osg::Image* image = imageFuture.release();
             if (image)
             {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatCatalog osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatCatalog
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatCatalog	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatCatalog	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -99,9 +99,9 @@
         SplatLUT                          _splatLUT;
         osg::ref_ptr<osg::Texture>        _splatLUTBuffer;
         std::string                       _samplingFunction;
+        void resizeGLObjectBuffers(unsigned maxSize);
+        void releaseGLObjects(osg::State* state) const;
     };
-    
-    typedef std::vector<SplatTextureDef> SplatTextureDefVector;
 
     /**
      * Catalog of texture-splatting classes. Usually these correspond
@@ -163,7 +163,6 @@
         optional<std::string> _name;
         optional<std::string> _description;
         SplatClassMap         _classes;
-        SplatTextureDef       _textureDef;
     };
 
 } } // namespace osgEarth::Splat
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatCatalog.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatCatalog.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatCatalog.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatCatalog.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -41,22 +41,22 @@
 SplatDetailData::SplatDetailData(const Config& conf) :
 _textureIndex( -1 )
 {
-    conf.getIfSet("image",      _imageURI);
-    conf.getIfSet("brightness", _brightness);
-    conf.getIfSet("contrast",   _contrast);
-    conf.getIfSet("threshold",  _threshold);
-    conf.getIfSet("slope",      _slope);
+    conf.get("image",      _imageURI);
+    conf.get("brightness", _brightness);
+    conf.get("contrast",   _contrast);
+    conf.get("threshold",  _threshold);
+    conf.get("slope",      _slope);
 }
 
 Config
 SplatDetailData::getConfig() const
 {
     Config conf;
-    conf.addIfSet("image",      _imageURI);
-    conf.addIfSet("brightness", _brightness);
-    conf.addIfSet("contrast",   _contrast);
-    conf.addIfSet("threshold",  _threshold);
-    conf.addIfSet("slope",      _slope);
+    conf.set("image",      _imageURI);
+    conf.set("brightness", _brightness);
+    conf.set("contrast",   _contrast);
+    conf.set("threshold",  _threshold);
+    conf.set("slope",      _slope);
     return conf;
 }
 
@@ -71,11 +71,11 @@
 SplatRangeData::SplatRangeData(const Config& conf) :
 _textureIndex( -1 )
 {
-    conf.getIfSet("max_lod",    _maxLOD);
-    conf.getIfSet("image",      _imageURI);
-    conf.getIfSet("model",      _modelURI);
-    conf.getIfSet("modelCount", _modelCount);
-    conf.getIfSet("modelLevel", _modelLevel);
+    conf.get("max_lod",    _maxLOD);
+    conf.get("image",      _imageURI);
+    conf.get("model",      _modelURI);
+    conf.get("modelCount", _modelCount);
+    conf.get("modelLevel", _modelLevel);
 
     if ( conf.hasChild("detail") )
         _detail = SplatDetailData(conf.child("detail"));
@@ -85,13 +85,13 @@
 SplatRangeData::getConfig() const
 {
     Config conf;
-    conf.addIfSet("max_lod",    _maxLOD);
-    conf.addIfSet("image",      _imageURI);
-    conf.addIfSet("model",      _modelURI);
-    conf.addIfSet("modelCount", _modelCount);
-    conf.addIfSet("modelLevel", _modelLevel);
+    conf.set("max_lod",    _maxLOD);
+    conf.set("image",      _imageURI);
+    conf.set("model",      _modelURI);
+    conf.set("modelCount", _modelCount);
+    conf.set("modelLevel", _modelLevel);
     if ( _detail.isSet() )
-        conf.add( "detail", _detail->getConfig() );
+        conf.set( "detail", _detail->getConfig() );
 
     return conf;
 }
@@ -148,9 +148,9 @@
 void
 SplatCatalog::fromConfig(const Config& conf)
 {
-    conf.getIfSet("version",     _version);
-    conf.getIfSet("name",        _name);
-    conf.getIfSet("description", _description);
+    conf.get("version",     _version);
+    conf.get("name",        _name);
+    conf.get("description", _description);
 
     Config classesConf = conf.child("classes");
     if ( !classesConf.empty() )
@@ -170,9 +170,9 @@
 SplatCatalog::getConfig() const
 {
     Config conf;
-    conf.addIfSet("version",     _version);
-    conf.addIfSet("name",        _name);
-    conf.addIfSet("description", _description);
+    conf.set("version",     _version);
+    conf.set("name",        _name);
+    conf.set("description", _description);
     
     Config classes("classes");
     {
@@ -181,7 +181,7 @@
             classes.add( "class", i->second.getConfig() );
         }
     }    
-    conf.add( classes );
+    conf.set( classes );
 
     return conf;
 }
@@ -342,7 +342,7 @@
         out._texture->setWrap( osg::Texture::WRAP_T, osg::Texture::REPEAT );
         out._texture->setFilter( osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR );
         out._texture->setFilter( osg::Texture::MAG_FILTER, osg::Texture::LINEAR );
-        out._texture->setResizeNonPowerOfTwoHint( false );
+        //out._texture->setResizeNonPowerOfTwoHint( false );
         out._texture->setMaxAnisotropy( 4.0f );
 
         for(unsigned i=0; i<imagesInOrder.size(); ++i)
@@ -387,4 +387,26 @@
     }
 
     return catalog.release();
-}
\ No newline at end of file
+}
+
+//...................................................................
+
+void
+SplatTextureDef::resizeGLObjectBuffers(unsigned maxSize)
+{
+    if (_texture.valid())
+        _texture->resizeGLObjectBuffers(maxSize);
+
+    if (_splatLUTBuffer.valid())
+        _splatLUTBuffer->resizeGLObjectBuffers(maxSize);
+}
+
+void
+SplatTextureDef::releaseGLObjects(osg::State* state) const
+{
+    if (_texture.valid())
+        _texture->releaseGLObjects(state);
+
+    if (_splatLUTBuffer.valid())
+        _splatLUTBuffer->releaseGLObjects(state);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatCoverageLegend osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatCoverageLegend
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatCoverageLegend	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatCoverageLegend	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatCoverageLegend.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatCoverageLegend.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatCoverageLegend.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatCoverageLegend.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -49,17 +49,17 @@
 void
 SplatCoverageLegend::fromConfig(const Config& conf)
 {
-    conf.getIfSet("name",   _name);
-    conf.getIfSet("source", _source);
+    conf.get("name",   _name);
+    conf.get("source", _source);
 
     ConfigSet predicatesConf = conf.child("mappings").children();
     for(ConfigSet::const_iterator i = predicatesConf.begin(); i != predicatesConf.end(); ++i)
     {
         osg::ref_ptr<CoverageValuePredicate> p = new CoverageValuePredicate();
 
-        i->getIfSet( "name",  p->_description );
-        i->getIfSet( "value", p->_exactValue );
-        i->getIfSet( "class", p->_mappedClassName );
+        i->get( "name",  p->_description );
+        i->get( "value", p->_exactValue );
+        i->get( "class", p->_mappedClassName );
         
         if ( p->_mappedClassName.isSet() )
         {
@@ -73,20 +73,21 @@
 {
     Config conf;
     
-    conf.addIfSet("name",   _name);
-    conf.addIfSet("source", _source);
+    conf.set("name",   _name);
+    conf.set("source", _source);
 
     Config preds;
     for(Predicates::const_iterator i = _predicates.begin(); i != _predicates.end(); ++i)
     {
         CoverageValuePredicate* p = i->get();
         Config pred;
-        pred.addIfSet( "name",  p->_description );
-        pred.addIfSet( "value", p->_exactValue );
-        pred.addIfSet( "class", p->_mappedClassName );
+        pred.set( "name",  p->_description );
+        pred.set( "value", p->_exactValue );
+        pred.set( "class", p->_mappedClassName );
+
         preds.add( "mapping", pred );
     }
-    conf.add( "mappings", preds );
+    conf.set( "mappings", preds );
 
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/Splat.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthSplat/Splat.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/Splat.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/Splat.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -12,7 +12,15 @@
 #pragma include Splat.types.glsl
 
 // statset defines
-#pragma import_defines(OE_SPLAT_HAVE_NOISE_SAMPLER, OE_SPLAT_EDIT_MODE, OE_SPLAT_GPU_NOISE, OE_TERRAIN_RENDER_NORMAL_MAP, OE_TERRAIN_BLEND_IMAGERY)
+#pragma import_defines(OE_SPLAT_NOISE_SAMPLER)
+#pragma import_defines(OE_SPLAT_EDIT_MODE)
+#pragma import_defines(OE_SPLAT_GPU_NOISE)
+#pragma import_defines(OE_TERRAIN_RENDER_NORMAL_MAP)
+#pragma import_defines(OE_TERRAIN_BLEND_IMAGERY)
+
+// Uncomment this to use textureGather() in the oe_splat_bilinear function,
+// but read the comments there first!
+//#define USE_TEXTURE_GATHER
 
 // from: Splat.util.glsl
 void oe_splat_getLodBlend(in float range, out float lod0, out float rangeOuter, out float rangeInner, out float clampedRange);
@@ -28,6 +36,8 @@
 in float oe_splat_range;                    // distance from camera to vertex
 flat in float oe_splat_coverageTexSize;     // size of coverage texture
 
+in float oe_layer_opacity;
+
 // from SplatLayerFactory:
 uniform sampler2D oe_splat_coverageTex;
 uniform sampler2DArray oe_splatTex;
@@ -182,12 +192,62 @@
 
     float size = oe_splat_coverageTexSize;
 
+#ifdef USE_TEXTURE_GATHER
+
+    // A wee bit faster, but causes a rendering anomaly -- lines of 
+    // incorrectly splatted textures appear at higher resolutions.
+    // Problem may be in the bilinear weight calculation but not sure
+
     vec4 value = textureGather(oe_splat_coverageTex, oe_splat_covtc, 0);
     float value_sw = value.w;
     float value_se = value.z;
     float value_ne = value.y;
     float value_nw = value.x;
 
+#else
+        //TODO: coverage warping is slow due to the noise function. Consider removing/reworking.
+    vec2 tc = oe_splat_covtc;
+
+    float pixelWidth = 1.0/size;
+    float halfPixelWidth = pixelWidth * 0.5;
+    float pixelWidth2 = pixelWidth * pixelWidth;
+
+     // Find the four quantized coverage coordinates that form a box around the actual
+    // coverage coordinates, where each quantized coord is at the center of a coverage texel.
+    vec2 rem = mod(tc, pixelWidth);
+    vec2 sw;
+    sw.x = tc.x - rem.x + (rem.x >= halfPixelWidth ? halfPixelWidth : -halfPixelWidth);
+    sw.y = tc.y - rem.y + (rem.y >= halfPixelWidth ? halfPixelWidth : -halfPixelWidth); 
+    vec2 ne = sw + pixelWidth;
+    vec2 nw = vec2(sw.x, ne.y);
+    vec2 se = vec2(ne.x, sw.y);
+
+    // Calculate the weighting for each corner.
+    vec2 dsw = tc-sw;
+    vec2 dse = tc-se;
+    vec2 dne = tc-ne;
+    vec2 dnw = tc-nw;
+
+    float sw_weight = max(pixelWidth2-dot(dsw,dsw),0.0);
+    float se_weight = max(pixelWidth2-dot(dse,dse),0.0);
+    float ne_weight = max(pixelWidth2-dot(dne,dne),0.0);
+    float nw_weight = max(pixelWidth2-dot(dnw,dnw),0.0);
+
+     // normalize the weights so they total 1.0
+    float invTotalWeight = 1.0/(sw_weight+se_weight+ne_weight+nw_weight);
+    sw_weight *= invTotalWeight;
+    se_weight *= invTotalWeight;
+    ne_weight *= invTotalWeight;
+    nw_weight *= invTotalWeight;
+
+     // Sample coverage values using quantized corner coords:
+    float value_sw = texture(oe_splat_coverageTex, clamp(sw, 0.0, 1.0)).r;
+    float value_se = texture(oe_splat_coverageTex, clamp(se, 0.0, 1.0)).r;
+    float value_ne = texture(oe_splat_coverageTex, clamp(ne, 0.0, 1.0)).r;
+    float value_nw = texture(oe_splat_coverageTex, clamp(nw, 0.0, 1.0)).r;
+#endif
+
+
     // Build the render info data for each corner:
     oe_SplatRenderInfo ri_sw; oe_splat_getRenderInfo(value_sw, env, ri_sw);
     oe_SplatRenderInfo ri_se; oe_splat_getRenderInfo(value_se, env, ri_se);
@@ -209,12 +269,12 @@
     vec4 ne_detail = detailToggle * oe_splat_getDetailTexel(ri_ne, splat_tc, env);
     vec4 nw_detail = detailToggle * oe_splat_getDetailTexel(ri_nw, splat_tc, env); 
 
-    vec4 nw_mix = mix(nw_primary, nw_detail, nw_detail.a);
-    vec4 ne_mix = mix(ne_primary, ne_detail, ne_detail.a);
-    vec4 sw_mix = mix(sw_primary, sw_detail, sw_detail.a);
-    vec4 se_mix = mix(se_primary, se_detail, se_detail.a);
+    vec4 nw_mix = vec4(mix(nw_primary.rgb, nw_detail.rgb, nw_detail.a), nw_primary.a);
+    vec4 ne_mix = vec4(mix(ne_primary.rgb, ne_detail.rgb, ne_detail.a), ne_primary.a);
+    vec4 sw_mix = vec4(mix(sw_primary.rgb, sw_detail.rgb, sw_detail.a), sw_primary.a);
+    vec4 se_mix = vec4(mix(se_primary.rgb, se_detail.rgb, se_detail.a), se_primary.a);
 
-    vec2 weight = fract( oe_splat_covtc*size - 0.5+(1.0/size) );
+    vec2 weight = fract( oe_splat_covtc*size - 0.5);
 
     vec4 temp0 = mix(nw_mix, ne_mix, weight.x);
     vec4 temp1 = mix(sw_mix, se_mix, weight.x);
@@ -243,11 +303,11 @@
 
 #else // !SPLAT_GPU_NOISE
 
-#ifdef OE_SPLAT_HAVE_NOISE_SAMPLER
-uniform sampler2D oe_splat_noiseTex;
+#ifdef OE_SPLAT_NOISE_SAMPLER
+uniform sampler2D OE_SPLAT_NOISE_SAMPLER;
 vec4 oe_splat_getNoise(in vec2 tc)
 {
-    return texture(oe_splat_noiseTex, tc.st);
+    return texture(OE_SPLAT_NOISE_SAMPLER, tc.st);
 }
 #else
 vec4 oe_splat_getNoise(in vec2 tc)
@@ -280,8 +340,9 @@
     vec2 tc = oe_terrain_scaleCoordsToRefLOD(oe_layer_tilec.st, lod0 + float(oe_splat_scaleOffsetInt));
 
     color = oe_splat_bilinear(tc, env);
+    //color = oe_splat_nearest(tc, env);
 
-    //color = mix(color, vec4(tc.s, tc.t, 0.0, 1.0), 0.5);
+    color.a *= oe_layer_opacity;
 }
 
 //............................................................................
@@ -323,26 +384,23 @@
     // Blend the two samples based on LOD factor:
     vec4 texel = mix(texel0, texel1, lodBlend);
 
-#if 0
-    color = mix(color, texel, texel.a);
-    color.a = oe_layer_order > 0 ? texel.a : 1.0;
-    
-#else
 
-#ifdef OE_TERRAIN_BLEND_IMAGERY
+    // incorporate the layer's opacity:
+    texel.a *= oe_layer_opacity;
 
+#ifdef OE_TERRAIN_BLEND_IMAGERY
+    // If this is a first image layer, blend with the incoming terrain color.
+    // Otherwise, apply directly and let GL blending do the rest.
     if (oe_layer_order == 0)
     {
         color.rgb = texel.rgb*texel.a + color.rgb*(1.0-texel.a);
-        color.a = max(color.a, texel.a);
     }
     else
-#endif
     {
-        color = mix(color, texel, texel.a);
-        color.a = texel.a;
+        color = texel;
     }
-#endif
-    // uncomment to visualize slope, noise, etc.
-    //color.rgba = vec4(env.noise.x,0,0,1);  
+#else
+    // No blending? The output is just the texel value.
+    color = texel;
+#endif // OE_TERRAIN_BLEND_IMAGERY
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatLayer osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatLayer
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -78,7 +78,7 @@
     class OSGEARTHSPLAT_EXPORT SplatLayer : public VisibleLayer
     {
     public:
-        META_Layer(osgEarthSplat, SplatLayer, SplatLayerOptions);
+        META_Layer(osgEarthSplat, SplatLayer, SplatLayerOptions, splat_imagery);
 
         //! Construct a splat layer with default configuration
         SplatLayer();
@@ -96,11 +96,6 @@
         Zones& zones() { return _zones; }
         const Zones& zones() const { return _zones; }
 
-    public: // Layer
-
-        //! Override
-        bool cull(const osgUtil::CullVisitor* cv, osg::State::StateSetStack& ssStack) const;
-
     protected:
 
         //! Override post-ctor init
@@ -113,6 +108,11 @@
         virtual void removedFromMap(const Map* map);
         virtual void setTerrainResources(TerrainResources* res);
 
+    public:
+
+        virtual void resizeGLObjectBuffers(unsigned maxSize);
+        virtual void releaseGLObjects(osg::State* state) const;
+
     protected:
         virtual ~SplatLayer() { }
 
@@ -132,6 +132,16 @@
         bool _gpuNoise;
 
         void buildStateSets();
+
+        void aaa();
+
+        struct ZoneSelector : public Layer::TraversalCallback
+        {
+            SplatLayer* _layer;
+            ZoneSelector(SplatLayer* layer) : _layer(layer) { }
+            void operator()(osg::Node*, osg::NodeVisitor*) const;
+        };
+        friend struct ZoneSelector;
     };
 
 } } // namespace osgEarth::Splat
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -27,6 +27,7 @@
 #include <osgEarthFeatures/FeatureSourceLayer>
 #include <osgUtil/CullVisitor>
 #include <osg/BlendFunc>
+#include <osg/Drawable>
 #include <cstdlib> // getenv
 
 #define LC "[SplatLayer] " << getName() << ": "
@@ -48,7 +49,6 @@
 SplatLayerOptions::getConfig() const
 {
     Config conf = VisibleLayerOptions::getConfig();
-    conf.key() = "splat_imagery";
     conf.set("land_cover_layer", _landCoverLayerName);
 
     Config zones("zones");
@@ -58,14 +58,14 @@
             zones.add(zone);
     }
     if (!zones.empty())
-        conf.update(zones);
+        conf.set(zones);
     return conf;
 }
 
 void
 SplatLayerOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet("land_cover_layer", _landCoverLayerName);
+    conf.get("land_cover_layer", _landCoverLayerName);
 
     const Config* zones = conf.child_ptr("zones");
     if (zones) {
@@ -78,6 +78,54 @@
 
 //........................................................................
 
+void
+SplatLayer::ZoneSelector::operator()(osg::Node* node, osg::NodeVisitor* nv) const
+{
+    if (nv->getVisitorType() == nv->CULL_VISITOR)
+    {
+        osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(nv);
+
+        // If we have zones, select the current one and apply its state set.
+        if (_layer->_zones.size() > 0)
+        {
+            int zoneIndex = 0;
+            osg::Vec3d vp = cv->getViewPoint();
+
+            for(int z=_layer->_zones.size()-1; z > 0 && zoneIndex == 0; --z)
+            {
+                if ( _layer->_zones[z]->contains(vp) )
+                {
+                    zoneIndex = z;
+                }
+            }
+
+            osg::StateSet* zoneStateSet = 0L;
+            Surface* surface = _layer->_zones[zoneIndex]->getSurface();
+            if (surface)
+            {
+                zoneStateSet = surface->getStateSet();
+            }
+
+            if (zoneStateSet == 0L)
+            {
+                OE_FATAL << LC << "ASSERTION FAILURE - zoneStateSet is null\n";
+            }
+            else
+            {            
+                cv->pushStateSet(zoneStateSet);
+                traverse(node, nv);
+                cv->popStateSet();
+            }
+        }
+    }
+    else
+    {
+        traverse(node, nv);
+    }
+}
+
+//........................................................................
+
 SplatLayer::SplatLayer() :
 VisibleLayer(&_optionsConcrete),
 _options(&_optionsConcrete)
@@ -103,7 +151,7 @@
     _editMode = (::getenv("OSGEARTH_SPLAT_EDIT") != 0L); // TODO deprecate
     _gpuNoise = (::getenv("OSGEARTH_SPLAT_GPU_NOISE") != 0L); // TODO deprecate
 
-    setRenderType(osgEarth::Layer::RENDERTYPE_TILE);
+    setRenderType(osgEarth::Layer::RENDERTYPE_TERRAIN_SURFACE);
 
     for (std::vector<ZoneOptions>::const_iterator i = options().zones().begin();
         i != options().zones().end();
@@ -112,6 +160,8 @@
         osg::ref_ptr<Zone> zone = new Zone(*i);
         _zones.push_back(zone.get());
     }
+
+    setCullCallback(new ZoneSelector(this));
 }
 
 void
@@ -163,6 +213,8 @@
 void
 SplatLayer::setTerrainResources(TerrainResources* res)
 {
+    VisibleLayer::setTerrainResources(res);
+
     if (res)
     {
         // TODO.
@@ -199,42 +251,6 @@
     }
 }
 
-bool
-SplatLayer::cull(const osgUtil::CullVisitor* cv,
-                 osg::State::StateSetStack& stateSetStack) const
-{
-    if (Layer::cull(cv, stateSetStack) == false)
-        return false;
-
-    // If we have zones, select the current one and apply its state set.
-    if (_zones.size() > 0)
-    {
-        int zoneIndex = 0;
-        osg::Vec3d vp = cv->getViewPoint();
-
-        for(int z=_zones.size()-1; z > 0 && zoneIndex == 0; --z)
-        {
-            if ( _zones[z]->contains(vp) )
-            {
-                zoneIndex = z;
-            }
-        }
-
-        osg::StateSet* zoneStateSet = 0L;
-        Surface* surface = _zones[zoneIndex]->getSurface();
-        if (surface)
-        {
-            zoneStateSet = surface->getStateSet();
-        }
-
-        if (zoneStateSet)
-        {
-            stateSetStack.push_back(zoneStateSet);
-        }
-    }
-    return true;
-}
-
 void
 SplatLayer::buildStateSets()
 {
@@ -313,18 +329,14 @@
         osg::ref_ptr<osg::Texture> noiseTexture = noise.create(256u, 1u);
         stateset->setTextureAttribute(_noiseBinding.unit(), noiseTexture.get());
         stateset->addUniform(new osg::Uniform(NOISE_SAMPLER, _noiseBinding.unit()));
-        stateset->setDefine("OE_SPLAT_HAVE_NOISE_SAMPLER");
+        stateset->setDefine("OE_SPLAT_NOISE_SAMPLER", NOISE_SAMPLER);
     }
 
     osg::Uniform* lcTexUniform = new osg::Uniform(COVERAGE_SAMPLER, landCoverLayer->shareImageUnit().get());
     stateset->addUniform(lcTexUniform);
 
     stateset->addUniform(new osg::Uniform("oe_splat_scaleOffsetInt", 0));
-    stateset->addUniform(new osg::Uniform("oe_splat_warp", 0.0f));
-    stateset->addUniform(new osg::Uniform("oe_splat_blur", 1.0f));
-    stateset->addUniform(new osg::Uniform("oe_splat_useBilinear", 1.0f));
     stateset->addUniform(new osg::Uniform("oe_splat_noiseScale", 12.0f));
-
     stateset->addUniform(new osg::Uniform("oe_splat_detailRange", 100000.0f));
 
     if (_editMode)
@@ -343,6 +355,7 @@
 
     SplattingShaders splatting;
     VirtualProgram* vp = VirtualProgram::getOrCreate(stateset);
+    vp->setName("SplatLayer");
     splatting.load(vp, splatting.VertModel);
     splatting.load(vp, splatting.VertView);
     splatting.load(vp, splatting.Frag);
@@ -350,3 +363,31 @@
 
     OE_DEBUG << LC << "Statesets built!! Ready!\n";
 }
+
+
+void
+SplatLayer::resizeGLObjectBuffers(unsigned maxSize)
+{
+    for (Zones::const_iterator z = _zones.begin(); z != _zones.end(); ++z)
+    {
+        z->get()->resizeGLObjectBuffers(maxSize);
+    }
+
+    VisibleLayer::resizeGLObjectBuffers(maxSize);
+}
+
+void
+SplatLayer::releaseGLObjects(osg::State* state) const
+{
+    for (Zones::const_iterator z = _zones.begin(); z != _zones.end(); ++z)
+    {
+        z->get()->releaseGLObjects(state);
+    }
+
+    VisibleLayer::releaseGLObjects(state);
+
+    // For some unknown reason, release doesn't work on the zone 
+    // texture def data (SplatTextureDef). So we have to recreate
+    // it here.
+    const_cast<SplatLayer*>(this)->buildStateSets();
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatOptions osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatOptions
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -62,7 +62,7 @@
                     zones.add(zone);
             }
             if ( !zones.empty() )
-                conf.update(zones);
+                conf.set(zones);
             return conf;
         }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatShaders osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatShaders
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/SplatShaders	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/SplatShaders	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/Splat.util.glsl osgearth-2.10.2+dfsg/src/osgEarthSplat/Splat.util.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/Splat.util.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/Splat.util.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -7,7 +7,7 @@
 // and rendering artifacts when the camera is very close to the ground.
 #define LOD_COUNT 26
 
-const float oe_SplatRanges[LOD_COUNT] = float[](
+const float oe_SplatRanges[26] = float[](
        100000000.0, // 0
         75000000.0, // 1
         50000000.0, // 2
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/Surface osgearth-2.10.2+dfsg/src/osgEarthSplat/Surface
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/Surface	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/Surface	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -55,17 +55,17 @@
 
     public:
         void fromConfig(const Config& conf) {
-            conf.getIfSet("catalog", _catalogURI);
+            conf.get("catalog", _catalogURI);
         }
         
         Config getConfig() const {
             Config conf = ConfigOptions::getConfig();
-            conf.key() = "surface";
+            //conf.key() = "surface";
             conf.set("catalog", _catalogURI);
             return conf;
         }
 
-        void mergeConfig( const Config& conf ) {
+        virtual void mergeConfig( const Config& conf ) {
             ConfigOptions::mergeConfig( conf );
             fromConfig( conf );
         }
@@ -97,6 +97,10 @@
         osg::StateSet* getOrCreateStateSet();
         osg::StateSet* getStateSet() const { return _stateSet.get(); }
 
+        void resizeGLObjectBuffers(unsigned maxSize);
+
+        void releaseGLObjects(osg::State* state) const;
+
     protected:
         virtual ~Surface() { }
 
@@ -115,4 +119,6 @@
 
 } } // namespace osgEarth::Splat
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Splat::SurfaceOptions);
+
 #endif // OSGEARTH_PROCEDURAL_SURFACE
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/Surface.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/Surface.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/Surface.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/Surface.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -198,3 +198,21 @@
 
     return buf;
 }
+
+void
+Surface::resizeGLObjectBuffers(unsigned maxSize)
+{
+    if (getStateSet())
+        getStateSet()->resizeGLObjectBuffers(maxSize);
+
+    _textureDef.resizeGLObjectBuffers(maxSize);
+}
+
+void
+Surface::releaseGLObjects(osg::State* state) const
+{
+    if (getStateSet())
+        getStateSet()->releaseGLObjects(state);
+
+    _textureDef.releaseGLObjects(state);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/Zone osgearth-2.10.2+dfsg/src/osgEarthSplat/Zone
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/Zone	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/Zone	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -114,15 +114,14 @@
         void setGroundCover(GroundCover* groundCover) { _groundCover = groundCover; }
         GroundCover* getGroundCover() const { return _groundCover.get(); }
 
-        //osg::StateSet* getStateSet() { return _stateSet.get(); }
-
-        //osg::StateSet* getOrCreateStateSet();
-
         bool contains(const osg::Vec3& points) const;
 
         void setUID(UID uid) { _uid = uid; }
         UID getUID() const { return _uid; }
 
+        void resizeGLObjectBuffers(unsigned maxSize);
+        void releaseGLObjects(osg::State* state) const;
+
     protected:
         virtual ~Zone() { }
         std::string                 _name;
@@ -130,7 +129,6 @@
         Boundaries                  _boundaries;
         osg::ref_ptr<Surface>       _surface;
         osg::ref_ptr<GroundCover>   _groundCover;
-        osg::ref_ptr<osg::StateSet> _stateSet;
         const ZoneOptions           _options;
 
     public:
@@ -160,4 +158,6 @@
 
 } } // namespace osgEarth::Splat
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Splat::ZoneOptions);
+
 #endif // OSGEARTH_PROCEDURAL_ZONE
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSplat/Zone.cpp osgearth-2.10.2+dfsg/src/osgEarthSplat/Zone.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSplat/Zone.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSplat/Zone.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -52,10 +52,10 @@
         
         GeoExtent extent(
             SpatialReference::get("wgs84"),
-            osg::clampBetween(box.xMin(), -180.0f, 180.0f),
-            osg::clampBetween(box.yMin(),  -90.0f,  90.0f),
-            osg::clampBetween(box.xMax(), -180.0f, 180.0f),
-            osg::clampBetween(box.yMax(),  -90.0f,  90.0f));
+            osg::clampBetween(static_cast<float>(box.xMin()), -180.0f, 180.0f),
+            osg::clampBetween(static_cast<float>(box.yMin()),  -90.0f,  90.0f),
+            osg::clampBetween(static_cast<float>(box.xMax()), -180.0f, 180.0f),
+            osg::clampBetween(static_cast<float>(box.yMax()),  -90.0f,  90.0f));
 
         extent.createPolytope( b.tope );
         b.zmin2 = box.zMin() > -FLT_MAX ? box.zMin()*box.zMin() : box.zMin();
@@ -125,20 +125,32 @@
     return false;
 }
 
-//osg::StateSet*
-//Zone::getOrCreateStateSet() 
-//{
-//    if ( !_stateSet.valid() )
-//        _stateSet = new osg::StateSet();
-//    return _stateSet.get();
-//}
+void
+Zone::resizeGLObjectBuffers(unsigned maxSize)
+{
+    if (_groundCover.valid())
+        _groundCover->resizeGLObjectBuffers(maxSize);
+
+    if (_surface.valid())
+        _surface->resizeGLObjectBuffers(maxSize);
+}
+
+void
+Zone::releaseGLObjects(osg::State* state) const
+{
+    if (_groundCover.valid())
+        _groundCover->releaseGLObjects(state);
+
+    if (_surface.valid())
+        _surface->releaseGLObjects(state);
+}
 
 //........................................................................
 
 void
 ZoneOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet("name", _name);
+    conf.get("name", _name);
     const Config* boundaries = conf.child_ptr("boundaries");
     if ( boundaries ) {
         for(ConfigSet::const_iterator i = boundaries->children().begin(); i != boundaries->children().end(); ++i) {
@@ -147,15 +159,15 @@
                 i->value("xmax",  FLT_MAX), i->value("ymax",  FLT_MAX), i->value("zmax",  FLT_MAX)));
         }
     }
-    conf.getObjIfSet( "surface",    _surface );
-    conf.getObjIfSet( "groundcover", _groundCover);
+    conf.get( "surface",     _surface );
+    conf.get( "groundcover", _groundCover);
 }
 
 Config
 ZoneOptions::getConfig() const
 {
     Config conf("zone");
-    conf.addIfSet("name", _name);
+    conf.set("name", _name);
     if ( _boundaries.size() > 0 ) {
         Config regions("boundaries");
         for(int i=0; i<_boundaries.size(); ++i) {
@@ -168,10 +180,10 @@
             if ( _boundaries[i].zMax() <  FLT_MAX ) region.set("zmax", _boundaries[i].zMax());
             regions.add(region);
         }
-        conf.add(regions);
+        conf.set(regions);
     }
-    conf.setObj( "surface",    _surface );
-    conf.setObj( "groundcover", _groundCover );
+    conf.set( "surface",     _surface );
+    conf.set( "groundcover", _groundCover );
     return conf;
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/AGG.h osgearth-2.10.2+dfsg/src/osgEarthSymbology/AGG.h
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/AGG.h	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/AGG.h	2019-07-11 18:30:19.000000000 +0000
@@ -7,7 +7,7 @@
 // This software is provided "as is" without express or implied
 // warranty, and with no claim as to its suitability for any purpose.
 //
-// The author gratefully acknowleges the support of David Turner, 
+// The author gratefully acknowledges the support of David Turner, 
 // Robert Wilhelm, and Werner Lemberg - the authors of the FreeType 
 // libray - in producing this work. See http://www.freetype.org for details.
 //
@@ -122,7 +122,7 @@
     //    start from the end of the buffer and decrease. It gives you an 
     //    additional degree of freedom.
     //    Method attach() can be called more than once. The execution time of it
-    //    is very little, still it allocates memory of heigh * sizeof(char*) bytes
+    //    is very little, still it allocates memory of height * sizeof(char*) bytes
     //    and has a loop while(height--) {...}, so it's unreasonable to call it
     //    every time before drawing any single pixel :-)
     //
@@ -245,7 +245,7 @@
     //
     //     int num_pix = span.num_pix();        // Number of pixels of the span.
     //                                          // Always greater than 0, still we
-    //                                          // shoud use "int" instead of 
+    //                                          // should use "int" instead of 
     //                                          // "unsigned" because it's more
     //                                          // convenient for clipping
     //
@@ -271,7 +271,7 @@
     // That's because using the scaline is in general faster. When is consists 
     // of more than one span the conditions for the processor cash system
     // are better, because switching between two different areas of memory 
-    // (that can be large ones) occures less frequently.
+    // (that can be large ones) occurs less frequently.
     //------------------------------------------------------------------------
     class scanline
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/AltitudeSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/AltitudeSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/AltitudeSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/AltitudeSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/AltitudeSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/AltitudeSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/AltitudeSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/AltitudeSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -54,44 +54,44 @@
     Config conf = Symbol::getConfig();
 
     conf.key() = "altitude";
-    conf.addIfSet   ( "clamping",  "none",       _clamping, CLAMP_NONE );
-    conf.addIfSet   ( "clamping",  "terrain",    _clamping, CLAMP_TO_TERRAIN );
-    conf.addIfSet   ( "clamping",  "absolute",   _clamping, CLAMP_ABSOLUTE );
-    conf.addIfSet   ( "clamping",  "relative",   _clamping, CLAMP_RELATIVE_TO_TERRAIN );
-
-    conf.addIfSet   ( "technique", "map",   _technique, TECHNIQUE_MAP );
-    conf.addIfSet   ( "technique", "scene", _technique, TECHNIQUE_SCENE );
-    conf.addIfSet   ( "technique", "gpu",   _technique, TECHNIQUE_GPU );
-    conf.addIfSet   ( "technique", "drape", _technique, TECHNIQUE_DRAPE );
-
-    conf.addIfSet   ( "binding", "vertex",   _binding, BINDING_VERTEX );
-    conf.addIfSet   ( "binding", "centroid", _binding, BINDING_CENTROID );
-
-    conf.addIfSet   ( "clamping_resolution",     _resolution );
-    conf.addObjIfSet( "vertical_offset",         _verticalOffset );
-    conf.addObjIfSet( "vertical_scale",          _verticalScale );
+    conf.set( "clamping", "none",     _clamping, CLAMP_NONE );
+    conf.set( "clamping", "terrain",  _clamping, CLAMP_TO_TERRAIN );
+    conf.set( "clamping", "absolute", _clamping, CLAMP_ABSOLUTE );
+    conf.set( "clamping", "relative", _clamping, CLAMP_RELATIVE_TO_TERRAIN );
+
+    conf.set( "technique", "map",   _technique, TECHNIQUE_MAP );
+    conf.set( "technique", "scene", _technique, TECHNIQUE_SCENE );
+    conf.set( "technique", "gpu",   _technique, TECHNIQUE_GPU );
+    conf.set( "technique", "drape", _technique, TECHNIQUE_DRAPE );
+
+    conf.set( "binding", "vertex",   _binding, BINDING_VERTEX );
+    conf.set( "binding", "centroid", _binding, BINDING_CENTROID );
+
+    conf.set( "clamping_resolution", _resolution );
+    conf.set( "vertical_offset",     _verticalOffset );
+    conf.set( "vertical_scale",      _verticalScale );
     return conf;
 }
 
 void 
 AltitudeSymbol::mergeConfig( const Config& conf )
 {
-    conf.getIfSet   ( "clamping",  "none",     _clamping, CLAMP_NONE );
-    conf.getIfSet   ( "clamping",  "terrain",  _clamping, CLAMP_TO_TERRAIN );
-    conf.getIfSet   ( "clamping",  "absolute", _clamping, CLAMP_ABSOLUTE );
-    conf.getIfSet   ( "clamping",  "relative", _clamping, CLAMP_RELATIVE_TO_TERRAIN );
-
-    conf.getIfSet   ( "technique", "map",   _technique, TECHNIQUE_MAP );
-    conf.getIfSet   ( "technique", "scene", _technique, TECHNIQUE_SCENE );
-    conf.getIfSet   ( "technique", "gpu",   _technique, TECHNIQUE_GPU );
-    conf.getIfSet   ( "technique", "drape", _technique, TECHNIQUE_DRAPE );
-
-    conf.getIfSet   ( "binding", "vertex",   _binding, BINDING_VERTEX );
-    conf.getIfSet   ( "binding", "centroid", _binding, BINDING_CENTROID );
-
-    conf.getIfSet   ( "clamping_resolution",   _resolution );
-    conf.getObjIfSet( "vertical_offset",       _verticalOffset );
-    conf.getObjIfSet( "vertical_scale",        _verticalScale );
+    conf.get( "clamping",  "none",     _clamping, CLAMP_NONE );
+    conf.get( "clamping",  "terrain",  _clamping, CLAMP_TO_TERRAIN );
+    conf.get( "clamping",  "absolute", _clamping, CLAMP_ABSOLUTE );
+    conf.get( "clamping",  "relative", _clamping, CLAMP_RELATIVE_TO_TERRAIN );
+
+    conf.get( "technique", "map",   _technique, TECHNIQUE_MAP );
+    conf.get( "technique", "scene", _technique, TECHNIQUE_SCENE );
+    conf.get( "technique", "gpu",   _technique, TECHNIQUE_GPU );
+    conf.get( "technique", "drape", _technique, TECHNIQUE_DRAPE );
+
+    conf.get( "binding", "vertex",   _binding, BINDING_VERTEX );
+    conf.get( "binding", "centroid", _binding, BINDING_CENTROID );
+
+    conf.get( "clamping_resolution", _resolution );
+    conf.get( "vertical_offset",     _verticalOffset );
+    conf.get( "vertical_scale",      _verticalScale );
 }
 
 void
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/BBoxSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/BBoxSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/BBoxSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/BBoxSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/BBoxSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/BBoxSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/BBoxSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/BBoxSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -48,13 +48,13 @@
 BBoxSymbol::getConfig() const
 {
     Config conf = Symbol::getConfig();
-    conf.key() = "text-bbox";
-    conf.addObjIfSet( "fill", _fill );
-    conf.addObjIfSet( "border", _border );
-    conf.addIfSet( "margin", _margin );
+    conf.key() = "bbox";
+    conf.set( "fill", _fill );
+    conf.set( "border", _border );
+    conf.set( "margin", _margin );
 
-    conf.addIfSet( "geom", "box", _bboxGeom, GEOM_BOX );
-    conf.addIfSet( "geom", "box_oriented", _bboxGeom, GEOM_BOX_ORIENTED );
+    conf.set( "geom", "box", _bboxGeom, GEOM_BOX );
+    conf.set( "geom", "box_oriented", _bboxGeom, GEOM_BOX_ORIENTED );
 
     return conf;
 }
@@ -62,12 +62,12 @@
 void
 BBoxSymbol::mergeConfig( const Config& conf )
 {
-    conf.getObjIfSet( "fill", _fill );
-    conf.getObjIfSet( "border", _border );
-    conf.getIfSet( "margin", _margin );
+    conf.get( "fill", _fill );
+    conf.get( "border", _border );
+    conf.get( "margin", _margin );
 
-    conf.getIfSet( "geom", "box", _bboxGeom, GEOM_BOX );
-    conf.getIfSet( "geom", "box_oriented", _bboxGeom, GEOM_BOX_ORIENTED );
+    conf.get( "geom", "box", _bboxGeom, GEOM_BOX );
+    conf.get( "geom", "box_oriented", _bboxGeom, GEOM_BOX_ORIENTED );
 }
 
 void
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/BillboardResource osgearth-2.10.2+dfsg/src/osgEarthSymbology/BillboardResource
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/BillboardResource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/BillboardResource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/BillboardResource.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/BillboardResource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/BillboardResource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/BillboardResource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -33,8 +33,8 @@
 void
 BillboardResource::mergeConfig(const Config& conf)
 {
-    conf.getIfSet( "width", _width );
-    conf.getIfSet( "height", _height );
+    conf.get( "width", _width );
+    conf.get( "height", _height );
 }
 
 Config
@@ -42,8 +42,8 @@
 {
     Config conf = InstanceResource::getConfig();
     conf.key() = "billboard";
-    conf.addIfSet( "width", _width );
-    conf.addIfSet( "height", _height );
+    conf.set( "width", _width );
+    conf.set( "height", _height );
     //nop
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/BillboardSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/BillboardSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/BillboardSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/BillboardSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -46,6 +46,10 @@
 
     public: // properties
 
+        //! URL or the top image
+        optional<StringExpression>& topURL() { return _topURL; }
+        const optional<StringExpression>& topURL() const { return _topURL; }
+
         /** Width of the billboard image in meters */
         optional<float>& width() { return _width; }
         const optional<float>& width() const { return _width; }
@@ -58,8 +62,11 @@
     public: // non-serialized properties (for programmatic use only)
 
         /** Explicit model to use for model placement */
-        void setImage(osg::Image* image) { _image = image; }
-        const osg::Image* getImage() const { return _image.get(); }
+        void setSideImage(osg::Image* value) { _sideImage = value; }
+        osg::Image* getSideImage() const { return _sideImage.get(); }
+
+        void setTopImage(osg::Image* value) { _topImage = value; }
+        osg::Image* getTopImage() const { return _topImage.get(); }
 
     public:
         virtual Config getConfig() const;
@@ -72,9 +79,11 @@
         virtual InstanceResource* createResource() const;
 
     protected:
+        optional<StringExpression> _topURL;
         optional<float> _width;
         optional<float> _height;
-        osg::ref_ptr<osg::Image> _image;
+        osg::ref_ptr<osg::Image> _sideImage;
+        osg::ref_ptr<osg::Image> _topImage;
     };
 
 } } // namespace osgEarth::Symbology
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/BillboardSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/BillboardSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/BillboardSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/BillboardSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,6 +19,7 @@
 #include <osgEarthSymbology/BillboardSymbol>
 #include <osgEarthSymbology/BillboardResource>
 #include <osgEarthSymbology/Style>
+#include <osgEarth/URI>
 
 using namespace osgEarth;
 using namespace osgEarth::Symbology;
@@ -27,8 +28,8 @@
 
 
 BillboardSymbol::BillboardSymbol(const BillboardSymbol& rhs,const osg::CopyOp& copyop):
-InstanceSymbol(rhs, copyop),
-_image        (rhs._image.get())
+InstanceSymbol(rhs, copyop)//,
+//_image        (rhs._image.get())
 {
     //nop
 }
@@ -44,18 +45,20 @@
 {
     Config conf = InstanceSymbol::getConfig();
     conf.key() = "billboard";
-    conf.addIfSet( "width", _width );
-    conf.addIfSet( "height", _height );
-    conf.addNonSerializable( "BillboardSymbol::image", _image.get() );
+    conf.set( "width", _width );
+    conf.set( "height", _height );
+    conf.set( "top_url", _topURL );
+    //conf.setNonSerializable( "BillboardSymbol::image", _image.get() );
     return conf;
 }
 
 void 
 BillboardSymbol::mergeConfig( const Config& conf )
 {
-    conf.getIfSet( "width", _width );
-    conf.getIfSet( "height", _height );
-    _image = conf.getNonSerializable<osg::Image>( "BillboardSymbol::image" );
+    conf.get( "width", _width );
+    conf.get( "height", _height );
+    conf.get( "top_url", _topURL );
+    //_image = conf.getNonSerializable<osg::Image>( "BillboardSymbol::image" );
 }
 
 InstanceResource*
@@ -71,6 +74,10 @@
         style.getOrCreate<BillboardSymbol>()->url() = c.value();
         style.getOrCreate<BillboardSymbol>()->url()->setURIContext( c.referrer() );
     }
+    else if (match(c.key(), "billboard-top-image")) {
+        style.getOrCreate<BillboardSymbol>()->topURL() = c.value();
+        style.getOrCreate<BillboardSymbol>()->topURL()->setURIContext(c.referrer());
+    }
     else if ( match(c.key(), "billboard-width") ) {
         style.getOrCreate<BillboardSymbol>()->width() = as<float>(c.value(), 10.0f);
     }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthSymbology/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -34,8 +34,6 @@
     InstanceResource
     InstanceSymbol
     LineSymbol
-    MarkerResource
-    MarkerSymbol
     MeshConsolidator
     MeshFlattener
     MeshSubdivider
@@ -49,7 +47,6 @@
     ResourceCache
     ResourceLibrary
     Skins
-    StencilVolumeNode
     Stroke
     Style
     StyleSelector
@@ -81,8 +78,6 @@
     InstanceResource.cpp
     InstanceSymbol.cpp
     LineSymbol.cpp
-    MarkerResource.cpp
-    MarkerSymbol.cpp
     MeshConsolidator.cpp
     MeshFlattener.cpp
     MeshSubdivider.cpp
@@ -96,7 +91,6 @@
     ResourceCache.cpp
     ResourceLibrary.cpp
     Skins.cpp
-    StencilVolumeNode.cpp
     Stroke.cpp
     Style.cpp
     StyleSelector.cpp
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Color osgearth-2.10.2+dfsg/src/osgEarthSymbology/Color
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Color	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Color	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* --*-c++-*-- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -75,6 +75,12 @@
         /** Lighten/darken the color by factor */
         Color brightness( float factor ) const;
 
+        //! gets the color as HSL (and alpha)
+        osg::Vec4f asHSL() const;
+
+        //! populates the RGB from HSL
+        void fromHSL(const osg::Vec4f& hsla);
+
         // built in colors
         // http://en.wikipedia.org/wiki/Web_colors#HTML_color_names
 
@@ -113,24 +119,16 @@
     using namespace osgEarth::Symbology;
 
     // Config specializations for Color:
-
-    template <> inline
-    void Config::addIfSet<Color>( const std::string& key, const optional<Color>& opt ) {
-        if ( opt.isSet() ) {
-            add( key, opt->toHTML() );
-        }
-    }
-
     template<> inline
-    void Config::updateIfSet<Color>( const std::string& key, const optional<Color>& opt ) {
+    void Config::set<Color>( const std::string& key, const optional<Color>& opt ) {
         if ( opt.isSet() ) {
             remove( key );
-            add( key, opt->toHTML() );
+            set( key, opt->toHTML() );
         }
     }
 
     template<> inline
-    bool Config::getIfSet<Color>( const std::string& key, optional<Color>& output ) const {
+    bool Config::get<Color>( const std::string& key, optional<Color>& output ) const {
         if ( hasValue( key ) ) {
             output = Color( value(key) );
             return true;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Color.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/Color.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Color.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Color.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -29,8 +29,8 @@
 {
     void rgb2hsv( osg::Vec4f& c )
     {
-        float minval = std::min( c.r(), std::min( c.g(), c.b() ) );
-        float maxval = std::max( c.r(), std::max( c.g(), c.b() ) );
+        float minval = osg::minimum( c.r(), osg::minimum( c.g(), c.b() ) );
+        float maxval = osg::maximum( c.r(), osg::maximum( c.g(), c.b() ) );
         float delta = maxval - minval;
         float h = 0.0f, s = 0.0, v = maxval;
         if ( delta != 0.0f )
@@ -203,3 +203,18 @@
             (((unsigned)(r()*255.0)));
     }
 }
+
+osg::Vec4f
+Color::asHSL() const
+{
+    osg::Vec4f out = *this;
+    rgb2hsv(out);
+    return out;
+}
+
+void
+Color::fromHSL(const osg::Vec4f& hsla)
+{
+    *this = hsla;
+    hsv2rgb(*this);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Common osgearth-2.10.2+dfsg/src/osgEarthSymbology/Common
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Common	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,11 +22,6 @@
 
 #include <osgEarth/Common>
 
-// define USE_DEPRECATED_API is used to include in API which is being phased out
-// if you can compile your apps with this turned off you are
-// well placed for compatibility with future versions.
-#define USE_DEPRECATED_API
-
 #if defined(_MSC_VER)
     #pragma warning( disable : 4244 )
     #pragma warning( disable : 4251 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/CoverageSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/CoverageSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/CoverageSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/CoverageSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/CoverageSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/CoverageSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/CoverageSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/CoverageSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -42,14 +42,14 @@
 {
     Config conf = Symbol::getConfig();
     conf.key() = "coverage";
-    conf.addObjIfSet( "value", _valueExpr );
+    conf.set( "value", _valueExpr );
     return conf;
 }
 
 void 
 CoverageSymbol::mergeConfig( const Config& conf )
 {
-    conf.getObjIfSet( "value", _valueExpr );
+    conf.get( "value", _valueExpr );
 }
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/CssUtils osgearth-2.10.2+dfsg/src/osgEarthSymbology/CssUtils
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/CssUtils	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/CssUtils	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/CssUtils.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/CssUtils.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/CssUtils.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/CssUtils.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Expression osgearth-2.10.2+dfsg/src/osgEarthSymbology/Expression
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Expression	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Expression	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -172,4 +172,7 @@
 
 } } // namespace osgEarth::Symbology
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Symbology::NumericExpression);
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Symbology::StringExpression);
+
 #endif // OSGEARTHSYMBOLOGY_EXPRESSION_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Expression.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/Expression.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Expression.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Expression.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -339,7 +339,7 @@
                 {
                     double op2 = s.top(); s.pop();
                     double op1 = s.top(); s.pop();
-                    s.push( std::min(op1, op2) );
+                    s.push( osg::minimum(op1, op2) );
                 }
             }
             else if ( a.first == MAX )
@@ -348,7 +348,7 @@
                 {
                     double op2 = s.top(); s.pop();
                     double op1 = s.top(); s.pop();
-                    s.push( std::max(op1, op2) );
+                    s.push( osg::maximum(op1, op2) );
                 }
             }
             else // OPERAND or VARIABLE
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/ExtrusionSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/ExtrusionSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/ExtrusionSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/ExtrusionSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -34,21 +34,6 @@
     class OSGEARTHSYMBOLOGY_EXPORT ExtrusionSymbol : public Symbol
     {
     public:
-        // @deprecated
-        enum HeightReference
-        {
-            /** Means that the "height" value as provided in this symbol is expressed
-                relative to the Z of the input geometry. This is the usual way to extrude
-                geometry- extrude up from the geometry's base Z height. (default.) */
-            HEIGHT_REFERENCE_Z,
-
-            /** Means the "height" value is expressed in absolute terms, i.e., relative to 
-                MSL (mean sea level, which is usually the map's ellipsoid). If your height
-                value is an absolute elevation, use this to "extrude down" to the terrain. */
-            HEIGHT_REFERENCE_MSL
-        };
-
-    public:
         META_Object(osgEarthSymbology, ExtrusionSymbol);
 
         ExtrusionSymbol(const ExtrusionSymbol& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
@@ -66,11 +51,6 @@
         optional<NumericExpression>& heightExpression() { return _heightExpr; }
         const optional<NumericExpression>& heightExpression() const { return _heightExpr; }
 
-        /** Reference frame in which height is expressed */
-        // @deprecated
-        optional<HeightReference>& heightReference() { return _heightRef; }
-        const optional<HeightReference>& heightReference() const { return _heightRef; }
-
         /** Whether the top cap of the extruded geometry should be flat (default=true) */
         optional<bool>& flatten() { return _flatten; }
         const optional<bool>& flatten() const { return _flatten; }
@@ -97,7 +77,6 @@
         optional<float>             _height;
         optional<bool>              _flatten;
         optional<NumericExpression> _heightExpr;
-        optional<HeightReference>   _heightRef;
         optional<std::string>       _wallStyleName;
         optional<std::string>       _roofStyleName;
         optional<float>             _wallGradientPercentage;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/ExtrusionSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/ExtrusionSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/ExtrusionSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/ExtrusionSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -30,7 +30,6 @@
     _height = rhs._height;
     _flatten = rhs._flatten;
     _heightExpr = rhs._heightExpr;
-    _heightRef = rhs._heightRef;
     _wallStyleName = rhs._wallStyleName;
     _roofStyleName = rhs._roofStyleName;
     _wallGradientPercentage = rhs._wallGradientPercentage;
@@ -40,7 +39,6 @@
 Symbol    ( conf ),
 _height   ( 10.0 ),
 _flatten  ( true ),
-_heightRef( HEIGHT_REFERENCE_Z ),
 _wallGradientPercentage( 0.0f )
 {
     if ( !conf.empty() )
@@ -52,28 +50,24 @@
 {
     Config conf = Symbol::getConfig();
     conf.key() = "extrusion";
-    conf.addIfSet   ( "height",            _height );
-    conf.addIfSet   ( "flatten",           _flatten );
-    conf.addObjIfSet( "height_expression", _heightExpr );
-    conf.addIfSet   ( "height_reference", "z",   _heightRef, HEIGHT_REFERENCE_Z );
-    conf.addIfSet   ( "height_reference", "msl", _heightRef, HEIGHT_REFERENCE_MSL );
-    conf.addIfSet   ( "wall_style", _wallStyleName );
-    conf.addIfSet   ( "roof_style", _roofStyleName );
-    conf.addIfSet   ( "wall_gradient", _wallGradientPercentage );
+    conf.set( "height", _height );
+    conf.set( "flatten", _flatten );
+    conf.set( "height_expression", _heightExpr );
+    conf.set( "wall_style", _wallStyleName );
+    conf.set( "roof_style", _roofStyleName );
+    conf.set( "wall_gradient", _wallGradientPercentage );
     return conf;
 }
 
 void 
 ExtrusionSymbol::mergeConfig( const Config& conf )
 {
-    conf.getIfSet   ( "height",  _height );
-    conf.getIfSet   ( "flatten", _flatten );
-    conf.getObjIfSet( "height_expression", _heightExpr );
-    conf.getIfSet   ( "height_reference", "z",   _heightRef, HEIGHT_REFERENCE_Z );
-    conf.getIfSet   ( "height_reference", "msl", _heightRef, HEIGHT_REFERENCE_MSL );
-    conf.getIfSet   ( "wall_style", _wallStyleName );
-    conf.getIfSet   ( "roof_style", _roofStyleName );
-    conf.getIfSet   ( "wall_gradient", _wallGradientPercentage );
+    conf.get( "height",  _height );
+    conf.get( "flatten", _flatten );
+    conf.get( "height_expression", _heightExpr );
+    conf.get( "wall_style", _wallStyleName );
+    conf.get( "roof_style", _roofStyleName );
+    conf.get( "wall_gradient", _wallGradientPercentage );
 }
 
 void
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Fill osgearth-2.10.2+dfsg/src/osgEarthSymbology/Fill
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Fill	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Fill	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -55,4 +55,6 @@
 
 } } // namespace osgEarth::Symbology
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Symbology::Fill);
+
 #endif // OSGEARTHSYMBOLOGY_FILL_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Fill.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/Fill.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Fill.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Fill.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Geometry osgearth-2.10.2+dfsg/src/osgEarthSymbology/Geometry
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Geometry	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Geometry	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -214,7 +214,7 @@
         virtual void close();
 
         /**
-         * Removes consecutive duplicates in the geometry to prepare for tesselation.
+         * Removes consecutive duplicates in the geometry to prepare for tessellation.
          */
         virtual void removeDuplicates();
 
@@ -308,7 +308,7 @@
         // override
         virtual Geometry* cloneAs( const Geometry::Type& newType ) const;
 
-        // tests whether the point falls withing the ring
+        // tests whether the point falls within the ring
         virtual bool contains2D( double x, double y ) const;
 
         // gets the signed area of a part that is known to be open.
@@ -357,7 +357,7 @@
         
         virtual unsigned getNumGeometries() const { return 1 + _holes.size(); }
 
-        // tests whether the point falls withing the polygon (but not its holes)
+        // tests whether the point falls within the polygon (but not its holes)
         virtual bool contains2D( double x, double y ) const;
 
         virtual void open();
@@ -421,7 +421,7 @@
     /**
      * Iterates over a Geometry object, returning each component Geometry
      * in turn. The iterator automatically traverses MultiGeometry objects,
-     * returning their components. The interator NEVER returns an actual
+     * returning their components. The iterator NEVER returns an actual
      * MultiGeometry object.
      */
     class OSGEARTHSYMBOLOGY_EXPORT GeometryIterator
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Geometry.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/Geometry.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Geometry.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Geometry.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@
 using namespace geos::operation;
 #endif
 
-#define GEOS_OUT OE_INFO
+#define GEOS_OUT OE_DEBUG
 
 #define LC "[Geometry] "
 
@@ -587,7 +587,7 @@
 {
     // adjust for a non-open ring:
     int n = size();
-    while( n > 0 && front() == back() )
+    if ( n > 0 && front() == back() )
         n--;
 
     if ( n < 3 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/GeometryFactory osgearth-2.10.2+dfsg/src/osgEarthSymbology/GeometryFactory
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/GeometryFactory	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/GeometryFactory	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/GeometryFactory.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/GeometryFactory.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/GeometryFactory.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/GeometryFactory.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -100,8 +100,8 @@
         numSegments = (unsigned)::ceil(circumference / segLen);
     }
 
-    double startRad = std::min( start.as(Units::RADIANS), end.as(Units::RADIANS) );
-    double endRad   = std::max( start.as(Units::RADIANS), end.as(Units::RADIANS) );
+    double startRad = osg::minimum( start.as(Units::RADIANS), end.as(Units::RADIANS) );
+    double endRad   = osg::maximum( start.as(Units::RADIANS), end.as(Units::RADIANS) );
 
     if ( endRad == startRad )
         endRad += 2*osg::PI;
@@ -237,8 +237,8 @@
         numSegments = (unsigned)::ceil(circumference / segLen);
     }
 
-    double startRad = std::min( start.as(Units::RADIANS), end.as(Units::RADIANS) );// - osg::PI_2;
-    double endRad   = std::max( start.as(Units::RADIANS), end.as(Units::RADIANS) );// - osg::PI_2;
+    double startRad = osg::minimum( start.as(Units::RADIANS), end.as(Units::RADIANS) );// - osg::PI_2;
+    double endRad   = osg::maximum( start.as(Units::RADIANS), end.as(Units::RADIANS) );// - osg::PI_2;
 
     if ( endRad == startRad )
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/GeometryRasterizer osgearth-2.10.2+dfsg/src/osgEarthSymbology/GeometryRasterizer
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/GeometryRasterizer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/GeometryRasterizer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/GeometryRasterizer.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/GeometryRasterizer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/GeometryRasterizer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/GeometryRasterizer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/GEOS osgearth-2.10.2+dfsg/src/osgEarthSymbology/GEOS
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/GEOS	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/GEOS	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -47,7 +47,9 @@
         void disposeGeometry(geos::geom::Geometry* input);
 
     protected:
-#if GEOS_VERSION_MAJOR >= 3 && GEOS_VERSION_MINOR >= 6
+#if GEOS_VERSION_MAJOR >= 3 && GEOS_VERSION_MINOR >= 7
+        geos::geom::GeometryFactory::Ptr _factory;
+#elif GEOS_VERSION_MAJOR == 3 && GEOS_VERSION_MINOR == 6
         geos::geom::GeometryFactory::unique_ptr _factory;
 #else
         geos::geom::GeometryFactory* _factory;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/GEOS.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/GEOS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/GEOS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/GEOS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -44,6 +44,9 @@
 
 #define LC "[GEOS] "
 
+#define GEOS_VERSION_AT_LEAST(MAJOR, MINOR) \
+    ((GEOS_VERSION_MAJOR>MAJOR) || (GEOS_VERSION_MAJOR==MAJOR && GEOS_VERSION_MINOR>=MINOR))
+
 namespace
 {
     geom::CoordinateSequence*
@@ -216,7 +219,7 @@
     geos::geom::PrecisionModel* pm = new geos::geom::PrecisionModel(geom::PrecisionModel::FLOATING);
 
     // Factory will clone the PM
-#if GEOS_VERSION_MAJOR >= 3 && GEOS_VERSION_MINOR >= 6
+#if GEOS_VERSION_AT_LEAST(3,6)
     _factory = geos::geom::GeometryFactory::create( pm );
 #else
     _factory = new geos::geom::GeometryFactory( pm );
@@ -228,7 +231,7 @@
 
 GEOSContext::~GEOSContext()
 {
-#if !(GEOS_VERSION_MAJOR >= 3 && GEOS_VERSION_MINOR >= 6)
+#if !GEOS_VERSION_AT_LEAST(3,6)
     delete _factory;
 #endif
 }
@@ -239,7 +242,7 @@
     geom::Geometry* output = 0L;
     if ( input && input->isValid() )
     {
-#if GEOS_VERSION_MAJOR >= 3 && GEOS_VERSION_MINOR >= 6
+#if GEOS_VERSION_AT_LEAST(3,6)
         output = import( input, _factory.get() );
 #else
         output = import( input, _factory );
@@ -345,7 +348,7 @@
 {
     if (input)
     {
-#if GEOS_VERSION_MAJOR >= 3 && GEOS_VERSION_MINOR >= 6
+#if GEOS_VERSION_AT_LEAST(3,6)
         _factory->destroyGeometry(input);
 #else
         geom::GeometryFactory* f = const_cast<geom::GeometryFactory*>(input->getFactory());
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/IconResource osgearth-2.10.2+dfsg/src/osgEarthSymbology/IconResource
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/IconResource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/IconResource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/IconResource.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/IconResource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/IconResource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/IconResource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -53,8 +53,8 @@
         osg::Vec3Array* verts = new osg::Vec3Array(4);
         (*verts)[0] = osg::Vec3(-width/2.0f, -height/2.0, 0.0f);
         (*verts)[1] = osg::Vec3( width/2.0f, -height/2.0, 0.0f);
-        (*verts)[2] = osg::Vec3( width/2.0f,  height/2.0, 0.0f);
-        (*verts)[3] = osg::Vec3(-width/2.0f,  height/2.0, 0.0f);
+        (*verts)[2] = osg::Vec3(-width/2.0f,  height/2.0, 0.0f);
+        (*verts)[3] = osg::Vec3( width/2.0f,  height/2.0, 0.0f);
         geometry->setVertexArray( verts );
 
         bool flip = image->getOrigin()==osg::Image::TOP_LEFT;
@@ -64,24 +64,23 @@
         {
             (*texcoords)[0].set(0.0f,      flip ? height-1.0f : 0.0f);
             (*texcoords)[1].set(width-1.0f,flip ? height-1.0f : 0.0f);
-            (*texcoords)[2].set(width-1.0f,flip ? 0.0         : height-1.0f);
-            (*texcoords)[3].set(0.0f,      flip ? 0.0         : height-1.0f);
+            (*texcoords)[2].set(0.0f,      flip ? 0.0         : height-1.0f);
+            (*texcoords)[3].set(width-1.0f,flip ? 0.0         : height-1.0f);
         }
         else
         {
             (*texcoords)[0].set(0.0f, flip ? 1.0f : 0.0f);
             (*texcoords)[1].set(1.0f, flip ? 1.0f : 0.0f);
-            (*texcoords)[2].set(1.0f, flip ? 0.0  : 1.0f);
-            (*texcoords)[3].set(0.0f, flip ? 0.0  : 1.0f);
+            (*texcoords)[2].set(0.0f, flip ? 0.0  : 1.0f);
+            (*texcoords)[3].set(1.0f, flip ? 0.0  : 1.0f);
         }
         geometry->setTexCoordArray(0, texcoords);
 
-        osg::Vec4Array* colors = new osg::Vec4Array(1);
+        osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
         (*colors)[0].set(1,1,1,1);
         geometry->setColorArray( colors );
-        geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
 
-        geometry->addPrimitiveSet( new osg::DrawArrays(GL_QUADS, 0, 4));
+        geometry->addPrimitiveSet( new osg::DrawArrays(GL_TRIANGLE_STRIP, 0, 4));
 
         osg::StateSet* stateSet = geometry->getOrCreateStateSet();
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/IconSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/IconSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/IconSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/IconSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/IconSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/IconSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/IconSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/IconSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -57,42 +57,42 @@
     Config conf = InstanceSymbol::getConfig();
     conf.key() = "icon";
 
-    conf.addIfSet( "alignment", "left_top",      _alignment, ALIGN_LEFT_TOP );
-    conf.addIfSet( "alignment", "left_center",   _alignment, ALIGN_LEFT_CENTER );
-    conf.addIfSet( "alignment", "left_bottom",   _alignment, ALIGN_LEFT_BOTTOM );
-    conf.addIfSet( "alignment", "center_top",    _alignment, ALIGN_CENTER_TOP );
-    conf.addIfSet( "alignment", "center_center", _alignment, ALIGN_CENTER_CENTER );
-    conf.addIfSet( "alignment", "center_bottom", _alignment, ALIGN_CENTER_BOTTOM );
-    conf.addIfSet( "alignment", "right_top",     _alignment, ALIGN_RIGHT_TOP );
-    conf.addIfSet( "alignment", "right_center",  _alignment, ALIGN_RIGHT_CENTER );
-    conf.addIfSet( "alignment", "right_bottom",  _alignment, ALIGN_RIGHT_BOTTOM );
-
-    conf.addObjIfSet( "heading",   _heading );
-    conf.addIfSet   ( "declutter", _declutter );	                  
-	conf.addIfSet   ( "icon-occlusion-cull", _occlusionCull );
-    conf.addIfSet   ( "icon-occlusion-cull-altitude", _occlusionCullAltitude );
+    conf.set( "alignment", "left_top",      _alignment, ALIGN_LEFT_TOP );
+    conf.set( "alignment", "left_center",   _alignment, ALIGN_LEFT_CENTER );
+    conf.set( "alignment", "left_bottom",   _alignment, ALIGN_LEFT_BOTTOM );
+    conf.set( "alignment", "center_top",    _alignment, ALIGN_CENTER_TOP );
+    conf.set( "alignment", "center_center", _alignment, ALIGN_CENTER_CENTER );
+    conf.set( "alignment", "center_bottom", _alignment, ALIGN_CENTER_BOTTOM );
+    conf.set( "alignment", "right_top",     _alignment, ALIGN_RIGHT_TOP );
+    conf.set( "alignment", "right_center",  _alignment, ALIGN_RIGHT_CENTER );
+    conf.set( "alignment", "right_bottom",  _alignment, ALIGN_RIGHT_BOTTOM );
+
+    conf.set( "heading",   _heading );
+    conf.set( "declutter", _declutter );	                  
+	conf.set( "icon-occlusion-cull", _occlusionCull );
+    conf.set( "icon-occlusion-cull-altitude", _occlusionCullAltitude );
 
-    conf.addNonSerializable( "IconSymbol::image", _image.get() );
+    conf.setNonSerializable( "IconSymbol::image", _image.get() );
     return conf;
 }
 
 void 
 IconSymbol::mergeConfig( const Config& conf )
 {
-    conf.getIfSet( "alignment", "left_top",      _alignment, ALIGN_LEFT_TOP );
-    conf.getIfSet( "alignment", "left_center",   _alignment, ALIGN_LEFT_CENTER );
-    conf.getIfSet( "alignment", "left_bottom",   _alignment, ALIGN_LEFT_BOTTOM );
-    conf.getIfSet( "alignment", "center_top",    _alignment, ALIGN_CENTER_TOP );
-    conf.getIfSet( "alignment", "center_center", _alignment, ALIGN_CENTER_CENTER );
-    conf.getIfSet( "alignment", "center_bottom", _alignment, ALIGN_CENTER_BOTTOM );
-    conf.getIfSet( "alignment", "right_top",     _alignment, ALIGN_RIGHT_TOP );
-    conf.getIfSet( "alignment", "right_center",  _alignment, ALIGN_RIGHT_CENTER );
-    conf.getIfSet( "alignment", "right_bottom",  _alignment, ALIGN_RIGHT_BOTTOM );
-
-    conf.getObjIfSet( "heading",   _heading );
-    conf.getIfSet   ( "declutter", _declutter );
-	conf.getIfSet   ( "icon-occlusion-cull", _occlusionCull );
-    conf.getIfSet   ( "icon-occlusion-cull-altitude", _occlusionCullAltitude );
+    conf.get( "alignment", "left_top",      _alignment, ALIGN_LEFT_TOP );
+    conf.get( "alignment", "left_center",   _alignment, ALIGN_LEFT_CENTER );
+    conf.get( "alignment", "left_bottom",   _alignment, ALIGN_LEFT_BOTTOM );
+    conf.get( "alignment", "center_top",    _alignment, ALIGN_CENTER_TOP );
+    conf.get( "alignment", "center_center", _alignment, ALIGN_CENTER_CENTER );
+    conf.get( "alignment", "center_bottom", _alignment, ALIGN_CENTER_BOTTOM );
+    conf.get( "alignment", "right_top",     _alignment, ALIGN_RIGHT_TOP );
+    conf.get( "alignment", "right_center",  _alignment, ALIGN_RIGHT_CENTER );
+    conf.get( "alignment", "right_bottom",  _alignment, ALIGN_RIGHT_BOTTOM );
+
+    conf.get( "heading",   _heading );
+    conf.get( "declutter", _declutter );
+	conf.get( "icon-occlusion-cull", _occlusionCull );
+    conf.get( "icon-occlusion-cull-altitude", _occlusionCullAltitude );
 
     _image = conf.getNonSerializable<osg::Image>( "IconSymbol::image" );
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/InstanceResource osgearth-2.10.2+dfsg/src/osgEarthSymbology/InstanceResource
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/InstanceResource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/InstanceResource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/InstanceResource.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/InstanceResource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/InstanceResource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/InstanceResource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@
 void
 InstanceResource::mergeConfig( const Config& conf )
 {
-    conf.getIfSet( "url", _uri );
+    conf.get( "url", _uri );
 }
 
 Config
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/InstanceSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/InstanceSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/InstanceSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/InstanceSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/InstanceSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/InstanceSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/InstanceSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/InstanceSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -50,16 +50,16 @@
 {
     Config conf = Taggable<Symbol>::getConfig();
     conf.key() = "instance";
-    conf.addObjIfSet( "url", _url );
-    conf.addObjIfSet( "library", _library );
-    conf.addObjIfSet( "scale", _scale );
-    conf.addObjIfSet( "script", _script );
-    conf.addIfSet   ( "placement", "vertex",    _placement, PLACEMENT_VERTEX );
-    conf.addIfSet   ( "placement", "interval",  _placement, PLACEMENT_INTERVAL );
-    conf.addIfSet   ( "placement", "random",    _placement, PLACEMENT_RANDOM );
-    conf.addIfSet   ( "placement", "centroid",  _placement, PLACEMENT_CENTROID );
-    conf.addIfSet   ( "density", _density );
-    conf.addIfSet   ( "random_seed", _randomSeed );
+    conf.set( "url", _url );
+    conf.set( "library", _library );
+    conf.set( "scale", _scale );
+    conf.set( "script", _script );
+    conf.set( "placement", "vertex",    _placement, PLACEMENT_VERTEX );
+    conf.set( "placement", "interval",  _placement, PLACEMENT_INTERVAL );
+    conf.set( "placement", "random",    _placement, PLACEMENT_RANDOM );
+    conf.set( "placement", "centroid",  _placement, PLACEMENT_CENTROID );
+    conf.set( "density", _density );
+    conf.set( "random_seed", _randomSeed );
 
     std::string tagstring = this->tagString();
     if ( !tagstring.empty() )
@@ -71,16 +71,16 @@
 void 
 InstanceSymbol::mergeConfig( const Config& conf )
 {
-    conf.getObjIfSet( "url", _url );
-    conf.getObjIfSet( "library", _library );
-    conf.getObjIfSet( "scale", _scale );
-    conf.getObjIfSet( "script", _script );
-    conf.getIfSet   ( "placement", "vertex",   _placement, PLACEMENT_VERTEX );
-    conf.getIfSet   ( "placement", "interval", _placement, PLACEMENT_INTERVAL );
-    conf.getIfSet   ( "placement", "random",   _placement, PLACEMENT_RANDOM );
-    conf.getIfSet   ( "placement", "centroid", _placement, PLACEMENT_CENTROID );
-    conf.getIfSet   ( "density", _density );
-    conf.getIfSet   ( "random_seed", _randomSeed );
+    conf.get( "url", _url );
+    conf.get( "library", _library );
+    conf.get( "scale", _scale );
+    conf.get( "script", _script );
+    conf.get( "placement", "vertex",   _placement, PLACEMENT_VERTEX );
+    conf.get( "placement", "interval", _placement, PLACEMENT_INTERVAL );
+    conf.get( "placement", "random",   _placement, PLACEMENT_RANDOM );
+    conf.get( "placement", "centroid", _placement, PLACEMENT_CENTROID );
+    conf.get( "density", _density );
+    conf.get( "random_seed", _randomSeed );
     
     addTags( conf.value("tags") );
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/LineSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/LineSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/LineSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/LineSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/LineSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/LineSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/LineSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/LineSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -65,22 +65,22 @@
 {
     Config conf = Symbol::getConfig();
     conf.key() = "line";
-    conf.addObjIfSet("stroke",       _stroke);
-    conf.addIfSet   ("tessellation", _tessellation);
-    conf.addIfSet   ("crease_angle", _creaseAngle);
-    conf.addObjIfSet("tessellation_size", _tessellationSize );
-    conf.addObjIfSet   ("image", _imageURI);
+    conf.set("stroke",       _stroke);
+    conf.set("tessellation", _tessellation);
+    conf.set("crease_angle", _creaseAngle);
+    conf.set("tessellation_size", _tessellationSize );
+    conf.set("image", _imageURI);
     return conf;
 }
 
 void 
 LineSymbol::mergeConfig( const Config& conf )
 {
-    conf.getObjIfSet("stroke",       _stroke);
-    conf.getIfSet   ("tessellation", _tessellation);
-    conf.getIfSet   ("crease_angle", _creaseAngle);
-    conf.getObjIfSet("tessellation_size", _tessellationSize);
-    conf.getObjIfSet("image", _imageURI);
+    conf.get("stroke",       _stroke);
+    conf.get("tessellation", _tessellation);
+    conf.get("crease_angle", _creaseAngle);
+    conf.get("tessellation_size", _tessellationSize);
+    conf.get("image", _imageURI);
 }
 
 void
@@ -116,7 +116,7 @@
     else if ( match(c.key(), "stroke-rounding-ratio") ) {
         style.getOrCreate<LineSymbol>()->stroke()->roundingRatio() = as<float>(c.value(), 0.4f);
     }
-    else if ( match(c.key(), "stroke-tessellation") ) {
+    else if ( match(c.key(), "stroke-tessellation-segments") ) {
         style.getOrCreate<LineSymbol>()->tessellation() = as<unsigned>( c.value(), 0 );
     }
     else if ( match(c.key(), "stroke-tessellation-size") ) {
@@ -145,4 +145,7 @@
     else if (match(c.key(), "stroke-image")) {
         style.getOrCreate<LineSymbol>()->imageURI() = StringExpression(stripQuotes(c.value()), c.referrer());
     }
+    else if (match(c.key(), "stroke-smooth")) {
+        style.getOrCreate<LineSymbol>()->stroke()->smooth() = as<bool>(c.value(), false);
+    }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MarkerResource osgearth-2.10.2+dfsg/src/osgEarthSymbology/MarkerResource
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MarkerResource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MarkerResource	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
-#ifndef OSGEARTHSYMBOLOGY_MARKER_RESOURCE_H
-#define OSGEARTHSYMBOLOGY_MARKER_RESOURCE_H 1
-
-#include <osgEarthSymbology/Common>
-#include <osgEarthSymbology/Resource>
-#include <osgEarthSymbology/Symbol>
-#include <osgEarthSymbology/MarkerSymbol>
-#include <osgEarth/URI>
-#include <map>
-
-namespace osgEarth { namespace Symbology
-{
-    using namespace osgEarth;
-
-    /**
-     * A resource that points to a "marker", which is a model representing an object
-     * in the scene. Markers are used typically fro point-model subsitution and to
-     * manage externally referenced (or dynamically created) scene graph nodes.
-     */
-    class OSGEARTHSYMBOLOGY_EXPORT MarkerResource : public Resource
-    {
-    public:
-        /** Constructs a new marker resource. */
-        MarkerResource( const Config& conf =Config() );
-
-        /** dtor */
-        virtual ~MarkerResource() { }
-
-        /**
-         * Creates a new Node representing the marker.
-         */
-        osg::Node* createNode( const osgDB::Options* dbOptions ) const;
-
-    public:
-        /** Source location of the actual data to load.  */
-        optional<URI>& uri() { return _markerURI; }
-        const optional<URI>& uri() const { return _markerURI; }
-
-    public: // serialization methods
-
-        virtual Config getConfig() const;
-        void mergeConfig( const Config& conf );
-
-    protected:
-        optional<URI>  _markerURI;
-
-        osg::Node* createNodeFromURI( const URI& uri, const osgDB::Options* dbOptions ) const;
-    };
-
-    typedef std::vector< osg::ref_ptr<MarkerResource> > MarkerResourceVector;
-
-} } // namespace osgEarth::Symbology
-
-#endif // OSGEARTHSYMBOLOGY_MARKER_RESOURCE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MarkerResource.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/MarkerResource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MarkerResource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MarkerResource.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,150 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#include <osgEarthSymbology/MarkerResource>
-#include <osgEarth/StringUtils>
-#include <osgEarth/ImageUtils>
-
-#include <osg/AutoTransform>
-#include <osg/Depth>
-#include <osg/Geode>
-#include <osg/Geometry>
-#include <osg/TextureRectangle>
-#include <osg/Program>
-
-#define LC "[MarkerResource] "
-
-using namespace osgEarth;
-using namespace osgEarth::Symbology;
-
-//---------------------------------------------------------------------------
-
-namespace
-{
-    osg::Node* buildImageModel(osg::Image* image)
-    {
-        float width = image->s();
-        float height = image->t();
-
-        osg::Geometry* geometry = new osg::Geometry;
-        geometry->setUseVertexBufferObjects(true);
-
-        osg::Vec3Array* verts = new osg::Vec3Array(4);
-        (*verts)[0] = osg::Vec3(-width/2.0f, -height/2.0, 0.0f);
-        (*verts)[1] = osg::Vec3(width/2.0f, -height/2.0, 0.0f);
-        (*verts)[2] = osg::Vec3(width/2.0f, height/2.0, 0.0f);
-        (*verts)[3] = osg::Vec3(-width/2.0f,height/2.0, 0.0f);
-        geometry->setVertexArray( verts );
-
-        bool flip = image->getOrigin()==osg::Image::TOP_LEFT;
-
-        osg::Vec2Array* texcoords = new osg::Vec2Array(4);
-        (*texcoords)[0].set(0.0f,flip ? height-1.0f : 0.0f);
-        (*texcoords)[1].set(width-1.0f,flip ? height-1.0f : 0.0f);
-        (*texcoords)[2].set(width-1.0f,flip ? 0.0 : height-1.0f);
-        (*texcoords)[3].set(0.0f,flip ? 0.0 : height-1.0f);
-        geometry->setTexCoordArray(0, texcoords);
-
-        osg::Vec4Array* colors = new osg::Vec4Array(1);
-        (*colors)[0].set(1,1,1,1);
-        geometry->setColorArray( colors );
-        geometry->setColorBinding( osg::Geometry::BIND_OVERALL );
-
-        geometry->addPrimitiveSet( new osg::DrawArrays(GL_QUADS, 0, 4));
-
-        osg::StateSet* stateSet = geometry->getOrCreateStateSet();
-
-        osg::TextureRectangle* texture = new osg::TextureRectangle( image );
-        stateSet->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
-
-        stateSet->setMode( GL_BLEND, 1 );
-        stateSet->setRenderBinDetails( 95, "RenderBin" );
-        stateSet->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS,false), 1 );
-
-        osg::Geode* geode = new osg::Geode;
-        geode->addDrawable( geometry );
-
-        //PixelAutoTransform* at = new PixelAutoTransform;
-        //at->setMinPixelWidth( width );
-        osg::AutoTransform* at = new osg::AutoTransform;
-        at->setAutoScaleToScreen( true );
-        at->setAutoRotateMode( osg::AutoTransform::ROTATE_TO_SCREEN );
-        at->addChild( geode );
-        return at;
-    }
-}
-
-//---------------------------------------------------------------------------
-
-MarkerResource::MarkerResource( const Config& conf ) :
-Resource( conf )
-{
-    mergeConfig( conf );
-}
-
-void
-MarkerResource::mergeConfig( const Config& conf )
-{
-    conf.getIfSet( "url", _markerURI );
-}
-
-Config
-MarkerResource::getConfig() const
-{
-    Config conf = Resource::getConfig();
-    conf.key() = "marker";
-    return conf;
-}
-
-osg::Node*
-MarkerResource::createNode( const osgDB::Options* dbOptions ) const
-{
-    return createNodeFromURI( _markerURI.value(), dbOptions );
-}
-
-osg::Node*
-MarkerResource::createNodeFromURI( const URI& uri, const osgDB::Options* dbOptions ) const
-{
-    osg::Node* node = 0L;
-
-    ReadResult r = uri.readObject( dbOptions );
-    if ( r.succeeded() )
-    {     
-        OE_INFO << LC << "Loaded " << uri.base() << "(from " << (r.isFromCache()? "cache" : "source") << ")"
-            << std::endl;
-
-        if ( r.getImage() )
-        {
-            node = buildImageModel( r.getImage() );
-        }
-        else if ( r.getNode() )
-        {
-            node = r.releaseNode();
-        }
-    }
-
-    else // failing that, fall back on the old encoding format..
-    {
-        StringVector tok;
-        StringTokenizer( *uri, tok, "()" );
-        if (tok.size() >= 2)
-            return createNodeFromURI( URI(tok[1]), dbOptions );
-    }
-
-    return node;
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MarkerSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/MarkerSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MarkerSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MarkerSymbol	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
-#ifndef OSGEARTHSYMBOLOGY_MARKER_SYMBOL_H
-#define OSGEARTHSYMBOLOGY_MARKER_SYMBOL_H 1
-
-#include <climits>
-
-#include <osgEarth/Common>
-#include <osgEarthSymbology/Symbol>
-#include <osgEarthSymbology/Expression>
-#include <osg/Vec3f>
-
-namespace osgEarth { namespace Symbology
-{
-    class InstanceSymbol;
-
-    /**
-     * The MarkerSymbol describes replacement of geometry with "markers". A marker
-     * it another object like a 3D model (node) or an image.
-     */
-    class OSGEARTHSYMBOLOGY_EXPORT MarkerSymbol : public Symbol
-    {
-    public:
-        /**
-         * Controls the placements of models.
-         */
-        enum Placement
-        {
-            /** Places one model instance at the centroid of the feature. */
-            PLACEMENT_CENTROID,
-
-            /** Places a model instance at each feature point. */
-            PLACEMENT_VERTEX,
-
-            /** Places model instances at regular intervals within/along the feature geometry,
-                according to density. */
-            PLACEMENT_INTERVAL,
-
-            /** Scatters model instances randomly within/along feature, according to density. */
-            PLACEMENT_RANDOM
-        };
-
-        // note: these are similar to the values in osgText::Text::AlignmentType
-        enum Alignment {
-            ALIGN_LEFT_TOP,
-            ALIGN_LEFT_CENTER,
-            ALIGN_LEFT_BOTTOM,
-
-            ALIGN_CENTER_TOP,
-            ALIGN_CENTER_CENTER,
-            ALIGN_CENTER_BOTTOM,
-
-            ALIGN_RIGHT_TOP,
-            ALIGN_RIGHT_CENTER,
-            ALIGN_RIGHT_BOTTOM,
-        };
-
-    public:
-        META_Object(osgEarthSymbology, MarkerSymbol);
-
-        MarkerSymbol(const MarkerSymbol& rhs,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
-        MarkerSymbol( const Config& conf =Config() );
-
-
-        /** Since MarkerSymbol is deprecated, this conveneince function will convert to an InstanceSymbol */
-        class InstanceSymbol* convertToInstanceSymbol() const;
-
-        /** dtor */
-        virtual ~MarkerSymbol() { }
-
-        /** URI of the model to use for substitution. */
-        optional<StringExpression>& url() { return _url; }
-        const optional<StringExpression>& url() const { return _url; }     
-
-        /** Name of the resource library to use with this symbol (optional) */
-        optional<StringExpression>& library() { return _library; }
-        const optional<StringExpression>& library() const { return _library; }   
-
-        /** How to map feature geometry to model placement. (default is PLACEMENT_CENTROID) */
-        optional<Placement>& placement() { return _placement; }
-        const optional<Placement>& placement() const { return _placement; }
-
-        /** For PLACEMENT_RANDOM/INTERVAL, the scattering density in instances per sqkm */
-        optional<float>& density() { return _density; }
-        const optional<float>& density() const { return _density; }
-
-        /** Model instance scale factor */
-        optional<NumericExpression>& scale() { return _scale; }
-        const optional<NumericExpression>& scale() const { return _scale; }
-
-        /** Orientation in HPR degrees */
-        optional<osg::Vec3f>& orientation() { return _orientation; }
-        const optional<osg::Vec3f>& orientation() const { return _orientation; }
-
-        /** Seeding value for the randomizer */
-        optional<unsigned>& randomSeed() { return _randomSeed; }
-        const optional<unsigned>& randomSeed() const { return _randomSeed; }
-
-        /** Hint as to whether the marker is an icon vs. a 3D model */
-        optional<bool>& isModel() { return _isModelHint; }
-        const optional<bool>& isModel() const { return _isModelHint; }
-
-        /** Alignment of the marker relative to center pixels */
-        optional<Alignment>& alignment() { return _alignment; }
-        const optional<Alignment>& alignment() const { return _alignment; }
-        
-    public: // non-serialized properties (for programmatic use only)
-
-        /** Explicit image to use for 2D icon placemet */
-        void setImage( osg::Image* image ) { _image = image; }
-        osg::Image* getImage( unsigned maxSize =INT_MAX ) const;
-
-        /** Explicit model to use for model placement */
-        void setModel( osg::Node* node ) { _node = node; }
-        osg::Node* getModel() const { return _node.get(); }
-
-    public:
-        virtual Config getConfig() const;
-        virtual void mergeConfig( const Config& conf );
-        static void parseSLD(const Config& c, class Style& style);
-
-    protected:
-        optional<StringExpression>   _url;
-        optional<StringExpression>   _library;
-        optional<NumericExpression>  _scale;
-        optional<Placement>          _placement;
-        optional<osg::Vec3f>         _orientation;
-        optional<float>              _density;
-        optional<unsigned>           _randomSeed;
-        optional<bool>               _isModelHint;
-        optional<Alignment>         _alignment;
-
-        osg::ref_ptr<osg::Node>      _node;
-        mutable osg::ref_ptr<osg::Image> _image;
-    };
-
-} } // namespace osgEarth::Symbology
-
-#endif // OSGEARTHSYMBOLOGY_MARKER_SYMBOL_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MarkerSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/MarkerSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MarkerSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MarkerSymbol.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,297 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#include <osgEarthSymbology/MarkerSymbol>
-#include <osgEarthSymbology/IconSymbol>
-#include <osgEarthSymbology/ModelSymbol>
-#include <osgEarthSymbology/Style>
-#include <osgEarth/ThreadingUtils>
-#include <osgEarth/Registry>
-#include <osgEarth/ImageUtils>
-
-#include <osgDB/Options>
-#include <osgDB/FileNameUtils>
-#include <osgDB/Registry>
-
-using namespace osgEarth;
-using namespace osgEarth::Symbology;
-
-OSGEARTH_REGISTER_SIMPLE_SYMBOL(marker, MarkerSymbol);
-
-MarkerSymbol::MarkerSymbol(const MarkerSymbol& rhs,const osg::CopyOp& copyop):
-Symbol(rhs, copyop),
-_url(rhs._url),
-_library(rhs._library),
-_scale(rhs._scale),
-_placement(rhs._placement),
-_orientation(rhs._orientation),
-_density(rhs._density),
-_randomSeed(rhs._randomSeed),
-_isModelHint(rhs._isModelHint),
-_alignment(rhs._alignment),
-_node(rhs._node),
-_image(rhs._image)
-{
-}
-
-MarkerSymbol::MarkerSymbol( const Config& conf ) :
-Symbol     ( conf ),
-_placement ( PLACEMENT_CENTROID ),
-_density   ( 25.0f ),
-_randomSeed( 0 ),
-_alignment ( ALIGN_CENTER_BOTTOM )
-{
-    mergeConfig( conf );
-}
-
-Config 
-MarkerSymbol::getConfig() const
-{
-    Config conf = Symbol::getConfig();
-    conf.key() = "marker";
-    conf.addObjIfSet( "url", _url );
-    conf.addObjIfSet( "library", _library );
-    conf.addObjIfSet( "scale", _scale );
-    conf.addIfSet( "orientation", _orientation);
-    conf.addIfSet( "placement", "vertex",   _placement, PLACEMENT_VERTEX );
-    conf.addIfSet( "placement", "interval", _placement, PLACEMENT_INTERVAL );
-    conf.addIfSet( "placement", "random",   _placement, PLACEMENT_RANDOM );
-    conf.addIfSet( "density", _density );
-    conf.addIfSet( "random_seed", _randomSeed );
-    conf.addIfSet( "is_model", _isModelHint );
-
-    conf.addIfSet( "alignment", "left_top",                _alignment, ALIGN_LEFT_TOP );
-    conf.addIfSet( "alignment", "left_center",             _alignment, ALIGN_LEFT_CENTER );
-    conf.addIfSet( "alignment", "left_bottom",             _alignment, ALIGN_LEFT_BOTTOM );
-    conf.addIfSet( "alignment", "center_top",              _alignment, ALIGN_CENTER_TOP );
-    conf.addIfSet( "alignment", "center_center",           _alignment, ALIGN_CENTER_CENTER );
-    conf.addIfSet( "alignment", "center_bottom",           _alignment, ALIGN_CENTER_BOTTOM );
-    conf.addIfSet( "alignment", "right_top",               _alignment, ALIGN_RIGHT_TOP );
-    conf.addIfSet( "alignment", "right_center",            _alignment, ALIGN_RIGHT_CENTER );
-    conf.addIfSet( "alignment", "right_bottom",            _alignment, ALIGN_RIGHT_BOTTOM );
-
-    conf.addNonSerializable( "MarkerSymbol::image", _image.get() );
-    conf.addNonSerializable( "MarkerSymbol::node", _node.get() );
-    return conf;
-}
-
-void 
-MarkerSymbol::mergeConfig( const Config& conf )
-{
-    conf.getObjIfSet( "url", _url );
-    conf.getObjIfSet( "library", _library );
-    conf.getObjIfSet( "scale", _scale );    
-    conf.getIfSet( "placement", "vertex",   _placement, PLACEMENT_VERTEX );
-    conf.getIfSet( "placement", "interval", _placement, PLACEMENT_INTERVAL );
-    conf.getIfSet( "placement", "random",   _placement, PLACEMENT_RANDOM );
-    conf.getIfSet( "density", _density );
-    conf.getIfSet( "random_seed", _randomSeed );
-    conf.getIfSet( "orientation", _orientation);
-    conf.getIfSet( "is_model", _isModelHint );
-
-    conf.getIfSet( "alignment", "left_top",                _alignment, ALIGN_LEFT_TOP );
-    conf.getIfSet( "alignment", "left_center",             _alignment, ALIGN_LEFT_CENTER );
-    conf.getIfSet( "alignment", "left_bottom",             _alignment, ALIGN_LEFT_BOTTOM );
-    conf.getIfSet( "alignment", "center_top",              _alignment, ALIGN_CENTER_TOP );
-    conf.getIfSet( "alignment", "center_center",           _alignment, ALIGN_CENTER_CENTER );
-    conf.getIfSet( "alignment", "center_bottom",           _alignment, ALIGN_CENTER_BOTTOM );
-    conf.getIfSet( "alignment", "right_top",               _alignment, ALIGN_RIGHT_TOP );
-    conf.getIfSet( "alignment", "right_center",            _alignment, ALIGN_RIGHT_CENTER );
-    conf.getIfSet( "alignment", "right_bottom",            _alignment, ALIGN_RIGHT_BOTTOM );
-
-    _image = conf.getNonSerializable<osg::Image>( "MarkerSymbol::image" );
-    _node = conf.getNonSerializable<osg::Node>( "MarkerSymbol::node" );
-}
-
-osg::Image*
-MarkerSymbol::getImage( unsigned maxSize ) const
-{
-    static Threading::Mutex s_mutex;
-    if ( !_image.valid() && _url.isSet() )
-    {
-        Threading::ScopedMutexLock lock(s_mutex);
-        if ( !_image.valid() )
-        {
-            osg::ref_ptr<osgDB::Options> dbOptions = Registry::instance()->cloneOrCreateOptions();
-            dbOptions->setObjectCacheHint( osgDB::Options::CACHE_IMAGES );
-            _image = _url->evalURI().getImage( dbOptions.get() );
-            if ( _image.valid() && (maxSize < (unsigned int)_image->s() || maxSize < (unsigned int)_image->t()) )
-            {
-                unsigned new_s, new_t;
-
-                if ( _image->s() >= _image->t() ) {
-                    new_s = maxSize;
-                    float ratio = (float)new_s/(float)_image->s();
-                    new_t = (unsigned)((float)_image->t() * ratio);
-                }
-                else {
-                    new_t = maxSize;
-                    float ratio = (float)new_t/(float)_image->t();
-                    new_s = (unsigned)((float)_image->s() * ratio);
-                }
-                    
-                osg::ref_ptr<osg::Image> result;
-                ImageUtils::resizeImage( _image.get(), new_s, new_t, result );
-                _image = result.get();
-            }
-        }
-    }
-    return _image.get();
-}
-
-
-InstanceSymbol*
-MarkerSymbol::convertToInstanceSymbol() const
-{
-    InstanceSymbol* result = 0L;
-
-    bool isModel = true;
-
-    if ( this->isModel().isSet() )
-    {
-        isModel = *this->isModel();
-    }
-    else if ( this->getModel() )
-    {
-        isModel = true;
-    }
-    else if ( this->url().isSet() )
-    {
-        const std::string& str = this->url()->expr();
-        std::string ext = osgDB::getLowerCaseFileExtension(str);
-        if ( !ext.empty() )
-        {
-            osg::ref_ptr<osgDB::ReaderWriter> rw = osgDB::Registry::instance()->getReaderWriterForExtension(ext);
-            if ( rw.valid() )
-            {
-                unsigned features = (unsigned)rw->supportedFeatures();
-                if ( (features & osgDB::ReaderWriter::FEATURE_READ_IMAGE) != 0 )
-                {
-                    isModel = false;
-                }
-            }
-
-#if 0 // original method-- but getMimeTypeExtensionMap didn't exist until post-3.0
-            const osgDB::Registry::MimeTypeExtensionMap& exmap = osgDB::Registry::instance()->getMimeTypeExtensionMap();
-            for( osgDB::Registry::MimeTypeExtensionMap::const_iterator i = exmap.begin(); i != exmap.end(); ++i )
-            {
-                if ( i->second == ext )
-                {
-                    if ( i->first.compare(0, 6, "image/") == 0 )
-                        isModel = false;
-                    break;
-                }
-            }
-#endif
-
-        }
-    }
-
-    if ( isModel )
-    {
-        ModelSymbol* model = new ModelSymbol();
-
-        if ( this->orientation().isSet() )
-            model->heading() = NumericExpression(this->orientation()->x());
-
-        if ( model->getModel() )
-            model->setModel( this->getModel() );
-
-        result = model;
-    }
-    else // icon image
-    {
-        IconSymbol* icon = new IconSymbol();
-
-        if ( this->alignment().isSet() )
-            icon->alignment() = (IconSymbol::Alignment)this->alignment().get();
-
-        if ( this->getImage() )
-            icon->setImage( this->getImage() );
-
-        result = icon;
-    }
-
-    if ( this->url().isSet() )
-        result->url() = this->url().get();
-    if ( this->library().isSet() )
-        result->library() = this->library().get();
-    if ( this->placement().isSet() )
-        result->placement() = (InstanceSymbol::Placement)this->placement().get();
-    if ( this->density().isSet() )
-        result->density() = this->density().get();
-    if ( this->scale().isSet() )
-        result->scale() = this->scale().get();
-    if ( this->randomSeed().isSet() )
-        result->randomSeed() = this->randomSeed().get();
-
-    return result;
-}
-
-
-void
-MarkerSymbol::parseSLD(const Config& c, Style& style)
-{
-    if ( match(c.key(), "marker") ) {
-        style.getOrCreate<MarkerSymbol>()->url() = c.value();
-        style.getOrCreate<MarkerSymbol>()->url()->setURIContext( c.referrer() );
-    }
-    else if ( match(c.key(),"marker-library") ) {
-        style.getOrCreate<MarkerSymbol>()->library() = StringExpression(c.value());
-    }
-    else if ( match(c.key(), "marker-placement") ) {
-        if      ( match(c.value(), "vertex") )   
-            style.getOrCreate<MarkerSymbol>()->placement() = MarkerSymbol::PLACEMENT_VERTEX;
-        else if ( match(c.value(), "interval") ) 
-            style.getOrCreate<MarkerSymbol>()->placement() = MarkerSymbol::PLACEMENT_INTERVAL;
-        else if ( match(c.value(), "random") )   
-            style.getOrCreate<MarkerSymbol>()->placement() = MarkerSymbol::PLACEMENT_RANDOM;
-        else if ( match(c.value(), "centroid") ) 
-            style.getOrCreate<MarkerSymbol>()->placement() = MarkerSymbol::PLACEMENT_CENTROID;
-    }
-    else if ( match(c.key(), "marker-density") ) {
-        style.getOrCreate<MarkerSymbol>()->density() = as<float>(c.value(), 1.0f);
-    }
-    else if ( match(c.key(), "marker-random-seed") ) {
-        style.getOrCreate<MarkerSymbol>()->randomSeed() = as<unsigned>(c.value(), 0);
-    }
-    else if ( match(c.key(), "marker-scale") ) {
-        style.getOrCreate<MarkerSymbol>()->scale() = NumericExpression(c.value());
-    }
-    else if ( match(c.key(), "marker-icon-align") ) {
-        if      ( match(c.value(), "left-top") ) 
-            style.getOrCreate<MarkerSymbol>()->alignment() = MarkerSymbol::ALIGN_LEFT_TOP;
-        else if ( match(c.value(), "left-center") ) 
-            style.getOrCreate<MarkerSymbol>()->alignment() = MarkerSymbol::ALIGN_LEFT_CENTER;
-        else if ( match(c.value(), "left-bottom") ) 
-            style.getOrCreate<MarkerSymbol>()->alignment() = MarkerSymbol::ALIGN_LEFT_BOTTOM;
-        else if ( match(c.value(), "center-top")  ) 
-            style.getOrCreate<MarkerSymbol>()->alignment() = MarkerSymbol::ALIGN_CENTER_TOP;
-        else if ( match(c.value(), "center-center") ) 
-            style.getOrCreate<MarkerSymbol>()->alignment() = MarkerSymbol::ALIGN_CENTER_CENTER;
-        else if ( match(c.value(), "center-bottom") ) 
-            style.getOrCreate<MarkerSymbol>()->alignment() = MarkerSymbol::ALIGN_CENTER_BOTTOM;
-        else if ( match(c.value(), "right-top") ) 
-            style.getOrCreate<MarkerSymbol>()->alignment() = MarkerSymbol::ALIGN_RIGHT_TOP;
-        else if ( match(c.value(), "right-center") ) 
-            style.getOrCreate<MarkerSymbol>()->alignment() = MarkerSymbol::ALIGN_RIGHT_CENTER;
-        else if ( match(c.value(), "right-bottom") ) 
-            style.getOrCreate<MarkerSymbol>()->alignment() = MarkerSymbol::ALIGN_RIGHT_BOTTOM;
-    }
-}
-
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MarkerSymbolizer.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/MarkerSymbolizer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MarkerSymbolizer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MarkerSymbolizer.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,280 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2008-2010 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#include <osgEarthSymbology/MarkerSymbolizer>
-#include <osgEarthSymbology/MarkerSymbol>
-#include <osgDB/ReadFile>
-#include <osgDB/ReaderWriter>
-#include <osg/Geometry>
-#include <osg/MatrixTransform>
-#include <osg/Material>
-#include <osg/Geode>
-#include <osg/Version>
-
-
-using namespace osgEarth::Symbology;
-
-static osg::Node* getNode(const std::string& str)
-{
-#if OSG_VERSION_LESS_THAN(2,9,8)
-    osg::ref_ptr<osgDB::ReaderWriter::Options> options = new osgDB::ReaderWriter::Options;
-    options->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_ALL);
-    osg::Node* node = osgDB::readNodeFile(str, options.get());
-    return node;
-#else
-    osg::ref_ptr<osgDB::Options> options = new osgDB::Options;
-    options->setObjectCacheHint(osgDB::Options::CACHE_ALL);
-    ref_ptr<osg::Node> node = osgDB::readRefNodeFile(str, options.get());
-    return node.release();
-#endif
-}
-
-static double getRandomValueInRange(double value)
-{
-    return (-value/2) + ((rand() * value)/(RAND_MAX-1));
-}
-
-MarkerSymbolizer::MarkerSymbolizer()
-{
-}
-
-bool MarkerSymbolizer::pointInPolygon(const osg::Vec3d& point, osg::Vec3dArray* pointList)
-{
-    if (!pointList)
-        return false;
-
-    bool result = false;
-    const osg::Vec3dArray& polygon = *pointList;
-    for( unsigned int i=0, j=polygon.size()-1; i<polygon.size(); j = i++ )
-    {
-        if ((((polygon[i].y() <= point.y()) && (point.y() < polygon[j].y())) ||
-             ((polygon[j].y() <= point.y()) && (point.y() < polygon[i].y()))) &&
-            (point.x() < (polygon[j].x()-polygon[i].x()) * (point.y()-polygon[i].y())/(polygon[j].y()-polygon[i].y())+polygon[i].x()))
-        {
-            result = !result;
-        }
-    }
-    return result;
-}
-
-bool 
-MarkerSymbolizer::compile(MarkerSymbolizerState* state,
-                          osg::Group* attachPoint)
-{
-    if ( !state || !attachPoint || !state->getContent() || !state->getStyle() )
-        return false;
-
-    osg::ref_ptr<osg::Group> newSymbolized = new osg::Group;
-    const GeometryList& geometryList = state->getContent()->getGeometryList();
-    for (GeometryList::const_iterator it = geometryList.begin(); it != geometryList.end(); ++it)
-    {
-        Geometry* geometry = *it;
-        if (!geometry)
-            continue;
-
-        GeometryIterator geomIterator( geometry );
-        geomIterator.traverseMultiGeometry() = true;
-        geomIterator.traversePolygonHoles() = true;
-
-        while( geomIterator.hasMore() )
-        {
-            Geometry* part = geomIterator.next();
-            if (!part)
-                continue;
-
-            switch( part->getType())
-            {
-            case Geometry::TYPE_POINTSET:
-            {
-                const MarkerSymbol* point = state->getStyle()->getSymbol<MarkerSymbol>();
-                if (point)
-                {
-                    if (point && part->size() && !point->marker().value().empty())
-                    {
-                        osg::Node* node = getNode(point->marker().value());
-                        if (!node) {
-                            osg::notify(osg::WARN) << "can't load Marker Node " << point->marker().value() << std::endl;
-                            continue;
-                        }
-                        osg::Group* group = new osg::Group;
-                        for ( osg::Vec3dArray::iterator it = part->begin(); it != part->end(); ++it)
-                        {
-                            osg::Vec3d pos = *it;
-                            osg::MatrixTransform* tr = new osg::MatrixTransform;
-                            tr->setMatrix(osg::Matrix::translate(pos));
-                            tr->addChild(node);
-                            group->addChild(tr);
-                        }
-                        newSymbolized->addChild(group);
-                    }
-                }
-            }
-            break;
-
-            case Geometry::TYPE_LINESTRING:
-            case Geometry::TYPE_RING:
-            {
-                const MarkerLineSymbol* line = state->getStyle()->getSymbol<MarkerLineSymbol>();
-                if (line)
-                {
-                    if (line && part->size() && !line->marker().value().empty())
-                    {
-                        osg::Node* node = getNode(line->marker().value());
-                        if (!node) {
-                            osg::notify(osg::WARN) << "can't load Marker Node " << line->marker().value() << std::endl;
-                            continue;
-                        }
-                        float interval = line->interval().value();
-                        if (!interval)
-                            interval = 1.0;
-
-
-                        osg::Group* group = new osg::Group;                        
-                        float currentDist = 0;
-
-                        // start to put one first node
-                        {
-                            osg::MatrixTransform* tr = new osg::MatrixTransform;
-                            tr->setMatrix(osg::Matrix::translate(*part->begin()));
-                            tr->addChild(node);
-                            group->addChild(tr);
-                        }
-
-                        for ( unsigned int i = 0; i < part->size(); ++i)
-                        {
-                            osg::Vec3d start = (*part)[i];
-                            osg::Vec3d end;
-                            if (i < (part->size() - 1)) {
-                                end = (*part)[i+1];
-                            } else {
-                                if (part->getType() == Geometry::TYPE_RING) {
-                                    end = (*part)[0];
-                                } else {
-                                    end = start;
-                                }
-                            }
-                            osg::Vec3d direction = end - start;
-                            float segmentSize = direction.length();
-                            direction.normalize();
-
-                            float previousDist = currentDist;
-                            currentDist += segmentSize;
-                            if (currentDist < interval)
-                                continue;
-                                
-                            float offset = interval - previousDist;
-                                
-                            float rate = currentDist / interval;
-                            int nbItems = static_cast<int>(floorf(rate));
-                            rate -= (float)nbItems;
-                            float remaining = rate * interval;
-                            currentDist = remaining;
-
-                            osg::Vec3d startOnTheLine = start + direction * offset;
-                            for (int j = 0; j < nbItems; ++j)
-                            {
-                                osg::MatrixTransform* tr = new osg::MatrixTransform;
-                                tr->setMatrix(osg::Matrix::translate(startOnTheLine + direction*j*interval));
-                                tr->addChild(node);
-                                group->addChild(tr);
-                            }
-                        }
-                        newSymbolized->addChild(group);
-                    }
-                }
-            }
-            break;
-
-            case Geometry::TYPE_POLYGON:
-            {
-                const MarkerPolygonSymbol* poly = state->getStyle()->getSymbol<MarkerPolygonSymbol>();
-                if (poly)
-                {
-                    if (poly && part->size() && !poly->marker().value().empty())
-                    {
-                        osg::Node* node = getNode(poly->marker().value());
-                        if (!node) {
-                            osg::notify(osg::WARN) << "can't load Marker Node " << poly->marker().value() << std::endl;
-                            continue;
-                        }
-                        float interval = poly->interval().value();
-                        if (!interval)
-                            interval = 1.0;
-
-                        float randomRatio = poly->randomRatio().value();
-
-                        osg::Group* group = new osg::Group;
-                        osg::BoundingBox bb;
-                        for (osg::Vec3dArray::iterator it = part->begin(); it != part->end(); ++it) 
-                        {
-                            bb.expandBy(*it);
-                        }
-
-                        // use a grid on x and y
-                        osg::Vec3d startOnGrid = bb.corner(0);
-                        float sizex = bb.xMax() - bb.xMin();
-                        float sizey = bb.yMax() - bb.yMin();
-                        int numX = static_cast<int>(floorf(sizex / interval));
-                        int numY = static_cast<int>(floorf(sizey / interval));
-                        for (int y = 0; y < numY; ++y)
-                        {
-                            for (int x = 0; x < numX; ++x)
-                            {
-
-
-                                // get two random number in interval
-                                osg::Vec3d randOffset(0, 0, 0);
-                                randOffset = osg::Vec3d(getRandomValueInRange(1.0), getRandomValueInRange(1.0), 0);
-                                if (randOffset.length2() > 0.0)
-                                    randOffset.normalize();
-                                randOffset *= ( getRandomValueInRange( interval) ) * randomRatio;
-
-                                osg::Vec3d point = startOnGrid + randOffset + osg::Vec3d(x*interval, y*interval, 0);
-
-                                if (pointInPolygon(point, part))
-                                {
-
-                                    osg::MatrixTransform* tr = new osg::MatrixTransform;
-                                    tr->setMatrix(osg::Matrix::translate(point));
-                                    tr->addChild(node);
-                                    group->addChild(tr);
-                                }
-                            }
-                        }
-                        newSymbolized->addChild(group);
-                    }
-                }
-            }
-            break;
-
-            default:
-                break;
-
-            }
-        }
-    }
-
-    if (newSymbolized->getNumChildren())
-    {
-        attachPoint->removeChildren(0, attachPoint->getNumChildren());
-        attachPoint->addChild(newSymbolized.get());
-        return true;
-    }
-
-    return false;
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshConsolidator osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshConsolidator
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshConsolidator	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshConsolidator	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshConsolidator.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshConsolidator.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshConsolidator.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshConsolidator.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -89,6 +89,7 @@
     osg::Array* convertToBindPerVertex( TYPE* src, unsigned int numVerts)
     {
         TYPE* result = new TYPE();
+        result->setBinding(osg::Array::BIND_PER_VERTEX);
         result->reserve(numVerts);
         for (unsigned int i = 0; i < numVerts; i++)
         {
@@ -239,9 +240,9 @@
 
         // check that everything is bound per-vertex or convert bind overall
 
-        if ( geom.getColorArray() != 0L && geom.getColorBinding() != osg::Geometry::BIND_PER_VERTEX )
+        if (geom.getColorArray() && geom.getColorArray()->getBinding() != osg::Array::BIND_PER_VERTEX)
         {
-            if (geom.getColorBinding() == osg::Geometry::BIND_OVERALL)
+            if (geom.getColorArray()->getBinding() == osg::Array::BIND_OVERALL)
             {
                 geom.setColorArray(makeBindPerVertex(geom.getColorArray(), vertexArray->size()));
             }
@@ -251,9 +252,9 @@
             }
         }
 
-        if ( geom.getNormalArray() != 0L && geom.getNormalBinding() != osg::Geometry::BIND_PER_VERTEX )
+        if (geom.getNormalArray() && geom.getNormalArray()->getBinding() != osg::Array::BIND_PER_VERTEX)
         {
-            if (geom.getNormalBinding() == osg::Geometry::BIND_OVERALL)
+            if (geom.getNormalArray()->getBinding() == osg::Array::BIND_OVERALL)
             {
                 geom.setNormalArray(makeBindPerVertex(geom.getNormalArray(), vertexArray->size()));
             }
@@ -263,9 +264,9 @@
             }
         }
 
-        if ( geom.getSecondaryColorArray() != 0L && geom.getSecondaryColorBinding() != osg::Geometry::BIND_PER_VERTEX )
+        if (geom.getSecondaryColorArray() && geom.getSecondaryColorArray()->getBinding() != osg::Array::BIND_PER_VERTEX)
         {
-            if (geom.getSecondaryColorBinding() == osg::Geometry::BIND_OVERALL)
+            if (geom.getSecondaryColorArray()->getBinding() == osg::Array::BIND_OVERALL)
             {
                 geom.setSecondaryColorArray(makeBindPerVertex(geom.getSecondaryColorArray(), vertexArray->size()));
             }
@@ -396,7 +397,7 @@
         bool                          useVBOs,
         DrawableList&                 results )
     {
-        osg::Geometry::AttributeBinding newColorsBinding, newNormalsBinding;
+        osg::Array::Binding newColorsBinding, newNormalsBinding;
 
         osg::Vec3Array* newVerts = new osg::Vec3Array();
         newVerts->reserve( numVerts );
@@ -426,9 +427,7 @@
         {
             newColors = new osg::Vec4Array();
             newColors->reserve( numVerts );
-            newColorsBinding = osg::Geometry::BIND_PER_VERTEX;
-            //newColors->reserve( numColors==numVerts? numColors : 1 );
-            //newColorsBinding = numColors==numVerts? osg::Geometry::BIND_PER_VERTEX : osg::Geometry::BIND_OVERALL;
+            newColorsBinding = osg::Array::BIND_PER_VERTEX;
         }
 
         osg::Vec3Array* newNormals =0L;
@@ -436,9 +435,7 @@
         {
             newNormals = new osg::Vec3Array();
             newNormals->reserve( numVerts );
-            newNormalsBinding = osg::Geometry::BIND_PER_VERTEX;
-            //newNormals->reserve( numNormals==numVerts? numNormals : 1 );
-            //newNormalsBinding = numNormals==numVerts? osg::Geometry::BIND_PER_VERTEX : osg::Geometry::BIND_OVERALL;
+            newNormalsBinding = osg::Array::BIND_PER_VERTEX;
         }
 
         std::vector<osg::Array*> newTexCoordsArrays;
@@ -488,7 +485,7 @@
                     osg::Vec4Array* colors = dynamic_cast<osg::Vec4Array*>( geom->getColorArray() );
                     if ( colors )
                     {
-                        if ( newColorsBinding == osg::Geometry::BIND_PER_VERTEX )
+                        if ( newColorsBinding == osg::Array::BIND_PER_VERTEX )
                         {
                             std::copy( colors->begin(), colors->end(), std::back_inserter(*newColors) );
                         }
@@ -504,7 +501,7 @@
                     osg::Vec3Array* normals = dynamic_cast<osg::Vec3Array*>( geom->getNormalArray() );
                     if ( normals )
                     {
-                        if ( newNormalsBinding == osg::Geometry::BIND_PER_VERTEX )
+                        if ( newNormalsBinding == osg::Array::BIND_PER_VERTEX )
                         {
                             std::copy( normals->begin(), normals->end(), std::back_inserter(*newNormals) );
                         }
@@ -596,14 +593,14 @@
 
         if ( newColors )
         {
+            newColors->setBinding( newColorsBinding );
             newGeom->setColorArray( newColors );
-            newGeom->setColorBinding( newColorsBinding );
         }
 
         if ( newNormals )
         {
+            newNormals->setBinding(newNormalsBinding);
             newGeom->setNormalArray( newNormals );
-            newGeom->setNormalBinding( newNormalsBinding );
         }
 
         if ( newTexCoordsArrays.size() > 0 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshFlattener osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshFlattener
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshFlattener	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshFlattener	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -84,7 +84,7 @@
     public:
         static void run( osg::Group* group );
 
-        /** Run the flattener and indicate the target vertex cound for the MergeGeometry stage. */
+        /** Run the flattener and indicate the target vertex count for the MergeGeometry stage. */
         static void run(osg::Group* group, unsigned maxVertsPerCluster);
     };
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshFlattener.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshFlattener.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshFlattener.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshFlattener.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -194,7 +194,7 @@
         {
             // Run MERGE_GEOMETRY so that it will merge all the primitive sets
             osgUtil::Optimizer::MergeGeometryVisitor mg;
-            mg.setTargetMaximumNumberOfVertices(std::max(_maxVertsPerCluster, 1000u));
+            mg.setTargetMaximumNumberOfVertices(osg::maximum(_maxVertsPerCluster, 1000u));
             result->accept( mg );
 
             // Remove any empty geoetries. For some reason the MergeGeometryVisitor sometimes 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshSubdivider osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshSubdivider
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshSubdivider	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshSubdivider	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshSubdivider.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshSubdivider.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/MeshSubdivider.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/MeshSubdivider.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -62,7 +62,7 @@
     void
     geodeticMidpoint( const osg::Vec2d& g0, const osg::Vec2d& g1, osg::Vec2d& out_mid )
     {
-        if ( fabs(g0.x()-g1.x()) < osg::PI )
+        if ( fabs(g0.x()-g1.x()) <= osg::PI )
             out_mid.set( 0.5*(g0.x()+g1.x()), 0.5*(g0.y()+g1.y()) );
         else if ( g1.x() > g0.x() )
             out_mid.set( 0.5*((g0.x()+2*osg::PI)+g1.x()), 0.5*(g0.y()+g1.y()) );
@@ -516,7 +516,7 @@
             if ( !ebo )
             {
                 ebo = new ETYPE( GL_LINE_STRIP );
-                ebo->reserve( std::min(numElementsTotal-numElementsWritten, maxElementsPerEBO+1) );
+                ebo->reserve( osg::minimum(numElementsTotal-numElementsWritten, maxElementsPerEBO+1) );
                 numElementsInCurrentEBO = 0;
             }
 
@@ -554,7 +554,7 @@
         // collect all the line segments in the geometry.
         LineIndexFunctor<LineData> data;
         data.setSourceVerts( static_cast<osg::Vec3Array*>(geom.getVertexArray()) );
-        if ( geom.getColorBinding() == osg::Geometry::BIND_PER_VERTEX )
+        if (geom.getColorArray() && geom.getColorArray()->getBinding() == osg::Array::BIND_PER_VERTEX)
             data.setSourceColors( static_cast<osg::Vec4Array*>(geom.getColorArray()) );
         //LineFunctor<LineData> data;
         geom.accept( data );
@@ -683,9 +683,9 @@
         osg::TriangleIndexFunctor<TriangleData> data;;
         data.setSourceVerts(dynamic_cast<osg::Vec3Array*>(geom.getVertexArray()));
         data.setSourceTexCoords(dynamic_cast<osg::Vec2Array*>(geom.getTexCoordArray(0)));
-        if ( geom.getColorBinding() == osg::Geometry::BIND_PER_VERTEX )
+        if ( geom.getColorArray() && geom.getColorArray()->getBinding() == osg::Array::BIND_PER_VERTEX)
             data.setSourceColors(dynamic_cast<osg::Vec4Array*>(geom.getColorArray()));
-        if ( geom.getNormalBinding() == osg::Geometry::BIND_PER_VERTEX )
+        if (geom.getNormalArray() && geom.getNormalArray()->getBinding() == osg::Array::BIND_PER_VERTEX)
             data.setSourceNormals(dynamic_cast<osg::Vec3Array*>(geom.getNormalArray()));
 
         //TODO normals
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/ModelResource osgearth-2.10.2+dfsg/src/osgEarthSymbology/ModelResource
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/ModelResource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/ModelResource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/ModelResource.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/ModelResource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/ModelResource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/ModelResource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -43,8 +43,8 @@
 void
 ModelResource::mergeConfig( const Config& conf )
 {
-    conf.getIfSet("can_scale_to_fit_xy", _canScaleToFitXY);
-    conf.getIfSet("can_scale_to_fit_z",  _canScaleToFitZ);
+    conf.get("can_scale_to_fit_xy", _canScaleToFitXY);
+    conf.get("can_scale_to_fit_z",  _canScaleToFitZ);
 }
 
 Config
@@ -52,8 +52,8 @@
 {
     Config conf = InstanceResource::getConfig();
     conf.key() = "model";
-    conf.addIfSet("can_scale_to_fit_xy", _canScaleToFitXY);
-    conf.addIfSet("can_scale_to_fit_z",  _canScaleToFitZ);
+    conf.set("can_scale_to_fit_xy", _canScaleToFitXY);
+    conf.set("can_scale_to_fit_z",  _canScaleToFitZ);
     return conf;
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/ModelSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/ModelSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/ModelSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/ModelSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/ModelSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/ModelSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/ModelSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/ModelSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -66,46 +66,46 @@
 {
     Config conf = InstanceSymbol::getConfig();
     conf.key() = "model";
-    conf.addObjIfSet( "heading",    _heading );
-    conf.addObjIfSet( "pitch",      _pitch );
-    conf.addObjIfSet( "roll",       _roll );
-    conf.addObjIfSet( "name",       _name );
+    conf.set( "heading",    _heading );
+    conf.set( "pitch",      _pitch );
+    conf.set( "roll",       _roll );
+    conf.set( "name",       _name );
     
-    conf.addIfSet( "auto_scale", _autoScale );
-	conf.addIfSet( "min_auto_scale", _minAutoScale );
-	conf.addIfSet( "max_auto_scale", _maxAutoScale );
-    conf.addIfSet( "alias_map", _uriAliasMap );
+    conf.set( "auto_scale", _autoScale );
+	conf.set( "min_auto_scale", _minAutoScale );
+	conf.set( "max_auto_scale", _maxAutoScale );
+    conf.set( "alias_map", _uriAliasMap );
 
-    conf.addIfSet( "max_size_x", _maxSizeX );
-    conf.addIfSet( "max_size_y", _maxSizeY );
+    conf.set( "max_size_x", _maxSizeX );
+    conf.set( "max_size_y", _maxSizeY );
     
-    conf.addObjIfSet( "scale_x", _scaleX );
-    conf.addObjIfSet( "scale_y", _scaleY );
-    conf.addObjIfSet( "scale_z", _scaleZ );
+    conf.set( "scale_x", _scaleX );
+    conf.set( "scale_y", _scaleY );
+    conf.set( "scale_z", _scaleZ );
 
-    conf.addNonSerializable( "ModelSymbol::node", _node.get() );
+    conf.setNonSerializable( "ModelSymbol::node", _node.get() );
     return conf;
 }
 
 void 
 ModelSymbol::mergeConfig( const Config& conf )
 {
-    conf.getObjIfSet( "heading", _heading );
-    conf.getObjIfSet( "pitch",   _pitch );
-    conf.getObjIfSet( "roll",    _roll );
-    conf.getObjIfSet( "name",    _name );
-
-    conf.getIfSet( "max_size_x", _maxSizeX );
-    conf.getIfSet( "max_size_y", _maxSizeY );
-
-    conf.getIfSet( "auto_scale", _autoScale );
-	conf.getIfSet( "min_auto_scale", _minAutoScale);
-	conf.getIfSet( "max_auto_scale", _maxAutoScale);
-    conf.getIfSet( "alias_map", _uriAliasMap );
+    conf.get( "heading", _heading );
+    conf.get( "pitch",   _pitch );
+    conf.get( "roll",    _roll );
+    conf.get( "name",    _name );
+
+    conf.get( "max_size_x", _maxSizeX );
+    conf.get( "max_size_y", _maxSizeY );
+
+    conf.get( "auto_scale", _autoScale );
+	conf.get( "min_auto_scale", _minAutoScale);
+	conf.get( "max_auto_scale", _maxAutoScale);
+    conf.get( "alias_map", _uriAliasMap );
     
-    conf.getObjIfSet( "scale_x", _scaleX );
-    conf.getObjIfSet( "scale_y", _scaleY );
-    conf.getObjIfSet( "scale_z", _scaleZ );
+    conf.get( "scale_x", _scaleX );
+    conf.get( "scale_y", _scaleY );
+    conf.get( "scale_z", _scaleZ );
 
     _node = conf.getNonSerializable<osg::Node>( "ModelSymbol::node" );
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/PointSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/PointSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/PointSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/PointSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -46,6 +46,10 @@
         optional<float>& size() { return _size; }
         const optional<float>& size() const { return _size; }
 
+        /** Smoothing (antialiasing/rounding) */
+        optional<bool>& smooth() { return _smooth; }
+        const optional<bool>& smooth() const { return _smooth; }
+
     public:
         virtual Config getConfig() const;
         virtual void mergeConfig( const Config& conf );
@@ -54,6 +58,7 @@
     protected:
         optional<Fill>  _fill;
         optional<float> _size;
+        optional<bool>  _smooth;
     };
 
 } } // namespace osgEarth::Symbology
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/PointSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/PointSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/PointSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/PointSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -27,14 +27,16 @@
 PointSymbol::PointSymbol(const PointSymbol& rhs,const osg::CopyOp& copyop):
 Symbol(rhs, copyop),
 _fill(rhs._fill),
-_size(rhs._size)
+_size(rhs._size),
+_smooth(rhs._smooth)
 {
 }
 
 PointSymbol::PointSymbol( const Config& conf ) :
 Symbol( conf ),
 _fill ( Fill() ), 
-_size ( 1.0 )
+_size ( 1.0 ),
+_smooth( false )
 {
     mergeConfig(conf);
 }
@@ -44,16 +46,18 @@
 {
     Config conf = Symbol::getConfig();
     conf.key() = "point";
-    conf.addObjIfSet( "fill", _fill );
-    conf.addIfSet( "size", _size );
+    conf.set( "fill", _fill );
+    conf.set( "size", _size );
+    conf.set( "smooth", _smooth );
     return conf;
 }
 
 void 
 PointSymbol::mergeConfig( const Config& conf )
 {
-    conf.getObjIfSet( "fill", _fill );
-    conf.getIfSet( "size", _size );
+    conf.get( "fill", _fill );
+    conf.get( "size", _size );
+    conf.get( "smooth", _smooth );
 }
 
 
@@ -72,5 +76,8 @@
     else if ( match(c.key(), "point-script") ) {
         style.getOrCreate<PointSymbol>()->script() = StringExpression(c.value());
     }
+    else if (match(c.key(), "point-smooth")) {
+        style.getOrCreate<PointSymbol>()->smooth() = as<bool>(c.value(), false);
+    }
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/PolygonSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/PolygonSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/PolygonSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/PolygonSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/PolygonSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/PolygonSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/PolygonSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/PolygonSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -45,16 +45,16 @@
 {
     Config conf = Symbol::getConfig();
     conf.key() = "polygon";
-    conf.addObjIfSet( "fill", _fill );
-    conf.addIfSet("outline", _outline);
+    conf.set( "fill", _fill );
+    conf.set("outline", _outline);
     return conf;
 }
 
 void 
 PolygonSymbol::mergeConfig(const Config& conf )
 {
-    conf.getObjIfSet( "fill", _fill );
-    conf.getIfSet("outline", _outline);
+    conf.get( "fill", _fill );
+    conf.get("outline", _outline);
 }
 
 void
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Query osgearth-2.10.2+dfsg/src/osgEarthSymbology/Query
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Query	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Query	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -21,8 +21,6 @@
 #define OSGEARTHSYMBOLOGY_QUERY_H 1
 
 #include <osgEarthSymbology/Common>
-#include <osgEarth/Config>
-#include <osgEarth/Map>
 #include <osgEarth/GeoData>
 #include <osgEarth/TileKey>
 
@@ -62,17 +60,9 @@
 
         /** The maximum number of features to be returned by this Query.  This is driver specific . */
         optional<int>& limit() { return _limit; }
-        const optional<int>& limit() const { return _limit; }
+        const optional<int>& limit() const { return _limit; }        
 
-        const MapFrame& getMap() const { return _mapFrame; }
-
-        void setMap(const Map* map);
-        void setMap(const MapFrame& frame);
-        
-
-        /**
-         * Merges this query with another query, and returns the result
-         */
+        /** Merges this query with another query, and returns the result */
         Query combineWith( const Query& other ) const;
 
     public: // configurable
@@ -86,9 +76,10 @@
         optional<std::string> _orderby;
         optional<osgEarth::TileKey> _tileKey;
         optional<int> _limit;
-        MapFrame _mapFrame;
     };
 
 } } // namespace osgEarth::Symbology
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Symbology::Query);
+
 #endif // OSGEARTHSYMBOLOGY_QUERY_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Query.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/Query.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Query.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Query.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -31,7 +31,6 @@
 _expression(rhs._expression),
 _orderby(rhs._orderby),
 _tileKey(rhs._tileKey),
-_mapFrame(rhs._mapFrame),
 _limit(rhs._limit)
 {
     //nop
@@ -40,12 +39,12 @@
 void
 Query::mergeConfig( const Config& conf )
 {
-    if ( !conf.getIfSet( "expr", _expression ) )
-        if ( !conf.getIfSet( "where", _expression ) )
-            if ( !conf.getIfSet( "sql", _expression ) )
-                conf.getIfSet( "expression", _expression );
+    if ( !conf.get( "expr", _expression ) )
+        if ( !conf.get( "where", _expression ) )
+            if ( !conf.get( "sql", _expression ) )
+                conf.get( "expression", _expression );
 
-    conf.getIfSet("orderby", _orderby);
+    conf.get("orderby", _orderby);
 
     Config b = conf.child( "extent" );
     if( !b.empty() )
@@ -57,16 +56,16 @@
             b.value<double>( "ymax", 0.0 ) );
     }
 
-    conf.getIfSet("limit", _limit);
+    conf.get("limit", _limit);
 }
 
 Config
 Query::getConfig() const
 {
     Config conf( "query" );
-    conf.addIfSet( "expr", _expression );
-    conf.addIfSet( "orderby", _orderby);
-    conf.addIfSet( "limit", _limit);
+    conf.set( "expr", _expression );
+    conf.set( "orderby", _orderby);
+    conf.set( "limit", _limit);
     if ( _bounds.isSet() ) {
         Config bc( "extent" );
         bc.add( "xmin", toString(_bounds->xMin()) );
@@ -131,14 +130,3 @@
 
     return merged;
 }
-
-void Query::setMap(const Map* map)
-{
-    _mapFrame.setMap(map);
-}
-
-void Query::setMap(const MapFrame& mapf)
-{
-    _mapFrame = mapf;
-}
-
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/RenderSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/RenderSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/RenderSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/RenderSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -85,6 +85,10 @@
         optional<Angle>& maxCreaseAngle() { return _maxCreaseAngle; }
         const optional<Angle>& maxCreaseAngle() const { return _maxCreaseAngle; }
 
+        /** maximum visibility altitude */
+        optional<Distance>& maxAltitude() { return _maxAltitude; }
+        const optional<Distance>& maxAltitude() const { return _maxAltitude; }
+
     public:
         virtual Config getConfig() const;
         virtual void mergeConfig( const Config& conf );
@@ -102,6 +106,7 @@
         optional<bool>               _transparent;
         optional<bool>               _decal;
         optional<Angle>              _maxCreaseAngle;
+        optional<Distance>           _maxAltitude;
         
         /** dtor */
         virtual ~RenderSymbol() { }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/RenderSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/RenderSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/RenderSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/RenderSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -36,7 +36,8 @@
 _renderBin(rhs._renderBin),
 _transparent(rhs._transparent),
 _decal(rhs._decal),
-_maxCreaseAngle(rhs._maxCreaseAngle)
+_maxCreaseAngle(rhs._maxCreaseAngle),
+_maxAltitude(rhs._maxAltitude)
 {
 }
 
@@ -50,7 +51,8 @@
 _minAlpha       ( 0.0f ),
 _transparent    ( false ),
 _decal          ( false ),
-_maxCreaseAngle ( 0.0 )
+_maxCreaseAngle ( 0.0 ),
+_maxAltitude    ( Distance(FLT_MAX, Units::METERS) )
 {
     mergeConfig(conf);
 }
@@ -60,34 +62,36 @@
 {
     Config conf = Symbol::getConfig();
     conf.key() = "render";
-    conf.addIfSet   ( "depth_test",       _depthTest );
-    conf.addIfSet   ( "lighting",         _lighting );
-    conf.addObjIfSet( "depth_offset",     _depthOffset );
-    conf.addIfSet   ( "backface_culling", _backfaceCulling );
-    conf.addObjIfSet( "order",            _order );
-    conf.addIfSet   ( "clip_plane",       _clipPlane );
-    conf.addIfSet   ( "min_alpha",        _minAlpha );
-    conf.addIfSet   ( "render_bin",       _renderBin );
-    conf.addIfSet   ( "transparent",      _transparent );
-    conf.addIfSet   ( "decal",            _decal);
-    conf.addIfSet   ("max_crease_angle",  _maxCreaseAngle);
+    conf.set( "depth_test",       _depthTest );
+    conf.set( "lighting",         _lighting );
+    conf.set( "depth_offset",     _depthOffset );
+    conf.set( "backface_culling", _backfaceCulling );
+    conf.set( "order",            _order );
+    conf.set( "clip_plane",       _clipPlane );
+    conf.set( "min_alpha",        _minAlpha );
+    conf.set( "render_bin",       _renderBin );
+    conf.set( "transparent",      _transparent );
+    conf.set( "decal",            _decal);
+    conf.set( "max_crease_angle", _maxCreaseAngle);
+    conf.set( "max_altitude",     _maxAltitude);
     return conf;
 }
 
 void 
 RenderSymbol::mergeConfig( const Config& conf )
 {
-    conf.getIfSet   ( "depth_test",       _depthTest );
-    conf.getIfSet   ( "lighting",         _lighting );
-    conf.getObjIfSet( "depth_offset",     _depthOffset );
-    conf.getIfSet   ( "backface_culling", _backfaceCulling );
-    conf.getObjIfSet( "order",            _order );
-    conf.getIfSet   ( "clip_plane",       _clipPlane );
-    conf.getIfSet   ( "min_alpha",        _minAlpha );
-    conf.getIfSet   ( "render_bin",       _renderBin );
-    conf.getIfSet   ( "transparent",      _transparent );
-    conf.getIfSet   ( "decal",            _decal);
-    conf.getIfSet   ("max_crease_angle",  _maxCreaseAngle);
+    conf.get( "depth_test",       _depthTest );
+    conf.get( "lighting",         _lighting );
+    conf.get( "depth_offset",     _depthOffset );
+    conf.get( "backface_culling", _backfaceCulling );
+    conf.get( "order",            _order );
+    conf.get( "clip_plane",       _clipPlane );
+    conf.get( "min_alpha",        _minAlpha );
+    conf.get( "render_bin",       _renderBin );
+    conf.get( "transparent",      _transparent );
+    conf.get( "decal",            _decal);
+    conf.get( "max_crease_angle", _maxCreaseAngle);
+    conf.get( "max_altitude",     _maxAltitude);
 }
 
 void
@@ -154,4 +158,9 @@
         if (Units::parse(c.value(), value, units, Units::METERS))
             style.getOrCreate<RenderSymbol>()->maxCreaseAngle() = Angle(value, units);
     }
+    else if (match(c.key(), "render-max-altitude")) {
+        float value; Units units;
+        if (Units::parse(c.value(), value, units, Units::METERS))
+            style.getOrCreate<RenderSymbol>()->maxAltitude() = Distance(value, units);
+    }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Resource osgearth-2.10.2+dfsg/src/osgEarthSymbology/Resource
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Resource	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Resource	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/ResourceCache osgearth-2.10.2+dfsg/src/osgEarthSymbology/ResourceCache
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/ResourceCache	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/ResourceCache	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 
 #include <osgEarthSymbology/Common>
 #include <osgEarthSymbology/Skins>
-#include <osgEarthSymbology/MarkerResource>
 #include <osgEarthSymbology/InstanceResource>
 #include <osgEarthSymbology/ResourceLibrary>
 #include <osgEarth/Containers>
@@ -69,7 +68,7 @@
         const CacheStats getInstanceStats() const { return _instanceCache.getStats(); }
 
         /**
-         * Fetches the StateSet implemention for an entire ResourceLibrary.  This will contain a Texture2DArray with all of the skins merged into it.
+         * Fetches the StateSet implementation for an entire ResourceLibrary.  This will contain a Texture2DArray with all of the skins merged into it.
          * @param library    The library 
          * @param output     Result goes here. 
          */
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/ResourceCache.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/ResourceCache.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/ResourceCache.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/ResourceCache.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Resource.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/Resource.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Resource.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Resource.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/ResourceLibrary osgearth-2.10.2+dfsg/src/osgEarthSymbology/ResourceLibrary
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/ResourceLibrary	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/ResourceLibrary	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 
 #include <osgEarthSymbology/Common>
 #include <osgEarthSymbology/Skins>
-#include <osgEarthSymbology/MarkerResource>
 #include <osgEarthSymbology/InstanceResource>
 #include <osgEarthSymbology/ModelResource>
 #include <osgEarthSymbology/ModelSymbol>
@@ -70,7 +69,7 @@
         void setName(const std::string& name) { _name = name; }
 
         /**
-         * Adds a resoure to the library.
+         * Adds a resource to the library.
          */
         void addResource( Resource* resource );
 
@@ -107,19 +106,6 @@
         SkinResource* getSkin( const SkinSymbol* symbol, Random& prng, const osgDB::Options* dbOptions =0L ) const;
 
 
-    public: // Marker resource functions (deprecated)
-
-        /**
-         * Finds and returns a marker reosurce by name.
-         */
-        MarkerResource* getMarker( const std::string& name, const osgDB::Options* dbOptions =0L ) const;
-
-        /**
-         * Returns a list of all marker resources in this library.
-         */
-        void getMarkers( MarkerResourceVector& output, const osgDB::Options* dbOptions =0L ) const;
-
-
     public: // Instance functions
 
         /**
@@ -155,7 +141,6 @@
         mutable Threading::ReadWriteMutex  _mutex;
 
         ResourceMap<SkinResource>          _skins;
-        ResourceMap<MarkerResource>        _markers;
         ResourceMap<InstanceResource>      _instances;
 
         bool matches( const SkinSymbol* symbol, SkinResource* skin ) const;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/ResourceLibrary.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/ResourceLibrary.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/ResourceLibrary.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/ResourceLibrary.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -55,7 +55,7 @@
     if (_name.empty())
         _name = conf.value( "name" );
 
-    conf.getIfSet( "url", _uri );
+    conf.get( "url", _uri );
 
     for( ConfigSet::const_iterator i = conf.children().begin(); i != conf.children().end(); ++i )
     {
@@ -64,11 +64,6 @@
         {
             addResource( new SkinResource(child) );
         }
-        else if ( child.key() == "marker" )
-        {
-            // to be decrepated
-            addResource( new MarkerResource(child) );
-        }
         else if ( child.key() == "model" )
         {
             addResource( new ModelResource(child) );
@@ -94,7 +89,7 @@
 
         if ( _uri.isSet() )
         {
-            conf.addIfSet( "url", _uri );
+            conf.set( "url", _uri );
         }
         else
         {
@@ -104,12 +99,6 @@
                 conf.add( res->getConfig() );
             }
 
-            for( ResourceMap<MarkerResource>::const_iterator i = _markers.begin(); i != _markers.end(); ++i )
-            {
-                MarkerResource* res = i->second.get();
-                conf.add( res->getConfig() );
-            }
-
             for( ResourceMap<InstanceResource>::const_iterator i = _instances.begin(); i != _instances.end(); ++i )
             {
                 InstanceResource* res = i->second.get();
@@ -128,11 +117,6 @@
         Threading::ScopedWriteLock exclusive(_mutex);
         _skins[resource->name()] = static_cast<SkinResource*>(resource);
     }
-    else if ( dynamic_cast<MarkerResource*>(resource) )
-    {
-        Threading::ScopedWriteLock exclusive(_mutex);
-        _markers[resource->name()] = static_cast<MarkerResource*>(resource);
-    }
     else if ( dynamic_cast<InstanceResource*>(resource) )
     {
         Threading::ScopedWriteLock exclusive(_mutex);
@@ -152,11 +136,6 @@
         Threading::ScopedWriteLock exclusive(_mutex);
         _skins.erase( resource->name() );
     }
-    else if ( dynamic_cast<MarkerResource*>( resource ) )
-    {
-        Threading::ScopedWriteLock exclusive(_mutex);
-        _markers.erase( resource->name() );
-    }
     else if ( dynamic_cast<InstanceResource*>( resource ) )
     {
         Threading::ScopedWriteLock exclusive(_mutex);
@@ -325,28 +304,6 @@
     return true;
 }
 
-MarkerResource*
-ResourceLibrary::getMarker( const std::string& name, const osgDB::Options* dbOptions ) const
-{
-    const_cast<ResourceLibrary*>(this)->initialize( dbOptions );
-    Threading::ScopedReadLock shared( _mutex );
-    ResourceMap<MarkerResource>::const_iterator i = _markers.find( name );
-    return i != _markers.end() ? i->second.get() : 0L;
-}
-
-void
-ResourceLibrary::getMarkers( MarkerResourceVector& output, const osgDB::Options* dbOptions ) const
-{
-    const_cast<ResourceLibrary*>(this)->initialize( dbOptions );
-    Threading::ScopedReadLock shared( _mutex );
-
-    output.clear();
-    output.reserve( _markers.size() );
-
-    for( ResourceMap<MarkerResource>::const_iterator i = _markers.begin(); i != _markers.end(); ++i )
-        output.push_back( i->second.get() );
-}
-
 InstanceResource*
 ResourceLibrary::getInstance( const std::string& name, const osgDB::Options* dbOptions ) const
 {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Skins osgearth-2.10.2+dfsg/src/osgEarthSymbology/Skins
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Skins	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Skins	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Skins.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/Skins.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Skins.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Skins.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -55,28 +55,28 @@
 void
 SkinResource::mergeConfig( const Config& conf )
 {
-    conf.getIfSet( "url",                 _imageURI );
-    conf.getIfSet( "image_width",         _imageWidth );
-    conf.getIfSet( "image_height",        _imageHeight );
-    conf.getIfSet( "min_object_height",   _minObjHeight );
-    conf.getIfSet( "max_object_height",   _maxObjHeight );
-    conf.getIfSet( "tiled",               _isTiled );
-    conf.getIfSet( "max_texture_span",    _maxTexSpan );
-
-    conf.getIfSet( "texture_mode", "decal",    _texEnvMode, osg::TexEnv::DECAL );
-    conf.getIfSet( "texture_mode", "modulate", _texEnvMode, osg::TexEnv::MODULATE );
-    conf.getIfSet( "texture_mode", "replace",  _texEnvMode, osg::TexEnv::REPLACE );
-    conf.getIfSet( "texture_mode", "blend",    _texEnvMode, osg::TexEnv::BLEND );
+    conf.get( "url",                 _imageURI );
+    conf.get( "image_width",         _imageWidth );
+    conf.get( "image_height",        _imageHeight );
+    conf.get( "min_object_height",   _minObjHeight );
+    conf.get( "max_object_height",   _maxObjHeight );
+    conf.get( "tiled",               _isTiled );
+    conf.get( "max_texture_span",    _maxTexSpan );
+
+    conf.get( "texture_mode", "decal",    _texEnvMode, osg::TexEnv::DECAL );
+    conf.get( "texture_mode", "modulate", _texEnvMode, osg::TexEnv::MODULATE );
+    conf.get( "texture_mode", "replace",  _texEnvMode, osg::TexEnv::REPLACE );
+    conf.get( "texture_mode", "blend",    _texEnvMode, osg::TexEnv::BLEND );
 
     // texture atlas support
-    conf.getIfSet( "image_bias_s",        _imageBiasS );
-    conf.getIfSet( "image_bias_t",        _imageBiasT );
-    conf.getIfSet( "image_layer",         _imageLayer );
-    conf.getIfSet( "image_scale_s",       _imageScaleS );
-    conf.getIfSet( "image_scale_t",       _imageScaleT );
+    conf.get( "image_bias_s",        _imageBiasS );
+    conf.get( "image_bias_t",        _imageBiasT );
+    conf.get( "image_layer",         _imageLayer );
+    conf.get( "image_scale_s",       _imageScaleS );
+    conf.get( "image_scale_t",       _imageScaleT );
 
-    conf.getIfSet( "atlas", _atlasHint );
-    conf.getIfSet( "read_options", _readOptions );
+    conf.get( "atlas", _atlasHint );
+    conf.get( "read_options", _readOptions );
 }
 
 Config
@@ -271,13 +271,13 @@
 void 
 SkinSymbol::mergeConfig( const Config& conf )
 {
-    conf.getIfSet( "library",             _library );
-    conf.getIfSet( "object_height",       _objHeight );
-    conf.getIfSet( "min_object_height",   _minObjHeight );
-    conf.getIfSet( "max_object_height",   _maxObjHeight );
-    conf.getIfSet( "tiled",               _isTiled );
-    conf.getIfSet( "random_seed",         _randomSeed );
-    conf.getObjIfSet( "name",                _name );
+    conf.get( "library",             _library );
+    conf.get( "object_height",       _objHeight );
+    conf.get( "min_object_height",   _minObjHeight );
+    conf.get( "max_object_height",   _maxObjHeight );
+    conf.get( "tiled",               _isTiled );
+    conf.get( "random_seed",         _randomSeed );
+    conf.get( "name",                _name );
 
     addTags( conf.value("tags" ) );
 }
@@ -288,13 +288,13 @@
     Config conf = Symbol::getConfig();
     conf.key() = "skin";
 
-    conf.addIfSet( "library",             _library );
-    conf.addIfSet( "object_height",       _objHeight );
-    conf.addIfSet( "min_object_height",   _minObjHeight );
-    conf.addIfSet( "max_object_height",   _maxObjHeight );
-    conf.addIfSet( "tiled",               _isTiled );
-    conf.addIfSet( "random_seed",         _randomSeed );
-    conf.addObjIfSet( "name",                _name );
+    conf.set( "library",             _library );
+    conf.set( "object_height",       _objHeight );
+    conf.set( "min_object_height",   _minObjHeight );
+    conf.set( "max_object_height",   _maxObjHeight );
+    conf.set( "tiled",               _isTiled );
+    conf.set( "random_seed",         _randomSeed );
+    conf.set( "name",                _name );
 
     std::string tagstring = this->tagString();
     if ( !tagstring.empty() )
@@ -333,83 +333,3 @@
         style.getOrCreate<SkinSymbol>()->name() = StringExpression(c.value());
     }
 }
-
-#if 0
-//---------------------------------------------------------------------------
-SkinTextureArray::SkinTextureArray()
-{        
-}
-
-osg::Texture2DArray* SkinTextureArray::getTexture()
-{
-    return _texture.get();
-}
-
-int SkinTextureArray::getSkinIndex( const SkinResource* skin )
-{
-    LayerIndex::iterator itr = _layerIndex.find( skin->name());
-    if (itr != _layerIndex.end())
-    {
-        return itr->second;
-    }        
-    return -1;
-}
-
-void SkinTextureArray::build(SkinResourceVector& skins, const osgDB::Options* dbOptions)
-{        
-    _texture = 0;
-    _layerIndex.clear();
-
-    unsigned int maxWidth = 0;
-    unsigned int maxHeight = 0;
-
-    std::vector< osg::ref_ptr< osg::Image > > images;
-
-    for (unsigned int i = 0; i < skins.size(); i++)
-    {
-        osg::ref_ptr< osg::Image > image = skins[i]->createImage( dbOptions );
-        if (image.valid())
-        {
-            if (maxWidth < image->s()) maxWidth = image->s();
-            if (maxHeight < image->t()) maxHeight = image->t();            
-            _layerIndex[ skins[i]->name() ] = i;
-            images.push_back( image.get() );
-        }
-    }
-
-    // Now resize all the images to the largest size.
-    for (unsigned int i = 0; i < images.size(); i++)
-    {
-        osg::ref_ptr< osg::Image> resized;
-        if (images[i]->s() != maxWidth || images[i]->t() != maxHeight)
-        {            
-            OE_DEBUG << "resizing image to " << maxWidth << "x" << maxHeight << std::endl;
-            ImageUtils::resizeImage( images[i].get(), maxWidth, maxHeight, resized, 0, true);
-        }        
-        else
-        {
-             resized = images[i].get();
-        }
-        resized = ImageUtils::convertToRGBA8( resized.get() );
-        images[i] = resized.get();
-    }
-
-    osg::Texture2DArray* texture = new osg::Texture2DArray();
-    texture->setTextureDepth( images.size() );
-    texture->setTextureWidth( maxWidth );
-    texture->setTextureHeight( maxHeight );
-    texture->setSourceFormat( GL_RGBA );
-    texture->setInternalFormat( GL_RGBA8 );
-
-    texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR_MIPMAP_LINEAR);
-    texture->setFilter(osg::Texture::MAG_FILTER,osg::Texture::LINEAR);
-    texture->setWrap(osg::Texture::WRAP_S,osg::Texture::REPEAT);
-    texture->setWrap(osg::Texture::WRAP_T,osg::Texture::REPEAT);
-    texture->setResizeNonPowerOfTwoHint(false);
-    for (unsigned int i = 0; i < images.size(); i++)
-    {
-        texture->setImage(i, images[i].get() );
-    }
-    _texture = texture;
-}
-#endif
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/StencilVolumeNode osgearth-2.10.2+dfsg/src/osgEarthSymbology/StencilVolumeNode
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/StencilVolumeNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/StencilVolumeNode	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#ifndef OSGEARTHSYMBOLOGY_STENCIL_VOLUME_NODE_H
-#define OSGEARTHSYMBOLOGY_STENCIL_VOLUME_NODE_H 1
-
-#include <osgEarthSymbology/Common>
-#include <osgEarthSymbology/Geometry>
-#include <osgEarth/MaskNode>
-#include <osgEarth/ThreadingUtils>
-#include <osg/Group>
-#include <osg/Vec4>
-#include <queue>
-
-namespace osgEarth { namespace Symbology 
-{
-    class OSGEARTHSYMBOLOGY_EXPORT StencilVolumeNode : public osgEarth::MaskNode
-    {
-    public:
-        /**
-         * Constructs a stencil masking node.
-         *
-         * @param preRenderChildrenToDepthBuffer
-         *     Normally, this node will render the stencil volumes first and then
-         *     render the children (which will be masked by the stencil). If you need
-         *     to pre-render the children to the depth buffer, set this to TRUE. You
-         *     need to do this is you are creating a straight render mask.
-         *
-         * @param inverted
-         *     Inverts the stencil buffer, masking the opposite pixels that would
-         *     normally be masked.
-         */
-        StencilVolumeNode(
-            bool preRenderChildrenToDepthBuffer =false,
-            bool inverted =false );
-
-        /**
-         * Copy constructor
-         */
-        StencilVolumeNode( const StencilVolumeNode& rhs, const osg::CopyOp& op =osg::CopyOp::DEEP_COPY_ALL );
-
-        /** dtor */
-        virtual ~StencilVolumeNode() { }
-
-        META_Node(osgEarth::Symbology,StencilVolumeNode);
-        
-        //override
-        virtual void traverse( osg::NodeVisitor& nv );
-
-    public: // props
-
-        // sets the render bins and returns the next available bin.
-        int setBaseRenderBin( int bin );
-
-        // adds stenciling volume geometry (safely during the next update traversal, if necessary)
-        void addVolumes( osg::Node* node, bool onNextUpdate =true );
-   
-    public: // utilties
-
-        /**
-         * Generates a full screen quad that you can use to colorize 
-         * stencil volumes
-         */
-        static osg::Node* createFullScreenQuad( const osg::Vec4f& color );
-
-
-    public: //osg::Group overrides
-
-        virtual bool addChild( Node *child );
-        virtual bool insertChild( unsigned int index, Node *child );
-        virtual bool removeChildren(unsigned int pos,unsigned int numChildrenToRemove);
-        virtual bool replaceChild( Node *origChild, Node* newChild );
-        virtual bool setChild( unsigned  int i, Node* node );
-        virtual osg::BoundingSphere computeBound() const;
-
-    protected:
-        void init();
-
-        osg::ref_ptr<osg::Group> _root;
-        osg::Group* _stencilGroup1;
-        osg::Group* _stencilGroup2;
-        osg::Group* _depthPass;
-        osg::Group* _renderPass;
-        bool _inverted;
-        bool _preRenderChildrenToDepthBuffer;
-
-        Threading::Mutex _addVolumesMutex;
-        std::queue< osg::ref_ptr<osg::Node> > _volumesToAdd;
-        void addQueuedVolumes();
-    };
-
-
-} } // namespace osgEarth::Symbology
-
-#endif // OSGEARTHSYMBOLOGY_STENCIL_VOLUME_NODE_H
-
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/StencilVolumeNode.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/StencilVolumeNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/StencilVolumeNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/StencilVolumeNode.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,415 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#include <osgEarthSymbology/StencilVolumeNode>
-#include <osgEarth/Registry>
-#include <osgEarth/NodeUtils>
-#include <osgEarth/Capabilities>
-#include <osg/Stencil>
-#include <osg/StencilTwoSided>
-#include <osg/Depth>
-#include <osg/Drawable>
-#include <osg/CopyOp>
-#include <osg/CullFace>
-#include <osg/MatrixTransform>
-#include <osg/Projection>
-#include <osg/GLExtensions>
-#include <osg/Geode>
-#include <osg/Notify>
-#include <osgUtil/Tessellator>
-#include <algorithm>
-
-#define ON_AND_PROTECTED  osg::StateAttribute::ON | osg::StateAttribute::PROTECTED
-#define OFF_AND_PROTECTED osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED
-
-using namespace osgEarth;
-using namespace osgEarth::Symbology;
-
-/***************************************************************************/
-
-#define OFF_PROTECTED osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED
-
-osg::Node*
-StencilVolumeNode::createFullScreenQuad( const osg::Vec4f& color )
-{
-    // make a full screen quad:
-    osg::Geometry* quad = new osg::Geometry();
-    quad->setUseVertexBufferObjects(true);
-
-    osg::Vec3Array* verts = new osg::Vec3Array(4);
-    (*verts)[0].set( 0, 1, 0 );
-    (*verts)[1].set( 0, 0, 0 );
-    (*verts)[2].set( 1, 0, 0 );
-    (*verts)[3].set( 1, 1, 0 );
-    quad->setVertexArray( verts );
-    quad->addPrimitiveSet( new osg::DrawArrays( osg::PrimitiveSet::QUADS, 0, 4 ) );
-    osg::Vec4Array* colors = new osg::Vec4Array(1);
-    (*colors)[0] = color;
-    quad->setColorArray( colors );
-    quad->setColorBinding( osg::Geometry::BIND_OVERALL );
-    osg::Geode* quad_geode = new osg::Geode();
-    quad_geode->addDrawable( quad );
-
-    osg::StateSet* quad_ss = quad->getOrCreateStateSet();
-    quad_ss->setMode( GL_CULL_FACE, OFF_PROTECTED );
-    quad_ss->setMode( GL_DEPTH_TEST, OFF_PROTECTED );
-    quad_ss->setMode( GL_LIGHTING, OFF_PROTECTED );
-    osg::MatrixTransform* abs = new osg::MatrixTransform();
-    abs->setReferenceFrame( osg::Transform::ABSOLUTE_RF );
-    abs->setMatrix( osg::Matrix::identity() );
-    abs->addChild( quad_geode );
-
-    osg::Projection* proj = new osg::Projection();
-    proj->setMatrix( osg::Matrix::ortho(0, 1, 0, 1, 0, -1) );
-    proj->addChild( abs );
-
-    proj->getOrCreateStateSet()->setMode( GL_BLEND, 1 );    
-
-    return proj;
-}
-
-
-/***************************************************************************/
-
-StencilVolumeNode::StencilVolumeNode( bool preRenderChildrenToDepthBuffer, bool inverted ) :
-osgEarth::MaskNode(),
-_stencilGroup1( 0L ),
-_stencilGroup2( 0L ),
-_depthPass( 0L ),
-_renderPass( 0L ),
-_inverted( inverted ),
-_preRenderChildrenToDepthBuffer( preRenderChildrenToDepthBuffer )
-{
-    init();
-}
-
-StencilVolumeNode::StencilVolumeNode(const StencilVolumeNode& rhs,
-                                     const osg::CopyOp& op) :
-osgEarth::MaskNode( rhs, op ),
-_root( rhs._root.get() ),
-_stencilGroup1( rhs._stencilGroup1 ),
-_stencilGroup2( rhs._stencilGroup2 ),
-_depthPass( rhs._depthPass ),
-_renderPass( rhs._renderPass ),
-_inverted( rhs._inverted ),
-_preRenderChildrenToDepthBuffer( rhs._preRenderChildrenToDepthBuffer )
-{
-    //nop
-}
-
-int
-StencilVolumeNode::setBaseRenderBin( int bin )
-{
-    if ( _depthPass )
-    {
-        _depthPass->getOrCreateStateSet()->setRenderBinDetails( bin++, "RenderBin" );
-    }
-    if ( _stencilGroup1 )
-    {
-        _stencilGroup1->getOrCreateStateSet()->setRenderBinDetails( bin++, "RenderBin" );
-    }
-    if ( _stencilGroup2 )
-    {
-        _stencilGroup2->getOrCreateStateSet()->setRenderBinDetails( bin++, "RenderBin" );
-    }
-    if ( _renderPass )
-    {
-        _renderPass->getOrCreateStateSet()->setRenderBinDetails( bin++, "RenderBin" );
-    }
-    return bin;
-}
-
-void
-StencilVolumeNode::addVolumes( osg::Node* node, bool onNextUpdate )
-{
-    if ( onNextUpdate )
-    {
-        Threading::ScopedMutexLock lock( _addVolumesMutex );
-        _volumesToAdd.push( node );
-        ADJUST_UPDATE_TRAV_COUNT( this, 1 );
-    }
-    else
-    {
-        if ( _stencilGroup1 )
-            _stencilGroup1->addChild( node );
-        if ( _stencilGroup2 )
-            _stencilGroup2->addChild( node );
-    }
-}
-
-void
-StencilVolumeNode::addQueuedVolumes()
-{
-    Threading::ScopedMutexLock lock( _addVolumesMutex );
-    while( !_volumesToAdd.empty() )
-    {
-        osg::Node* node = _volumesToAdd.front().get();
-
-        if ( _stencilGroup1 )
-            _stencilGroup1->addChild( node );
-        if ( _stencilGroup2 )
-            _stencilGroup2->addChild( node );        
-
-        _volumesToAdd.pop();
-    }
-    
-    ADJUST_UPDATE_TRAV_COUNT( this, -1 );
-}
-
-/** Override all the osg::Group methods: */
-
-bool 
-StencilVolumeNode::addChild( Node *child ) {
-    if ( !child ) return false;
-    dirtyBound();
-    if ( _depthPass )  _depthPass->addChild( child );
-    return _renderPass->addChild( child );
-}
-bool 
-StencilVolumeNode::insertChild( unsigned int index, Node *child ) {
-    if ( !child ) return false;
-    dirtyBound();
-    if ( _depthPass ) _depthPass->insertChild( index, child );
-    return _renderPass->insertChild( index, child );
-}
-bool 
-StencilVolumeNode::removeChildren(unsigned int pos,unsigned int numChildrenToRemove) {
-    dirtyBound();
-    if ( _depthPass ) _depthPass->removeChildren( pos, numChildrenToRemove );
-    return _renderPass->removeChildren( pos, numChildrenToRemove );
-}
-bool 
-StencilVolumeNode::replaceChild( Node *origChild, Node* newChild ) {
-    dirtyBound();
-    if ( _depthPass ) _depthPass->replaceChild( origChild, newChild );
-    return _renderPass->replaceChild( origChild, newChild );
-}
-bool 
-StencilVolumeNode::setChild( unsigned  int i, Node* node ) {
-    dirtyBound();
-    if ( _depthPass ) _depthPass->setChild( i, node );
-    return _renderPass->setChild( i, node );
-}
-
-osg::BoundingSphere
-StencilVolumeNode::computeBound() const {
-    if ( _depthPass ) return _depthPass->computeBound();
-    else return _renderPass->computeBound();
-}
-
-
-void
-StencilVolumeNode::traverse( osg::NodeVisitor& nv )
-{
-    if ( nv.getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR && _volumesToAdd.size() > 0 )
-    {
-        addQueuedVolumes();
-    }
-
-    _root->accept( nv );
-}
-
-void
-StencilVolumeNode::init()
-{
-    this->getOrCreateStateSet()->setMode( GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED );
-
-    _root = new osg::Group();
-    int baseBin = 100;
-
-    // First, if we need to render the children to the depth buffer, create a depth
-    // buffer only pass. This is necessary if we are masking out terrain, for example. We have
-    // to populate the depth buffer before this algoritm can work.
-    if ( _preRenderChildrenToDepthBuffer )
-    {
-        _depthPass = new osg::Group();
-        _depthPass->setName( "StencilVolumeNode::depth_pass" );
-        osg::StateSet* ss = _depthPass->getOrCreateStateSet();
-        ss->setAttributeAndModes(new osg::ColorMask(false,false,false,false), ON_AND_PROTECTED);
-        //ss->setAttributeAndModes( new osg::CullFace(osg::CullFace::BACK), ON_AND_PROTECTED);
-        ss->setAttributeAndModes( new osg::Depth(osg::Depth::LESS), ON_AND_PROTECTED);
-        ss->setRenderBinDetails( baseBin++, "RenderBin" );
-
-        _root->addChild( _depthPass );
-    }
-
-    // Create the stenciled geometry pass:
-
-    // For now we are hard-coding these to what are hopefully "safe" values.
-    // In the future we hope to rewrite this as a custom StencilVolumeNode that 
-    // will automatically detect extension availability at draw time and choose
-    // the optimal GL rendering path.
-    const Capabilities& caps = osgEarth::Registry::instance()->getCapabilities();
-    bool s_EXT_stencil_wrap     = caps.supportsStencilWrap(); //true;
-    bool s_EXT_stencil_two_side = caps.supportsTwoSidedStencil(); //false;
-
-
-    // zFail=true if more compute intensive, but lets you get inside the volume.
-    // Again, a custom node will give us a better opportunity to choose between zFail and zPass based on
-    // the eye location (you only need zFail if you camera is inside the volume).
-#define zFail true
-
-    OE_DEBUG << "Stencil buffer wrap = " << s_EXT_stencil_wrap << std::endl;
-
-    if ( s_EXT_stencil_two_side )
-    {
-        OE_DEBUG << "Two-sided stenciling" << std::endl;
-
-        osg::StencilTwoSided::Operation incrOp = s_EXT_stencil_wrap ? osg::StencilTwoSided::INCR_WRAP : osg::StencilTwoSided::INCR;
-        osg::StencilTwoSided::Operation decrOp = s_EXT_stencil_wrap ? osg::StencilTwoSided::DECR_WRAP : osg::StencilTwoSided::DECR;
-        _stencilGroup1 = new osg::Group();
-        //osg::Group* stencil_group = new osg::Group();
-        osg::StateSet* ss = _stencilGroup1->getOrCreateStateSet();
-        ss->setRenderBinDetails( baseBin++, "RenderBin" );
-
-        if ( zFail )
-        {
-            osg::StencilTwoSided* stencil = new osg::StencilTwoSided();
-            stencil->setFunction(osg::StencilTwoSided::BACK, osg::StencilTwoSided::ALWAYS, 1, ~0u); 
-            stencil->setOperation(osg::StencilTwoSided::BACK, osg::StencilTwoSided::KEEP, incrOp, osg::StencilTwoSided::KEEP);
-
-            stencil->setFunction(osg::StencilTwoSided::FRONT, osg::StencilTwoSided::ALWAYS, 1, ~0u); 
-            stencil->setOperation(osg::StencilTwoSided::FRONT, osg::StencilTwoSided::KEEP, decrOp, osg::StencilTwoSided::KEEP);
-            ss->setAttributeAndModes( stencil, ON_AND_PROTECTED );
-        }
-        else
-        {
-            osg::StencilTwoSided* stencil = new osg::StencilTwoSided();
-            stencil->setFunction(osg::StencilTwoSided::FRONT, osg::StencilTwoSided::ALWAYS, 1, ~0u); 
-            stencil->setOperation(osg::StencilTwoSided::FRONT, osg::StencilTwoSided::KEEP, osg::StencilTwoSided::KEEP, incrOp);
-
-            stencil->setFunction(osg::StencilTwoSided::BACK, osg::StencilTwoSided::ALWAYS, 1, ~0u); 
-            stencil->setOperation(osg::StencilTwoSided::BACK, osg::StencilTwoSided::KEEP, osg::StencilTwoSided::KEEP, decrOp);
-            ss->setAttributeAndModes( stencil, ON_AND_PROTECTED );
-        }
-
-        ss->setAttributeAndModes(new osg::ColorMask(false,false,false,false), ON_AND_PROTECTED);
-        ss->setAttributeAndModes(new osg::Depth(osg::Depth::LESS,0,1,false), ON_AND_PROTECTED);
-
-        _root->addChild( _stencilGroup1 );
-    }
-    else
-    {
-        OE_INFO << "One-sided stenciling" << std::endl;
-
-        if ( !zFail )  // Z-Pass
-        {
-            _stencilGroup1 = new osg::Group();
-            osg::StateSet* front_ss = _stencilGroup1->getOrCreateStateSet();
-            front_ss->setRenderBinDetails( baseBin++, "RenderBin" );
-
-            // incrementing stencil op for front faces:
-            osg::Stencil* front_stencil = new osg::Stencil();
-            front_stencil->setFunction( osg::Stencil::ALWAYS, 1, ~0u );
-            osg::Stencil::Operation incrOp = s_EXT_stencil_wrap ? osg::Stencil::INCR_WRAP : osg::Stencil::INCR;
-            front_stencil->setOperation( osg::Stencil::KEEP, osg::Stencil::KEEP, incrOp );
-            front_ss->setAttributeAndModes( front_stencil, ON_AND_PROTECTED );
-
-            front_ss->setAttributeAndModes( new osg::ColorMask(false,false,false,false), ON_AND_PROTECTED);
-            front_ss->setAttributeAndModes( new osg::CullFace(osg::CullFace::BACK), ON_AND_PROTECTED);
-            front_ss->setAttributeAndModes( new osg::Depth(osg::Depth::LESS,0,1,false), ON_AND_PROTECTED);
-
-            _root->addChild( _stencilGroup1 );
-
-            // decrementing stencil op for back faces:
-            _stencilGroup2 = new osg::Group();
-            osg::StateSet* back_ss = _stencilGroup2->getOrCreateStateSet();
-            back_ss->setRenderBinDetails( baseBin++, "RenderBin" );
-
-            osg::Stencil* back_stencil = new osg::Stencil();
-            back_stencil->setFunction( osg::Stencil::ALWAYS, 1, ~0u );
-            osg::Stencil::Operation decrOp = s_EXT_stencil_wrap ? osg::Stencil::DECR_WRAP : osg::Stencil::DECR;
-            back_stencil->setOperation( osg::Stencil::KEEP, osg::Stencil::KEEP, decrOp );
-            back_ss->setAttributeAndModes( back_stencil, ON_AND_PROTECTED );
-
-            back_ss->setAttributeAndModes( new osg::ColorMask(false,false,false,false), ON_AND_PROTECTED);
-            back_ss->setAttributeAndModes( new osg::CullFace(osg::CullFace::FRONT), ON_AND_PROTECTED);
-            back_ss->setAttributeAndModes( new osg::Depth(osg::Depth::LESS,0,1,false), ON_AND_PROTECTED);
-
-            _root->addChild( _stencilGroup2 );    
-        }
-        else
-        {
-            // incrementing stencil op for back faces:
-            {
-                _stencilGroup1 = new osg::Group();
-                osg::StateSet* front_ss = _stencilGroup1->getOrCreateStateSet();
-                front_ss->setRenderBinDetails( baseBin++, "RenderBin" );
-
-                osg::Stencil* front_stencil = new osg::Stencil();
-                front_stencil->setFunction( osg::Stencil::ALWAYS ); //, 1, ~0u );
-                osg::Stencil::Operation incrOp = s_EXT_stencil_wrap ? osg::Stencil::INCR_WRAP : osg::Stencil::INCR;
-                front_stencil->setOperation( osg::Stencil::KEEP, incrOp, osg::Stencil::KEEP );
-                front_ss->setAttributeAndModes( front_stencil, ON_AND_PROTECTED );
-
-                front_ss->setAttributeAndModes( new osg::ColorMask(false,false,false,false), ON_AND_PROTECTED);
-                front_ss->setAttributeAndModes( new osg::CullFace(osg::CullFace::FRONT), ON_AND_PROTECTED);
-                front_ss->setAttributeAndModes( new osg::Depth(osg::Depth::LESS,0,1,false), ON_AND_PROTECTED);
-
-                _root->addChild( _stencilGroup1 );
-            }
-
-            // decrementing stencil buf for front faces
-            {
-                _stencilGroup2 = new osg::Group();
-                osg::StateSet* back_ss = _stencilGroup2->getOrCreateStateSet();
-                back_ss->setRenderBinDetails( baseBin++, "RenderBin" );
-
-                osg::Stencil* back_stencil = new osg::Stencil();
-                back_stencil->setFunction( osg::Stencil::ALWAYS ); //, 1, ~0u );
-                osg::Stencil::Operation decrOp = s_EXT_stencil_wrap ? osg::Stencil::DECR_WRAP : osg::Stencil::DECR;
-                back_stencil->setOperation( osg::Stencil::KEEP, decrOp, osg::Stencil::KEEP );
-                back_ss->setAttributeAndModes( back_stencil, ON_AND_PROTECTED );
-
-                back_ss->setAttributeAndModes( new osg::ColorMask(false,false,false,false), ON_AND_PROTECTED);
-                back_ss->setAttributeAndModes( new osg::CullFace(osg::CullFace::BACK), ON_AND_PROTECTED);
-                back_ss->setAttributeAndModes( new osg::Depth(osg::Depth::LESS,0,1,false), ON_AND_PROTECTED);
-
-                _root->addChild( _stencilGroup2 );
-            }
-        }
-    }
-    
-
-    // NOW build the full-screen quad mask that will paint the volume:
-
-    _renderPass = new osg::Group();
-    _renderPass->setName( "StencilVolumeNode::render_pass" );
-
-    osg::Stencil* quad_stencil = new osg::Stencil();
-    osg::Stencil::Function func = _inverted ? osg::Stencil::EQUAL : osg::Stencil::NOTEQUAL;
-    quad_stencil->setFunction( func, 128, (unsigned int)~0 );
-    // this will conveniently re-clear the stencil buffer in prep for the next pass:
-    quad_stencil->setOperation( osg::Stencil::REPLACE, osg::Stencil::REPLACE, osg::Stencil::REPLACE );
-
-    osg::StateSet* renderSS = _renderPass->getOrCreateStateSet();
-    renderSS->setAttributeAndModes( quad_stencil, ON_AND_PROTECTED );
-    renderSS->setRenderBinDetails( baseBin++, "RenderBin" );
-
-    // if we did a pre-render depth pass, adjust the depth buffer function to account for that
-    if ( _preRenderChildrenToDepthBuffer )
-    {
-        renderSS->setAttributeAndModes( new osg::Depth( osg::Depth::LEQUAL ), osg::StateAttribute::ON );
-    }
-
-    // testing
-    //renderSS->setMode( GL_DEPTH_TEST, OFF_AND_PROTECTED );
-    //renderSS->setAttributeAndModes( new osg::Depth( osg::Depth::ALWAYS ), ON_AND_PROTECTED );
-
-    _root->addChild( _renderPass );
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Stroke osgearth-2.10.2+dfsg/src/osgEarthSymbology/Stroke
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Stroke	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Stroke	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -98,6 +98,9 @@
         optional<unsigned short>& stipple() { return _stipplePattern; }
         const optional<unsigned short>& stipple() const { return _stipplePattern; }
 
+        /** Smoothing/antialiasing */
+        optional<bool>& smooth() { return _smooth; }
+        const optional<bool>& smooth() const { return _smooth; }
 
         /** Rounding ratio - when rounding corners/caps, this is the ratio
             of rounded-segment length to width(). The smaller this value,
@@ -119,10 +122,13 @@
         optional<unsigned short> _stipplePattern;
         optional<float>          _roundingRatio;
         optional<float>          _minPixels;
+        optional<bool>           _smooth;
 
         void init();
     };
 
 } } // namespace osgEarth::Symbology
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Symbology::Stroke);
+
 #endif // OSGEARTHSYMBOLOGY_STROKE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Stroke.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/Stroke.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Stroke.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Stroke.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -64,42 +64,45 @@
     _minPixels.init     ( 0.0f );
     _stipplePattern.init( 0xFFFF );
     _stippleFactor.init ( 1u );
+    _smooth.init        ( false );
 }
 
 Config 
 Stroke::getConfig() const {
     Config conf("stroke");
-    conf.add( "color", _color.toHTML() );
-    conf.addIfSet("linecap", "flat",   _lineCap, LINECAP_FLAT);
-    conf.addIfSet("linecap", "square", _lineCap, LINECAP_SQUARE);
-    conf.addIfSet("linecap", "round",  _lineCap, LINECAP_ROUND);
-    conf.addIfSet("linejoin", "mitre", _lineJoin, LINEJOIN_MITRE);
-    conf.addIfSet("linejoin", "round", _lineJoin, LINEJOIN_ROUND);
-    conf.addIfSet("width", _width);
-    conf.addIfSet("stipple_factor", _stippleFactor);
-    conf.addIfSet("stipple_pattern", _stipplePattern);
-    conf.addIfSet("rounding_ratio", _roundingRatio);
+    conf.set( "color", _color.toHTML() );
+    conf.set("linecap", "flat",   _lineCap, LINECAP_FLAT);
+    conf.set("linecap", "square", _lineCap, LINECAP_SQUARE);
+    conf.set("linecap", "round",  _lineCap, LINECAP_ROUND);
+    conf.set("linejoin", "mitre", _lineJoin, LINEJOIN_MITRE);
+    conf.set("linejoin", "round", _lineJoin, LINEJOIN_ROUND);
+    conf.set("width", _width);
+    conf.set("stipple_factor", _stippleFactor);
+    conf.set("stipple_pattern", _stipplePattern);
+    conf.set("rounding_ratio", _roundingRatio);
     if ( _widthUnits.isSet() )
-        conf.add( "width_units", _widthUnits->getAbbr() );
-    conf.addIfSet("min_pixels", _minPixels );
+        conf.set( "width_units", _widthUnits->getAbbr() );
+    conf.set("min_pixels", _minPixels );
+    conf.set("smooth", _smooth);
     return conf;
 }
 
 void 
 Stroke::mergeConfig( const Config& conf ) {
     _color = Color( conf.value("color") );
-    conf.getIfSet("linecap", "flat",   _lineCap, LINECAP_FLAT);
-    conf.getIfSet("linecap", "square", _lineCap, LINECAP_SQUARE);
-    conf.getIfSet("linecap", "round",  _lineCap, LINECAP_ROUND);
-    conf.getIfSet("linejoin", "mitre", _lineJoin, LINEJOIN_MITRE);
-    conf.getIfSet("linejoin", "miter", _lineJoin, LINEJOIN_MITRE); // alternate spelling
-    conf.getIfSet("linejoin", "round", _lineJoin, LINEJOIN_ROUND);
-    conf.getIfSet("width", _width);
-    conf.getIfSet("stipple", _stipplePattern); // back compat
-    conf.getIfSet("stipple_factor", _stippleFactor);
-    conf.getIfSet("stipple_pattern", _stipplePattern);
-    conf.getIfSet("rounding_ratio", _roundingRatio);
+    conf.get("linecap", "flat",   _lineCap, LINECAP_FLAT);
+    conf.get("linecap", "square", _lineCap, LINECAP_SQUARE);
+    conf.get("linecap", "round",  _lineCap, LINECAP_ROUND);
+    conf.get("linejoin", "mitre", _lineJoin, LINEJOIN_MITRE);
+    conf.get("linejoin", "miter", _lineJoin, LINEJOIN_MITRE); // alternate spelling
+    conf.get("linejoin", "round", _lineJoin, LINEJOIN_ROUND);
+    conf.get("width", _width);
+    conf.get("stipple", _stipplePattern); // back compat
+    conf.get("stipple_factor", _stippleFactor);
+    conf.get("stipple_pattern", _stipplePattern);
+    conf.get("rounding_ratio", _roundingRatio);
     if ( conf.hasValue("width_units" ) )
         Units::parse( conf.value("width_units"), _widthUnits.mutable_value() );
-    conf.getIfSet("min_pixels", _minPixels );
+    conf.get("min_pixels", _minPixels );
+    conf.get("smooth", _smooth);
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Style osgearth-2.10.2+dfsg/src/osgEarthSymbology/Style
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Style	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Style	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -26,7 +26,6 @@
 #include <osgEarthSymbology/PointSymbol>
 #include <osgEarthSymbology/LineSymbol>
 #include <osgEarthSymbology/PolygonSymbol>
-#include <osgEarthSymbology/MarkerSymbol>
 #include <osgEarthSymbology/ModelSymbol>
 #include <osgEarthSymbology/ExtrusionSymbol>
 #include <osgEarthSymbology/AltitudeSymbol>
@@ -42,6 +41,8 @@
 
 namespace osgEarth { namespace Symbology 
 {
+    class StyleSheet;
+
     /**
      * Style is an unordered collection of Symbols that describes how to render
      * geometry and other objects.
@@ -55,6 +56,9 @@
         /** Constructs a style by deserializing it from a Config. */
         Style(const Config& conf);
 
+        /** Constructs a stype by deserializing it from a Config. */
+        Style(const Config& conf, const StyleSheet* sheet);
+
         /** Copy constructor. By default, duplicates all the symbols; but if you 
             specify SHALLOW_COPY, the new one will point to the same symbols. */
         Style(const Style& rhs, const osg::CopyOp& op =osg::CopyOp::DEEP_COPY_ALL ); 
@@ -145,16 +149,16 @@
 
         template<typename T> T* getOrCreate() { return getOrCreateSymbol<T>(); } // alias
 
-	/** Access to list of symbols currently defining the style */
-	SymbolList& symbols() { return _symbols; }
-	const SymbolList& symbols() const { return _symbols; }
+        /** Access to list of symbols currently defining the style */
+        SymbolList& symbols() { return _symbols; }
+        const SymbolList& symbols() const { return _symbols; }
 
         /** Serializes this object into a Config. */
-        virtual Config getConfig( bool keepOrigType =true ) const;
+        virtual Config getConfig(bool keepOrigType = true) const;
 
-        void mergeConfig( const Config& conf );
+        void mergeConfig(const Config& conf, const StyleSheet* sheet);
 
-        void fromSLD(const Config&);
+        void fromSLD(const Config&, const StyleSheet*);
         
     protected:
         std::string                 _name;
@@ -169,5 +173,6 @@
 
 } } // namespace osgEarth::Symbology
 
+OSGEARTH_SPECIALIZE_CONFIG(osgEarth::Symbology::Style);
 
 #endif // OSGEARTHSYMBOLOGY_STYLE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Style.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/Style.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Style.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Style.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarthSymbology/Style>
+#include <osgEarthSymbology/StyleSheet>
 #include <osgEarthSymbology/CssUtils>
 #include <algorithm>
 
@@ -97,7 +98,12 @@
 
 Style::Style( const Config& conf )
 {
-    mergeConfig( conf );
+    mergeConfig( conf, 0L );
+}
+
+Style::Style( const Config& conf, const StyleSheet* sheet)
+{
+    mergeConfig( conf, sheet );
 }
 
 Style
@@ -126,19 +132,45 @@
 }
 
 void
-Style::fromSLD( const Config& sld )
+Style::fromSLD(const Config& sld, const StyleSheet* sheet)
 {
-    setName( sld.key() );
+    // check for style inheritance:
+    std::string::size_type pos = sld.key().find(':');
+    if (pos != std::string::npos)
+    {
+        StringVector tokens;
+        StringTokenizer(sld.key(), tokens, ":");
+        if (tokens.size() == 2)
+        {
+            // even if there's no stylesheet, set the name to the tokenized value.
+            setName(tokens[0]);  
+
+            if (sheet)
+            {
+                const Style* parent = sheet->getStyle(tokens[1], false);
+                if (parent)
+                {
+                    copySymbols(*parent);
+                }
+            }
+        }
+    }
+
+    // no inheritance:
+    else
+    {
+        setName( sld.key() );
+    }
 
     for( ConfigSet::const_iterator kid = sld.children().begin(); kid != sld.children().end(); ++kid )
     {
         const Config& p = *kid;
-		SymbolRegistry::instance()->parseSLD( p, *this );		
+		SymbolRegistry::instance()->parseSLD(p, *this);
     }
 }
 
 void
-Style::mergeConfig( const Config& conf )
+Style::mergeConfig( const Config& conf, const StyleSheet* sheet )
 {
     if ( _name.empty() )
         _name = conf.value( "name" );
@@ -147,7 +179,7 @@
     if ( _name.empty() )
         _name = conf.key();
 
-    conf.getIfSet( "url", _uri ); // named "url" for back compat
+    conf.get( "url", _uri ); // named "url" for back compat
 
     _origType = conf.value( "type" );
     std::string textData = trim(conf.value());
@@ -165,7 +197,7 @@
         CssUtils::readConfig( _origData, conf.referrer(), blocks );
         if ( blocks.size() > 0 )
         {
-            fromSLD( blocks.front() );
+            fromSLD( blocks.front(), sheet );
         }
     }
     else
@@ -190,12 +222,12 @@
     Config conf( "style" );
     conf.set("name", _name);
 
-    conf.addIfSet( "url", _uri );
+    conf.set( "url", _uri );
     
     if ( _origType == "text/css" && keepOrigType )
     {
         conf.set("type", _origType);
-        conf.value() = _origData;            
+        conf.setValue(_origData);
     }
     else
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/StyleSelector osgearth-2.10.2+dfsg/src/osgEarthSymbology/StyleSelector
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/StyleSelector	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/StyleSelector	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/StyleSelector.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/StyleSelector.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/StyleSelector.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/StyleSelector.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -43,20 +43,20 @@
 StyleSelector::mergeConfig( const Config& conf )
 {
     _name = conf.value( "name" );
-    conf.getIfSet   ( "style",        _styleName );
-    conf.getIfSet   ( "class",        _styleName ); // alias
-    conf.getObjIfSet( "style_expr",   _styleExpression ); 
-    conf.getObjIfSet( "class_expr",   _styleExpression ); // alias
-    conf.getObjIfSet( "query",        _query );
+    conf.get( "style",      _styleName );
+    conf.get( "class",      _styleName ); // alias
+    conf.get( "style_expr", _styleExpression ); 
+    conf.get( "class_expr", _styleExpression ); // alias
+    conf.get( "query",      _query );
 }
 
 Config
 StyleSelector::getConfig() const
 {
     Config conf( "selector" );
-    conf.add        ( "name",         _name );
-    conf.addIfSet   ( "style",        _styleName );
-    conf.addObjIfSet( "style_expr",   _styleExpression );
-    conf.addObjIfSet( "query",        _query );
+    conf.set( "name",       _name );
+    conf.set( "style",      _styleName );
+    conf.set( "style_expr", _styleExpression );
+    conf.set( "query",      _query );
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/StyleSheet osgearth-2.10.2+dfsg/src/osgEarthSymbology/StyleSheet
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/StyleSheet	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/StyleSheet	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -56,9 +56,9 @@
         /** Constructs a new style sheet */
         StyleSheet( const Config& conf );
 
-	/** Optional name of the style sheet */
-	optional<std::string>& name() { return _name; }
-	const optional<std::string>& name() const { return _name; }
+        /** Optional name of the style sheet */
+        optional<std::string>& name() { return _name; }
+        const optional<std::string>& name() const { return _name; }
 
         /** Gets the context for relative path resolution */
         const URIContext& uriContext() const { return _uriContext; }
@@ -122,5 +122,6 @@
 
 } } // namespace osgEarth::Symbology
 
+//OSGEARTH_SPECIALIZE_REF_CONFIG(osgEarth::Symbology::StyleSheet);
 
 #endif // OSGEARTHSYMBOLOGY_STYLE_SHEET_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/StyleSheet.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/StyleSheet.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/StyleSheet.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/StyleSheet.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -216,7 +216,7 @@
         if ( !_script->profile.empty() )
             scriptConf.set( "profile", _script->profile );
         else if ( !_script->code.empty() )
-            scriptConf.value() = _script->code;
+            scriptConf.setValue(_script->code);
 
         conf.add( scriptConf );
     }
@@ -227,7 +227,7 @@
 void
 StyleSheet::mergeConfig( const Config& conf )
 {
-    conf.getIfSet("name", _name);
+    conf.get("name", _name);
 
     _uriContext = URIContext( conf.referrer() );
 
@@ -307,9 +307,9 @@
             for( std::vector<std::string>::iterator i = blocks.begin(); i != blocks.end(); ++i )
             {
                 Config blockConf( styleConf );
-                blockConf.value() = *i;
+                blockConf.setValue(*i);
                 //OE_INFO << LC << "Style block = " << blockConf.toJSON() << std::endl;
-                Style style( blockConf );
+                Style style( blockConf, this );
                 _styles[ style.getName() ] = style;
             }
         }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Symbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/Symbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Symbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Symbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@
         optional<StringExpression>& script() { return _script; }
         const optional<StringExpression>& script() const { return _script; }
 
-        /** URI context (relative paths, etc) associated wtih this symbol */
+        /** URI context (relative paths, etc) associated with this symbol */
         const URIContext& uriContext() const { return _uriContext; }
 
         virtual Config getConfig() const;   
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Symbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/Symbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Symbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Symbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -63,7 +63,7 @@
 {
     for (SymbolFactoryList::const_iterator itr = _factories.begin(); itr != _factories.end(); itr++)
     {
-        itr->get()->parseSLD( c, style );        
+        itr->get()->parseSLD( c, style );     
     }
 }
 
@@ -86,14 +86,14 @@
 void
 Symbol::mergeConfig(const Config& conf)
 {
-    conf.getObjIfSet("script", _script);
+    conf.get("script", _script);
 }
 
 Config
 Symbol::getConfig() const
 {
     Config conf;
-    conf.addObjIfSet("script", _script);
+    conf.set("script", _script);
     return conf;
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/Tags osgearth-2.10.2+dfsg/src/osgEarthSymbology/Tags
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/Tags	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/Tags	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/TextSymbol osgearth-2.10.2+dfsg/src/osgEarthSymbology/TextSymbol
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/TextSymbol	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/TextSymbol	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthSymbology/TextSymbol.cpp osgearth-2.10.2+dfsg/src/osgEarthSymbology/TextSymbol.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthSymbology/TextSymbol.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthSymbology/TextSymbol.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -77,68 +77,68 @@
 {
     Config conf = Symbol::getConfig();
     conf.key() = "text";
-    conf.addObjIfSet( "fill", _fill );
-    conf.addObjIfSet( "halo", _halo );
-    conf.addIfSet( "halo_offset", _haloOffset );
-    conf.addIfSet( "halo_backdrop_type", "bottom_right",  _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_RIGHT );
-    conf.addIfSet( "halo_backdrop_type", "center_right",  _haloBackdropType, osgText::Text::DROP_SHADOW_CENTER_RIGHT );
-    conf.addIfSet( "halo_backdrop_type", "top_right",     _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_RIGHT );
-    conf.addIfSet( "halo_backdrop_type", "bottom_center", _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_CENTER );
-    conf.addIfSet( "halo_backdrop_type", "top_center",    _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_CENTER );
-    conf.addIfSet( "halo_backdrop_type", "bottom_left",   _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_LEFT );
-    conf.addIfSet( "halo_backdrop_type", "center_left",   _haloBackdropType, osgText::Text::DROP_SHADOW_CENTER_LEFT );
-    conf.addIfSet( "halo_backdrop_type", "top_left",      _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_LEFT );
-    conf.addIfSet( "halo_backdrop_type", "outline",       _haloBackdropType, osgText::Text::OUTLINE );
-    conf.addIfSet( "halo_backdrop_type", "none",          _haloBackdropType, osgText::Text::NONE );
-    conf.addIfSet( "halo_implementation", "polygon_offset",       _haloImplementation, osgText::Text::POLYGON_OFFSET );
-    conf.addIfSet( "halo_implementation", "no_depth_buffer",      _haloImplementation, osgText::Text::NO_DEPTH_BUFFER );
-    conf.addIfSet( "halo_implementation", "depth_range",          _haloImplementation, osgText::Text::DEPTH_RANGE );
-    conf.addIfSet( "halo_implementation", "stencil_buffer",       _haloImplementation, osgText::Text::STENCIL_BUFFER );
-    conf.addIfSet( "halo_implementation", "delayed_depth_writes", _haloImplementation, osgText::Text::DELAYED_DEPTH_WRITES );
-    conf.addIfSet( "font", _font );
-    conf.addObjIfSet( "size", _size );
-    conf.addObjIfSet( "content", _content );
-    conf.addObjIfSet( "priority", _priority );
-
-    conf.addIfSet( "encoding", "ascii", _encoding, ENCODING_ASCII );
-    conf.addIfSet( "encoding", "utf8",  _encoding, ENCODING_UTF8 );
-    conf.addIfSet( "encoding", "utf16", _encoding, ENCODING_UTF16 );
-    conf.addIfSet( "encoding", "utf32", _encoding, ENCODING_UTF32 );
-
-    conf.addIfSet( "alignment", "left_top",                _alignment, ALIGN_LEFT_TOP );
-    conf.addIfSet( "alignment", "left_center",             _alignment, ALIGN_LEFT_CENTER );
-    conf.addIfSet( "alignment", "left_bottom",             _alignment, ALIGN_LEFT_BOTTOM );
-    conf.addIfSet( "alignment", "center_top",              _alignment, ALIGN_CENTER_TOP );
-    conf.addIfSet( "alignment", "center_center",           _alignment, ALIGN_CENTER_CENTER );
-    conf.addIfSet( "alignment", "center_bottom",           _alignment, ALIGN_CENTER_BOTTOM );
-    conf.addIfSet( "alignment", "right_top",               _alignment, ALIGN_RIGHT_TOP );
-    conf.addIfSet( "alignment", "right_center",            _alignment, ALIGN_RIGHT_CENTER );
-    conf.addIfSet( "alignment", "right_bottom",            _alignment, ALIGN_RIGHT_BOTTOM );
-    conf.addIfSet( "alignment", "left_base_line",          _alignment, ALIGN_LEFT_BASE_LINE );
-    conf.addIfSet( "alignment", "center_base_line",        _alignment, ALIGN_CENTER_BASE_LINE );
-    conf.addIfSet( "alignment", "right_base_line",         _alignment, ALIGN_RIGHT_BASE_LINE );
-    conf.addIfSet( "alignment", "left_bottom_base_line",   _alignment, ALIGN_LEFT_BOTTOM_BASE_LINE );
-    conf.addIfSet( "alignment", "center_bottom_base_line", _alignment, ALIGN_CENTER_BOTTOM_BASE_LINE );
-    conf.addIfSet( "alignment", "right_bottom_base_line",  _alignment, ALIGN_RIGHT_BOTTOM_BASE_LINE );
-    conf.addIfSet( "alignment", "base_line",               _alignment, ALIGN_BASE_LINE );
-
-    conf.addIfSet( "layout", "ltr",  _layout, LAYOUT_LEFT_TO_RIGHT );
-    conf.addIfSet( "layout", "rtl",  _layout, LAYOUT_RIGHT_TO_LEFT );
-    conf.addIfSet( "layout", "vertical",  _layout, LAYOUT_VERTICAL );
+    conf.set( "fill", _fill );
+    conf.set( "halo", _halo );
+    conf.set( "halo_offset", _haloOffset );
+    conf.set( "halo_backdrop_type", "bottom_right",  _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_RIGHT );
+    conf.set( "halo_backdrop_type", "center_right",  _haloBackdropType, osgText::Text::DROP_SHADOW_CENTER_RIGHT );
+    conf.set( "halo_backdrop_type", "top_right",     _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_RIGHT );
+    conf.set( "halo_backdrop_type", "bottom_center", _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_CENTER );
+    conf.set( "halo_backdrop_type", "top_center",    _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_CENTER );
+    conf.set( "halo_backdrop_type", "bottom_left",   _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_LEFT );
+    conf.set( "halo_backdrop_type", "center_left",   _haloBackdropType, osgText::Text::DROP_SHADOW_CENTER_LEFT );
+    conf.set( "halo_backdrop_type", "top_left",      _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_LEFT );
+    conf.set( "halo_backdrop_type", "outline",       _haloBackdropType, osgText::Text::OUTLINE );
+    conf.set( "halo_backdrop_type", "none",          _haloBackdropType, osgText::Text::NONE );
+    conf.set( "halo_implementation", "polygon_offset",       _haloImplementation, osgText::Text::POLYGON_OFFSET );
+    conf.set( "halo_implementation", "no_depth_buffer",      _haloImplementation, osgText::Text::NO_DEPTH_BUFFER );
+    conf.set( "halo_implementation", "depth_range",          _haloImplementation, osgText::Text::DEPTH_RANGE );
+    conf.set( "halo_implementation", "stencil_buffer",       _haloImplementation, osgText::Text::STENCIL_BUFFER );
+    conf.set( "halo_implementation", "delayed_depth_writes", _haloImplementation, osgText::Text::DELAYED_DEPTH_WRITES );
+    conf.set( "font", _font );
+    conf.set( "size", _size );
+    conf.set( "content", _content );
+    conf.set( "priority", _priority );
+
+    conf.set( "encoding", "ascii", _encoding, ENCODING_ASCII );
+    conf.set( "encoding", "utf8",  _encoding, ENCODING_UTF8 );
+    conf.set( "encoding", "utf16", _encoding, ENCODING_UTF16 );
+    conf.set( "encoding", "utf32", _encoding, ENCODING_UTF32 );
+
+    conf.set( "alignment", "left_top",                _alignment, ALIGN_LEFT_TOP );
+    conf.set( "alignment", "left_center",             _alignment, ALIGN_LEFT_CENTER );
+    conf.set( "alignment", "left_bottom",             _alignment, ALIGN_LEFT_BOTTOM );
+    conf.set( "alignment", "center_top",              _alignment, ALIGN_CENTER_TOP );
+    conf.set( "alignment", "center_center",           _alignment, ALIGN_CENTER_CENTER );
+    conf.set( "alignment", "center_bottom",           _alignment, ALIGN_CENTER_BOTTOM );
+    conf.set( "alignment", "right_top",               _alignment, ALIGN_RIGHT_TOP );
+    conf.set( "alignment", "right_center",            _alignment, ALIGN_RIGHT_CENTER );
+    conf.set( "alignment", "right_bottom",            _alignment, ALIGN_RIGHT_BOTTOM );
+    conf.set( "alignment", "left_base_line",          _alignment, ALIGN_LEFT_BASE_LINE );
+    conf.set( "alignment", "center_base_line",        _alignment, ALIGN_CENTER_BASE_LINE );
+    conf.set( "alignment", "right_base_line",         _alignment, ALIGN_RIGHT_BASE_LINE );
+    conf.set( "alignment", "left_bottom_base_line",   _alignment, ALIGN_LEFT_BOTTOM_BASE_LINE );
+    conf.set( "alignment", "center_bottom_base_line", _alignment, ALIGN_CENTER_BOTTOM_BASE_LINE );
+    conf.set( "alignment", "right_bottom_base_line",  _alignment, ALIGN_RIGHT_BOTTOM_BASE_LINE );
+    conf.set( "alignment", "base_line",               _alignment, ALIGN_BASE_LINE );
+
+    conf.set( "layout", "ltr",  _layout, LAYOUT_LEFT_TO_RIGHT );
+    conf.set( "layout", "rtl",  _layout, LAYOUT_RIGHT_TO_LEFT );
+    conf.set( "layout", "vertical",  _layout, LAYOUT_VERTICAL );
 
-    conf.addIfSet( "declutter", _declutter );
+    conf.set( "declutter", _declutter );
 
-    conf.addIfSet( "provider", _provider );
+    conf.set( "provider", _provider );
     if ( _pixelOffset.isSet() ) {
-        conf.add( "pixel_offset_x", toString(_pixelOffset->x()) );
-        conf.add( "pixel_offset_y", toString(_pixelOffset->y()) );
+        conf.set( "pixel_offset_x", toString(_pixelOffset->x()) );
+        conf.set( "pixel_offset_y", toString(_pixelOffset->y()) );
     }
 
-    conf.addObjIfSet( "rotation", _onScreenRotation );
-    conf.addObjIfSet( "geographic-course", _geographicCourse );
+    conf.set( "rotation", _onScreenRotation );
+    conf.set( "geographic-course", _geographicCourse );
 
-    conf.addIfSet( "text-occlusion-cull", _occlusionCull );
-    conf.addIfSet( "text-occlusion-cull-altitude", _occlusionCullAltitude );
+    conf.set( "text-occlusion-cull", _occlusionCull );
+    conf.set( "text-occlusion-cull-altitude", _occlusionCullAltitude );
 
     return conf;
 }
@@ -146,68 +146,68 @@
 void
 TextSymbol::mergeConfig( const Config& conf )
 {
-    conf.getObjIfSet( "fill", _fill );
-    conf.getObjIfSet( "halo", _halo );
-    conf.getIfSet( "halo_offset", _haloOffset );
-    conf.getIfSet( "halo_backdrop_type", "right_bottom",  _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_RIGHT );
-    conf.getIfSet( "halo_backdrop_type", "right_center",  _haloBackdropType, osgText::Text::DROP_SHADOW_CENTER_RIGHT );
-    conf.getIfSet( "halo_backdrop_type", "right_top",     _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_RIGHT );
-    conf.getIfSet( "halo_backdrop_type", "center_bottom", _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_CENTER );
-    conf.getIfSet( "halo_backdrop_type", "center_top",    _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_CENTER );
-    conf.getIfSet( "halo_backdrop_type", "left_bottom",   _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_LEFT );
-    conf.getIfSet( "halo_backdrop_type", "left_center",   _haloBackdropType, osgText::Text::DROP_SHADOW_CENTER_LEFT );
-    conf.getIfSet( "halo_backdrop_type", "left_top",      _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_LEFT );
-    conf.getIfSet( "halo_backdrop_type", "outline",       _haloBackdropType, osgText::Text::OUTLINE );
-    conf.getIfSet( "halo_backdrop_type", "none",          _haloBackdropType, osgText::Text::NONE );
-    conf.getIfSet( "halo_implementation", "polygon_offset",       _haloImplementation, osgText::Text::POLYGON_OFFSET );
-    conf.getIfSet( "halo_implementation", "no_depth_buffer",      _haloImplementation, osgText::Text::NO_DEPTH_BUFFER );
-    conf.getIfSet( "halo_implementation", "depth_range",          _haloImplementation, osgText::Text::DEPTH_RANGE );
-    conf.getIfSet( "halo_implementation", "stencil_buffer",       _haloImplementation, osgText::Text::STENCIL_BUFFER );
-    conf.getIfSet( "halo_implementation", "delayed_depth_writes", _haloImplementation, osgText::Text::DELAYED_DEPTH_WRITES );
-    conf.getIfSet( "font", _font );
-    conf.getObjIfSet( "size", _size );
-    conf.getObjIfSet( "content", _content );
-    conf.getObjIfSet( "priority", _priority );
-
-    conf.getIfSet( "encoding", "ascii", _encoding, ENCODING_ASCII );
-    conf.getIfSet( "encoding", "utf8",  _encoding, ENCODING_UTF8 );
-    conf.getIfSet( "encoding", "utf16", _encoding, ENCODING_UTF16 );
-    conf.getIfSet( "encoding", "utf32", _encoding, ENCODING_UTF32 );
-
-    conf.getIfSet( "alignment", "left_top",                _alignment, ALIGN_LEFT_TOP );
-    conf.getIfSet( "alignment", "left_center",             _alignment, ALIGN_LEFT_CENTER );
-    conf.getIfSet( "alignment", "left_bottom",             _alignment, ALIGN_LEFT_BOTTOM );
-    conf.getIfSet( "alignment", "center_top",              _alignment, ALIGN_CENTER_TOP );
-    conf.getIfSet( "alignment", "center_center",           _alignment, ALIGN_CENTER_CENTER );
-    conf.getIfSet( "alignment", "center_bottom",           _alignment, ALIGN_CENTER_BOTTOM );
-    conf.getIfSet( "alignment", "right_top",               _alignment, ALIGN_RIGHT_TOP );
-    conf.getIfSet( "alignment", "right_center",            _alignment, ALIGN_RIGHT_CENTER );
-    conf.getIfSet( "alignment", "right_bottom",            _alignment, ALIGN_RIGHT_BOTTOM );
-    conf.getIfSet( "alignment", "left_base_line",          _alignment, ALIGN_LEFT_BASE_LINE );
-    conf.getIfSet( "alignment", "center_base_line",        _alignment, ALIGN_CENTER_BASE_LINE );
-    conf.getIfSet( "alignment", "right_base_line",         _alignment, ALIGN_RIGHT_BASE_LINE );
-    conf.getIfSet( "alignment", "left_bottom_base_line",   _alignment, ALIGN_LEFT_BOTTOM_BASE_LINE );
-    conf.getIfSet( "alignment", "center_bottom_base_line", _alignment, ALIGN_CENTER_BOTTOM_BASE_LINE );
-    conf.getIfSet( "alignment", "right_bottom_base_line",  _alignment, ALIGN_RIGHT_BOTTOM_BASE_LINE );
-    conf.getIfSet( "alignment", "base_line" ,              _alignment, ALIGN_BASE_LINE );
-
-    conf.getIfSet( "layout", "ltr",  _layout, LAYOUT_LEFT_TO_RIGHT );
-    conf.getIfSet( "layout", "rtl",  _layout, LAYOUT_RIGHT_TO_LEFT );
-    conf.getIfSet( "layout", "vertical",  _layout, LAYOUT_VERTICAL );
+    conf.get( "fill", _fill );
+    conf.get( "halo", _halo );
+    conf.get( "halo_offset", _haloOffset );
+    conf.get( "halo_backdrop_type", "right_bottom",  _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_RIGHT );
+    conf.get( "halo_backdrop_type", "right_center",  _haloBackdropType, osgText::Text::DROP_SHADOW_CENTER_RIGHT );
+    conf.get( "halo_backdrop_type", "right_top",     _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_RIGHT );
+    conf.get( "halo_backdrop_type", "center_bottom", _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_CENTER );
+    conf.get( "halo_backdrop_type", "center_top",    _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_CENTER );
+    conf.get( "halo_backdrop_type", "left_bottom",   _haloBackdropType, osgText::Text::DROP_SHADOW_BOTTOM_LEFT );
+    conf.get( "halo_backdrop_type", "left_center",   _haloBackdropType, osgText::Text::DROP_SHADOW_CENTER_LEFT );
+    conf.get( "halo_backdrop_type", "left_top",      _haloBackdropType, osgText::Text::DROP_SHADOW_TOP_LEFT );
+    conf.get( "halo_backdrop_type", "outline",       _haloBackdropType, osgText::Text::OUTLINE );
+    conf.get( "halo_backdrop_type", "none",          _haloBackdropType, osgText::Text::NONE );
+    conf.get( "halo_implementation", "polygon_offset",       _haloImplementation, osgText::Text::POLYGON_OFFSET );
+    conf.get( "halo_implementation", "no_depth_buffer",      _haloImplementation, osgText::Text::NO_DEPTH_BUFFER );
+    conf.get( "halo_implementation", "depth_range",          _haloImplementation, osgText::Text::DEPTH_RANGE );
+    conf.get( "halo_implementation", "stencil_buffer",       _haloImplementation, osgText::Text::STENCIL_BUFFER );
+    conf.get( "halo_implementation", "delayed_depth_writes", _haloImplementation, osgText::Text::DELAYED_DEPTH_WRITES );
+    conf.get( "font", _font );
+    conf.get( "size", _size );
+    conf.get( "content", _content );
+    conf.get( "priority", _priority );
+
+    conf.get( "encoding", "ascii", _encoding, ENCODING_ASCII );
+    conf.get( "encoding", "utf8",  _encoding, ENCODING_UTF8 );
+    conf.get( "encoding", "utf16", _encoding, ENCODING_UTF16 );
+    conf.get( "encoding", "utf32", _encoding, ENCODING_UTF32 );
+
+    conf.get( "alignment", "left_top",                _alignment, ALIGN_LEFT_TOP );
+    conf.get( "alignment", "left_center",             _alignment, ALIGN_LEFT_CENTER );
+    conf.get( "alignment", "left_bottom",             _alignment, ALIGN_LEFT_BOTTOM );
+    conf.get( "alignment", "center_top",              _alignment, ALIGN_CENTER_TOP );
+    conf.get( "alignment", "center_center",           _alignment, ALIGN_CENTER_CENTER );
+    conf.get( "alignment", "center_bottom",           _alignment, ALIGN_CENTER_BOTTOM );
+    conf.get( "alignment", "right_top",               _alignment, ALIGN_RIGHT_TOP );
+    conf.get( "alignment", "right_center",            _alignment, ALIGN_RIGHT_CENTER );
+    conf.get( "alignment", "right_bottom",            _alignment, ALIGN_RIGHT_BOTTOM );
+    conf.get( "alignment", "left_base_line",          _alignment, ALIGN_LEFT_BASE_LINE );
+    conf.get( "alignment", "center_base_line",        _alignment, ALIGN_CENTER_BASE_LINE );
+    conf.get( "alignment", "right_base_line",         _alignment, ALIGN_RIGHT_BASE_LINE );
+    conf.get( "alignment", "left_bottom_base_line",   _alignment, ALIGN_LEFT_BOTTOM_BASE_LINE );
+    conf.get( "alignment", "center_bottom_base_line", _alignment, ALIGN_CENTER_BOTTOM_BASE_LINE );
+    conf.get( "alignment", "right_bottom_base_line",  _alignment, ALIGN_RIGHT_BOTTOM_BASE_LINE );
+    conf.get( "alignment", "base_line" ,              _alignment, ALIGN_BASE_LINE );
+
+    conf.get( "layout", "ltr",  _layout, LAYOUT_LEFT_TO_RIGHT );
+    conf.get( "layout", "rtl",  _layout, LAYOUT_RIGHT_TO_LEFT );
+    conf.get( "layout", "vertical",  _layout, LAYOUT_VERTICAL );
 
-    conf.getIfSet( "declutter", _declutter );
+    conf.get( "declutter", _declutter );
 
-    conf.getIfSet( "provider", _provider );
+    conf.get( "provider", _provider );
     if ( conf.hasValue( "pixel_offset_x" ) )
         _pixelOffset = osg::Vec2s( conf.value<short>("pixel_offset_x",0), 0 );
     if ( conf.hasValue( "pixel_offset_y" ) )
         _pixelOffset = osg::Vec2s( _pixelOffset->x(), conf.value<short>("pixel_offset_y",0) );
 
-    conf.getObjIfSet( "rotation", _onScreenRotation );
-    conf.getObjIfSet( "geographic-course", _geographicCourse );
+    conf.get( "rotation", _onScreenRotation );
+    conf.get( "geographic-course", _geographicCourse );
 
-    conf.getIfSet( "text-occlusion-cull", _occlusionCull );
-    conf.getIfSet( "text-occlusion-cull-altitude", _occlusionCullAltitude );
+    conf.get( "text-occlusion-cull", _occlusionCull );
+    conf.get( "text-occlusion-cull-altitude", _occlusionCullAltitude );
 }
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthTriton/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -14,23 +14,25 @@
 #   header files go here
     Common
     Export
-    TritonNode
     TritonOptions
     TritonContext
     TritonDrawable
     TritonAPIWrapper
     TritonCallback
     TritonLayer
+    TritonHeightMap
+    TritonIntersections
 )
 
 ADD_LIBRARY(${LIB_NAME} ${OSGEARTH_USER_DEFINED_DYNAMIC_OR_STATIC}
     ${LIB_PUBLIC_HEADERS}
 #  .cpp files go here
-    TritonNode.cpp
     TritonContext.cpp
     TritonDrawable.cpp
     TritonAPIWrapper.cpp
     TritonLayer.cpp
+    TritonHeightMap.cpp
+    TritonIntersections.cpp
 )
 
 INCLUDE_DIRECTORIES( 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/Common osgearth-2.10.2+dfsg/src/osgEarthTriton/Common
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/Common	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/Export osgearth-2.10.2+dfsg/src/osgEarthTriton/Export
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/Export	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/Export	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
  * Copyright 2008-2014 Pelican Mapping
  * http://osgearth.org
  *
@@ -24,11 +24,6 @@
 #ifndef OSGEARTH_TRITON_EXPORT_H
 #define OSGEARTH_TRITON_EXPORT_H 1
 
-// define USE_DEPRECATED_API is used to include in API which is being fazed out
-// if you can compile your apps with this turned off you are
-// well placed for compatibility with future versions.
-#define USE_DEPRECATED_API
-
 #if defined(_MSC_VER)
     #pragma warning( disable : 4244 )
     #pragma warning( disable : 4251 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/Shaders/README.txt osgearth-2.10.2+dfsg/src/osgEarthTriton/Shaders/README.txt
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/Shaders/README.txt	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/Shaders/README.txt	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,3 @@
+Triton user shader files
+
+These GLSL files go in the Triton "Resources" folder, and are necessary if you want to use the osgEarth LogarithmicDepthBuffer with Triton.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/Shaders/user-functions.glsl osgearth-2.10.2+dfsg/src/osgEarthTriton/Shaders/user-functions.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/Shaders/user-functions.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/Shaders/user-functions.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -3,13 +3,12 @@
 out vec4 fragColor;
 #endif
 
-uniform float oe_ocean_alpha;
-
 // Light, view, and normal vectors are all in world space.
 // This function may be used to modify the ambient, diffuse, and specular light computed by Triton's fragment shaders.
 void user_lighting(in vec3 L
                    , in vec3 vVertex_World_Space, in vec3 vNormal_World_Space
                    , in vec4 vVertex_Projection_Space
+                   , in float shininess
                    , inout vec3 ambient, inout vec3 diffuse, inout vec3 specular)
 {
 
@@ -43,6 +42,7 @@
 
 }
 
+#ifdef DECAL_SHADER
 // Override the shading of volumetric decals on the water. You are given the texture lookup value,
 // alpha value for the decal, and light color for the decal. The incoming default finalColor
 // is the textureColor times the lightColor, with the alpha component further multiplied by alpha.
@@ -50,6 +50,7 @@
 {
 
 }
+#endif
 
 //adjust the reflection color prior to it being used by triton.
 void user_reflection_adjust(in vec4 envColor, in vec4 planarColor, in float planarReflectionBlend, inout vec4 reflectedColor)
@@ -63,16 +64,24 @@
 }
 
 // Adjust the water diffuse to include color from breaking waves, propeller wash, and some refraction
-void user_diffuse_color( inout vec3 Cdiffuse, in vec3 CiNoLight, in vec4 reflectedColor,
-                         in float reflectivity )
+void user_diffuse_color( inout vec3 Cdiffuse, in vec3 CiNoLight, in vec3 Cwash, in vec4 reflectedColor,
+                         in float reflectivity, in vec3 nNorm )
 {
+
 }
+#if __VERSION__ > 140
+    in float oe_LogDepth_logz;
+#else
+    varying float oe_LogDepth_logz;
+#endif
+uniform float oe_VisibleLayer_opacityUniform;
 
 // Output to MRT
 void writeFragmentData(in vec4 finalColor, in vec4 Cdiffuse, in vec3 lightColor, in vec3 nNorm )
 {
-    // Modify the final alpha with the value of the oe_ocean_alpha uniform.
-    finalColor.a = finalColor.a * oe_ocean_alpha;
+    gl_FragDepth = oe_LogDepth_logz >= 0? oe_LogDepth_logz : gl_FragCoord.z;
+    finalColor.a *= oe_VisibleLayer_opacityUniform;
+    
 #ifdef OPENGL32
     fragColor = finalColor;
 #else
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/Shaders/user-vert-functions.glsl osgearth-2.10.2+dfsg/src/osgEarthTriton/Shaders/user-vert-functions.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/Shaders/user-vert-functions.glsl	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/Shaders/user-vert-functions.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,57 @@
+
+float user_get_depth( in vec3 worldPos )
+{
+    return 1000.0;
+}
+
+#ifdef DOUBLE_PRECISION
+
+dvec3 user_horizon(in dvec3 intersect)
+{
+    return intersect;
+}
+
+#else
+
+vec3 user_horizon(in vec3 intersect)
+{
+    return intersect;
+}
+
+#endif
+
+/* You may use this hook to set any varying parameters you need for the user-functions.glsl fragment program.
+   provided are the ocean vertex in world, eye, and projected coordinates. */
+void user_intercept(in vec3 worldPosition, in vec3 localPosition, in vec4 eyePosition, in vec4 projectedPosition)
+{
+
+}
+
+#if __VERSION__ > 140
+    out float oe_LogDepth_logz;
+#else
+    varying float oe_LogDepth_logz;
+#endif
+uniform mat4 trit_projection;
+
+// Provides a point to override the final value of gl_Position.
+// Useful for implementing logarithmic depth buffers etc.
+vec4 overridePosition(in vec4 position)
+{
+    if(trit_projection[3][3] == 0)
+    {
+        mat4 clip2view = inverse(trit_projection);
+        vec4 farPoint = clip2view * vec4(0,0,1,1);
+        float FAR = -farPoint.z/farPoint.w;
+    
+        const float C = 0.001;
+        float FC = 1.0/log(FAR*C + 1);
+        oe_LogDepth_logz = log(position.w*C + 1)*FC;
+        position.z = (2*oe_LogDepth_logz - 1)*position.w;
+    }
+    else
+    {
+        oe_LogDepth_logz = -1;
+    }
+    return position;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonAPIWrapper osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonAPIWrapper
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonAPIWrapper	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonAPIWrapper	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -21,6 +21,8 @@
 
 #include "Common"
 #include <osg/Vec3>
+#include <osg/Matrix>
+#include <osg/GL>
 #include <stdint.h> // for uintptr_t
 
 namespace osgEarth {
@@ -69,6 +71,12 @@
 
         void SimulateSeaState(double bs, double winddir);
 
+        void SetAboveWaterVisibility(double visibility, osg::Vec3 fog_color);
+        void GetAboveWaterVisibility(double &visibility, osg::Vec3 &fog_color) const;
+
+        void SetEnvironmentMap(GLuint id, const osg::Matrixd &textureMatrix = osg::Matrixd());
+        GLuint GetEnvironmentMap() const;
+        osg::Matrixd GetEnvironmentMapMatrix() const;
     public:
         Environment(uintptr_t handle) : _handle(handle) { }
         uintptr_t _handle;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonAPIWrapper.cpp osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonAPIWrapper.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonAPIWrapper.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonAPIWrapper.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -68,6 +68,35 @@
 void Environment::SimulateSeaState(double bscale, double winddir) {
     HANDLE->SimulateSeaState(bscale, winddir);
 }
+void Environment::SetAboveWaterVisibility(double visibility, osg::Vec3 fog_color) {
+   HANDLE->SetAboveWaterVisibility(visibility, TOVEC3(fog_color));
+}
+void Environment::GetAboveWaterVisibility(double &visibility, osg::Vec3 &fog_color) const {
+    ::Triton::Vector3 triton_fog_col;
+    HANDLE->GetAboveWaterVisibility(visibility, triton_fog_col);
+    fog_color = FROMVEC3(triton_fog_col);
+}
+void Environment::SetEnvironmentMap(GLuint cubeMap, const osg::Matrixd &textureMatrix) {
+    ::Triton::Matrix3 triton_tex_mat(
+        textureMatrix(0, 0), textureMatrix(0, 1), textureMatrix(0, 2),
+        textureMatrix(1, 0), textureMatrix(1, 1), textureMatrix(1, 2),
+        textureMatrix(2, 0), textureMatrix(2, 1), textureMatrix(2, 2));
+    ::Triton::TextureHandle tex_handle = (::Triton::TextureHandle)(static_cast<size_t>(cubeMap));
+    HANDLE->SetEnvironmentMap(tex_handle, triton_tex_mat);
+}
+GLuint Environment::GetEnvironmentMap() const {
+    ::Triton::TextureHandle tex_handle = HANDLE->GetEnvironmentMap();
+    return static_cast<GLuint>((size_t)tex_handle);
+}
+osg::Matrixd Environment::GetEnvironmentMapMatrix() const {
+    ::Triton::Matrix3 m = HANDLE->GetEnvironmentMapMatrix();
+    osg::Matrixd env_map_matrix(
+        m.elem[0][0], m.elem[0][1], m.elem[0][2], 0,
+        m.elem[1][0], m.elem[1][1], m.elem[1][2], 0,
+        m.elem[2][0], m.elem[2][1], m.elem[2][2], 0,
+        0, 0, 0, 1);
+    return env_map_matrix;
+}
 SETGET(Environment, SunIntensity, float);
 
 //................................
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonCallback osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonCallback
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonCallback	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonCallback	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonContext osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonContext
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonContext	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonContext	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 #define OSGEARTH_TRITON_CONTEXT_H
 
 #include <Triton.h>
+#include <Camera.h> // Triton
 #include "Common"
 #include "TritonOptions"
 #include "TritonAPIWrapper"
@@ -60,7 +61,7 @@
 
         void initialize(osg::RenderInfo& renderInfo);
 
-        void update(double simTime);
+        bool intersect(const osg::Vec3d& start, const osg::Vec3d& dir, float& out_height, osg::Vec3f& out_normal) const;
 
         ::Triton::Environment* getEnvironment() { return _environment; }
         Environment& getEnvironmentWrapper() const { return *_environmentWrapper; }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonContext.cpp osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonContext.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonContext.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonContext.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -124,14 +124,19 @@
                 _environment->SetConfigOption( "polar-earth-radius-meters",      poRadius.c_str() );
             }
 
+            //_environment->SetConfigOption("avoid-opengl-stalls", "yes");
+            //_environment->SetConfigOption("fft-texture-update-frame-delayed", "yes");
+
             float openGLVersion = osg::getGLVersionNumber();
             enum ::Triton::Renderer tritonOpenGlVersion = ::Triton::OPENGL_2_0;
-            if( openGLVersion == 4.1 )
+#ifndef OSG_GL_FIXED_FUNCTION_AVAILABLE
+            if( openGLVersion >= 4.1 )
                 tritonOpenGlVersion = ::Triton::OPENGL_4_1;
-            else if( openGLVersion == 4.0 )
+            else if( openGLVersion >= 4.0 )
                 tritonOpenGlVersion = ::Triton::OPENGL_4_0;
-            else if( openGLVersion == 3.2 )
+            else if( openGLVersion >= 3.2 )
                 tritonOpenGlVersion = ::Triton::OPENGL_3_2;
+#endif
 
             ::Triton::EnvironmentError err = _environment->Initialize(
                 cs,
@@ -146,7 +151,8 @@
 
                 _ocean = ::Triton::Ocean::Create(
                     _environment, 
-                    ::Triton::JONSWAP );
+                    ::Triton::JONSWAP,
+                    true );                 // enableHeightTests - activated GetHeight for intersections
             }
 
             if ( _ocean )
@@ -170,14 +176,15 @@
     }
 }
 
-void
-TritonContext::update(double simTime)
+bool
+TritonContext::intersect(const osg::Vec3d& start, const osg::Vec3d& dir, float& out_height, osg::Vec3f& out_normal) const
 {
-    if ( _ocean )
-    {
-        // fmod requires b/c CUDA is limited to single-precision values
-        _ocean->UpdateSimulation( fmod(simTime, 86400.0) );
-    }
+    ::Triton::Vector3 p(start.ptr());
+    ::Triton::Vector3 d(dir.ptr());
+    ::Triton::Vector3 normal;
+    bool ok = _ocean->GetHeight(p, d, out_height, normal);
+    out_normal.set(normal.x, normal.y, normal.z);
+    return ok;
 }
 
 void
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonDrawable osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonDrawable
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonDrawable	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonDrawable	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -27,7 +27,6 @@
 #include <osg/Texture2D>
 #include <osg/buffered_value>
 
-#include <osgEarth/MapNode>
 #include <osgEarth/Terrain>
 #include <osgEarth/NativeProgramAdapter>
 #include <osgEarth/ImageLayer>
@@ -37,6 +36,7 @@
 namespace osgEarth { namespace Triton
 {
     class TritonContext;
+    class TritonHeightMap;
 
     /**
      * Custom drawable for rendering the Triton ocean effects
@@ -44,56 +44,50 @@
     class OSGEARTHTRITON_EXPORT TritonDrawable : public osg::Drawable
     {
     public:
-        TritonDrawable(osgEarth::MapNode* mapNode=NULL, TritonContext* TRITON =0L);
-        META_Object(Triton, TritonDrawable);
+        TritonDrawable(TritonContext* TRITON);
 
+        //! Layer to use as an ocean rendering mask
         void setMaskLayer(const osgEarth::ImageLayer* maskLayer);
 
+        //! Height map generator to use to mask out the ocean where the
+        //! terrain has positive elevation
+        void setHeightMapGenerator(TritonHeightMap* heightMap);
+
+        //! Gets the Triton Camera associated with an osg Camera
+        ::Triton::Camera* getTritonCam(const osg::Camera* cam) {
+            return _local.get(cam)._tritonCam;
+        }
+
     public: // osg::Drawable
 
-        // custom draw (called with an active GC)
         void drawImplementation(osg::RenderInfo& ri) const;
 
-        void setupHeightMap(osg::State& state);
-
-        void updateHeightMap(osg::RenderInfo& renderInfo) const;
-
-        void dirtyAllContexts();
-
-#if OSG_VERSION_GREATER_THAN(3,3,1)
-        osg::BoundingBox computeBoundingBox() const
-#else
-        osg::BoundingBox computeBound() const
-#endif
-            { return osg::BoundingBox(); }
+        osg::BoundingBox computeBoundingBox() const;
 
-        void SetPlanarReflectionMap(osg::Texture2D* map) {_planarReflectionMap = map;};
-        void SetPlanarReflectionProjection(osg::RefMatrix * proj) {_planarReflectionProjection = proj;};
+        void setPlanarReflectionMap(osg::Texture2D* map);
 
-        osg::Group* _heightCameraParent;
+        void setPlanarReflectionProjection(osg::RefMatrix* proj);
 
     protected:
         virtual ~TritonDrawable();
 
         osg::observer_ptr<TritonContext>  _TRITON;
-        osg::observer_ptr<osgEarth::MapNode> _mapNode;
         osg::observer_ptr<const osgEarth::ImageLayer> _maskLayer;
         osg::ref_ptr<osg::TextureCubeMap> _cubeMap;
-        osg::BoundingBox                  _bbox;
-        osg::ref_ptr<osg::Texture2D> _heightMap;
-        osg::ref_ptr<osg::Camera> _heightCamera;
-        osg::observer_ptr<osgEarth::TerrainCallback> _terrainChangedCallback;
         
-        osg::ref_ptr< osg::Texture2D >       _planarReflectionMap;
-        osg::ref_ptr< osg::RefMatrix >       _planarReflectionProjection;
+        osg::ref_ptr<osg::Texture2D> _planarReflectionMap;
+        osg::ref_ptr<osg::RefMatrix> _planarReflectionProjection;
 
-        mutable osg::buffered_object<int>         _contextDirty;
-        mutable osg::Matrix                       _viewMatrix;
-        mutable osg::Matrix                       _projMatrix;
+        mutable osg::ref_ptr<TritonHeightMap> _heightMapGenerator;
 
         mutable osg::buffered_object<osgEarth::NativeProgramAdapterCollection> _adapters;
 
-        TritonDrawable(const TritonDrawable& copy, const osg::CopyOp& op=osg::CopyOp::SHALLOW_COPY) { }
+        struct CameraLocal
+        {
+            CameraLocal() : _tritonCam(0L) { }
+            ::Triton::Camera* _tritonCam;
+        };
+        mutable PerObjectFastMap<const osg::Camera*, CameraLocal> _local;
     };
 
 } } // namespace osgEarth::Triton
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonDrawable.cpp osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonDrawable.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonDrawable.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonDrawable.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,13 +18,17 @@
  */
 #include "TritonContext"
 #include "TritonDrawable"
+#include "TritonHeightMap"
+#include <Version.h>
 #include <osg/MatrixTransform>
 #include <osg/FrameBufferObject>
+#include <osg/Depth>
 
 #include <osgEarth/SpatialReference>
 #include <osgEarth/VirtualProgram>
 #include <osgEarth/MapNode>
 #include <osgEarth/TerrainEngineNode>
+#include <osgEarth/Random>
 
 #undef  LC
 #define LC "[TritonDrawable] "
@@ -33,298 +37,9 @@
 
 using namespace osgEarth::Triton;
 
-namespace
-{
-
-/** Default size of _contextDirty */
-static const size_t NUM_CONTEXTS = 64;
-
-#ifdef DEBUG_HEIGHTMAP
-    osg::Node*
-    makeFrustumFromCamera( osg::Camera* camera )
-    {
-        osg::Matrixd proj;
-        osg::Matrixd mv;
-        if (camera)
-        {
-            proj = camera->getProjectionMatrix();
-            mv = camera->getViewMatrix();
-        }
-        else
-        {
-            proj.makePerspective( 30., 1., 1., 10. );
-            // leave mv as identity
-        }
-
-        double near=0.0, far=0.0;
-        double left=0.0, right=0.0, bottom=0.0, top=0.0;
-        double fovy=0.0, aspectRatio=0.0;
-        double nLeft=0.0, nRight=0.0, nBottom=0.0, nTop=0.0;
-        double fLeft=0.0, fRight=0.0, fBottom=0.0, fTop=0.0;
-
-        osg::Geode* geode = new osg::Geode;
-
-        if( proj.getPerspective(fovy, aspectRatio, near, far) )
-        {
-            near = proj(3,2) / (proj(2,2)-1.0);
-            far = proj(3,2) / (1.0+proj(2,2));
-
-            nLeft = near * (proj(2,0)-1.0) / proj(0,0);
-            nRight = near * (1.0+proj(2,0)) / proj(0,0);
-            nTop = near * (1.0+proj(2,1)) / proj(1,1);
-            nBottom = near * (proj(2,1)-1.0) / proj(1,1);
-
-            fLeft = far * (proj(2,0)-1.0) / proj(0,0);
-            fRight = far * (1.0+proj(2,0)) / proj(0,0);
-            fTop = far * (1.0+proj(2,1)) / proj(1,1);
-            fBottom = far * (proj(2,1)-1.0) / proj(1,1);
-
-            osg::Vec3Array* v = new osg::Vec3Array;
-            v->resize( 9 );
-            (*v)[0].set( 0., 0., 0. );
-
-            (*v)[1].set( nLeft, nBottom, -near );
-            (*v)[2].set( nRight, nBottom, -near );
-            (*v)[3].set( nRight, nTop, -near );
-            (*v)[4].set( nLeft, nTop, -near );
-            (*v)[5].set( fLeft, fBottom, -far );
-            (*v)[6].set( fRight, fBottom, -far );
-            (*v)[7].set( fRight, fTop, -far );
-            (*v)[8].set( fLeft, fTop, -far );
-
-            osg::Geometry* geom = new osg::Geometry;
-            geom->setVertexArray( v );
-
-            GLushort idxLines[8] = {
-                0, 5, 0, 6, 0, 7, 0, 8 };
-            GLushort idxLoops0[4] = {
-                1, 2, 3, 4 };
-            GLushort idxLoops1[4] = {
-                5, 6, 7, 8 };
-            geom->addPrimitiveSet( new osg::DrawElementsUShort( osg::PrimitiveSet::LINES, 8, idxLines ) );
-            geom->addPrimitiveSet( new osg::DrawElementsUShort( osg::PrimitiveSet::LINE_LOOP, 4, idxLoops0 ) );
-            geom->addPrimitiveSet( new osg::DrawElementsUShort( osg::PrimitiveSet::LINE_LOOP, 4, idxLoops1 ) );
-
-            geode->addDrawable( geom );
-        }
-        else if(proj.getOrtho( left, right, bottom, top, near, far) )
-        {
-            nLeft = left;//near * (proj(2,0)-1.0) / proj(0,0);
-            nRight = right;//near * (1.0+proj(2,0)) / proj(0,0);
-            nTop = top;//near * (1.0+proj(2,1)) / proj(1,1);
-            nBottom = bottom;//near * (proj(2,1)-1.0) / proj(1,1);
-
-            fLeft = left;//far * (proj(2,0)-1.0) / proj(0,0);
-            fRight = right;//far * (1.0+proj(2,0)) / proj(0,0);
-            fTop = top;//far * (1.0+proj(2,1)) / proj(1,1);
-            fBottom = bottom;//far * (proj(2,1)-1.0) / proj(1,1);
-
-            osg::Vec3Array* v = new osg::Vec3Array;
-            v->resize( 9 );
-            (*v)[0].set( 0., 0., 0. );
-
-            (*v)[1].set( nLeft, nBottom, -near );
-            (*v)[2].set( nRight, nBottom, -near );
-            (*v)[3].set( nRight, nTop, -near );
-            (*v)[4].set( nLeft, nTop, -near );
-            (*v)[5].set( fLeft, fBottom, -far );
-            (*v)[6].set( fRight, fBottom, -far );
-            (*v)[7].set( fRight, fTop, -far );
-            (*v)[8].set( fLeft, fTop, -far );
-
-            osg::Geometry* geom = new osg::Geometry;
-            geom->setVertexArray( v );
-
-            GLushort idxLines[8] = {
-                1, 5, 2, 6, 3, 7, 4, 8 };
-            GLushort idxLoops0[4] = {
-                1, 2, 3, 4 };
-            GLushort idxLoops1[4] = {
-                5, 6, 7, 8 };
-            geom->addPrimitiveSet( new osg::DrawElementsUShort( osg::PrimitiveSet::LINES, 8, idxLines ) );
-            geom->addPrimitiveSet( new osg::DrawElementsUShort( osg::PrimitiveSet::LINE_LOOP, 4, idxLoops0 ) );
-            geom->addPrimitiveSet( new osg::DrawElementsUShort( osg::PrimitiveSet::LINE_LOOP, 4, idxLoops1 ) );
-
-            geode->addDrawable( geom );
-        }
-
-        geode->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
-
-
-
-        osg::MatrixTransform* mt = new osg::MatrixTransform;
-        osg::Matrixd mvi = osg::Matrixd::inverse( mv );
-        mt->setMatrix( mvi );
-        mt->addChild( geode );
-
-        return mt;
-    }
-
-    osg::Camera *
-    CreateTextureQuadOverlay( osg::Texture * texture, float x, float y, float w, float h )
-    {
-        osg::Camera * camera = new osg::Camera;
 
-        // set up the background color and clear mask.
-        camera->setClearMask( GL_DEPTH_BUFFER_BIT );
-
-        // set viewport
-        camera->setProjectionMatrixAsOrtho2D( 0, 1, 0, 1 );
-        camera->setViewMatrix( osg::Matrix::identity() );
-        camera->setReferenceFrame( osg::Transform::ABSOLUTE_RF );
-
-        osg::Geode * geode = new osg::Geode();
-        camera->addChild( geode );
-    /*
-        osg::Geometry * background = osg::createTexturedQuadGeometry( osg::Vec3( x,y,0 ),osg::Vec3( w,0,0 ), osg::Vec3( 0,h,0 ) );
-        geode->addDrawable( background );
-
-        osg::Vec4Array* colors = new osg::Vec4Array;
-        colors->push_back( osg::Vec4( 1,1,0,0.3 ) );
-        background->setColorArray( colors );
-        background->setColorBinding( osg::Geometry::BIND_OVERALL );
-        background->getOrCreateStateSet()->setMode( GL_BLEND, osg::StateAttribute::ON );
-        background->getOrCreateStateSet()->setMode( GL_DEPTH_TEST, osg::StateAttribute::OFF );
-    */
-        osg::Geometry * quad = osg::createTexturedQuadGeometry( osg::Vec3( x,y,0 ),osg::Vec3( w,0,0 ), osg::Vec3( 0,h,0 ) );
-        geode->addDrawable( quad );
-        quad->getOrCreateStateSet()->setTextureAttributeAndModes( 0, texture, osg::StateAttribute::ON );
-        quad->getOrCreateStateSet()->setMode( GL_BLEND, osg::StateAttribute::ON );
-        quad->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
-        quad->getOrCreateStateSet()->setMode( GL_DEPTH_TEST, osg::StateAttribute::OFF );
-
-        camera->getOrCreateStateSet()->setAttribute(new osg::Program());
-
-
-        // set the camera to render after the main camera.
-        camera->setRenderOrder(osg::Camera::POST_RENDER);
-
-        return camera;
-    }
-#endif /* DEBUG_HEIGHTMAP */
-
-
-    struct PassHeightMapToTritonCallback : public osg::Camera::DrawCallback
-    {
-        PassHeightMapToTritonCallback(TritonContext* triton) : _TRITON(triton), _enable(false), _id(0) { _ptrEnable = const_cast<bool*> (&_enable); };
-        virtual void operator()( osg::RenderInfo& renderInfo ) const
-        {
-            if( _enable )
-            {
-                *_ptrEnable = false; // cannot directly change _enable because of const
-
-                //osg::notify( osg::ALWAYS ) << "passing heightmap to Triton" << std::endl;
-                if(_TRITON->ready())
-                    _TRITON->getEnvironment()->SetHeightMap((::Triton::TextureHandle)_id,_heightMapMatrix);
-            }
-        }
-
-        unsigned int _frameNumber;
-        bool _enable;
-        bool* _ptrEnable;
-        int _id;
-        ::Triton::Matrix4 _heightMapMatrix;
-
-    private:
-        osg::observer_ptr<TritonContext>  _TRITON;
-    };
-
-
-    /**
-     * Responds to tile-added events by telling the Triton drawable that it needs to update
-     * its height map.
-     */
-    class OceanTerrainChangedCallback : public osgEarth::TerrainCallback
-    {
-    public:
-        OceanTerrainChangedCallback(TritonDrawable* drawable)
-            : _drawable(drawable) { }
-
-    public: // osgEarth::TerrainCallback
-
-        // Called when the terrain engine loads a new tile (or new tile heightfield data).
-        // When this happens we need to update the Triton height map.
-        void onTileAdded(const osgEarth::TileKey& tileKey, osg::Node* graph, osgEarth::TerrainCallbackContext& context)
-        {
-            osg::ref_ptr<TritonDrawable> drawable;
-            if ( _drawable.lock(drawable) )
-                drawable->dirtyAllContexts();
-        }
-
-    private:
-        osg::observer_ptr<TritonDrawable> _drawable;
-    };
-
-
-    const char* vertexShader =
-        "#version " GLSL_VERSION_STR "\n"
-        GLSL_DEFAULT_PRECISION_FLOAT "\n"
-
-        "#pragma import_defines(OE_TRITON_MASK_MATRIX);\n"
-
-        "// terrain SDK:\n"
-        "float oe_terrain_getElevation(); \n"
-
-        "out float oe_triton_elev;\n"
-        
-        "#ifdef OE_TRITON_MASK_MATRIX\n"
-        "out vec2 maskCoords;\n"
-        "uniform mat4 OE_TRITON_MASK_MATRIX;\n"
-        "vec4 oe_layer_tilec;\n"
-        "#endif\n"
-
-        "void oe_triton_setupHeightMap(inout vec4 unused) \n"
-        "{ \n"
-        "    oe_triton_elev = oe_terrain_getElevation(); \n"
-        "#ifdef OE_TRITON_MASK_MATRIX\n"
-        "    maskCoords = (OE_TRITON_MASK_MATRIX * oe_layer_tilec).st;\n"
-        "#endif\n"
-        "} \n";
-
-    // The fragment shader simply takes the texture index that we generated
-    // in the vertex shader and does a texture lookup. In this case we're
-    // just wholesale replacing the color, so if the map had any existing
-    // imagery, this will overwrite it.
-
-    const char* fragmentShader =
-        "#version " GLSL_VERSION_STR "\n"
-        GLSL_DEFAULT_PRECISION_FLOAT "\n"
-
-        "#pragma import_defines(OE_TRITON_MASK_SAMPLER);\n"
-
-        "in float oe_triton_elev;\n"
-
-        "#ifdef OE_TRITON_MASK_SAMPLER\n"
-        "in vec2 maskCoords;\n"
-        "uniform sampler2D OE_TRITON_MASK_SAMPLER;\n"
-        "uniform float DD;\n"
-        "#endif\n"
-
-        "out vec4 out_height; \n"
-
-        "void oe_triton_drawHeightMap(inout vec4 unused) \n"
-        "{ \n"
-#ifdef DEBUG_HEIGHTMAP
-          // Map to black = -500m, white = +500m
-          "   float nHeight = clamp(oe_triton_elev / 1000.0 + 0.5, 0.0, 1.0);\n"
-#else
-          "   float nHeight = oe_triton_elev;\n"
-
-          "#ifdef OE_TRITON_MASK_SAMPLER\n"
-          "    float mask = texture(OE_TRITON_MASK_SAMPLER, maskCoords).a;\n"
-          "    nHeight *= mask; \n"
-          "#endif\n"
-
-#endif
-        "    out_height = vec4( nHeight, 0.0, 0.0, 1.0 ); \n"
-        "} \n";
-}
-
-
-TritonDrawable::TritonDrawable(osgEarth::MapNode* mapNode, TritonContext* TRITON) :
-_TRITON(TRITON),
-_mapNode(mapNode),
-_heightCameraParent(0L)
+TritonDrawable::TritonDrawable(TritonContext* TRITON) :
+_TRITON(TRITON)
 {
     // call this to ensure draw() gets called every frame.
     setSupportsDisplayList( false );
@@ -332,19 +47,11 @@
 
     // dynamic variance prevents update/cull overlap when drawing this
     setDataVariance( osg::Object::DYNAMIC );
-
-    _contextDirty.resize(NUM_CONTEXTS);
-    dirtyAllContexts();
 }
 
 TritonDrawable::~TritonDrawable()
 {
-    osg::ref_ptr<MapNode> mapNode;
-    osg::ref_ptr<osgEarth::TerrainCallback> callback;
-    if ( _mapNode.lock(mapNode) && _terrainChangedCallback.lock(callback) && mapNode->getTerrain() )
-    {
-        _mapNode->getTerrain()->removeTerrainCallback( callback.get() );
-    }
+    //nop
 }
 
 void
@@ -354,96 +61,42 @@
 }
 
 void
-TritonDrawable::dirtyAllContexts()
+TritonDrawable::setHeightMapGenerator(TritonHeightMap* value)
 {
-    _contextDirty.setAllElementsTo(1);
+    _heightMapGenerator = value;
 }
 
 void
-TritonDrawable::updateHeightMap(osg::RenderInfo& renderInfo) const
-{
-    if ( !_TRITON->ready() )
-        return;
-
-    osg::ref_ptr<MapNode> mapNode;
-    if (!_mapNode.lock(mapNode))
-        return;
+TritonDrawable::setPlanarReflectionMap(osg::Texture2D* map)
+{ 
+    _planarReflectionMap = map;
+}
 
-    const osg::Matrix& viewMatrix = renderInfo.getCurrentCamera()->getViewMatrix();
-    const osg::Matrix& projectionMatrix = renderInfo.getCurrentCamera()->getProjectionMatrix();
+void
+TritonDrawable::setPlanarReflectionProjection(osg::RefMatrix* proj)
+{
+    _planarReflectionProjection = proj;
+}
 
-    osg::Vec3d eye, center, up;
-    viewMatrix.getLookAt(eye, center, up);
-    double fovyDEG=0.0, aspectRatio=0.0, zNear=0.0, zFar=0.0;
-    projectionMatrix.getPerspective(fovyDEG, aspectRatio,zNear,zFar);
-
-    // aspect_ratio = tan( HFOV/2 ) / tan( VFOV/2 )
-    // tan( HFOV/2 ) = tan( VFOV/2 ) * aspect_ratio
-    // HFOV/2 = atan( tan( VFOV/2 ) * aspect_ratio )
-    // HFOV = 2.0 * atan( tan( VFOV/2 ) * aspect_ratio )
-    double fovxDEG = osg::RadiansToDegrees( 2.0 * atan( tan(osg::DegreesToRadians(fovyDEG))/2.0 * aspectRatio ));
-
-    double eyeLat=0.0, eyeLon=0.0, eyeHeight=0.0;
-    mapNode->getMap()->getSRS()->getEllipsoid()->convertXYZToLatLongHeight(eye.x(), eye.y(), eye.z(), eyeLat, eyeLon, eyeHeight);
-    double clampedEyeX=0.0, clampedEyeY=0.0,clampedEyeZ=0.0;
-    mapNode->getMap()->getSRS()->getEllipsoid()->convertLatLongHeightToXYZ(eyeLat, eyeLon, 0.0, clampedEyeX, clampedEyeY, clampedEyeZ);
-    osg::Vec3 mslEye(clampedEyeX,clampedEyeY,clampedEyeZ);
-    double lookAtLat=0.0, lookAtLon=0.0, lookAtHeight=0.0;
-    mapNode->getMap()->getSRS()->getEllipsoid()->convertXYZToLatLongHeight(center.x(), center.y(), center.z(), lookAtLat, lookAtLon, lookAtHeight);
-
-    // Calculate the distance to the horizon from the eyepoint 
-    double eyeLen = eye.length();
-    double radE = mslEye.length();
-    double hmax = radE + 8848.0;
-    double hmin = radE - 12262.0;
-    double hasl = osg::maximum(0.1, eyeLen - radE);
-    double radius = eyeLen - hasl;
-    double horizonDistance = osg::minimum(radE, sqrt( 2.0*radius*hasl + hasl*hasl ));
-
-    osg::Vec3d heightCamEye(eye);
-
-    double near = osg::maximum(1.0, heightCamEye.length() - hmax);
-    double far = osg::maximum(10.0, heightCamEye.length() - hmin + radE);
-    //osg::notify( osg::ALWAYS ) << "near = " << near << "; far = " << far << std::endl;
-
-    //horizonDistance *= 0.25;
-
-    _heightCamera->setProjectionMatrix(osg::Matrix::ortho(-horizonDistance,horizonDistance,-horizonDistance,horizonDistance,near,far) );
-    _heightCamera->setViewMatrixAsLookAt( heightCamEye, osg::Vec3d(0.0,0.0,0.0), osg::Vec3d(0.0,0.0,1.0));
-
-    const osg::Matrixd bias(0.5, 0.0, 0.0, 0.0,
-        0.0, 0.5, 0.0, 0.0,
-        0.0, 0.0, 0.5, 0.0,
-        0.5, 0.5, 0.5, 1.0);
-
-    osg::Matrix hMM = _heightCamera->getViewMatrix() * _heightCamera->getProjectionMatrix() * bias;
-    ::Triton::Matrix4 heightMapMatrix(hMM(0,0),hMM(0,1),hMM(0,2),hMM(0,3),
-        hMM(1,0),hMM(1,1),hMM(1,2),hMM(1,3),
-        hMM(2,0),hMM(2,1),hMM(2,2),hMM(2,3),
-        hMM(3,0),hMM(3,1),hMM(3,2),hMM(3,3));
+osg::BoundingBox
+TritonDrawable::computeBoundingBox() const
+{
+    return osg::BoundingBox();
+}
 
-    osg::Texture::TextureObject* texObj = _heightMap->getTextureObject(renderInfo.getContextID());
+namespace {
 
-    if(texObj)
-    {
-        PassHeightMapToTritonCallback* cb = dynamic_cast<PassHeightMapToTritonCallback*>(_heightCamera->getFinalDrawCallback());
-        if( cb )
-        {
-            cb->_enable = true;
-            cb->_id = texObj->id();
-            cb->_heightMapMatrix = heightMapMatrix;
-        }
-    }
-    else
-    {
-        // may happen on the first frame; ignore
-        //OE_WARN << LC << "Texture object is NULL (Internal error)" << std::endl;
-    }
+// Wrapper around Ocean->GetShaderObject() to account for API changes from Triton 3.x to 4.x
+GLint
+getOceanShader(::Triton::Ocean* ocean, ::Triton::Shaders shaderProgram, void* context, const ::Triton::Camera* camera)
+{
+#if (TRITON_MAJOR_VERSION >= 4)
+  return (GLint)ocean->GetShaderObject( shaderProgram, context, camera );
+#else
+  return (GLint)ocean->GetShaderObject( shaderProgram );
+#endif
+}
 
-#ifdef DEBUG_HEIGHTMAP
-    mapNode->getParent(0)->removeChild(0, 1);
-    mapNode->getParent(0)->insertChild(0, makeFrustumFromCamera(_heightCamera));
-#endif /* DEBUG_HEIGHTMAP */
 }
 
 void
@@ -457,50 +110,71 @@
     if ( !_TRITON->ready() )
         return;
 
-    if ( _TRITON->passHeightMapToTriton() && !_terrainChangedCallback.valid() )
+    // Configure the height map generator.
+    // If configuration fails, attempt to continue without a heightmap.
+    if (_heightMapGenerator.valid())
     {
-        const_cast<TritonDrawable*>(this)->setupHeightMap(*state);
+        bool configOK = _heightMapGenerator->configure(_TRITON->getHeightMapSize(), *state);
+        if (configOK == false)
+        {
+            _heightMapGenerator = 0L;
+            OE_WARN << LC << "Failed to establish a legal FBO configuration; disabling height map generator!" << std::endl;
+        }
     }
 
     ::Triton::Environment* environment = _TRITON->getEnvironment();
 
+    // Find or create the Triton camera for this OSG camera:
+    CameraLocal& local = _local.get(renderInfo.getCurrentCamera());
+    if (local._tritonCam == 0L)
+    {
+        local._tritonCam = environment->CreateCamera();
+        local._tritonCam->SetName(renderInfo.getCurrentCamera()->getName().c_str());
+    }
+    ::Triton::Camera* tritonCam = local._tritonCam;
+
     osgEarth::NativeProgramAdapterCollection& adapters = _adapters[ state->getContextID() ];
     if ( adapters.empty() )
     {
-        const char* prefix = "oe_";
-        adapters.push_back( new osgEarth::NativeProgramAdapter(state, (GLint)_TRITON->getOcean()->GetShaderObject(::Triton::GOD_RAYS), prefix));
-        adapters.push_back( new osgEarth::NativeProgramAdapter(state, (GLint)_TRITON->getOcean()->GetShaderObject(::Triton::SPRAY_PARTICLES), prefix));
-        adapters.push_back( new osgEarth::NativeProgramAdapter(state, (GLint)_TRITON->getOcean()->GetShaderObject(::Triton::WAKE_SPRAY_PARTICLES), prefix));
-        adapters.push_back( new osgEarth::NativeProgramAdapter(state, (GLint)_TRITON->getOcean()->GetShaderObject(::Triton::WATER_DECALS), prefix));
-        adapters.push_back( new osgEarth::NativeProgramAdapter(state, (GLint)_TRITON->getOcean()->GetShaderObject(::Triton::WATER_SURFACE_PATCH), prefix));
-        adapters.push_back( new osgEarth::NativeProgramAdapter(state, (GLint)_TRITON->getOcean()->GetShaderObject(::Triton::WATER_SURFACE), prefix));
+        OE_INFO << LC << "Initializing Triton program adapters" << std::endl;
+        const char* prefix = "oe_"; // because, don't forget osg_*
+        adapters.push_back( new osgEarth::NativeProgramAdapter(state, getOceanShader(_TRITON->getOcean(), ::Triton::WATER_SURFACE, 0L, tritonCam), prefix, "WATER_SURFACE"));
+        adapters.push_back( new osgEarth::NativeProgramAdapter(state, getOceanShader(_TRITON->getOcean(), ::Triton::WATER_SURFACE_PATCH, 0L, tritonCam), prefix, "WATER_SURFACE_PATCH"));
+        adapters.push_back( new osgEarth::NativeProgramAdapter(state, getOceanShader(_TRITON->getOcean(), ::Triton::GOD_RAYS, 0L, tritonCam), prefix, "GOD_RAYS"));
+        adapters.push_back( new osgEarth::NativeProgramAdapter(state, getOceanShader(_TRITON->getOcean(), ::Triton::SPRAY_PARTICLES, 0L, tritonCam), prefix, "SPRAY_PARTICLES"));
+        adapters.push_back( new osgEarth::NativeProgramAdapter(state, getOceanShader(_TRITON->getOcean(), ::Triton::WAKE_SPRAY_PARTICLES, 0L, tritonCam), prefix, "WAKE_SPRAY_PARTICLES"));
+#if 0
+        // In older Triton (3.91), this line causes problems in Core profile and prevents the ocean from drawing.  In newer Triton (4.01),
+        // this line causes a crash because there is no context passed in to GetShaderObject(), resulting in multiple NULL references.
+        adapters.push_back( new osgEarth::NativeProgramAdapter(state, getOceanShader(_TRITON->getOcean(), ::Triton::WATER_DECALS, 0L, tritonCam), prefix, "WATER_DECALS"));
+#endif
     }
     adapters.apply( state );
 
+
     // Pass the final view and projection matrices into Triton.
     if ( environment )
     {
-        environment->SetCameraMatrix( state->getModelViewMatrix().ptr() );
-        environment->SetProjectionMatrix( state->getProjectionMatrix().ptr() );
+        tritonCam->SetCameraMatrix(state->getModelViewMatrix().ptr());
+        tritonCam->SetProjectionMatrix(state->getProjectionMatrix().ptr());
     }
 
-    if ( _TRITON->passHeightMapToTriton() )
+    if (_heightMapGenerator.valid())
     {
-        unsigned cid = renderInfo.getContextID();
-        const bool validCid = (cid < _contextDirty.size());
-
-        bool dirty =
-            ( validCid && _contextDirty[cid] ) ||
-            ( renderInfo.getView()->getCamera()->getViewMatrix()       != _viewMatrix ) ||
-            ( renderInfo.getView()->getCamera()->getProjectionMatrix() != _projMatrix );
-
-        if ( dirty )
-        {
-            updateHeightMap( renderInfo );
-            if ( validCid )
-                _contextDirty[renderInfo.getContextID()] = 0;
-            _viewMatrix = renderInfo.getView()->getCamera()->getViewMatrix();
-            _projMatrix = renderInfo.getView()->getCamera()->getProjectionMatrix();
+        GLint texName;
+        osg::Matrix hMM;
+        if (_heightMapGenerator->getTextureAndMatrix(renderInfo, texName, hMM))
+        {
+            // copy the OSG matrix to a Triton matrix:
+            ::Triton::Matrix4 texMat(
+                hMM(0, 0), hMM(0, 1), hMM(0, 2), hMM(0, 3),
+                hMM(1, 0), hMM(1, 1), hMM(1, 2), hMM(1, 3),
+                hMM(2, 0), hMM(2, 1), hMM(2, 2), hMM(2, 3),
+                hMM(3, 0), hMM(3, 1), hMM(3, 2), hMM(3, 3));
+
+            environment->SetHeightMap((::Triton::TextureHandle)texName, texMat, 0L, tritonCam);
+                
+            OE_DEBUG << LC << "Updating height map, FN=" << renderInfo.getState()->getFrameStamp()->getFrameNumber() << std::endl;
         }
     }
 
@@ -558,11 +232,10 @@
             pos3.normalize();
             float dot = osg::clampAbove(up*pos3, 0.0); dot*=dot;
             float sunAmbient = (float)osg::clampBetween( dot, 0.0f, 0.88f );
-            float fa = std::max(sunAmbient, ambient[0]);
+            float fa = osg::maximum(sunAmbient, ambient[0]);
 
             // Ambient color based on the zenith color in the cube map
             environment->SetAmbientLight( ::Triton::Vector3(fa, fa, fa) );
-            //::Triton::Vector3( ambient[0], ambient[1], ambient[2] ) );
         }
 
         else
@@ -571,211 +244,75 @@
             environment->SetAmbientLight( ::Triton::Vector3(0.88f, 0.88f, 0.88f) );
         }
 
-        // Build transform from our cube map orientation space to native Triton orientation
-        // See worldToCubeMap function used in SkyBox to orient sky texture so that sky is up and earth is down
-        osg::Matrix m = osg::Matrix::rotate( osg::PI_2, osg::X_AXIS ); // = worldToCubeMap
-
-        ::Triton::Matrix3 transformFromYUpToZUpCubeMapCoords(
-            m(0,0), m(0,1), m(0,2),
-            m(1,0), m(1,1), m(1,2),
-            m(2,0), m(2,1), m(2,2) );
-
-        // Grab the cube map from our sky box and give it to Triton to use as an _environment map
-        // GLenum texture = renderInfo.getState()->getLastAppliedTextureAttribute( _stage, osg::StateAttribute::TEXTURE );
         if ( _cubeMap.valid() )
         {
+            // Build transform from our cube map orientation space to native Triton orientation
+            // See worldToCubeMap function used in SkyBox to orient sky texture so that sky is up and earth is down
+            osg::Matrix m = osg::Matrix::rotate( osg::PI_2, osg::X_AXIS ); // = worldToCubeMap
+
+            ::Triton::Matrix3 transformFromYUpToZUpCubeMapCoords(
+                m(0,0), m(0,1), m(0,2),
+                m(1,0), m(1,1), m(1,2),
+                m(2,0), m(2,1), m(2,2) );
+
+            // Grab the cube map from our sky box and give it to Triton to use as an _environment map
+            // GLenum texture = renderInfo.getState()->getLastAppliedTextureAttribute( _stage, osg::StateAttribute::TEXTURE );
             environment->SetEnvironmentMap(
-                (::Triton::TextureHandle)_cubeMap->getTextureObject( state->getContextID() )->id(), transformFromYUpToZUpCubeMapCoords );
+                (::Triton::TextureHandle)_cubeMap->getTextureObject( state->getContextID() )->id(),
+                transformFromYUpToZUpCubeMapCoords );
 
             if( _planarReflectionMap.valid() && _planarReflectionProjection.valid() )
             {
                 osg::Matrix & p = *_planarReflectionProjection;
 
-                ::Triton::Matrix3 planarProjection( p(0,0), p(0,1), p(0,2),
-                                                    p(1,0), p(1,1), p(1,2),
-                                                    p(2,0), p(2,1), p(2,2) );
-
-                environment->SetPlanarReflectionMap( (::Triton::TextureHandle)
-                                                      _planarReflectionMap->getTextureObject( state->getContextID() )->id(),
-                                                      planarProjection, 0.125  );
+                ::Triton::Matrix3 planarProjection(
+                    p(0,0), p(0,1), p(0,2),
+                    p(1,0), p(1,1), p(1,2),
+                    p(2,0), p(2,1), p(2,2) );
+
+                environment->SetPlanarReflectionMap(
+                    (::Triton::TextureHandle)_planarReflectionMap->getTextureObject( state->getContextID() )->id(),
+                    planarProjection,
+                    0.125 );
             }
         }
 
         // Draw the ocean for the current time sample
         if ( _TRITON->getOcean() )
         {
-            _TRITON->getOcean()->Draw( renderInfo.getView()->getFrameStamp()->getSimulationTime() );
+            osg::GLExtensions* ext = osg::GLExtensions::Get(state->getContextID(), true);
+
+            bool writeDepth = true;
+            const osg::Depth* depth = static_cast<const osg::Depth*>(state->getLastAppliedAttribute(osg::StateAttribute::DEPTH));
+            if (depth)
+                writeDepth = depth->getWriteMask();
+
+            double simTime = renderInfo.getView()->getFrameStamp()->getSimulationTime();
+            simTime = fmod(simTime, 86400.0);
+
+            _TRITON->getOcean()->Draw(
+                simTime,
+                writeDepth, // depth writes
+                true, // draw water
+                true, // draw particles
+                NULL, // optional context
+                tritonCam);
+
         }
     }
-
+            
     // Put GL back in a state that won't confuse the OSG state tracking:
     state->dirtyAllVertexArrays();
     state->dirtyAllAttributes();
-    state->dirtyAllModes();
-    //osg::GL2Extensions* api = osg::GL2Extensions::Get(state->getContextID(), true);
-    //api->glUseProgram((GLuint)0);
-    //state->setLastAppliedProgramObject( 0L );
+    state->dirtyAllModes();    
+
+#ifndef OSG_GL_FIXED_FUNCTION_AVAILABLE
+    // Keep OSG from reapplying GL_LIGHTING on next state change after dirtyAllModes().
+    state->setModeValidity(GL_LIGHTING, false);
+#endif
 
     // Keep an eye on this.
     // I had to remove something similar in another module (Rex engine) because it was causing
     // positional attributes (like clip planes) to re-apply with an incorrect MVM. -gw
-    state->apply();
-}
-
-namespace
-{
-#ifdef GL_LUMINANCE_FLOAT16_ATI
-#   define GL_LUMINANCE_FLOAT16_ATI 0x881E
-#endif
-    /** Choose a supported FBO format by testing suitable ones until we find one that works. */
-    bool getBestFBOConfiguration(GLint* out_internalFormat, GLenum* out_sourceFormat, osg::State& state)
-    {
-#define NUM_FORMATS 7
-
-        struct Format {
-            GLint internalFormat;
-            GLenum sourceFormat;
-            std::string name;
-        };
-
-        const Format formats[NUM_FORMATS] = {
-            { GL_LUMINANCE16F_ARB,      GL_LUMINANCE, "GL_LUMINANCE16F_ARB" },
-            { GL_LUMINANCE_FLOAT16_ATI, GL_LUMINANCE, "GL_LUMINANCE_FLOAT16_ATI" },
-            { GL_LUMINANCE32F_ARB,      GL_LUMINANCE, "GL_LUMINANCE32F_ARB" },
-            { GL_RGB16F_ARB,            GL_RGB,       "GL_RGB16F_ARB" },
-            { GL_RGBA16F_ARB,           GL_RGBA,      "GL_RGBA16F_ARB" },
-            { GL_RGB32F_ARB,            GL_RGB,       "GL_RGB32F_ARB" },
-            { GL_RGBA32F_ARB,           GL_RGBA,      "GL_RGBA32F_ARB" }
-        };
-
-#if OSG_VERSION_GREATER_OR_EQUAL(3,4,0)
-        osg::GLExtensions* ext = osg::GLExtensions::Get(state.getContextID(), true);
-#else
-        osg::FBOExtensions* ext = osg::FBOExtensions::instance(state.getContextID(), true);
-#endif
-
-        osg::State::CheckForGLErrors check = state.getCheckForGLErrors();
-        state.setCheckForGLErrors(state.NEVER_CHECK_GL_ERRORS);
-
-        bool found = false;
-
-        for(int i=0; i<NUM_FORMATS && !found; ++i)
-        {
-            const Format& format = formats[i];
-
-            osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D();
-            tex->setTextureSize(1, 1);
-            tex->setInternalFormat( format.internalFormat );
-            tex->setSourceFormat  ( format.sourceFormat );
-
-            osg::ref_ptr<osg::FrameBufferObject> fbo = new osg::FrameBufferObject();
-            fbo->setAttachment( osg::Camera::COLOR_BUFFER, osg::FrameBufferAttachment(tex.get()) );
-
-            fbo->apply( state );
-
-            GLenum status = ext->glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
-
-            fbo->releaseGLObjects( &state );
-            tex->releaseGLObjects( &state );
-
-            if ( status == GL_FRAMEBUFFER_COMPLETE_EXT )
-            {
-                if ( out_internalFormat) *out_internalFormat = format.internalFormat;
-                if ( out_sourceFormat )  *out_sourceFormat   = format.sourceFormat;
-                OE_INFO << LC << "Height map format => " << format.name << std::endl;
-                found = true;
-            }
-        }
-
-        state.setCheckForGLErrors(check);
-
-        return found;
-    }
-}
-
-void TritonDrawable::setupHeightMap(osg::State& state)
-{
-    osg::ref_ptr<MapNode> mapNode;
-    if (!_mapNode.lock(mapNode))
-        return;
-
-    int textureUnit = 0;
-    int textureSize = _TRITON->getHeightMapSize();
-
-    // Discover a suitable FBO format for floating point values:
-    GLint internalFormat;
-    GLenum sourceFormat;
-    if ( !getBestFBOConfiguration(&internalFormat, &sourceFormat, state) )
-    {
-        OE_WARN << LC << "No supported FBO format available for height map; height map disabled!\n";
-        return;
-    }
-
-    // Create our height map texture
-    _heightMap = new osg::Texture2D;
-    _heightMap->setTextureSize(textureSize, textureSize);
-    _heightMap->setInternalFormat( internalFormat );
-    _heightMap->setSourceFormat( sourceFormat );
-    _heightMap->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR);
-    _heightMap->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR);
-
-    // Create its camera and render to it
-    _heightCamera = new osg::Camera;
-    _heightCamera->setReferenceFrame(osg::Transform::ABSOLUTE_RF_INHERIT_VIEWPOINT);
-    _heightCamera->setClearMask(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-    _heightCamera->setClearColor(osg::Vec4(-1000.0, -1000.0, -1000.0, 1.0f));
-    _heightCamera->setViewport(0, 0, textureSize, textureSize);
-    _heightCamera->setRenderOrder(osg::Camera::PRE_RENDER);
-    _heightCamera->setRenderTargetImplementation( osg::Camera::FRAME_BUFFER_OBJECT );
-    _heightCamera->setImplicitBufferAttachmentMask(0, 0);
-    _heightCamera->attach(osg::Camera::COLOR_BUFFER, _heightMap.get());
-    _heightCamera->setCullMask( ~TRITON_OCEAN_MASK );
-    _heightCamera->setAllowEventFocus(false);
-    _heightCamera->setFinalDrawCallback(new PassHeightMapToTritonCallback(_TRITON.get()));
-
-    // Install the shaders. We also bind osgEarth's elevation data attribute, which the
-    // terrain engine automatically generates at the specified location. We need to set
-    // this VP as "abstract" because it cannot run without the terrain engine's SDK 
-    // shaders installed.
-    osg::StateSet* stateSet = _heightCamera->getOrCreateStateSet();
-    osgEarth::VirtualProgram* heightProgram = osgEarth::VirtualProgram::getOrCreate(stateSet);
-    heightProgram->setName("Triton Height Map");
-    heightProgram->setFunction( "oe_triton_setupHeightMap", vertexShader,   osgEarth::ShaderComp::LOCATION_VERTEX_MODEL);
-    heightProgram->setFunction( "oe_triton_drawHeightMap", fragmentShader, osgEarth::ShaderComp::LOCATION_FRAGMENT_OUTPUT);
-    heightProgram->setIsAbstract(true);
-
-    // If we're using a mask layer, enable that in the shader:
-    osg::ref_ptr<const ImageLayer> maskLayer;
-    _maskLayer.lock(maskLayer);
-
-    if (!maskLayer.valid() && !_TRITON->getMaskLayerName().empty())
-    {
-        maskLayer = _mapNode->getMap()->getLayerByName<ImageLayer>(_TRITON->getMaskLayerName());
-        if (!maskLayer)
-        {
-            OE_WARN << LC << "Mask Layer \"" << _TRITON->getMaskLayerName() << "\" not found in Map!\n";
-        }
-    }
-
-    if (maskLayer.valid())
-    {
-        stateSet->setDefine("OE_TRITON_MASK_SAMPLER", maskLayer->shareTexUniformName().get());
-        stateSet->setDefine("OE_TRITON_MASK_MATRIX", maskLayer->shareTexMatUniformName().get());
-        OE_INFO << LC << "Using mask layer \"" << maskLayer->getName() << "\", sampler=" << maskLayer->shareTexUniformName().get() << ", matrix=" << maskLayer->shareTexMatUniformName().get() << std::endl;
-    }
-
-    _heightCamera->addChild( mapNode->getTerrainEngine() );
-
-    _terrainChangedCallback = new OceanTerrainChangedCallback(this);
-    if ( mapNode->getTerrain() )
-        mapNode->getTerrain()->addTerrainCallback( _terrainChangedCallback.get() );
-
-    _heightCameraParent->addChild(_heightCamera.get());
-    //osg::Group* root = osgEarth::findTopMostNodeOfType<osg::Group>(mapNode);
-    //root->addChild(_heightCamera.get());
-
-#ifdef DEBUG_HEIGHTMAP
-    mapNode->getParent(0)->addChild(CreateTextureQuadOverlay(_heightMap, 0.65, 0.05, 0.3, 0.3));
-    mapNode->getParent(0)->insertChild(0, makeFrustumFromCamera(_heightCamera));
-#endif /* DEBUG_HEIGHTMAP */
+    state->apply();    
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonHeightMap osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonHeightMap
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonHeightMap	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonHeightMap	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,110 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_TRITON_HEIGHT_MAP
+#define OSGEARTH_TRITON_HEIGHT_MAP 1
+
+#include "Common"
+#include <osgEarth/Containers>
+#include <osgEarth/ImageLayer>
+#include <osg/Node>
+#include <osg/Camera>
+#include <osg/Texture2D>
+
+namespace osgEarth {
+    class Horizon;
+}
+
+namespace osgEarth { namespace Triton
+{
+    /**
+     * Creates a height map that Triton can use to mask out the ocean where 
+     * the terrain is above sea level.
+     */
+    class OSGEARTHTRITON_EXPORT TritonHeightMap : public osg::Node
+    {
+    public:
+
+        TritonHeightMap();
+
+        //! Sets the root of the terrain scene graph
+        void setTerrain(osg::Node*);
+
+        //! Sets the masking layer
+        void setMaskLayer(const osgEarth::ImageLayer* layer);
+
+        //! Configure the generator; return success t/f
+        bool configure(unsigned texSize, osg::State& state);
+
+        //! Fetch the heightmap texture and matrix generated for a camera.
+        bool getTextureAndMatrix(osg::RenderInfo&, GLint& out_texName, osg::Matrix& out_matrix);
+
+        //! Mark all height maps (for all cameras) for regeneration
+        void dirty();
+
+    public: // osg::Node
+
+        void traverse(osg::NodeVisitor&);
+
+    protected:
+
+        virtual ~TritonHeightMap();
+
+    private:
+
+        struct CameraLocal
+        {
+            osg::ref_ptr<osg::Camera> _rtt;
+            osg::ref_ptr<osg::Texture2D> _tex;
+            osg::Matrix _texMatrix;
+            osg::Matrix _mvpw;
+            unsigned _frameNum;
+        };
+
+        typedef osgEarth::PerObjectFastMap<const osg::Camera*, CameraLocal> Locals;
+
+        struct SetDirty : public Locals::Functor
+        {
+            void operator()(CameraLocal&);
+        };
+
+        //! Sets up an RTT camera for the first time
+        void setup(CameraLocal& local, const std::string& name);
+
+        //! Updates an RTT camera for the new view/projection matrices of the camera
+        void update(CameraLocal& local, const osg::Camera*, osgEarth::Horizon*);
+
+        //! Whether FBO configuration has happened yet
+        bool isConfigurationComplete() const;
+        
+        //! Figures out the best FBO format on this GPU
+        static bool getBestFBOConfig(osg::State& state, GLint& internalFormat, GLenum& sourceFormat);
+        
+        
+        Locals _local;
+        osg::observer_ptr<osg::Node> _terrain;
+        unsigned _texSize;
+        GLint _internalFormat;
+        GLenum _sourceFormat;
+        osg::observer_ptr<const osgEarth::ImageLayer> _maskLayer;
+        osg::ref_ptr<osg::Referenced> _terrainCallback;
+    };
+
+} } // namespace osgEarth::Triton
+
+#endif // OSGEARTH_TRITON_HEIGHT_MAP
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonHeightMap.cpp osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonHeightMap.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonHeightMap.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonHeightMap.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,440 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include "TritonHeightMap"
+#include "TritonContext"
+#include <osgEarth/CullingUtils>
+#include <osgEarth/VirtualProgram>
+#include <osgEarth/TerrainEngineNode>
+
+#define LC "[TritonHeightMap] "
+
+using namespace osgEarth::Triton;
+
+namespace
+{    
+    const char* vertexShader =
+        "#version " GLSL_VERSION_STR "\n"
+        GLSL_DEFAULT_PRECISION_FLOAT "\n"
+
+        "#pragma import_defines(OE_TRITON_MASK_MATRIX);\n"
+
+        "// terrain SDK:\n"
+        "float oe_terrain_getElevation(); \n"
+
+        "out float oe_triton_elev;\n"
+        
+        "#ifdef OE_TRITON_MASK_MATRIX\n"
+        "out vec2 maskCoords;\n"
+        "uniform mat4 OE_TRITON_MASK_MATRIX;\n"
+        "vec4 oe_layer_tilec;\n"
+        "#endif\n"
+
+        "void oe_triton_setupHeightMap(inout vec4 unused) \n"
+        "{ \n"
+        "    oe_triton_elev = oe_terrain_getElevation(); \n"
+        "#ifdef OE_TRITON_MASK_MATRIX\n"
+        "    maskCoords = (OE_TRITON_MASK_MATRIX * oe_layer_tilec).st;\n"
+        "#endif\n"
+        "} \n";
+
+    // The fragment shader simply takes the texture index that we generated
+    // in the vertex shader and does a texture lookup. In this case we're
+    // just wholesale replacing the color, so if the map had any existing
+    // imagery, this will overwrite it.
+
+    const char* fragmentShader =
+        "#version " GLSL_VERSION_STR "\n"
+        GLSL_DEFAULT_PRECISION_FLOAT "\n"
+
+        "#pragma import_defines(OE_TRITON_MASK_SAMPLER);\n"
+
+        "in float oe_triton_elev;\n"
+
+        "#ifdef OE_TRITON_MASK_SAMPLER\n"
+        "in vec2 maskCoords;\n"
+        "uniform sampler2D OE_TRITON_MASK_SAMPLER;\n"
+        "#endif\n"
+
+        "out vec4 out_height; \n"
+
+        "void oe_triton_drawHeightMap(inout vec4 unused) \n"
+        "{ \n"
+#ifdef DEBUG_HEIGHTMAP
+          // Map to black = -500m, white = +500m
+          "   float nHeight = clamp(oe_triton_elev / 1000.0 + 0.5, 0.0, 1.0);\n"
+#else
+          "   float nHeight = oe_triton_elev;\n"
+
+          "#ifdef OE_TRITON_MASK_SAMPLER\n"
+          "    float mask = texture(OE_TRITON_MASK_SAMPLER, maskCoords).a;\n"
+          "    nHeight *= mask; \n"
+          "#endif\n"
+
+#endif
+        "    out_height = vec4( nHeight, 0.0, 0.0, 1.0 ); \n"
+        "} \n";
+
+    struct TerrainDirtyCallback : public osgEarth::TerrainCallback
+    {
+        osg::observer_ptr<TritonHeightMap> _hm;
+        TerrainDirtyCallback(TritonHeightMap* hm) : _hm(hm) { }
+        void onTileAdded(const osgEarth::TileKey&, osg::Node*, osgEarth::TerrainCallbackContext&)
+        {
+            osg::ref_ptr<TritonHeightMap> hm;
+            if (_hm.lock(hm))
+                hm->dirty();
+        }
+    };
+}
+
+TritonHeightMap::TritonHeightMap() :
+_texSize(0u),
+_internalFormat((GLint)0),
+_sourceFormat((GLenum)0)
+{
+    setCullingActive(false);
+}
+
+TritonHeightMap::~TritonHeightMap()
+{
+    osgEarth::TerrainEngineNode* t = dynamic_cast<osgEarth::TerrainEngineNode*>(_terrain.get());
+    if (t)
+    {
+        t->getTerrain()->removeTerrainCallback(static_cast<TerrainDirtyCallback*>(_terrainCallback.get()));
+        _terrainCallback = NULL;
+    }
+}
+
+void
+TritonHeightMap::setTerrain(osg::Node* node)
+{
+    _terrain = node;
+
+    osgEarth::TerrainEngineNode* t = dynamic_cast<osgEarth::TerrainEngineNode*>(node);
+    if (t)
+    {
+        TerrainDirtyCallback* cb = new TerrainDirtyCallback(this);
+        t->getTerrain()->addTerrainCallback(cb);
+        _terrainCallback = cb;
+    }
+}
+
+void
+TritonHeightMap::setMaskLayer(const osgEarth::ImageLayer* layer)
+{
+    _maskLayer = layer;
+}
+
+void
+TritonHeightMap::SetDirty::operator()(CameraLocal& local)
+{
+    local._mvpw.makeIdentity();
+}
+
+void
+TritonHeightMap::dirty()
+{
+    SetDirty setDirty;
+    _local.forEach(setDirty);
+}
+
+bool
+TritonHeightMap::configure(unsigned texSize, osg::State& state)
+{
+    bool result = true;
+
+    if (_texSize == 0u)
+    {
+        // first time through, single-lane and set up FBO parameters.
+        static Threading::Mutex s_mutex;
+        s_mutex.lock();
+
+        if (_texSize == 0u)
+        {
+            _texSize = texSize;
+            if (!getBestFBOConfig(state, _internalFormat, _sourceFormat))
+            {
+                result = false;
+            }
+        }
+
+        s_mutex.unlock();
+    }
+    return result;
+}
+
+namespace {
+    struct Format {
+        Format(GLint i, GLenum s, const std::string& n) :
+            internalFormat(i), sourceFormat(s), name(n) { }
+        GLint internalFormat;
+        GLenum sourceFormat;
+        std::string name;
+    };
+}
+
+bool
+TritonHeightMap::getBestFBOConfig(osg::State& state, GLint& out_internalFormat, GLenum& out_sourceFormat)
+{
+#ifdef GL_LUMINANCE_FLOAT16_ATI
+#   define GL_LUMINANCE_FLOAT16_ATI 0x881E
+#endif
+
+    std::vector<Format> formats;
+
+#ifdef GL_R16F
+    formats.push_back(Format(GL_R16F, GL_RED, "GL_R16F"));
+#endif
+#ifdef GL_LUMINANCE16F_ARB
+    formats.push_back(Format(GL_LUMINANCE16F_ARB, GL_LUMINANCE, "GL_LUMINANCE16F_ARB"));
+#endif
+#ifdef GL_LUMINANCE_FLOAT16_ATI
+    formats.push_back(Format(GL_LUMINANCE_FLOAT16_ATI, GL_LUMINANCE, "GL_LUMINANCE_FLOAT16_ATI"));
+#endif
+#ifdef GL_R32F
+    formats.push_back(Format(GL_R32F, GL_RED, "GL_R32F"));
+#endif
+#ifdef GL_LUMINANCE32F_ARB
+    formats.push_back(Format(GL_LUMINANCE32F_ARB, GL_LUMINANCE, "GL_LUMINANCE32F_ARB"));
+#endif
+#ifdef GL_RGB16F_ARB
+    formats.push_back(Format(GL_RGB16F_ARB, GL_RGB, "GL_RGB16F_ARB"));
+#endif
+#ifdef GL_RGBA16F_ARB
+    formats.push_back(Format(GL_RGBA16F_ARB, GL_RGBA, "GL_RGBA16F_ARB"));
+#endif
+#ifdef GL_RGB32F_ARB
+    formats.push_back(Format(GL_RGB32F_ARB, GL_RGB, "GL_RGB32F_ARB"));
+#endif
+#ifdef GL_RGBA32F_ARB
+    formats.push_back(Format(GL_RGBA32F_ARB, GL_RGBA, "GL_RGBA32F_ARB"));
+#endif
+    
+
+    osg::GLExtensions* ext = osg::GLExtensions::Get(state.getContextID(), true);
+
+    osg::State::CheckForGLErrors check = state.getCheckForGLErrors();
+    state.setCheckForGLErrors(state.NEVER_CHECK_GL_ERRORS);
+
+    bool found = false;
+
+    for(int i=0; i<formats.size() && !found; ++i)
+    {
+        const Format& format = formats[i];
+
+        osg::ref_ptr<osg::Texture2D> tex = new osg::Texture2D();
+        tex->setTextureSize(1, 1);
+        tex->setInternalFormat( format.internalFormat );
+        tex->setSourceFormat  ( format.sourceFormat );
+
+        osg::ref_ptr<osg::FrameBufferObject> fbo = new osg::FrameBufferObject();
+        fbo->setAttachment( osg::Camera::COLOR_BUFFER0, osg::FrameBufferAttachment(tex.get()) );
+
+        fbo->apply( state );
+
+        GLenum status = ext->glCheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
+
+        fbo->releaseGLObjects( &state );
+        tex->releaseGLObjects( &state );
+
+        if ( status == GL_FRAMEBUFFER_COMPLETE_EXT )
+        {
+            out_internalFormat = format.internalFormat;
+            out_sourceFormat   = format.sourceFormat;
+            OE_INFO << LC << "Height map format = " << format.name << std::endl;
+            found = true;
+        }
+    }
+
+    state.setCheckForGLErrors(check);
+
+    return found;
+}
+
+bool
+TritonHeightMap::isConfigurationComplete() const
+{
+    return
+        _texSize > 0u &&
+        _internalFormat != (GLint)0 &&
+        _sourceFormat != (GLenum)0;
+}
+
+void
+TritonHeightMap::setup(CameraLocal& local, const std::string& name)
+{
+    // make sure the FBO params are configured:
+    if (!isConfigurationComplete())
+        return;
+
+    local._frameNum = 0u;
+
+    local._tex = new osg::Texture2D();
+    local._tex->setName(Stringify() << "Triton HM (" << name << ")");
+    local._tex->setTextureSize(_texSize, _texSize);
+    local._tex->setInternalFormat( _internalFormat );
+    local._tex->setSourceFormat( _sourceFormat );
+    local._tex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR);
+    local._tex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR);
+
+    // Triton prob doesn't need this but it's good practice
+    if (_sourceFormat == GL_RED)
+    {
+        local._tex->setSwizzle(osg::Vec4i(GL_RED, GL_RED, GL_RED, GL_ONE));
+    }
+    
+    local._rtt = new osg::Camera();
+    local._rtt->setName(local._tex->getName());
+    local._rtt->setReferenceFrame(osg::Transform::ABSOLUTE_RF_INHERIT_VIEWPOINT);
+    local._rtt->setClearMask(GL_COLOR_BUFFER_BIT); //GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+    local._rtt->setClearColor(osg::Vec4(-1000.0, -1000.0, -1000.0, 1.0f));
+    local._rtt->setViewport(0, 0, _texSize, _texSize);
+    local._rtt->setRenderOrder(osg::Camera::PRE_RENDER);
+    local._rtt->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
+    local._rtt->setImplicitBufferAttachmentMask(0, 0);
+    local._rtt->attach(osg::Camera::COLOR_BUFFER0, local._tex.get());
+    //local._rtt->setCullMask( ~TRITON_OCEAN_MASK );
+    local._rtt->setAllowEventFocus(false);
+    local._rtt->setDrawBuffer(GL_FRONT);
+    local._rtt->setReadBuffer(GL_FRONT);
+    local._rtt->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
+    
+    // TODO: create this once and just re-use it for all RTT cameras
+    osg::StateSet* rttSS = local._rtt->getOrCreateStateSet();
+    
+    osgEarth::VirtualProgram* rttVP = osgEarth::VirtualProgram::getOrCreate(rttSS);
+    rttVP->setName("Triton Height Map");
+    rttVP->setFunction( "oe_triton_setupHeightMap", vertexShader,   ShaderComp::LOCATION_VERTEX_MODEL);
+    rttVP->setFunction( "oe_triton_drawHeightMap",  fragmentShader, ShaderComp::LOCATION_FRAGMENT_OUTPUT);
+    rttVP->setIsAbstract(true);
+    rttVP->setInheritShaders(false);
+
+    osg::StateAttribute::OverrideValue off = osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE;
+    rttSS->setDefine("OE_IS_DEPTH_CAMERA");
+    rttSS->setDefine("OE_TERRAIN_RENDER_IMAGERY", off);
+    rttSS->setDefine("OE_TERRAIN_RENDER_NORMAL_MAP", off);
+    rttSS->setDefine("OE_TERRAIN_BLEND_IMAGERY", off);
+    rttSS->setDefine("OE_TERRAIN_MORPH_GEOMETRY", off);
+
+    osg::ref_ptr<const osgEarth::ImageLayer> maskLayer;
+    if (_maskLayer.lock(maskLayer))
+    {
+        rttSS->setDefine("OE_TRITON_MASK_SAMPLER", maskLayer->shareTexUniformName().get());
+        rttSS->setDefine("OE_TRITON_MASK_MATRIX", maskLayer->shareTexMatUniformName().get());
+        OE_INFO << LC << "Using mask layer \"" << maskLayer->getName() << "\", sampler=" << maskLayer->shareTexUniformName().get() << ", matrix=" << maskLayer->shareTexMatUniformName().get() << std::endl;
+    }
+
+    if (_terrain.valid())
+    {
+        local._rtt->addChild(_terrain.get());
+    }
+    else
+    {
+        OE_WARN << LC << "Illegal: no terrain set (must call setTerrain)" << std::endl;
+    }
+}
+
+#define MAXABS4(A,B,C,D) \
+    osg::maximum(fabs(A), osg::maximum(fabs(B), osg::maximum(fabs(C),fabs(D))))
+
+void
+TritonHeightMap::update(CameraLocal& local, const osg::Camera* cam, osgEarth::Horizon* horizon)
+{
+    osg::Vec3d eye = osg::Vec3d(0,0,0) * cam->getInverseViewMatrix();
+
+    double hd = horizon->getDistanceToVisibleHorizon();
+
+    local._rtt->setProjectionMatrix(osg::Matrix::ortho(-hd, hd, -hd, hd, 1.0, eye.length()));
+    local._rtt->setViewMatrixAsLookAt(eye, osg::Vec3d(0.0,0.0,0.0), osg::Vec3d(0.0,0.0,1.0));
+
+    static const osg::Matrixd scaleBias(
+        0.5, 0.0, 0.0, 0.0,
+        0.0, 0.5, 0.0, 0.0,
+        0.0, 0.0, 0.5, 0.0,
+        0.5, 0.5, 0.5, 1.0);
+
+    // Matrix that Triton will use to position the heightmap for sampling.
+    local._texMatrix = local._rtt->getViewMatrix() * local._rtt->getProjectionMatrix() * scaleBias;
+}
+
+void
+TritonHeightMap::traverse(osg::NodeVisitor& nv)
+{
+    if (nv.getVisitorType() == nv.CULL_VISITOR)
+    {
+        osgUtil::CullVisitor* cv = osgEarth::Culling::asCullVisitor(nv);
+        const osg::Camera* camera = cv->getCurrentCamera();
+        if (camera)
+        {
+            CameraLocal& local = _local.get(camera);
+
+            if (isConfigurationComplete())
+            {
+                // create the RTT for this camera on first encounter:
+                if (!local._rtt.valid())
+                {
+                    setup(local, camera->getName());
+                }
+
+                // only update when the MVPW changes.
+                if (local._mvpw != *cv->getMVPW())
+                {
+                    // update the RTT based on the current camera:
+                    osgEarth::Horizon* horizon = osgEarth::Horizon::get(nv);
+                    update(local, camera, horizon);
+
+                    // finally, traverse the camera to build the height map.
+                    local._rtt->accept(nv);
+                    
+                    local._frameNum = nv.getFrameStamp()->getFrameNumber();
+                    local._mvpw = *cv->getMVPW();
+                }
+           }
+           else
+           {
+               OE_DEBUG << LC << "Configuration not yet complete..." << std::endl;
+           }
+        }
+    }
+}
+
+bool
+TritonHeightMap::getTextureAndMatrix(osg::RenderInfo& ri, GLint& out_texName, osg::Matrix& out_matrix)
+{
+    if (!isConfigurationComplete())
+        return false;
+
+    CameraLocal& local = _local.get(ri.getCurrentCamera());
+    if (!local._tex.valid())
+        return false;
+
+    // did the texture change?
+    OE_DEBUG << "FN=" << ri.getState()->getFrameStamp()->getFrameNumber() << "; localFN=" << local._frameNum << std::endl;
+
+    if (ri.getState()->getFrameStamp()->getFrameNumber() > local._frameNum)
+        return false;
+
+    osg::Texture::TextureObject* obj = local._tex->getTextureObject(ri.getContextID());
+    if (!obj)
+        return false;
+
+    out_texName = obj->id();
+    out_matrix = local._texMatrix;
+    return true;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonIntersections osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonIntersections
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonIntersections	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonIntersections	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,76 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#ifndef OSGEARTH_TRITON_INTERSECTIONS
+#define OSGEARTH_TRITON_INTERSECTIONS 1
+
+#include "Common"
+
+#include <osgEarth/VisibleLayer>
+#include <osgEarth/LayerListener>
+#include <osgEarth/ImageLayer>
+#include <osgEarthUtil/Ocean>
+#include <osgEarthTriton/TritonCallback>
+
+namespace osgEarth { namespace Triton
+{
+    /**
+     * Pass this structure to TritonLayer and it will automatically
+     * populate the results with ocean wave intersections (local coordinates
+     * and normals.)
+     */
+    class OSGEARTHTRITON_EXPORT TritonIntersections : public osg::Referenced
+    {
+    public:
+        //! Construct an empty set
+        TritonIntersections();
+
+        //! Anchor point for intersectsions in this set. Only the X and Y
+        //! components are used. Any local points you add to this set will
+        //! be in the local coordinate system (LTP) around this anchor point.
+        void setAnchor(const GeoPoint& p);
+
+        //! Adds a point to the intersection set. The point should be in the 
+        //! local coordinate system of the anchor point.
+        void addLocalPoint(const osg::Vec3d& p);
+
+        //! Maximum range at which to perform intersections. Beyond this
+        //! range Triton will skip this set. Default is 2km.
+        void setMaxRange(const Distance& value);
+        const Distance& getMaxRange() const { return _maxRange; }
+
+        //! Vector of input local points added by addLocalPoint.
+        const std::vector<osg::Vec3d>& getInput() const { return _input; }
+
+        //! Vector of heights resulting from the intersection tests.
+        const std::vector<float>& getHeights() const { return _heights; }
+
+        //! Vector of normals resulting from the intersection tests.
+        const std::vector<osg::Vec3d>& getNormals() const { return _normals; }
+
+    private:
+        GeoPoint _anchor;
+        std::vector<osg::Vec3d> _input;
+        std::vector<float> _heights;
+        std::vector<osg::Vec3d> _normals; 
+        Distance _maxRange;
+        friend class TritonLayerNode;
+    };
+} }
+
+#endif // OSGEARTH_TRITON_INTERSECTIONS
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonIntersections.cpp osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonIntersections.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonIntersections.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonIntersections.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,51 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
+ * http://osgearth.org
+ *
+ * osgEarth is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+#include "TritonIntersections"
+
+using namespace osgEarth;
+using namespace osgEarth::Triton;
+
+TritonIntersections::TritonIntersections() :
+_maxRange(2.0, Units::KILOMETERS)
+{
+}
+
+void
+TritonIntersections::setAnchor(const GeoPoint& value)
+{
+    _anchor = value;
+
+    // zero out the other stuff:
+    _anchor.z() = 0.0;
+    _anchor.altitudeMode() = ALTMODE_ABSOLUTE;
+}
+
+void
+TritonIntersections::addLocalPoint(const osg::Vec3d& p)
+{
+    _input.push_back(p);
+    _heights.resize(_input.size());
+    _normals.resize(_input.size());
+}
+
+void
+TritonIntersections::setMaxRange(const Distance& range)
+{
+    _maxRange = range;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonLayer osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonLayer
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,11 +20,13 @@
 #define OSGEARTH_TRITON_LAYER 1
 
 #include "Common"
-#include "TritonOptions"
-#include "TritonNode"
+
 #include <osgEarth/VisibleLayer>
 #include <osgEarth/LayerListener>
 #include <osgEarth/ImageLayer>
+#include <osgEarthUtil/Ocean>
+#include <osgEarthTriton/TritonCallback>
+#include <osgEarthTriton/TritonIntersections>
 
 namespace osgEarth { namespace Triton
 {
@@ -40,6 +42,7 @@
             _useHeightMap.init( true );
             _heightMapSize.init( 1024 );
             _renderBinNumber.init( 12 );
+            _maxAltitude.init(50000);
             fromConfig( _conf );
         }
 
@@ -75,17 +78,21 @@
         optional<std::string>& maskLayer() { return _maskLayerName; }
         const optional<std::string>& maskLayer() const { return _maskLayerName; }
 
+        /** Render bin number to assign to the ocean (in DepthSortedBin) */
+        optional<float>& maxAltitude() { return _maxAltitude; }
+        const optional<float>& maxAltitude() const { return _maxAltitude; }
+
     public:
         osgEarth::Config getConfig() const {
             osgEarth::Config conf = osgEarth::VisibleLayerOptions::getConfig();
-            conf.key() = "triton";
-            conf.addIfSet("user", _user);
-            conf.addIfSet("license_code", _licenseCode);
-            conf.addIfSet("resource_path", _resourcePath);
-            conf.addIfSet("use_height_map", _useHeightMap);
-            conf.addIfSet("height_map_size", _heightMapSize);
-            conf.addIfSet("render_bin_number", _renderBinNumber);
-            conf.addIfSet("mask_layer", _maskLayerName);
+            conf.set("user", _user);
+            conf.set("license_code", _licenseCode);
+            conf.set("resource_path", _resourcePath);
+            conf.set("use_height_map", _useHeightMap);
+            conf.set("height_map_size", _heightMapSize);
+            conf.set("render_bin_number", _renderBinNumber);
+            conf.set("mask_layer", _maskLayerName);
+            conf.set("max_altitude", _maxAltitude);
             return conf;
         }
 
@@ -97,13 +104,14 @@
 
     private:
         void fromConfig( const osgEarth::Config& conf ) {
-            conf.getIfSet("user", _user);
-            conf.getIfSet("license_code", _licenseCode);
-            conf.getIfSet("resource_path", _resourcePath);
-            conf.getIfSet("use_height_map", _useHeightMap);
-            conf.getIfSet("height_map_size", _heightMapSize);
-            conf.getIfSet("render_bin_number", _renderBinNumber);
-            conf.getIfSet("mask_layer", _maskLayerName);
+            conf.get("user", _user);
+            conf.get("license_code", _licenseCode);
+            conf.get("resource_path", _resourcePath);
+            conf.get("use_height_map", _useHeightMap);
+            conf.get("height_map_size", _heightMapSize);
+            conf.get("render_bin_number", _renderBinNumber);
+            conf.get("mask_layer", _maskLayerName);
+            conf.get("max_altitude", _maxAltitude);
         }
 
     private:
@@ -114,6 +122,7 @@
         osgEarth::optional<int>         _heightMapSize;
         osgEarth::optional<int>         _renderBinNumber;
         osgEarth::optional<std::string> _maskLayerName;
+        osgEarth::optional<float>       _maxAltitude;
     };
 
 
@@ -123,11 +132,11 @@
     class OSGEARTHTRITON_EXPORT TritonLayer : public osgEarth::VisibleLayer
     {
     public:
-        META_Layer(osgEarth, TritonLayer, TritonLayerOptions);
+        META_Layer(osgEarth, TritonLayer, TritonLayerOptions, triton);
 
-        TritonLayer();
+        explicit TritonLayer(Callback* userCallback =0L);
 
-        TritonLayer(const TritonLayerOptions& options);
+        TritonLayer(const TritonLayerOptions& options, Callback* userCallback =0L);
 
         /** Masking layer for the ocean */
         void setMaskLayer(const osgEarth::ImageLayer* maskLayer);
@@ -136,9 +145,14 @@
         void setMaxAltitude(float alt);
         float getMaxAltitude() const;
 
+        //! Adds an intersection set.
+        //! Each frame, Triton will perform intersections against the ocean surface
+        //! (including the waves) and populate the set with the results.
+        void addIntersections(TritonIntersections*);
+
     public: // Layer
 
-        virtual osg::Node* getOrCreateNode();
+        virtual osg::Node* getNode() const;
 
     protected: // Layer
 
@@ -150,11 +164,15 @@
 
     private:
 
-        osg::ref_ptr<TritonNode> _tritonNode;
+        osg::ref_ptr<osg::Group> _root;
+        osg::ref_ptr<osg::Node> _tritonNode;
+        osg::ref_ptr<Callback> _callback;
+        float _seaLevel;
+        float _opacity;
 
     private:
 
-        LayerListener<TritonLayer, const osgEarth::ImageLayer> _layerListener;
+        osgEarth::LayerListener<TritonLayer, const osgEarth::ImageLayer> _layerListener;
     };
 
 } } // namespace osgEarth::Triton
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,14 +17,250 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include "TritonLayer"
-#include "TritonNode"
 #include "TritonContext"
+#include "TritonDrawable"
+#include "TritonHeightMap"
+
+#include <osgEarth/MapNode>
 #include <osgEarth/ImageLayer>
+#include <osgEarth/ResourceReleaser>
+#include <osgEarth/NodeUtils>
+#include <osgEarth/ElevationLOD>
+#include <osgEarth/TerrainEngineNode>
+
+#include <osgUtil/CullVisitor>
 
 #define LC "[TritonLayer] "
 
 using namespace osgEarth::Triton;
 
+namespace osgEarth { namespace Triton
+{
+    class TritonLayerNode : public osg::Group
+    {
+    public:
+        TritonLayerNode(const TritonLayerOptions& options, Callback* callback, osgEarth::Triton::TritonLayer* layer) :
+            _options(options),
+            _tritonLayer(layer),
+            _callback(callback),
+            _needsMapNode(true)
+        {
+            // To detect the map node:
+            ADJUST_UPDATE_TRAV_COUNT(this, +1);
+
+            // Disable bounds culling
+            setCullingActive(false);
+        }
+
+        ~TritonLayerNode()
+        {
+            // submit the TRITON context to the releaser so it can shut down Triton
+            // objects in a valid graphics context.
+            if (_TRITON.valid())
+            {
+                // TODO: 2.10+ trying to delete the TRITON object crashes.
+#if 0
+                osg::ref_ptr<osgEarth::ResourceReleaser> releaser;
+                if (_releaser.lock(releaser))
+                {
+                    releaser->push(_TRITON.get());
+                }
+#else
+                //_TRITON->releaseGLObjects(0L);
+#endif
+            }
+        }
+
+        /** Layer to use to mask the rendering of the ocean surface */
+        void setMaskLayer(const osgEarth::ImageLayer* layer)
+        {
+            _maskLayer = layer;
+            create();
+        }
+
+        /** MapNode to use; will be discovered automatically if not set here */
+        void setMapNode(osgEarth::MapNode* mapNode)
+        {
+            if (!mapNode)
+            {
+                this->removeChildren(0, this->getNumChildren());
+                _drawable = 0L;
+                _TRITON = 0L;
+                _needsMapNode = true;
+            }
+            else
+            {
+                _mapNode = mapNode;
+                create();
+            }
+        }
+
+        void create()
+        {
+            this->removeChildren(0, this->getNumChildren());
+            _drawable = 0L;
+
+            osg::ref_ptr<osgEarth::MapNode> mapNode;
+            if (!_mapNode.lock(mapNode))
+                return;
+
+            const osgEarth::Map* map = mapNode->getMap();
+
+            // Remember the resource releaser so we can properly destroy 
+            // Triton objects in a graphics context.
+            _releaser = mapNode->getResourceReleaser();
+
+            // create an object to house Triton data and resources.
+            if (!_TRITON.valid())
+                _TRITON = new TritonContext(_options);
+
+            if (map)
+                _TRITON->setSRS(map->getSRS());
+
+            if (_callback.valid())
+                _TRITON->setCallback(_callback.get());
+
+            TritonDrawable* drawable = new TritonDrawable(_TRITON.get());
+            _drawable = drawable;
+            _drawable->setNodeMask(TRITON_OCEAN_MASK);
+            drawable->setMaskLayer(_maskLayer.get());
+            this->addChild(_drawable);
+
+            // Place in the depth-sorted bin and set a rendering order.
+            // We want Triton to render after the terrain.
+            _drawable->getOrCreateStateSet()->setRenderBinDetails(_options.renderBinNumber().get(), "DepthSortedBin");
+
+            // If the user requested a height map, install it now.
+            // Configuration of the height map generator will take place later when
+            // we have a valid graphics context.
+            if (_options.useHeightMap() == true)
+            {
+                TritonHeightMap* heightMapGen = new TritonHeightMap();
+                heightMapGen->setTerrain(mapNode->getTerrainEngine());
+                if (_maskLayer.valid())
+                    heightMapGen->setMaskLayer(_maskLayer.get());
+                this->addChild(heightMapGen);
+                drawable->setHeightMapGenerator(heightMapGen);
+            }
+        }
+
+        void traverse(osg::NodeVisitor& nv)
+        {
+            if (nv.getVisitorType() == nv.UPDATE_VISITOR)
+            {
+                // Find a MapNode in the traversal path if necessary:
+                if (_needsMapNode)
+                {
+                    osgEarth::MapNode* mapNode = osgEarth::findInNodePath<osgEarth::MapNode>(nv);
+                    if (mapNode)
+                    {
+                        setMapNode(mapNode);
+                        _needsMapNode = false;
+                        ADJUST_UPDATE_TRAV_COUNT(this, -1);
+                    }
+                }
+            }
+
+            else if (nv.getVisitorType() == nv.CULL_VISITOR && _drawable && _TRITON.valid() && _TRITON->getOcean())
+            {
+                // Update any intersections.
+                // For now this is running in the CULL traversal, which is not ideal.
+                // However the Triton Ocean::GetHeight method requires a pointer to the Triton "camera"
+                // and under our framework this is only available in CULL or DRAW.
+                // Running the intersection in eithe CULL or DRAW will result in a frame
+                // incoherency w.r.t the Triton update() call that updates the ocean state.
+                ::Triton::Ocean* ocean = _TRITON->getOcean();
+
+                // Find the TritonCam associated with this osg Cam
+                osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(&nv);
+                ::Triton::Camera* tritonCam = static_cast<TritonDrawable*>(_drawable)->getTritonCam(cv->getCurrentCamera());
+
+                osg::Vec3d eye = osg::Vec3d(0,0,0) * cv->getCurrentCamera()->getInverseViewMatrix();
+
+                for(std::vector<osg::ref_ptr<TritonIntersections> >::iterator i = _isect.begin();
+                    i != _isect.end();
+                    ++i)
+                {
+                    TritonIntersections* ir = i->get();
+
+                    // allocate enough space for the output:
+                    ir->_input.resize(ir->_input.size());
+                    ir->_normals.resize(ir->_input.size());
+
+                    osg::Matrix local2world;
+                    ir->_anchor.createLocalToWorld(local2world);
+
+                    // Make sure it's in range so as not to waste cycles:
+                    osg::Vec3d anchor = osg::Vec3d(0,0,0) * local2world;
+                    double m = ir->getMaxRange().as(Units::METERS);
+                    if ((eye-anchor).length2() > (m*m))
+                    {
+                        continue;
+                    }
+
+                    osg::Matrix world2local;
+                    world2local.invert(local2world);
+
+                    for(unsigned i=0; i<ir->_input.size(); ++i)
+                    {
+                        const osg::Vec3d& local = ir->_input[i];
+
+                        // transform the ray to world coordinates
+                        osg::Vec3d start = local * local2world;
+                        osg::Vec3d dir = osg::Matrix::transform3x3(local2world, osg::Vec3d(0,0,1));
+
+                        // intersect the ocean
+                        float& out_height = ir->_heights[i];
+                        ::Triton::Vector3 out_normalT;
+                            
+                        bool ok = ocean->GetHeight(
+                            ::Triton::Vector3(start.x(), start.y(), start.z()),
+                            ::Triton::Vector3(dir.x(), dir.y(), dir.z()),
+                            out_height,
+                            out_normalT,
+                            true,           // visualCorrelation
+                            true,           // includeWakes
+                            true,           // highResolution
+                            true,           // threadSafe,
+                            0L,             // intersectionPoint,
+                            true,           // autoFlip
+                            tritonCam);
+
+                        if (ok)
+                        {
+                            // populate the output data in local coordinates
+                            osg::Vec3d& normal = ir->_normals[i];
+                            normal.set(out_normalT.x, out_normalT.y, out_normalT.z);
+                            normal = osg::Matrix::transform3x3(normal, world2local);
+                        }
+                        else
+                        {
+                            // todo...what?
+                            OE_WARN << "GetHeight returned false dude" << std::endl;
+                        }
+                    }
+                }
+            }
+
+            osg::Group::traverse(nv);
+        }
+
+        osg::ref_ptr<TritonContext> _TRITON;
+        TritonOptions               _options;
+        osg::Drawable*              _drawable;
+        osg::observer_ptr<osgEarth::ResourceReleaser> _releaser;
+        osg::observer_ptr<const osgEarth::ImageLayer> _maskLayer;
+        osg::observer_ptr<osgEarth::MapNode> _mapNode;
+        osg::observer_ptr<osgEarth::Triton::TritonLayer> _tritonLayer;
+        osg::ref_ptr<Callback> _callback;
+        bool _needsMapNode;
+        std::vector<osg::ref_ptr<TritonIntersections> > _isect;
+
+    };
+} }
+
+//........................................................................
+
 /** Register this layer so it can be used in an earth file */
 namespace osgEarth { namespace Triton
 {
@@ -33,17 +269,19 @@
 } }
 
 
-TritonLayer::TritonLayer() :
+TritonLayer::TritonLayer(Callback* userCallback) :
 osgEarth::VisibleLayer(&_optionsConcrete),
-_options(&_optionsConcrete)
+_options(&_optionsConcrete),
+_callback(userCallback)
 {
     init();
 }
 
-TritonLayer::TritonLayer(const TritonLayerOptions& options) :
+TritonLayer::TritonLayer(const TritonLayerOptions& options, Callback* userCallback) :
 osgEarth::VisibleLayer(&_optionsConcrete),
 _options(&_optionsConcrete),
-_optionsConcrete(options)
+_optionsConcrete(options),
+_callback(userCallback)
 {
     init();
 }
@@ -51,27 +289,45 @@
 void
 TritonLayer::init()
 {
-    OE_INFO << LC << "Creating a TritonLayer\n";
+    OE_INFO << LC << "Creating TritonLayer\n";
 
     osgEarth::VisibleLayer::init();
 
+    _seaLevel = 0.0f;
+
+    // Trick to force the VisibleLayer to install its opacity shader, 
+    // which a modified Triton user-functions.glsl shader needs in order to control
+    // sea surface opacity.
+    float opacity = getOpacity();
+    setOpacity(0.0f);
+    setOpacity(opacity);
+
     this->setName("Triton");
-    setRenderType(RENDERTYPE_NONE);
+    setRenderType(RENDERTYPE_CUSTOM);
+
+    ElevationLOD* lod = new ElevationLOD();
+    _root = lod;
+    if (options().maxAltitude().isSet())
+    {
+        OE_INFO << LC << "Setting max altitude = " << options().maxAltitude().get() << std::endl;
+        lod->setMaxElevation(options().maxAltitude().get());
+    }
 
-    TritonOptions legacyOptions(options());
-    _tritonNode = new TritonNode(legacyOptions);
+    _tritonNode = new TritonLayerNode(options(), _callback.get(), this);
+    _root->addChild(_tritonNode.get());
 }
 
+
 osg::Node*
-TritonLayer::getOrCreateNode()
+TritonLayer::getNode() const
 {
-    return _tritonNode.get();
+    return _root.get();
 }
 
 void
 TritonLayer::setMaskLayer(const osgEarth::ImageLayer* maskLayer)
 {
-    _tritonNode->setMaskLayer(maskLayer);
+    static_cast<TritonLayerNode*>(_tritonNode.get())->setMaskLayer(maskLayer);
 }
 
 void
@@ -94,3 +350,9 @@
     }
 }
 
+void
+TritonLayer::addIntersections(TritonIntersections* value)
+{
+    TritonLayerNode* node = static_cast<TritonLayerNode*>(_tritonNode.get());
+    node->_isect.push_back(value);
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonNode osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonNode
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonNode	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonNode	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#ifndef OSGEARTH_TRITON_NODE
-#define OSGEARTH_TRITON_NODE 1
-
-#include "Common"
-#include "TritonOptions"
-#include "TritonAPIWrapper"
-#include "TritonCallback"
-#include <osgEarthUtil/Ocean>
-#include <osgEarth/MapNode>
-#include <osgEarth/ImageLayer>
-#include <osgEarth/ResourceReleaser>
-#include <osg/Drawable>
-
-namespace osgEarth { namespace Triton
-{
-    class TritonContext;
-
-    /**
-     * Node that roots the Triton adapter.
-     */
-    class OSGEARTHTRITON_EXPORT TritonNode : public osgEarth::Util::OceanNode
-    {
-    public:
-        /** Consruct a TritonNode */
-        TritonNode(const TritonOptions& options,
-                   Callback* userCallback =0L);
-
-        /** @deprecated - place TritonNode under MapNode, or call setMapNode
-         *  Construct a TritonNode */
-        TritonNode(osgEarth::MapNode* mapNode, const TritonOptions& options, Callback* callback =0L);
-
-        /** MapNode to use; will be discovered automatically if not set here */
-        void setMapNode(osgEarth::MapNode* mapNode);
-
-        /** Layer to use to mask the rendering of the ocean surface */
-        void setMaskLayer(const osgEarth::ImageLayer* layer);
-
-    protected: // OceanNode
-
-        void onSetSeaLevel();
-
-        void onSetAlpha();
-
-    public: // osg::Node
-
-        osg::BoundingSphere computeBound() const;
-
-        void traverse(osg::NodeVisitor&);
-
-    protected:
-        virtual ~TritonNode();
-
-        osg::ref_ptr<TritonContext> _TRITON;
-        TritonOptions               _options;
-        osg::Drawable*              _drawable;
-        osg::ref_ptr<osg::Uniform>  _alphaUniform;
-        osg::observer_ptr<ResourceReleaser> _releaser;
-        osg::observer_ptr<const ImageLayer> _maskLayer;
-        osg::observer_ptr<MapNode> _mapNode;
-        osg::ref_ptr<Callback> _callback;
-        bool _needsMapNode;
-
-        void create();
-    };
-
-} } // namespace osgEarth::Triton
-
-#endif // OSGEARTH_TRITON_NODE
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonNode.cpp osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonNode.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonNode.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,187 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-#include "TritonNode"
-#include "TritonContext"
-#include "TritonDrawable"
-#include <osgEarth/CullingUtils>
-#include <osgEarth/NodeUtils>
-
-#define LC "[TritonNode] "
-
-using namespace osgEarth::Triton;
-
-
-TritonNode::TritonNode(const TritonOptions& options,
-                       Callback* callback) :
-OceanNode( options ),
-_options ( options ),
-_callback( callback ),
-_needsMapNode( true )
-{
-    // Triton requires a constant update traversal.
-    ADJUST_UPDATE_TRAV_COUNT(this, +1);
-}
-
-
-// @deprecated ctor
-TritonNode::TritonNode(osgEarth::MapNode* mapNode,
-                       const TritonOptions& options,
-                       Callback* callback) :
-OceanNode( options ),
-_options ( options ),
-_callback( callback )
-{
-    // Triton requires a constant update traversal.
-    ADJUST_UPDATE_TRAV_COUNT(this, +1);
-
-    setMapNode(mapNode);
-    _needsMapNode = (mapNode == 0L);
-}
-
-void
-TritonNode::setMaskLayer(const osgEarth::ImageLayer* maskLayer)
-{
-    _maskLayer = maskLayer;
-    create();
-}
-
-void
-TritonNode::setMapNode(osgEarth::MapNode* mapNode)
-{
-    if (!mapNode)
-    {
-        this->removeChildren(0, this->getNumChildren());
-        _drawable = 0L;
-        _TRITON = 0L;
-        setSRS(0L);
-        _needsMapNode = true;
-    }
-    else
-    {
-        _mapNode = mapNode;
-        create();
-    }
-}
-
-void
-TritonNode::create()
-{    
-    this->removeChildren(0, this->getNumChildren());
-    _drawable = 0L;
-
-    osg::ref_ptr<MapNode> mapNode;
-    if (!_mapNode.lock(mapNode))
-        return;
-
-    const osgEarth::Map* map = mapNode->getMap();
-    if ( map )
-        setSRS( map->getSRS() );
-
-    // Remember the resource releaser so we can properly destroy 
-    // Triton objects in a graphics context.
-    _releaser = mapNode->getResourceReleaser();
-
-    // create an object to house Triton data and resources.
-    if (!_TRITON.valid())
-        _TRITON = new TritonContext(_options);
-
-    if ( map )
-        _TRITON->setSRS( map->getSRS() );
-
-    if ( _callback.valid() )
-        _TRITON->setCallback( _callback.get() );
-
-    TritonDrawable* drawable = new TritonDrawable(mapNode.get(), _TRITON.get());
-    _drawable = drawable;
-    _alphaUniform = getOrCreateStateSet()->getOrCreateUniform("oe_ocean_alpha", osg::Uniform::FLOAT);
-    _alphaUniform->set(getAlpha());
-    _drawable->setNodeMask( TRITON_OCEAN_MASK );
-    drawable->setMaskLayer(_maskLayer.get());
-    this->addChild(_drawable);
-
-    drawable->_heightCameraParent = this;
-
-    //this->setNumChildrenRequiringUpdateTraversal(1);
-
-    // Place in the depth-sorted bin and set a rendering order.
-    // We want Triton to render after the terrain.
-    _drawable->getOrCreateStateSet()->setRenderBinDetails( _options.renderBinNumber().get(), "DepthSortedBin" );
-}
-
-TritonNode::~TritonNode()
-{
-    // submit the TRITON context to the releaser so it can shut down Triton
-    // objects in a valid graphics context.
-    if (_TRITON.valid())
-    {
-        osg::ref_ptr<ResourceReleaser> releaser;
-        if (_releaser.lock(releaser))
-        {
-            releaser->push(_TRITON.get());
-        }
-    }
-}
-
-void
-TritonNode::onSetSeaLevel()
-{
-    if ( _TRITON->ready() )
-    {
-        _TRITON->getEnvironment()->SetSeaLevel( getSeaLevel() );
-    }
-    dirtyBound();
-}
-
-void
-TritonNode::onSetAlpha()
-{
-    _alphaUniform->set(getAlpha());
-}
-
-osg::BoundingSphere
-TritonNode::computeBound() const
-{
-    return osg::BoundingSphere();
-}
-
-void
-TritonNode::traverse(osg::NodeVisitor& nv)
-{
-    if ( nv.getVisitorType() == nv.UPDATE_VISITOR )
-    {
-        // Find a MapNode in the traversal path if necessary:
-        if (_needsMapNode)
-        {
-            MapNode* mapNode = osgEarth::findInNodePath<MapNode>(nv);
-            if (mapNode)
-            {
-                setMapNode(mapNode);
-                _needsMapNode = false;
-            }
-        }
-
-        // Tick Triton each frame:
-        if (_TRITON->ready())
-        {
-            _TRITON->update(nv.getFrameStamp()->getSimulationTime());
-        }
-    }
-
-    osgEarth::Util::OceanNode::traverse(nv);
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonOptions osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonOptions
--- osgearth-2.9.0+dfsg/src/osgEarthTriton/TritonOptions	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthTriton/TritonOptions	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -77,13 +77,13 @@
     public:
         osgEarth::Config getConfig() const {
             osgEarth::Config conf = osgEarth::Util::OceanOptions::getConfig();
-            conf.addIfSet("user", _user);
-            conf.addIfSet("license_code", _licenseCode);
-            conf.addIfSet("resource_path", _resourcePath);
-            conf.addIfSet("use_height_map", _useHeightMap);
-            conf.addIfSet("height_map_size", _heightMapSize);
-            conf.addIfSet("render_bin_number", _renderBinNumber);
-            conf.addIfSet("mask_layer", _maskLayerName);
+            conf.set("user", _user);
+            conf.set("license_code", _licenseCode);
+            conf.set("resource_path", _resourcePath);
+            conf.set("use_height_map", _useHeightMap);
+            conf.set("height_map_size", _heightMapSize);
+            conf.set("render_bin_number", _renderBinNumber);
+            conf.set("mask_layer", _maskLayerName);
             return conf;
         }
 
@@ -95,13 +95,13 @@
 
     private:
         void fromConfig( const osgEarth::Config& conf ) {
-            conf.getIfSet("user", _user);
-            conf.getIfSet("license_code", _licenseCode);
-            conf.getIfSet("resource_path", _resourcePath);
-            conf.getIfSet("use_height_map", _useHeightMap);
-            conf.getIfSet("height_map_size", _heightMapSize);
-            conf.getIfSet("render_bin_number", _renderBinNumber);
-            conf.getIfSet("mask_layer", _maskLayerName);
+            conf.get("user", _user);
+            conf.get("license_code", _licenseCode);
+            conf.get("resource_path", _resourcePath);
+            conf.get("use_height_map", _useHeightMap);
+            conf.get("height_map_size", _heightMapSize);
+            conf.get("render_bin_number", _renderBinNumber);
+            conf.get("mask_layer", _maskLayerName);
         }
 
     private:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ActivityMonitorTool osgearth-2.10.2+dfsg/src/osgEarthUtil/ActivityMonitorTool
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ActivityMonitorTool	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ActivityMonitorTool	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ActivityMonitorTool.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/ActivityMonitorTool.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ActivityMonitorTool.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ActivityMonitorTool.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/AnnotationEvents osgearth-2.10.2+dfsg/src/osgEarthUtil/AnnotationEvents
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/AnnotationEvents	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/AnnotationEvents	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
-* http://osgearth.org
-*
-* osgEarth is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-* IN THE SOFTWARE.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-#ifndef OSGEARTH_UTIL_ANNOTATION_EVENTS_H
-#define OSGEARTH_UTIL_ANNOTATION_EVENTS_H 1
-
-#include <osgEarthUtil/Common>
-#include <osgEarthAnnotation/AnnotationNode>
-#include <set>
-
-/**
- * @deprecated
- *
- * These classes are deprecated, and will be removed in a future version.
- * Please consider using the RTTPicker class instead and handling hovering and 
- * clicking in your own code.
- */
-namespace osgEarth { namespace Util
-{	
-    using namespace osgEarth::Annotation;
-
-    /**
-     * Event handler skeleton for handling events from the AnnotationEventCallback.
-     * @deprecated
-     */
-    struct AnnotationEventHandler : public osg::Referenced
-    {
-        struct EventArgs
-        {
-            EventArgs() : x(0.0f), y(0.0f), buttons(0), modkeys(0) { }
-            float x, y;
-            int   buttons;   // see osgGA::GUIEventAdapter::MouseButtonMask
-            int   modkeys;   // see osgGA::GUIEventAdapter::ModKeyMask
-        };
-
-        virtual void onClick( AnnotationNode* node, const EventArgs& details ) { }
-
-        virtual void onHoverEnter( AnnotationNode* node, const EventArgs& details ) { }
-
-        virtual void onHoverLeave( AnnotationNode* node, const EventArgs& details ) { }
-
-        virtual ~AnnotationEventHandler() { }
-    };
-
-    /**
-     * Event-traversal node callback that handles user interaction with 
-     * annotation objects.
-     * @deprecated
-     */
-    class OSGEARTHUTIL_EXPORT AnnotationEventCallback : public osg::NodeCallback
-    {
-    public:
-        AnnotationEventCallback( AnnotationEventHandler* handler =0L );
-
-        /** 
-         * Adds an event handler whose events will fire upon user actions
-         */
-        void addHandler( AnnotationEventHandler* handler );
-
-        /**
-         * Sets whether "hovering" events will fire. By default they do. But you 
-         * can disable this (if you're not using hovering) and get a small
-         * performance improvement.
-         */
-        void setHoverEnabled( bool hoverEnabled );
-
-    public: // osg::NodeCallback
-
-        virtual void operator()( osg::Node* node, osg::NodeVisitor* nv );
-
-    protected:
-
-        virtual ~AnnotationEventCallback() { }
-
-        AnnotationEventHandler::EventArgs _args;
-        bool  _mouseDown;
-        bool _hoverEnabled;
-        std::set<AnnotationNode*> _hovered;
-
-        typedef std::vector< osg::ref_ptr<AnnotationEventHandler> > Handlers;
-        Handlers _handlers;
-
-        typedef void (AnnotationEventHandler::*EventHandlerMethodPtr)(AnnotationNode*,const AnnotationEventHandler::EventArgs&);
-        void fireEvent(EventHandlerMethodPtr mp, AnnotationNode* node);
-    };
-
-} } // namespace osgEarth::Annotation
-
-#endif // OSGEARTH_ANNO_ANNOTATION_NODE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/AnnotationEvents.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/AnnotationEvents.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/AnnotationEvents.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/AnnotationEvents.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,167 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
-* http://osgearth.org
-*
-* osgEarth is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-* IN THE SOFTWARE.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-#include <osgEarthUtil/AnnotationEvents>
-#include <osgEarth/IntersectionPicker>
-#include <osgGA/GUIEventAdapter>
-#include <osgGA/EventVisitor>
-#include <osgViewer/View>
-
-using namespace osgEarth;
-using namespace osgEarth::Util;
-using namespace osgEarth::Annotation;
-
-AnnotationEventCallback::AnnotationEventCallback( AnnotationEventHandler* handler ) :
-_hoverEnabled( true ),
-_mouseDown   ( false )
-{
-    OE_DEPRECATED(AnnotationEventCallback, RTTPicker);
-    if ( handler )
-        addHandler( handler );
-}
-
-void
-AnnotationEventCallback::addHandler( AnnotationEventHandler* handler )
-{
-    if ( handler )
-        _handlers.push_back( handler );
-}
-
-void
-AnnotationEventCallback::setHoverEnabled( bool hoverEnabled )
-{
-    // Does not unhover currently hovered annotations, so don't turn hovering off if there
-    // are currently items hovered
-    if(hoverEnabled || !_hovered.size() )
-    {
-      _hoverEnabled = hoverEnabled;
-    }
-}
-
-void
-AnnotationEventCallback::operator()( osg::Node* node, osg::NodeVisitor* nv )
-{
-    osgGA::EventVisitor* ev = static_cast<osgGA::EventVisitor*>(nv);
-    osgGA::EventQueue::Events& events = ev->getEvents();
-    osgViewer::View* view = static_cast<osgViewer::View*>(ev->getActionAdapter());
-
-    for( osgGA::EventQueue::Events::const_iterator e = events.begin(); e != events.end(); ++e )
-    {
-        osgGA::GUIEventAdapter* ea = dynamic_cast<osgGA::GUIEventAdapter*>(e->get());
-        if ( !ea )
-            continue;
-
-        if ( ea->getEventType() == osgGA::GUIEventAdapter::MOVE ||
-             ea->getEventType() == osgGA::GUIEventAdapter::DRAG )
-        {
-            _args.x = ea->getX();
-            _args.y = ea->getY();
-        }
-
-        else if ( ea->getEventType() == osgGA::GUIEventAdapter::PUSH )
-        {
-            _mouseDown = true;
-            _args.x = ea->getX();
-            _args.y = ea->getY();
-            _args.buttons = ea->getButtonMask();
-            _args.modkeys = ea->getModKeyMask();
-
-            IntersectionPicker picker( view, node );
-            IntersectionPicker::Hits hits;
-            if ( picker.pick( _args.x, _args.y, hits ) )
-            {
-                std::set<AnnotationNode*> fired; // prevent multiple hits on the same instance
-
-                for( IntersectionPicker::Hits::const_iterator h = hits.begin(); h != hits.end(); ++h )
-                {
-                    AnnotationNode* anno = picker.getNode<AnnotationNode>( *h );
-                    if ( anno && fired.find(anno) == fired.end() )
-                    {
-                        fireEvent( &AnnotationEventHandler::onClick, anno );
-                        fired.insert( anno );
-                        //break;
-                    }
-                }
-            }
-        }
-
-        else if ( ea->getEventType() == osgGA::GUIEventAdapter::RELEASE )
-        {
-            _mouseDown = false;
-        }
-
-        else if ( ea->getEventType() == osgGA::GUIEventAdapter::FRAME && _hoverEnabled && !_mouseDown )
-        {
-            //Insert all the currently hovered annotations into a set to be unhoverd
-            std::set<AnnotationNode*> toUnHover;
-            for( std::set<AnnotationNode*>::iterator i = _hovered.begin(); i != _hovered.end(); ++i )
-            {
-                toUnHover.insert( *i );
-            }
-
-            IntersectionPicker picker( view, node );
-            IntersectionPicker::Hits hits;
-
-            if ( picker.pick( _args.x, _args.y, hits ) )
-            {
-                for( IntersectionPicker::Hits::const_iterator h = hits.begin(); h != hits.end(); ++h )
-                {
-                    const IntersectionPicker::Hit& hit = *h;
-
-                    AnnotationNode* anno = picker.getNode<AnnotationNode>( hit );
-                    if ( anno )
-                    {
-                        //If the annotation ins't current hovered, add it to the list of new hovered items
-                        if ( _hovered.find(anno) == _hovered.end() )
-                        {
-                            _hovered.insert( anno );
-                            fireEvent( &AnnotationEventHandler::onHoverEnter, anno );
-                        }
-                        //It's still hovered, so don't unhover it
-                        toUnHover.erase( anno );
-                        //break;
-                    }
-                }
-            }                
-
-            //The unhovered list now contains all the annotations that were hovered on the previous frame that need to be unhovered
-            //and removed from the previous hover list
-            for( std::set<AnnotationNode*>::iterator i = toUnHover.begin(); i != toUnHover.end(); ++i )
-            {
-                _hovered.erase( *i );
-                fireEvent( &AnnotationEventHandler::onHoverLeave, *i );
-            }
-        }
-    }
-
-    traverse(node,nv);
-}
-
-void
-AnnotationEventCallback::fireEvent(EventHandlerMethodPtr   method, 
-                                   AnnotationNode*         node )
-{
-    for( Handlers::iterator i = _handlers.begin(); i != _handlers.end(); ++i )
-    {
-        (i->get()->*method)( node, _args );
-    }
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ArcGIS osgearth-2.10.2+dfsg/src/osgEarthUtil/ArcGIS
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ArcGIS	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ArcGIS	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 #include <osg/Referenced>
 #include <osg/ref_ptr>
 #include <osgEarth/Common>
+#include <osgEarth/URI>
 
 #include <osgDB/ReaderWriter>
 #include <osg/Version>
@@ -79,8 +80,6 @@
         const std::string& getCurrentVersion() const;
         void setCurrentVersion( const std::string& currentVersion);
 
-        bool getFolder(const std::string& folder, RESTResponse& response ) const;
-
         const std::string& getServiceURL() const;
         void setServiceURL( const std::string& serviceURL );
 
@@ -94,7 +93,7 @@
     class OSGEARTHUTIL_EXPORT ServiceReader
     {
     public:
-        static bool read( const std::string &location, const osgDB::ReaderWriter::Options* options, RESTResponse& response );    
+        static bool read( const URI &location, const osgDB::Options* options, RESTResponse& response );    
         static bool read( const Config& conf,  RESTResponse& response );
 
     private:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ArcGIS.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/ArcGIS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ArcGIS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ArcGIS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,7 +19,6 @@
 
 #include <osgEarthUtil/ArcGIS>
 
-#include <osgEarth/IOTypes>
 #include <osgEarth/URI>
 
 using namespace osgEarth;
@@ -85,12 +84,6 @@
     _serviceURL = serviceURL;
 }
 
-bool RESTResponse::getFolder(const std::string& folder, RESTResponse& response ) const
-{
-    std::string folderURL = _serviceURL + "/" + folder;
-    return ServiceReader::read(folderURL, 0, response );
-}
-
 /***************************************************************************************/
 
 ServiceReader::ServiceReader()
@@ -106,12 +99,12 @@
 }
 
 bool 
-ServiceReader::read( const std::string &location, const osgDB::ReaderWriter::Options* options, RESTResponse& response )
+ServiceReader::read( const URI& location, const osgDB::Options* options, RESTResponse& response )
 {
-    response.setServiceURL( location );
-    std::string serviceLocation = location + "?f=json&pretty=true";
+    response.setServiceURL( location.full() );
+    std::string serviceLocation = location.full() + "?f=json&pretty=true";
 
-    ReadResult r = URI(serviceLocation).readString();
+    ReadResult r = URI(serviceLocation, location.context()).readString();
     if ( r.failed() )
     {
         OE_WARN << "Failed to read ArcGIS Services tile map file from " << serviceLocation << std::endl;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/AtlasBuilder osgearth-2.10.2+dfsg/src/osgEarthUtil/AtlasBuilder
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/AtlasBuilder	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/AtlasBuilder	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/AtlasBuilder.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/AtlasBuilder.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/AtlasBuilder.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/AtlasBuilder.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,16 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarthUtil/AtlasBuilder>
-#include <osgEarthSymbology/Skins>
-#include <osgEarth/ImageUtils>
-#include <osgDB/Options>
 #include <osgDB/FileNameUtils>
 #include <osgDB/ReadFile>
 #include <osgDB/WriteFile>
 #include <osgUtil/Optimizer>
-#include <vector>
-#include <string>
-#include <stdlib.h> // for ::getenv
 
 #define LC "[AtlasBuilder] "
 
@@ -256,8 +250,8 @@
     }
 
     // protecte against a div0
-    maxS = std::max(maxS, 1u);
-    maxT = std::max(maxT, 1u);
+    maxS = osg::maximum(maxS, 1u);
+    maxT = osg::maximum(maxT, 1u);
 
     OE_INFO << LC <<
         "Final atlas size will be (" << maxS << ", " << maxT << ")" << std::endl;
@@ -306,8 +300,8 @@
     
     // for each source in this atlas layer, apply its texture matrix info
     // to the new catalog.
-    maxS = std::max(maxS, 1u);
-    maxT = std::max(maxT, 1u);
+    maxS = osg::maximum(maxS, 1u);
+    maxT = osg::maximum(maxT, 1u);
 
     for(int r=0; r<(int)mainAtlasList.size(); ++r)
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/AutoClipPlaneHandler osgearth-2.10.2+dfsg/src/osgEarthUtil/AutoClipPlaneHandler
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/AutoClipPlaneHandler	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/AutoClipPlaneHandler	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/AutoClipPlaneHandler.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/AutoClipPlaneHandler.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/AutoClipPlaneHandler.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/AutoClipPlaneHandler.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,10 +18,7 @@
  */
 #include <osgEarthUtil/AutoClipPlaneHandler>
 #include <osgEarth/MapNode>
-#include <osgEarth/Terrain>
-#include <osgEarth/Notify>
 #include <osgEarth/Registry>
-#include <osgEarth/Utils>
 #include <osgEarth/CullingUtils>
 
 #define LC "[AutoClip] "
@@ -134,8 +131,8 @@
 
         bool clampProjectionMatrixImplementation(osg::Matrixf& projection, double& znear, double& zfar) const
         {
-            double n = std::max( znear, _minNear );
-            double f = std::min( zfar, _maxFar );
+            double n = osg::maximum( znear, _minNear );
+            double f = osg::minimum( zfar, _maxFar );
             bool r = _clampProjectionMatrix( projection, n, f, _nearFarRatio );
             if ( r ) {
                 znear = n;
@@ -146,8 +143,8 @@
 
         bool clampProjectionMatrixImplementation(osg::Matrixd& projection, double& znear, double& zfar) const
         {
-            double n = std::max( znear, _minNear );
-            double f = std::min( zfar, _maxFar );
+            double n = osg::maximum( znear, _minNear );
+            double f = osg::minimum( zfar, _maxFar );
             bool r = _clampProjectionMatrix( projection, n, f, _nearFarRatio );
             if ( r ) {
                 znear = n;
@@ -179,7 +176,7 @@
         {
             // Select the minimal radius..
             const osg::EllipsoidModel* em = map->getProfile()->getSRS()->getEllipsoid();
-            _rp = std::min( em->getRadiusEquator(), em->getRadiusPolar() );
+            _rp = osg::minimum( em->getRadiusEquator(), em->getRadiusPolar() );
             _rp2 = _rp*_rp;
             _active = true;
         }
@@ -192,7 +189,7 @@
     else
     {
         const osg::EllipsoidModel* em = Registry::instance()->getGlobalGeodeticProfile()->getSRS()->getEllipsoid();
-        _rp = std::min( em->getRadiusEquator(), em->getRadiusPolar() );
+        _rp = osg::minimum( em->getRadiusEquator(), em->getRadiusPolar() );
         _rp2 = _rp*_rp;
         _active = true;
     }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/AutoScaleCallback osgearth-2.10.2+dfsg/src/osgEarthUtil/AutoScaleCallback
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/AutoScaleCallback	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/AutoScaleCallback	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,121 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#ifndef OSGEARTHUTIL_AUTO_SCALE_CALLBACK
+#define OSGEARTHUTIL_AUTO_SCALE_CALLBACK 1
+
+#include <osgEarthUtil/Common>
+#include <osg/NodeCallback>
+#include <osg/Vec3d>
+
+namespace osgEarth { namespace Util
+{
+    /**
+     * Cull Callback that you can install on any node that implements
+     * a setScale(osg::Vec3) method (like an osg::PositionAttitudeTransform)
+     * and will automatically scale the model from model coords to pixels.
+     *
+     * A couple tips: If your object doesn't show up, it might be getting
+     * small-feature-culled. Try disabling small feature calling in your
+     * camera; or, you can call setCullingActive(false) on the transform
+     * to which you add this callback.
+     */
+    template<typename T>
+    class AutoScaleCallback : public osg::NodeCallback
+    {
+    public:
+
+        AutoScaleCallback(
+            double baseScale = 1.0,
+            double minScale = 0.0,
+            double maxScale = DBL_MAX) :
+                _baseScale(baseScale),
+                _minScale(minScale),
+                _maxScale(maxScale) { }
+
+    public: // osg::NodeCallback
+        void operator()(osg::Node* node, osg::NodeVisitor* nv)
+        {
+            T* transform = static_cast<T*>(node);
+            osgUtil::CullVisitor* cs = static_cast<osgUtil::CullVisitor*>(nv);
+
+            osg::Camera* cam = cs->getCurrentCamera();
+
+            // If this is an RTT camera, we need to use it's "parent"
+            // to calculate the proper scale factor.
+            if (cam->isRenderToTextureCamera() &&
+                cam->getView() &&
+                cam->getView()->getCamera() &&
+                cam->getView()->getCamera() != cam)
+            {
+                cam = cam->getView()->getCamera();
+            }
+
+            if (cam->getViewport())
+            {
+                // Reset the scale so we get a proper bound
+                transform->setScale(osg::Vec3d(_baseScale,_baseScale, _baseScale));
+                const osg::BoundingSphere& bs = node->getBound();
+                osg::Matrix l2w = osg::computeLocalToWorld(nv->getNodePath());
+
+                // transform centroid to VIEW space:
+                osg::Vec3d centerView = l2w.getTrans() * cam->getViewMatrix();
+
+                // Set X coordinate to the radius so we can use the resulting CLIP
+                // distance to calculate meters per pixel:
+                centerView.x() = bs.radius();
+
+                // transform the CLIP space:
+                osg::Vec3d centerClip = centerView * cam->getProjectionMatrix();
+
+                // caluclate meters per pixel:
+                double mpp = (centerClip.x()*0.5) * cam->getViewport()->width();
+
+                // and the resulting scale we need to auto-scale.
+                double scale = bs.radius() / mpp;
+
+                if (scale < _minScale)
+                    scale = _minScale;
+                else if (scale>_maxScale)
+                    scale = _maxScale;
+
+                scale *= _baseScale;
+
+                transform->setScale(osg::Vec3d(scale, scale, scale));
+            }
+
+            if (node->getCullingActive() == false)
+            {
+                node->setCullingActive(true);
+            }
+
+            traverse(node, nv);
+        }
+
+    private:
+        double _baseScale;
+        double _minScale;
+		double _maxScale;
+    };
+
+} } // namespace
+
+#endif //OSGEARTHUTIL_AUTO_SCALE_CALLBACK
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/BrightnessContrastColorFilter osgearth-2.10.2+dfsg/src/osgEarthUtil/BrightnessContrastColorFilter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/BrightnessContrastColorFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/BrightnessContrastColorFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/BrightnessContrastColorFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/BrightnessContrastColorFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/BrightnessContrastColorFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/BrightnessContrastColorFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ChromaKeyColorFilter osgearth-2.10.2+dfsg/src/osgEarthUtil/ChromaKeyColorFilter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ChromaKeyColorFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ChromaKeyColorFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ChromaKeyColorFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/ChromaKeyColorFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ChromaKeyColorFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ChromaKeyColorFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ClampCallback osgearth-2.10.2+dfsg/src/osgEarthUtil/ClampCallback
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ClampCallback	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ClampCallback	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ClampCallback.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/ClampCallback.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ClampCallback.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ClampCallback.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,14 +21,8 @@
 */
 
 #include <osgEarthUtil/ClampCallback>
-#include <osgEarth/Notify>
-#include <osgUtil/IntersectionVisitor>
-#include <osgUtil/LineSegmentIntersector>
-#include <osgEarth/NodeUtils>
-#include <OpenThreads/ScopedLock>
 #include <osg/MatrixTransform>
 
-#include <osg/io_utils>
 
 using namespace osg;
 using namespace osgEarth;
@@ -107,7 +101,11 @@
         }
     }
     geom->dirtyBound();
+#if OSG_VERSION_LESS_THAN(3,6,0)
     geom->dirtyDisplayList();
+#else
+    geom->dirtyGLObjects();
+#endif
 
     return true;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ClipSpace osgearth-2.10.2+dfsg/src/osgEarthUtil/ClipSpace
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ClipSpace	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ClipSpace	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,51 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#ifndef OSGEARTHUTIL_CLIPSPACE_H
+#define OSGEARTHUTIL_CLIPSPACE_H
+
+#include <osgEarthUtil/Common>
+#include <osgEarth/GeoData>
+
+namespace osgEarth { namespace Util
+{	
+
+    /**
+    * Utility class for perform operations in clip space
+    */
+    class OSGEARTHUTIL_EXPORT ClipSpace
+    {
+    public:
+        osg::Matrix _worldToClip, _clipToWorld;
+
+        ClipSpace(const osg::Matrix& MVP, const osg::Matrix& MVPinv);
+
+        // Moves the input point to the bottom edge of the viewport.
+        void clampToBottom(GeoPoint& p);
+
+        // Moves the input point to left edge of the viewport.
+        void clampToLeft(GeoPoint& p);
+    };
+
+} } // namespace osgEarth::Util
+
+#endif //OSGEARTHUTIL_CLIPSPACE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ClipSpace.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/ClipSpace.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ClipSpace.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ClipSpace.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,54 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include <osgEarthUtil/ClipSpace>
+using namespace osgEarth;
+using namespace osgEarth::Util;
+
+ClipSpace::ClipSpace(const osg::Matrix& MVP, const osg::Matrix& MVPinv)
+    : _worldToClip(MVP),
+    _clipToWorld(MVPinv)
+{
+}
+
+void ClipSpace::clampToBottom(GeoPoint& p)
+{
+    p.transformInPlace(p.getSRS()->getGeographicSRS());
+    osg::Vec3d world;
+    p.toWorld(world);
+    osg::Vec3d clip = world * _worldToClip;
+    clip.y() = -1.0;
+    world = clip * _clipToWorld;
+    p.fromWorld(p.getSRS(), world);
+}
+
+void ClipSpace::clampToLeft(GeoPoint& p)
+{
+    p.transformInPlace(p.getSRS()->getGeographicSRS());
+    osg::Vec3d world;
+    p.toWorld(world);
+    osg::Vec3d clip = world * _worldToClip;
+    clip.x() = -1.0;
+    world = clip * _clipToWorld;
+    p.fromWorld(p.getSRS(), world);
+}
+
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ClusterNode osgearth-2.10.2+dfsg/src/osgEarthUtil/ClusterNode
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ClusterNode	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ClusterNode	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,104 @@
+#ifndef OSGEARTHUTIL_CLUSTERNODE_H
+#define OSGEARTHUTIL_CLUSTERNODE_H
+
+#include <osgEarthUtil/Common>
+#include <osg/Node>
+
+#include <osgEarthAnnotation/PlaceNode>
+
+namespace osgEarth {
+    namespace Util
+    {
+        using namespace osgEarth;
+        using namespace osgEarth::Annotation;
+
+        typedef std::vector< osg::ref_ptr< PlaceNode > > PlaceNodeList;
+
+        /**
+         * ClusterNode clusters overlapping nodes together into PlaceNodes on the screen to avoid visual clutter and increase performance.
+         */
+        class OSGEARTHUTIL_EXPORT ClusterNode : public osg::Node
+        {
+        public:
+            struct Cluster
+            {
+                osg::ref_ptr< PlaceNode > marker;
+                osg::NodeList nodes;
+            };
+
+            typedef std::vector< Cluster > ClusterList;
+
+            class StyleClusterCallback : public osg::Referenced
+            {
+            public:
+                virtual void operator()(Cluster& cluster) {}
+            };
+
+            class CanClusterCallback : public osg::Referenced
+            {
+            public:
+                virtual bool operator()(osg::Node* a, osg::Node* b) { return true; }
+            };
+
+
+        public:
+            ClusterNode(MapNode* mapNode = 0, osg::Image* defaultImage = 0);
+
+            MapNode* getMapNode() const;
+            void setMapNode(MapNode* mapNode);
+
+            void addNode(osg::Node* node);
+            void removeNode(osg::Node* node);
+            void clear();
+
+            unsigned int getRadius() const;
+            void setRadius(unsigned int radius);
+
+            bool getEnabled() const;
+            void setEnabled(bool enabled);
+
+            StyleClusterCallback* getStyleCallback();
+            void setStyleCallback(StyleClusterCallback* callback);
+
+            CanClusterCallback* getCanClusterCallback();
+            void setCanClusterCallback(CanClusterCallback* callback);
+
+            virtual void traverse(osg::NodeVisitor& nv);
+
+        protected:
+
+            PlaceNode* getOrCreateLabel();
+
+            void getClusters(osgUtil::CullVisitor* cv, ClusterList& out);
+            void buildIndex();
+
+            osg::NodeList _nodes;
+
+            unsigned int _radius;
+
+            osg::ref_ptr< osg::Image > _defaultImage;
+
+            PlaceNodeList _labelPool;
+            unsigned int _nextLabel;
+            osg::observer_ptr< MapNode > _mapNode;
+
+            osg::ref_ptr< StyleClusterCallback > _styleCallback;
+            osg::ref_ptr< CanClusterCallback > _canClusterCallback;
+
+            osg::ref_ptr< Horizon > _horizon;
+
+            osg::Matrixd _lastViewMatrix;
+
+            ClusterList _clusters;
+
+            osg::NodeList _clusterIndex;
+            bool _dirtyIndex;
+
+            bool _dirty;
+
+            bool _enabled;
+        };
+    }
+}
+
+#endif
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ClusterNode.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/ClusterNode.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ClusterNode.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ClusterNode.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,357 @@
+#include <osgEarthUtil/ClusterNode>
+
+#include <osgEarthUtil/kdbush.hpp>
+
+typedef std::pair<int, int> TPoint;
+typedef std::vector< std::size_t > TIds;
+
+using namespace osgEarth::Util;
+
+ClusterNode::ClusterNode(MapNode* mapNode, osg::Image* defaultImage) :
+    _radius(50),
+    _mapNode(mapNode),
+    _nextLabel(0),
+    _enabled(true),
+    _dirty(true),
+    _defaultImage(defaultImage),
+    _dirtyIndex(true)
+{
+    setCullingActive(false);
+    
+    _horizon = new Horizon();
+}
+
+void ClusterNode::addNode(osg::Node* node)
+{
+    _nodes.push_back(node);
+    _dirty = true;
+    _dirtyIndex = true;
+}
+
+void ClusterNode::removeNode(osg::Node* node)
+{
+    osg::NodeList::iterator itr = std::find(_nodes.begin(), _nodes.end(), node);
+    if (itr != _nodes.end())
+    {
+        _nodes.erase(itr);
+    }
+    _dirty = true;
+    _dirtyIndex = true;
+}
+
+void ClusterNode::clear()
+{
+    _nodes.clear();
+    _dirty = true;
+    _dirtyIndex = true;
+}
+
+unsigned int ClusterNode::getRadius() const
+{
+    return _radius;
+}
+
+void ClusterNode::setRadius(unsigned int radius)
+{
+    _radius = radius;
+    _dirty = true;
+}
+
+bool ClusterNode::getEnabled() const
+{
+    return _enabled;
+}
+
+void ClusterNode::setEnabled(bool enabled)
+{
+    _enabled = enabled;
+    _dirty = true;
+}
+
+MapNode* ClusterNode::getMapNode() const
+{
+    return _mapNode.get();
+}
+
+void ClusterNode::setMapNode(MapNode* mapNode)
+{
+    if (_mapNode != mapNode)
+    {
+        _mapNode = mapNode;
+        _dirty = true;
+        _dirtyIndex = true;
+        _labelPool.clear();
+        _nextLabel = 0;
+    }
+}
+
+ClusterNode::StyleClusterCallback* ClusterNode::getStyleCallback()
+{
+    return _styleCallback.get();
+}
+
+void
+ClusterNode::setStyleCallback(ClusterNode::StyleClusterCallback* callback)
+{
+    _styleCallback = callback;
+    _dirty = true;
+}
+
+ClusterNode::CanClusterCallback* ClusterNode::getCanClusterCallback()
+{
+    return _canClusterCallback.get();
+}
+
+void ClusterNode::setCanClusterCallback(ClusterNode::CanClusterCallback* callback)
+{
+    _canClusterCallback = callback;
+    _dirty = true;
+}
+
+bool boundSort(const osg::ref_ptr< osg::Node> &i, const osg::ref_ptr< osg::Node> &j)
+{
+    osg::BoundingSphere bsI = i->getBound();
+    osg::BoundingSphere bsJ = j->getBound();
+
+    return bsI.center().x() < bsJ.center().x();
+}
+
+
+void ClusterNode::buildIndex()
+{
+    if (_dirtyIndex)
+    {
+        _clusterIndex.clear();
+
+        std::sort(_nodes.begin(), _nodes.end(), boundSort);
+
+        unsigned int maxNodes = 10000;
+
+        osg::Group* currentGroup = 0;
+
+        for (unsigned int i = 0; i < _nodes.size(); i++)
+        {
+            if (!currentGroup || currentGroup->getNumChildren() >= maxNodes)
+            {
+                currentGroup = new osg::Group;
+                _clusterIndex.push_back(currentGroup);
+            }
+            currentGroup->addChild(_nodes[i]);                      
+        }
+    }
+    _dirtyIndex = false;
+}
+
+
+void ClusterNode::getClusters(osgUtil::CullVisitor* cv, ClusterList& out)
+{
+    _nextLabel = 0;
+
+    osg::Camera* camera = cv->getCurrentCamera();
+
+    osg::Viewport* viewport = camera->getViewport();
+    if (!viewport)
+    {
+        return;
+    }
+
+    osg::Matrixd mvpw = camera->getViewMatrix() *
+        camera->getProjectionMatrix() *
+        camera->getViewport()->computeWindowMatrix();
+
+    std::vector<TPoint> points;
+
+    osg::NodeList validPlaces;
+
+    buildIndex();
+
+    for (osg::NodeList::iterator itr = _clusterIndex.begin(); itr != _clusterIndex.end(); ++itr)
+    {
+        osg::Group* index = static_cast<osg::Group*>(itr->get());
+        if (cv->isCulled(index->getBound()))
+        {
+            continue;
+        }
+
+        for (unsigned int i = 0; i < index->getNumChildren(); i++)
+        {
+            osg::Node* node = index->getChild(i);
+            osg::Vec3d world = node->getBound().center();
+
+            if (cv->isCulled(*node))
+            {
+                continue;
+            }
+
+            if (!_horizon->isVisible(world))
+            {
+                continue;
+            }
+
+            osg::Vec3d screen = world * mvpw;
+
+            if (screen.x() >= 0 && screen.x() <= viewport->width() &&
+                screen.y() >= 0 && screen.y() <= viewport->height())
+            {
+                validPlaces.push_back(node);
+                points.push_back(TPoint(screen.x(), screen.y()));
+            }
+        }
+    }
+
+    if (validPlaces.size() == 0) return;
+
+    kdbush::KDBush<TPoint> index(points);
+    std::set< unsigned int > clustered;
+
+    for (unsigned int i = 0; i < validPlaces.size(); i++)
+    {
+        TPoint &screen = points[i];
+        osg::Node* node = validPlaces[i].get();
+
+        // If this thing is already part of a cluster then just continue.
+        if (clustered.find(i) != clustered.end())
+        {
+            continue;
+        }
+
+        osg::Vec3d world = node->getBound().center();
+
+        // Get any matching indices that are part of this cluster.
+        TIds indices;
+
+        index.range(screen.first - _radius, screen.second - _radius, screen.first + _radius, screen.second + _radius, indices);
+
+        // Create a new cluster.
+        Cluster cluster;
+
+        unsigned int actualCount = 0;
+
+        // Add all of the points to the cluster.
+        for (unsigned int j = 0; j < indices.size(); j++)
+        {
+            if (clustered.find(indices[j]) == clustered.end())
+            {
+                if (_canClusterCallback.valid())
+                {
+                    bool canCluster = (*_canClusterCallback)(node, validPlaces[indices[j]].get());
+                    if (!canCluster) {
+                        continue;
+                    }
+                }
+                cluster.nodes.push_back(validPlaces[indices[j]]);
+                actualCount++;
+                clustered.insert(indices[j]);
+            }
+        }
+
+        std::stringstream buf;
+        buf << actualCount << std::endl;
+
+        PlaceNode* marker = getOrCreateLabel();
+        GeoPoint markerPos;
+        markerPos.fromWorld(_mapNode->getMapSRS(), world);
+        marker->setPosition(markerPos);
+        marker->setText(buf.str());
+
+        cluster.marker = marker;
+        out.push_back(cluster);
+
+        clustered.insert(i);
+    }
+}
+
+void ClusterNode::traverse(osg::NodeVisitor& nv)
+{
+    if (nv.getVisitorType() == osg::NodeVisitor::CULL_VISITOR)
+    {
+        osgUtil::CullVisitor* cv = Culling::asCullVisitor(nv);
+
+        // If we aren't enabled just traverse all the placenodes.
+        if (!_enabled)
+        {
+            for (osg::NodeList::iterator itr = _nodes.begin(); itr != _nodes.end(); ++itr)
+            {
+                itr->get()->accept(nv);
+            }            
+        }
+        else
+        {
+            if (_mapNode.valid())
+            {
+                const osg::Matrixd &currentViewMatrix = cv->getCurrentCamera()->getViewMatrix();
+                if (_lastViewMatrix != currentViewMatrix || _dirty)
+                {
+                    osg::Vec3d eye, center, up;
+                    cv->getCurrentCamera()->getViewMatrixAsLookAt(eye, center, up);
+
+                    _horizon->setEye(eye);
+
+                    _clusters.clear();
+                    getClusters(cv, _clusters);
+
+                    // Style the clusters if need be
+                    if (_styleCallback)
+                    {
+                        for (ClusterList::iterator itr = _clusters.begin(); itr != _clusters.end(); ++itr)
+                        {
+                            Cluster& cluster = *itr;
+                            (*_styleCallback)(cluster);
+                        }
+                    }
+                }
+
+                for (ClusterList::iterator itr = _clusters.begin(); itr != _clusters.end(); ++itr)
+                {
+                    Cluster& cluster = *itr;
+
+                    // If we have more than 1 place, traverse the representative marker
+                    if (cluster.nodes.size() > 1)
+                    {
+                        itr->marker->accept(nv);
+                    }
+                    else
+                    {
+                        // Otherwise just traverse the first node
+                        cluster.nodes[0]->accept(nv);
+                    }
+                }
+                _dirty = false;
+                _lastViewMatrix = currentViewMatrix;
+            }
+        }
+    }
+    else
+    {
+        // Other visitors just traverse all the placenodes.
+        for (osg::NodeList::iterator itr = _nodes.begin(); itr != _nodes.end(); ++itr)
+        {
+            itr->get()->accept(nv);
+        }
+    }
+}
+
+PlaceNode* ClusterNode::getOrCreateLabel()
+{
+    PlaceNode* node = 0;
+    if (_labelPool.size() <= _nextLabel)
+    {
+        // set up a style to use for placemarks:
+        Style placeStyle;
+        placeStyle.getOrCreate<TextSymbol>()->declutter() = false;
+        node = new PlaceNode("", placeStyle, _defaultImage.get());
+        node->setMapNode(_mapNode.get());
+        node->setDynamic(true);
+        _labelPool.push_back(node);
+    }
+    else
+    {
+        node = _labelPool[_nextLabel].get();
+    }
+
+    ++_nextLabel;
+
+    return node;
+
+
+}
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/CMakeLists.txt osgearth-2.10.2+dfsg/src/osgEarthUtil/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -10,14 +10,16 @@
 
 SET(HEADERS_ROOT
     ActivityMonitorTool
-    AnnotationEvents
     AutoClipPlaneHandler
+    AutoScaleCallback
     ArcGIS
     AtlasBuilder
+    ClipSpace
     Common
     Controls
     ContourMap
     ClampCallback
+    ClusterNode
     DataScanner
     EarthManipulator
     Ephemeris
@@ -29,6 +31,8 @@
     FractalElevationLayer
     GARSGraticule
     GeodeticGraticule
+    GeodeticLabelingEngine
+    GraticuleLabelingEngine
     HTM
     LatLongFormatter
     LineOfSight
@@ -41,7 +45,6 @@
     MouseCoordsTool
     MultiElevationLayer
     Ocean
-    PolyhedralLineOfSight
     RadialLineOfSight
     RTTPicker
     Shaders
@@ -87,7 +90,8 @@
     Shadowing.vert.glsl
     Shadowing.frag.glsl
     SimpleOceanLayer.vert.glsl
-    SimpleOceanLayer.frag.glsl)
+    SimpleOceanLayer.frag.glsl
+    RTTPicker.glsl)
 
 set(TARGET_IN
     Shaders.cpp.in)
@@ -100,11 +104,12 @@
 
 SET(SOURCES_ROOT
     ActivityMonitorTool.cpp
-    AnnotationEvents.cpp
     ArcGIS.cpp
     AtlasBuilder.cpp
     AutoClipPlaneHandler.cpp
     ClampCallback.cpp
+    ClipSpace.cpp
+    ClusterNode.cpp
     Controls.cpp
     ContourMap.cpp
     DataScanner.cpp
@@ -116,6 +121,8 @@
     FractalElevationLayer.cpp
     GARSGraticule.cpp
     GeodeticGraticule.cpp
+    GeodeticLabelingEngine.cpp
+    GraticuleLabelingEngine.cpp
     HTM.cpp
     LatLongFormatter.cpp
     LinearLineOfSight.cpp
@@ -127,7 +134,6 @@
     MouseCoordsTool.cpp
     MultiElevationLayer.cpp
     Ocean.cpp
-    PolyhedralLineOfSight.cpp
     RadialLineOfSight.cpp
     RTTPicker.cpp
     Shadowing.cpp
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/CMYKColorFilter osgearth-2.10.2+dfsg/src/osgEarthUtil/CMYKColorFilter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/CMYKColorFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/CMYKColorFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/CMYKColorFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/CMYKColorFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/CMYKColorFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/CMYKColorFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Common osgearth-2.10.2+dfsg/src/osgEarthUtil/Common
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Common	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Common	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ContourMap osgearth-2.10.2+dfsg/src/osgEarthUtil/ContourMap
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ContourMap	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ContourMap	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -54,13 +54,13 @@
 
     public:
         void fromConfig(const Config& conf) {
-            conf.getIfSet("opacity", _opacity);
-            conf.getIfSet("grayscale", _grayscale);
+            conf.get("opacity", _opacity);
+            conf.get("grayscale", _grayscale);
         }
         Config getConfig() const {
             Config conf;
-            conf.addIfSet("opacity", _opacity);
-            conf.addIfSet("grayscale", _grayscale);
+            conf.set("opacity", _opacity);
+            conf.set("grayscale", _grayscale);
             return conf;
         }
         
@@ -118,7 +118,7 @@
                                                     public ContourMapOptions
     {
     public:
-        META_Object(osgEarthUtil, ContourMapExtension);
+        META_OE_Extension(osgEarthUtil, ContourMapExtension, contour_map);
 
         ContourMapExtension() { }
         ContourMapExtension(const ConfigOptions& co) : ContourMapOptions(co) { }
@@ -128,12 +128,10 @@
         bool disconnect(MapNode*);
 
     public: // Extension
-        
-        // for serialization
-        virtual const ConfigOptions& getConfigOptions() const { return *this; }
+
+        const ConfigOptions& getConfigOptions() const { return *this; }
 
     protected:
-        ContourMapExtension(const ContourMapExtension& rhs, const osg::CopyOp& op) { } // unused
         virtual ~ContourMapExtension() { }
 
         osg::ref_ptr<ContourMap> _effect;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ContourMap.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/ContourMap.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ContourMap.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ContourMap.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -22,8 +22,6 @@
 #include <osgEarthUtil/ContourMap>
 #include <osgEarthUtil/Shaders>
 #include <osgEarth/Registry>
-#include <osgEarth/Capabilities>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/TerrainEngineNode>
 #include <osgEarth/MapNode>
 
@@ -70,39 +68,6 @@
     _xferTexture->setFilter( osg::Texture::MAG_FILTER, osg::Texture::LINEAR );
     _xferTexture->setWrap( osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE );
 
-#if 0
-    // build a default transfer function.
-    // TODO: think about scale/bias controls.
-    osg::TransferFunction1D* xfer = new osg::TransferFunction1D();
-    float s = 2500.0f;
-
-    if ( grayscale() == true )
-    {
-        xfer->setColor( -1.0000 * s, osg::Vec4f(.125,.125,.125, 1), false);
-        xfer->setColor( -0.2500 * s, osg::Vec4f(.25,.25,.25, 1), false);
-        xfer->setColor(  0.0000 * s, osg::Vec4f(.375,.375,.375, 1), false);
-        xfer->setColor(  0.0062 * s, osg::Vec4f(.5,.5,.5,1), false);
-        xfer->setColor(  0.1250 * s, osg::Vec4f(.625,.625,.625,1), false);
-        xfer->setColor(  0.3250 * s, osg::Vec4f(.75,.75,.75,1), false);
-        xfer->setColor(  0.7500 * s, osg::Vec4f(.875,.875,.875,1), false);
-        xfer->setColor(  1.0000 * s, osg::Vec4f(1,1,1,1), false);
-    }
-    else
-    {
-        xfer->setColor( -1.0000 * s, osg::Vec4f(0, 0, 0.5, 1), false);
-        xfer->setColor( -0.2500 * s, osg::Vec4f(0, 0, 1, 1), false);
-        xfer->setColor(  0.0000 * s, osg::Vec4f(0, .5, 1, 1), false);
-        xfer->setColor(  0.0062 * s, osg::Vec4f(.84,.84,.25,1), false);
-        xfer->setColor(  0.1250 * s, osg::Vec4f(.125,.62,0,1), false);
-        xfer->setColor(  0.3250 * s, osg::Vec4f(.80,.70,.47,1), false);
-        xfer->setColor(  0.7500 * s, osg::Vec4f(.5,.5,.5,1), false);
-        xfer->setColor(  1.0000 * s, osg::Vec4f(1,1,1,1), false);
-    }
-    xfer->updateImage();
-    this->setTransferFunction( xfer );
-    _opacityUniform->set( opacity().getOrUse(1.0f) );
-#endif
-
     dirty();
 }
 
@@ -178,7 +143,7 @@
         // set the "priority" parameter to setFunction() to a negative number so that it draws
         // before the terrain's layers.)
         VirtualProgram* vp = VirtualProgram::getOrCreate(stateset);
-
+        vp->setName("ContourMap");
         Shaders pkg;
         //pkg.load(vp, pkg.ContourMap_Vertex);
         pkg.load(vp, pkg.ContourMap_Fragment);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Controls osgearth-2.10.2+dfsg/src/osgEarthUtil/Controls
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Controls	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Controls	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -326,6 +326,9 @@
         bool _absorbEvents;
         osg::Geode* _geode;
         osg::ref_ptr<osg::Geometry> _geom;
+
+        static osg::observer_ptr<osg::StateSet> s_geomStateSet;
+        osg::ref_ptr<osg::StateSet> getGeomStateSet();
     };
 
     typedef std::vector< osg::ref_ptr<Control> > ControlVector;
@@ -434,6 +437,7 @@
     {
     public:
         ImageControl( osg::Image* image =0L );
+        ImageControl( osg::Texture* texture );
 
         /** dtor */
         virtual ~ImageControl() { }
@@ -441,6 +445,9 @@
         void setImage( osg::Image* image );
         osg::Image* getImage() const { return _image.get(); }
 
+        void setTexture( osg::Texture* texture );
+        osg::Texture* getTexture() const { return _texture.get(); }
+
         /** Rotates the image. */
         void setRotation( const Angular& angle );
         const Angular& getRotation() const { return _rotation; }
@@ -455,11 +462,18 @@
         virtual void draw( const ControlContext& cx );
 
     private:
+        /** Recalculate the size of the texture */
+        osg::Vec2i calculateImageSize() const;
+
         osg::ref_ptr<osg::Image> _image;
+        osg::ref_ptr<osg::Texture> _texture;
         Angular _rotation;
         bool _fixSizeForRot;
         osg::Geometry* _geom;
         float _opacity;
+
+        static osg::observer_ptr<osg::StateSet> s_imageStateSet;
+        osg::ref_ptr<osg::StateSet> getImageStateSet();
     };
 
     /**
@@ -507,7 +521,7 @@
         /** dtor */
         virtual ~CheckBoxControl() { }
 
-        void setValue( bool value );
+        void setValue( bool value, bool notify=true );
         bool getValue() const { return _value; }
 
     public:
@@ -574,11 +588,11 @@
         void setChildSpacing( float value );
         float childSpacing() const { return _spacing; }
 
-        // horiz alignment to set on children (that do not already have alignment explicity set)
+        // horiz alignment to set on children (that do not already have alignment explicitly set)
         void setChildHorizAlign( Alignment align );
         const optional<Alignment>& childHorizAlign() const { return _childhalign; }
 
-        // vert alignment to set on children (that do not already have alignment explicity set)
+        // vert alignment to set on children (that do not already have alignment explicitly set)
         void setChildVertAlign( Alignment align );
         const optional<Alignment>& childVertAlign() const { return _childvalign; }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Controls.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/Controls.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Controls.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Controls.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,26 +18,15 @@
  */
 #include <osgEarthUtil/Controls>
 #include <osgEarth/NodeUtils>
-#include <osg/Geometry>
-#include <osg/NodeCallback>
 #include <osg/Depth>
-#include <osg/TextureRectangle>
-#include <osgGA/GUIEventHandler>
-#include <osgText/Text>
-#include <osgUtil/RenderBin>
-#include <osgUtil/Statistics>
-#include <osgEarthSymbology/Style>
-#include <osgEarthSymbology/Geometry>
 #include <osgEarthSymbology/GeometryRasterizer>
 #include <osgEarthFeatures/PolygonizeLines>
-#include <osg/Version>
-#include <osgEarth/Common>
 #include <osgEarth/Registry>
-#include <osgEarth/Capabilities>
 #include <osgEarth/Utils>
 #include <osgEarth/CullingUtils>
-#include <osgEarth/ShaderGenerator>
-#include <osgEarth/VirtualProgram>
+#include <osgEarth/GLUtils>
+#include <osgEarth/Shaders>
+#include <osgEarth/Text>
 
 using namespace osgEarth;
 using namespace osgEarth::Features;
@@ -69,11 +58,11 @@
             x41 =  x4*cosa + y4*sina,
             y41 = -x4*sina + y3*cosa;
 
-        float xmin = std::min(x11, std::min(x21, std::min(x31, x41)));
-        float ymin = std::min(y11, std::min(y21, std::min(y31, y41)));
+        float xmin = osg::minimum(x11, osg::minimum(x21, osg::minimum(x31, x41)));
+        float ymin = osg::minimum(y11, osg::minimum(y21, osg::minimum(y31, y41)));
 
-        float xmax = std::max(x11, std::max(x21, std::max(x31, x41)));
-        float ymax = std::max(y11, std::max(y21, std::max(y31, y41)));
+        float xmax = osg::maximum(x11, osg::maximum(x21, osg::maximum(x31, x41)));
+        float ymax = osg::maximum(y11, osg::maximum(y21, osg::maximum(y31, y41)));
 
         out_w = xmax-xmin;
         out_h = ymax-ymin;
@@ -169,6 +158,8 @@
 void
 Control::init()
 {
+    setStateSet(getGeomStateSet());
+
     _x.init(0);
     _y.init(0);
     _width.init(1);
@@ -193,6 +184,28 @@
     this->addChild( _geode );
 }
 
+// shared state set for control geometry
+osg::observer_ptr<osg::StateSet> Control::s_geomStateSet;
+
+osg::ref_ptr<osg::StateSet>
+Control::getGeomStateSet()
+{
+    osg::ref_ptr<osg::StateSet> stateSet;
+    if (s_geomStateSet.lock(stateSet) == false)
+    {
+        static Threading::Mutex m;
+        Threading::ScopedMutexLock lock(m);
+        if (s_geomStateSet.lock(stateSet) == false)
+        {
+            s_geomStateSet = stateSet = new osg::StateSet();
+            VirtualProgram* vp = VirtualProgram::getOrCreate(stateSet.get());
+            vp->setName("Control::geomStateSet");
+            vp->setInheritShaders(false);
+        }
+    }
+    return stateSet;
+}
+
 void
 Control::setVisible( bool value ) {
     if ( value != _visible ) {
@@ -598,13 +611,15 @@
 
     // by default, rendering a Control directly results in a colored quad. Usually however
     // you will not render a Control directly, but rather one of its subclasses.
-    if ( visible()  && parentIsVisible() )
+    if ( visible() && parentIsVisible() )
     {
-        if ( !(_backColor.isSet() && _backColor->a() == 0) && _renderSize.x() > 0 && _renderSize.y() > 0 )
+        if (_renderSize.x() > 0 && _renderSize.y() > 0)
         {
             float vph = cx._vp->height();
 
             // draw the background poly:
+            if ((_backColor.isSet() && _backColor->a() > 0.0f) ||
+                (_activeColor.isSet() && _activeColor->a() > 0.0f && _active))
             {
                 _geom = newGeometry();
 
@@ -622,16 +637,15 @@
                 
                _geom->addPrimitiveSet( new osg::DrawArrays( GL_TRIANGLES, 0, 6 ) );
 
-                osg::Vec4Array* colors = new osg::Vec4Array(1);
+                osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
                 (*colors)[0] = _active && _activeColor.isSet() ? _activeColor.value() : _backColor.value();
                 _geom->setColorArray( colors );
-                _geom->setColorBinding( osg::Geometry::BIND_OVERALL );
 
                 getGeode()->addDrawable( _geom.get() );
             }
 
             // draw the border:
-            if ( _borderColor.isSet() && _borderWidth > 0.0f )
+            if ( _borderColor.isSet() && _borderColor->a() > 0.0f && _borderWidth > 0.0f )
             {
                 float rx = _renderPos.x() - padding().left();
                 float ry = _renderPos.y() - padding().top();
@@ -704,9 +718,12 @@
 namespace
 {
     // override osg Text to get at some of the internal properties
-    struct LabelText : public osgText::Text
+    struct LabelText : public osgEarth::Text
     {
-        LabelText() : osgText::Text() { setDataVariance(osg::Object::DYNAMIC); }
+        LabelText() : osgEarth::Text()
+        { 
+            setDataVariance(osg::Object::DYNAMIC); 
+        }
         const osg::BoundingBox& getTextBB() const { return _textBB; }
         const osg::Matrix& getATMatrix(int contextID) const { 
         #if OSG_MIN_VERSION_REQUIRED(3,5,6)
@@ -752,7 +769,8 @@
 _backdropType( osgText::Text::OUTLINE ),
 _backdropImpl( osgText::Text::NO_DEPTH_BUFFER ),
 _backdropOffset( 0.03f )
-{    
+{ 
+    //setStateSet(textStateSet());
     setFont( Registry::instance()->getDefaultFont() );    
     setForeColor( foreColor );
     setBackColor( osg::Vec4f(0,0,0,0) );
@@ -897,15 +915,10 @@
         t->setAlignment( osgText::Text::LEFT_TOP ); 
         t->setColor( foreColor().value() );
 
-        // set up the font. When you do this, OSG automatically tries to put the text object
-        // in the transparent render bin. We do not want that, so we will set it back to
-        // INHERIT.
+        // set up the font.
         if ( _font.valid() )
             t->setFont( _font.get() );
 
-        if ( t->getStateSet() )
-            t->getStateSet()->setRenderBinToInherit();
-
         // set up the backdrop halo:
         if ( haloColor().isSet() )
         {
@@ -915,7 +928,7 @@
             t->setBackdropColor( haloColor().value() );
         }
 
-        osg::BoundingBox bbox = t->getTextBB();
+        osg::BoundingBox bbox = t->getBoundingBox(); //t->getTextBB();
         if ( cx._viewContextID != ~0u )
         {
             //the Text's autoTransformCache matrix puts some mojo on the bounding box
@@ -1015,14 +1028,77 @@
 _fixSizeForRot( false ),
 _opacity      ( 1.0f )
 {
+    setStateSet(getImageStateSet());
     setImage( image );
 }
 
+ImageControl::ImageControl( osg::Texture* texture ) :
+_rotation     ( 0.0, Units::RADIANS ),
+_fixSizeForRot( false ),
+_opacity      ( 1.0f )
+{
+    setStateSet(getImageStateSet());
+    setTexture( texture );
+}
+
+// shared state set for image geometry
+osg::observer_ptr<osg::StateSet> ImageControl::s_imageStateSet;
+
+osg::ref_ptr<osg::StateSet>
+ImageControl::getImageStateSet()
+{
+    osg::ref_ptr<osg::StateSet> stateSet;
+    if (s_imageStateSet.lock(stateSet) == false)
+    {
+        static Threading::Mutex m;
+        Threading::ScopedMutexLock lock(m);
+        if (s_imageStateSet.lock(stateSet) == false)
+        {
+            s_imageStateSet = stateSet = new osg::StateSet();
+
+            const char* vert =
+                "#version " GLSL_VERSION_STR "\n"
+                "out vec2 oe_Controls_texCoord; \n"
+                "void oe_Controls_renderImageVert(inout vec4 vert) { \n"
+                "    oe_Controls_texCoord = gl_MultiTexCoord0.xy; \n"
+                "}\n";
+
+            const char* frag =
+                "#version " GLSL_VERSION_STR "\n"
+                "in vec2 oe_Controls_texCoord; \n"
+                "uniform sampler2D oe_Controls_tex; \n"
+                "void oe_Controls_renderImageFrag(inout vec4 color) { \n"
+                "    vec4 texel = texture(oe_Controls_tex, oe_Controls_texCoord); \n"
+                "    color = color * texel; \n"
+                "}\n";
+
+            VirtualProgram* vp = VirtualProgram::getOrCreate(stateSet.get());
+            vp->setName("Control::imageStateSet");
+            vp->setInheritShaders(false);
+            vp->setFunction("oe_Controls_renderImageVert", vert, ShaderComp::LOCATION_VERTEX_MODEL);
+            vp->setFunction("oe_Controls_renderImageFrag", frag, ShaderComp::LOCATION_FRAGMENT_COLORING);
+        }
+    }
+
+    return stateSet;
+}
+
 void
 ImageControl::setImage( osg::Image* image )
 {
     if ( image != _image.get() ) {
         _image = image;
+        _texture = 0L;
+        dirty();
+    }
+}
+
+void
+ImageControl::setTexture(osg::Texture* texture)
+{
+    if ( texture != _texture.get() ) {
+        _texture = texture;
+        _image = 0L;
         dirty();
     }
 }
@@ -1050,23 +1126,8 @@
 {
     if ( visible() == true )
     {
-        _renderSize.set( 0, 0 );
-
-        //First try the explicit settings
-        if (width().isSet() && height().isSet())
-        {
-            _renderSize.set(width().value(), height().value());
-        }
-        //Second try the size of the image itself
-        else if (_image.valid())
-        {
-            _renderSize.set( _image->s(), _image->t() );
-        }
-        //Lastly just use the default values for width and height
-        else
-        {
-            _renderSize.set( width().value(), height().value());
-        }
+        const osg::Vec2i imageSize = calculateImageSize();
+        _renderSize.set( imageSize.x(), imageSize.y() );
 
         //if there's a rotation angle, rotate
         float rot = _fixSizeForRot ? osg::PI_4 : _rotation.as(Units::RADIANS);
@@ -1090,97 +1151,120 @@
     }
 }
 
-#undef IMAGECONTROL_TEXRECT
+osg::Vec2i
+ImageControl::calculateImageSize() const
+{
+    //First try the explicit settings
+    if (width().isSet() && height().isSet())
+    {
+        return osg::Vec2i(width().value(), height().value());
+    }
+    //Second try the size of the image
+    else if (_image.valid())
+    {
+        return osg::Vec2i(_image->s(), _image->t());
+    }
+    //Next try the size of the texture itself
+    else if (_texture.valid() && _texture->getTextureWidth() > 0)
+    {
+        return osg::Vec2i(_texture->getTextureWidth(), _texture->getTextureHeight());
+    }
+    //Try the size of the texture's image
+    else if (_texture.valid() && _texture->getImage(0))
+    {
+        const osg::Image* image = _texture->getImage(0);
+        return osg::Vec2i(image->s(), image->t());
+    }
+    //Lastly just use the default values for width and height
+    return osg::Vec2i(width().value(), height().value());
+}
 
 void
 ImageControl::draw( const ControlContext& cx )
 {
     Control::draw( cx );
 
-    if ( visible() && parentIsVisible() && _image.valid() )
-    {
-        //TODO: this is not precisely correct..images get deformed slightly..
-        osg::Geometry* g = newGeometry();
+    if ( !visible() || !parentIsVisible() )
+        return;
 
-        float rx = osg::round( _renderPos.x() );
-        float ry = osg::round( _renderPos.y() );
-        float vph = cx._vp->height();
+    if ( !_texture.valid() )
+    {
+        if ( !_image.valid() )
+            return;
 
-        osg::Vec3Array* verts = new osg::Vec3Array(6);
-        g->setVertexArray( verts );
+        _texture = new osg::Texture2D( _image.get() );
+        _texture->setResizeNonPowerOfTwoHint( false );
+        _texture->setFilter( osg::Texture::MIN_FILTER, osg::Texture::LINEAR );
+        _texture->setFilter( osg::Texture::MAG_FILTER, osg::Texture::LINEAR );
+    }
+    const osg::Vec2i imageSize = calculateImageSize();
 
-        if ( _rotation.as(Units::RADIANS) != 0.0f || _fixSizeForRot == true )
-        {
-            osg::Vec2f rc( rx+_renderSize.x()/2, (vph-ry)-_renderSize.y()/2 );
-            float ra = osg::PI - _rotation.as(Units::RADIANS);
+    //TODO: this is not precisely correct..images get deformed slightly..
+    osg::Geometry* g = newGeometry();
 
-            rx += 0.5*_renderSize.x() - 0.5*(float)_image->s();
-            ry += 0.5*_renderSize.y() - 0.5*(float)_image->t();
+    float rx = osg::round( _renderPos.x() );
+    float ry = osg::round( _renderPos.y() );
+    float vph = cx._vp->height();
 
-            rot( rx, vph-ry, rc, ra, (*verts)[0] );
-            rot( rx, vph-ry-_image->t(), rc, ra, (*verts)[1] );
-            rot( rx+_image->s(), vph-ry-_image->t(), rc, ra, (*verts)[2] );
-            (*verts)[3].set( (*verts)[2] );
-            rot( rx+_image->s(), vph-ry, rc, ra, (*verts)[4] );
-            (*verts)[5].set( (*verts)[0] );
-        }
-        else
-        {
-            (*verts)[0].set( rx, vph - ry, 0 );
-            (*verts)[1].set( rx, vph - ry - _renderSize.y(), 0 );
-            (*verts)[2].set( rx + _renderSize.x(), vph - ry - _renderSize.y(), 0 );
-            (*verts)[3].set( (*verts)[2] );
-            (*verts)[4].set( rx + _renderSize.x(), vph - ry, 0 );
-            (*verts)[5].set( (*verts)[0] );
-        }
+    osg::Vec3Array* verts = new osg::Vec3Array(6);
+    g->setVertexArray( verts );
 
-        g->addPrimitiveSet( new osg::DrawArrays( GL_TRIANGLES, 0, 6 ) );
+    if ( _rotation.as(Units::RADIANS) != 0.0f || _fixSizeForRot == true )
+    {
+        osg::Vec2f rc( rx+_renderSize.x()/2, (vph-ry)-_renderSize.y()/2 );
+        float ra = osg::PI - _rotation.as(Units::RADIANS);
 
-        osg::Vec4Array* c = new osg::Vec4Array(1);
-        (*c)[0] = osg::Vec4f(1,1,1,1);
-        g->setColorArray( c );
-        g->setColorBinding( osg::Geometry::BIND_OVERALL );
+        rx += 0.5*_renderSize.x() - 0.5*(float)imageSize.x();
+        ry += 0.5*_renderSize.y() - 0.5*(float)imageSize.y();
 
-        bool flip = _image->getOrigin()==osg::Image::TOP_LEFT;
+        rot( rx, vph-ry, rc, ra, (*verts)[0] );
+        rot( rx, vph-ry-imageSize.y(), rc, ra, (*verts)[1] );
+        rot( rx+imageSize.x(), vph-ry-imageSize.y(), rc, ra, (*verts)[2] );
+        (*verts)[3].set( (*verts)[2] );
+        rot( rx+imageSize.x(), vph-ry, rc, ra, (*verts)[4] );
+        (*verts)[5].set( (*verts)[0] );
+    }
+    else
+    {
+        (*verts)[0].set( rx, vph - ry, 0 );
+        (*verts)[1].set( rx, vph - ry - _renderSize.y(), 0 );
+        (*verts)[2].set( rx + _renderSize.x(), vph - ry - _renderSize.y(), 0 );
+        (*verts)[3].set( (*verts)[2] );
+        (*verts)[4].set( rx + _renderSize.x(), vph - ry, 0 );
+        (*verts)[5].set( (*verts)[0] );
+    }
 
-        osg::Vec2Array* t = new osg::Vec2Array(6);
+    g->addPrimitiveSet( new osg::DrawArrays( GL_TRIANGLES, 0, 6 ) );
 
-#ifdef IMAGECONTROL_TEXRECT
+    osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
+    (*c)[0] = osg::Vec4f(1,1,1,1);
+    g->setColorArray( c );
 
-        (*t)[0].set( 0, flip? 0: _image->t()-1 );
-        (*t)[1].set( 0, flip? _image->t()-1: 0 );
-        (*t)[2].set( _image->s()-1, flip? _image->t()-1: 0 );
-        (*t)[3].set( (*t)[2]);
-        (*t)[4].set( _image->s()-1, flip? 0: _image->t()-1 );
-        (*t)[5].set( (*t)[0] );
-        osg::TextureRectangle* tex = new osg::TextureRectangle( _image.get() );
+    bool flip = false;
+    if ( _image.valid() )
+        flip = (_image->getOrigin()==osg::Image::TOP_LEFT);
+    else if ( _texture->getImage(0) )
+        flip = (_texture->getImage(0)->getOrigin() == osg::Image::TOP_LEFT);
 
-#else
+    osg::Vec2Array* t = new osg::Vec2Array(6);
 
-        (*t)[0].set( 0, flip? 0 : 1 );
-        (*t)[1].set( 0, flip? 1 : 0 );
-        (*t)[2].set( 1, flip? 1 : 0 );
-        (*t)[3].set( (*t)[2]);
-        (*t)[4].set( 1, flip? 0 : 1 );
-        (*t)[5].set( (*t)[0] );
-        osg::Texture2D* tex = new osg::Texture2D( _image.get() );
-#endif
+    (*t)[0].set( 0, flip? 0 : 1 );
+    (*t)[1].set( 0, flip? 1 : 0 );
+    (*t)[2].set( 1, flip? 1 : 0 );
+    (*t)[3].set( (*t)[2]);
+    (*t)[4].set( 1, flip? 0 : 1 );
+    (*t)[5].set( (*t)[0] );
 
-        g->setTexCoordArray( 0, t );
+    g->setTexCoordArray( 0, t );
 
-        tex->setResizeNonPowerOfTwoHint(false);
+    osg::StateSet* ss = g->getOrCreateStateSet();
 
-        tex->setFilter( osg::Texture::MIN_FILTER, osg::Texture::LINEAR );
-        tex->setFilter( osg::Texture::MAG_FILTER, osg::Texture::LINEAR );
-        g->getOrCreateStateSet()->setTextureAttributeAndModes( 0, tex, osg::StateAttribute::ON );
+    ss->setTextureAttributeAndModes( 0, _texture.get(), osg::StateAttribute::ON );
+    ss->addUniform(new osg::Uniform("oe_Controls_tex", (int)0));
 
-        /*osg::TexEnv* texenv = new osg::TexEnv( osg::TexEnv::MODULATE );
-        g->getStateSet()->setTextureAttributeAndModes( 0, texenv, osg::StateAttribute::ON );
-         */
-        getGeode()->addDrawable( g );
+    getGeode()->addDrawable( g );
 
-        _dirty = false;
-    }
+    _dirty = false;
 }
 
 // ---------------------------------------------------------------------------
@@ -1302,10 +1386,9 @@
             
             g->addPrimitiveSet( new osg::DrawArrays( GL_TRIANGLES, 4, 6) );
 
-            osg::Vec4Array* c = new osg::Vec4Array(1);
+            osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
             (*c)[0] = *foreColor();
             g->setColorArray( c );
-            g->setColorBinding( osg::Geometry::BIND_OVERALL );
 
             getGeode()->addDrawable( g.get() );
         }
@@ -1369,12 +1452,13 @@
 }
 
 void
-CheckBoxControl::setValue( bool value )
+CheckBoxControl::setValue( bool value, bool notify )
 {
     if ( value != _value )
     {
         _value = value;
-        fireValueChanged();
+        if (notify)
+            fireValueChanged();
         dirty();
     }
 }
@@ -1414,10 +1498,9 @@
             g->addPrimitiveSet( e );
         }
 
-        osg::Vec4Array* c = new osg::Vec4Array(1);
+        osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
         (*c)[0] = *foreColor();
         g->setColorArray( c );
-        g->setColorBinding( osg::Geometry::BIND_OVERALL );
 
         getGeode()->addDrawable( g );
     }
@@ -1601,8 +1684,8 @@
 {
     if ( visible() == true )
     {
-        float w = width().isSet()  ? std::max( width().value(),  _renderSize.x() ) : _renderSize.x();
-        float h = height().isSet() ? std::max( height().value(), _renderSize.y() ) : _renderSize.y();
+        float w = width().isSet()  ? osg::maximum( width().value(),  _renderSize.x() ) : _renderSize.x();
+        float h = height().isSet() ? osg::maximum( height().value(), _renderSize.y() ) : _renderSize.y();
 
         _renderSize.set(
             w + padding().x(),
@@ -2065,7 +2148,7 @@
     }
 
     // and that we have sufficient rows:
-    unsigned maxRows = std::max( (unsigned)getNumRows(), (unsigned)(row+1) );
+    unsigned maxRows = osg::maximum( (unsigned)getNumRows(), (unsigned)(row+1) );
 
     // expand everything and use empty groups as placeholders
     for( unsigned r=0; r<maxRows; ++r )
@@ -2247,45 +2330,36 @@
     //nop
 }
 
-// version helper.
-#if OSG_VERSION_GREATER_THAN(3,3,0)
-#   define AS_ADAPTER(e) e->asGUIEventAdapter()
-#else
-#   define AS_ADAPTER(e) e
-#endif
+#define AS_ADAPTER(e) e->asGUIEventAdapter()
 
 void
 ControlCanvas::EventCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
 {
     osgGA::EventVisitor* ev = static_cast<osgGA::EventVisitor*>(nv);
 
-    osg::ref_ptr<ControlCanvas> canvas;
-    if ( _canvas.lock(canvas) )
+    const osgGA::EventQueue::Events& events = ev->getEvents();
+    if (events.size() > 0)
     {
-        const osgGA::EventQueue::Events& events = ev->getEvents();
-        if ( events.size() > 0 )
+        osg::ref_ptr<ControlCanvas> canvas;
+        if (_canvas.lock(canvas))
         {
-            osg::ref_ptr<ControlCanvas> canvas;
-            if ( _canvas.lock(canvas) )
+            osgGA::GUIActionAdapter* aa = ev->getActionAdapter();
+
+            for (osgGA::EventQueue::Events::const_iterator e = events.begin(); e != events.end(); ++e)
             {
-                osgGA::GUIActionAdapter* aa = ev->getActionAdapter();
+                osgGA::GUIEventAdapter* ea = AS_ADAPTER(e->get());
 
-                for(osgGA::EventQueue::Events::const_iterator e = events.begin(); e != events.end(); ++e)
+                // check for a resize each frame. Don't rely on the RESIZE event;
+                // it does always convey the new viewport dimensions (they aren't
+                // always available until the following FRAME event)
+                if (ea->getEventType() == ea->FRAME)
                 {
-                    osgGA::GUIEventAdapter* ea = AS_ADAPTER(e->get());
-
-                    // check for a resize each frame. Don't rely on the RESIZE event;
-                    // it does always convey the new viewport dimensions (they aren't
-                    // always available until the following FRAME event)
-                    if ( ea->getEventType() == ea->FRAME )
-                    {
-                        handleResize(aa->asView(), canvas.get());
-                    }
+                    handleResize(aa->asView(), canvas.get());
+                }
 
-                    if (canvas->handle( *ea, *aa ))
-                    {
-                        e->get()->setHandled(true);
-                    }
+                if (canvas->handle(*ea, *aa))
+                {
+                    e->get()->setHandled(true);
                 }
             }
         }
@@ -2664,9 +2738,13 @@
         return canvas;
 
     canvas = new ControlCanvas();
-
-    // ControlCanvas does NOT work as a direct child of the View's camera.
+    
+    //TODO: Revisit this after 2.10. We should be connecting ControlCanvas to a Camera,
+    //not a View, because in the case of an MRT or other RTT-camera based setup, this
+    //approach will not work properly.
+#if 1
     osg::Group* group = 0L;
+    // ControlCanvas does NOT work as a direct child of the View's camera.
     if ( view->getCamera()->getNumChildren() > 0 )
     {
         group = view->getCamera()->getChild(0)->asGroup();
@@ -2683,6 +2761,10 @@
     }
 
     group->addChild( canvas );
+#else
+    view->getCamera()->addChild(canvas);
+#endif
+
     return canvas;
 }
 
@@ -2733,20 +2815,13 @@
     ADJUST_EVENT_TRAV_COUNT( this, 1 );
 
     osg::StateSet* ss = getOrCreateStateSet();
-    ss->setMode( GL_LIGHTING, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE );
+    GLUtils::setLighting(ss, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE );
     ss->setMode( GL_BLEND, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE );
     ss->setAttributeAndModes( new osg::Depth( osg::Depth::ALWAYS, 0, 1, false ) );
     ss->setRenderBinDetails( 0, "TraversalOrderBin" );
 
     _controlNodeBin = new ControlNodeBin();
     this->addChild( _controlNodeBin->getControlGroup() );
-   
-#if OSG_VERSION_LESS_THAN(3,5,8) && defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
-    // don't use shaders unless we have to.
-    this->getOrCreateStateSet()->setAttributeAndModes(
-        new osg::Program(), 
-        osg::StateAttribute::OFF|osg::StateAttribute::OVERRIDE);
-#endif
 }
 
 ControlCanvas::~ControlCanvas()
@@ -2797,8 +2872,8 @@
 
     for( unsigned i=getNumChildren()-1; i>0; --i )
     {
-        Control* control = static_cast<Control*>( getChild(i) );
-        if ( control->isDirty() )
+        Control* control = dynamic_cast<Control*>( getChild(i) );
+        if ( control && control->isDirty() )
         {
             aa.requestRedraw();
             break;
@@ -2812,8 +2887,9 @@
     {
         for( unsigned i=1; i<getNumChildren(); ++i )
         {
-            Control* control = static_cast<Control*>( getChild(i) );
-            control->handle(ea, aa, _context);
+            Control* control = dynamic_cast<Control*>( getChild(i) );
+            if (control)
+                control->handle(ea, aa, _context);
         }
         return handled;
     }
@@ -2824,8 +2900,8 @@
 
     for( unsigned i=getNumChildren()-1; i>0; --i )
     {
-        Control* control = static_cast<Control*>( getChild(i) );
-        if ( control->intersects( canvasX, canvasY ) )
+        Control* control = dynamic_cast<Control*>( getChild(i) );
+        if ( control && control->intersects( canvasX, canvasY ) )
         {
             handled = control->handle( ea, aa, _context );
             if ( handled )
@@ -2861,9 +2937,8 @@
     int bin = 0;
     for( unsigned i=1; i<getNumChildren(); ++i )
     {
-        Control* control = static_cast<Control*>( getChild(i) );
-
-        if ( control->isDirty() || _contextDirty )
+        Control* control = dynamic_cast<Control*>( getChild(i) );
+        if ( control && (control->isDirty() || _contextDirty))
         {
             osg::Vec2f size;
             control->calcSize( _context, size );
@@ -2873,10 +2948,6 @@
             control->calcPos( _context, osg::Vec2f(0,0), surfaceSize );
 
             control->draw( _context );
-
-#if !defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
-            osgEarth::Registry::shaderGenerator().run(control);
-#endif
         }
     }
 
@@ -2885,13 +2956,6 @@
         _controlNodeBin->draw( _context, _contextDirty, bin );
     }
 
-#if defined(OSG_GLES2_AVAILABLE) || defined(OSG_GLES3_AVAILABLE)
-    // shaderize.
-    // we don't really need to rebuild shaders on every dirty; we could probably
-    // just do it on add/remove controls; but that's an optimization for later
-    Registry::shaderGenerator().run( this, "osgEarth.ControlCanvas" );
-#endif
-
     _contextDirty = false;
 }
 
@@ -2909,8 +2973,8 @@
                 {
                     for( unsigned i=1; i<getNumChildren(); ++i )
                     {
-                        Control* control = static_cast<Control*>( getChild(i) );
-                        if ( control->isDirty() )
+                        Control* control = dynamic_cast<Control*>( getChild(i) );
+                        if ( control && control->isDirty() )
                         {
                             needsUpdate = true;
                             break;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/DataScanner osgearth-2.10.2+dfsg/src/osgEarthUtil/DataScanner
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/DataScanner	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/DataScanner	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -30,6 +30,7 @@
 {
     /**
      * Scans local directories in search of image and elevation data.
+     * @deprecated (remove after 2.10)
      */
     class OSGEARTHUTIL_EXPORT DataScanner
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/DataScanner.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/DataScanner.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/DataScanner.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/DataScanner.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include <osgEarthUtil/DataScanner>
 #include <osgEarthDrivers/gdal/GDALOptions>
 #include <osgDB/FileUtils>
-#include <osgDB/FileNameUtils>
 
 #define LC "[DataScanner] "
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/EarthManipulator osgearth-2.10.2+dfsg/src/osgEarthUtil/EarthManipulator
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/EarthManipulator	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/EarthManipulator	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -491,16 +491,6 @@
                 out_maxSeconds = _max_vp_duration_s;
             }
 
-#if 0 // removed. please set the matrix yourself.
-            /** The camera projection matrix type */
-            void setCameraProjection( const CameraProjection& value );
-            const CameraProjection& getCameraProjection() const { return _camProjType; }
-
-            /** Frustum offset (in pixels) */
-            void setCameraFrustumOffsets( const osg::Vec2s& offsets );
-            const osg::Vec2s& getCameraFrustumOffsets() const { return _camFrustOffsets; }
-#endif
-
             /** Whether to automatically adjust an orthographic camera so that it "tracks" the last known FOV and Aspect Ratio. */
             bool getOrthoTracksPerspective() const { return _orthoTracksPerspective; }
             void setOrthoTracksPerspective(bool value) { _orthoTracksPerspective = value; }
@@ -592,13 +582,6 @@
         virtual void setViewpoint( const Viewpoint& vp, double duration_s =0.0 );
 
         /**
-         * @deprecated Please use clearViewpoint() instead.
-         *
-         * Cancels a viewpoint transition if one is in progress
-         */
-        void cancelViewpointTransition();
-
-        /**
          * Cancels a call to setViewpoint that resulted in an ongoing transition OR
          * attachment to a node.
          */
@@ -620,45 +603,6 @@
         bool isTethering() const;
 
         /**
-         * @deprecated Please use setViewpoint() instead.
-         *
-         * Locks the camera's focal point on the center of a node's bounding sphere.
-         * While tethered, you can still call navigate or call setViewpoint() to move the
-         * camera relative to the tether object. Pass NULL to deactivate the tether.
-         *
-         * @param node
-         *      Node to which to tether the viewpoint.
-         * @param duration_s
-         *      The duration that the camera should transition when tethering to the node.
-         */
-        void setTetherNode(osg::Node* node, double duration_s =0.0);
-
-        /**
-         * @deprecated Please use setViewpoint() instead.
-         *
-         * Same as setTether(node, duration) but you also specify the final
-         * heading, pitch, and range offset from the tethered node.
-         */
-        void setTetherNode(
-            osg::Node* nodeToTetherTo,
-            double     duration_seconds,
-            double     newHeading_degrees,
-            double     newPitch_degrees,
-            double     newRange_meters);
-
-        /**
-         * @deprecated - Please use getViewpoint().getNode() instead.
-         */
-        osg::Node* getTetherNode() const;
-
-        /**
-         * @deprecated Please call clearViewpoint() instead.
-         *
-         * Same as calling setTetherNode(NULL).
-         */
-        void breakTether();
-
-        /**
          * Sets a callback to be invoked upon a tether or tether break
          */
         class TetherCallback : public osg::Referenced
@@ -672,6 +616,20 @@
         TetherCallback* getTetherCallback() { return _tetherCallback.get(); }
 
         /**
+         * Post-camera-update callback; use to access the camera position after
+         * the call to updateCamera (for frame synchronization)
+         */
+        class UpdateCameraCallback : public osg::Referenced
+        {
+        public:
+            virtual void onUpdateCamera(const osg::Camera*) { }
+        protected:
+            virtual ~UpdateCameraCallback() { }
+        };
+        void setUpdateCameraCallback(UpdateCameraCallback* cb) { _updateCameraCallback = cb; }
+        UpdateCameraCallback* getUpdateCameraCallback() { return _updateCameraCallback.get(); }
+
+        /**
          * Move the focal point of the camera using deltas (normalized screen coords).
          */
         virtual void pan( double dx, double dy );
@@ -777,7 +735,7 @@
         virtual osg::Matrixd getInverseMatrix() const;
 
         /** update the camera with the current values from this manipulator. Overloaded to support tethering, this method is
-            called by Viewer or ComppositeViewer at the end of the udpate traversal. */
+            called by Viewer or ComppositeViewer at the end of the update traversal. */
         virtual void updateCamera(osg::Camera& camera);
 
         // Gets the stereo convergance mode.
@@ -810,7 +768,7 @@
         // react to a tile-added event from the Terrain
         virtual void handleTileAdded(const TileKey& key, osg::Node* tile, TerrainCallbackContext& context);
 
-        // returns the absoulte Euler angles composited from the composite rotation matrix.
+        // returns the absolute Euler angles composited from the composite rotation matrix.
         void getCompositeEulerAngles( double* out_azim, double* out_pitch =0L ) const;
 
     protected:
@@ -844,6 +802,12 @@
         // This sets the camera's roll based on your location on the globe.
         void recalculateRoll();
 
+        // Gets the matrix without a pre-MapNode transform (i.e., map world space)
+        osg::Matrixd getWorldMatrix() const;
+
+        // Gets the inverse matrix without a pre-MapNode transform (i.e., map world space)
+        osg::Matrixd getWorldInverseMatrix() const;
+
     protected:
 
         enum TaskType
@@ -888,12 +852,10 @@
         osg::Matrixd getRotation(const osg::Vec3d& center) const;
         osg::Quat computeCenterRotation(const osg::Vec3d& center) const;
 
-        void updateTether();
+        void updateTether(double t);
 
         void updateSetViewpoint();
 
-        void updateHandCam( const osg::Timer_t& now );
-
         bool isMouseClick( const osgGA::GUIEventAdapter* mouse_up_event ) const;
 
         void applyOptionsToDeltas( const Action& action, double& dx, double& dy );
@@ -946,11 +908,6 @@
         virtual void handleContinuousAction( const Action& action, osg::View* view );
         virtual void handleMovementAction( const ActionType& type, double dx, double dy, osg::View* view );
 
-        /**
-         * Gets the viewpoint of the TetherNode.
-         */
-        Viewpoint getTetherNodeViewpoint() const;
-
     protected:
 
         // makeshift "stack" of the last 2 incoming events.
@@ -958,15 +915,14 @@
         osg::ref_ptr<const osgGA::GUIEventAdapter> _ga_t0;
 
         osg::ref_ptr<const osgGA::GUIEventAdapter> _mouse_down_event;
+        bool _pushed;
 
         osg::observer_ptr<osg::Node> _node;
         osg::observer_ptr<MapNode>   _mapNode;
 
         osg::ref_ptr<const osgEarth::SpatialReference> _srs;
 
-        double                  _time_s_last_frame;
         double                  _time_s_now;
-        double                  _delta_t;
         bool                    _thrown;
         double                  _throw_dx;
         double                  _throw_dy;
@@ -1038,6 +994,8 @@
 
         TetherMode              _lastTetherMode;
 
+        osg::Matrix             _mapNodeFrame, _mapNodeFrameInverse;
+
         // returns "t", the parametric coefficient of a timed transition. 1=finished.
         double setViewpointFrame(double time_s);
 
@@ -1074,6 +1032,8 @@
 
         osg::ref_ptr<TetherCallback> _tetherCallback;
 
+        osg::ref_ptr<UpdateCameraCallback> _updateCameraCallback;
+
         bool _userWillCallUpdateCamera;
 
         osg::observer_ptr<osg::NodeVisitor> _updateCameraNodeVisitor;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/EarthManipulator.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/EarthManipulator.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/EarthManipulator.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/EarthManipulator.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -16,20 +16,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
+#undef min
+#undef max
 #include <osgEarthUtil/EarthManipulator>
-#include <osgEarth/MapNode>
-#include <osgEarth/NodeUtils>
 #include <osgEarth/GeoMath>
 #include <osgEarth/TerrainEngineNode>
-#include <osg/Quat>
-#include <osg/Notify>
-#include <osg/MatrixTransform>
-#include <osgUtil/LineSegmentIntersector>
 #include <osgViewer/View>
-#include <iomanip>
-#include <osgUtil/LineSegmentIntersector>
 
-#include <osg/io_utils>
 
 #define LC "[EarthManip] "
 
@@ -79,7 +72,19 @@
         if ( node ) {
             osg::NodePathList nodePaths = node->getParentalNodePaths();
             if ( nodePaths.size() > 0 ) {
-                m = osg::computeLocalToWorld( nodePaths[0] );
+                osg::NodePath p;
+                unsigned start = 0;
+                for(unsigned i=0; i<nodePaths[0].size(); ++i) {
+                    if (dynamic_cast<MapNode*>(nodePaths[0][i]) != 0L) {
+                        start = i;
+                        break;
+                    }
+                }
+                for(unsigned i=start; i<nodePaths[0].size(); ++i)
+                    p.push_back(nodePaths[0][i]);
+                
+                m = osg::computeLocalToWorld(p);
+                //m = osg::computeLocalToWorld( nodePaths[0] );
             }
             else {
                 osg::Transform* t = dynamic_cast<osg::Transform*>(node);
@@ -128,6 +133,10 @@
                     if( cam->getReferenceFrame() != osg::Transform::RELATIVE_RF || cam->getParents().empty())
                         break;
                 }
+                else if (dynamic_cast<MapNode*>(*i))
+                {
+                    break;
+                }
             }
             for (; j<path.size(); ++j)
             {
@@ -490,8 +499,8 @@
 void
 EarthManipulator::Settings::setMaxOffset(double max_x_offset, double max_y_offset)
 {
-    _max_x_offset = max_x_offset;
-    _max_y_offset = max_y_offset;
+    _max_x_offset = osg::clampAbove(max_x_offset, 0.0);
+    _max_y_offset = osg::clampAbove(max_y_offset, 0.0);
     dirty();
 }
 
@@ -535,7 +544,6 @@
     _time_s_last_event = 0.0;
     _frameCount = 0;
     _findNodeTraversalMask = 0x01;
-    _time_s_last_frame = 0.0;
     _time_s_now = 0.0;
     _centerHeight = 0.0;
     _time_last_frame = 0.0;
@@ -703,13 +711,12 @@
     _task = new Task();
     _last_action = ACTION_NULL;
     _srs = 0L;
-    //_setting_viewpoint = false;
-    _delta_t = 0.0;
     _pendingViewpoint.unset();
     _setVP0.unset();
     _setVP1.unset();
     _lastPointOnEarth.set(0.0, 0.0, 0.0);
     _setVPArcHeight = 0.0;
+    _pushed = false;
 }
 
 
@@ -906,6 +913,11 @@
     if ( isTethering() && _setVP1.isSet() )
     {
         vp = _setVP1.get();
+
+        if (vp.getNode().valid())
+            vp.focalPoint()->fromWorld(_srs.get(), computeWorld(vp.getNode().get()));
+        else
+            vp.focalPoint().unset();
     }
 
     // Transitioning? Capture the last calculated intermediate position.
@@ -937,13 +949,6 @@
 }
 
 void
-EarthManipulator::breakTether()
-{
-    // breakTether() is deprecated; add new code to clearViewpoint
-    clearViewpoint();
-}
-
-void
 EarthManipulator::setViewpoint(const Viewpoint& vp, double duration_seconds)
 {
     // If the manip is not set up, save the viewpoint for later.
@@ -993,7 +998,7 @@
                 _setVP1->focalPoint() = _setVP0->focalPoint().get();
         }
 
-        _setVPDuration.set( std::max(duration_seconds, 0.0), Units::SECONDS );
+        _setVPDuration.set( osg::maximum(duration_seconds, 0.0), Units::SECONDS );
 
         OE_DEBUG << LC << "setViewpoint:\n"
             << "    from " << _setVP0->toString() << "\n"
@@ -1044,7 +1049,7 @@
             // calculate acceleration coefficients
             if ( _setVPArcHeight > 0.0 )
             {
-                // if we're arcing, we need seperate coefficients for the up and down stages
+                // if we're arcing, we need separate coefficients for the up and down stages
                 double h_apex = 2.0*(h0+h1) + _setVPArcHeight;
                 double dh2_up = fabs(h_apex - h0)/100000.0;
                 _setVPAccel = log10( dh2_up );
@@ -1125,8 +1130,8 @@
 
         // Remaining time is the full duration minus the time since initiation:
         double elapsed = time_s - _setVPStartTime->as(Units::SECONDS);
-        double t = std::min(1.0, elapsed / _setVPDuration.as(Units::SECONDS));
-
+        double duration = _setVPDuration.as(Units::SECONDS);
+        double t = osg::minimum(1.0, duration > 0.0 ? elapsed/duration : 1.0);
         double tp = t;
 
         if ( _setVPArcHeight > 0.0 )
@@ -1210,7 +1215,7 @@
     setDistance( range );
 
     _previousUp = getUpVector( _centerLocalToWorld );
-    _centerRotation = computeCenterRotation( center ); //getRotation( center ).getRotate().inverse();
+    _centerRotation = computeCenterRotation( center );
 
     _posOffset = posOffset;
 
@@ -1234,7 +1239,7 @@
     if ( pitch > maxPitch )
         rotate( 0.0, -(pitch-maxPitch) );
 
-    osg::Vec3d eye = getMatrix().getTrans();
+    osg::Vec3d eye = getWorldMatrix().getTrans();
 
     // calculate the center point in front of the eye. The reference frame here
     // is the view plane of the camera.
@@ -1259,13 +1264,6 @@
 }
 
 void
-EarthManipulator::cancelViewpointTransition()
-{
-    // @deprecated function - please add new code to clearViewpoint() instead
-    clearViewpoint();
-}
-
-void
 EarthManipulator::clearViewpoint()
 {
     bool breakingTether = isTethering();
@@ -1275,7 +1273,8 @@
     _setVP1.unset();
 
     // Restore the matrix values in a neutral state.
-    resetLookAt();
+    recalculateCenterFromLookVector();
+    //resetLookAt();
 
     // Fire the callback to indicate a tethering break.
     if ( _tetherCallback.valid() && breakingTether )
@@ -1289,54 +1288,6 @@
     return _setVP1.isSet() && _setVP1->nodeIsSet();
 }
 
-void
-EarthManipulator::setTetherNode(osg::Node* node, double duration_s)
-{
-    // @deprecated function - please don't add new code here.
-    if ( node )
-    {
-        Viewpoint vp;
-        vp.setNode( node );
-        setViewpoint( vp, duration_s );
-    }
-
-    else
-    {
-        clearViewpoint();
-    }
-}
-
-void
-EarthManipulator::setTetherNode(osg::Node* node,
-                                double     duration_s,
-                                double     newHeadingDeg,
-                                double     newPitchDeg,
-                                double     newRangeM)
-{
-    // @deprecated function - please don't add new code here.
-    Viewpoint newVP;
-    newVP.setNode( node );
-    newVP.heading()->set( newHeadingDeg, Units::DEGREES );
-    newVP.pitch()->set( newPitchDeg, Units::DEGREES );
-    newVP.range()->set( newRangeM, Units::METERS );
-
-    setViewpoint( newVP, duration_s );
-
-    OE_WARN << LC << "TODO: call the tether callback\n";
-}
-
-osg::Node*
-EarthManipulator::getTetherNode() const
-{
-    if ( !isTethering() )
-        return 0L;
-
-    osg::ref_ptr<osg::Node> node;
-    _setVP1->getNode(node);
-    return node.release();
-}
-
-
 void EarthManipulator::collisionDetect()
 {
     if (!getSettings()->getTerrainAvoidanceEnabled() ||
@@ -1344,16 +1295,15 @@
     {
         return;
     }
-
     // The camera has changed, so make sure we aren't under the ground.
 
-    osg::Vec3d eye = getMatrix().getTrans();
+    osg::Vec3d eye = getWorldMatrix().getTrans();
     osg::CoordinateFrame eyeCoordFrame;
-    createLocalCoordFrame( eye, eyeCoordFrame );
+    createLocalCoordFrame(eye, eyeCoordFrame);
     osg::Vec3d eyeUp = getUpVector(eyeCoordFrame);
 
     // Try to intersect the terrain with a vector going straight up and down.
-    double r = std::min( _srs->getEllipsoid()->getRadiusEquator(), _srs->getEllipsoid()->getRadiusPolar() );
+    double r = osg::minimum(_srs->getEllipsoid()->getRadiusEquator(), _srs->getEllipsoid()->getRadiusPolar());
     osg::Vec3d ip, normal;
 
     if (intersect(eye + eyeUp * r, eye - eyeUp * r, ip, normal))
@@ -1365,16 +1315,20 @@
         osg::Vec3d v1 = eye - (ip + eyeUp * eps);
         v1.normalize();
 
+        // save rotation so we can restore it later - the setraw method
+        // may alter it and we don't want that.
+        osg::Quat rotation = _rotation;
+
         //osg::Vec3d adjVector = normal;
         osg::Vec3d adjVector = eyeUp;
-        if (v0 * v1 <= 0 )
+        if (v0 * v1 <= 0)
         {
             setByLookAtRaw(ip + adjVector * eps, _center, eyeUp);
+            _rotation = rotation;
         }
 
         //OE_INFO << "hit at " << ip.x() << ", " << ip.y() << ", " << ip.z() << "\n";
     }
-
 }
 
 
@@ -1415,7 +1369,7 @@
     {
         double R = _centerHeight;
 
-        getInverseMatrix().getLookAt(out_eye, out_target, out_up, 1.0);
+        getWorldInverseMatrix().getLookAt(out_eye, out_target, out_up, 1.0);
         osg::Vec3d look = out_target-out_eye;
 
 		osg::ref_ptr<osgUtil::LineSegmentIntersector> lsi =
@@ -1625,20 +1579,28 @@
     if ( !established() )
         return false;
 
-    // make sure the camera projection is up to date:
     osg::View* view = aa.asView();
-    updateProjection( view->getCamera() );
-
-    double time_s_now = osg::Timer::instance()->time_s();
 
+    //double time_s_now = osg::Timer::instance()->time_s();
+    _time_s_now = view->getFrameStamp()->getReferenceTime();
+    
     if ( ea.getEventType() == osgGA::GUIEventAdapter::FRAME )
     {
-        _time_s_last_frame = _time_s_now;
-        _time_s_now = time_s_now;
-        _delta_t = _time_s_now - _time_s_last_frame;
-
         if ( _node.valid() )
         {
+            // Update the mapnode reference frame. This is the transformation
+            // between the Camera and the MapNode. Since all computations are done
+            // in map-world space (e.g., ECEF) we need to then introduce this transform
+            // at the very end (in getInverseMatrix()) to apply the final view matrix.
+            {
+                osg::ref_ptr<MapNode> mapNode;
+                if (_mapNode.lock(mapNode))
+                {
+                    _mapNodeFrame = osg::computeLocalToWorld(mapNode->getParentalNodePaths()[0]); 
+                    _mapNodeFrameInverse.invert(_mapNodeFrame);
+                }
+            }
+
             if ( _pendingViewpoint.isSet() )
             {
                 setViewpoint( _pendingViewpoint.get(), _pendingViewpointDuration.as(Units::SECONDS) );
@@ -1650,8 +1612,6 @@
             {
                 if ( _frameCount < 2 )
                     _setVPStartTime->set(_time_s_now, Units::SECONDS);
-
-                setViewpointFrame( time_s_now );
             }
 
             if (_thrown)
@@ -1667,7 +1627,7 @@
                     handleMovementAction(_last_action._type, _throw_dx, _throw_dy, aa.asView());
             }
 
-            aa.requestContinuousUpdate( isSettingViewpoint() || _thrown );
+            aa.requestContinuousUpdate( isSettingViewpoint() || _thrown || _pushed );
 
             if ( _continuous )
             {
@@ -1797,6 +1757,7 @@
         switch( ea.getEventType() )
         {
             case osgGA::GUIEventAdapter::PUSH:
+                _pushed = true;
                 resetMouse( aa );
                 addMouseEvent( ea );
                 _mouse_down_event = &ea;
@@ -1805,6 +1766,7 @@
                 break;
 
             case osgGA::GUIEventAdapter::RELEASE:
+                _pushed = false;
                 if ( _continuous )
                 {
                     // bail out of continuous mode if necessary:
@@ -1818,7 +1780,7 @@
                     _throw_dx = fabs(_dx) > 0.01 ? _dx : 0.0;
                     _throw_dy = fabs(_dy) > 0.01 ? _dy : 0.0;
 
-                    if (_settings->getThrowingEnabled() && ( time_s_now - _time_s_last_event < 0.05 ) && (_throw_dx != 0.0 || _throw_dy != 0.0))
+                    if (_settings->getThrowingEnabled() && ( _time_s_now - _time_s_last_event < 0.05 ) && (_throw_dx != 0.0 || _throw_dy != 0.0))
                     {
                         _thrown = true;
                         aa.requestRedraw();
@@ -1847,6 +1809,7 @@
             case osgGA::GUIEventAdapter::DOUBLECLICK:
                 // bail out of continuous mode if necessary:
                 _continuous = false;
+                _pushed = false;
                 addMouseEvent( ea );
                 if (_mouse_down_event)
                 {
@@ -1864,19 +1827,22 @@
 
             case osgGA::GUIEventAdapter::DRAG:
                 {
-                    action = _settings->getAction( ea.getEventType(), ea.getButtonMask(), ea.getModKeyMask() );
-                    addMouseEvent( ea );
-                    bool wasContinuous = _continuous;
-                    _continuous = action.getBoolOption(OPTION_CONTINUOUS, false);
-                    if ( handleMouseAction( action, aa.asView() ) )
-                        aa.requestRedraw();
-
-                    if ( _continuous && !wasContinuous )
-                        _last_continuous_action_time = time_s_now; //_time_s_now;
-
-                    aa.requestContinuousUpdate(_continuous);
-                    _thrown = false;
-                    handled = true;
+                    if (_pushed)
+                    {
+                        action = _settings->getAction( ea.getEventType(), ea.getButtonMask(), ea.getModKeyMask() );
+                        addMouseEvent( ea );
+                        bool wasContinuous = _continuous;
+                        _continuous = action.getBoolOption(OPTION_CONTINUOUS, false);
+                        if ( handleMouseAction( action, aa.asView() ) )
+                            aa.requestRedraw();
+
+                        if ( _continuous && !wasContinuous )
+                            _last_continuous_action_time = _time_s_now;
+
+                        aa.requestContinuousUpdate(_continuous);
+                        _thrown = false;
+                        handled = true;
+                    }
                 }
                 break;
 
@@ -1918,7 +1884,7 @@
     if ( handled && action._type != ACTION_NULL )
     {
         _last_action = action;
-        _time_s_last_event = time_s_now;
+        _time_s_last_event = _time_s_now;
     }
 
     return handled;
@@ -1965,16 +1931,8 @@
 }
 
 void
-EarthManipulator::updateTether()
+EarthManipulator::updateTether(double t)
 {
-    double t = 1.0;
-
-    // If we are still setting the viewpoint, tick that now.
-    if ( isSettingViewpoint() )
-    {
-        t = setViewpointFrame( _time_s_now );
-    }
-
     // Initial transition is complete, so update the camera for tether.
     osg::ref_ptr<osg::Node> node;
     if ( _setVP1->getNode(node) )
@@ -2036,7 +1994,9 @@
             // Track all rotations
             else if (_settings->getTetherMode() == TETHER_CENTER_AND_ROTATION)
             {
-                _tetherRotation = L2W.getRotate() * _centerRotation.inverse();
+                osg::Quat finalTetherRotation;
+                finalTetherRotation = L2W.getRotate() * _centerRotation.inverse();
+                _tetherRotation.slerp(t, _tetherRotationVP0, finalTetherRotation);
             }
         }
 
@@ -2044,20 +2004,6 @@
     }
 }
 
-Viewpoint
-EarthManipulator::getTetherNodeViewpoint() const
-{
-    // @deprecated; please do not add new code here.
-    if ( isTethering() )
-    {
-        return _setVP1.get();
-    }
-    else
-    {
-        return Viewpoint();
-    }
-}
-
 bool
 EarthManipulator::serviceTask()
 {
@@ -2066,9 +2012,6 @@
         double dt = _time_s_now - _task->_time_last_service;
         if ( dt > 0.0 )
         {
-            //OE_INFO << "serviceTask: fr="<<_frame_count<<", dt=" << dt << ", clamped = " << osg::clampBelow(dt,_task->_duration_s)
-            //    << std::endl;
-
             // cap the DT so we don't exceed the expected delta.
             dt = osg::clampBelow( dt, _task->_duration_s );
 
@@ -2101,20 +2044,6 @@
 }
 
 bool
-EarthManipulator::isMouseMoving()
-{
-    if (_ga_t0.get()==NULL || _ga_t1.get()==NULL) return false;
-
-    static const float velocity = 0.1f;
-
-    float dx = _ga_t0->getXnormalized()-_ga_t1->getXnormalized();
-    float dy = _ga_t0->getYnormalized()-_ga_t1->getYnormalized();
-    float len = sqrtf(dx*dx+dy*dy);
-
-    return len > _delta_t * velocity;
-}
-
-bool
 EarthManipulator::isMouseClick( const osgGA::GUIEventAdapter* mouse_up_event ) const
 {
     if ( mouse_up_event == NULL || _mouse_down_event == NULL ) return false;
@@ -2351,6 +2280,12 @@
 osg::Matrixd
 EarthManipulator::getMatrix() const
 {
+    return getWorldMatrix() * _mapNodeFrame;
+}
+
+osg::Matrixd
+EarthManipulator::getWorldMatrix() const
+{
     return osg::Matrixd::translate(_viewOffset.x(), _viewOffset.y(), _distance) *
            osg::Matrixd::rotate   (_rotation) *
            osg::Matrixd::rotate   (_tetherRotation) *
@@ -2362,6 +2297,12 @@
 osg::Matrixd
 EarthManipulator::getInverseMatrix() const
 {
+    return _mapNodeFrameInverse * getWorldInverseMatrix();
+}
+
+osg::Matrixd
+EarthManipulator::getWorldInverseMatrix() const
+{
     return osg::Matrixd::translate(-_center)*
            osg::Matrixd::rotate   (_centerRotation.inverse()) *
            osg::Matrixd::translate(-_posOffset) *
@@ -2373,11 +2314,35 @@
 void
 EarthManipulator::updateCamera(osg::Camera& camera)
 {
+    // time exactly now
+    double now = osg::Timer::instance()->time_s();
+
+    // interpolation through a setViewpoint, if applicable
+    double t = 1.0;
+
+    // Update a viewpoint transition:
+    if (isSettingViewpoint())
+    {
+        t = setViewpointFrame(now);
+    }
+
+    // Update a camera tethered to a node:
     if (isTethering())
     {
-        updateTether();
+        updateTether(t);
     }
+
+    // Update an ortho/perspective projection tracking:
+    updateProjection(&camera);
+
+
     osgGA::CameraManipulator::updateCamera(camera);
+    
+    // Invoke the callback once the camera's been udpated for the ensuing render:
+    if (_updateCameraCallback.valid())
+    {
+        _updateCameraCallback->onUpdateCamera(&camera);
+    }
 }
 
 void
@@ -2442,6 +2407,8 @@
     osg::Vec3d lv(center-eye);
     setDistance( lv.length() );
     setCenter( center );
+    _posOffset.set(0,0,0);
+    _viewOffset.set(0,0);
 
     osg::Matrixd rotation_matrix = osg::Matrixd::lookAt(eye,center,up);
     _centerRotation = computeCenterRotation(_center); // getRotation(_center).getRotate().inverse();
@@ -2462,9 +2429,6 @@
     if (intersected)
     {
         setByLookAtRaw(eye, target, up);
-        //GeoPoint p;
-        //p.fromWorld(getSRS(), target);
-        //OE_INFO << "center = " << p.x() << ", " << p.y() << ", " << p.alt() << "\n";
     }
 
     return intersected;
@@ -2569,27 +2533,7 @@
                 _centerRotation = _centerRotation * pan_rotation;
                 _previousUp = new_localUp;
             }
-
-#if 0
-            else
-            {
-                //OE_DEBUG<<"New up orientation nearly inline - no need to rotate"<<std::endl;
-            }
-
-            double new_azim;
-            getEulerAngles( _rotation, &new_azim, 0L );
-            double delta_azim = new_azim - old_azim;
-
-            osg::Quat q;
-            q.makeRotate( delta_azim, new_localUp );
-            if ( !q.zeroRotation() )
-            {
-                _centerRotation = _centerRotation * q;
-            }
-#endif
         }
-
-        //recalculateLocalPitchAndAzimuth();
     }
     else
     {
@@ -2992,7 +2936,7 @@
 void
 EarthManipulator::getCompositeEulerAngles( double* out_azim, double* out_pitch ) const
 {
-    osg::Matrix m = getMatrix() * osg::Matrixd::inverse(_centerLocalToWorld);
+    osg::Matrix m = getWorldMatrix() * osg::Matrixd::inverse(_centerLocalToWorld);
     osg::Vec3d look = -getUpVector( m );
     osg::Vec3d up   =  getFrontVector( m );
 
@@ -3146,7 +3090,7 @@
         using namespace osg;
         // new sphere with center at midpoint between pt and input sphere
         Vec3d center2 = (pt + center) / 2.0;
-        double rad2 = (pt - center2).length();
+        double radius2 = (pt - center2).length();
         Vec3d resCtr;
         double resRad;
         // Use Thales' theorem, which states that a triangle inscribed in
@@ -3154,7 +3098,7 @@
         // third on the circle, is a right triangle. Since one endpoint is
         // the center of the original sphere (the earth) and the other is
         // pt, we can get our tangent from that.
-        bool valid = sphereInterection(center, radius, center2, rad2, resCtr,
+        bool valid = sphereInterection(center, radius, center2, radius2, resCtr,
                                        resRad);
         if (!valid)
             return Vec3d(0.0, 0.0, 0.0);
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Ephemeris osgearth-2.10.2+dfsg/src/osgEarthUtil/Ephemeris
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Ephemeris	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Ephemeris	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -24,6 +24,8 @@
 
 #include <osgEarthUtil/Common>
 #include <osgEarth/DateTime>
+#include <osgEarth/Units>
+#include <osgEarth/GeoData>
 #include <osg/Vec3d>
 
 namespace osgEarth { namespace Util 
@@ -31,6 +33,20 @@
     using namespace osgEarth;
 
     /**
+     * Location of a celestial body relative to the Earth.
+     */
+    struct CelestialBody
+    {
+        Angle rightAscension;
+        Angle declination;
+        Angle latitude;
+        Angle longitude;
+        Distance altitude;
+        osg::Vec3d geocentric;
+        osg::Vec3d eci;
+    };
+
+    /**
      * An Ephemeris gives the positions of naturally occurring astronimical
      * objects; in that case, the sun and the moon. Also includes some
      * related utility functions.
@@ -38,16 +54,13 @@
     class OSGEARTHUTIL_EXPORT Ephemeris : public osg::Referenced
     {
     public:
-        /**
-        * Gets the moon position in ECEF coordinates at the given time
-        */
-        virtual osg::Vec3d getMoonPositionECEF(const DateTime& dt) const;
 
-        /**
-        * Gets the sun position in ECEF coordinates at the given time
-        */
-        virtual osg::Vec3d getSunPositionECEF(const DateTime& dt) const;
-        
+        //! Return the sun's position for a given date and time.
+        virtual CelestialBody getSunPosition(const DateTime& dt) const;
+
+        //! Return the moon's position for a given date and time.
+        virtual CelestialBody getMoonPosition(const DateTime& dt) const;
+
         /**
          * Gets an ECEF position from the right ascension, declination and range
          *
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Ephemeris.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/Ephemeris.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Ephemeris.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Ephemeris.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarthUtil/Ephemeris>
-#include <sstream>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
@@ -41,201 +40,138 @@
 #define nrad2(X) { while( X <= -osg::PI ) X += TWO_PI; while( X > osg::PI ) X -= TWO_PI; }
 
     static const double TWO_PI = (2.0*osg::PI);
-    static const double JD2000 = 2451545.0;
-    
-    osg::Vec3d getPositionFromRADecl(double ra, double decl, double range)
-    {
-        return osg::Vec3d(
-                range * cos(decl) * cos(ra),
-                range * cos(decl) * sin(ra),
-                range * sin(decl) );
-
-        //return osg::Vec3(0,range,0) * 
-        //    osg::Matrix::rotate( decl, 1, 0, 0 ) * 
-        //    osg::Matrix::rotate( ra, 0, 0, 1 ); // - osg::PI_2, 0, 0, 1 );
-    }
 
-
-    double sgCalcEccAnom(double M, double e)
+    // http://www.stjarnhimlen.se/comp/tutorial.html#4
+    // for reference only; same as DateTime::getJulianDay() - 2451544
+    double dayNumber(int Y, int M, int D, double hoursUTC)
     {
-        double eccAnom, E0, E1, diff;
-
-        double epsilon = osg::DegreesToRadians(0.001);
-        
-        eccAnom = M + e * sin(M) * (1.0 + e * cos (M));
-        // iterate to achieve a greater precision for larger eccentricities 
-        if (e > 0.05)
-        {
-            E0 = eccAnom;
-            do
-            {
-                 E1 = E0 - (E0 - e * sin(E0) - M) / (1 - e *cos(E0));
-                 diff = fabs(E0 - E1);
-                 E0 = E1;
-            } while (diff > epsilon );
-            return E0;
-        }
-        return eccAnom;
+        int d = 367*Y - (7*(Y+(((M+9)/12))))/4 + ((275*M)/9) + D - 730530;
+        return (double)d + hoursUTC/24.0;
     }
 
-    double getJulianDate( int year, int month, int date )
+    double rev(double a)
     {
-        if ( month <= 2 )
-        {
-            month += 12;
-            year -= 1;
-        }
-
-        int A = int(year/100);
-        int B = 2-A+(A/4);
-        int C = int(365.25*(year+4716));
-        int D = int(30.6001*(month+1));
-        return B + C + D + date - 1524.5;
+        return a - floor(a/360.0)*360.0;
     }
 
     struct Sun
     {
-        // https://www.cfa.harvard.edu/~wsoon/JuanRamirez09-d/Chang09-OptimalTiltAngleforSolarCollector.pdf
-        void getLatLonRaDecl(int year, int month, int date, double hoursUTC,
-                             double& out_lat,
-                             double& out_lon,
-                             double& out_ra,
-                             double& out_decl,
-                             double& out_almanacTime) const
+        // http://www.stjarnhimlen.se/comp/tutorial.html#5
+        // Test: http://www.satellite-calculations.com/Satellite/suncalc.htm
+        CelestialBody getPosition(const DateTime& dt) const
         {
-            double JD = getJulianDate(year, month, date);
-            double JD1 = (JD - JD2000);                         // julian time since JD2000 epoch
-            double JC = JD1/36525.0;                            // julian century
-
-            double mu = 282.937348 + 0.00004707624*JD1 + 0.0004569*(JC*JC);
-
-            double epsilon = 280.466457 + 0.985647358*JD1 + 0.000304*(JC*JC);
-
-            // orbit eccentricity:
-            double E = 0.01670862 - 0.00004204 * JC;
-
-            // mean anomaly of the perihelion
-            double M = epsilon - mu;
-
-            // perihelion anomaly:
-            double v =
-                M + 
-                360.0*E*sin(d2r(M))/osg::PI + 
-                900.0*(E*E)*sin(d2r(2*M))/4*osg::PI - 
-                180.0*(E*E*E)*sin(d2r(M))/4.0*osg::PI;
-
-            // longitude of the sun in ecliptic coordinates:
-            double sun_lon = d2r(v - 360.0 + mu); // lambda
-            nrad2(sun_lon);
-
-            // angle between the ecliptic plane and the equatorial plane
-            double zeta_deg = 23.4392;
-            double zeta = d2r(zeta_deg);
-
-            // latitude of the sun on the ecliptic plane:
-            double omega = d2r(0.0);
-
-            // latitude of the sun with respect to the equatorial plane (solar declination):
-            double sun_lat = asin( sin(sun_lon)*sin(zeta) );
-            nrad2(sun_lat);
-
-            // finally, adjust for the time of day (rotation of the earth)
-            double time_r = hoursUTC/24.0; // 0..1
-            nrad(sun_lon); // clamp to 0..TWO_PI
-            double sun_r = sun_lon/TWO_PI; // convert to 0..1
-
-            // rotational difference between UTC and current time
-            double diff_r = sun_r - time_r;
-            double diff_lon = TWO_PI * diff_r;
-
-            // apparent sun longitude.
-            double app_sun_lon = sun_lon - diff_lon + osg::PI;
-            nrad2(app_sun_lon);
-
-            out_lat = sun_lat;
-            out_lon = app_sun_lon;
-
-            // right ascension and declination.
-            double eclong = sun_lon;
-            double oblqec = d2r(zeta_deg - 0.0000004*JD1);
-            double num = cos(oblqec) * sin(eclong);
-            double den = cos(eclong);
-            out_ra = atan(num/den);
-            if ( den < 0.0 ) out_ra += osg::PI;
-            if ( den >= 0 && num < 0 ) out_ra += TWO_PI;
-            out_decl = asin(sin(oblqec)*sin(eclong));
+            static const osg::EllipsoidModel WGS84;
 
-            // almanac time is the difference between the Julian Date and JD2000 epoch
-            out_almanacTime = JD1;
-        }
+            // Reference to 1999Dec31.0TDT
+            const double JD_REFTIME = DateTime(1999,12,31,0.0).getJulianDay();
+            double d = dt.getJulianDay() - JD_REFTIME;
+
+            double w = 282.9404 + 4.70935E-5 * d;
+            const double a = 1.0;
+
+            double e = 0.016709 - 1.151E-9 *d;
+            double M = 356.0470 + 0.9856002585 * d;
+            double oblecl = 23.4393 - 3.563E-7 * d;
+            double L = rev(w + rev(M));
+
+            double E = rev(M + r2d(e*sin(d2r(M))*(1.0 + e * cos(d2r(M)))));
+            double x = a*cos(d2r(E)) - e;
+            double y = a*sin(d2r(rev(E)))*sqrt(1.0 - e*e);
+            double r = sqrt(x*x + y*y);
+            double v = r2d(atan2(y, x));
+            double sunlon = rev(v + w);
+
+            x = r*cos(d2r(sunlon));
+            y = r*sin(d2r(sunlon));
+            double z = 0;
+
+            double xequat = x;
+            double yequat = y*cos(d2r(oblecl)) + z*sin(d2r(oblecl));
+            double zequat = y*sin(d2r(oblecl)) + z*cos(d2r(oblecl));
 
-        void getECEF(int year, int month, int date, double hoursUTC, osg::Vec3d& out_ecef)
-        {
-            double lat, applon, ra, decl, almanacTime;
-            getLatLonRaDecl(year, month, date, hoursUTC, lat, applon, ra, decl, almanacTime);
-            out_ecef.set(
-                cos(lat) * cos(-applon),
-                cos(lat) * sin(-applon),
-                sin(lat) );
+            double RA_deg = rev(r2d(atan2(yequat, xequat)));
+            double DECL_deg = r2d(atan2(zequat, sqrt(xequat*xequat + yequat*yequat)));
 
-            out_ecef *= 149600000;
-        }
+            double GMST0_deg = rev(L + 180);
+            double UT = d - floor(d);
 
-        void getLocalAzEl(int year, int month, int date, double hoursUTC, double lat, double lon, double& out_az, double out_el)
-        {
-            // UNTESTED!
-            // http://stackoverflow.com/questions/257717/position-of-the-sun-given-time-of-day-and-lat-long 
-            double sunLat, sunAppLon, ra, decl, almanacTime;
-            getLatLonRaDecl(year, month, date, hoursUTC, sunLat, sunAppLon, ra, decl, almanacTime);
-            // UTC sidereal time:
-            double gmst = 6.697375 + .0657098242 * almanacTime + hoursUTC;
-            gmst = fmod(gmst, 24.0);
-            if ( gmst < 0.0 ) gmst += 24.0;
-            // Local mean sidereal time:
-            double lmst = gmst + r2d(lon)/15.0;
-            lmst = fmod(lmst, 24.0);
-            if ( lmst < 0.0 ) lmst += 24.0;
-            lmst = d2r(lmst*15.0);
-            // Hour angle:
-            double ha = lmst - ra;
-            nrad2(ha);
-            // Az/el:
-            out_el = asin(sin(decl)*sin(lat)+cos(decl)*cos(lat)*cos(ha));
-            out_az = asin(-cos(decl)*sin(ha)/cos(out_el));
-            double elc = asin(sin(decl)/sin(lat));
-            if ( out_el >= elc ) out_az = osg::PI - out_az;
-            if ( out_el <= elc && ha > 0.0 ) out_az += TWO_PI;
+            CelestialBody sun;
+
+            sun.rightAscension.set(RA_deg, Units::DEGREES);
+            sun.declination.set(DECL_deg, Units::DEGREES);
+            sun.latitude.set(DECL_deg, Units::DEGREES);
+            sun.longitude.set(rev(0*180+RA_deg-GMST0_deg-UT*360), Units::DEGREES);
+            sun.altitude.set(149600000.0, Units::KILOMETERS);
+            
+#if 0
+            // compute topographic measurements relative to observer position:
+            if (sun._observer.isValid())
+            {
+                double siteLat_deg = sun._observer.y(); // TODO
+                double siteLon_deg = sun._observer.x(); // TODO
+
+                double SIDEREAL_deg = GMST0_deg + UT * 360 + siteLon_deg;
+                double siteLon_rad = d2r(siteLon_deg);
+                double siteLat_rad = d2r(siteLat_deg);
+                double hourAngle_rad = d2r(SIDEREAL_deg - RA_deg);
+                double DECL_rad = d2r(DECL_deg);
+                x = cos(hourAngle_rad) * cos(DECL_rad);
+                y = sin(hourAngle_rad) * cos(DECL_rad);
+                z = sin(DECL_rad);
+                double xhor = x*sin(siteLat_rad) - z*cos(siteLat_rad);
+                double yhor = y;
+                double zhor = x*cos(siteLat_rad) + z*sin(siteLat_rad);
+
+                double elev = asin(zhor);
+                double azim = atan2(yhor, zhor);
+                azim = siteLat_deg < 0.0? azim + osg::PI : azim - osg::PI;
+                nrad2(azim);
+
+                sun._topoElevation.set(elev, Units::RADIANS);
+                sun._topoAzimuth.set(azim, Units::RADIANS);
+            }
+#endif
+
+            // geocentric:
+            {
+                WGS84.convertLatLongHeightToXYZ(
+                    sun.latitude.as(Units::RADIANS),
+                    sun.longitude.as(Units::RADIANS),
+                    sun.altitude.as(Units::METERS),
+                    sun.geocentric.x(), sun.geocentric.y(), sun.geocentric.z());
+            }
+
+            // ECI:
+            {
+                double RA = sun.rightAscension.as(Units::RADIANS);
+                double DECL = sun.declination.as(Units::RADIANS);
+                double R = sun.altitude.as(Units::METERS);
+                sun.eci.set(
+                    R*cos(DECL)*cos(RA),
+                    R*cos(DECL)*sin(RA),
+                    R*sin(DECL));
+            }
+
+            //OE_DEBUG << "RA = " << RA << ", DECL = " << DECL << ", LAT = " << r2d(out_lat) << ", LON = " << r2d(out_lon) << std::endl;
+
+            return sun;
         }
     };
 
     struct Moon
     {
-        static std::string radiansToHoursMinutesSeconds(double ra)
-        {
-            while (ra < 0) ra += (osg::PI * 2.0);
-            //Get the total number of hours
-            double hours = (ra / (osg::PI * 2.0) ) * 24.0;
-            double minutes = hours - (int)hours;
-            hours -= minutes;
-            minutes *= 60.0;
-            double seconds = minutes - (int)minutes;
-            seconds *= 60.0;
-            std::stringstream buf;
-            buf << (int)hours << ":" << (int)minutes << ":" << (int)seconds;
-            return buf.str();
-        }
-
         // Math: http://www.stjarnhimlen.se/comp/ppcomp.html
         // More: http://www.stjarnhimlen.se/comp/tutorial.html#7
         // Test: http://www.satellite-calculations.com/Satellite/suncalc.htm
         // Test: http://www.timeanddate.com/astronomy/moon/light.html
-        osg::Vec3d getEarthLonLatRange(int year, int month, int date, double hoursUTC ) const
+        //osg::Vec3d getEarthLonLatRange(int year, int month, int date, double hoursUTC ) const
+        CelestialBody getPosition(const DateTime& dt) const
         {
-            int di = 367*year - 7 * ( year + (month+9)/12 ) / 4 + 275*month/9 + date - 730530;
-            double d = (double)di;
-            double time_r = hoursUTC/24.0; // 0..1            
-            d += time_r;
-
+            static const osg::EllipsoidModel WGS84;
+            
+            // Reference to 1999Dec31.0TDT
+            const double JD_REFTIME = DateTime(1999,12,31,0.0).getJulianDay();
+            double d = dt.getJulianDay() - JD_REFTIME;
             double N = d2r(125.1228 - 0.0529538083 * d);  nrad(N);
             double i = d2r(5.1454);                       
             double w = d2r(318.0634 + 0.1643573223 * d);  nrad(w);
@@ -244,129 +180,135 @@
             double M = d2r(115.3654 + 13.0649929509 * d); nrad(M);
 
             double E = M + e * sin(M) * ( 1.0 + e * cos(M) );
-            double E0 = E, E1 = 0.0;
-            double epsilon = d2r(0.001);
-            int count = 0;
-            do {
-                E1 = E0 - (E0 - e*sin(E0) - M) / (1.0 - e*cos(E0) );
+            nrad(E);
+
+            double Estart = E;
+            double Eerror = 9;
+            int iterations = 0;
+            while (Eerror > 0.0005 && iterations<20)
+            {
+                iterations++;
+                double E0 = E;
+                double E1 = E0 - (E0 - e*sin(E0) - M) / (1.0 - e*cos(E0) );
+                nrad(E1);
                 E = E1;
-                std::swap(E0, E1);
-                ++count;
+                Eerror = E<E0? E0-E : E-E0;
             }
-            while( fabs(E1-E0) > epsilon && count < 10 );
-            
-            //E = E - (E - e*sin(E) - M) / (1.0 - e*cos(E) );
             
-            double xv = a * ( cos(E) - e );
-            double yv = a * ( sqrt(1.0 - e*e) * sin(E) );
-
-            double v = atan2( yv, xv );
-            double r = sqrt( xv*xv + yv*yv );
+            nrad(E);
+            double x = a * ( cos(E) - e );
+            double y = a * ( sqrt(1.0 - e*e) * sin(E) );
 
+            double v = atan2( y, x );
+            double r = sqrt( x*x + y*y );
+            
             //Compute the geocentric (Earth-centered) position of the moon in the ecliptic coordinate system
-            double xh = r * ( cos(N) * cos(v+w) - sin(N) * sin(v+w) * cos(i) );
-            double yh = r * ( sin(N) * cos(v+w) + cos(N) * sin(v+w) * cos(i) );
-            double zh = r * ( sin(v+w) * sin(i) );
+            double xeclip = r * ( cos(N) * cos(v+w) - sin(N) * sin(v+w) * cos(i) );
+            double yeclip = r * ( sin(N) * cos(v+w) + cos(N) * sin(v+w) * cos(i) );
+            double zeclip = r * ( sin(v+w) * sin(i) );
 
             // calculate the ecliptic latitude and longitude here
-            double lonEcl = atan2(yh, xh);
-            double latEcl = atan2(zh, sqrt(xh*xh + yh*yh));
-
-            //Just use the average distance from the earth
-            double rg = 6378137.0 * a;
+            double lonEcl = atan2(yeclip, xeclip); nrad(lonEcl);
+            double latEcl = atan2(zeclip, sqrt(xeclip*xeclip + yeclip*yeclip));
 
             // add in the perturbations.
-            double Mm = M;
-            double Ms = d2r(356.0470 + 0.9856002585 * d); //nrad(Ms); // mean anomaly of the sun
-            double ws = d2r(282.9404 + 4.70935E-5   * d); //nrad(ws); // sun's longitude of perihelion
-            double Ls = ws + Ms;    //nrad(Ls);
-            double Lm = N + w + Mm; //nrad(Lm);
-            double D = Lm - Ls;     //nrad(D);
-            double F = Lm - N;      //nrad(F);
-
-            lonEcl = lonEcl
-                + d2r(-1.274) * sin(Mm - 2*D)    // (Evection)
-                + d2r(+0.658) * sin(2*D)         //(Variation)
-                + d2r(-0.186) * sin(Ms)          // (Yearly equation)
-                + d2r(-0.059) * sin(2*Mm - 2*D)
-                + d2r(-0.057) * sin(Mm - 2*D + Ms)
-                + d2r(+0.053) * sin(Mm + 2*D)
-                + d2r(+0.046) * sin(2*D - Ms)
-                + d2r(+0.041) * sin(Mm - Ms)
-                + d2r(-0.035) * sin(D)           // (Parallactic equation)
-                + d2r(-0.031) * sin(Mm + Ms)
-                + d2r(-0.015) * sin(2*F - 2*D)
-                + d2r(+0.011) * sin(Mm - 4*D);
-
-            latEcl = latEcl
-                + d2r(-0.173) * sin(F - 2*D)
-                + d2r(-0.055) * sin(Mm - F - 2*D)
-                + d2r(-0.046) * sin(Mm + F - 2*D)
-                + d2r(+0.033) * sin(F + 2*D)
-                + d2r(+0.017) * sin(2*Mm + F);
+            double Ms = d2r(356.0470 + 0.9856002585 * d); //nrad(Ms); // sun mean anomaly
+            double ws = d2r(282.9404 + 4.70935E-5   * d); //nrad(ws); // sun longitude of perihelion
+            double Ls = ws + Ms;    nrad(Ls);  // sun mean longitude
+
+            double Mm = M;                     // moon mean anomaly
+            double Lm = N + w + Mm; nrad(Lm);  // moon mean longitude
+            double D = Lm - Ls;     nrad(D);   // moon mean elongation
+            double F = Lm - N;      //nrad(F); // moon argument of latitude
+
+            lonEcl = lonEcl + d2r(
+                + (-1.274) * sin(Mm - 2*D)    // (Evection)
+                + (+0.658) * sin(2*D)         // (Variation)
+                + (-0.186) * sin(Ms)          // (Yearly equation)
+                + (-0.059) * sin(2*Mm - 2*D)
+                + (-0.057) * sin(Mm - 2*D + Ms)
+                + (+0.053) * sin(Mm + 2*D)
+                + (+0.046) * sin(2*D - Ms)
+                + (+0.041) * sin(Mm - Ms)
+                + (-0.035) * sin(D)           // (Parallactic equation)
+                + (-0.031) * sin(Mm + Ms)
+                + (-0.015) * sin(2*F - 2*D)
+                + (+0.011) * sin(Mm - 4*D)
+            );
+
+            latEcl = latEcl + d2r(
+                + (-0.173) * sin(F - 2*D)
+                + (-0.055) * sin(Mm - F - 2*D)
+                + (-0.046) * sin(Mm + F - 2*D)
+                + (+0.033) * sin(F + 2*D)
+                + (+0.017) * sin(2*Mm + F)
+            );
 
             r = r +
                 -0.58 * cos(Mm - 2*D)
                 -0.46 * cos(2*D);
 
-            // R is in "earth radii", so resolve to meters:
-            r *= 6378137.0;
-
             // convert to elliptic geocentric (unit)
-            double xg = cos(lonEcl) * cos(latEcl);
-            double yg = sin(lonEcl) * cos(latEcl);
-            double zg = sin(latEcl);
+            double xh = r * cos(lonEcl) * cos(latEcl);
+            double yh = r * sin(lonEcl) * cos(latEcl);
+            double zh = r * sin(latEcl);
 
             // and then to rectangular equatorial (unit)
             double ecl = d2r(23.4393 - 3.563E-7 * d); // obliquity of elliptic (tilt of earth)
-            double xe = xg;
-            double ye = yg*cos(ecl) - zg*sin(ecl);
-            double ze = yg*sin(ecl) + zg*cos(ecl);
+            double xe = xh;
+            double ye = yh*cos(ecl) - zh*sin(ecl);
+            double ze = yh*sin(ecl) + zh*cos(ecl);
 
             // get the ra/decl:
-            double RA   = atan2(ye, xe);
+            double RA = atan2(ye, xe); nrad(RA);
             double Decl = atan2(ze, sqrt(xe*xe + ye*ye));
-
-            nrad(RA);
-            double RAdeg  = r2d(RA);
-            double Decdeg = r2d(Decl);
           
             // finally, adjust for the time of day (rotation of the earth).
-            double UT = d - floor(d);
-            double GMST0 = Ls + d2r(180.0);
-            double siteLon = 0.0, siteLat = 0.0;
-            double siderealTime = GMST0 + d2r(UT*360.0) + siteLon;
-            double hourAngle = siderealTime - RA;
-            nrad2(hourAngle);
-
-            double x = cos(hourAngle) * cos(Decl);
-            double y = sin(hourAngle) * cos(Decl);
-            double z = sin(Decl);
-            
-            double earthLat = atan2(z, sqrt(x*x + y*y) );
+            double UT = 2.0*osg::PI * (d - floor(d));
+            //double UT = d - floor(d); // 0..1
+            double GMST0 = Ls + d2r(180.0); nrad(GMST0);
+
+            // Note. The paper creates a "correction" called called "topographic RA/DECL"
+            // based on an observer location. We're not using that here which is why the
+            // longitude doesn't match up exactly with the test site.
+
+            double earthLat = Decl;
+            double earthLon = RA - GMST0 - UT;
+            nrad(earthLon);
+
+            // since r (distance to moon) is in "earth radius units", resolve it to meters
+            r *= WGS84.getRadiusEquator();
+
+            CelestialBody moon;
             
-            // calculate the topographic right ascension and declination:
-            double mpar  = asin(1.0/r);
-            double gclat = siteLat - d2r(0.1924)*sin(2.0*siteLat);
-            double rho   = 0.99833 + 0.00167*cos(2.0*siteLat);
-            double g     = atan( tan(gclat) / cos(hourAngle) );
-            double topRA   = RA - (mpar * rho * cos(gclat) * sin(hourAngle) / cos(Decl));
-            double topDecl = Decl - (mpar * rho * sin(gclat) * sin(g - Decl) / sin(g));
+            moon.rightAscension.set(RA, Units::RADIANS);
+            moon.declination.set(Decl, Units::RADIANS);
+            moon.latitude.set(earthLat, Units::RADIANS);
+            moon.longitude.set(earthLon, Units::RADIANS);
+            moon.altitude.set(r, Units::METERS);
 
-            // use that to calculate the 
-            double earthLon = topRA - GMST0 - d2r(UT*360.0);
+            // geocentric:
+            {
+                WGS84.convertLatLongHeightToXYZ(
+                    moon.latitude.as(Units::RADIANS),
+                    moon.longitude.as(Units::RADIANS),
+                    moon.altitude.as(Units::METERS),
+                    moon.geocentric.x(), moon.geocentric.y(), moon.geocentric.z());
+            }
 
-            return osg::Vec3d(earthLon, earthLat, r);
-        }
+            // ECI:
+            {
+                double RA = moon.rightAscension.as(Units::RADIANS);
+                double DECL = moon.declination.as(Units::RADIANS);
+                double R = moon.altitude.as(Units::METERS);
+                moon.eci.set(
+                    R*cos(DECL)*cos(RA),
+                    R*cos(DECL)*sin(RA),
+                    R*sin(DECL));
+            }
 
-        osg::Vec3d getECEF(int year, int month, int date, double hoursUTC) const
-        {            
-            osg::Vec3d LLA = getEarthLonLatRange(year, month, date, hoursUTC);
-            
-            return osg::Vec3d(
-                    LLA.z() * cos(LLA.y()) * cos(LLA.x()),
-                    LLA.z() * cos(LLA.y()) * sin(LLA.x()),
-                    LLA.z() * sin(LLA.y()) ); 
+
+            return moon;
         }
     };
 }
@@ -377,26 +319,28 @@
 #undef  LC
 #define LC "[Ephemeris] "
 
-osg::Vec3d
-Ephemeris::getSunPositionECEF(const DateTime& date) const
+CelestialBody
+Ephemeris::getSunPosition(const DateTime& dt) const
 {
-    Sun sun;
-    osg::Vec3d ecef;
-    sun.getECEF( date.year(), date.month(), date.day(), date.hours(), ecef );
-    return ecef;
+    return Sun().getPosition(dt);
 }
 
-osg::Vec3d
-Ephemeris::getMoonPositionECEF(const DateTime& date) const
+CelestialBody
+Ephemeris::getMoonPosition(const DateTime& dt) const
 {
-    Moon moon;
-    //osg::Vec3d rdr = moon.getRaDeclRange(date.year(), date.month(), date.day(), date.hours());
-    //OE_NOTICE << "Moon: Y=" << date.year() << ", M=" << date.month() << ", D=" << date.day() << ", H=" << date.hours() << ": RA=" << osg::RadiansToDegrees(rdr.x()) << "; Decl=" << osg::RadiansToDegrees(rdr.y()) << "; Range=" << rdr.z() << std::endl;
-    return moon.getECEF( date.year(), date.month(), date.day(), date.hours() );
+    return Moon().getPosition(dt);
 }
 
 osg::Vec3d
-Ephemeris::getECEFfromRADecl( double ra, double decl, double range ) const
+Ephemeris::getECEFfromRADecl(double ra, double decl, double range) const
 {
-    return getPositionFromRADecl(ra, decl, range);
+    static const osg::EllipsoidModel WGS84;
+
+    osg::Vec3d out;
+
+    WGS84.convertLatLongHeightToXYZ(
+        decl, ra, range,
+        out.x(), out.y(), out.z());
+
+    return out;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ExampleResources osgearth-2.10.2+dfsg/src/osgEarthUtil/ExampleResources
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ExampleResources	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ExampleResources	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
 #include <osgEarthUtil/Controls>
 #include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/Sky>
-#include <osgEarthUtil/Ocean>
+#include <osgEarthUtil/SimpleOceanLayer>
 #include <osgEarth/Viewpoint>
 
 //#include <osg/ArgumentParser>
@@ -39,6 +39,7 @@
 }
 namespace osgViewer {
     class View;
+    class ViewerBase;
 };
 
 /**
@@ -61,18 +62,18 @@
          * arguemnts and XML externals.
          */
         osg::Group* load(
-            osg::ArgumentParser& args,
-            osgViewer::View*     view,
-            Container*           userContainer = 0L) const
+            osg::ArgumentParser&   args,
+            osgViewer::ViewerBase* viewer,
+            Container*             userContainer = 0L) const
         {
-            return load(args, view, userContainer, 0L);
+            return load(args, viewer, userContainer, 0L);
         }
 
         osg::Group* load(
-            osg::ArgumentParser&  args, 
-            osgViewer::View*      view,
-            Container*            userContainer,
-            const osgDB::Options* readOptions) const;
+            osg::ArgumentParser&   args,
+            osgViewer::ViewerBase* viewer,
+            Container*             userContainer,
+            const osgDB::Options*  readOptions) const;
 
         /**
          * Takes an existing map node and processes all the built-in example command
@@ -94,7 +95,7 @@
 
         /**
          * Configures a view with a stock set of event handlers that are useful
-         * for demos, and performs some other common view configuation for osgEarth.
+         * for demos, and performs some other common view configuration for osgEarth.
          */
         void configureView( osgViewer::View* view ) const;
 
@@ -112,7 +113,7 @@
     {
     public:
         Control* create(
-            const std::vector<Viewpoint>& list, 
+            const std::vector<Viewpoint>& list,
             osgViewer::View*              view) const;
     };
 
@@ -123,8 +124,8 @@
     class OSGEARTHUTIL_EXPORT MouseCoordsControlFactory
     {
     public:
-        Control* create( 
-            MapNode*         mapNode, 
+        Control* create(
+            MapNode*         mapNode,
             osgViewer::View* view ) const;
     };
 
@@ -136,7 +137,7 @@
     class OSGEARTHUTIL_EXPORT AnnotationGraphControlFactory
     {
     public:
-        Control* create( 
+        Control* create(
             osg::Node*       node,
             osgViewer::View* view) const;
     };
@@ -158,10 +159,26 @@
     class OSGEARTHUTIL_EXPORT OceanControlFactory
     {
     public:
-        Control* create( 
-            OceanNode* ocean ) const;
+        static Control* create(SimpleOceanLayer* ocean);
+    };
+
+
+    /**
+    * Creates UI controls displaying the map attribution
+    */
+    class OSGEARTHUTIL_EXPORT AttributionControlFactory
+    {
+    public:
+        Control* create(MapNode* mapNode) const;
     };
 
 } } // namespace osgEarth::Util
 
+
+#define OE_UI_HANDLER(X) \
+    struct X : public osgEarth::Util::Controls::ControlEventHandler { \
+        App& _app; X(App& app):_app(app) { } \
+        void onValueChanged(osgEarth::Util::Controls::Control*) { _app. X (); } \
+        void onClick(osgEarth::Util::Controls::Control*) { _app. X (); } }
+
 #endif // OSGEARTH_UTIL_EXAMPLE_RESOURCES_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ExampleResources.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/ExampleResources.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ExampleResources.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ExampleResources.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,39 +21,24 @@
 */
 
 #include <osgEarthUtil/ExampleResources>
-#include <osgEarthUtil/EarthManipulator>
 #include <osgEarthUtil/LatLongFormatter>
 #include <osgEarthUtil/MGRSFormatter>
 #include <osgEarthUtil/MouseCoordsTool>
-#include <osgEarthUtil/AutoClipPlaneHandler>
-#include <osgEarthUtil/DataScanner>
-#include <osgEarthUtil/Sky>
-#include <osgEarthUtil/Ocean>
 #include <osgEarthUtil/Shadowing>
 #include <osgEarthUtil/ActivityMonitorTool>
 #include <osgEarthUtil/LogarithmicDepthBuffer>
-#include <osgEarthUtil/ContourMap>
-
-#include <osgEarthUtil/LODBlending>
-#include <osgEarthUtil/VerticalScale>
+#include <osgEarthUtil/SimpleOceanLayer>
 
 #include <osgEarthAnnotation/AnnotationData>
-#include <osgEarthAnnotation/AnnotationRegistry>
-#include <osgEarth/ScreenSpaceLayout>
 #include <osgEarth/TerrainEngineNode>
 #include <osgEarth/NodeUtils>
-#include <osgEarth/FileUtils>
-
-#include <osgEarth/XmlUtils>
-#include <osgEarth/StringUtils>
+#include <osgEarth/GLUtils>
+#include <osgEarth/CullingUtils>
 
 #include <osgEarthDrivers/kml/KML>
 
-#include <osgDB/FileNameUtils>
 #include <osgDB/WriteFile>
 #include <osgGA/StateSetManipulator>
-#include <osgGA/AnimationPathManipulator>
-#include <osgViewer/View>
 #include <osgViewer/ViewerEventHandlers>
 
 #define KML_PUSHPIN_URL "../data/placemark32.png"
@@ -88,7 +73,7 @@
     // flies to a viewpoint in response to control event (click)
     struct ClickViewpointHandler : public ControlEventHandler
     {
-        ClickViewpointHandler( const Viewpoint& vp, osgGA::CameraManipulator* manip ) 
+        ClickViewpointHandler( const Viewpoint& vp, osgGA::CameraManipulator* manip )
             : _vp(vp), _manip( dynamic_cast<EarthManipulator*>(manip) ) { }
 
         Viewpoint         _vp;
@@ -153,8 +138,22 @@
     {
         osg::ref_ptr<osg::Uniform> _u;
         ApplyValueUniform(osg::Uniform* u) :_u(u) { }
-        void onValueChanged(Control* c, double value) {
+        void onValueChanged(Control* c, double value)
+        {
             _u->set( float(value) );
+            osgEarth::Registry::instance()->dataStore().store(
+                osgEarth::Registry::instance(), _u->getName(), _u.get());
+        }
+    };
+
+    struct ToggleDefine : public ControlEventHandler
+    {
+        osg::ref_ptr<osg::StateSet> _ss;
+        std::string _name;
+        ToggleDefine(osg::StateSet* ss, const std::string& name) : _ss(ss), _name(name) { }
+        void onValueChanged(Control* c, bool value) {
+            if (value) _ss->setDefine(_name, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+            else _ss->setDefine(_name, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE); //(_name);
         }
     };
 }
@@ -166,7 +165,7 @@
 MouseCoordsControlFactory::create(MapNode*         mapNode,
                                   osgViewer::View* view     ) const
 {
-    // readout for coordinates under the mouse   
+    // readout for coordinates under the mouse
     LabelControl* readout = new LabelControl();
     readout->setHorizAlign( Control::ALIGN_RIGHT );
     readout->setVertAlign( Control::ALIGN_BOTTOM );
@@ -245,21 +244,68 @@
 
 //------------------------------------------------------------------------
 
+std::string getAttributionString(Map* map)
+{
+    StringSet attributions;
+    map->getAttributions(attributions);
+    std::stringstream buf;
+    for (StringSet::iterator itr = attributions.begin(); itr != attributions.end(); ++itr)
+    {
+        buf << *itr << std::endl;
+    }
+
+    return buf.str();
+}
+
+class AttributeCallback : public osgEarth::MapCallback
+{
+public:
+    AttributeCallback(LabelControl* label, MapNode* mapNode) :
+        _label(label),
+        _mapNode(mapNode)
+    {
+    }
+
+    virtual void onMapModelChanged(const MapModelChange& change)
+    {
+        osg::ref_ptr< LabelControl > label;
+        osg::ref_ptr< MapNode > mapNode;
+
+        StringVector attributions;
+        if (_mapNode.lock(mapNode) && _label.lock(label))
+        {
+            label->setText(getAttributionString(_mapNode->getMap()));
+        }
+    }
+
+    osg::observer_ptr< LabelControl > _label;
+    osg::observer_ptr< MapNode > _mapNode;
+};
+
+Control* AttributionControlFactory::create(MapNode* mapNode) const
+{
+    // readout for coordinates under the mouse
+    LabelControl* credits = new LabelControl();
+    credits->setHorizAlign(Control::ALIGN_CENTER);
+    credits->setVertAlign(Control::ALIGN_BOTTOM);
+    credits->setText(getAttributionString(mapNode->getMap()));
+    mapNode->getMap()->addMapCallback(new AttributeCallback(credits, mapNode));
+    return credits;
+}
+
+//------------------------------------------------------------------------
+
 #undef  LC
 #define LC "[MapNodeHelper] "
 
 osg::Group*
-MapNodeHelper::load(osg::ArgumentParser&  args,
-                    osgViewer::View*      view,
-                    Container*            userContainer,
-                    const osgDB::Options* readOptions) const
-{
-    // do this first before scanning for an earth file
-    std::string outEarth;
-    args.read( "--out-earth", outEarth );
-
+MapNodeHelper::load(osg::ArgumentParser&   args,
+                    osgViewer::ViewerBase* viewer,
+                    Container*             userContainer,
+                    const osgDB::Options*  readOptions) const
+{
     osg::ref_ptr<osgDB::Options> myReadOptions = Registry::cloneOrCreateOptions(readOptions);
-    
+
     Config c;
     c.add("elevation_smoothing", false);
     TerrainOptions to(c);
@@ -272,33 +318,24 @@
     // read in the Earth file:
     osg::ref_ptr<osg::Node> node = osgDB::readNodeFiles(args, myReadOptions.get());
 
-    osg::ref_ptr<MapNode> mapNode;
-    if ( !node )
+    osg::ref_ptr<MapNode> mapNode = MapNode::get(node.get());
+    if ( !mapNode.valid() )
     {
-        if ( args.find("--images") < 0 )
-        {
-            OE_WARN << LC << "No earth file." << std::endl;
-            return 0L;
-        }
-        else
-        {
-            mapNode = new MapNode();
-        }
+        OE_WARN << LC << "Loaded scene graph does not contain a MapNode - aborting" << std::endl;
+        return 0L;
     }
-    else
+
+    // collect the views
+    osgViewer::Viewer::Views views;
+    if (viewer)
     {
-        mapNode = MapNode::get(node.get());
-        if ( !mapNode.valid() )
-        {
-            OE_WARN << LC << "Loaded scene graph does not contain a MapNode - aborting" << std::endl;
-            return 0L;
-        }
+        viewer->getViews(views);
     }
 
     // warn about not having an earth manip
-    if ( view )
+    for (osgViewer::Viewer::Views::iterator view = views.begin(); view != views.end(); ++view)
     {
-        EarthManipulator* manip = dynamic_cast<EarthManipulator*>(view->getCameraManipulator());
+        EarthManipulator* manip = dynamic_cast<EarthManipulator*>((*view)->getCameraManipulator());
         if ( manip == 0L )
         {
             OE_WARN << LC << "Helper used before installing an EarthManipulator" << std::endl;
@@ -307,28 +344,37 @@
 
     // a root node to hold everything:
     osg::Group* root = new osg::Group();
-    
+
     root->addChild( node );
 
-    // parses common cmdline arguments.
-    if ( view )
+    // parses common cmdline arguments and apply to the first view:
+    if ( !views.empty() )
     {
-        parse( mapNode.get(), args, view, root, userContainer );
+        parse( mapNode.get(), args, views.front(), root, userContainer );
+        
+        float lodscale;
+        if (args.read("--lodscale", lodscale))
+        {
+            LODScaleGroup* g = new LODScaleGroup();
+            g->setLODScaleFactor(osg::maximum(lodscale, 0.0001f));
+            osgEarth::insertGroup(g, mapNode->getParent(0));
+            OE_NOTICE << "LOD Scale set to: " << lodscale << std::endl;
+        }
     }
 
-    // Dump out an earth file if so directed.
-    if ( !outEarth.empty() )
+    // configures each view with some stock goodies
+    for (osgViewer::Viewer::Views::iterator view = views.begin(); view != views.end(); ++view)
     {
-        OE_NOTICE << LC << "Writing earth file: " << outEarth << std::endl;
-        osgDB::writeNodeFile( *mapNode, outEarth );
+        configureView( *view );
     }
 
-    // configures the viewer with some stock goodies
-    if ( view )
+#ifdef OSG_GL3_AVAILABLE
+    if (viewer)
     {
-        configureView( view );
+        viewer->setRealizeOperation(new GL3RealizeOperation());
     }
-    
+#endif
+
     return root;
 }
 
@@ -364,12 +410,7 @@
     osg::ref_ptr<osgDB::Options> dbOptions = Registry::instance()->cloneOrCreateOptions();
 
     // parse out custom example arguments first:
-    bool useMGRS       = args.read("--mgrs");
-    bool useDMS        = args.read("--dms");
-    bool useDD         = args.read("--dd");
-    bool useCoords     = args.read("--coords") || useMGRS || useDMS || useDD;
-
-    bool useAutoClip   = args.read("--autoclip");
+    bool useCoords     = args.read("--coords");
     bool showActivity  = args.read("--activity");
     bool useLogDepth   = args.read("--logdepth");
     bool useLogDepth2  = args.read("--logdepth2");
@@ -378,12 +419,6 @@
     std::string kmlFile;
     args.read( "--kml", kmlFile );
 
-    std::string imageFolder;
-    args.read( "--images", imageFolder );
-
-    std::string imageExtensions;
-    args.read("--image-extensions", imageExtensions);
-    
     // animation path:
     std::string animpath;
     if ( args.read("--path", animpath) )
@@ -391,6 +426,15 @@
         view->setCameraManipulator( new osgGA::AnimationPathManipulator(animpath) );
     }
 
+    // vertical field of view:
+    float vfov = -1.0f;
+    if (args.read("--vfov", vfov) && vfov > 0.0f)
+    {
+        double fov, ar, n, f;
+        view->getCamera()->getProjectionMatrixAsPerspective(fov, ar, n, f);
+        view->getCamera()->setProjectionMatrixAsPerspective(vfov, ar, n, f);
+    }
+
     // Install a new Canvas for our UI controls, or use one that already exists.
     ControlCanvas* canvas = ControlCanvas::getOrCreate( view );
 
@@ -402,7 +446,7 @@
     else
     {
         mainContainer = new VBox();
-        mainContainer->setAbsorbEvents( true );
+        mainContainer->setAbsorbEvents( false );
         mainContainer->setBackColor( Color(Color::Black, 0.8) );
         mainContainer->setHorizAlign( Control::ALIGN_LEFT );
         mainContainer->setVertAlign( Control::ALIGN_BOTTOM );
@@ -415,10 +459,6 @@
     // look for external data in the map node:
     const Config& externals = mapNode->externalConfig();
 
-    // some terrain effects.
-    // TODO: Most of these are likely to move into extensions.
-    const Config& vertScaleConf   = externals.child("vertical_scale");
-
     // Loading KML from the command line:
     if ( !kmlFile.empty() )
     {
@@ -443,10 +483,10 @@
                 if ( c )
                 {
                     c->setVertAlign( Control::ALIGN_TOP );
-                    canvas->addControl( c );
+                    mainContainer->addControl( c );
                 }
             }
-            root->addChild( kml );
+            mapNode->addChild( kml );
         }
         else
         {
@@ -454,33 +494,25 @@
         }
     }
 
-    //// Configure the de-cluttering engine for labels and annotations:
-    //if ( !screenSpaceLayoutConf.empty() )
-    //{
-    //    ScreenSpaceLayout::setOptions( ScreenSpaceLayoutOptions(screenSpaceLayoutConf) );
-    //}
-
     // Configure the mouse coordinate readout:
     if ( useCoords )
-    { 
+    {
         LabelControl* readout = new LabelControl();
         readout->setBackColor( Color(Color::Black, 0.8) );
         readout->setHorizAlign( Control::ALIGN_RIGHT );
         readout->setVertAlign( Control::ALIGN_BOTTOM );
 
-        Formatter* formatter = 
-            useMGRS ? (Formatter*)new MGRSFormatter(MGRSFormatter::PRECISION_1M, 0L, MGRSFormatter::USE_SPACES) :
-            useDMS  ? (Formatter*)new LatLongFormatter(LatLongFormatter::FORMAT_DEGREES_MINUTES_SECONDS) :
-            useDD   ? (Formatter*)new LatLongFormatter(LatLongFormatter::FORMAT_DECIMAL_DEGREES) :
-            0L;
-
         MouseCoordsTool* mcTool = new MouseCoordsTool( mapNode );
-        mcTool->addCallback( new MouseCoordsLabelCallback(readout, formatter) );
+        mcTool->addCallback( new MouseCoordsLabelCallback(readout) );
         view->addEventHandler( mcTool );
 
         canvas->addControl( readout );
     }
 
+
+    // Add the credits display
+    canvas->addControl(AttributionControlFactory().create(mapNode));
+
     // Configure for an ortho camera:
     if ( args.read("--ortho") )
     {
@@ -506,12 +538,6 @@
         canvas->addControl( vbox );
     }
 
-    // Install an auto clip plane clamper
-    if ( useAutoClip )
-    {
-        mapNode->addCullCallback( new AutoClipPlaneCullCallback(mapNode) );
-    }
-
     // Install logarithmic depth buffer on main camera
     if ( useLogDepth )
     {
@@ -529,39 +555,6 @@
         logDepth.install( view->getCamera() );
     }
 
-    // Scan for images if necessary.
-    if ( !imageFolder.empty() )
-    {
-        std::vector<std::string> extensions;
-        if ( !imageExtensions.empty() )
-            StringTokenizer( imageExtensions, extensions, ",;", "", false, true );
-        if ( extensions.empty() )
-            extensions.push_back( "tif" );
-
-        OE_INFO << LC << "Loading images from " << imageFolder << "..." << std::endl;
-        ImageLayerVector imageLayers;
-        DataScanner scanner;
-        scanner.findImageLayers( imageFolder, extensions, imageLayers );
-
-        if ( imageLayers.size() > 0 )
-        {
-            mapNode->getMap()->beginUpdate();
-            for( ImageLayerVector::iterator i = imageLayers.begin(); i != imageLayers.end(); ++i )
-            {
-                mapNode->getMap()->addLayer( i->get() );
-            }
-            mapNode->getMap()->endUpdate();
-        }
-        OE_INFO << LC << "...found " << imageLayers.size() << " image layers." << std::endl;
-    }
-
-    // Install vertical scaler.
-    // TODO: deprecate this, or move it to an extension.
-    if ( !vertScaleConf.empty() )
-    {
-        mapNode->getTerrainEngine()->addEffect( new VerticalScale(vertScaleConf) );
-    }
-
     // Generic named value uniform with min/max.
     VBox* uniformBox = 0L;
     while( args.find( "--uniform" ) >= 0 )
@@ -575,7 +568,7 @@
                 uniformBox = new VBox();
                 uniformBox->setBackColor(0,0,0,0.5);
                 uniformBox->setAbsorbEvents( true );
-                canvas->addControl( uniformBox );
+                mainContainer->addControl( uniformBox );
             }
             osg::Uniform* uniform = new osg::Uniform(osg::Uniform::FLOAT, name);
             uniform->set( minval );
@@ -590,6 +583,26 @@
         }
     }
 
+    while (args.find("--define") >= 0)
+    {
+        std::string name;
+        if (args.read("--define", name))
+        {
+            if ( uniformBox == 0L )
+            {
+                uniformBox = new VBox();
+                uniformBox->setBackColor(0,0,0,0.5);
+                uniformBox->setAbsorbEvents( true );
+                mainContainer->addControl( uniformBox );
+            }
+            
+            HBox* box = new HBox();
+            box->addControl(new CheckBoxControl(false, new ToggleDefine(mapNode->getOrCreateStateSet(), name)));
+            box->addControl(new LabelControl(name));
+            uniformBox->addControl(box);
+        }
+    }
+
     // Map inspector:
     if (args.read("--inspect"))
     {
@@ -612,7 +625,11 @@
     // Simple ocean model:
     if (args.read("--ocean"))
     {
-        mapNode->addExtension(Extension::create("ocean_simple", ConfigOptions()));
+        //mapNode->addExtension(Extension::create("ocean_simple", ConfigOptions()));
+        SimpleOceanLayer* layer = new SimpleOceanLayer();
+        mapNode->getMap()->addLayer(layer);
+        Control* ui = OceanControlFactory::create(layer);
+        mainContainer->addControl(ui);
     }
 
     // Arbitrary extension:
@@ -623,7 +640,7 @@
         if (ext)
             mapNode->addExtension(ext);
     }
-    
+
 
     // Hook up the extensions!
     for(std::vector<osg::ref_ptr<Extension> >::const_iterator eiter = mapNode->getExtensions().begin();
@@ -654,7 +671,7 @@
             ShadowCaster* caster = new ShadowCaster();
             caster->setTextureImageUnit( unit );
             caster->setLight( view->getLight() );
-            caster->getShadowCastingGroup()->addChild( mapNode->getModelLayerGroup() );
+            caster->getShadowCastingGroup()->addChild( mapNode->getLayerNodeGroup() );
             caster->getShadowCastingGroup()->addChild(mapNode->getTerrainEngine());
             if ( mapNode->getNumParents() > 0 )
             {
@@ -675,6 +692,9 @@
 void
 MapNodeHelper::configureView( osgViewer::View* view ) const
 {
+    // default uniform values:
+    GLUtils::setGlobalDefaults(view->getCamera()->getOrCreateStateSet());
+
     // add some stock OSG handlers:
     view->addEventHandler(new osgViewer::StatsHandler());
     view->addEventHandler(new osgViewer::WindowSizeHandler());
@@ -694,19 +714,16 @@
         << "  --kml <file.kml>              : load a KML or KMZ file\n"
         << "  --kmlui                       : display a UI for toggling nodes loaded with --kml\n"
         << "  --coords                      : display map coords under mouse\n"
-        << "  --dms                         : dispay deg/min/sec coords under mouse\n"
-        << "  --dd                          : display decimal degrees coords under mouse\n"
-        << "  --mgrs                        : show MGRS coords under mouse\n"
         << "  --ortho                       : use an orthographic camera\n"
         << "  --logdepth                    : activates the logarithmic depth buffer\n"
         << "  --logdepth2                   : activates logarithmic depth buffer with per-fragment interpolation\n"
         << "  --shadows                     : activates model layer shadows\n"
-        << "  --images [path]               : finds and loads image layers from folder [path]\n"
-        << "  --image-extensions [ext,...]  : with --images, extensions to use\n"
         << "  --out-earth [file]            : write the loaded map to an earth file\n"
         << "  --uniform [name] [min] [max]  : create a uniform controller with min/max values\n"
+        << "  --define [name]               : install a shader #define\n"
         << "  --path [file]                 : load and playback an animation path\n"
-        << "  --extension [name]            : loads a named extension\n";
+        << "  --extension [name]            : loads a named extension\n"
+        << "  --ocean                       : add a simple ocean model (requires bathymetry)\n";
 }
 
 
@@ -723,9 +740,22 @@
         {
             DateTime d = _sky->getDateTime();
             _sky->setDateTime(DateTime(d.year(), d.month(), d.day(), value));
+
+            d = _sky->getDateTime();
+        }
+    };
+
+    struct SkyDaysSlider : public ui::ControlEventHandler
+    {
+        SkyDaysSlider(SkyNode* sky) : _sky(sky)  { }
+        SkyNode* _sky;
+        void onValueChanged(ui::Control* control, float value )
+        {
+            DateTime d = _sky->getDateTime();
+            _sky->setDateTime(DateTime(d.year(), d.month(), floor(value), d.hours()));
         }
     };
-    
+
     static std::string s_month[12] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 
     struct SkyMonthSlider : public ui::ControlEventHandler
@@ -735,10 +765,10 @@
         ui::LabelControl* _label;
         void onValueChanged(ui::Control* control, float value )
         {
-            int m = std::min((int)value, 11);
-            DateTime d = _sky->getDateTime();            
+            int m = 1 + osg::minimum((int)value, 11);
+            DateTime d = _sky->getDateTime();
             _sky->setDateTime(DateTime(d.year(), m, d.day(), d.hours()));
-            _label->setText(s_month[m]);
+            _label->setText(s_month[m-1]);
         }
     };
 
@@ -749,7 +779,7 @@
         ui::LabelControl* _label;
         void onValueChanged(ui::Control* control, float value )
         {
-            DateTime d = _sky->getDateTime();            
+            DateTime d = _sky->getDateTime();
             _sky->setDateTime(DateTime((int)value, d.month(), d.day(), d.hours()));
             _label->setText(Stringify() << (int)value);
         }
@@ -763,7 +793,8 @@
 
         void onValueChanged(ui::Control* control, float value )
         {
-            _sky->setMinimumAmbient(osg::Vec4(value,value,value,1));
+            if (_sky->getSunLight())
+                _sky->getSunLight()->setAmbient(osg::Vec4(value,value,value,1));
         }
     };
 }
@@ -771,9 +802,9 @@
 ui::Control* SkyControlFactory::create(SkyNode* sky)
 {
     ui::Grid* grid = new ui::Grid();
+    grid->setBackColor(0,0,0,.1);
     grid->setChildVertAlign( ui::Control::ALIGN_CENTER );
     grid->setChildSpacing( 10 );
-    grid->setHorizFill( true );
 
     if (sky)
     {
@@ -785,14 +816,21 @@
         skyHoursSlider->setHorizFill( true, 250 );
         skyHoursSlider->addEventHandler( new SkyHoursSlider(sky) );
         grid->setControl(2, r, new ui::LabelControl(skyHoursSlider) );
-    
+
+        r++;
+        grid->setControl( 0, r, new ui::LabelControl("Day: ", 16) );
+        ui::HSliderControl* skyDaySlider = grid->setControl(1, r, new ui::HSliderControl( 1, 31, dt.hours() ));
+        skyDaySlider->setHorizFill( true, 250 );
+        skyDaySlider->addEventHandler( new SkyDaysSlider(sky) );
+        grid->setControl(2, r, new ui::LabelControl(skyDaySlider) );
+
         ++r;
         grid->setControl( 0, r, new ui::LabelControl("Month: ", 16) );
         ui::HSliderControl* skyMonthSlider = grid->setControl(1, r, new ui::HSliderControl( 0.0f, 12.0f, dt.month() ));
         skyMonthSlider->setHorizFill( true, 250 );
-        ui::LabelControl* monthLabel = grid->setControl(2, r, new ui::LabelControl(s_month[dt.month()]));
+        ui::LabelControl* monthLabel = grid->setControl(2, r, new ui::LabelControl(s_month[dt.month()-1]));
         skyMonthSlider->addEventHandler( new SkyMonthSlider(sky, monthLabel) );
-    
+
         ++r;
         grid->setControl( 0, r, new ui::LabelControl("Year: ", 16) );
         ui::HSliderControl* skyYearSlider = grid->setControl(1, r, new ui::HSliderControl( 1970.0f, 2061.0f, dt.year() ));
@@ -808,4 +846,41 @@
     }
 
     return grid;
+}
+
+//........................................................................
+
+
+namespace
+{
+    struct OceanSeaLevel : public ui::ControlEventHandler
+    {
+        OceanSeaLevel(SimpleOceanLayer* ocean) : _ocean(ocean) { }
+        SimpleOceanLayer* _ocean;
+        void onValueChanged(ui::Control* control, float value )
+        {
+            _ocean->setSeaLevel(value);
+        }
+    };
+}
+
+ui::Control*
+OceanControlFactory::create(SimpleOceanLayer* ocean)
+{
+    ui::Grid* grid = new ui::Grid();
+    grid->setBackColor(0,0,0,.1);
+    grid->setChildVertAlign( ui::Control::ALIGN_CENTER );
+    grid->setChildSpacing( 10 );
+
+    if (ocean)
+    {
+        int r=0;
+
+        grid->setControl( 0, r, new ui::LabelControl("Sea Level: ", 16) );
+        ui::HSliderControl* seaLevel = grid->setControl(1, r, new ui::HSliderControl(-250.0f, 250.0f, 0.0f, new OceanSeaLevel(ocean)));
+        seaLevel->setHorizFill( true, 250 );
+        grid->setControl(2, r, new ui::LabelControl(seaLevel) );
+    }
+
+    return grid;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Export osgearth-2.10.2+dfsg/src/osgEarthUtil/Export
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Export	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Export	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -24,11 +24,6 @@
 #ifndef OSGEARTHUTIL_EXPORT_H
 #define OSGEARTHUTIL_EXPORT_H 1
 
-// define USE_DEPRECATED_API is used to include in API which is being fazed out
-// if you can compile your apps with this turned off you are
-// well placed for compatibility with future versions.
-#define USE_DEPRECATED_API
-
 #if defined(_MSC_VER)
     #pragma warning( disable : 4244 )
     #pragma warning( disable : 4251 )
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/FeatureManipTool osgearth-2.10.2+dfsg/src/osgEarthUtil/FeatureManipTool
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/FeatureManipTool	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/FeatureManipTool	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2008-2014 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
-#ifndef OSGEARTHUTIL_FEATURE_DRAGGER_TOOL_H
-#define OSGEARTHUTIL_FEATURE_DRAGGER_TOOL_H 1
-
-#include <osgEarthUtil/Common>
-#include <osgEarthUtil/FeatureQueryTool>
-#include <osgEarthFeatures/FeatureDrawSet>
-#include <osgEarthAnnotation/CircleNode>
-#include <osgEarthAnnotation/AnnotationEditing>
-#include <osgEarth/MapNode>
-#include <osgEarth/Draggers>
-#include <osgEarth/Units>
-#include <osgGA/GUIEventHandler>
-#include <osg/View>
-#include <osg/MatrixTransform>
-
-namespace osgEarth { namespace Util
-{
-    using namespace osgEarth;
-    using namespace osgEarth::Annotation;
-
-    /**
-     * Tool that let you select a feature and drag it around.
-     */
-    class OSGEARTHUTIL_EXPORT FeatureManipTool : public FeatureQueryTool,
-                                                 public FeatureQueryTool::Callback
-    {
-    public:
-        /**
-         * Constructs a new feature dragger tool.
-         */
-        FeatureManipTool( MapNode* mapNode, bool verticalEnabled=false );
-
-        /** dtor */
-        virtual ~FeatureManipTool() { }
-
-        /**
-         * Sets the position of the dragger
-         */
-        void setPosition( const GeoPoint& pos );
-
-        /**
-         * Sets the rotation of the dragger
-         */
-        void setRotation( const Angle& angle );
-
-        /**
-         * Cancels a manipulation in progress
-         */
-        void cancel();
-
-        /**
-         * Commits a manipulation in progress, buring in the new verts.
-         */
-        void commit();
-
-
-    public: // FeatureQueryTool::Callback
-
-        virtual void onHit( FeatureSourceIndexNode* index, FeatureID fid, const EventArgs& args );
-        virtual void onMiss( const EventArgs& args );
-
-
-    public: // GUIEventHandler
-
-        virtual bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa );
-
-
-    public: // internal
-
-        void syncToDraggers(bool wasVertical=false);
-
-    protected:
-
-        /**
-         * Alters the appearance of the "manipulated" model. Override this method to provide a
-         * custom appearance.
-         */
-        virtual osg::Node* configureManip( osg::Node* node ) const;
-
-        /**
-         * Alters the appearance of the "ghost" model. Override this method to provide a
-         * custom appearance.
-         */
-        virtual osg::Node* configureGhost( osg::Node* node ) const;
-
-    protected:
-        FeatureDrawSet                     _drawSet;
-        osg::ref_ptr<osg::MatrixTransform> _manipModel;
-        osg::ref_ptr<osg::Node>            _ghostModel;
-        bool                               _verticalEnabled;
-        double                             _verticalOffset;
-        double                             _verticalDraggerOffset;
-        osg::ref_ptr<CircleNode>           _circle;
-        osg::ref_ptr<CircleNodeEditor>     _circleEditor;
-        osg::ref_ptr<SphereDragger>        _verticalDragger;
-        osg::ref_ptr<osg::Group>           _workGroup;
-    };
-
-} } // namespace osgEarthUtil
-
-#endif // OSGEARTHUTIL_FEATURE_DRAGGER_TOOL_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/FeatureManipTool.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/FeatureManipTool.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/FeatureManipTool.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/FeatureManipTool.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,458 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2008-2014 Pelican Mapping
- * http://osgearth.org
- *
- * osgEarth is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
-#include <osgEarthUtil/FeatureManipTool>
-#include <osgEarthAnnotation/CircleNode>
-#include <osgEarthAnnotation/AnnotationEditing>
-#include <osgEarth/ECEF>
-#include <osgEarth/Registry>
-#include <osgEarth/Capabilities>
-#include <osgEarth/GeoMath>
-#include <osgViewer/View>
-#include <osg/Depth>
-
-#define LC "[FeatureManipTool] "
-
-#define OE_TEST OE_NULL
-
-using namespace osgEarth;
-using namespace osgEarth::Util;
-using namespace osgEarth::Annotation;
-
-//-----------------------------------------------------------------------
-
-namespace
-{
-    // walks a node path, accumulating the state and storing it in the target.
-    osg::StateSet* accumulateStateSet( osg::StateSet* target, const osg::NodePath& path )
-    {
-        osg::StateSet* s = new osg::StateSet();
-        for( osg::NodePath::const_iterator i = path.begin(); i != path.end(); ++i )
-        {
-            if ( (*i)->getStateSet() )
-                s->merge( *(*i)->getStateSet() );
-        }
-
-        s->merge( *target );
-        return s;
-    }
-
-
-    // input predicate for the query tool that specifies what action
-    // should trigger a drag.
-    struct CustomQueryPredicate : public FeatureQueryTool::InputPredicate
-    {
-        bool accept( const osgGA::GUIEventAdapter& ea )
-        {
-            return
-                ea.getEventType() == ea.PUSH &&
-                (ea.getButtonMask() & ea.LEFT_MOUSE_BUTTON) != 0 &&
-                (ea.getModKeyMask() & ea.MODKEY_SHIFT)      != 0;
-        }
-    };
-
-
-    // visits a scene graph and replaces the color array on each Geometry with
-    // a specified overall color.
-    struct ColorReplacer : public osg::NodeVisitor 
-    {
-        osg::ref_ptr<osg::Vec4Array> _colors;
-        ColorReplacer(const osg::Vec4f& color) : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
-        {
-            _colors = new osg::Vec4Array(1);
-            (*_colors.get())[0] = color;
-        }
-
-        void apply(osg::Geode& geode) 
-        {
-            for( unsigned i=0; i<geode.getNumDrawables(); ++i )
-            {
-                osg::Geometry* g = geode.getDrawable(i)->asGeometry();
-                if ( g )
-                {
-                    g->setColorArray( _colors );
-                    g->setColorBinding( osg::Geometry::BIND_OVERALL );
-                }
-            }
-            traverse( geode );
-        };
-    };
-
-    
-    // Dragger callback to simply hooks back into the DraggerTool.
-    struct DraggerCallback : public Dragger::PositionChangedCallback
-    {
-        DraggerCallback( FeatureManipTool* tool, bool isVertical=false ) : _tool(tool), _isVertical(isVertical) { }
-
-        void onPositionChanged(const Dragger* sender, const osgEarth::GeoPoint& pos)
-        {
-            _tool->syncToDraggers(_isVertical);
-        }
-
-        FeatureManipTool* _tool;
-        bool _isVertical;
-    };
-
-    // updates the verts in a subgraph based on a pair of re-positioning transforms.
-    struct VertexMover : public osg::NodeVisitor
-    {
-        VertexMover(const osg::Matrixd& l2w_orig, const osg::Matrix&  w2l_new)
-            : _local2world0(l2w_orig), _world2local1(w2l_new), osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) { }
-
-        void apply(osg::Geode& geode)
-        {
-            for( unsigned i=0; i<geode.getNumDrawables(); ++i )
-            {
-                osg::Geometry* g = geode.getDrawable(i)->asGeometry();
-                if ( g )
-                {
-                    osg::Vec3Array* verts = dynamic_cast<osg::Vec3Array*>( g->getVertexArray() );
-                    for( osg::Vec3Array::iterator i = verts->begin(); i != verts->end(); ++i )
-                    {
-                        osg::Vec3d vert3d = *i;
-                        osg::Vec3d vertWorld0 = vert3d * _local2world0;
-                        osg::Vec3d vertLocal1 = vertWorld0 * _world2local1;
-                        *i = vertLocal1;
-                    }
-                }
-            }
-            traverse( geode );
-        }
-
-        osg::Matrix _local2world0, _world2local1;
-    };
-}
-
-//-----------------------------------------------------------------------
-
-FeatureManipTool::FeatureManipTool(MapNode* mapNode, bool verticalEnabled) :
-FeatureQueryTool( mapNode ),
-_verticalEnabled(verticalEnabled),
-_verticalDraggerOffset(0.0)
-{
-    // install this object as a query callback so we will receive messages.
-    this->addCallback( this );
-
-    // a custom input predicate that triggers manip mode
-    this->setInputPredicate( new CustomQueryPredicate );
-}
-
-
-void 
-FeatureManipTool::onHit( FeatureSourceIndexNode* index, FeatureID fid, const EventArgs& args )
-{
-    //OE_TEST << LC << "onHit" << std::endl;
-
-    // cancel any existing drag first, just to be safe
-    cancel();
-
-    // extract the "selected" feature model from the scene graph.
-    _drawSet = index->getDrawSet( fid );
-    if ( !_drawSet.empty() )
-    {
-        // grab the point on the ground under the hit point and use that as the anchor.
-        osg::Vec3d anchorWorld;
-        anchorWorld = args._worldPoint;
-
-        // extract the "hit" feature from its draw set into a new draggable node.
-        osg::ref_ptr<osg::Node> node;
-
-        // create a copy of the drawset's geometry for dragging:
-        osg::Node* manipModel = _drawSet.createCopy();
-        if ( manipModel )
-        {
-            _workGroup = new osg::Group();
-            _mapNode->addChild( _workGroup.get() );
-
-            anchorWorld = manipModel->getBound().center();
-            
-            // calculate the vertical offset of the anchor point from the ground
-            GeoPoint anchorMapCenter;
-            anchorMapCenter.fromWorld( _mapNode->getMapSRS(), anchorWorld );
-            _verticalOffset = anchorMapCenter.z();
-
-            GeoPoint anchorMap(anchorMapCenter);
-            anchorMap.z() = 0;
-            anchorMap.altitudeMode() = ALTMODE_RELATIVE;
-            anchorMap.transformZ( ALTMODE_ABSOLUTE, _mapNode->getTerrain() );
-
-            _verticalOffset = anchorMapCenter.z() - anchorMap.z();
-
-            anchorMap.toWorld( anchorWorld );
-
-            // set up the dragged model's appearance:
-            configureManip( manipModel );
-
-            // create a SECOND copy of the drawset's geometry that will act as the "ghost" model -- 
-            // it will sit in its original position to "remind" the user of where the drag started.
-            _ghostModel = _drawSet.createCopy();
-            configureGhost( _ghostModel.get() );
-
-            // create a transform that moves the feature from world coords to the local coordinate
-            // system around the mouse. This will allow us to move the feature without messing around
-            // with its relatively-positioned verts.
-            osg::Matrixd world2local_anchor;
-            anchorMapCenter.createWorldToLocal( world2local_anchor );
-
-            osg::MatrixTransform* world2local_xform = new osg::MatrixTransform(world2local_anchor);
-            world2local_xform->addChild( manipModel );
-
-            // next, create the positioner matrix that goes from the local coordinates to mouse
-            // world coords. This is the matrix that will change as the user drags the mouse.
-            // It just starts out as the inverse of the matrix we just created.
-            osg::Matrixd local2world_anchor;
-            local2world_anchor.invert( world2local_anchor );
-
-            _manipModel = new osg::MatrixTransform( local2world_anchor );
-            _manipModel->addChild( world2local_xform );
-
-            // hide the original draw set.
-            _drawSet.setVisible( false );
-
-            // make a circle annotation that we will use to edit the feature's position and rotation:
-            Style circleStyle;
-            circleStyle.getOrCreate<PolygonSymbol>()->fill()->color() = Color(Color::Yellow, 0.25);
-            circleStyle.getOrCreate<LineSymbol>()->stroke()->color() = Color::White;
-            const osg::BoundingSphere& bs = manipModel->getBound();
-            _circle = new CircleNode( getMapNode(), anchorMap, Distance(bs.radius()*1.5), circleStyle );
-            _circle->getOrCreateStateSet()->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS,0,1,false) );
-
-            _circleEditor = new CircleNodeEditor( _circle.get() );
-            _circleEditor->getPositionDragger()->addPositionChangedCallback( new DraggerCallback(this) );
-            _circleEditor->getRadiusDragger()->addPositionChangedCallback( new DraggerCallback(this) );
-            _circleEditor->getOrCreateStateSet()->setAttributeAndModes( new osg::Depth(osg::Depth::ALWAYS,0,1,false) );
-
-            // add an additional dragger for vertical dragging
-            if (_verticalEnabled)
-            {
-                _verticalDragger  = new SphereDragger( getMapNode() );
-                _verticalDragger->setDefaultDragMode(Dragger::DRAGMODE_VERTICAL);
-                _verticalDragger->setColor(osg::Vec4f(0.0f, 1.0f, 1.0f, 1.0f));
-                _verticalDragger->setPickColor(osg::Vec4f(1.0f, 0.0f, 1.0f, 1.0f));
-
-                _verticalDraggerOffset = bs.radius() * 1.1;
-                GeoPoint verticalDraggerPos(anchorMapCenter);
-                verticalDraggerPos.z() += _verticalDraggerOffset;
-                _verticalDragger->setPosition(verticalDraggerPos, false);
-                _verticalDragger->setVerticalMinimum(_verticalDraggerOffset);
-
-                _verticalDragger->addPositionChangedCallback( new DraggerCallback(this, true) );
-            }
-
-            // micro-manage the render order to get things just right:
-            _workGroup->getOrCreateStateSet()->setRenderBinDetails( 15, "TraversalOrderBin" );
-            _workGroup->addChild( _circle.get() );
-            _workGroup->addChild( _manipModel.get() );
-            _workGroup->addChild( _ghostModel.get() );
-            _workGroup->addChild( _circleEditor.get() );
-
-            if (_verticalDragger.valid())
-                _workGroup->addChild( _verticalDragger.get() );
-        }
-    }
-}
-
-
-void 
-FeatureManipTool::onMiss( const EventArgs& args )
-{
-    cancel();
-}
-
-
-bool 
-FeatureManipTool::handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa )
-{
-    bool handled = FeatureQueryTool::handle( ea, aa );
-    if ( !handled )
-    {
-        if ( _workGroup.valid() && ea.getEventType() == ea.KEYDOWN && ea.getKey() == ea.KEY_C )
-        {
-            commit();
-            handled = true;
-        }
-    }
-    return handled;
-}
-
-
-void
-FeatureManipTool::setPosition( const GeoPoint& pos )
-{
-    if ( _circleEditor.valid() )
-    {
-        _circleEditor->setPosition( pos );
-        syncToDraggers();
-    }
-}
-
-
-void
-FeatureManipTool::setRotation( const Angle& rot )
-{
-    if ( _circleEditor.valid() )
-    {
-        _circleEditor->setBearing( rot );
-        syncToDraggers();
-    }
-}
-
-
-void
-FeatureManipTool::syncToDraggers(bool wasVertical)
-{
-    // position the feature based on the circle annotation's draggers:
-    GeoPoint pos = _circleEditor->getPositionDragger()->getPosition();
-    GeoPoint rad = _circleEditor->getRadiusDragger()->getPosition();
-
-    // if the vertical dragger was moved, update the vertical offset
-    if (wasVertical)
-      _verticalOffset = _verticalDragger->getPosition().z() - _verticalDraggerOffset - pos.z();
-
-    GeoPoint vPos(pos);
-    vPos.z() += _verticalOffset;
-
-    // update the vertical draggers (horizontal) position 
-    if (_verticalEnabled)
-    {
-      GeoPoint vdPos(vPos);
-      vdPos.z() += _verticalDraggerOffset;
-      _verticalDragger->setPosition(vdPos, false);
-    }
-    
-    pos.makeGeographic();
-    rad.makeGeographic();
-
-    double bearing = GeoMath::bearing( 
-        osg::DegreesToRadians(pos.y()), osg::DegreesToRadians(pos.x()),
-        osg::DegreesToRadians(rad.y()), osg::DegreesToRadians(rad.x()) );
-
-    osg::Matrixd local2world;
-    vPos.createLocalToWorld( local2world );
-
-    // rotate the feature:
-    osg::Quat rot( osg::PI_2-bearing, osg::Vec3d(0,0,1) );
-    local2world.preMultRotate( rot );
-
-    // move the feature:
-    _manipModel->setMatrix(local2world);
-
-    // only show the ghost when the ghost and dragger are sufficiently separated.
-    _ghostModel->setNodeMask( _manipModel->getBound().intersects( _ghostModel->getBound() ) ? 0 : ~0 );
-}
-
-
-void
-FeatureManipTool::cancel()
-{
-    if ( _workGroup.valid() )
-    {
-        if ( _workGroup->getNumParents() > 0 )
-            _workGroup->getParent(0)->removeChild(_workGroup.get());
-        _workGroup = 0L;
-    }
-
-    _manipModel   = 0L;
-    _ghostModel   = 0L;
-    _circle       = 0L;
-    _circleEditor = 0L;
-
-    _drawSet.setVisible( true );
-    _drawSet.clear();
-}
-
-
-void
-FeatureManipTool::commit()
-{
-    if ( _workGroup.valid() )
-    {
-        // extract the manipulation matricies:
-        osg::MatrixTransform* xform1 = _manipModel.get();
-        osg::MatrixTransform* xform2 = dynamic_cast<osg::MatrixTransform*>( _manipModel->getChild(0) );
-
-        const osg::Matrixd& world2local_anchor = xform2->getMatrix();
-        const osg::Matrix&  local2world_move   = xform1->getMatrix();
-
-        // go through the draw set and update the verts based on the new location
-        for( FeatureDrawSet::DrawableSlices::iterator s = _drawSet.slices().begin(); s != _drawSet.slices().end(); ++s )
-        {
-            const FeatureDrawSet::DrawableSlice& slice = *s;
-            
-            // collection a set of indicies in the slice:
-            std::set<unsigned> indexSet;
-            _drawSet.collectPrimitiveIndexSet( slice, indexSet );
-
-            // need the inverse of our original L2W so we can reposition the verts:
-            osg::Matrixd world2local;
-            world2local.invert( slice.local2world );
-
-            // recalculate the verts in their local reference frame:
-            osg::Vec3Array* verts = dynamic_cast<osg::Vec3Array*>( slice.drawable->asGeometry()->getVertexArray() );
-            for( std::set<unsigned>::iterator i = indexSet.begin(); i != indexSet.end(); ++i )
-            {
-                osg::Vec3d vert3d = (*verts)[*i];
-                osg::Vec3d vertWorld = (((vert3d * slice.local2world) * world2local_anchor) * local2world_move);
-                osg::Vec3d vertLocalNew = vertWorld * world2local;
-                (*verts)[*i] = vertLocalNew;
-            }
-            verts->dirty();
-        }
-    }
-
-    cancel();
-}
-
-
-osg::Node*
-FeatureManipTool::configureManip( osg::Node* node ) const
-{
-    //nop
-    return node;
-}
-
-
-osg::Node*
-FeatureManipTool::configureGhost( osg::Node* node ) const
-{
-    osg::StateSet* s = node->getOrCreateStateSet();
-
-    // note: everything here must be OVERRIDE so we override the default state of the ghost model.
-
-    //s->setRenderBinDetails( 10, "DepthSortedBin", osg::StateSet::USE_RENDERBIN_DETAILS );
-    s->setMode( GL_BLEND,    osg::StateAttribute::ON  | osg::StateAttribute::OVERRIDE );
-    s->setMode( GL_LIGHTING, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE );
-
-    // turn off texturing:
-    for( int ii = 0; ii < Registry::instance()->getCapabilities().getMaxFFPTextureUnits(); ++ii )
-    {
-        s->setTextureMode( ii, GL_TEXTURE_2D, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE );
-        s->setTextureMode( ii, GL_TEXTURE_3D, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE );
-        //sset->setTextureMode( ii, GL_TEXTURE_RECTANGLE, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE );
-        //sset->setTextureMode( ii, GL_TEXTURE_CUBE_MAP, osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE );
-    }
-
-    // make it a nice transparent color
-    // careful, the ghost is a "shallow copy" of the original, so don't go modifying any buffer objects!
-    // (replacing them is OK though.)
-    ColorReplacer replacer(osg::Vec4f(0.5f, 0.5f, 1.0f, 0.35f));
-    node->accept( replacer );
-
-    return node;
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/FlatteningLayer osgearth-2.10.2+dfsg/src/osgEarthUtil/FlatteningLayer
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/FlatteningLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/FlatteningLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -80,12 +80,11 @@
         Config getConfig() const
         {
             Config conf = ElevationLayerOptions::getConfig();
-            conf.key() = "flattened_elevation";
-            conf.addObjIfSet("features",  _featureSource);
-            conf.addIfSet("feature_source", _featureSourceLayer);
-            conf.addObjIfSet("line_width", _lineWidth);
-            conf.addObjIfSet("buffer_width", _bufferWidth);
-            conf.addIfSet("fill", _fill);
+            conf.set("features",  _featureSource);
+            conf.set("feature_source", _featureSourceLayer);
+            conf.set("line_width", _lineWidth);
+            conf.set("buffer_width", _bufferWidth);
+            conf.set("fill", _fill);
 
             if ( _script.valid() )
             {
@@ -100,7 +99,7 @@
                 if ( !_script->profile.empty() )
                     scriptConf.set( "profile", _script->profile );
                 else if ( !_script->code.empty() )
-                    scriptConf.value() = _script->code;
+                    scriptConf.setValue(_script->code);
 
                 conf.add( scriptConf );
             }
@@ -113,11 +112,11 @@
         {
             URIContext uriContext = URIContext( conf.referrer() );
 
-            conf.getObjIfSet("features",  _featureSource);
-            conf.getIfSet("feature_source", _featureSourceLayer);
-            conf.getObjIfSet("line_width", _lineWidth);
-            conf.getObjIfSet("buffer_width", _bufferWidth);
-            conf.getIfSet("fill", _fill);
+            conf.get("features",  _featureSource);
+            conf.get("feature_source", _featureSourceLayer);
+            conf.get("line_width", _lineWidth);
+            conf.get("buffer_width", _bufferWidth);
+            conf.get("fill", _fill);
 
             // TODO:  Separate out ScriptDef from Stylesheet and include it as a standalone class, along with this loading code.
             ConfigSet scripts = conf.children( "script" );
@@ -165,7 +164,7 @@
     class OSGEARTHUTIL_EXPORT FlatteningLayer : public ElevationLayer
     {
     public:
-        META_Layer(osgEarth, FlatteningLayer, FlatteningLayerOptions);
+        META_Layer(osgEarth, FlatteningLayer, FlatteningLayerOptions, flattened_elevation);
 
         // Create a layer with initial options.
         FlatteningLayer(const FlatteningLayerOptions& options = FlatteningLayerOptions());
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/FlatteningLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/FlatteningLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/FlatteningLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/FlatteningLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,13 +19,7 @@
 #include <osgEarthUtil/FlatteningLayer>
 #include <osgEarth/Registry>
 #include <osgEarth/HeightFieldUtils>
-#include <osgEarth/Map>
-#include <osgEarth/Progress>
-#include <osgEarth/Utils>
 #include <osgEarthFeatures/FeatureCursor>
-#include <osgEarthFeatures/GeometryUtils>
-#include <osgEarthFeatures/FilterContext>
-#include <osgEarthSymbology/Query>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
@@ -61,7 +55,7 @@
     // clamp "a" to [lo..hi].
     double inline clamp(double a, double lo, double hi)
     {
-        return std::max(std::min(a, hi), lo);
+        return osg::maximum(osg::minimum(a, hi), lo);
     }
 
     typedef osg::Vec3d POINT;
@@ -90,7 +84,7 @@
     // This will not always work with polygons that contain holes,
     // so we need to come up with a different algorithm if this becomes a problem.
     // Maybe try a random point generator and profile it.
-    osg::Vec3d inline getInternalPoint(const Polygon* p)
+    osg::Vec3d inline getInternalPoint(const Symbology::Polygon* p)
     {
         // Simple test: if the centroid is in the polygon, use it.
         osg::Vec3d centroid = p->getBounds().center();
@@ -158,7 +152,7 @@
         return p->getBounds().center();
     }
 
-    double getDistanceSquaredToClosestEdge(const osg::Vec3d& P, const Polygon* poly)
+    double getDistanceSquaredToClosestEdge(const osg::Vec3d& P, const Symbology::Polygon* poly)
     {        
         double Dmin = DBL_MAX;
         ConstSegmentIterator segIter(poly, true);
@@ -233,7 +227,7 @@
                 double minD2 = DBL_MAX;//bufferWidth * bufferWidth; // minimum distance(squared) to closest polygon edge
                 double bufferWidth = 0.0;
 
-                const Polygon* bestPoly = 0L;
+                const Symbology::Polygon* bestPoly = 0L;
 
                 for (unsigned int geomIndex = 0; geomIndex < geom->getNumComponents(); geomIndex++)
                 {
@@ -242,7 +236,7 @@
                     ConstGeometryIterator giter(component, false);
                     while (giter.hasMore() && !done)
                     {
-                        const Polygon* polygon = dynamic_cast<const Polygon*>(giter.next());
+                        const Symbology::Polygon* polygon = dynamic_cast<const Symbology::Polygon*>(giter.next());
                         if (polygon)
                         {
                             // Does the point P fall within the polygon?
@@ -867,7 +861,7 @@
             Query query;        
             query.tileKey() = *i;
 
-            osg::ref_ptr<FeatureCursor> cursor = _featureSource->createFeatureCursor(query);
+            osg::ref_ptr<FeatureCursor> cursor = _featureSource->createFeatureCursor(query, progress);
             while (cursor.valid() && cursor->hasMore())
             {
                 Feature* feature = cursor->nextFeature();
@@ -915,7 +909,7 @@
         query.bounds() = queryExtent.bounds();
 
         // Run the query and fill the list.
-        osg::ref_ptr<FeatureCursor> cursor = _featureSource->createFeatureCursor(query);
+        osg::ref_ptr<FeatureCursor> cursor = _featureSource->createFeatureCursor(query, progress);
         while (cursor.valid() && cursor->hasMore())
         {
             Feature* feature = cursor->nextFeature();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Fog osgearth-2.10.2+dfsg/src/osgEarthUtil/Fog
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Fog	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Fog	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -65,7 +65,7 @@
         void attach(osg::StateSet* stateSet );
 
         /**
-         * Detatches this FogEffect from the given StateSet
+         * Detaches this FogEffect from the given StateSet
          */
         void detach(osg::StateSet* stateSet );
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Fog.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/Fog.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Fog.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Fog.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -23,9 +23,6 @@
 #include <osg/Fog>
 #include <osgEarthUtil/Shaders>
 #include <osgEarth/Registry>
-#include <osgEarth/Capabilities>
-#include <osgEarth/VirtualProgram>
-#include <osgEarth/TerrainEngineNode>
 
 #define LC "[Fog] "
 
@@ -69,6 +66,7 @@
 void FogEffect::attach( osg::StateSet* stateSet )
 {
     VirtualProgram* vp = VirtualProgram::getOrCreate( stateSet );
+    vp->setName("Fog");
     Shaders pkg;
     pkg.load( vp, pkg.Fog_Vertex );
     pkg.load( vp, pkg.Fog_Fragment );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Formatter osgearth-2.10.2+dfsg/src/osgEarthUtil/Formatter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Formatter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Formatter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/FractalElevationLayer osgearth-2.10.2+dfsg/src/osgEarthUtil/FractalElevationLayer
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/FractalElevationLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/FractalElevationLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -107,7 +107,7 @@
     class OSGEARTHUTIL_EXPORT FractalElevationLayer : public ElevationLayer
     {
     public:
-        META_Layer(osgEarth, FractalElevationLayer, FractalElevationLayerOptions);
+        META_Layer(osgEarth, FractalElevationLayer, FractalElevationLayerOptions, fractal_elevation);
 
         //! Create a blank layer to be configurated through options().
         FractalElevationLayer();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/FractalElevationLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/FractalElevationLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/FractalElevationLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/FractalElevationLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,10 +18,7 @@
  */
 #include <osgEarthUtil/FractalElevationLayer>
 #include <osgEarth/HeightFieldUtils>
-#include <osgEarth/Map>
-#include <osgEarth/ImageUtils>
 #include <osgEarth/SimplexNoise>
-#include <cstdlib> // for getenv
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
@@ -84,12 +81,12 @@
 void
 FractalElevationLayerOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet("base_lod", _baseLOD);
-    conf.getIfSet("amplitude", _amplitude);
-    conf.getIfSet("frequency", _frequency);
-    conf.getIfSet("persistence", _persistence);
-    conf.getIfSet("lacunarity", _lacunarity);
-    conf.getIfSet("noise_image", _noiseImageURI);
+    conf.get("base_lod", _baseLOD);
+    conf.get("amplitude", _amplitude);
+    conf.get("frequency", _frequency);
+    conf.get("persistence", _persistence);
+    conf.get("lacunarity", _lacunarity);
+    conf.get("noise_image", _noiseImageURI);
 
     const ConfigSet& lcmap = conf.child("land_cover_mappings").children();
     for (ConfigSet::const_iterator i = lcmap.begin(); i != lcmap.end(); ++i)
@@ -97,7 +94,7 @@
         const Config& mapping = *i;
         FractalElevationLayerLandCoverMapping m;
         m.className = mapping.value("class");
-        mapping.getIfSet("amplitude", m.amplitude);
+        mapping.get("amplitude", m.amplitude);
         if (!m.className.empty() && m.amplitude.isSet())
             _lcMap[m.className] = m;
     }
@@ -107,13 +104,12 @@
 FractalElevationLayerOptions::getConfig() const
 {
     Config conf = ElevationLayerOptions::getConfig();
-    conf.key() = "fractal_elevation";
-    conf.addIfSet("base_lod", _baseLOD);
-    conf.addIfSet("amplitude", _amplitude);
-    conf.addIfSet("frequency", _frequency);
-    conf.addIfSet("persistence", _persistence);
-    conf.addIfSet("lacunarity", _lacunarity);
-    conf.addIfSet("noise_image", _noiseImageURI);
+    conf.set("base_lod", _baseLOD);
+    conf.set("amplitude", _amplitude);
+    conf.set("frequency", _frequency);
+    conf.set("persistence", _persistence);
+    conf.set("lacunarity", _lacunarity);
+    conf.set("noise_image", _noiseImageURI);
 
     if (!_lcMap.empty())
     {
@@ -125,7 +121,7 @@
             mapping.set("amplitude", i->second.amplitude.get());
             mappings.add(mapping);
         }
-        conf.add(mappings);
+        conf.set(mappings);
     }
 
     return conf;
@@ -336,10 +332,10 @@
             if (_debug)
             {
                 h_mean += hf->getHeight(s, t);
-                min_n = std::min(min_n, n);
-                max_n = std::max(max_n, n);
-                min_h = std::min(min_h, (double)hf->getHeight(s, t));
-                max_h = std::max(max_h, (double)hf->getHeight(s, t));
+                min_n = osg::minimum(min_n, n);
+                max_n = osg::maximum(max_n, n);
+                min_h = osg::minimum(min_h, (double)hf->getHeight(s, t));
+                max_h = osg::maximum(max_h, (double)hf->getHeight(s, t));
             }
         }
     }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GammaColorFilter osgearth-2.10.2+dfsg/src/osgEarthUtil/GammaColorFilter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GammaColorFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GammaColorFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GammaColorFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/GammaColorFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GammaColorFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GammaColorFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GARSGraticule osgearth-2.10.2+dfsg/src/osgEarthUtil/GARSGraticule
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GARSGraticule	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GARSGraticule	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -19,11 +19,9 @@
 #ifndef OSGEARTHANNOTATION_GARS_GRATICLE
 #define OSGEARTHANNOTATION_GARS_GRATICLE
 
-#include <osgEarth/Extension>
 #include <osgEarth/VisibleLayer>
 #include <osgEarthUtil/Common>
 #include <osgEarthSymbology/Style>
-#include <osg/ClipPlane>
 
 namespace osgEarth { namespace Util
 {
@@ -48,22 +46,21 @@
     public:
         virtual Config getConfig() const {
             Config conf = VisibleLayerOptions::getConfig();
-            conf.key() = "gars_graticule";
-            conf.addObjIfSet("style", _style);
+            conf.set("style", _style);
             return conf;
         }
 
-        virtual void fromConfig(const Config& conf) {
-            conf.getObjIfSet("style", _style);
-        }
-
     protected:
         optional<Style> _style;
 
-        void mergeConfig(const Config& conf) {
+        virtual void mergeConfig(const Config& conf) {
             VisibleLayerOptions::mergeConfig(conf);
             fromConfig(conf);
         }
+
+        void fromConfig(const Config& conf) {
+            conf.get("style", _style);
+        }
     };
 
     /**
@@ -73,7 +70,7 @@
     class OSGEARTHUTIL_EXPORT GARSGraticule : public VisibleLayer
     {
     public:
-        META_Layer(osgEarthUtil, GARSGraticule, GARSGraticuleOptions);
+        META_Layer(osgEarthUtil, GARSGraticule, GARSGraticuleOptions, gars_graticule);
 
         //! Construct a default GARS graticule
         GARSGraticule();
@@ -90,7 +87,7 @@
 
         virtual void removedFromMap(const Map* map);
         
-        virtual osg::Node* getOrCreateNode();
+        virtual osg::Node* getNode() const;
 
         virtual void init();
 
@@ -101,13 +98,11 @@
 
     private:
 
-        void setUpDefaultStyles();
         void rebuild();
         void build30MinCells();
 
         UID _uid;
         osg::ref_ptr<const Profile> _profile;
-        osg::ref_ptr<osg::ClipPlane> _clipPlane;
         osg::ref_ptr<osg::Group> _root;
     };  
 } } // namespace osgEarth::Util
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GARSGraticule.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/GARSGraticule.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GARSGraticule.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GARSGraticule.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,8 +18,10 @@
  */
 #include <osgEarthUtil/GARSGraticule>
 #include <osgEarthAnnotation/FeatureNode>
-#include <osgEarthFeatures/Feature>
+#include <osgEarthFeatures/TextSymbolizer>
 #include <osgEarth/PagedNode>
+#include <osgEarth/GLUtils>
+#include <osgEarth/Text>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
@@ -185,32 +187,43 @@
         _extent.getCentroid(lon, lat);
         std::string label = getGARSLabel(lon, lat, _level);
     
-        FeatureNode* featureNode = new FeatureNode(0L, features, style);
+        FeatureNode* featureNode = new FeatureNode(features, style);
         // Add the node to the attachpoint.
         _attachPoint->addChild(featureNode);
        
-        GeoPoint centroid(_extent.getSRS(), lon, lat, 1000.0);
-        GeoPoint west(_extent.getSRS(), _extent.west(), lat, 0.0);
-        GeoPoint east(_extent.getSRS(), _extent.east(), lat, 0.0);   
-        double widthInMeters = west.distanceTo(east);
-
-        osgText::Text* text = new osgText::Text;
-        text->setFont(osgText::readRefFontFile("arial.ttf"));
-        text->setText(label);
-
-        text->setCharacterSize(widthInMeters / (double)label.size());
-        text->setAlignment(osgText::Text::CENTER_CENTER);
-        osg::Geode* textGeode = new osg::Geode;
-        textGeode->addDrawable(text);
+        GeoPoint centroid(_extent.getSRS(), lon, lat, 0.0f);
+        GeoPoint ll(_extent.getSRS(), _extent.west(), _extent.south(), 0.0f);
+
+        const TextSymbol* textSymPrototype = style.get<TextSymbol>();
+        osg::ref_ptr<TextSymbol> textSym = textSymPrototype ? new TextSymbol(*textSymPrototype) : new TextSymbol();
+
+        if (textSym->size().isSet() == false)
+            textSym->size() = 32.0f;
+
+        if (textSym->alignment().isSet() == false)
+            textSym->alignment() = textSym->ALIGN_LEFT_BASE_LINE;
+
+        TextSymbolizer symbolizer(textSym.get());                
+
+        osgText::Text* text = new osgEarth::Text(label);
+        symbolizer.apply(text);
+        text->setCharacterSizeMode(osgText::Text::SCREEN_COORDS);
+        //text->getOrCreateStateSet()->setRenderBinToInherit();
+
+        //osg::Geode* textGeode = new osg::Geode;
+        //textGeode->addDrawable(text);
 
         osg::MatrixTransform* mt = new osg::MatrixTransform;
-        mt->addChild(textGeode);
+        mt->addChild(text);
 
+        // Position the label at the bottom left of the grid cell.
         osg::Matrixd local2World;
-        centroid.createLocalToWorld(local2World);
+        ll.createLocalToWorld(local2World);
         mt->setMatrix(local2World);
 
        _attachPoint->addChild(mt);
+
+       //Registry::shaderGenerator().run(this, Registry::stateSetCache());
     }
 
     osg::BoundingSphere GridNode::getChildBound() const
@@ -312,20 +325,31 @@
 
     osg::StateSet* ss = this->getOrCreateStateSet();
     ss->setMode( GL_DEPTH_TEST, 0 );
-    ss->setMode( GL_LIGHTING, 0 );
+    GLUtils::setLighting(ss, 0);
     ss->setMode( GL_BLEND, 1 );
 
+
     // force it to render after the terrain.
     ss->setRenderBinDetails(1, "RenderBin");
     
     if (options().style().isSet() == false)
     {
         options().style()->getOrCreateSymbol<LineSymbol>()->stroke()->color() = Color::Blue;
-        options().style()->getOrCreateSymbol<LineSymbol>()->tessellation() = 20;
+        options().style()->getOrCreateSymbol<LineSymbol>()->tessellation() = 10;
     }
 
+    // Always use draping.
+    // Note: since we use draping we do NOT need to activate a horizon clip plane!
     options().style()->getOrCreateSymbol<AltitudeSymbol>()->clamping() = AltitudeSymbol::CLAMP_TO_TERRAIN;
     options().style()->getOrCreateSymbol<AltitudeSymbol>()->technique() = AltitudeSymbol::TECHNIQUE_DRAPE;
+
+    _root = new osg::Group();
+    //_root->getOrCreateStateSet()->setAttribute(new osg::Program(), osg::StateAttribute::OFF);
+
+    if (getEnabled() == true)
+    {
+        rebuild();
+    }
 }
 
 void
@@ -341,15 +365,8 @@
 }
 
 osg::Node*
-GARSGraticule::getOrCreateNode()
+GARSGraticule::getNode() const
 {
-    if (_root.valid() == false)
-    {
-        _root = new osg::Group();
-        _root->getOrCreateStateSet()->setAttribute(new osg::Program(), osg::StateAttribute::OFF);
-        rebuild();
-    }
-
     return _root.get();
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GeodeticGraticule osgearth-2.10.2+dfsg/src/osgEarthUtil/GeodeticGraticule
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GeodeticGraticule	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GeodeticGraticule	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -21,8 +21,8 @@
 
 #include <osgEarthUtil/Common>
 #include <osgEarthUtil/LatLongFormatter>
+#include <osgEarthUtil/GeodeticLabelingEngine>
 #include <osgEarth/VisibleLayer>
-#include <osgEarth/TerrainEffect>
 #include <osgEarth/MapNode>
 #include <osgEarthSymbology/Style>
 #include <osgEarthAnnotation/LabelNode>
@@ -42,9 +42,13 @@
         optional<Color>& color() { return _color; }
         const optional<Color>& color() const { return _color; }
 
-        //! Label color
-        optional<Color>& labelColor() { return _labelColor; }
-        const optional<Color>& labelColor() const { return _labelColor; }
+        //! Style for grid labels
+        optional<Style>& gridLabelStyle() { return _gridLabelStyle; }
+        const optional<Style>& gridLabelStyle() const { return _gridLabelStyle; }
+
+        //! Style for edge labels
+        optional<Style>& edgeLabelStyle() { return _edgeLabelStyle; }
+        const optional<Style>& edgeLabelStyle() const { return _edgeLabelStyle; }
 
         //! Grid line width in pixels
         optional<float>& lineWidth() { return _lineWidth; }
@@ -60,25 +64,45 @@
         optional<std::string>& resolutions() { return _resolutions; }
         const optional<std::string>& resolutions() const { return _resolutions; }
 
+        optional<bool>& gridLinesVisible() { return _gridLinesVisible; }
+        const optional<bool>& gridLinesVisible() const { return _gridLinesVisible; }
+
+        optional<bool>& gridLabelsVisible() { return _gridLabelsVisible; }
+        const optional<bool>& gridLabelsVisible() const { return _gridLabelsVisible; }
+
+        optional<bool>& edgeLabelsVisible() { return _edgeLabelsVisible; }
+        const optional<bool>& edgeLabelsVisible() const { return _edgeLabelsVisible; }
+
     public:
         GeodeticGraticuleOptions(const ConfigOptions& opt =ConfigOptions()) : VisibleLayerOptions( opt )
         {
             _lineWidth.init(2.0f);
             _color.init(Color(Color::Yellow, 0.5f));
-            _labelColor.init(Color::White);
             _gridLines.init(10);
+            _gridLinesVisible.init(true);
+            _gridLabelsVisible.init(true);
+            _edgeLabelsVisible.init(true);
+            _resolutions.init("10 5 2.5 1.0 0.5 0.25 0.125 0.0625 0.3125");
+            Style labelStyle;
+            TextSymbol* t = labelStyle.getOrCreate<TextSymbol>();
+            t->fill()->color().set(1,1,1,1);
+            _gridLabelStyle.init(labelStyle);
+            _edgeLabelStyle.init(labelStyle);
             fromConfig( _conf );
         }
 
     public:
         virtual Config getConfig() const {
             Config conf = VisibleLayerOptions::getConfig();
-            conf.key() = "geodetic_graticule";
-            conf.addIfSet("line_width", _lineWidth);
-            conf.addIfSet("color",      _color);
-            conf.addIfSet("label_color", _labelColor );
-            conf.addIfSet("grid_lines", _gridLines);
-            conf.addIfSet("resolutions", _resolutions);
+            conf.set("line_width", _lineWidth);
+            conf.set("color", _color);
+            conf.set("grid_lines", _gridLines);
+            conf.set("resolutions", _resolutions);
+            conf.set("grid_lines_visible", _gridLinesVisible);
+            conf.set("grid_labels_visible", _gridLabelsVisible);
+            conf.set("edge_labels_visible", _edgeLabelsVisible);
+            conf.set("grid_label_style", _gridLabelStyle);
+            conf.set("edge_label_style", _edgeLabelStyle);
             return conf;
         }
 
@@ -89,18 +113,26 @@
         }
 
         void fromConfig( const Config& conf ) {
-            conf.getIfSet("line_width", _lineWidth);
-            conf.getIfSet("color",      _color);
-            conf.getIfSet("label_color", _labelColor);
-            conf.getIfSet("grid_lines", _gridLines);
-            conf.getIfSet("resolutions", _resolutions);
+            conf.get("line_width", _lineWidth);
+            conf.get("color", _color);
+            conf.get("grid_lines", _gridLines);
+            conf.get("resolutions", _resolutions);
+            conf.get("grid_lines_visible", _gridLinesVisible);
+            conf.get("grid_labels_visible", _gridLabelsVisible);
+            conf.get("edge_labels_visible", _edgeLabelsVisible);
+            conf.get("grid_label_style", _gridLabelStyle);
+            conf.get("edge_label_style", _edgeLabelStyle);
         }
 
         optional<float>       _lineWidth;
         optional<Color>       _color;
-        optional<Color>       _labelColor;
         optional<int>         _gridLines;
         optional<std::string> _resolutions;
+        optional<bool>        _gridLinesVisible;
+        optional<bool>        _gridLabelsVisible;
+        optional<bool>        _edgeLabelsVisible;
+        optional<Style>       _gridLabelStyle;
+        optional<Style>       _edgeLabelStyle;
     };
 
 
@@ -110,7 +142,7 @@
     class OSGEARTHUTIL_EXPORT GeodeticGraticule : public VisibleLayer
     {
     public:
-        META_Layer(osgEarthUtil, GeodeticGraticule, GeodeticGraticuleOptions);
+        META_Layer(osgEarthUtil, GeodeticGraticule, GeodeticGraticuleOptions, geodetic_graticule);
 
         //! Construct a graticule with default settings.
         GeodeticGraticule();
@@ -121,13 +153,39 @@
         //! Rebuild the graticule after changing options.
         void dirty();
 
+        //! Get whether to show the grid lines
+        bool getGridLinesVisible() const;
+
+        //! Set whether to show the grid lines
+        void setGridLinesVisible(bool gridLinesVisible);
+
+        //! Get whether to show the grid labels
+        bool getGridLabelsVisible() const;
+
+        //! Set whether to show the grid labels
+        void setGridLabelsVisible(bool gridLabelsVisible);
+
+        //! Get whether to show the edge labels
+        bool getEdgeLabelsVisible() const;
+
+        //! Set whether to show the edge labels
+        void setEdgeLabelsVisible(bool edgeLabelsVisible);
+
+        //! Set the styling to use for grid labels
+        void setGridLabelStyle(const Style& style);
+        const Style& getGridLabelStyle() const { return options().gridLabelStyle().get(); }
+
+        //! Set ths styling to use for edge labels
+        void setEdgeLabelStyle(const Style& style);
+        const Style& getEdgeLabelStyle() const { return options().edgeLabelStyle().get(); }
+
     public: // Layer
 
         virtual void addedToMap(const Map* map);
 
         virtual void removedFromMap(const Map* map);
-        
-        virtual osg::Node* getOrCreateNode();
+
+        virtual osg::Node* getNode() const;
 
         virtual void init();
 
@@ -135,39 +193,33 @@
 
         virtual void setVisible(bool value);
 
+    public: // osg::Object
+
+        virtual void resizeGLObjectBuffers(unsigned maxSize);
+
+        virtual void releaseGLObjects(osg::State* state) const;
+
     protected:
 
         /** dtor */
-        virtual ~GeodeticGraticule() { }      
+        virtual ~GeodeticGraticule() { }
 
     private:
 
-        void setUpDefaultStyles();
-
         void rebuild();
 
-        UID _uid;
+        void updateGridLineVisibility();
 
+        UID _uid;
         osg::ref_ptr<const Profile> _profile;
-
-        osg::ref_ptr<osg::ClipPlane> _clipPlane;
-
         osg::ref_ptr<osg::Group> _root;
-
-        osg::observer_ptr<const Map> _map;
-        osg::ref_ptr<TerrainEffect> _effect;
+        osg::ref_ptr<const SpatialReference> _mapSRS;
         osg::ref_ptr<osg::NodeCallback > _callback;
         osg::ref_ptr<LatLongFormatter> _formatter;
         float _defaultResolution;
-        
         osg::Vec2f _centerOffset;
-
-        bool _visible;
-        
-
         std::vector< double > _resolutions;
 
-
         struct CameraData
         {
             osg::ref_ptr<osg::StateSet> _stateset;
@@ -175,38 +227,46 @@
             osg::ref_ptr<osg::StateSet> _labelStateset;
             std::vector< osg::ref_ptr<LabelNode> > _labelPool;
             float _resolution;
-            osg::Matrixd _lastViewMatrix;     
+            osg::Matrixd _lastViewMatrix;
             GeoExtent _viewExtent;
             double _lon;
             double _lat;
             double _metersPerPixel;
+            void releaseGLObjects(osg::State*) const;
+            ~CameraData();
         };
         typedef std::map<osg::Camera*, CameraData> CameraDataMap;
         mutable CameraDataMap _cameraDataMap;
         mutable Threading::Mutex _cameraDataMapMutex;
-        
-        CameraData& getCameraData(osg::Camera*) const;
 
-        double getResolution() const;
-        void setResolution(double resolution);
+        CameraData& getCameraData(osg::Camera*) const;
 
         void initLabelPool(CameraData&);
 
         std::string getText(const GeoPoint& location, bool lat);
 
-        osg::ref_ptr<MapNode> _mapNode;
-
-        void installEffect();
-        void removeEffect();
+        GeodeticLabelingEngine* _labelingEngine;
 
         GeoExtent getViewExtent(osgUtil::CullVisitor*) const;
 
+
     public:
-        
+
         void updateLabels();
         void cull(osgUtil::CullVisitor*);
         osg::StateSet* getStateSet(osgUtil::CullVisitor* cv);
-    };  
+
+    private:
+        osg::observer_ptr<MapNode> _mapNode;
+        void setMapNode(MapNode*);
+
+        struct MyGroup : public osg::Group {
+            MyGroup(GeodeticGraticule*);
+            GeodeticGraticule* _graticule;
+            void traverse(osg::NodeVisitor& nv); 
+        };
+        friend struct MyGroup;
+    };
 } } // namespace osgEarth::Util
 
 #endif // OSGEARTHUTIL_GEODETIC_GRATICULE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GeodeticGraticule.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/GeodeticGraticule.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GeodeticGraticule.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GeodeticGraticule.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,11 +22,7 @@
 #include <osgEarth/Registry>
 #include <osgEarth/NodeUtils>
 #include <osgEarth/TerrainEngineNode>
-#include <osgEarth/Terrain>
 
-#include <osg/Depth>
-#include <osg/ClipNode>
-#include <osg/ClipPlane>
 
 #define LC "[GeodeticGraticule] "
 
@@ -38,46 +34,39 @@
 
 REGISTER_OSGEARTH_LAYER(geodetic_graticule, GeodeticGraticule);
 
-namespace
-{
-    // Helper class to find a MapNode and set it in the graticule 
-    // so it can install the terrain effect.
-    struct MyGroup : public osg::Group
-    {
-        GeodeticGraticule* _grat;
-        osg::ref_ptr<MapNode>& _mapNode;
 
-        MyGroup(GeodeticGraticule* grat, osg::ref_ptr<MapNode>& mapNode)
-            : _grat(grat), _mapNode(mapNode)
-        {
-            // Require an update traversal to udpate the labels.
-            setNumChildrenRequiringUpdateTraversal(1);
-        }
+GeodeticGraticule::MyGroup::MyGroup(GeodeticGraticule* grat) :
+_graticule(grat)
+{
+    ADJUST_UPDATE_TRAV_COUNT(this, +1);
+}
 
-        void traverse(osg::NodeVisitor& nv)
+void
+GeodeticGraticule::MyGroup::traverse(osg::NodeVisitor& nv)
+{
+    if (nv.getVisitorType() == nv.UPDATE_VISITOR)
+    {
+        if (_graticule->_mapNode.valid() == false)
         {
-            if (nv.getVisitorType() == nv.UPDATE_VISITOR)
+            MapNode* mapNode = osgEarth::findInNodePath<MapNode>(nv);
+            if (mapNode)
             {
-                if (_mapNode.valid() == false)
-                {
-                    _mapNode = osgEarth::findInNodePath<MapNode>(nv);
-                    if (_mapNode.valid() == true)
-                    {
-                        _grat->dirty();
-                    }
-                }
-                _grat->updateLabels();
+                _graticule->setMapNode(mapNode);
             }
+        }
+        _graticule->updateLabels();
+    }
 
-            else if (nv.getVisitorType() == nv.CULL_VISITOR)
-            {
-                _grat->cull(static_cast<osgUtil::CullVisitor*>(&nv));
-            }
+    else if (nv.getVisitorType() == nv.CULL_VISITOR)
+    {
+        _graticule->cull(static_cast<osgUtil::CullVisitor*>(&nv));
+    }
 
-            osg::Group::traverse(nv);
-        }
-    };
+    osg::Group::traverse(nv);
+}
 
+namespace
+{
     // Cull callback installed on the terrain that applies
     // a stateset for the proper camera.
     struct GraticuleTerrainCallback : public osg::NodeCallback
@@ -111,7 +100,7 @@
     };
 
     const char* textFadeFS =
-        "#version 330\n"
+        "#version " GLSL_VERSION_STR "\n"
         "uniform mat4 osg_ViewMatrixInverse;\n"
         "void oe_GeodeticGraticule_text_frag(inout vec4 color) { \n"
         "    const float maxHAE = 4000.0;\n"
@@ -122,6 +111,10 @@
         "}\n";
 }
 
+#define RESOLUTION_UNIFORM "oe_GeodeticGraticule_resolution"
+#define COLOR_UNIFORM "oe_GeodeticGraticule_color"
+#define WIDTH_UNIFORM "oe_GeodeticGraticule_lineWidth"
+
 
 GeodeticGraticule::GeodeticGraticule() :
 VisibleLayer(&_optionsConcrete),
@@ -163,7 +156,7 @@
         for (unsigned int i = 0; i < tokens.size(); i++)
         {
             double r = as<double>(tokens[i], -1.0);
-            if (r > 0) 
+            if (r > 0)
             {
                 _resolutions.push_back( r );
             }
@@ -193,40 +186,39 @@
 
     // Initialize the formatter
     _formatter = new LatLongFormatter(osgEarth::Util::LatLongFormatter::FORMAT_DEGREES_MINUTES_SECONDS_TERSE, LatLongFormatter::USE_SYMBOLS |LatLongFormatter::USE_PREFIXES);
+
+    _labelingEngine = 0L;
+    
+    _root = new MyGroup(this);
 }
 
 void
 GeodeticGraticule::addedToMap(const Map* map)
 {
-    _map = map;
-    rebuild();
+    if (map->isGeocentric())
+    {
+        _mapSRS = map->getSRS();
+        if (!_mapSRS.valid())
+            _mapSRS = SpatialReference::get("wgs84");
+
+        rebuild();
+    }
+    else
+    {
+        OE_WARN << LC << "Projected map not supported" << std::endl;
+    }
 }
 
 void
 GeodeticGraticule::removedFromMap(const Map* map)
 {
-    if (_mapNode.valid())
-    {
-        removeEffect();
-
-        if (_callback.valid())
-        {
-            _mapNode->getTerrainEngine()->removeCullCallback(_callback.get());
-            _callback = 0L;
-        }
-    }
-    _map = 0L;
+    setMapNode(NULL);
+    _mapSRS = NULL;
 }
 
 osg::Node*
-GeodeticGraticule::getOrCreateNode()
+GeodeticGraticule::getNode() const
 {
-    if (_root.valid() == false)
-    {
-        _root = new MyGroup(this, _mapNode);
-        rebuild();
-    }
-
     return _root.get();
 }
 
@@ -234,91 +226,147 @@
 GeodeticGraticule::setVisible(bool value)
 {
     VisibleLayer::setVisible(value);
-
-    if (getVisible())
-        installEffect();
-    else
-        removeEffect();
+    updateGridLineVisibility();
 }
 
 void
-GeodeticGraticule::rebuild()
+GeodeticGraticule::updateGridLineVisibility()
 {
-    // clear everything out
-    if (!_root.valid())
-        return;
-
-    // we must have the map node, if not, wait
-    if (_mapNode.valid() == false)
-        return;
-
-    // also need a map; if not, wait
-    osg::ref_ptr<const Map> map;
-    if (!_map.lock(map))
-        return;
-
-    // start from scratch
-    _root->removeChildren( 0, _root->getNumChildren() );
-
-    // requires a geocentric map
-    if ( !map->isGeocentric() )
+    osg::ref_ptr<MapNode> mapNode;
+    if (_mapNode.lock(mapNode))
     {
-        OE_WARN << LC << "Projected map mode is not yet supported" << std::endl;
-        return;
+        osg::StateSet* ss = mapNode->getTerrainEngine()->getSurfaceStateSet();
+        if (getVisible() && *_options->gridLinesVisible())
+        {
+            ss->removeDefine("OE_DISABLE_GRATICULE");
+        }
+        else
+        {
+            ss->setDefine("OE_DISABLE_GRATICULE");
+        }
     }
+}
 
-    if (!_callback.valid())
-    {
-        _callback = new GraticuleTerrainCallback(this);
-        _mapNode->getTerrainEngine()->addCullCallback(_callback.get());
-    }
+bool
+GeodeticGraticule::getGridLinesVisible() const
+{
+    return options().gridLinesVisible().get();
+}
 
-    setVisible(getVisible());
+void
+GeodeticGraticule::setGridLinesVisible(bool gridLinesVisible)
+{
+    options().gridLinesVisible() = gridLinesVisible;
+    updateGridLineVisibility();
 }
 
-#define RESOLUTION_UNIFORM "oe_GeodeticGraticule_resolution"
-#define COLOR_UNIFORM "oe_GeodeticGraticule_color"
-#define WIDTH_UNIFORM "oe_GeodeticGraticule_lineWidth"
+bool
+GeodeticGraticule::getGridLabelsVisible() const
+{
+    return options().gridLabelsVisible().get();
+}
 
 void
-GeodeticGraticule::installEffect()
+GeodeticGraticule::setGridLabelsVisible(bool gridLabelsVisible)
 {
-    if (_mapNode.valid() == false)
-        return;
+    options().gridLabelsVisible() = gridLabelsVisible;
+}
 
-    // shader components
-    osg::StateSet* stateset = _mapNode->getTerrainEngine()->getSurfaceStateSet();
-    VirtualProgram* vp = VirtualProgram::getOrCreate(stateset);
-
-    // configure shaders
-    Shaders package;
-    package.load(vp, package.Graticule_Vertex);
-    package.load(vp, package.Graticule_Fragment);
-    
-    stateset->addUniform(new osg::Uniform(COLOR_UNIFORM, options().color().get()));
-    stateset->addUniform(new osg::Uniform(WIDTH_UNIFORM, options().lineWidth().get()));
+bool
+GeodeticGraticule::getEdgeLabelsVisible() const
+{
+    return options().edgeLabelsVisible().get();
 }
 
 void
-GeodeticGraticule::removeEffect()
+GeodeticGraticule::setEdgeLabelsVisible(bool edgeLabelsVisible)
 {
-    if (_mapNode.valid() == false)
-        return;
+    options().edgeLabelsVisible() = edgeLabelsVisible;
+}
+
+void
+GeodeticGraticule::setGridLabelStyle(const Style& style)
+{
+    options().gridLabelStyle() = style;
+    rebuild();
+}
+
+void
+GeodeticGraticule::setEdgeLabelStyle(const Style& style)
+{
+    options().edgeLabelStyle() = style;
+    rebuild();
+}
 
-    osg::StateSet* stateset = _mapNode->getTerrainEngine()->getSurfaceStateSet();
-    if ( stateset )
+void
+GeodeticGraticule::setMapNode(MapNode* mapNode)
+{
+    osg::ref_ptr<MapNode> oldMapNode;
+    if (_mapNode.lock(oldMapNode))
     {
-        VirtualProgram* vp = VirtualProgram::get(stateset);
-        if ( vp )
+        osg::StateSet* stateset = oldMapNode->getTerrainEngine()->getSurfaceStateSet();
+        if ( stateset )
         {
-            Shaders package;
-            package.unload( vp, package.Graticule_Vertex );
-            package.unload( vp, package.Graticule_Fragment );
+            VirtualProgram* vp = VirtualProgram::get(stateset);
+            if ( vp )
+            {
+                Shaders package;
+                package.unload( vp, package.Graticule_Vertex );
+                package.unload( vp, package.Graticule_Fragment );
 
-            stateset->removeUniform( COLOR_UNIFORM );
-            stateset->removeUniform( WIDTH_UNIFORM );
+                stateset->removeUniform( COLOR_UNIFORM );
+                stateset->removeUniform( WIDTH_UNIFORM );
+            }
+        }
+
+        if (_callback.valid())
+        {
+            oldMapNode->getTerrainEngine()->removeCullCallback(_callback.get());
         }
     }
+
+    _mapNode = mapNode;
+
+    if (mapNode)
+    {
+        // shader components
+        osg::StateSet* stateset = mapNode->getTerrainEngine()->getSurfaceStateSet();
+        VirtualProgram* vp = VirtualProgram::getOrCreate(stateset);
+        vp->setName("GeodeticGraticule");
+
+        // configure shaders
+        Shaders package;
+        package.load(vp, package.Graticule_Vertex);
+        package.load(vp, package.Graticule_Fragment);
+
+        stateset->addUniform(new osg::Uniform(COLOR_UNIFORM, options().color().get()));
+        stateset->addUniform(new osg::Uniform(WIDTH_UNIFORM, options().lineWidth().get()));
+        updateGridLineVisibility();
+
+        _callback = new GraticuleTerrainCallback(this);
+        mapNode->getTerrainEngine()->addCullCallback(_callback.get());
+    }
+}
+
+void
+GeodeticGraticule::rebuild()
+{
+    // clear everything out
+    if (!_root.valid() || !_mapSRS.valid())
+        return;
+
+    // start from scratch
+    _root->removeChildren( 0, _root->getNumChildren() );
+
+    setVisible(getVisible());
+
+    _labelingEngine = new GeodeticLabelingEngine(_mapSRS.get());
+    _labelingEngine->setStyle(options().edgeLabelStyle().get());
+    _root->addChild(_labelingEngine);
+
+    // destroy all per-camera data so it can reinitialize itself
+    Threading::ScopedMutexLock lock(_cameraDataMapMutex);
+    _cameraDataMap.clear();
 }
 
 void
@@ -331,10 +379,14 @@
     CameraData& cdata = getCameraData(cv->getCurrentCamera());
 
     // Only update if the view matrix has changed.
-    if (viewMatrix != cdata._lastViewMatrix && _mapNode.valid())
+    if (viewMatrix != cdata._lastViewMatrix && _mapSRS.valid())
     {
+        osg::ref_ptr<MapNode> mapNode;
+        if (!_mapNode.lock(mapNode))
+            return;
+
         GeoPoint eyeGeo;
-        eyeGeo.fromWorld(_mapNode->getMapSRS(), vp);
+        eyeGeo.fromWorld(_mapSRS.get(), vp);
         cdata._lon = eyeGeo.x();
         cdata._lat = eyeGeo.y();
 
@@ -350,7 +402,7 @@
 
         // Try the center of the screen.
         osg::Vec3d focalPoint;
-        if (_mapNode->getTerrain()->getWorldCoordsUnderMouse(cv->getCurrentCamera()->getView(), centerX, centerY, focalPoint))
+        if (mapNode->getTerrain()->getWorldCoordsUnderMouse(cv->getCurrentCamera()->getView(), centerX, centerY, focalPoint))
         {
             hitValid = true;
         }
@@ -435,7 +487,7 @@
     osg::Matrixd mv = *cullVisitor->getModelViewMatrix();
     osg::Matrixd invmv = osg::Matrixd::inverse( mv );
 
-    // clamp the projection far plane so it's not on the other 
+    // clamp the projection far plane so it's not on the other
     // side of the globe
     osg::Vec3d eye = osg::Vec3d(0,0,0) * invmv;
 
@@ -444,7 +496,7 @@
     double nearPlane, farPlane;
     double nLeft, nRight, nTop, nBottom;
     double fLeft, fRight, fTop, fBottom;
-    
+
     if (osg::equivalent(proj(3,3), 1.0)) // ORTHOGRAPHIC
     {
         proj.getOrtho(nLeft, nRight, nBottom, nTop, nearPlane, farPlane);
@@ -462,11 +514,13 @@
     }
     else
     {
+        Horizon* h = Horizon::get(*cullVisitor);
         double f, a, zn, zf;
         proj.getPerspective(f,a,zn,zf);
-        zf = std::min(zf, eye.length()-1000.0);
+        zf = h->getDistanceToVisibleHorizon();
+        zn = zf * cullVisitor->getNearFarRatio();
         proj.makePerspective(f, a, zn, zf);
-       
+
         nearPlane = proj(3,2) / (proj(2,2)-1.0);
         farPlane = proj(3,2) / (1.0+proj(2,2));
 
@@ -512,7 +566,7 @@
     center.fromWorld(srs, bs.center());
 
     double radiusDegrees = bs.radius() / 111000.0;
-    
+
     // Try to clamp the maximum radius so far out views don't go wacky.
     radiusDegrees = osg::minimum(radiusDegrees, 90.0);
 
@@ -527,15 +581,21 @@
 }
 
 
-void 
+void
 GeodeticGraticule::updateLabels()
 {
+    if (!_labelingEngine)
+    {
+        OE_WARN << "LabelingEngine is not set" << std::endl;
+        return;
+    }
+
     const osgEarth::SpatialReference* srs = osgEarth::SpatialReference::create("wgs84");
-    
+
     Threading::ScopedMutexLock lock(_cameraDataMapMutex);
-    for (CameraDataMap::iterator i = _cameraDataMap.begin(); i != _cameraDataMap.end(); ++i)
+    for (CameraDataMap::iterator itr = _cameraDataMap.begin(); itr != _cameraDataMap.end(); ++itr)
     {
-        CameraData& cdata = i->second;
+        CameraData& cdata = itr->second;
 
         std::vector< GeoExtent > extents;
         if (cdata._viewExtent.crossesAntimeridian())
@@ -550,11 +610,15 @@
             extents.push_back( cdata._viewExtent );
         }
 
+        _labelingEngine->setResolution(cdata._resolution);
+
+        bool showSideLabels = *_options->edgeLabelsVisible() && cdata._resolution < 0.03;
+        _labelingEngine->setNodeMask(showSideLabels ? ~0u : 0);
+
         double resDegrees = cdata._resolution * 180.0;
         // We want half the resolution so the labels don't appear as often as the grid lines
         resDegrees *= 2.0;
 
-    
         // Hide all the labels
         for (unsigned int i = 0; i < cdata._labelPool.size(); i++)
         {
@@ -563,54 +627,58 @@
 
         // Approximate offset in degrees
         double degOffset = cdata._metersPerPixel / 111000.0;
-     
+
         unsigned int labelIndex = 0;
 
 
-        bool done = false;
-        for (unsigned int extentIndex = 0; extentIndex < extents.size() && !done; extentIndex++)
+        // Only show the centered labels if the side labels aren't visible.
+        if (*_options->gridLabelsVisible() && (!showSideLabels || !_labelingEngine->getVisible(itr->first)))
         {
-            GeoExtent extent = extents[extentIndex];
-
-            int minLonIndex = floor(((extent.xMin() + 180.0)/resDegrees));
-            int maxLonIndex = ceil(((extent.xMax() + 180.0)/resDegrees));
+            bool done = false;
+            for (unsigned int extentIndex = 0; extentIndex < extents.size() && !done; extentIndex++)
+            {
+                GeoExtent extent = extents[extentIndex];
 
-            int minLatIndex = floor(((extent.yMin() + 90)/resDegrees));
-            int maxLatIndex = ceil(((extent.yMax() + 90)/resDegrees));
+                int minLonIndex = floor(((extent.xMin() + 180.0) / resDegrees));
+                int maxLonIndex = ceil(((extent.xMax() + 180.0) / resDegrees));
 
-            // Generate horizontal labels
-            for (int i = minLonIndex; i <= maxLonIndex && !done; i++)
-            {
-                GeoPoint point(srs, -180.0 + (double)i * resDegrees, cdata._lat + (_centerOffset.y() * degOffset), 0, ALTMODE_ABSOLUTE);
-                LabelNode* label = cdata._labelPool[labelIndex++].get();
+                int minLatIndex = floor(((extent.yMin() + 90) / resDegrees));
+                int maxLatIndex = ceil(((extent.yMax() + 90) / resDegrees));
 
-                label->setNodeMask(~0u);
-                label->setPosition(point);
-                std::string text = getText( point, false);
-                label->setText( text );
-                if (labelIndex == cdata._labelPool.size() - 1)
+                // Generate horizontal labels
+                for (int i = minLonIndex; i <= maxLonIndex && !done; i++)
                 {
-                    done = true;
-                }
-            }
+                    GeoPoint point(srs, -180.0 + (double)i * resDegrees, cdata._lat + (_centerOffset.y() * degOffset), 0, ALTMODE_ABSOLUTE);
+                    LabelNode* label = cdata._labelPool[labelIndex++].get();
 
-            // Generate the vertical labels
-            for (int i = minLatIndex; i <= maxLatIndex && !done; i++)
-            {
-                GeoPoint point(srs, cdata._lon + (_centerOffset.x() * degOffset), -90.0 + (double)i * resDegrees, 0, ALTMODE_ABSOLUTE);
-                // Skip drawing labels at the poles
-                if (osg::equivalent(osg::absolute( point.y()), 90.0, 0.1))
-                {
-                    continue;
+                    label->setNodeMask(~0u);
+                    label->setPosition(point);
+                    std::string text = getText(point, false);
+                    label->setText(text);
+                    if (labelIndex == cdata._labelPool.size() - 1)
+                    {
+                        done = true;
+                    }
                 }
-                LabelNode* label = cdata._labelPool[labelIndex++].get();
-                label->setNodeMask(~0u);
-                label->setPosition(point);
-                std::string text = getText( point, true);
-                label->setText( text );
-                if (labelIndex == cdata._labelPool.size() - 1)
+
+                // Generate the vertical labels
+                for (int i = minLatIndex; i <= maxLatIndex && !done; i++)
                 {
-                    done = true;
+                    GeoPoint point(srs, cdata._lon + (_centerOffset.x() * degOffset), -90.0 + (double)i * resDegrees, 0, ALTMODE_ABSOLUTE);
+                    // Skip drawing labels at the poles
+                    if (osg::equivalent(osg::absolute(point.y()), 90.0, 0.1))
+                    {
+                        continue;
+                    }
+                    LabelNode* label = cdata._labelPool[labelIndex++].get();
+                    label->setNodeMask(~0u);
+                    label->setPosition(point);
+                    std::string text = getText(point, true);
+                    label->setText(text);
+                    if (labelIndex == cdata._labelPool.size() - 1)
+                    {
+                        done = true;
+                    }
                 }
             }
         }
@@ -637,6 +705,7 @@
 
         cdata._labelStateset = new osg::StateSet();
         VirtualProgram* vp = VirtualProgram::getOrCreate(cdata._labelStateset.get());
+        vp->setName("GeodeticGraticule Text");
         vp->setFunction("oe_GeodeticGraticule_text_frag", textFadeFS, ShaderComp::LOCATION_FRAGMENT_COLORING);
     }
 
@@ -645,31 +714,22 @@
 
 std::string
 GeodeticGraticule::getText(const GeoPoint& location, bool lat)
-{ 
+{
     double value = lat ? location.y() : location.x();
     return _formatter->format(value, lat);
 }
 
-
 void
 GeodeticGraticule::initLabelPool(CameraData& cdata)
 {
     const osgEarth::SpatialReference* srs = osgEarth::SpatialReference::create("wgs84");
 
-    Style style;
-    TextSymbol* text = style.getOrCreateSymbol<TextSymbol>();
-    text->alignment() = TextSymbol::ALIGN_CENTER_CENTER;
-    text->fill()->color() = options().labelColor().get();
-    AltitudeSymbol* alt = style.getOrCreateSymbol<AltitudeSymbol>();
-    alt->clamping() = AltitudeSymbol::CLAMP_TO_TERRAIN;
-
     unsigned int labelPoolSize = 8 * options().gridLines().get();
     for (unsigned int i = 0; i < labelPoolSize; i++)
     {
-        GeoPoint pt(srs, 0,0,0);
-        LabelNode* label = new LabelNode(_mapNode.get(), pt, "0,0");
+        LabelNode* label = new LabelNode("0,0");
         label->setDynamic(true);
-        label->setStyle(style);
+        label->setStyle(options().gridLabelStyle().get());
         cdata._labelPool.push_back(label);
     }
 }
@@ -680,3 +740,38 @@
     CameraData& cdata = getCameraData(cv->getCurrentCamera());
     return cdata._stateset.get();
 }
+
+void
+GeodeticGraticule::CameraData::releaseGLObjects(osg::State* state) const
+{
+    if (_stateset.valid())
+        _stateset->releaseGLObjects(state);
+    if (_labelStateset.valid())
+        _labelStateset->releaseGLObjects(state);
+    for(std::vector<osg::ref_ptr<LabelNode> >::const_iterator i = _labelPool.begin(); i != _labelPool.end(); ++i)
+        i->get()->releaseGLObjects(state);
+}
+
+GeodeticGraticule::CameraData::~CameraData()
+{
+    releaseGLObjects(NULL);
+}
+
+void
+GeodeticGraticule::resizeGLObjectBuffers(unsigned maxSize)
+{
+    VisibleLayer::resizeGLObjectBuffers(maxSize);
+}
+
+void
+GeodeticGraticule::releaseGLObjects(osg::State* state) const
+{
+    VisibleLayer::releaseGLObjects(state);
+
+    Threading::ScopedMutexLock lock(_cameraDataMapMutex);
+    for (CameraDataMap::iterator i = _cameraDataMap.begin(); i != _cameraDataMap.end(); ++i)
+    {
+        CameraData& data = i->second;
+        data.releaseGLObjects(state);
+    }
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GeodeticLabelingEngine osgearth-2.10.2+dfsg/src/osgEarthUtil/GeodeticLabelingEngine
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GeodeticLabelingEngine	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GeodeticLabelingEngine	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,63 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#ifndef OSGEARTH_UTIL_GEODETIC_LABELING_ENGINE_H
+#define OSGEARTH_UTIL_GEODETIC_LABELING_ENGINE_H 1
+
+#include <osgEarthUtil/Common>
+#include <osgEarthUtil/GraticuleLabelingEngine>
+#include <osgEarthUtil/LatLongFormatter>
+#include <osgEarth/GeoData>
+#include <osgEarth/MapNode>
+#include <osgEarth/Containers>
+#include <osgEarthAnnotation/LabelNode>
+
+namespace osgEarth { namespace Util
+{
+    using namespace osgEarth;
+    using namespace osgEarth::Annotation;
+
+    /**
+     * Node that plots geodetic coordinats labels along the edge of the
+     * viewport when you are looking straight down on a zoomed-in area.
+     */
+    class GeodeticLabelingEngine : public GraticuleLabelingEngine
+    {
+    public:
+        //! Construct a new labeling engine with the map's SRS
+        GeodeticLabelingEngine(const SpatialReference* srs);
+
+        virtual bool updateLabels(const osg::Vec3d& LL_world, osg::Vec3d& UL_world, osg::Vec3d& LR_world, ClipSpace& window, CameraData& data);
+
+        double getResolution() const;
+        void setResolution(double resolution);
+
+    protected:
+        std::string getText(const GeoPoint& location, bool lat);
+
+        double _resolution;
+
+        osg::ref_ptr<LatLongFormatter> _formatter;
+    };
+
+} } // namespace osgEarth::Util
+
+#endif // GeodeticLabelingEngine
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GeodeticLabelingEngine.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/GeodeticLabelingEngine.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GeodeticLabelingEngine.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GeodeticLabelingEngine.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,112 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#include "GeodeticLabelingEngine"
+
+#define LC "[GeodeticLabelingEngine] "
+
+using namespace osgEarth;
+using namespace osgEarth::Util;
+
+//........................................................................
+
+GeodeticLabelingEngine::GeodeticLabelingEngine(const SpatialReference* srs) :
+GraticuleLabelingEngine(srs),
+_resolution(10.0 / 180.0)
+{
+    _formatter = new LatLongFormatter(osgEarth::Util::LatLongFormatter::FORMAT_DEGREES_MINUTES_SECONDS_TERSE, LatLongFormatter::USE_SYMBOLS | LatLongFormatter::USE_PREFIXES);
+}
+
+double GeodeticLabelingEngine::getResolution() const
+{
+    return _resolution;
+}
+
+void GeodeticLabelingEngine::setResolution(double resolution)
+{
+    _resolution = resolution;
+}
+
+std::string
+GeodeticLabelingEngine::getText(const GeoPoint& location, bool lat)
+{
+    double value = lat ? location.y() : location.x();
+    return _formatter->format(value, lat);
+}
+
+bool
+GeodeticLabelingEngine::updateLabels(const osg::Vec3d& LL_world, osg::Vec3d& UL_world, osg::Vec3d& LR_world, ClipSpace& window, CameraData& data)
+{    
+    SpatialReference* wgs84 = SpatialReference::create("wgs84");
+
+    GeoPoint ll, ul, lr;
+    ll.fromWorld(wgs84, LL_world);
+    ul.fromWorld(wgs84, UL_world);
+    lr.fromWorld(wgs84, LR_world);
+
+    double resDegrees = _resolution * 180.0;
+
+    double minLon = osg::minimum(ll.x(), ul.x());
+    double maxLon = lr.x();
+    // Handle the case where the the extent crosses the dateline.
+    if (maxLon < minLon)
+    {
+        maxLon += 360.0;
+    }
+
+    double minLat = osg::minimum(osg::minimum(ll.y(), ul.y()), lr.y());
+    double maxLat = osg::maximum(osg::maximum(ll.y(), ul.y()), lr.y());
+
+    int minLonIndex = floor(((minLon + 180.0) / resDegrees));
+    int maxLonIndex = ceil(((maxLon + 180.0) / resDegrees));
+
+    int minLatIndex = floor(((minLat + 90) / resDegrees));
+    int maxLatIndex = ceil(((maxLat + 90) / resDegrees));
+
+    // Generate horizontal labels
+    unsigned int xi = 0;
+    for (int i = minLonIndex; i <= maxLonIndex; i++)
+    {
+        GeoPoint p(wgs84, -180.0 + (double)i * resDegrees, minLat, 0, ALTMODE_ABSOLUTE);
+        std::string text = getText(p, false);
+        window.clampToBottom(p); // also xforms to geographic
+        data.xLabels[xi]->setPosition(p);
+        data.xLabels[xi]->setText(text);
+        data.xLabels[xi]->setNodeMask(~0);
+        xi++;
+        if (xi >= data.xLabels.size()) break;
+    }
+
+    unsigned int yi = 0;
+    for (int i = minLatIndex; i <= maxLatIndex; i++)
+    {
+        GeoPoint p(wgs84, minLon, -90.0 + (double)i * resDegrees, 0, ALTMODE_ABSOLUTE);
+        std::string text = getText(p, true);
+        window.clampToLeft(p); // also xforms to geographic
+        data.yLabels[yi]->setPosition(p);
+        data.yLabels[yi]->setText(text);
+        data.yLabels[yi]->setNodeMask(~0);
+        yi++;
+        if (yi >= data.yLabels.size()) break;
+    }
+
+    return true;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GLSLColorFilter osgearth-2.10.2+dfsg/src/osgEarthUtil/GLSLColorFilter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GLSLColorFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GLSLColorFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GLSLColorFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/GLSLColorFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GLSLColorFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GLSLColorFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -120,8 +120,8 @@
 GLSLColorFilter::getConfig() const
 {
     Config conf("glsl", getCode());
-    conf.addIfSet( "function", _functionName );
-    conf.addIfSet( "type", "vertex",   _type, osg::Shader::VERTEX );
-    conf.addIfSet( "type", "fragment", _type, osg::Shader::FRAGMENT );
+    conf.set( "function", _functionName );
+    conf.set( "type", "vertex",   _type, osg::Shader::VERTEX );
+    conf.set( "type", "fragment", _type, osg::Shader::FRAGMENT );
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Graticule.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthUtil/Graticule.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Graticule.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Graticule.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -5,6 +5,8 @@
 #pragma vp_location   fragment_lighting
 #pragma vp_order      1.1
 
+#pragma import_defines(OE_DISABLE_GRATICULE)
+
 uniform float oe_GeodeticGraticule_lineWidth;
 uniform float oe_GeodeticGraticule_resolution;
 uniform vec4  oe_GeodeticGraticule_color;
@@ -14,6 +16,7 @@
 
 void oe_GeodeticGraticule_fragment(inout vec4 color)
 {
+#ifndef OE_DISABLE_GRATICULE
     // double the effective res for longitude since it has twice the span
     vec2 gr = vec2(0.5*oe_GeodeticGraticule_resolution, oe_GeodeticGraticule_resolution);
     vec2 distanceToLine = mod(oe_GeodeticGraticule_coord, gr);
@@ -34,4 +37,5 @@
         float alpha = clamp(hae / maxHAE, 0.0, 1.0) * antialias;
         color.rgb = mix(color.rgb, oe_GeodeticGraticule_color.rgb, oe_GeodeticGraticule_color.a * alpha);
     }
+#endif
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GraticuleLabelingEngine osgearth-2.10.2+dfsg/src/osgEarthUtil/GraticuleLabelingEngine
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GraticuleLabelingEngine	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GraticuleLabelingEngine	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,100 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#ifndef OSGEARTH_UTIL_GRATICULE_LABELING_ENGINE_H
+#define OSGEARTH_UTIL_GRATICULE_LABELING_ENGINE_H 1
+
+#include <osgEarthUtil/Common>
+#include <osgEarthUtil/ClipSpace>
+#include <osgEarth/GeoData>
+#include <osgEarth/MapNode>
+#include <osgEarth/Containers>
+#include <osgEarthAnnotation/LabelNode>
+
+namespace osgEarth { namespace Util
+{
+    using namespace osgEarth;
+    using namespace osgEarth::Annotation;
+
+    /**
+     * Node that plots graticule coordinates labels along the edge of the
+     * viewport when you are looking straight down on a zoomed-in area.
+     */
+    class GraticuleLabelingEngine : public osg::Group
+    {
+    public:
+        //! Construct a new labeling engine with the map's SRS
+        GraticuleLabelingEngine(const SpatialReference* srs);
+
+        bool getVisible(osg::Camera* camera);
+
+        //! Set the labeling style for all labels
+        void setStyle(const Style& style);
+
+        //! Set the labeling style for X and Y labels separately
+        void setStyles(const Style& xStyle, const Style& yStyle);
+
+    public: // osg::Node
+        void traverse(osg::NodeVisitor& nv);
+
+    protected:
+        typedef std::vector< osg::ref_ptr<LabelNode> > LabelNodeVector;
+
+        struct CameraData
+        {
+            CameraData():
+                visible(false)
+            {
+            }
+
+            LabelNodeVector xLabels;
+            LabelNodeVector yLabels;
+            bool visible;
+        };
+        
+        bool cullTraverse(osgUtil::CullVisitor& nv, CameraData& data);
+
+        // Override to place labels
+        virtual bool updateLabels(const osg::Vec3d& LL_world, osg::Vec3d& UL_world, osg::Vec3d& LR_world, ClipSpace& window, CameraData& data);
+        
+        typedef PerObjectFastMap<osg::Camera*, CameraData> CameraDataMap;
+        CameraDataMap _cameraDataMap;
+
+        struct AcceptCameraData : public CameraDataMap::Functor {
+            AcceptCameraData(osg::NodeVisitor& nv) : _nv(nv) { }
+            void operator()(CameraData& data);
+            osg::NodeVisitor& _nv;
+        };
+
+        struct UpdateLabelStyles : public CameraDataMap::Functor {
+            UpdateLabelStyles(const Style& xStyle, const Style& yStyle) : _xStyle(&xStyle), _yStyle(&yStyle) { }
+            void operator()(CameraData& data);
+            const Style* _xStyle;
+            const Style* _yStyle;
+        };
+
+        osg::ref_ptr<const SpatialReference> _srs;
+        Style _xLabelStyle, _yLabelStyle;      
+    };
+
+} } // namespace osgEarth::Util
+
+#endif // OSGEARTH_UTIL_GRATICULE_LABELING_ENGINE_H
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/GraticuleLabelingEngine.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/GraticuleLabelingEngine.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/GraticuleLabelingEngine.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/GraticuleLabelingEngine.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,253 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+#include "GraticuleLabelingEngine"
+#include <osgEarth/EllipsoidIntersector>
+
+#define LC "[GraticuleLabelingEngine] "
+
+using namespace osgEarth;
+using namespace osgEarth::Util;
+
+#define MAX_LABELS 60
+
+namespace
+{          
+    // Given a view matrix, return the heading of the camera relative to North;
+    // this works for geocentric maps.
+    // TODO: graduate to a utilities class somewhere in the core if generally useful
+    double getCameraHeading(const osg::Matrix& VM)
+    {
+        osg::Matrixd VMinverse;
+        VMinverse.invert(VM);
+
+        osg::Vec3d N(0, 0, 6356752); // north pole, more or less
+        osg::Vec3d b(-VM(0, 2), -VM(1, 2), -VM(2, 2)); // look vector
+        osg::Vec3d E = osg::Vec3d(0, 0, 0)*VMinverse;
+        osg::Vec3d u = E; u.normalize();
+
+        // account for looking straight downish
+        if (osg::equivalent(b*u, -1.0, 1e-4))
+        {
+            // up vec becomes the look vec.
+            b = osg::Matrixd::transform3x3(VM, osg::Vec3f(0.0, 1.0, 0.0));
+            b.normalize();
+        }
+
+        osg::Vec3d proj_d = b - u*(b*u);
+        osg::Vec3d n = N - E;
+        osg::Vec3d proj_n = n - u*(n*u);
+        osg::Vec3d proj_e = proj_n^u;
+
+        double cameraHeading = atan2(proj_e*proj_d, proj_n*proj_d);
+        return cameraHeading;
+    }
+}
+
+//........................................................................
+
+GraticuleLabelingEngine::GraticuleLabelingEngine(const SpatialReference* srs)
+{
+    _srs = srs;
+
+    // Set up the symbology for x-axis labels
+    TextSymbol* xText = _xLabelStyle.getOrCreate<TextSymbol>();
+    xText->alignment() = TextSymbol::ALIGN_CENTER_BOTTOM;
+    xText->halo()->color().set(0, 0, 0, 1);
+    xText->declutter() = false;
+
+    // Set up the symbology for y-axis labels
+    TextSymbol* yText = _yLabelStyle.getOrCreate<TextSymbol>();
+    yText->alignment() = TextSymbol::ALIGN_LEFT_BOTTOM;
+    yText->halo()->color().set(0, 0, 0, 1);
+    yText->declutter() = false;
+}
+
+bool GraticuleLabelingEngine::getVisible(osg::Camera* camera)
+{
+    CameraData& data = _cameraDataMap.get(camera);
+    return data.visible;
+}
+
+void
+GraticuleLabelingEngine::UpdateLabelStyles::operator()(GraticuleLabelingEngine::CameraData& data)
+{
+    for(GraticuleLabelingEngine::LabelNodeVector::iterator i = data.xLabels.begin();
+        i != data.xLabels.end();
+        ++i)
+    {
+        i->get()->setStyle(*_xStyle);
+    }
+
+    for(GraticuleLabelingEngine::LabelNodeVector::iterator i = data.yLabels.begin();
+        i != data.yLabels.end();
+        ++i)
+    {
+        i->get()->setStyle(*_yStyle);
+    }
+}
+
+void
+GraticuleLabelingEngine::setStyle(const Style& style)
+{
+    setStyles(style, style);
+}
+
+void
+GraticuleLabelingEngine::setStyles(const Style& xStyle, const Style& yStyle)
+{
+    _xLabelStyle = xStyle;
+    _yLabelStyle = yStyle;
+
+    UpdateLabelStyles update(_xLabelStyle, _yLabelStyle);
+    _cameraDataMap.forEach(update);
+}
+
+void
+GraticuleLabelingEngine::AcceptCameraData::operator()(GraticuleLabelingEngine::CameraData& data)
+{
+    for (LabelNodeVector::iterator i = data.xLabels.begin(); i != data.xLabels.end(); ++i)
+        i->get()->accept(_nv);
+
+    for (LabelNodeVector::iterator i = data.yLabels.begin(); i != data.yLabels.end(); ++i)
+        i->get()->accept(_nv);
+}
+
+void
+GraticuleLabelingEngine::traverse(osg::NodeVisitor& nv)
+{
+    if (nv.getVisitorType() == nv.CULL_VISITOR)
+    {
+        osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(&nv);
+        if (cv)
+        {
+            // Find the data corresponding to this camera:
+            CameraData& data = _cameraDataMap.get(cv->getCurrentCamera());
+            bool visible = cullTraverse(*cv, data);
+            data.visible = visible;
+            if (visible)
+            {
+                // traverse all the labels for this camera:
+                AcceptCameraData accept(nv);
+                accept(data);
+            }
+        }
+    }
+    else
+    {
+        AcceptCameraData accept(nv);
+        _cameraDataMap.forEach(accept);
+    }
+    
+    osg::Group::traverse(nv);
+}
+
+bool
+GraticuleLabelingEngine::cullTraverse(osgUtil::CullVisitor& nv, CameraData& data)
+{    
+    osg::Camera* cam = nv.getCurrentCamera();
+
+    // Don't draw the labels if we are too far from North-Up:
+    double heading = getCameraHeading(cam->getViewMatrix());
+    if (osg::RadiansToDegrees(fabs(heading)) > 7.0)
+        return false;
+
+    // Initialize the label pool for this camera if we have not done so:
+    if (data.xLabels.empty())
+    {
+        for (unsigned i = 0; i < MAX_LABELS; ++i)
+        {
+            LabelNode* label = new LabelNode();
+            label->setDynamic(true);
+            label->setStyle(_xLabelStyle);
+            label->setHorizonCulling(false);
+            label->setOcclusionCulling(false);
+            data.xLabels.push_back(label);
+        }
+
+        for (unsigned i = 0; i < MAX_LABELS; ++i)
+        {
+            LabelNode* label = new LabelNode();
+            label->setDynamic(true);
+            label->setStyle(_yLabelStyle);
+            label->setHorizonCulling(false);
+            label->setOcclusionCulling(false);
+            data.yLabels.push_back(label);
+        }
+    }
+
+    // Start out with all labels off. We will then turn back on the ones we use:
+    for (unsigned i = 0; i < MAX_LABELS; ++i)
+    {
+        data.xLabels[i]->setNodeMask(0);
+        data.yLabels[i]->setNodeMask(0);
+    }
+
+    // Intersect the corners of the view frustum with the ellipsoid.
+    // This will yield the approximate geo-extent of the view.
+    // TODO: graduate this to the core if generally useful - could be helpful
+    // for displaying the extent of the current view.
+
+    // Calculate the "clip to world" matrix = MVPinv.
+    osg::Matrix MVP = (*nv.getModelViewMatrix()) * cam->getProjectionMatrix();
+    osg::Matrix MVPinv;
+    MVPinv.invert(MVP);
+
+    EllipsoidIntersector ellipsoid(_srs->getEllipsoid());
+
+    // For each corner, transform the clip coordinates at the near and far
+    // planes into world space and intersect that line with the ellipsoid:
+    osg::Vec3d p0, p1;
+
+    // find the lower-left corner of the frustum:
+    osg::Vec3d LL_world;
+    p0 = osg::Vec3d(-1, -1, -1) * MVPinv;
+    p1 = osg::Vec3d(-1, -1, +1) * MVPinv;
+    bool LL_ok = ellipsoid.intersectLine(p0, p1, LL_world);
+    if (!LL_ok)
+        return false;
+
+    // find the upper-left corner of the frustum:
+    osg::Vec3d UL_world;
+    p0 = osg::Vec3d(-1, +1, -1) * MVPinv;
+    p1 = osg::Vec3d(-1, +1, +1) * MVPinv;
+    bool UL_ok = ellipsoid.intersectLine(p0, p1, UL_world);
+    if (!UL_ok)
+        return false;
+
+    // find the lower-right corner of the frustum:
+    osg::Vec3d LR_world;
+    p0 = osg::Vec3d(+1, -1, -1) * MVPinv;
+    p1 = osg::Vec3d(+1, -1, +1) * MVPinv;
+    bool LR_ok = ellipsoid.intersectLine(p0, p1, LR_world);
+    if (!LR_ok)
+        return false;
+
+    // Use this for clamping geopoints to the edges of the frustum:
+    ClipSpace window(MVP, MVPinv);
+
+    return updateLabels(LL_world, UL_world, LR_world, window, data);
+}
+
+bool GraticuleLabelingEngine::updateLabels(const osg::Vec3d& LL_world, osg::Vec3d& UL_world, osg::Vec3d& LR_world, ClipSpace& clipSpace, CameraData& data)
+{
+    return true;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Graticule.vert.glsl osgearth-2.10.2+dfsg/src/osgEarthUtil/Graticule.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Graticule.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Graticule.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -4,6 +4,8 @@
 #pragma vp_location   vertex_view
 #pragma vp_order      0.5
 
+#pragma import_defines(OE_DISABLE_GRATICULE)
+
 uniform vec4 oe_tile_key;
 out vec4 oe_layer_tilec;
 out vec2 oe_GeodeticGraticule_coord;
@@ -11,7 +13,9 @@
 
 void oe_GeodeticGraticule_vertex(inout vec4 vertex)
 {
+#ifndef OE_DISABLE_GRATICULE
     // calculate long and lat from [0..1] across the profile:
     vec2 r = (oe_tile_key.xy + oe_layer_tilec.xy)/exp2(oe_tile_key.z);
     oe_GeodeticGraticule_coord = vec2(0.5*r.x, r.y);
+#endif
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/HSLColorFilter osgearth-2.10.2+dfsg/src/osgEarthUtil/HSLColorFilter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/HSLColorFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/HSLColorFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/HSLColorFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/HSLColorFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/HSLColorFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/HSLColorFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/HTM osgearth-2.10.2+dfsg/src/osgEarthUtil/HTM
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/HTM	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/HTM	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -136,7 +136,7 @@
 
         void split();
 
-        // test whether the node's triangle lies entirely withing a frustum
+        // test whether the node's triangle lies entirely within a frustum
         bool entirelyWithin(const osg::Polytope& tope) const;
         
         // test whether the node's triangle intersects a frustum
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/HTM.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/HTM.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/HTM.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/HTM.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,12 +20,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarthUtil/HTM>
-#include <osgEarth/CullingUtils>
-#include <osgEarth/Registry>
-#include <osgEarth/StringUtils>
 #include <osgEarthAnnotation/LabelNode>
-#include <osg/Geometry>
-#include <osgText/Text>
 #include <osgEarth/DrapeableNode>
 
 using namespace osgEarth;
@@ -257,7 +252,7 @@
     
     if (_settings._storeObjectsInLeavesOnly == true)
     {
-        // distibute the data amongst the children
+        // distribute the data amongst the children
         for(osg::NodeList::iterator i = _children.begin(); i != _children.end(); ++i)
         {
             osg::Node* node = i->get();        
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/kdbush.hpp osgearth-2.10.2+dfsg/src/osgEarthUtil/kdbush.hpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/kdbush.hpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/kdbush.hpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,149 @@
+#pragma once
+
+/**
+* Modified version of mourner's kdbush.hpp to support old C++
+* https://github.com/mourner/kdbush.hpp
+*/
+
+#undef min
+#undef max
+
+#include <algorithm>
+#include <cmath>
+// Both 
+//#include <cstdint>
+//#include <tuple>
+#include <vector>
+#include <cassert>
+
+namespace kdbush {
+
+    template <typename TPoint>
+    class KDBush {
+    public:
+        KDBush(const std::vector<TPoint> input, std::size_t nodeSize_ = 64) :
+            nodeSize(nodeSize_)
+        {
+
+            const std::size_t size = input.size();
+
+            points.reserve(size);
+            ids.reserve(size);
+
+            for (unsigned int i = 0; i < input.size(); i++)
+            {
+                // TODO:  Use xy or something here...
+                //points.push_back(std::pair<int,int>(input[i].first, input[i].second));
+                points.push_back(std::pair<int, int>(input[i].first, input[i].second));
+                ids.push_back(i);
+            }
+            sortKD(0, size - 1, 0);
+        }
+
+        void range(const int minX,
+            const int minY,
+            const int maxX,
+            const int maxY,
+            std::vector<std::size_t> &out) {
+            range(minX, minY, maxX, maxY, out, 0, static_cast<std::size_t>(ids.size() - 1), 0);
+        }
+
+
+    private:
+
+
+        void range(const int minX,
+            const int minY,
+            const int maxX,
+            const int maxY,
+            std::vector< std::size_t >& out,
+            const std::size_t left,
+            const std::size_t right,
+            const std::size_t axis) {
+
+            if (right - left <= nodeSize) {
+                for (std::size_t i = left; i <= right; i++) {
+                    const int x = points[i].first;
+                    const int y = points[i].second;
+                    if (x >= minX && x <= maxX && y >= minY && y <= maxY) out.push_back(ids[i]);
+                }
+                return;
+            }
+
+            const std::size_t m = (left + right) >> 1;
+            const int x = points[m].first;
+            const int y = points[m].second;
+
+            if (x >= minX && x <= maxX && y >= minY && y <= maxY) out.push_back(ids[m]);
+
+            if (axis == 0 ? minX <= x : minY <= y)
+                range(minX, minY, maxX, maxY, out, left, m - 1, (axis + 1) % 2);
+
+            if (axis == 0 ? maxX >= x : maxY >= y)
+                range(minX, minY, maxX, maxY, out, m + 1, right, (axis + 1) % 2);
+        }
+
+        int get(const std::pair< int, int >& p, unsigned int axis) {
+            return axis == 0 ? p.first : p.second;
+        }
+
+        void sortKD(const std::size_t left, const std::size_t right, const unsigned int axis) {
+            if (right - left <= nodeSize) return;
+            const std::size_t m = (left + right) >> 1;
+            select(m, left, right, axis);
+            sortKD(left, m - 1, (axis + 1) % 2);
+            sortKD(m + 1, right, (axis + 1) % 2);
+        }
+
+
+        void select(const std::size_t k, std::size_t left, std::size_t right, const unsigned int axis) {
+
+            while (right > left) {
+                if (right - left > 600) {
+                    const double n = right - left + 1;
+                    const double m = k - left + 1;
+                    const double z = std::log(n);
+                    const double s = 0.5 * std::exp(2 * z / 3);
+                    const double r =
+                        k - m * s / n + 0.5 * std::sqrt(z * s * (1 - s / n)) * (2 * m < n ? -1 : 1);
+                    select(k, std::max(left, std::size_t(r)), std::min(right, std::size_t(r + s)), axis);
+                }
+
+                const int t = get(points[k], axis);
+                std::size_t i = left;
+                std::size_t j = right;
+
+                swapItem(left, k);
+                if (get(points[right], axis) > t) swapItem(left, right);
+
+                while (i < j) {
+                    swapItem(i++, j--);
+                    while (get(points[i], axis) < t) i++;
+                    while (get(points[j], axis) > t) j--;
+                }
+
+                if (get(points[left], axis) == t)
+                    swapItem(left, j);
+                else {
+                    swapItem(++j, right);
+                }
+
+                if (j <= k) left = j + 1;
+                if (k <= j) right = j - 1;
+            }
+        }
+
+        void swapItem(const std::size_t i, const std::size_t j) {
+            std::iter_swap(ids.begin() + i, ids.begin() + j);
+            std::iter_swap(points.begin() + i, points.begin() + j);
+        }
+
+        int sqDist(const int ax, const int ay, const int bx, const int by) {
+            return std::pow(ax - bx, 2) + std::pow(ay - by, 2);
+        }
+
+        std::vector<std::size_t> ids;
+        std::vector< std::pair< int, int > > points;
+        std::size_t nodeSize;
+    };
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LatLongFormatter osgearth-2.10.2+dfsg/src/osgEarthUtil/LatLongFormatter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LatLongFormatter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LatLongFormatter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LatLongFormatter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/LatLongFormatter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LatLongFormatter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LatLongFormatter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,10 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarthUtil/LatLongFormatter>
-#include <iomanip>
-#include <sstream>
-#include <cstdio>
-#include <algorithm>
+
+#include <stdio.h>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LinearLineOfSight osgearth-2.10.2+dfsg/src/osgEarthUtil/LinearLineOfSight
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LinearLineOfSight	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LinearLineOfSight	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LinearLineOfSight.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/LinearLineOfSight.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LinearLineOfSight.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LinearLineOfSight.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,10 +21,7 @@
 */
 #include <osgEarthUtil/LinearLineOfSight>
 #include <osgEarth/TerrainEngineNode>
-#include <osgUtil/LineSegmentIntersector>
-#include <osgSim/LineOfSight>
-#include <osgUtil/IntersectionVisitor>
-#include <osgUtil/LineSegmentIntersector>
+#include <osgEarth/GLUtils>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
@@ -294,11 +291,10 @@
         verts->reserve(4);
         geometry->setVertexArray( verts );
 
-        osg::Vec4Array* colors = new osg::Vec4Array();
+        osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
         colors->reserve( 4 );
 
         geometry->setColorArray( colors );
-        geometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
 
         if (_hasLOS)
         {
@@ -339,7 +335,7 @@
         mt->setMatrix(osg::Matrixd::translate(_startWorld));
         mt->addChild(geode);  
 
-        getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+        GLUtils::setLighting(getOrCreateStateSet(), osg::StateAttribute::OFF);
     }
 
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LineOfSight osgearth-2.10.2+dfsg/src/osgEarthUtil/LineOfSight
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LineOfSight	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LineOfSight	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LODBlending osgearth-2.10.2+dfsg/src/osgEarthUtil/LODBlending
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LODBlending	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LODBlending	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -70,11 +70,11 @@
     public:
         Config getConfig() const {
             Config conf = ConfigOptions::getConfig();
-            conf.addIfSet("delay", _delay);
-            conf.addIfSet("duration", _duration);
-            conf.addIfSet("vertical_scale", _vscale);
-            conf.addIfSet("blend_imagery", _blendImagery);
-            conf.addIfSet("blend_elevation", _blendElevation);
+            conf.set("delay", _delay);
+            conf.set("duration", _duration);
+            conf.set("vertical_scale", _vscale);
+            conf.set("blend_imagery", _blendImagery);
+            conf.set("blend_elevation", _blendElevation);
             return conf;
         }
 
@@ -86,11 +86,11 @@
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet("delay", _delay);
-            conf.getIfSet("duration", _duration);
-            conf.getIfSet("vertical_scale", _vscale);
-            conf.getIfSet("blend_imagery", _blendImagery);
-            conf.getIfSet("blend_elevation", _blendElevation);
+            conf.get("delay", _delay);
+            conf.get("duration", _duration);
+            conf.get("vertical_scale", _vscale);
+            conf.get("blend_imagery", _blendImagery);
+            conf.get("blend_elevation", _blendElevation);
         }
 
     private:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LODBlending.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/LODBlending.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LODBlending.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LODBlending.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -21,10 +21,7 @@
 */
 #include <osgEarthUtil/LODBlending>
 #include <osgEarth/Registry>
-#include <osgEarth/Capabilities>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/TerrainEngineNode>
-#include <osgEarth/Extension>
 #include <osgEarth/MapNode>
 
 #define LC "[LODBlending] "
@@ -224,6 +221,12 @@
 {
     if ( engine )
     {
+        if (engine->getName() == "osgEarth.RexTerrainEngineNode")
+        {
+            OE_WARN << LC << "LODBlending extension will be disabled; terrain engine supports blending natively" << std::endl;
+            return;
+        }
+
         // need the parent textures for blending.
         engine->requireParentTextures();
 
@@ -290,7 +293,7 @@
                              public LODBlendingOptions
 {
 public:
-    META_Object(osgearth_ext_lodblending, LODBlendingExtension);
+    META_OE_Extension(osgEarth, LODBlendingExtension, lod_blending);
 
     // CTORs
     LODBlendingExtension() { }
@@ -327,10 +330,6 @@
         return true;
     }
 
-
-protected: // Object
-    LODBlendingExtension(const LODBlendingExtension& rhs, const osg::CopyOp& op) { }
-
 private:
     osg::ref_ptr<LODBlending> _effect;
 };
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LogarithmicDepthBuffer osgearth-2.10.2+dfsg/src/osgEarthUtil/LogarithmicDepthBuffer
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LogarithmicDepthBuffer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LogarithmicDepthBuffer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -73,7 +73,6 @@
         osg::ref_ptr<osg::NodeCallback> _cullCallback;
         bool _supported;
         bool _useFragDepth;
-        osg::ref_ptr<osg::Uniform> _FCUniform;
     };
 
 } } // namespace osgEarth::Util
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LogarithmicDepthBuffer.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/LogarithmicDepthBuffer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LogarithmicDepthBuffer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LogarithmicDepthBuffer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,78 +21,20 @@
 */
 #include <osgEarthUtil/LogarithmicDepthBuffer>
 #include <osgEarthUtil/Shaders>
-#include <osgEarth/CullingUtils>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/Registry>
 #include <osgEarth/Capabilities>
-#include <osgEarth/ShaderUtils>
-#include <osgUtil/CullVisitor>
-#include <osg/Uniform>
-#include <osg/buffered_value>
-#include <cmath>
 
 #define LC "[LogarithmicDepthBuffer] "
 
-#define LOG2(X) (::log((double)(X))/::log(2.0))
-#define FC_UNIFORM "oe_logDepth_FC"
-
-// This is only used in the "precise" variant.
-#define NEAR_RES_COEFF 0.001  // a.k.a. "C"
-
 using namespace osgEarth;
 using namespace osgEarth::Util;
 
-//------------------------------------------------------------------------
-
-namespace
-{
-    // Callback to set the "far plane" uniform just before drawing.
-    struct SetFarPlaneUniformCallback : public osg::Camera::DrawCallback
-    {
-        osg::ref_ptr<osg::Uniform>              _uniform;
-        osg::ref_ptr<osg::Camera::DrawCallback> _next;
-        float                                   _coeff;
-
-        SetFarPlaneUniformCallback(osg::Uniform*              uniform,
-                                   osg::Camera::DrawCallback* next )
-        {
-            _uniform = uniform;
-            _next    = next;
-            _coeff   = 1.0f;
-        }
-
-        void operator () (osg::RenderInfo& renderInfo) const
-        {
-            const osg::Matrix& proj = renderInfo.getCurrentCamera()->getProjectionMatrix();
-
-            // perspective only. the LDB will automatically disable in orthograhpic.
-            if ( osg::equivalent(proj(3,3), 0.0) )
-            {
-                float vfov, ar, n, f;
-                proj.getPerspective(vfov, ar, n, f);
-                float fc = (float)(2.0/LOG2(_coeff*f+1.0));
-                _uniform->set( fc );
-            }
-
-            if ( _next.valid() )
-            {
-                _next->operator()( renderInfo );
-            }
-        }
-    };
-}
-
-//------------------------------------------------------------------------
 
 LogarithmicDepthBuffer::LogarithmicDepthBuffer() :
 _useFragDepth(false)
 {
     _supported = Registry::capabilities().supportsGLSL();
-    if ( _supported )
-    {
-        _FCUniform = new osg::Uniform(FC_UNIFORM, (float)0.0f);
-    }
-    else
+    if ( !_supported )
     {
         OE_WARN << LC << "Not supported on this platform (no GLSL)" << std::endl;
     }
@@ -113,6 +55,7 @@
         osg::StateSet* stateset = camera->getOrCreateStateSet();
         
         VirtualProgram* vp = VirtualProgram::getOrCreate( stateset );
+        vp->setName("Log Depth Buffer");
         Shaders pkg;
 
         if ( _useFragDepth )
@@ -124,14 +67,6 @@
         {
             pkg.load( vp, pkg.LogDepthBuffer_VertOnly_VertFile );
         }
-
-        osg::ref_ptr<osg::Camera::DrawCallback> next = camera->getPreDrawCallback();
-        if ( dynamic_cast<SetFarPlaneUniformCallback*>(next.get()) )
-            next = static_cast<SetFarPlaneUniformCallback*>(next.get())->_next.get();
-        
-        stateset->addUniform( _FCUniform.get() );
-
-        camera->setPreDrawCallback( new SetFarPlaneUniformCallback(_FCUniform.get(), next.get()) );
     }
 }
 
@@ -140,13 +75,6 @@
 {
     if ( camera && _supported )
     {
-        SetFarPlaneUniformCallback* dc = dynamic_cast<SetFarPlaneUniformCallback*>(camera->getPreDrawCallback());
-        if ( dc )
-        {
-            osg::ref_ptr<osg::Camera::DrawCallback> next = dc->_next.get();
-            camera->setPreDrawCallback( next.get() );
-        }
-
         osg::StateSet* stateset = camera->getStateSet();
         if ( stateset )
         {
@@ -158,8 +86,6 @@
                 pkg.unload( vp, pkg.LogDepthBuffer_VertFile );
                 pkg.unload( vp, pkg.LogDepthBuffer_VertOnly_VertFile );
             }
-
-            stateset->removeUniform( FC_UNIFORM );
         }
     }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LogDepthBuffer.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthUtil/LogDepthBuffer.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LogDepthBuffer.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LogDepthBuffer.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -5,18 +5,9 @@
 #pragma vp_location   fragment_lighting
 #pragma vp_order      0.99
 
-uniform float oe_logDepth_FC;
-in float oe_logDepth_clipz;
+in float oe_LogDepth_logz;
 
 void oe_logDepth_frag(inout vec4 color)
 {
-    if (gl_ProjectionMatrix[3][3] == 0.0) // perspective
-    {
-        gl_FragDepth = log2(oe_logDepth_clipz) * 0.5*oe_logDepth_FC;
-    }
-    else
-    {
-        // must set gl_FragDepth is all branches even if it doesn't change
-        gl_FragDepth = gl_FragCoord.z;
-    }
+    gl_FragDepth = oe_LogDepth_logz >= 0? oe_LogDepth_logz : gl_FragCoord.z;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LogDepthBuffer.vert.glsl osgearth-2.10.2+dfsg/src/osgEarthUtil/LogDepthBuffer.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LogDepthBuffer.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LogDepthBuffer.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -5,14 +5,23 @@
 #pragma vp_location   vertex_clip
 #pragma vp_order      0.99
 
-uniform float oe_logDepth_FC;
-out float oe_logDepth_clipz;
+out float oe_LogDepth_logz;
 
 void oe_logDepth_vert(inout vec4 clip)
 {
-    if (gl_ProjectionMatrix[3][3] == 0.0) // perspective
+    if (gl_ProjectionMatrix[3][3] == 0) // perspective only
     {
-        clip.z = (log2(max(1e-6, 1.0 + clip.w)) * oe_logDepth_FC - 1.0) * clip.w;
-        oe_logDepth_clipz = 1.0 + clip.w;
+        mat4 clip2view = inverse(gl_ProjectionMatrix);
+        vec4 farPoint = clip2view * vec4(0,0,1,1);
+        float FAR = -farPoint.z / farPoint.w;
+
+        const float C = 0.001;
+        float FC = 1.0 / log(FAR*C + 1);
+        oe_LogDepth_logz = log(max(1e-6, clip.w*C + 1.0))*FC;
+        clip.z = (2.0*oe_LogDepth_logz - 1.0)*clip.w;
+    }
+    else
+    {
+        oe_LogDepth_logz = -1.0;
     }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/LogDepthBuffer.VertOnly.vert.glsl osgearth-2.10.2+dfsg/src/osgEarthUtil/LogDepthBuffer.VertOnly.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/LogDepthBuffer.VertOnly.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/LogDepthBuffer.VertOnly.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -4,12 +4,15 @@
 #pragma vp_location   vertex_clip
 #pragma vp_order      0.99
 
-uniform float oe_logDepth_FC;
-
 void oe_logDepth_vert(inout vec4 clip)
 {
-    if (gl_ProjectionMatrix[3][3] == 0.0) // perspective
+    if (gl_ProjectionMatrix[3][3] == 0.0) // perspective only
     {
-        clip.z = (log2(max(1e-6, clip.w+1.0))*oe_logDepth_FC - 1.0) * clip.w;
+        mat4 clip2view = inverse(gl_ProjectionMatrix);
+        vec4 farPoint = clip2view * vec4(0,0,1,1);
+        float FAR = -farPoint.z / farPoint.w;
+
+        float FC = 2.0 / log2(FAR + 1);
+        clip.z = (log2(max(1e-6, clip.w+1.0))*FC - 1.0) * clip.w;
     }
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/MeasureTool osgearth-2.10.2+dfsg/src/osgEarthUtil/MeasureTool
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/MeasureTool	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/MeasureTool	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -47,7 +47,7 @@
         typedef std::list< osg::ref_ptr< MeasureToolEventHandler > > MeasureToolEventHandlerList;
 
 
-        MeasureToolHandler( osg::Group* group, MapNode* mapNode );        
+        MeasureToolHandler( MapNode* mapNode );        
         virtual ~MeasureToolHandler();
 
         bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa );        
@@ -67,7 +67,7 @@
         void setIsPath( bool path );
         bool getIsPath() const;
 
-        /** Sets the style of the measurment line (to something other than the default) */
+        /** Sets the style of the measurement line (to something other than the default) */
         void setLineStyle( const Style& style );
         const Style& getLineStyle() const { return _feature->style().value(); }
 
@@ -90,7 +90,7 @@
         bool _mouseDown;
         float _mouseDownX, _mouseDownY;
         int _mouseButton;
-        osg::ref_ptr< osg::Group > _group;
+        osg::ref_ptr< osg::Group > _root;
 
         osg::ref_ptr< osgEarth::Annotation::FeatureNode > _featureNode;
         osg::ref_ptr< osgEarth::Features::Feature >  _feature;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/MeasureTool.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/MeasureTool.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/MeasureTool.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/MeasureTool.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,10 +18,8 @@
  */
 
 #include <osgEarthUtil/MeasureTool>
-#include <osgEarth/GeoMath>
+#include <osgEarth/GLUtils>
 
-#include <osgEarthFeatures/Feature>
-#include <osgEarthAnnotation/FeatureNode>
 
 #define LC "[MeasureTool] "
 
@@ -34,9 +32,8 @@
 //#define SHOW_EXTENT 1
 
 
-MeasureToolHandler::MeasureToolHandler( osg::Group* group, osgEarth::MapNode* mapNode ):
+MeasureToolHandler::MeasureToolHandler( osgEarth::MapNode* mapNode ):
 _mouseDown         (false),
-_group             (group),
 _gotFirstLocation  (false),
 _lastPointTemporary(false),
 _finished          (false),
@@ -45,6 +42,7 @@
 _isPath            (false),
 _intersectionMask  (0xffffffff)
 {
+    _root = new osg::Group();
     setMapNode( mapNode );
 }
 
@@ -61,7 +59,18 @@
 
     if ( oldMapNode != mapNode )
     {
+        if (oldMapNode)
+        {
+            oldMapNode->removeChild(_root.get());
+        }
+
         _mapNode = mapNode;
+
+        if (mapNode)
+        {
+            mapNode->addChild(_root.get());
+        }
+
         rebuild();
     }
 }
@@ -70,9 +79,9 @@
 void
 MeasureToolHandler::rebuild()
 {
-    if ( _group.valid() && _featureNode.valid() )
+    if ( _featureNode.valid() )
     {
-        _group->removeChild( _featureNode.get() );
+        _root->removeChild( _featureNode.get() );
         _featureNode = 0L;
     }
 
@@ -93,7 +102,7 @@
     // clamp to the terrain skin as it pages in
     AltitudeSymbol* alt = _feature->style()->getOrCreate<AltitudeSymbol>();
     alt->clamping() = alt->CLAMP_TO_TERRAIN;
-    alt->technique() = alt->TECHNIQUE_SCENE;
+    alt->technique() = alt->TECHNIQUE_GPU;
 
     // offset to mitigate Z fighting
     RenderSymbol* render = _feature->style()->getOrCreate<RenderSymbol>();
@@ -107,11 +116,13 @@
     ls->stroke()->widthUnits() = Units::PIXELS;
     ls->tessellation() = 150;
 
-    _featureNode = new FeatureNode( getMapNode(), _feature.get() );
-    _featureNode->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    _featureNode = new FeatureNode( _feature.get() );
+    _featureNode->setMapNode(getMapNode());
+
+    GLUtils::setLighting(_featureNode->getOrCreateStateSet(), osg::StateAttribute::OFF);
     //_featureNode->setClusterCulling(false);
 
-    _group->addChild (_featureNode.get() );
+    _root->addChild (_featureNode.get() );
 
 #ifdef SHOW_EXTENT
 
@@ -126,7 +137,7 @@
 
     _extentFeatureNode = new FeatureNode( getMapNode(), _extentFeature.get() );
     
-    _group->addChild( _extentFeatureNode.get() );
+    _root->addChild( _extentFeatureNode.get() );
 #endif
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/MGRSFormatter osgearth-2.10.2+dfsg/src/osgEarthUtil/MGRSFormatter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/MGRSFormatter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/MGRSFormatter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/MGRSFormatter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/MGRSFormatter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/MGRSFormatter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/MGRSFormatter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,10 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarthUtil/MGRSFormatter>
-#include <iomanip>
-#include <sstream>
-#include <cstdio>
-#include <algorithm>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/MGRSGraticule osgearth-2.10.2+dfsg/src/osgEarthUtil/MGRSGraticule
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/MGRSGraticule	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/MGRSGraticule	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -66,14 +66,14 @@
     public:
         virtual Config getConfig() const;
 
-        virtual void fromConfig(const Config& conf);
-
     protected:
-        void mergeConfig(const Config& conf) {
+        virtual void mergeConfig(const Config& conf) {
             VisibleLayerOptions::mergeConfig(conf);
             fromConfig(conf);
         }
 
+        void fromConfig(const Config& conf);
+
         optional<URI> _sqidURI;
         osg::ref_ptr<StyleSheet> _styleSheet;
         optional<bool> _useDefaultStyles;
@@ -89,7 +89,7 @@
     class OSGEARTHUTIL_EXPORT MGRSGraticule : public VisibleLayer
     {
     public:
-        META_Layer(osgEarthUtil, MGRSGraticule, MGRSGraticuleOptions);
+        META_Layer(osgEarthUtil, MGRSGraticule, MGRSGraticuleOptions, mgrs_graticule);
 
         //! Constructs a default graticule
         MGRSGraticule();
@@ -115,7 +115,7 @@
 
         virtual void removedFromMap(const Map* map);
         
-        virtual osg::Node* getOrCreateNode();
+        virtual osg::Node* getNode() const;
 
         virtual void init();
 
@@ -135,8 +135,6 @@
 
         osg::ref_ptr<FeatureProfile> _featureProfile;
 
-        osg::ref_ptr<osg::ClipPlane> _clipPlane;
-
         osg::ref_ptr<osg::Group> _root;
 
         osg::observer_ptr<const Map> _map;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/MGRSGraticule.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/MGRSGraticule.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/MGRSGraticule.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/MGRSGraticule.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,37 +17,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarthUtil/MGRSGraticule>
-#include <osgEarthUtil/MGRSFormatter>
 #include <osgEarthUtil/UTMLabelingEngine>
 
-#include <osgEarthFeatures/GeometryCompiler>
 #include <osgEarthFeatures/TextSymbolizer>
-#include <osgEarthFeatures/FeatureSource>
 #include <osgEarthFeatures/TessellateOperator>
 
 #include <osgEarthAnnotation/FeatureNode>
 
 #include <osgEarth/Registry>
-#include <osgEarth/CullingUtils>
-#include <osgEarth/Utils>
 #include <osgEarth/PagedNode>
-#include <osgEarth/ShaderUtils>
 #include <osgEarth/Endian>
+#include <osgEarth/GLUtils>
+#include <osgEarth/Text>
 
-#include <osg/BlendFunc>
-#include <osg/PagedLOD>
 #include <osg/Depth>
-#include <osg/LogicOp>
-#include <osg/MatrixTransform>
-#include <osg/ClipNode>
-#include <osgDB/FileNameUtils>
-#include <osgDB/ReaderWriter>
 //#include <osgDB/WriteFile>
 
 #include <osgEarthDrivers/feature_ogr/OGRFeatureOptions>
 
-#include <fstream>
-#include <sstream>
 
 #define LC "[MGRSGraticule] "
 
@@ -59,12 +46,21 @@
 
 REGISTER_OSGEARTH_LAYER(mgrs_graticule, MGRSGraticule);
 
+#ifndef GL_CLIP_DISTANCE0
+#define GL_CLIP_DISTANCE0 0x3000
+#endif
+
+// whether to use SCREEN_COORDS to auto-size the text
+#define USE_SCREEN_COORDS
+
+
 //#define DEBUG_MODE
 
 //---------------------------------------------------------------------------
 
 MGRSGraticuleOptions::MGRSGraticuleOptions(const ConfigOptions& conf) :
-VisibleLayerOptions(conf)
+VisibleLayerOptions(conf),
+_useDefaultStyles(true)
 {
     _sqidURI.init(URI("../data/mgrs_sqid.bin", conf.referrer()));
     _styleSheet = new StyleSheet();
@@ -75,9 +71,8 @@
 MGRSGraticuleOptions::getConfig() const
 {
     Config conf = VisibleLayerOptions::getConfig();
-    conf.key() = "mgrs_graticule";
     conf.set("sqid_data", _sqidURI);
-    conf.setObj("styles", _styleSheet);
+    conf.set("styles", _styleSheet);
     conf.set("use_default_styles", _useDefaultStyles);
     return conf;
 }
@@ -85,9 +80,9 @@
 void
 MGRSGraticuleOptions::fromConfig(const Config& conf)
 {
-    conf.getIfSet("sqid_data", _sqidURI);
-    conf.getObjIfSet("styles", _styleSheet);
-    conf.getIfSet("use_default_styles", _useDefaultStyles);
+    conf.get("sqid_data", _sqidURI);
+    conf.get("styles", _styleSheet);
+    conf.get("use_default_styles", _useDefaultStyles);
 }
 
 //---------------------------------------------------------------------------
@@ -125,7 +120,7 @@
         {
             // Read source data into an array:
             FeatureList sqids;
-            osg::ref_ptr<FeatureCursor> sqid_cursor = sqid_fs->createFeatureCursor();
+            osg::ref_ptr<FeatureCursor> sqid_cursor = sqid_fs->createFeatureCursor(0L);
             if (sqid_cursor.valid() && sqid_cursor->hasMore())
                 sqid_cursor->fill(sqids);
 
@@ -136,8 +131,8 @@
             // We will need a local XY SRS for geometry simplification:
             const SpatialReference* xysrs = SpatialReference::get("spherical-mercator");
 
-            u_long count = OE_ENCODE_LONG(sqids.size());
-            out.write(reinterpret_cast<const char*>(&count), sizeof(u_long));
+            u_int count = OE_ENCODE_LONG(sqids.size());
+            out.write(reinterpret_cast<const char*>(&count), sizeof(u_int));
 
             for (FeatureList::iterator i = sqids.begin(); i != sqids.end(); ++i)
             {
@@ -198,13 +193,13 @@
         if (fin.eof() || fin.is_open() == false)
             return false;
 
-        u_long count;
-        fin.read(reinterpret_cast<char*>(&count), sizeof(u_long));
+        u_int count;
+        fin.read(reinterpret_cast<char*>(&count), sizeof(u_int));
         count = OE_DECODE_LONG(count);
 
         const SpatialReference* wgs84 = SpatialReference::get("wgs84");
 
-        for (u_long i = 0; i < count; ++i)
+        for (u_int i = 0; i < count; ++i)
         {
             char gzd[4]; gzd[3] = 0;
             fin.read(gzd, 3);
@@ -223,7 +218,7 @@
             if (numPoints > 16384)
             {
                 OE_WARN << LC << "sqid bin file is corrupt.. abort!" << std::endl;
-                exit(-1);
+                return false;
             }
 
             osgEarth::Symbology::Ring* line = new osgEarth::Symbology::Ring();
@@ -326,16 +321,32 @@
 
     osg::StateSet* ss = this->getOrCreateStateSet();
 
-    // make the shared depth attr:
+    // disable the depth buffer
     ss->setAttributeAndModes(
         new osg::Depth(osg::Depth::ALWAYS, 0.f, 1.f, false),
         osg::StateAttribute::ON);
+    
+    // activate horizon clipping
+    ss->setMode(GL_CLIP_DISTANCE0, 1);
 
-    ss->setMode( GL_LIGHTING, 0 );
-    ss->setMode( GL_BLEND, 1 );
+    // blending on to support transculency
+    ss->setMode(GL_BLEND, 1);
 
     // force it to render after the terrain.
     ss->setRenderBinDetails(1, "RenderBin");
+
+    _root = new LocalRoot();
+
+    GLUtils::setLighting(_root->getOrCreateStateSet(), osg::StateAttribute::OFF);
+
+    // install the range callback for clip plane activation
+    _root->addCullCallback( new RangeUniformCullCallback() );
+
+    if (getEnabled() == true)
+    {
+        rebuild();
+    }
+
 }
 
 void
@@ -352,18 +363,8 @@
 }
 
 osg::Node*
-MGRSGraticule::getOrCreateNode()
+MGRSGraticule::getNode() const
 {
-    if (_root.valid() == false)
-    {
-        _root = new LocalRoot();
-
-        // install the range callback for clip plane activation
-        _root->addCullCallback( new RangeUniformCullCallback() );
-
-        rebuild();
-    }
-
     return _root.get();
 }
 
@@ -711,7 +712,7 @@
         {
             GeometryCompilerOptions gco;
             gco.shaderPolicy() = SHADERPOLICY_INHERIT;
-            return new FeatureNode(0L, _sqidFeatures, _style, gco);
+            return new FeatureNode(_sqidFeatures, _style, gco);
         }
     };
 
@@ -778,6 +779,9 @@
             // make sure we get sufficient tessellation:
             compiler.options().maxGranularity() = 1.0;
 
+            // line shaders are at the root of the geometry tree, so don't install any
+            compiler.options().shaderPolicy() = SHADERPOLICY_INHERIT;
+
             FeatureList features;
 
             // longitudinal line:
@@ -815,13 +819,11 @@
             osg::Vec3d tileCenter;
             extent.getCentroid( tileCenter.x(), tileCenter.y() );
 
-            const SpatialReference* ecefSRS = extent.getSRS()->getECEF();
+            const SpatialReference* ecefSRS = extent.getSRS()->getGeocentricSRS();
     
             osg::Vec3d centerECEF;
             extent.getSRS()->transform( tileCenter, ecefSRS, centerECEF );
 
-            Registry::shaderGenerator().run(group, Registry::stateSetCache());
-    
             return ClusterCullingFactory::createAndInstall(group, centerECEF);
         }
         
@@ -863,13 +865,19 @@
             {
                 const Feature* feature = f->get();
                 std::string sqid = feature->getString("sqid");
-                osgText::Text* drawable = symbolizer.create(sqid);
-                drawable->setCharacterSizeMode(drawable->SCREEN_COORDS);
+                osgText::Text* drawable = new osgEarth::Text(sqid);
+                symbolizer.apply(drawable);
+#ifdef USE_SCREEN_COORDS
+                drawable->setCharacterSizeMode(osgText::Text::SCREEN_COORDS);
+#else
+                drawable->setCharacterSizeMode(osgText::Text::OBJECT_COORDS);
+                drawable->setCharacterSize(13000);
+#endif
                 drawable->getOrCreateStateSet()->setRenderBinToInherit();
             
                 GeoExtent extent(feature->getSRS(), feature->getGeometry()->getBounds());
 
-                const SpatialReference* ecef = feature->getSRS()->getECEF();
+                const SpatialReference* ecef = feature->getSRS()->getGeocentricSRS();
 
                 osg::Vec3d LL;
                 findPointClosestTo(feature, osg::Vec3d(extent.xMin(), extent.yMin(), 0), LL);
@@ -888,7 +896,7 @@
 
             OE_DEBUG << LC << "Created " << features.size() << " text elements for " << getName() << std::endl;
             
-            Registry::shaderGenerator().run(this, Registry::stateSetCache());
+            //Registry::shaderGenerator().run(this, Registry::stateSetCache());
         }
         
 #ifdef DEBUG_MODE
@@ -956,11 +964,20 @@
                 textSym->alignment() = textSym->ALIGN_LEFT_BASE_LINE;
         
             TextSymbolizer symbolizer( textSym.get() );
-            osgText::Text* drawable = symbolizer.create(getName());
+            osgText::Text* drawable = new osgEarth::Text(getName());
+            symbolizer.apply(drawable);
+
+#ifdef USE_SCREEN_COORDS
             drawable->setCharacterSizeMode(osgText::Text::SCREEN_COORDS);
+            //drawable->setPosition(osg::Vec3(0,0,0));
+            //drawable->setCharacterSize(36);
+#else
+            drawable->setCharacterSizeMode(osgText::Text::OBJECT_COORDS);
+            drawable->setCharacterSize(130000);
+#endif
             drawable->getOrCreateStateSet()->setRenderBinToInherit();
 
-            const SpatialReference* ecef = f->getSRS()->getECEF();
+            const SpatialReference* ecef = f->getSRS()->getGeocentricSRS();
             osg::Vec3d positionECEF;
             extent.getSRS()->transform( osg::Vec3d(extent.xMin(),extent.yMin(),0), ecef, positionECEF );
         
@@ -969,8 +986,6 @@
             osg::MatrixTransform* mt = new osg::MatrixTransform(L2W);
             mt->addChild(drawable); 
 
-            Registry::shaderGenerator().run(drawable, Registry::stateSetCache());
-
             return ClusterCullingFactory::createAndInstall(mt, positionECEF);
         }
 
@@ -1028,19 +1043,6 @@
     // rebuild the graph:
     osg::Group* top = _root.get();
 
-    // Horizon clipping plane.
-    osg::ClipPlane* cp = _clipPlane.get();
-    if ( cp == 0L )
-    {
-        osg::ClipNode* clipNode = new osg::ClipNode();
-        osgEarth::Registry::shaderGenerator().run( clipNode );
-        cp = new osg::ClipPlane( 0 );
-        clipNode->addClipPlane( cp );
-        _root->addChild(clipNode);
-        top = clipNode;
-    }
-    top->addCullCallback( new ClipToGeocentricHorizon(_profile->getSRS(), cp) );
-
 #if 0
     // Uncomment to write out a SQID data file
     writeSQIDfile(options().sqidData().get());
@@ -1057,10 +1059,14 @@
             table[i->get()->getString("gzd")].push_back(i->get());
         }
 
+        // Root of the geometry tree
         osg::Group* geomTop = new osg::Group();
         top->addChild(geomTop);
 
+        // Root of the text tree
         osg::Group* textTop = new osg::Group();
+        osg::StateSet* textSS = textTop->getOrCreateStateSet();
+        //TextSymbolizer::insta(textSS);
         top->addChild(textTop);
 
         // build the GZD feature set
@@ -1108,6 +1114,12 @@
         if (ss->getStyle("1", false)) maxRes = 1.0;
         labeler->setMaxResolution(maxRes);
 
+        // Set labeler styles
+        const Style* xEdgeStyle = ss->getStyle("xedge", false);
+        const Style* yEdgeStyle = ss->getStyle("yedge", false);
+        if (xEdgeStyle && yEdgeStyle)
+            labeler->setStyles(*xEdgeStyle, *yEdgeStyle);
+
         osg::ref_ptr<StateSetCache> sscache = new StateSetCache();
         sscache->optimize(geomTop);
         sscache->optimize(textTop);
@@ -1221,7 +1233,7 @@
             line->stroke()->width() = 4.0;
             line->tessellation() = 20;
             TextSymbol* text = style.getOrCreate<TextSymbol>();
-            text->fill()->color() = Color::Gray;
+            text->fill()->color() = Color::White;
             text->halo()->color() = Color::Black;
             text->alignment() = TextSymbol::ALIGN_LEFT_BOTTOM;
             styles->addStyle(style);
@@ -1243,7 +1255,7 @@
             line->stroke()->color().set(1,1,0,alpha);
             line->stroke()->width() = 3;
             TextSymbol* text = style.getOrCreate<TextSymbol>();
-            text->fill()->color() = Color::Gray;
+            text->fill()->color() = Color::White;
             text->halo()->color() = Color::Black;
             text->alignment() = TextSymbol::ALIGN_LEFT_BOTTOM;
             styles->addStyle(style);
@@ -1300,502 +1312,3 @@
         }
     }
 }
-
-// ------ OLD CODE --------------------------------------------------------
-
-
-#if 0
-
-osg::Node*
-MGRSGraticule::buildSQIDTiles( const std::string& gzd )
-{
-    const GeoExtent& extent = _utmData.sectorTable()[gzd];
-
-    // parse the GZD into its components:
-    unsigned zone;
-    char letter;
-    sscanf( gzd.c_str(), "%u%c", &zone, &letter );
-    
-    const TextSymbol* textSymFromOptions = options().sqidStyle()->get<TextSymbol>();
-    if ( !textSymFromOptions )
-        textSymFromOptions = options().sqidStyle()->get<TextSymbol>();
-
-    // copy it since we intend to alter it
-    osg::ref_ptr<TextSymbol> textSym = 
-        textSymFromOptions ? new TextSymbol(*textSymFromOptions) :
-        new TextSymbol();
-
-    double h = 0.0;
-
-    TextSymbolizer ts( textSym );
-    MGRSFormatter mgrs(MGRSFormatter::PRECISION_100000M);
-    osg::Geode* textGeode = new osg::Geode();
-
-    const SpatialReference* ecefSRS = extent.getSRS()->getECEF();
-    osg::Vec3d centerMap, centerECEF;
-    extent.getCentroid(centerMap.x(), centerMap.y());
-    extent.getSRS()->transform(centerMap, ecefSRS, centerECEF);
-
-    osg::Matrix local2world;
-    ecefSRS->createLocalToWorld( centerECEF, local2world );
-    osg::Matrix world2local;
-    world2local.invert(local2world);
-
-    FeatureList features;
-
-    std::vector<GeoExtent> sqidExtents;
-
-    // UTM:
-    if ( letter > 'B' && letter < 'Y' )
-    {
-        // grab the SRS for the current UTM zone:
-        // TODO: AL/AA designation??
-        const SpatialReference* utm = SpatialReference::create(
-            Stringify() << "+proj=utm +zone=" << zone << " +north +units=m" );
-
-        // transform the four corners of the tile to UTM.
-        osg::Vec3d gzdUtmSW, gzdUtmSE, gzdUtmNW, gzdUtmNE;
-        extent.getSRS()->transform( osg::Vec3d(extent.xMin(),extent.yMin(),h), utm, gzdUtmSW );
-        extent.getSRS()->transform( osg::Vec3d(extent.xMin(),extent.yMax(),h), utm, gzdUtmNW );
-        extent.getSRS()->transform( osg::Vec3d(extent.xMax(),extent.yMin(),h), utm, gzdUtmSE );
-        extent.getSRS()->transform( osg::Vec3d(extent.xMax(),extent.yMax(),h), utm, gzdUtmNE );
-
-        // find the southern boundary of the first full SQID tile in the GZD tile.
-        double southSQIDBoundary = gzdUtmSW.y(); //extentUTM.yMin();
-        double remainder = fmod( southSQIDBoundary, 100000.0 );
-        if ( remainder > 0.0 )
-            southSQIDBoundary += (100000.0 - remainder);
-
-        // find the min/max X for this cell in UTM:
-        double xmin = extent.yMin() >= 0.0 ? gzdUtmSW.x() : gzdUtmNW.x();
-        double xmax = extent.yMin() >= 0.0 ? gzdUtmSE.x() : gzdUtmNE.x();
-
-        // Record the UTM extent of each SQID cell in this tile.
-        // Go from the south boundary northwards:
-        for( double y = southSQIDBoundary; y < gzdUtmNW.y(); y += 100000.0 )
-        {
-            // start at the central meridian (500K) and go west:
-            for( double x = 500000.0; x > xmin; x -= 100000.0 )
-            {
-                sqidExtents.push_back( GeoExtent(utm, x-100000.0, y, x, y+100000.0) );
-            }
-
-            // then start at the central meridian and go east:
-            for( double x = 500000.0; x < xmax; x += 100000.0 )
-            {
-                sqidExtents.push_back( GeoExtent(utm, x, y, x+100000.0, y+100000.0) );
-            }
-        }
-
-        for( std::vector<GeoExtent>::iterator i = sqidExtents.begin(); i != sqidExtents.end(); ++i )
-        {
-            GeoExtent utmEx = *i;
-
-            // now, clamp each of the points in the UTM SQID extent to the map-space
-            // boundaries of the GZD tile. (We only need to clamp in the X dimension,
-            // Y geometry is allowed to overflow.) Also, skip NE, we don't need it.
-            double r, xlimit;
-
-            osg::Vec3d sw(utmEx.xMin(), utmEx.yMin(), 0);
-            r = (sw.y()-gzdUtmSW.y())/(gzdUtmNW.y()-gzdUtmSW.y());
-            xlimit = gzdUtmSW.x() + r * (gzdUtmNW.x() - gzdUtmSW.x());
-            if ( sw.x() < xlimit ) sw.x() = xlimit;
-
-            osg::Vec3d nw(utmEx.xMin(), utmEx.yMax(), 0);
-            r = (nw.y()-gzdUtmSW.y())/(gzdUtmNW.y()-gzdUtmSW.y());
-            xlimit = gzdUtmSW.x() + r * (gzdUtmNW.x() - gzdUtmSW.x());
-            if ( nw.x() < xlimit ) nw.x() = xlimit;
-            
-            osg::Vec3d se(utmEx.xMax(), utmEx.yMin(), 0);
-            r = (se.y()-gzdUtmSE.y())/(gzdUtmNE.y()-gzdUtmSE.y());
-            xlimit = gzdUtmSE.x() + r * (gzdUtmNE.x() - gzdUtmSE.x());
-            if ( se.x() > xlimit ) se.x() = xlimit;
-
-            // at the northernmost GZD (lateral band X), clamp the northernmost SQIDs to the upper latitude.
-            if ( letter == 'X' && nw.y() > gzdUtmNW.y() ) 
-                nw.y() = gzdUtmNW.y();
-
-            // need this in order to calculate the font size:
-            double utmWidth = se.x() - sw.x();
-
-            // now transform the corner points back into the map SRS:
-            utm->transform( sw, extent.getSRS(), sw );
-            utm->transform( nw, extent.getSRS(), nw );
-            utm->transform( se, extent.getSRS(), se );
-
-            // and draw valid sqid geometry.
-            if ( sw.x() < se.x() )
-            {
-                Feature* lat = new Feature(new LineString(2), extent.getSRS());
-                lat->geoInterp() = GEOINTERP_RHUMB_LINE;
-                lat->getGeometry()->push_back( sw );
-                lat->getGeometry()->push_back( se );
-                features.push_back(lat);
-
-                Feature* lon = new Feature(new LineString(2), extent.getSRS());
-                lon->geoInterp() = GEOINTERP_GREAT_CIRCLE;
-                lon->getGeometry()->push_back( sw );
-                lon->getGeometry()->push_back( nw );
-                features.push_back(lon);
-
-                // and the text label:
-                osg::Vec3d sqidTextMap = (nw + se) * 0.5;
-                sqidTextMap.z() += 1000.0;
-                osg::Vec3d sqidTextECEF;
-                extent.getSRS()->transform(sqidTextMap, ecefSRS, sqidTextECEF);
-                osg::Vec3d sqidLocal;
-                sqidLocal = sqidTextECEF * world2local;
-
-                MGRSCoord mgrsCoord;
-                if ( mgrs.transform( GeoPoint(extent.getSRS(),sqidTextMap,ALTMODE_ABSOLUTE), mgrsCoord) )
-                {
-                    textSym->size() = utmWidth/3.0;        
-                    osgText::Text* d = ts.create( mgrsCoord.sqid );
-
-                    osg::Matrixd textLocal2World;
-                    ecefSRS->createLocalToWorld( sqidTextECEF, textLocal2World );
-
-                    d->setPosition( sqidLocal );
-                    textGeode->addDrawable( d );
-                }
-            }
-        }
-    }
-
-    else if ( letter == 'A' || letter == 'B' )
-    {
-        // SRS for south polar region UPS projection. This projection has (0,0) at the
-        // south pole, with +X extending towards 90 degrees E longitude and +Y towards
-        // 0 degrees longitude.
-        const SpatialReference* ups = SpatialReference::create(
-            "+proj=stere +lat_ts=-90 +lat_0=-90 +lon_0=0 +k_0=1 +x_0=0 +y_0=0");
-
-        osg::Vec3d gtemp;
-        double r = GeoMath::distance(-osg::PI_2, 0.0, -1.3962634, 0.0); // -90 => -80 latitude
-        double r2 = r*r;
-
-        if ( letter == 'A' )
-        {
-            for( double x = 0.0; x < 1200000.0; x += 100000.0 )
-            {
-                double yminmax = sqrt( r2 - x*x );
-                Feature* f = new Feature( new LineString(2), extent.getSRS() );
-                f->geoInterp() = GEOINTERP_GREAT_CIRCLE;
-                osg::Vec3d p0, p1;
-                ups->transform( osg::Vec3d(-x, -yminmax, 0), extent.getSRS(), p0 );
-                ups->transform( osg::Vec3d(-x,  yminmax, 0), extent.getSRS(), p1 );
-                f->getGeometry()->push_back( p0 );
-                f->getGeometry()->push_back( p1 );
-                features.push_back( f );
-            }
-
-            for( double y = -1100000.0; y < 1200000.0; y += 100000.0 )
-            {
-                double xmax = sqrt( r2 - y*y );
-                Feature* f = new Feature( new LineString(2), extent.getSRS() );
-                f->geoInterp() = GEOINTERP_GREAT_CIRCLE;
-                osg::Vec3d p0, p1;
-                ups->transform( osg::Vec3d(-xmax, y, 0), extent.getSRS(), p0 );
-                ups->transform( osg::Vec3d(    0, y, 0), extent.getSRS(), p1 );
-                f->getGeometry()->push_back( p0 );
-                f->getGeometry()->push_back( p1 );
-                features.push_back( f );
-            }
-
-            for( double x = -1200000.0; x < 0.0; x += 100000.0 )
-            {
-                for( double y = -1200000.0; y < 1200000.0; y += 100000.0 )
-                {
-                    osg::Vec3d sqidTextMap;
-                    ups->transform( osg::Vec3d(x+50000.0, y+50000.0, 0), extent.getSRS(), sqidTextMap);
-                    if ( sqidTextMap.y() < -80.0 )
-                    {
-                        sqidTextMap.z() += 1000.0;
-                        osg::Vec3d sqidTextECEF;
-                        extent.getSRS()->transform(sqidTextMap, ecefSRS, sqidTextECEF);
-                        osg::Vec3d sqidLocal = sqidTextECEF * world2local;
-
-                        MGRSCoord mgrsCoord;
-                        if ( mgrs.transform( GeoPoint(extent.getSRS(),sqidTextMap,ALTMODE_ABSOLUTE), mgrsCoord) )
-                        {
-                            textSym->size() = 33000.0;
-                            osgText::Text* d = ts.create( mgrsCoord.sqid );
-                            osg::Matrixd textLocal2World;
-                            ecefSRS->createLocalToWorld( sqidTextECEF, textLocal2World );
-                            d->setPosition( sqidLocal );
-                            textGeode->addDrawable( d );
-                        }
-                    }
-                }
-            }
-        }
-
-        else if ( letter == 'B' )
-        {
-            for( double x = 100000.0; x < 1200000.0; x += 100000.0 )
-            {
-                double yminmax = sqrt( r2 - x*x );
-                Feature* f = new Feature( new LineString(2), extent.getSRS() );
-                f->geoInterp() = GEOINTERP_GREAT_CIRCLE;
-                osg::Vec3d p0, p1;
-                ups->transform( osg::Vec3d(x, -yminmax, 0), extent.getSRS(), p0 );
-                ups->transform( osg::Vec3d(x,  yminmax, 0), extent.getSRS(), p1 );
-                f->getGeometry()->push_back( p0 );
-                f->getGeometry()->push_back( p1 );
-                features.push_back( f );
-            }
-
-            for( double y = -1100000.0; y < 1200000.0; y += 100000.0 )
-            {
-                double xmax = sqrt( r2 - y*y );
-                Feature* f = new Feature( new LineString(2), extent.getSRS() );
-                f->geoInterp() = GEOINTERP_GREAT_CIRCLE;
-                osg::Vec3d p0, p1;
-                ups->transform( osg::Vec3d(    0, y, 0), extent.getSRS(), p0 );
-                ups->transform( osg::Vec3d( xmax, y, 0), extent.getSRS(), p1 );
-                f->getGeometry()->push_back( p0 );
-                f->getGeometry()->push_back( p1 );
-                features.push_back( f );
-            }
-
-            for( double x = 0.0; x < 1200000.0; x += 100000.0 )
-            {
-                for( double y = -1200000.0; y < 1200000.0; y += 100000.0 )
-                {
-                    osg::Vec3d sqidTextMap;
-                    ups->transform( osg::Vec3d(x+50000.0, y+50000.0, 0), extent.getSRS(), sqidTextMap);
-                    if ( sqidTextMap.y() < -80.0 )
-                    {
-                        sqidTextMap.z() += 1000.0;
-                        osg::Vec3d sqidTextECEF;
-                        extent.getSRS()->transform(sqidTextMap, ecefSRS, sqidTextECEF);
-                        //extent.getSRS()->transformToECEF(sqidTextMap, sqidTextECEF);
-                        osg::Vec3d sqidLocal = sqidTextECEF * world2local;
-
-                        MGRSCoord mgrsCoord;
-                        if ( mgrs.transform( GeoPoint(extent.getSRS(),sqidTextMap,ALTMODE_ABSOLUTE), mgrsCoord) )
-                        {
-                            textSym->size() = 33000.0;
-                            osgText::Text* d = ts.create( mgrsCoord.sqid );
-                            osg::Matrixd textLocal2World;
-                            ecefSRS->createLocalToWorld( sqidTextECEF, textLocal2World );
-                            d->setPosition( sqidLocal );
-                            textGeode->addDrawable( d );
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    else if ( letter == 'Y' || letter == 'Z' )
-    {
-        // SRS for north polar region UPS projection. This projection has (0,0) at the
-        // south pole, with +X extending towards 90 degrees E longitude and +Y towards
-        // 180 degrees longitude.
-        const SpatialReference* ups = SpatialReference::create(
-            "+proj=stere +lat_ts=90 +lat_0=90 +lon_0=0 +k_0=1 +x_0=0 +y_0=0");
-
-        osg::Vec3d gtemp;
-        double r = GeoMath::distance(osg::PI_2, 0.0, 1.46607657, 0.0); // 90 -> 84 latitude
-        double r2 = r*r;
-
-        if ( letter == 'Y' )
-        {
-            for( double x = 0.0; x < 700000.0; x += 100000.0 )
-            {
-                double yminmax = sqrt( r2 - x*x );
-                Feature* f = new Feature( new LineString(2), extent.getSRS() );
-                f->geoInterp() = GEOINTERP_GREAT_CIRCLE;
-                osg::Vec3d p0, p1;
-                ups->transform( osg::Vec3d(-x, -yminmax, 0), extent.getSRS(), p0 );
-                ups->transform( osg::Vec3d(-x,  yminmax, 0), extent.getSRS(), p1 );
-                f->getGeometry()->push_back( p0 );
-                f->getGeometry()->push_back( p1 );
-                features.push_back( f );
-            }
-
-            for( double y = -600000.0; y < 700000.0; y += 100000.0 )
-            {
-                double xmax = sqrt( r2 - y*y );
-                Feature* f = new Feature( new LineString(2), extent.getSRS() );
-                f->geoInterp() = GEOINTERP_GREAT_CIRCLE;
-                osg::Vec3d p0, p1;
-                ups->transform( osg::Vec3d(-xmax, y, 0), extent.getSRS(), p0 );
-                ups->transform( osg::Vec3d(    0, y, 0), extent.getSRS(), p1 );
-                f->getGeometry()->push_back( p0 );
-                f->getGeometry()->push_back( p1 );
-                features.push_back( f );
-            }
-
-            for( double x = -700000.0; x < 0.0; x += 100000.0 )
-            {
-                for( double y = -700000.0; y < 700000.0; y += 100000.0 )
-                {
-                    osg::Vec3d sqidTextMap;
-                    ups->transform( osg::Vec3d(x+50000.0, y+50000.0, 0), extent.getSRS(), sqidTextMap);
-                    if ( sqidTextMap.y() > 84.0 )
-                    {
-                        sqidTextMap.z() += 1000.0;
-                        osg::Vec3d sqidTextECEF;
-                        extent.getSRS()->transform(sqidTextMap, ecefSRS, sqidTextECEF);
-                        //extent.getSRS()->transformToECEF(sqidTextMap, sqidTextECEF);
-                        osg::Vec3d sqidLocal = sqidTextECEF * world2local;
-
-                        MGRSCoord mgrsCoord;
-                        if ( mgrs.transform( GeoPoint(extent.getSRS(),sqidTextMap,ALTMODE_ABSOLUTE), mgrsCoord) )
-                        {
-                            textSym->size() = 33000.0;
-                            osgText::Text* d = ts.create( mgrsCoord.sqid );
-                            osg::Matrixd textLocal2World;
-                            ecefSRS->createLocalToWorld( sqidTextECEF, textLocal2World );
-                            d->setPosition( sqidLocal );
-                            textGeode->addDrawable( d );
-                        }
-                    }
-                }
-            }
-        }
-
-        else if ( letter == 'Z' )
-        {
-            for( double x = 100000.0; x < 700000.0; x += 100000.0 )
-            {
-                double yminmax = sqrt( r2 - x*x );
-                Feature* f = new Feature( new LineString(2), extent.getSRS() );
-                f->geoInterp() = GEOINTERP_GREAT_CIRCLE;
-                osg::Vec3d p0, p1;
-                ups->transform( osg::Vec3d(x, -yminmax, 0), extent.getSRS(), p0 );
-                ups->transform( osg::Vec3d(x,  yminmax, 0), extent.getSRS(), p1 );
-                f->getGeometry()->push_back( p0 );
-                f->getGeometry()->push_back( p1 );
-                features.push_back( f );
-            }
-
-            for( double y = -600000.0; y < 700000.0; y += 100000.0 )
-            {
-                double xmax = sqrt( r2 - y*y );
-                Feature* f = new Feature( new LineString(2), extent.getSRS() );
-                f->geoInterp() = GEOINTERP_GREAT_CIRCLE;
-                osg::Vec3d p0, p1;
-                ups->transform( osg::Vec3d(    0, y, 0), extent.getSRS(), p0 );
-                ups->transform( osg::Vec3d( xmax, y, 0), extent.getSRS(), p1 );
-                f->getGeometry()->push_back( p0 );
-                f->getGeometry()->push_back( p1 );
-                features.push_back( f );
-            }
-
-            for( double x = 0.0; x < 700000.0; x += 100000.0 )
-            {
-                for( double y = -700000.0; y < 700000.0; y += 100000.0 )
-                {
-                    osg::Vec3d sqidTextMap;
-                    ups->transform( osg::Vec3d(x+50000.0, y+50000.0, 0), extent.getSRS(), sqidTextMap);
-                    if ( sqidTextMap.y() > 84.0 )
-                    {
-                        sqidTextMap.z() += 1000.0;
-                        osg::Vec3d sqidTextECEF;
-                        extent.getSRS()->transform(sqidTextMap, ecefSRS, sqidTextECEF);
-                        //extent.getSRS()->transformToECEF(sqidTextMap, sqidTextECEF);
-                        osg::Vec3d sqidLocal = sqidTextECEF * world2local;
-
-                        MGRSCoord mgrsCoord;
-                        if ( mgrs.transform( GeoPoint(extent.getSRS(),sqidTextMap,ALTMODE_ABSOLUTE), mgrsCoord) )
-                        {
-                            textSym->size() = 33000.0;
-                            osgText::Text* d = ts.create( mgrsCoord.sqid );
-                            osg::Matrixd textLocal2World;
-                            ecefSRS->createLocalToWorld( sqidTextECEF, textLocal2World );
-                            d->setPosition( sqidLocal );
-                            textGeode->addDrawable( d );
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    osg::Group* group = new osg::Group();
-
-    osg::ref_ptr<const Map> map;
-    if (_map.lock(map))
-    {
-        Style lineStyle;
-        lineStyle.add( options().sqidStyle()->get<LineSymbol>() );
-
-        GeometryCompiler compiler;
-        osg::ref_ptr<Session> session = new Session(map.get());
-        FilterContext context( session.get(), _featureProfile.get(), extent );
-
-        // make sure we get sufficient tessellation:
-        compiler.options().maxGranularity() = 0.25;
-
-        osg::Node* geomNode = compiler.compile(features, lineStyle, context);
-        if ( geomNode ) 
-            group->addChild( geomNode );
-
-        osg::MatrixTransform* mt = new osg::MatrixTransform(local2world);
-        mt->addChild(textGeode);
-        group->addChild( mt );
-
-        Registry::shaderGenerator().run(textGeode, Registry::stateSetCache());
-    }
-
-    return group;
-}
-
-//---------------------------------------------------------------------------
-
-namespace osgEarth { namespace Util
-{
-    // OSG Plugin for loading subsequent graticule levels
-    class MGRSGraticulePseudoLoader : public osgDB::ReaderWriter
-    {
-    public:
-        MGRSGraticulePseudoLoader()
-        {
-            supportsExtension( MGRS_GRATICULE_PSEUDOLOADER_EXTENSION, "osgEarth MGRS graticule" );
-        }
-
-        const char* className() const
-        {
-            return "osgEarth MGRS graticule LOD loader";
-        }
-
-        bool acceptsExtension(const std::string& extension) const
-        {
-            return osgDB::equalCaseInsensitive(extension, MGRS_GRATICULE_PSEUDOLOADER_EXTENSION);
-        }
-
-        ReadResult readNode(const std::string& uri, const Options* options) const
-        {        
-            std::string ext = osgDB::getFileExtension( uri );
-            if ( !acceptsExtension( ext ) )
-                return ReadResult::FILE_NOT_HANDLED;
-
-            if ( !options )
-            {
-                OE_WARN << LC << "INTERNAL ERROR: MGRSGraticule object not present in Options (1)\n";
-                return ReadResult::ERROR_IN_READING_FILE;
-            }
-
-            osg::ref_ptr<MGRSGraticule> graticule;
-            if (!OptionsData<MGRSGraticule>::lock(options, "osgEarth.MGRSGraticule", graticule))
-            {
-                OE_WARN << LC << "INTERNAL ERROR: MGRSGraticule object not present in Options (2)\n";
-                return ReadResult::ERROR_IN_READING_FILE;
-            }
-
-            std::string def = osgDB::getNameLessExtension(uri);
-            std::string gzd = osgDB::getNameLessExtension(def);
-            
-            osg::Node* result = graticule->buildSQIDTiles( gzd );
-
-            return result ? ReadResult(result) : ReadResult::ERROR_IN_READING_FILE;
-        }
-    };
-    REGISTER_OSGPLUGIN(MGRS_GRATICULE_PSEUDOLOADER_EXTENSION, MGRSGraticulePseudoLoader);
-
-} } // namespace osgEarth::Util
-
-#endif
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/MouseCoordsTool osgearth-2.10.2+dfsg/src/osgEarthUtil/MouseCoordsTool
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/MouseCoordsTool	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/MouseCoordsTool	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/MouseCoordsTool.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/MouseCoordsTool.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/MouseCoordsTool.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/MouseCoordsTool.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,13 +18,8 @@
  */
 
 #include <osgEarthUtil/MouseCoordsTool>
-#include <osgEarthUtil/LatLongFormatter>
 #include <osgEarth/MapNode>
-#include <osgEarth/Terrain>
 #include <osgEarth/TerrainEngineNode>
-#include <osgViewer/View>
-#include <osgUtil/LineSegmentIntersector>
-#include <osgEarth/Registry>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
@@ -86,11 +81,18 @@
 {
     if ( _label.valid() )
     {
+        osg::Vec3d eye, center, up;
+        view->getCamera()->getViewMatrixAsLookAt(eye, center, up);
+        osg::Vec3d world;
+        mapCoords.toWorld(world);
+        double range = (eye-world).length();
+
         if ( _formatter )
         {
             _label->setText( Stringify()
                 <<  _formatter->format( mapCoords )
                 << ", " << mapCoords.z() 
+                << "; RNG:" << range
                 << "  |  "
                 << mapCoords.getSRS()->getName() );
         }
@@ -101,6 +103,7 @@
                 << mapCoords.x()
                 << ", " << mapCoords.y()
                 << ", " << mapCoords.z()
+                << "; RNG:" << range
                 << "  |  "
                 << mapCoords.getSRS()->getName() );
         }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/MultiElevationLayer osgearth-2.10.2+dfsg/src/osgEarthUtil/MultiElevationLayer
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/MultiElevationLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/MultiElevationLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -60,7 +60,7 @@
     class OSGEARTHUTIL_EXPORT MultiElevationLayer : public ElevationLayer
     {
     public:
-        META_Layer(osgEarth, MultiElevationLayer, MultiElevationLayerOptions);
+        META_Layer(osgEarth, MultiElevationLayer, MultiElevationLayerOptions, multi_elevation);
 
         //! Create a blank layer to be configurated through options().
         MultiElevationLayer();
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/MultiElevationLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/MultiElevationLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/MultiElevationLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/MultiElevationLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -47,7 +47,6 @@
 MultiElevationLayerOptions::getConfig() const
 {
     Config conf = ElevationLayerOptions::getConfig();
-    conf.key() = "multi_elevation";
     Config layers("layers");
     for (std::vector<ConfigOptions>::const_iterator i = _layers.begin(); i != _layers.end(); ++i)
         layers.add(i->getConfig());
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/NightColorFilter osgearth-2.10.2+dfsg/src/osgEarthUtil/NightColorFilter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/NightColorFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/NightColorFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/NightColorFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/NightColorFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/NightColorFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/NightColorFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -38,19 +38,43 @@
         "#version " GLSL_VERSION_STR "\n"
         GLSL_DEFAULT_PRECISION_FLOAT "\n"
 
-        "in vec3 atmos_lightDir;\n"    // light direction (view coords)
-        "in vec3 atmos_up;\n"          // earth up vector at fragment (in view coords)
+        "#pragma import_defines(OE_NUM_LIGHTS)\n"
+
+        "struct osg_LightSourceParameters\n"
+        "{\n"
+        "    vec4 ambient;\n"
+        "    vec4 diffuse;\n"
+        "    vec4 specular;\n"
+        "    vec4 position;\n"
+        "    vec3 spotDirection;\n"
+        "    float spotExponent;\n"
+        "    float spotCutoff;\n"
+        "    float spotCosCutoff;\n"
+        "    float constantAttenuation;\n"
+        "    float linearAttenuation;\n"
+        "    float quadraticAttenuation;\n"
+        "    bool enabled;\n"
+        "};\n"
+
+        "#if OE_NUM_LIGHTS>0\n"
+        "  uniform osg_LightSourceParameters osg_LightSource[OE_NUM_LIGHTS];\n"
+        "#endif\n"
+
+        // stage global - interpolated UP vector at fragment
+        "vec3 vp_Normal;\n"
 
         "void __ENTRY_POINT__(inout vec4 color)\n"
         "{\n"
-        "    vec3 L = normalize(atmos_lightDir);\n"
-        "    vec3 N = normalize(atmos_up);\n"
+        "#if OE_NUM_LIGHTS>0\n"
+        "    vec3 L = normalize(osg_LightSource[0].position.xyz);\n"
+        "    vec3 N = normalize(vp_Normal);\n"
         "    float NdotL = dot(N,L);\n"
         "    float vmin = -0.25;\n"
         "    float vmax = 0.0;\n"
         //   Remap the -0.25 to 0 to 0 to 1.0
         "    float day = (clamp( NdotL, vmin, vmax) - vmin)/(vmax-vmin);\n"
         "    color.a *= (1.0 - day);\n"
+        "#endif\n"
         "} \n";
 }
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Ocean osgearth-2.10.2+dfsg/src/osgEarthUtil/Ocean
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Ocean	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Ocean	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 #include <osgEarth/Config>
 #include <osgEarth/SpatialReference>
 #include <osgEarth/Profile>
+#include <osgEarth/VisibleLayer>
 #include <osg/Group>
 #include <osg/View>
 #include <osgDB/ReaderWriter>
@@ -41,9 +42,9 @@
 namespace osgEarth { namespace Util 
 {
     using namespace osgEarth;
-
     /**
      * Base Options structure for loading an Ocean node from a plugin.
+     * @deprecated (remove after 2.10)
      */
     class OSGEARTHUTIL_EXPORT OceanOptions : public DriverConfigOptions
     {
@@ -65,9 +66,9 @@
         optional<float> _maxAltitude;
     };
 
-
     /**
     * Interface for a Node that renders an ocean surface.
+    * @deprecated (remove after 2.10)
     */
     class OSGEARTHUTIL_EXPORT OceanNode : public osg::Group
     {
@@ -124,6 +125,7 @@
 
     /**
      * Base class for an ocean driver plugin implementation.
+     * @deprecated (remove after 2.10)
      */
     class OSGEARTHUTIL_EXPORT OceanDriver : public osgDB::ReaderWriter
     {
@@ -137,6 +139,7 @@
      * convert the ocean extensions into proper NodeKits, at which point this method
      * will probably be no longer necessary since you can just link with the library
      * and create the OceanNode normally.
+     * @deprecated (remove after 2.10)
      */
     class /*header-only*/ OceanNodeFactory
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Ocean.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/Ocean.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Ocean.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Ocean.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,10 +20,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarthUtil/Ocean>
-#include <osgEarth/Registry>
 #include <osgEarth/CullingUtils>
 #include <osgEarth/MapNode>
-#include <osgDB/ReadFile>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
@@ -43,7 +41,7 @@
 void
 OceanOptions::fromConfig( const Config& conf )
 {
-    conf.getIfSet( "max_altitude", _maxAltitude );
+    conf.get( "max_altitude", _maxAltitude );
 }
 
 void
@@ -57,7 +55,7 @@
 OceanOptions::getConfig() const
 {
     Config conf = DriverConfigOptions::getConfig();
-    conf.addIfSet( "max_altitude", _maxAltitude );
+    conf.set( "max_altitude", _maxAltitude );
     return conf;
 }
 
@@ -117,7 +115,7 @@
 
             // clamp the absolute value so it will work above or below sea level
             // and so we don't attempt to set the near clip below 1:
-            altitude = std::max( ::fabs(altitude), 1.0 );
+            altitude = osg::maximum( ::fabs(altitude), 1.0 );
 
             // we don't want the ocean participating in the N/F calculation:
             osg::CullSettings::ComputeNearFarMode mode = cv->getComputeNearFarMode();
@@ -132,7 +130,7 @@
             // plane distance. Close enough and errs on the safe side.
             double oldNear = cv->getCalculatedNearPlane();
 
-            double newNear = std::min( oldNear, altitude );
+            double newNear = osg::minimum( oldNear, altitude );
             if ( newNear < oldNear )
             {
                 cv->setCalculatedNearPlane( newNear );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/PolyhedralLineOfSight osgearth-2.10.2+dfsg/src/osgEarthUtil/PolyhedralLineOfSight
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/PolyhedralLineOfSight	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/PolyhedralLineOfSight	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
-* http://osgearth.org
-*
-* osgEarth is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-* IN THE SOFTWARE.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-#ifndef OSGEARTHUTIL_VOLUME_LINEOFSIGHT
-#define OSGEARTHUTIL_VOLUME_LINEOFSIGHT 1
-
-#include <osgEarthUtil/LineOfSight>
-#include <osgEarth/MapNode>
-#include <osgEarth/GeoData>
-#include <osgEarth/Units>
-#include <osgEarthAnnotation/GeoPositionNode>
-#include <osgEarth/Terrain>
-#include <osg/Geode>
-
-namespace osgEarth { namespace Util
-{
-    using namespace osgEarth;
-    using namespace osgEarth::Annotation;
-
-    /**
-     * A Node that display a line of sight polytope.
-     */
-    class OSGEARTHUTIL_EXPORT PolyhedralLineOfSightNode : public GeoPositionNode
-    {
-    public:
-        /**
-         * Constructs a new PolyhedralLineOfSightNode.
-         * @param mapNode MapNode this LOS is operating under.
-         */
-        PolyhedralLineOfSightNode( MapNode* mapNode );
-
-        virtual ~PolyhedralLineOfSightNode();
-
-        /**
-         * The maximum sampling range from the center point
-         */
-        void setDistance( const Distance& value );
-        const Distance& getDistance() const { return _distance; }
-
-        /** 
-         * The azimuthal range for the LOS sampling
-         */
-        void setAzimuthalRange( const Angle& start, const Angle& end );
-        void getAximuthalRange( Angle& out_start, Angle& out_end );
-
-        /**
-         * The elevation (pitch) range for the LOS sampling
-         */
-        void setElevationRange( const Angle& start, const Angle& end );
-        void getElevationRange( Angle& out_start, Angle& out_end );
-
-        /**
-         * The sample spacing (in both azimuth and elevation)
-         */
-        void setSampleSpacing( const Angle& spacing );
-        const Angle& getSampleSpacing() const { return _spacing; }
-
-        /**
-         * Manage callbacks that report whether the LOS has changed
-         */
-        void addChangedCallback( LOSChangedCallback* callback );
-        void removeChangedCallback( LOSChangedCallback* callback );
-
-    public: // GeoPositionNode
-        
-        virtual void setPosition( const GeoPoint& pos );
-
-    public: // MapNodeObserver
-
-        virtual void setMapNode( MapNode* mapNode );
-
-    public:
-        // internal: called when the underlying terrain changes and resampling
-        // is required
-        void terrainChanged( const osgEarth::TileKey& tileKey, osg::Node* terrain );
-
-        virtual void traverse(osg::NodeVisitor& nv);
-
-    protected:
-
-        Angle                  _startAzim, _endAzim;
-        Angle                  _startElev, _endElev;
-        Angle                  _spacing;
-        Distance               _distance;
-        LOSChangedCallbackList _changedCallbacks;
-        unsigned               _numRows;
-        unsigned               _numCols;
-        osg::Geode*            _geode;
-        GeoExtent              _extent;
-
-        osg::ref_ptr<osg::MatrixTransform> _xform;
-
-        osg::ref_ptr< TerrainCallback > _terrainCallback;
-
-        void dirty();
-        void rebuildGeometry();
-        void updateSamples();
-        void recalculateExtent();
-    };
-
-} } // namespace osgEarth::Util
-
-#endif // OSGEARTHUTIL_VOLUME_LINEOFSIGHT
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/PolyhedralLineOfSight.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/PolyhedralLineOfSight.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/PolyhedralLineOfSight.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/PolyhedralLineOfSight.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,407 +0,0 @@
-/* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
-* http://osgearth.org
-*
-* osgEarth is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-* IN THE SOFTWARE.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-#include <osgEarthUtil/PolyhedralLineOfSight>
-
-
-#include <osgUtil/LineSegmentIntersector>
-#include <osgUtil/IntersectionVisitor>
-#include <osg/CullFace>
-
-#define LC "[PolyhedralLineOfSight] "
-
-using namespace osgEarth;
-using namespace osgEarth::Util;
-
-//------------------------------------------------------------------------
-
-namespace
-{
-    struct TerrainChangedCallback : public osgEarth::TerrainCallback
-    {
-        TerrainChangedCallback( PolyhedralLineOfSightNode* los ) : _los(los) { }
-        void onTileAdded(const osgEarth::TileKey& tileKey, osg::Node* graph, TerrainCallbackContext& ) {
-            _los->terrainChanged( tileKey, graph );
-        }
-        PolyhedralLineOfSightNode* _los;
-    };
-}
-
-//------------------------------------------------------------------------
-
-PolyhedralLineOfSightNode::PolyhedralLineOfSightNode( MapNode* mapNode ) :
-GeoPositionNode( mapNode ),
-_startAzim   ( Angle(-45.0, Units::DEGREES) ),
-_endAzim     ( Angle( 45.0, Units::DEGREES) ),
-_startElev   ( Angle(  0.0, Units::DEGREES) ),
-_endElev     ( Angle( 45.0, Units::DEGREES) ),
-_spacing     ( Angle(  5.0, Units::DEGREES) ),
-_distance    ( Distance(50000.0, Units::METERS) )
-{
-    OE_WARN << LC << "This class is under development; use at your own risk" << std::endl;
-
-    _xform = new osg::MatrixTransform();
-    this->addChild( _xform.get() );
-
-    _geode = new osg::Geode();
-    rebuildGeometry();
-    recalculateExtent();
-
-    _xform->addChild( _geode );
-
-    _terrainCallback = new TerrainChangedCallback(this);
-    
-    if ( mapNode )
-        mapNode->getTerrain()->addTerrainCallback( _terrainCallback.get() );
-
-    osg::StateSet* stateSet = this->getOrCreateStateSet();
-    stateSet->setMode( GL_BLEND, 1 );
-    stateSet->setRenderingHint( osg::StateSet::TRANSPARENT_BIN );
-    stateSet->setAttributeAndModes( new osg::CullFace(osg::CullFace::BACK), 1 );
-}
-
-
-PolyhedralLineOfSightNode::~PolyhedralLineOfSightNode()
-{
-    if (_terrainCallback && getMapNode() )
-    {
-        getMapNode()->getTerrain()->removeTerrainCallback( _terrainCallback.get() );
-    }
-}
-
-void
-PolyhedralLineOfSightNode::setMapNode( MapNode* mapNode )
-{
-    osg::ref_ptr<MapNode> oldMapNode = getMapNode();
-    if ( oldMapNode.valid() )
-    {
-        if ( _terrainCallback.valid() )
-        {
-            oldMapNode->getTerrain()->removeTerrainCallback( _terrainCallback.get() );
-        }
-        if ( mapNode )
-        {
-            mapNode->getTerrain()->addTerrainCallback( _terrainCallback.get() );
-        }
-    }
-
-    GeoPositionNode::setMapNode( mapNode );
-}
-
-void
-PolyhedralLineOfSightNode::setDistance( const Distance& value )
-{
-    _distance = value;
-    recalculateExtent();
-    updateSamples();
-}
-
-
-void
-PolyhedralLineOfSightNode::setAzimuthalRange(const Angle& start,
-                                             const Angle& end)
-{
-    _startAzim = start;
-    _endAzim   = end;
-    rebuildGeometry();
-    updateSamples();
-}
-
-
-void
-PolyhedralLineOfSightNode::setElevationRange(const Angle& start,
-                                             const Angle& end)
-{
-    _startElev = start;
-    _endElev   = end;
-    rebuildGeometry();
-    updateSamples();
-}
-
-
-void
-PolyhedralLineOfSightNode::setSampleSpacing(const Angle& value)
-{
-    _spacing = value;
-    rebuildGeometry();
-    updateSamples();
-}
-
-
-void 
-PolyhedralLineOfSightNode::terrainChanged(const osgEarth::TileKey& tileKey,
-                                          osg::Node*               patch)
-{
-    if ( tileKey.getExtent().intersects(_extent) )
-    {
-        updateSamples();
-    }
-}
-
-
-void 
-PolyhedralLineOfSightNode::traverse(osg::NodeVisitor& nv)
-{
-    osg::Group::traverse( nv );
-}
-
-
-void
-PolyhedralLineOfSightNode::setPosition(const GeoPoint& pos)
-{
-    GeoPositionNode::setPosition( pos );
-    recalculateExtent();
-    updateSamples();
-}
-
-
-void
-PolyhedralLineOfSightNode::dirty()
-{
-    //todo
-}
-
-
-void
-PolyhedralLineOfSightNode::recalculateExtent()
-{
-    // get a local2world matrix for the map position:
-    GeoPoint absMapPos = getPosition();
-    absMapPos.makeAbsolute( getMapNode()->getTerrain() );
-    osg::Matrix local2world;
-    absMapPos.createLocalToWorld( local2world );
-
-    // local offsets (east and north)
-    osg::Vec3d x( _distance.as(Units::METERS), 0.0, 0.0 );
-    osg::Vec3d y( 0.0, _distance.as(Units::METERS), 0.0 );
-
-    // convert these to map coords:
-    GeoPoint easting, northing;
-    easting.fromWorld( getMapNode()->getMapSRS(), x * local2world );
-    northing.fromWorld( getMapNode()->getMapSRS(), y * local2world );
-
-    // calculate the offsets:
-    double d_easting = easting.x() - absMapPos.x();
-    double d_northing = northing.y() - absMapPos.y();
-
-    // update the extent.
-    _extent = GeoExtent(
-        getMapNode()->getMapSRS(),
-        absMapPos.x() - d_easting, absMapPos.y() - d_northing,
-        absMapPos.x() + d_easting, absMapPos.y() + d_northing );
-
-    OE_INFO << LC << "Cached extent = " << _extent.toString() << std::endl;
-}
-
-
-// Builds the initial basic geometry set. This needs to happen (a) on startup, and 
-// (b) if something changes that would alter the vertex count or unit vector
-void
-PolyhedralLineOfSightNode::rebuildGeometry()
-{
-    // clear out the node first.
-    _geode->removeDrawables( 0, _geode->getNumDrawables() );
-
-    osg::Geometry* geom = new osg::Geometry();
-    geom->setUseVertexBufferObjects( true );
-
-    osg::Vec3Array* verts = new osg::Vec3Array();
-    geom->setVertexArray( verts );
-    verts->getVertexBufferObject()->setUsage(GL_DYNAMIC_DRAW_ARB);
-
-    osg::Vec4Array* colors = new osg::Vec4Array();
-    geom->setColorArray( colors );
-    geom->setColorBinding( osg::Geometry::BIND_PER_VERTEX );
-
-    osg::Vec3Array* normals = new osg::Vec3Array();
-    geom->setNormalArray( normals );
-    geom->setNormalBinding( osg::Geometry::BIND_PER_VERTEX );
-
-    double azim0   = _startAzim.as(Units::RADIANS);
-    double azim1   = _endAzim.as(Units::RADIANS);
-    double elev0   = _startElev.as(Units::RADIANS);
-    double elev1   = _endElev.as(Units::RADIANS);
-    double spacing = _spacing.as(Units::RADIANS);
-    if ( spacing <= 0.0 )
-        spacing = 0.1;
-
-    // the origin point
-    verts->push_back  ( osg::Vec3(0.0f, 0.0f, 0.0f) );
-    normals->push_back( osg::Vec3(0.0f, 0.0f, 1.0f) );
-    colors->push_back ( osg::Vec4(1.0f, 1.0f, 0.0f, 1.0f) );
-
-    // Build the unit-vector vertex list. Later this will be updated
-    // in updateGeometry.
-    _numRows = 0;
-    bool lastElev = false;
-    for( double elev = elev0; !lastElev; elev += spacing, _numRows++ )
-    {
-        if ( elev >= elev1 ) 
-        {
-            elev = elev1;
-            lastElev = true;
-        }
-
-        double cos_elev = cos(elev), sin_elev = sin(elev);
-
-        _numCols = 0;
-        bool lastAzim = false;
-        for( double azim = azim0; !lastAzim; azim += spacing, _numCols++ )
-        {
-            if ( azim >= azim1 )
-            {
-                azim = azim1;
-                lastAzim = true;
-            }
-
-            double cos_azim = cos(azim), sin_azim = sin(azim);
-
-            double x = cos_elev * sin_azim;
-            double y = cos_elev * cos_azim;
-            double z = sin_elev;
-
-            verts->push_back  ( osg::Vec3(x, y, z) );
-            normals->push_back( osg::Vec3(x, y, z) );
-            colors->push_back ( osg::Vec4(0,1,0,0.5f) );
-        }
-    }
-
-    // Build the primitive sets to render the polyhedron.
-    // first the walls.
-    osg::DrawElements* de = 
-        verts->size() > 0xFFFF ? (osg::DrawElements*)new osg::DrawElementsUShort  ( GL_TRIANGLES ) :
-        verts->size() > 0xFF   ? (osg::DrawElements*)new osg::DrawElementsUShort( GL_TRIANGLES ) :
-                                 (osg::DrawElements*)new osg::DrawElementsUByte ( GL_TRIANGLES );
-
-    unsigned rowOffset = 1; // to account for the origin point
-
-    OE_NOTICE << LC << "numRows = " << _numRows << ", numCols = " << _numCols << std::endl;
-
-    // outer surface
-    for( unsigned r=0; r<_numRows-1; ++r )
-    {
-        for( unsigned c=0; c<_numCols-1; ++c )
-        {
-            unsigned i  = rowOffset + c;
-            unsigned i2 = rowOffset + c + _numCols;
-
-            de->addElement( i );
-            de->addElement( i+1 );
-            de->addElement( i2 );
-            de->addElement( i2 );
-            de->addElement( i+1 );
-            de->addElement( i2+1 );
-        }
-        rowOffset += _numCols;
-    }
-
-#if 1
-    // top cap
-    for( unsigned c=0; c<_numCols-1; ++c )
-    {
-        de->addElement( 0 );
-        de->addElement( rowOffset + c + 1 );
-        de->addElement( rowOffset + c );
-    }
-#endif
-
-    geom->addPrimitiveSet( de );
-
-    // finally, make the geode and attach it.
-    _geode->addDrawable( geom );
-}
-
-
-void
-PolyhedralLineOfSightNode::updateSamples()
-{
-    if ( _geode->getNumDrawables() == 0 )
-        rebuildGeometry();
-
-    osg::Geometry* geom  = _geode->getDrawable(0)->asGeometry();
-    osg::Vec3Array* verts = dynamic_cast<osg::Vec3Array*>( geom->getVertexArray() );
-    if (!verts)
-        return;
-
-    double distance = _distance.as(Units::METERS);
-
-    // get the world coords and a l2w transform for the origin:
-    osg::Vec3d  originWorld;
-    osg::Matrix local2world, world2local;
-
-    Terrain* t = getMapNode()->getTerrain();
-    GeoPoint origin = getPosition();
-    origin.makeAbsolute( t );
-    origin.toWorld( originWorld, t );
-    origin.createLocalToWorld( local2world );
-    world2local.invert( local2world );
-
-    // set up an intersector:
-    osgUtil::LineSegmentIntersector* lsi = new osgUtil::LineSegmentIntersector( originWorld, originWorld );
-    osgUtil::IntersectionVisitor iv( lsi );
-
-    // intersect the verts (skip the origin point) with the map node.
-    for( osg::Vec3Array::iterator v = verts->begin()+1; v != verts->end(); ++v )
-    {
-        osg::Vec3d unit = *v;
-        unit.normalize();
-        unit *= distance;
-
-        osg::Vec3d world = unit * local2world;
-
-        if ( osg::equivalent(unit.length(), 0.0) )
-        {
-            OE_WARN << "problem." << std::endl;
-        }
-
-        lsi->reset();
-        lsi->setStart( originWorld );
-        lsi->setEnd( world );
-
-        OE_DEBUG << LC << "Ray: " <<
-            originWorld.x() << "," << originWorld.y() << "," << originWorld.z() << " => "
-            << world.x() << "," << world.y() << "," << world.z()
-            << std::endl;
-
-
-        getMapNode()->getTerrain()->accept( iv );
-
-        osgUtil::LineSegmentIntersector::Intersections& hits = lsi->getIntersections();
-        if ( !hits.empty() )
-        {
-            const osgUtil::LineSegmentIntersector::Intersection& hit = *hits.begin();
-            osg::Vec3d newV = hit.getWorldIntersectPoint() * world2local;
-            if ( newV.length() > 1.0 )
-                *v = newV;
-            else
-                *v = unit;
-        }
-        else
-        {
-            *v = unit;
-        }
-
-        //OE_NOTICE << "Radial point = " << v->x() << ", " << v->y() << ", " << v->z() << std::endl;
-    }
-
-    verts->dirty();
-    geom->dirtyBound();
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/RadialLineOfSight osgearth-2.10.2+dfsg/src/osgEarthUtil/RadialLineOfSight
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/RadialLineOfSight	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/RadialLineOfSight	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/RadialLineOfSight.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/RadialLineOfSight.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/RadialLineOfSight.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/RadialLineOfSight.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,10 +21,7 @@
 */
 #include <osgEarthUtil/RadialLineOfSight>
 #include <osgEarth/TerrainEngineNode>
-#include <osgUtil/LineSegmentIntersector>
-#include <osgSim/LineOfSight>
-#include <osgUtil/IntersectionVisitor>
-#include <osgUtil/LineSegmentIntersector>
+#include <osgEarth/GLUtils>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
@@ -269,11 +266,10 @@
     verts->reserve(_numSpokes * 5);
     geometry->setVertexArray( verts );
 
-    osg::Vec4Array* colors = new osg::Vec4Array();
+    osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
     colors->reserve( _numSpokes * 5 );
 
     geometry->setColorArray( colors );
-    geometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
 
     osg::Vec3d previousEnd;
     osg::Vec3d firstEnd;
@@ -371,7 +367,7 @@
     osg::Geode* geode = new osg::Geode();
     geode->addDrawable( geometry );
 
-    getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    GLUtils::setLighting(getOrCreateStateSet(), osg::StateAttribute::OFF);
 
     osg::MatrixTransform* mt = new osg::MatrixTransform;
     mt->setMatrix(osg::Matrixd::translate(_centerWorld));
@@ -415,11 +411,10 @@
     verts->reserve(_numSpokes * 2);
     geometry->setVertexArray( verts );
 
-    osg::Vec4Array* colors = new osg::Vec4Array();
+    osg::Vec4Array* colors = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
     colors->reserve( _numSpokes * 2 );
 
     geometry->setColorArray( colors );
-    geometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
 
     osg::ref_ptr<osgUtil::IntersectorGroup> ivGroup = new osgUtil::IntersectorGroup();
 
@@ -562,7 +557,7 @@
     osg::Geode* geode = new osg::Geode();
     geode->addDrawable( geometry );
 
-    getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    GLUtils::setLighting(getOrCreateStateSet(), osg::StateAttribute::OFF);
     getOrCreateStateSet()->setMode(GL_BLEND, osg::StateAttribute::ON);
 
     osg::MatrixTransform* mt = new osg::MatrixTransform;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/RGBColorFilter osgearth-2.10.2+dfsg/src/osgEarthUtil/RGBColorFilter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/RGBColorFilter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/RGBColorFilter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/RGBColorFilter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/RGBColorFilter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/RGBColorFilter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/RGBColorFilter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/RTTPicker osgearth-2.10.2+dfsg/src/osgEarthUtil/RTTPicker
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/RTTPicker	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/RTTPicker	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/RTTPicker.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/RTTPicker.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/RTTPicker.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/RTTPicker.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -17,14 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 #include <osgEarthUtil/RTTPicker>
-#include <osgEarth/VirtualProgram>
+#include <osgEarthUtil/Shaders>
 #include <osgEarth/ImageUtils>
 #include <osgEarth/Registry>
-#include <osgEarth/ShaderLoader>
-#include <osgEarth/ObjectIndex>
-#include <osgEarth/Utils>
+#include <osgEarth/GLUtils>
 
-#include <osgDB/WriteFile>
 #include <osg/BlendFunc>
 
 using namespace osgEarth;
@@ -55,54 +52,6 @@
             }
         }
     };
-
-    // SHADERS for the RTT pick camera.
-
-    const char* pickVertexEncode =
-        "#version " GLSL_VERSION_STR "\n"
-        GLSL_DEFAULT_PRECISION_FLOAT "\n"
-
-        "#pragma vp_entryPoint oe_pick_encodeObjectID\n"
-        "#pragma vp_location   vertex_clip\n"
-        
-        "uint oe_index_objectid; \n"                        // Vertex stage global containing the Object ID; set in ObjectIndex shader.
-
-        "flat out vec4 oe_pick_encoded_objectid; \n"        // output encoded oid to fragment shader
-        "flat out int oe_pick_color_contains_objectid; \n"  // whether color already contains oid (written by another RTT camera)
-
-        "void oe_pick_encodeObjectID(inout vec4 vertex) \n"
-        "{ \n"
-        "    oe_pick_color_contains_objectid = (oe_index_objectid == 1u) ? 1 : 0; \n"
-        "    if ( oe_pick_color_contains_objectid == 0 ) \n"
-        "    { \n"
-        "        float b0 = float((oe_index_objectid & 0xff000000u) >> 24u); \n"
-        "        float b1 = float((oe_index_objectid & 0x00ff0000u) >> 16u); \n"
-        "        float b2 = float((oe_index_objectid & 0x0000ff00u) >> 8u ); \n"
-        "        float b3 = float((oe_index_objectid & 0x000000ffu)       ); \n"
-        "        oe_pick_encoded_objectid = vec4(b0, b1, b2, b3) / 255.0; \n"
-        "    } \n"
-        "} \n";
-
-    const char* pickFragment =
-        "#version " GLSL_VERSION_STR "\n"
-        GLSL_DEFAULT_PRECISION_FLOAT "\n"
-
-        "#pragma vp_entryPoint oe_pick_renderEncodedObjectID\n"
-        "#pragma vp_location   fragment_output\n"
-        "#pragma vp_order      last\n"
-
-        "flat in vec4 oe_pick_encoded_objectid; \n"
-        "flat in int oe_pick_color_contains_objectid; \n"
-        
-        "out vec4 fragColor; \n"
-
-        "void oe_pick_renderEncodedObjectID(inout vec4 color) \n"
-        "{ \n"
-        "    if ( oe_pick_color_contains_objectid == 1 ) \n"
-        "        fragColor = color; \n"
-        "    else \n"
-        "        fragColor = oe_pick_encoded_objectid; \n"
-        "} \n";
 }
 
 VirtualProgram* 
@@ -112,10 +61,8 @@
     vp->setName( "osgEarth::RTTPicker" );
 
     // Install RTT picker shaders:
-    ShaderPackage pickShaders;
-    pickShaders.add( "RTTPicker.vert.glsl", pickVertexEncode );
-    pickShaders.add( "RTTPicker.frag.glsl", pickFragment );
-    pickShaders.loadAll( vp );
+    Shaders shaders;
+    shaders.load(vp, shaders.RTTPicker);
 
     // Install shaders and bindings from the ObjectIndex:
     Registry::objectIndex()->loadShaders( vp );
@@ -129,13 +76,13 @@
     _group = new osg::Group();
 
     // Size of the RTT camera image
-    _rttSize = std::max(cameraSize, 4);    
+    _rttSize = osg::maximum(cameraSize, 4);    
 
     // pixels around the click to test
     _buffer = 2;
     
     // Cull mask for RTT cameras
-    _cullMask = ~0;
+    _cullMask = ~0u;
 }
 
 RTTPicker::~RTTPicker()
@@ -226,6 +173,7 @@
 
     c._image = new osg::Image();
     c._image->allocateImage(_rttSize, _rttSize, 1, GL_RGBA, GL_UNSIGNED_BYTE);    
+    memset(c._image->data(), 0, _rttSize * _rttSize * 4);
     
     // Make an RTT camera and bind it to our image.
     // Note: don't use RF_INHERIT_VIEWPOINT because it's unnecessary and
@@ -254,7 +202,7 @@
     osg::StateAttribute::GLModeValue disable = 
         osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE | osg::StateAttribute::PROTECTED;
 
-    rttSS->setMode(GL_LIGHTING,  disable );
+    GLUtils::setLighting(rttSS, disable);
     rttSS->setMode(GL_CULL_FACE, disable );
     rttSS->setMode(GL_ALPHA_TEST, disable );
 
@@ -355,7 +303,7 @@
     float v = (mouseY - (float)vp->y())/(float)vp->height();
 
     // check the bounds:
-    if ( u < 0.0f || u > 1.0f || v < 0.0f || v > 1.0f )
+    if ( u < 0.0f || u >= 1.0f || v < 0.0f || v >= 1.0f )
         return false;
 
     // install the RTT pick camera under this view's camera if it's not already:
@@ -376,7 +324,7 @@
     pick._context->_numPicks++;
     if (pick._context->_numPicks == 1)
     {
-        pick._context->_pickCamera->setNodeMask(~0);
+        pick._context->_pickCamera->setNodeMask(~0u);
     }
     
     return true;
@@ -443,16 +391,24 @@
         bool next()
         {
             // first time, just use the start point
-            if ( _count++ == 0 )
-                return true;
+            if (_count == 0)
+            {
+                if (_offsetX < 0 || _offsetX >= _w || _offsetY < 0 || _offsetY >= _h)
+                    return false;
+                else
+                {
+                    _count++;
+                    return true;
+                }
+            }
 
             // spiral until we get to the next valid in-bounds pixel:
             do {
                 switch(_leg) {
-                case 0: ++_x; if (  _x == _ring ) ++_leg; break;
-                case 1: ++_y; if (  _y == _ring ) ++_leg; break;
-                case 2: --_x; if ( -_x == _ring ) ++_leg; break;
-                case 3: --_y; if ( -_y == _ring ) { _leg = 0; ++_ring; } break;
+                case 0: ++_x; if (  _x == (int)_ring ) ++_leg; break;
+                case 1: ++_y; if (  _y == (int)_ring ) ++_leg; break;
+                case 2: --_x; if ( -_x == (int)_ring ) ++_leg; break;
+                case 3: --_y; if ( -_y == (int)_ring ) { _leg = 0; ++_ring; } break;
                 }
             }
             while(_ring <= _maxRing && (_x+_offsetX < 0 || _x+_offsetX >= _w || _y+_offsetY < 0 || _y+_offsetY >= _h));
@@ -479,7 +435,7 @@
 
     bool hit = false;
     osg::Vec4f value;
-    SpiralIterator iter(image->s(), image->t(), std::max(_buffer,1), pick._u, pick._v);
+    SpiralIterator iter(image->s(), image->t(), osg::maximum(_buffer,1), pick._u, pick._v);
     while (iter.next() && (hit == false))
     {
         value = read(iter.s(), iter.t());
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/RTTPicker.glsl osgearth-2.10.2+dfsg/src/osgEarthUtil/RTTPicker.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/RTTPicker.glsl	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/RTTPicker.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,63 @@
+#version $GLSL_VERSION_STR
+$GLSL_DEFAULT_PRECISION_FLOAT
+
+#pragma vp_entryPoint oe_pick_encodeObjectID
+#pragma vp_location   vertex_clip
+
+//#define USE_BITWISE_MATH
+        
+// Vertex stage global containing the Object ID; set in ObjectIndex shader.
+uint oe_index_objectid;
+
+// output encoded oid to fragment shader
+flat out vec4 oe_pick_encoded_objectid;
+
+// whether color already contains oid (written by another RTT camera)
+flat out int oe_pick_color_contains_objectid;
+
+void oe_pick_encodeObjectID(inout vec4 vertex)
+{
+    // the color will contain an encoded object ID for draped features.
+    oe_pick_color_contains_objectid = (oe_index_objectid == 1u) ? 1 : 0;
+
+    if ( oe_pick_color_contains_objectid == 0 )
+    {
+        // encode the objectID as a vec4 (color)
+#ifdef USE_BITWISE_MATH
+        uint u0 = (oe_index_objectid & 0xff000000u) >> 24u;
+        uint u1 = (oe_index_objectid & 0x00ff0000u) >> 16u;
+        uint u2 = (oe_index_objectid & 0x0000ff00u) >> 8u;
+        uint u3 = (oe_index_objectid & 0x000000ffu);
+#else
+        uint u0 = (oe_index_objectid / 16777216u);
+        uint u1 = (oe_index_objectid / 65536u) - (u0 * 256u);
+        uint u2 = (oe_index_objectid / 256u) - (u1 * 256u) - (u0 * 65536u);
+        uint u3 = (oe_index_objectid) - (u2 * 256u) - (u1 * 65536u) - (u0 * 16777216u);
+#endif
+        oe_pick_encoded_objectid = vec4(float(u0), float(u1), float(u2), float(u3)) / 255.0;
+    }
+}
+
+
+[break]
+
+
+#version $GLSL_VERSION_STR
+$GLSL_DEFAULT_PRECISION_FLOAT
+
+#pragma vp_entryPoint oe_pick_renderEncodedObjectID
+#pragma vp_location   fragment_output
+#pragma vp_order      last
+
+flat in vec4 oe_pick_encoded_objectid;
+flat in int oe_pick_color_contains_objectid;
+        
+out vec4 fragColor;
+
+void oe_pick_renderEncodedObjectID(inout vec4 color)
+{
+    if ( oe_pick_color_contains_objectid == 1 )
+        fragColor = color;
+    else
+        fragColor = oe_pick_encoded_objectid;
+}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Shaders osgearth-2.10.2+dfsg/src/osgEarthUtil/Shaders
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Shaders	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Shaders	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -49,7 +49,9 @@
             Shadowing_Fragment,
 
             SimpleOceanLayer_Vertex,
-            SimpleOceanLayer_Fragment;
+            SimpleOceanLayer_Fragment,
+            
+            RTTPicker;
 	};	
 } } // namespace osgEarth::Util
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Shaders.cpp.in osgearth-2.10.2+dfsg/src/osgEarthUtil/Shaders.cpp.in
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Shaders.cpp.in	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Shaders.cpp.in	2019-07-11 18:30:19.000000000 +0000
@@ -44,4 +44,7 @@
 
     SimpleOceanLayer_Fragment = "SimpleOceanLayer.frag.glsl";
     _sources[SimpleOceanLayer_Fragment] = "@SimpleOceanLayer.frag.glsl@";
+    
+    RTTPicker = "RTTPicker.glsl";
+    _sources[RTTPicker] = "@RTTPicker.glsl@";
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Shadowing osgearth-2.10.2+dfsg/src/osgEarthUtil/Shadowing
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Shadowing	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Shadowing	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -67,7 +67,7 @@
         unsigned getTraversalMask() const { return _traversalMask; }
 
         /**
-         * Slice ranges. Each slice (the space beteen each value in the list)
+         * Slice ranges. Each slice (the space between each value in the list)
          * represents a single shadow map in the Cascading Shadow Maps 
          * implementation.
          */
@@ -108,6 +108,12 @@
 
         virtual void traverse(osg::NodeVisitor& nv);
 
+    public:
+
+        virtual void resizeGLObjectBuffers(unsigned maxSize);
+
+        virtual void releaseGLObjects(osg::State* state) const;
+
     protected:
         virtual ~ShadowCaster() { }
 
@@ -131,6 +137,7 @@
         osg::ref_ptr<osg::Uniform>  _shadowMapTexGenUniform;
         osg::ref_ptr<osg::Uniform>  _shadowBlurUniform;
         osg::ref_ptr<osg::Uniform>  _shadowColorUniform;
+        osg::ref_ptr<osg::Uniform>  _shadowToPrimaryMatrix;
     };
 
 } } // namespace osgEarth::Util
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Shadowing.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/Shadowing.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Shadowing.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Shadowing.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -22,13 +22,10 @@
 #include <osgEarthUtil/Shadowing>
 #include <osgEarthUtil/Shaders>
 #include <osgEarth/CullingUtils>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/Registry>
 #include <osgEarth/Capabilities>
 #include <osgEarth/Shadowing>
-#include <osg/Texture2D>
 #include <osg/CullFace>
-#include <osg/ValueObject>
 #include <osgShadow/ConvexPolyhedron>
 
 #define LC "[ShadowCaster] "
@@ -52,7 +49,7 @@
         // default slices:
         _ranges.push_back(0.0f);
         _ranges.push_back(1750.0f);
-        _ranges.push_back(5000.0f);
+        _ranges.push_back(25000.0f);
 
         reinitialize();
     }
@@ -150,15 +147,19 @@
         new osg::CullFace(osg::CullFace::FRONT),
         osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
 
-    //_rttStateSet->addUniform(new osg::Uniform("oe_isShadowCamera", true), osg::StateAttribute::OVERRIDE);
+    // tell the terrain engine this is a depth-only camera
+    //_rttStateSet->setDefine("OE_IS_SHADOW_CAMERA"); // done above in rtt stateset
+
+    // install a shadow-to-primary xform matrix (per frame) so verts match up
+    _shadowToPrimaryMatrix = _rttStateSet->getOrCreateUniform(
+        "oe_shadowToPrimaryMatrix", osg::Uniform::FLOAT_MAT4);
 
-    _rttStateSet->setDefine("OE_IS_SHADOW_CAMERA");
 
     _renderStateSet = new osg::StateSet();
-    
 
     // Establish a Virtual Program on the stateset.
     VirtualProgram* vp = VirtualProgram::getOrCreate(_renderStateSet.get());
+    vp->setName("ShadowCaster");
 
     // Load the shadowing shaders.
     Shaders package;
@@ -187,6 +188,36 @@
 }
 
 void
+ShadowCaster::resizeGLObjectBuffers(unsigned maxSize)
+{
+    if (_light.valid())
+        _light->resizeGLObjectBuffers(maxSize);
+    if (_shadowmap.valid())
+        _shadowmap->resizeGLObjectBuffers(maxSize);
+    if (_rttStateSet.valid())
+        _rttStateSet->resizeGLObjectBuffers(maxSize);
+    if (_renderStateSet.valid())
+        _renderStateSet->resizeGLObjectBuffers(maxSize);
+    for(unsigned i=0; i<_rttCameras.size(); ++i)
+        _rttCameras[i]->resizeGLObjectBuffers(maxSize);
+}
+
+void
+ShadowCaster::releaseGLObjects(osg::State* state) const
+{
+    if (_light.valid())
+        _light->releaseGLObjects(state);
+    if (_shadowmap.valid())
+        _shadowmap->releaseGLObjects(state);
+    if (_rttStateSet.valid())
+        _rttStateSet->releaseGLObjects(state);
+    if (_renderStateSet.valid())
+        _renderStateSet->releaseGLObjects(state);
+    for(unsigned i=0; i<_rttCameras.size(); ++i)
+        _rttCameras[i]->releaseGLObjects(state);
+}
+
+void
 ShadowCaster::traverse(osg::NodeVisitor& nv)
 {
     if (_supported                             && 
@@ -221,8 +252,14 @@
             lightUp = side ^ lightVectorWorld;
             lightUp.normalize();
             lightViewMat.makeLookAt(lightPosWorld, lightPosWorld+lightVectorWorld, lightUp);
+
+            // set the primary-camera-to-shadow-camera transformation matrix,
+            // which lets you perform vertex shader operations from the perspective
+            // of the primary camera (morphing, etc.) so that things match up
+            // between the two cameras.
+            osg::Matrix lightViewMatInv = osg::Matrix::inverse(lightViewMat);
+            _shadowToPrimaryMatrix->set( lightViewMatInv * MV);
             
-            //int i = nv.getFrameStamp()->getFrameNumber() % (_ranges.size()-1);
             int i;
             for(i=0; i < (int) _ranges.size()-1; ++i)
             {
@@ -234,7 +271,7 @@
                 osg::Matrix proj = _prevProjMatrix;
                 double fovy,ar,zn,zf;
                 proj.getPerspective(fovy,ar,zn,zf);
-                proj.makePerspective(fovy,ar,std::max(n,zn),std::min(f,zf));
+                proj.makePerspective(fovy,ar,osg::maximum(n,zn),osg::minimum(f,zf));
                 
                 // extract the corner points of the camera frustum in world space.
                 osg::Matrix MVP = MV * proj;
@@ -253,8 +290,8 @@
                     bbox.expandBy( (*v) * lightViewMat );
 
                 osg::Matrix lightProjMat;
-                n = -std::max(bbox.zMin(), bbox.zMax());
-                f = -std::min(bbox.zMin(), bbox.zMax());
+                n = -osg::maximum(bbox.zMin(), bbox.zMax());
+                f = -osg::minimum(bbox.zMin(), bbox.zMax());
                 // TODO: consider extending "n" so that objects outside the main view can still cast shadows
                 lightProjMat.makeOrtho(bbox.xMin(), bbox.xMax(), bbox.yMin(), bbox.yMax(), n, f);
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/SimpleOceanLayer osgearth-2.10.2+dfsg/src/osgEarthUtil/SimpleOceanLayer
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/SimpleOceanLayer	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/SimpleOceanLayer	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,6 +22,8 @@
 #include <osgEarthUtil/Common>
 #include <osgEarth/Layer>
 #include <osgEarth/LayerListener>
+#include <osgEarth/URI>
+#include <osgEarthUtil/Ocean>
 #include <osgEarthSymbology/Color>
 
 namespace osgEarth {
@@ -33,7 +35,7 @@
     using namespace osgEarth::Symbology;
 
     /**
-     * Serializable configuation options for the SimpleOceanLayer.
+     * Serializable configuration options for the SimpleOceanLayer.
      */
     class OSGEARTHUTIL_EXPORT SimpleOceanLayerOptions : public VisibleLayerOptions
     {
@@ -55,27 +57,40 @@
         optional<bool>& useBathymetry() { return _useBathymetry; }
         const optional<bool>& useBathymetry() const { return _useBathymetry; }
 
+        /** URI of surface texture to apply */
+        optional<URI>& texture() { return _textureURI; }
+        const optional<URI>& texture() const { return _textureURI; }
+
+        /** LOD at which to apply surface texture 1:1 (default = 13) */
+        optional<unsigned>& textureLOD() { return _textureLOD; }
+        const optional<unsigned>& textureLOD() const { return _textureLOD; }
+
     public:
         SimpleOceanLayerOptions(const ConfigOptions& op =ConfigOptions()) : VisibleLayerOptions(op) {
-            _color.init(Color("#1D2C4FE7"));
-            _maxAltitude.init(500000.f);
-            _useBathymetry.init(false);
+            _color.init(Color("#1D2C4FFF"));
+            _maxAltitude.init(1500000.f);
+            _useBathymetry.init(true);
+            _textureLOD.init(13u);
             mergeConfig(_conf);
         }
 
         void mergeConfig(const Config& conf) {
-            conf.getIfSet("color", _color);
-            conf.getIfSet("max_altitude", _maxAltitude);
-            conf.getIfSet("mask_layer", _maskLayer);
-            conf.getIfSet("use_bathymetry", _useBathymetry);
+            conf.get("color", _color);
+            conf.get("max_altitude", _maxAltitude);
+            conf.get("mask_layer", _maskLayer);
+            conf.get("use_bathymetry", _useBathymetry);
+            conf.get("texture", _textureURI);
+            conf.get("texture_lod", _textureLOD);
         }
 
         Config getConfig() const {
-            Config conf;
-            conf.addIfSet("color", _color);
-            conf.addIfSet("max_altitude", _maxAltitude);
-            conf.addIfSet("mask_layer", _maskLayer);
-            conf.addIfSet("use_bathymetry", _useBathymetry);
+            Config conf = VisibleLayerOptions::getConfig();
+            conf.set("color", _color);
+            conf.set("max_altitude", _maxAltitude);
+            conf.set("mask_layer", _maskLayer);
+            conf.set("use_bathymetry", _useBathymetry);
+            conf.set("texture", _textureURI);
+            conf.set("texture_lod", _textureLOD);
             return conf;
         }
 
@@ -84,6 +99,8 @@
         optional<float> _maxAltitude;
         optional<std::string> _maskLayer;
         optional<bool> _useBathymetry;
+        optional<URI> _textureURI;
+        optional<unsigned> _textureLOD;
     };
 
 
@@ -94,7 +111,7 @@
     class OSGEARTHUTIL_EXPORT SimpleOceanLayer : public VisibleLayer
     {
     public:
-        META_Layer(osgEarth, SimpleOceanLayer, SimpleOceanLayerOptions);
+        META_Layer(osgEarth, SimpleOceanLayer, SimpleOceanLayerOptions, simple_ocean);
 
         /** Constructs a new ocean layer */
         SimpleOceanLayer();
@@ -115,13 +132,17 @@
         /** Sets a masking layer, or pass NULL to clear the masking layer. Returns true upon success */
         void setMaskLayer(const ImageLayer* layer);
 
-    public: // Layer
+    public: // Ocean
+        
+        void setSeaLevel(float seaLevel);
+        float getSeaLevel() const;
 
-        /** serialize */
-        virtual Config getConfig() const;
+    public: // Layer
 
         /** callback that ensures proper culling */
         void modifyTileBoundingBox(const TileKey& key, osg::BoundingBox& box) const;
+        
+        void setTerrainResources(TerrainResources* res);
 
     protected: // Layer
 
@@ -138,6 +159,10 @@
     private:
 
         LayerListener<SimpleOceanLayer, const ImageLayer> _layerListener;
+
+        float _seaLevel;
+
+        TextureImageUnitReservation _texReservation;
     };
     
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/SimpleOceanLayer.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/SimpleOceanLayer.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/SimpleOceanLayer.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/SimpleOceanLayer.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -22,11 +22,10 @@
 #include <osgEarthUtil/SimpleOceanLayer>
 #include <osgEarthUtil/Shaders>
 #include <osgEarth/VirtualProgram>
-#include <osgEarth/Lighting>
 #include <osgEarth/ImageLayer>
-#include <osgEarth/Map>
+#include <osgEarth/Lighting>
 #include <osg/CullFace>
-#include <osg/Material>
+#include <osg/Texture2D>
 
 
 using namespace osgEarth;
@@ -36,6 +35,7 @@
 
 
 /** Register this layer so it can be used in an earth file */
+REGISTER_OSGEARTH_LAYER(ocean, SimpleOceanLayer);
 REGISTER_OSGEARTH_LAYER(simple_ocean, SimpleOceanLayer);
 
 
@@ -63,12 +63,13 @@
     VisibleLayer::init();
 
     this->setName("Simple Ocean");
-    setRenderType(RENDERTYPE_TILE);
+    setRenderType(RENDERTYPE_TERRAIN_SURFACE);
 
     osg::StateSet* ss = getOrCreateStateSet();
     ss->setDataVariance(ss->DYNAMIC);
     
     VirtualProgram* vp = VirtualProgram::getOrCreate(ss);
+    vp->setName("SimpleOceanLayer");
     Shaders shaders;
     shaders.load(vp, shaders.SimpleOceanLayer_Vertex);
     shaders.load(vp, shaders.SimpleOceanLayer_Fragment);
@@ -88,19 +89,53 @@
         osg::StateAttribute::OFF | osg::StateAttribute::OVERRIDE);
 
     // Material.
-#if 0
     osg::Material* m = new MaterialGL3();
-    m->setAmbient(m->FRONT, osg::Vec4(.5, .5, .5, 1));
+    m->setAmbient(m->FRONT, osg::Vec4(1, 1, 1, 1));
     m->setDiffuse(m->FRONT, osg::Vec4(1, 1, 1, 1));
-    m->setSpecular(m->FRONT, osg::Vec4(1, 1, 1, 1)); //0.2, 0.2, 0.2, 1));
+    m->setSpecular(m->FRONT, osg::Vec4(1, 1, 1, 1));
     m->setEmission(m->FRONT, osg::Vec4(0, 0, 0, 1));
-    m->setShininess(m->FRONT, 100.0);
-    ss->setAttributeAndModes(m, 1); //osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-    m->setUpdateCallback(new MaterialCallback());
-#endif
+    m->setShininess(m->FRONT, 32.0);
+    ss->setAttributeAndModes(m, 1);
+    MaterialCallback().operator()(m, 0L);
     
     setColor(options().color().get());
     setMaxAltitude(options().maxAltitude().get());
+    setSeaLevel(0.0f); // option?
+}
+
+void
+SimpleOceanLayer::setTerrainResources(TerrainResources* res)
+{
+    VisibleLayer::setTerrainResources(res);
+
+    if (options().texture().isSet()) // texture
+    {
+        if (res->reserveTextureImageUnitForLayer(_texReservation, this) == false)
+        {
+            OE_WARN << LC << "Failed to reserve a TIU...will not apply texture" << std::endl;
+            return;
+        }
+
+        ReadResult r = options().texture()->readImage(getReadOptions());
+        if (r.failed())
+        {
+            OE_WARN << LC << "Failed to load ocean texture: " << r.errorDetail() << std::endl;
+            return;
+        }
+
+        osg::Texture2D* tex = new osg::Texture2D(r.getImage());
+        tex->setFilter(tex->MIN_FILTER, tex->LINEAR_MIPMAP_LINEAR);
+        tex->setFilter(tex->MAG_FILTER, tex->LINEAR);
+        tex->setWrap(tex->WRAP_S, tex->REPEAT);
+        tex->setWrap(tex->WRAP_T, tex->REPEAT);
+
+        osg::StateSet* ss = getOrCreateStateSet();
+        ss->setTextureAttributeAndModes(_texReservation.unit(), tex, 1); // todo: reserve a slot
+        ss->setDefine("OE_OCEAN_TEXTURE", "oe_ocean_tex");
+        ss->addUniform(new osg::Uniform("oe_ocean_tex", _texReservation.unit()));
+
+        ss->setDefine("OE_OCEAN_TEXTURE_LOD", Stringify() << options().textureLOD().get());
+    }
 }
 
 void
@@ -190,13 +225,19 @@
 SimpleOceanLayer::modifyTileBoundingBox(const TileKey& key, osg::BoundingBox& box) const
 {
     // Force the max Z to be at least sea level, to satisfy the culling pass
-    box.zMax() = std::max(box.zMax(), (osg::BoundingBox::value_type)0.0);
+    box.zMax() = osg::maximum(box.zMax(), (osg::BoundingBox::value_type)0.0);
 }
 
-Config
-SimpleOceanLayer::getConfig() const
+void
+SimpleOceanLayer::setSeaLevel(float value)
+{
+    _seaLevel = value;
+    getOrCreateStateSet()->getOrCreateUniform(
+        "ocean_seaLevel", osg::Uniform::FLOAT)->set(value);
+}
+
+float
+SimpleOceanLayer::getSeaLevel() const
 {
-    Config conf = options().getConfig();
-    conf.key() = "simple_ocean";
-    return conf;
+    return _seaLevel;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/SimpleOceanLayer.frag.glsl osgearth-2.10.2+dfsg/src/osgEarthUtil/SimpleOceanLayer.frag.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/SimpleOceanLayer.frag.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/SimpleOceanLayer.frag.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -3,13 +3,23 @@
 
 #pragma vp_entryPoint ocean_FS
 #pragma vp_location fragment_coloring
-#pragma import_defines(OE_OCEAN_MASK, OE_OCEAN_BATHYMETRY)
+
+#pragma import_defines(OE_OCEAN_TEXTURE)
+#pragma import_defines(OE_OCEAN_MASK)
+#pragma import_defines(OE_OCEAN_USE_BATHYMETRY)
 
 float oe_terrain_getElevation();
 
 in float ocean_visibility; // [0..1] => [invisible..visible]
+in float oe_layer_opacity; // from VisibleLayer
 
 uniform vec4 ocean_color;
+uniform float ocean_seaLevel;
+
+#ifdef OE_OCEAN_TEXTURE
+in vec2 ocean_texCoord;
+uniform sampler2D OE_OCEAN_TEXTURE ;
+#endif
 
 #ifdef OE_OCEAN_MASK
 in vec2 ocean_maskCoord;
@@ -28,13 +38,12 @@
 {
     float alpha = 1.0;
 
-#ifdef OE_OCEAN_BATHYMETRY
+#ifdef OE_OCEAN_USE_BATHYMETRY
     const float lowF = -100.0;
     const float hiF = -10.0;
-    const float seaLevel = 0.0;
 
     float elevation = oe_terrain_getElevation();
-    float alpha = ocean_remap(elevation, seaLevel+lowF, seaLevel+hiF, 1.0, 0.0);
+    alpha = ocean_remap(elevation, ocean_seaLevel+lowF, ocean_seaLevel+hiF, 1.0, 0.0);
 #endif
 
 #ifdef OE_OCEAN_MASK
@@ -42,5 +51,9 @@
     alpha *= mask;
 #endif
 
-    color = vec4(ocean_color.rgb, alpha*ocean_visibility*ocean_color.a);
+    color = vec4(ocean_color.rgb, alpha*ocean_visibility*oe_layer_opacity*ocean_color.a);
+
+#ifdef OE_OCEAN_TEXTURE
+    color *= texture(OE_OCEAN_TEXTURE, ocean_texCoord);
+#endif
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/SimpleOceanLayer.vert.glsl osgearth-2.10.2+dfsg/src/osgEarthUtil/SimpleOceanLayer.vert.glsl
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/SimpleOceanLayer.vert.glsl	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/SimpleOceanLayer.vert.glsl	2019-07-11 18:30:19.000000000 +0000
@@ -4,19 +4,30 @@
 #pragma vp_entryPoint ocean_VS
 #pragma vp_location vertex_view
 
+#pragma import_defines(OE_OCEAN_TEXTURE)
+#pragma import_defines(OE_OCEAN_TEXTURE_LOD)
 #pragma import_defines(OE_OCEAN_MASK_MATRIX)
 
 uniform float ocean_maxAltitude;
+uniform float ocean_seaLevel;
 uniform mat4 osg_ViewMatrixInverse;
 
+vec3 oe_UpVectorView;   // stage global
+
 out float ocean_visibility; // [0..1]
 
+#ifdef OE_OCEAN_TEXTURE
+out vec2 ocean_texCoord;
+vec2 oe_terrain_scaleCoordsToRefLOD(in vec2 tc, in float refLOD); // from SDK
+#endif
+
 #ifdef OE_OCEAN_MASK_MATRIX
 out vec2 ocean_maskCoord;
-vec4 oe_layer_tilec;
 uniform mat4 OE_OCEAN_MASK_MATRIX ;
 #endif
 
+vec4 oe_layer_tilec;
+
 void ocean_VS(inout vec4 vertexView)
 {
     // calculate the visibility based on the max altitude:
@@ -26,6 +37,13 @@
     float highAlt = lowAlt*1.5;
     ocean_visibility = clamp((highAlt-eyeAlt) / (highAlt-lowAlt), 0.0, 1.0);
 
+    // move the surface to the new sea level:
+    vertexView.xyz += oe_UpVectorView * ocean_seaLevel;
+
+#ifdef OE_OCEAN_TEXTURE
+    ocean_texCoord = oe_terrain_scaleCoordsToRefLOD(oe_layer_tilec.st, OE_OCEAN_TEXTURE_LOD);
+#endif
+
     // if masking, calculate the mask coordinates
 #ifdef OE_OCEAN_MASK_MATRIX
     ocean_maskCoord = (OE_OCEAN_MASK_MATRIX * oe_layer_tilec).st;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/SimplePager osgearth-2.10.2+dfsg/src/osgEarthUtil/SimplePager
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/SimplePager	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/SimplePager	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@
 #include <osgEarthUtil/Common>
 #include <osgEarth/Profile>
 #include <osgEarth/Progress>
+#include <osgEarth/SceneGraphCallback>
 #include <osg/Group>
 #include <osg/PagedLOD>
 
@@ -67,6 +68,10 @@
         void setEnableCancelation(bool value);
         bool getEnableCancalation() const;
 
+        //! Scene graph callbacks for notification of changes. Call before calling build().
+        void setSceneGraphCallbacks(SceneGraphCallbacks* value) { _sceneGraphCallbacks = value; }
+        SceneGraphCallbacks* getSceneGraphCallbacks() const { return _sceneGraphCallbacks.get(); }
+
         /**
          * Gets the profile for the SimplePager.
          */
@@ -132,6 +137,7 @@
         osg::ref_ptr< const osgEarth::Profile > _profile;
         osg::ref_ptr< osg::NodeCallback > _progressMaster;
         osg::ref_ptr< osgDB::FileLocationCallback > _fileLocationCallback;
+        osg::ref_ptr< SceneGraphCallbacks > _sceneGraphCallbacks;
         float _priorityScale;
         float _priorityOffset;
         bool _canCancel;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/SimplePager.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/SimplePager.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/SimplePager.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/SimplePager.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -3,11 +3,8 @@
 #include <osgEarth/Utils>
 #include <osgDB/Registry>
 #include <osgDB/FileNameUtils>
-#include <osgDB/Options>
-#include <osg/UserDataContainer>
 #include <osg/ShapeDrawable>
 #include <osg/MatrixTransform>
-#include <osg/Geode>
 
 using namespace osgEarth::Util;
 
@@ -102,9 +99,16 @@
                 return ReadResult::ERROR_IN_READING_FILE;
             }
 
-            return pager->loadKey(
+            osg::ref_ptr<osg::Node> node = pager->loadKey(
                 TileKey(lod, x, y, pager->getProfile()),
                 tracker.get());
+
+            if (node.valid() && pager->getSceneGraphCallbacks())
+            {
+                pager->getSceneGraphCallbacks()->firePreMergeNode(node.get());
+            }
+
+            return node.release();
         }
     };
 
@@ -252,9 +256,13 @@
     // notify any callbacks.
     fire_onCreateNode(key, node.get());
 
-    tileRadius = std::max(tileBounds.radius(), tileRadius);
+    tileRadius = osg::maximum(tileBounds.radius(), static_cast<osg::BoundingSphere::value_type>(tileRadius));
+
+    //osg::PagedLOD* plod = new osg::PagedLOD;
+    osg::PagedLOD* plod = 
+        getSceneGraphCallbacks() ? new PagedLODWithSceneGraphCallbacks(getSceneGraphCallbacks()) :
+        new osg::PagedLOD();
 
-    osg::PagedLOD* plod = new osg::PagedLOD;
     plod->setCenter( tileBounds.center() ); 
     plod->setRadius( tileRadius );
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Sky osgearth-2.10.2+dfsg/src/osgEarthUtil/Sky
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Sky	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Sky	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 #include <osgEarth/DateTime>
 #include <osgEarth/GeoData>
 #include <osgEarth/Config>
-#include <osgEarth/Profile>
+#include <osgEarth/SpatialReference>
 #include <osg/Group>
 #include <osg/Uniform>
 #include <osg/View>
@@ -52,6 +52,15 @@
     class SkyOptions : public DriverConfigOptions
     {
     public:
+        enum CoordinateSystem 
+        {
+            COORDSYS_ECEF,
+            COORDSYS_ECI
+        };
+
+        //! Coordinate system for whole-earth maps (default = ECEF)
+        optional<int>& coordinateSystem() { return _coordsys; }
+        const optional<int>& coordinateSystem() const { return _coordsys; }
 
         /** Time of day - Hours [0..24] component of DateTime */
         optional<float>& hours() { return _hours; }
@@ -63,28 +72,32 @@
 
     public:
         SkyOptions( const ConfigOptions& options =ConfigOptions() ) : DriverConfigOptions(options) {
+            _coordsys.init(COORDSYS_ECEF);
             fromConfig(_conf);
         }
         virtual ~SkyOptions() { }
         virtual Config getConfig() const {
             Config conf = DriverConfigOptions::getConfig();
-            conf.addIfSet("hours", _hours);
-            conf.addIfSet("ambient", _ambient);
+            conf.set("coordsys", _coordsys);
+            conf.set("hours", _hours);
+            conf.set("ambient", _ambient);
             return conf;
         }
 
     protected:
         virtual void mergeConfig( const Config& conf ) {
-            DriverConfigOptions::mergeConfig( conf );
+            ConfigOptions::mergeConfig( conf );
             fromConfig( conf );
         }
 
     private:
         void fromConfig( const Config& conf ) {
-            conf.getIfSet("hours", _hours);
-            conf.getIfSet("ambient", _ambient);
+            conf.get("coordsys", _coordsys);
+            conf.get("hours", _hours);
+            conf.get("ambient", _ambient);
         }
 
+        optional<int> _coordsys;
         optional<float> _hours;
         optional<float> _ambient;
     };
@@ -97,30 +110,37 @@
     class OSGEARTHUTIL_EXPORT SkyNode : public osg::Group
     {
     public:
-        /**
-         * Creates a new SkyNode with the default built-in sky driver
-         * and default options.
-         */
-        static SkyNode* create(
-            osgEarth::MapNode* mapNode );
+        //! Creates a SkyNode with the default implementation.
+        static SkyNode* create();
 
-        /**
-         * Creates a new SkyNode with custom options.
-         */
-        static SkyNode* create(
-            const SkyOptions&  options,
-            osgEarth::MapNode* mapNode );
+        //! Creates a SkyNode with custom options.
+        static SkyNode* create(const SkyOptions&);
 
-        /**
-         * Creates a new SkyNode with a named driver.
-         */
-        static SkyNode* create(
-            const std::string& driver,
-            osgEarth::MapNode* mapNode );
+        //! Creates a SkyNode from a raw driver name.
+        static SkyNode* create(const std::string& driver);
+
+    public: // DEPRECATED API
+
+        //! @deprecated Use create()
+        static SkyNode* create(osgEarth::MapNode* mapNode) {
+            return create();
+        }
+
+        //! @deprecated Use create(SkyOptions&)
+        static SkyNode* create(const SkyOptions& options, osgEarth::MapNode* mapNode) {
+            return create(options);
+        }
+
+        //! @deprecated Use create(const std::string&)
+        static SkyNode* create(const std::string& driver, osgEarth::MapNode* mapNode) {
+            return create(driver);
+        }
 
     protected:
         // CTOR (abstract base class)
         SkyNode();
+
+        // CTOR (abstract base class)
         SkyNode(const SkyOptions& options);
 
         // protected DTOR (heap-only)
@@ -128,6 +148,14 @@
 
     public:
         /**
+         * The ephemeris reference point for projected maps. Not applicable
+         * for geocentric maps. Setting this also informs the skynode that is
+         * should operate in projected-map mode if possible.
+         */
+        void setReferencePoint(const GeoPoint& point);
+        const GeoPoint& getReferencePoint() const { return *_refpoint; }
+
+        /**
          * Gets/Sets the Ephemeris used to position the sun and the moon
          * based on date/time.
          */
@@ -135,20 +163,13 @@
         const Ephemeris* getEphemeris() const;
 
         /**
-         * The ephemeris reference point for projected maps. Not applicable
-         * for geocentric maps.
-         */
-        void setReferencePoint(const GeoPoint& point);
-        const GeoPoint& getReferencePoint() const { return *_refpoint; }
-
-        /**
          * Whether the sky lights its subgraph.
          */
         void setLighting(osg::StateAttribute::OverrideValue value);
         osg::StateAttribute::OverrideValue getLighting() const { return _lightingValue; }
 
         /**
-         * Gets the date/time for which the enviroment is configured.
+         * Gets the date/time for which the environment is configured.
          * Pass in an optional View to get the date/time specific to
          * that View.
          */
@@ -173,7 +194,6 @@
 
         /** Access the osg::Light representing the sun */
         virtual osg::Light* getSunLight() const = 0;
-        //virtual const osg::Light* getSunLight() const = 0;
 
         /** @deprecated. use getSunLight()->setAmbient instead */
         void setMinimumAmbient(const osg::Vec4f& ambient) { if (getSunLight()) getSunLight()->setAmbient(ambient); }
@@ -221,7 +241,6 @@
     class OSGEARTHUTIL_EXPORT SkyDriver : public osgDB::ReaderWriter
     {
     protected:
-        MapNode* getMapNode(const osgDB::Options* opt) const;
         const SkyOptions& getSkyOptions(const osgDB::Options* opt) const;
     };
 
@@ -234,7 +253,7 @@
     class /*header-only*/ SkyNodeFactory
     {
     public:
-        virtual SkyNode* createSkyNode(const Profile* profile) =0;
+        virtual SkyNode* createSkyNode() =0;
     };
 
 } } // namespace osgEarth::Util
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/Sky.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/Sky.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/Sky.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/Sky.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,14 +20,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarthUtil/Sky>
-#include <osgEarthUtil/Ephemeris>
-#include <osgEarth/Registry>
-#include <osgEarth/ShaderFactory>
-#include <osgEarth/ShaderUtils>
-#include <osgEarth/Extension>
 #include <osgEarth/MapNode>
-#include <osgEarth/Lighting>
-#include <osgDB/ReadFile>
+#include <osgEarth/GLUtils>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
@@ -106,14 +100,11 @@
 SkyNode::setLighting(osg::StateAttribute::OverrideValue value)
 {
     _lightingValue = value;
-    //_lightingUniform = Registry::shaderFactory()->createUniformForGLMode(
-    //    GL_LIGHTING, value );
-    //this->getOrCreateStateSet()->addUniform( _lightingUniform.get(), value );
 
     if (value & osg::StateAttribute::INHERIT)
-        this->getOrCreateStateSet()->removeDefine(OE_LIGHTING_DEFINE);
+        GLUtils::remove(this->getStateSet(), GL_LIGHTING);
     else
-        this->getOrCreateStateSet()->setDefine(OE_LIGHTING_DEFINE, value);
+        GLUtils::setLighting(this->getOrCreateStateSet(), value);
 }
 
 void
@@ -146,24 +137,18 @@
 
 //------------------------------------------------------------------------
 
-#define MAPNODE_TAG     "__osgEarth::MapNode"
 #define SKY_OPTIONS_TAG "__osgEarth::Util::SkyOptions"
 
 SkyNode*
-SkyNode::create(const SkyOptions& options, MapNode* mapNode)
+SkyNode::create(const SkyOptions& options)
 {
-    if ( !mapNode ) {
-        OE_WARN << LC << "Internal error; null map node passed to SkyNode::Create\n";
-        return 0L;
-    }
-
     std::string driverName = osgEarth::trim(options.getDriver());
     if ( driverName.empty() )
         driverName = "simple";
 
     std::string extensionName = std::string("sky_") + driverName;
 
-    osg::ref_ptr<Extension> extension = Extension::create( extensionName, options );
+    osg::ref_ptr<Extension> extension = Extension::create(extensionName, options);
     if ( !extension.valid() ) {
         OE_WARN << LC << "Failed to load extension for sky driver \"" << driverName << "\"\n";
         return 0L;
@@ -175,24 +160,23 @@
         return 0L;
     }
 
-    osg::ref_ptr<SkyNode> result = factory->createSkyNode(mapNode->getMap()->getProfile());
-
+    osg::ref_ptr<SkyNode> result = factory->createSkyNode();
     return result.release();
 }
 
 SkyNode*
-SkyNode::create(MapNode* mapNode)
+SkyNode::create()
 {
     SkyOptions options;
-    return create(options, mapNode);
+    return create(options);
 }
 
 SkyNode*
-SkyNode::create(const std::string& driver, MapNode* mapNode)
+SkyNode::create(const std::string& driver)
 {
     SkyOptions options;
     options.setDriver( driver );
-    return create( options, mapNode );
+    return create(options);
 }
 
 
@@ -205,11 +189,3 @@
     const void* data = options->getPluginData(SKY_OPTIONS_TAG);
     return data ? *static_cast<const SkyOptions*>(data) : s_default;
 }
-
-
-MapNode*
-SkyDriver::getMapNode(const osgDB::Options* options) const
-{
-    return const_cast<MapNode*>(
-        static_cast<const MapNode*>( options->getPluginData(MAPNODE_TAG) ) );
-}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/SpatialData osgearth-2.10.2+dfsg/src/osgEarthUtil/SpatialData
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/SpatialData	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/SpatialData	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -38,6 +38,7 @@
 
     /**
      * A group corresponding to a specific geospatial cell.
+     * @deprecated (remove after 2.10)
      */
     class OSGEARTHUTIL_EXPORT GeoCell : public osg::LOD
     {
@@ -59,7 +60,7 @@
         /** Removes an object from this geocell graph. */
         bool removeObject( GeoObject* object );
 
-        /** Re-index an object withing the geocell graph based on a new position. */
+        /** Re-index an object within the geocell graph based on a new position. */
         bool reindexObject( GeoObject* object );
 
         /** The number of rows and columns into which this cell will split */
@@ -112,6 +113,9 @@
         friend class GeoCellVisitor;
     };
 
+    /**
+     * @deprecated (remove after 2.10)
+     */
     class OSGEARTHUTIL_EXPORT GeoGraph : public GeoCell
     {
     public:
@@ -132,7 +136,10 @@
     private:
         unsigned _rootWidth, _rootHeight;
     };
-
+    
+    /**
+     * @deprecated (remove after 2.10)
+     */
     class GeoCellVisitor : public osg::NodeVisitor
     {
     public:
@@ -151,6 +158,7 @@
 
     /**
      * Base class for an object indexed by a GeoCell hierarchy.
+     * @deprecated (remove after 2.10)
      */
     class OSGEARTHUTIL_EXPORT GeoObject : public osg::Referenced
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/SpatialData.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/SpatialData.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/SpatialData.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/SpatialData.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -20,11 +20,8 @@
 #include <osgEarth/Registry>
 #include <osgEarth/CullingUtils>
 #include <osg/PolygonOffset>
-#include <osg/Polytope>
-#include <osg/Geometry>
 #include <osg/Depth>
 #include <osgText/Text>
-#include <sstream>
 
 #define LC "[GeoGraph] "
 
@@ -265,10 +262,9 @@
     //el->push_back( 9 ); el->push_back( 7 ); el->push_back( 5 ); el->push_back( 3 ); // bottom
     g->addPrimitiveSet( el );
 
-    osg::Vec4Array* c = new osg::Vec4Array(1);
+    osg::Vec4Array* c = new osg::Vec4Array(osg::Array::BIND_OVERALL, 1);
     (*c)[0].set( 1, 1, 1, 0.25 );
     g->setColorArray( c );
-    g->setColorBinding( osg::Geometry::BIND_OVERALL );
 
     _boundaryColor = c;
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/StarData osgearth-2.10.2+dfsg/src/osgEarthUtil/StarData
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/StarData	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/StarData	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TerrainProfile osgearth-2.10.2+dfsg/src/osgEarthUtil/TerrainProfile
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TerrainProfile	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TerrainProfile	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TerrainProfile.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/TerrainProfile.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TerrainProfile.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TerrainProfile.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include <osgEarthUtil/TerrainProfile>
 #include <osgEarth/MapNode>
 #include <osgEarth/TerrainEngineNode>
-#include <osgEarth/GeoMath>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TFS osgearth-2.10.2+dfsg/src/osgEarthUtil/TFS
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TFS	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TFS	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TFS.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/TFS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TFS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TFS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TFSPackager osgearth-2.10.2+dfsg/src/osgEarthUtil/TFSPackager
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TFSPackager	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TFSPackager	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -73,7 +73,7 @@
         void setMethod( CropFilter::Method method) { _method = method;}
 
         /**
-         * The SRS to use for the output dataset.  If not set the SRS of the FeatureSource wil be used.
+         * The SRS to use for the output dataset.  If not set the SRS of the FeatureSource will be used.
          * Can be any string that will result in a valid osgEarth::SpatialReference (epsg codes, wkt, proj4).
          */
         const std::string& getDestSRS() const { return _destSRSString;}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TFSPackager.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/TFSPackager.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TFSPackager.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TFSPackager.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,13 +21,10 @@
 */
 #include <osgEarthUtil/TFSPackager>
 
-#include <osgEarth/Registry>
 #include <osgEarth/FileUtils>
 
-#include <osgEarthFeatures/FilterContext>
 #include <osgEarthFeatures/FeatureCursor>
 
-#include <osgDB/FileNameUtils>
 #include <osgDB/FileUtils>
 
 #define LC "[TFSPackager] "
@@ -303,7 +300,7 @@
 }
 
 void
-    TFSPackager::package( FeatureSource* features, const std::string& destination, const std::string& layername, const std::string& description )
+TFSPackager::package( FeatureSource* features, const std::string& destination, const std::string& layername, const std::string& description )
 {   
     if (!_destSRSString.empty())
     {
@@ -332,7 +329,7 @@
 
     osg::ref_ptr< FeatureTile > root = new FeatureTile( rootKey );
     //Loop through all the features and try to insert them into the quadtree
-    osg::ref_ptr< FeatureCursor > cursor = features->createFeatureCursor( _query );
+    osg::ref_ptr< FeatureCursor > cursor = features->createFeatureCursor( _query, 0L ); // TODO: progress.
     int added = 0;
     int failed = 0;
     int skipped = 0;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TileIndex osgearth-2.10.2+dfsg/src/osgEarthUtil/TileIndex
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TileIndex	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TileIndex	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TileIndexBuilder osgearth-2.10.2+dfsg/src/osgEarthUtil/TileIndexBuilder
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TileIndexBuilder	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TileIndexBuilder	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TileIndexBuilder.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/TileIndexBuilder.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TileIndexBuilder.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TileIndexBuilder.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -21,13 +21,11 @@
 */
 
 #include <osgEarthUtil/TileIndexBuilder>
-#include <osgEarth/Registry>
 #include <osgEarth/FileUtils>
 #include <osgEarth/Progress>
 #include <osgEarth/ImageLayer>
 #include <osgEarthDrivers/gdal/GDALOptions>
 #include <osgDB/FileUtils>
-#include <osgDB/FileNameUtils>
 
 using namespace osgDB;
 using namespace osgEarth;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TileIndex.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/TileIndex.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TileIndex.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TileIndex.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -30,7 +30,6 @@
 
 #include <osgEarthDrivers/feature_ogr/OGRFeatureOptions>
 
-#include <ogr_api.h>
 #include <osgDB/FileUtils>
 
 using namespace osgEarth;
@@ -122,7 +121,7 @@
 
     GeoExtent transformed = extent.transform( _features->getFeatureProfile()->getSRS() );
     query.bounds() = transformed.bounds();
-    osg::ref_ptr< osgEarth::Features::FeatureCursor> cursor = _features->createFeatureCursor( query );
+    osg::ref_ptr< osgEarth::Features::FeatureCursor> cursor = _features->createFeatureCursor( query, 0L );
 
     while (cursor->hasMore())
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TMS osgearth-2.10.2+dfsg/src/osgEarthUtil/TMS
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TMS	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TMS	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -36,6 +36,7 @@
 #include <osgEarth/Profile>
 #include <osgEarth/Common>
 #include <osgEarth/DateTime>
+#include <osgEarth/URI>
 
 #include <osg/Referenced>
 #include <osgDB/ReaderWriter>
@@ -434,7 +435,7 @@
     class OSGEARTHUTIL_EXPORT TileMapReaderWriter
     {
     public:
-        static TileMap* read( const std::string &location, const osgDB::ReaderWriter::Options* options );
+        static TileMap* read( const URI& location, const osgDB::ReaderWriter::Options* options );
         static TileMap* read( std::istream &in );
         static TileMap* read( const Config& conf );
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TMSBackFiller osgearth-2.10.2+dfsg/src/osgEarthUtil/TMSBackFiller
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TMSBackFiller	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TMSBackFiller	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TMSBackFiller.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/TMSBackFiller.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TMSBackFiller.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TMSBackFiller.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include <osgEarthUtil/TMSBackFiller>
-#include <osgEarth/ImageUtils>
 #include <osgEarth/FileUtils>
 #include <osgEarth/ImageMosaic>
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TMS.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/TMS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TMS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TMS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,21 +18,13 @@
  */
 
 #include <osgEarthUtil/TMS>
-#include <osgEarth/Common>
-#include <osgEarth/GeoData>
 #include <osgEarth/XmlUtils>
 #include <osgEarth/TileKey>
-#include <osgEarth/TileSource>
 #include <osgEarth/Registry>
-#include <osgEarth/StringUtils>
-#include <osgEarth/Profile>
 
-#include <osg/Notify>
 #include <osgDB/FileUtils>
 #include <osgDB/FileNameUtils>
 
-#include <limits.h>
-#include <iomanip>
 
 using namespace osgEarth;
 using namespace osgEarth::Util::TMS;
@@ -147,6 +139,8 @@
 #define ATTR_ORDER "order"
 #define ATTR_UNITSPERPIXEL "units-per-pixel"
 
+#define ATTR_DESCRIPTION "description"
+
 bool intersects(const double &minXa, const double &minYa, const double &maxXa, const double &maxYa,
                 const double &minXb, const double &minYb, const double &maxXb, const double &maxYb)
 {
@@ -223,8 +217,7 @@
     }
 
     else if ( 
-        spatialReference->isGeographic()  && 
-        !spatialReference->isPlateCarre() &&
+        spatialReference->isGeographic() &&
         osg::equivalent(_minX, -180.) &&
         osg::equivalent(_maxX,  180.) &&
         osg::equivalent(_minY,  -90.) &&
@@ -454,14 +447,14 @@
 
 
 TileMap* 
-TileMapReaderWriter::read( const std::string& location, const osgDB::Options* options )
+TileMapReaderWriter::read( const URI& uri, const osgDB::Options* options )
 {
     TileMap* tileMap = NULL;
 
-    ReadResult r = URI(location).readString(options);
+    ReadResult r = uri.readString(options);
     if ( r.failed() )
     {
-        OE_DEBUG << LC << "Failed to read TMS tile map file from " << location
+        OE_DEBUG << LC << "Failed to read TMS tile map file from " << uri.full()
             << " ... " << r.errorDetail() << std::endl;
         return 0L;
     }
@@ -476,7 +469,7 @@
 
     if (tileMap)
     {
-        tileMap->setFilename( location );
+        tileMap->setFilename( uri.full() );
 
         // record the timestamp (if there is one) in the tilemap. It's not a persistent field
         // but will help with things like per-session caching.
@@ -592,12 +585,24 @@
 
             unsigned int maxLevel = conf.value<unsigned>(ATTR_MAX_LEVEL, 0);
 
+            std::string description = conf.value<std::string>(ATTR_DESCRIPTION, std::string());
+
             //OE_DEBUG << LC << "Read area " << minX << ", " << minY << ", " << maxX << ", " << maxY << ", minlevel=" << minLevel << " maxlevel=" << maxLevel << std::endl;
 
             if ( maxLevel > 0 )
-                tileMap->getDataExtents().push_back( DataExtent(GeoExtent(profile->getSRS(), minX, minY, maxX, maxY), 0, maxLevel));
+            {
+                if(description.empty())
+                    tileMap->getDataExtents().push_back( DataExtent(GeoExtent(profile->getSRS(), minX, minY, maxX, maxY), 0, maxLevel));
+                else
+                    tileMap->getDataExtents().push_back( DataExtent(GeoExtent(profile->getSRS(), minX, minY, maxX, maxY), 0, maxLevel, description));
+            }
             else
-                tileMap->getDataExtents().push_back( DataExtent(GeoExtent(profile->getSRS(), minX, minY, maxX, maxY), 0) );
+            {
+                if(description.empty())
+                    tileMap->getDataExtents().push_back( DataExtent(GeoExtent(profile->getSRS(), minX, minY, maxX, maxY), 0) );
+                else
+                    tileMap->getDataExtents().push_back( DataExtent(GeoExtent(profile->getSRS(), minX, minY, maxX, maxY), 0, description) );
+            }
         }
     }
 
@@ -686,6 +691,8 @@
                 e_data_extent->getAttrs()[ATTR_MIN_LEVEL] = toString<unsigned int>(*itr->minLevel());
             if ( itr->maxLevel().isSet() )
                 e_data_extent->getAttrs()[ATTR_MAX_LEVEL] = toString<unsigned int>(*itr->maxLevel());
+            if ( itr->description().isSet() )
+                e_data_extent->getAttrs()[ATTR_DESCRIPTION] = *itr->description();
             e_data_extents->getChildren().push_back( e_data_extent );
         }
         doc->getChildren().push_back( e_data_extents.get() );
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TMSPackager osgearth-2.10.2+dfsg/src/osgEarthUtil/TMSPackager
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TMSPackager	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TMSPackager	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TMSPackager.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/TMSPackager.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TMSPackager.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TMSPackager.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -18,15 +18,10 @@
  */
 #include <osgEarthUtil/TMSPackager>
 #include <osgEarthUtil/TMS>
-#include <osgEarth/ImageUtils>
 #include <osgEarth/ImageToHeightFieldConverter>
-#include <osgEarth/TaskService>
 #include <osgEarth/FileUtils>
-#include <osgEarth/CacheEstimator>
 #include <osgEarth/ImageLayer>
-#include <osgEarth/ElevationLayer>
 #include <osgDB/FileUtils>
-#include <osgDB/FileNameUtils>
 #include <osgDB/WriteFile>
 
 
@@ -397,28 +392,13 @@
         setLayerName(layer->getName());
     }
 
-
-
     if (imageLayer)
     {
         int tileSize = imageLayer->getTileSize();
         _width = tileSize;
         _height = tileSize;
-
-        // Figure out the extension if we haven't already assigned one.
         if (_extension.empty())
-        {
-            // Just default to whatever the source reports as it's extension.
-            _extension = imageLayer->getTileSource()->getExtension();
-        }
-
-        if (_extension == "jpg" && _applyAlphaMask)
-        {
             _extension = "png";
-            OE_NOTICE << LC << "Extension changed to PNG since output requires an alpha channel" << std::endl;
-        }
-
-        OE_INFO << LC << "Output extension: " << _extension << std::endl;
 
     }
     else if (elevationLayer)
@@ -467,7 +447,7 @@
     tileMap->setTitle( _layerName );
     tileMap->setVersion( "1.0.0" );
     tileMap->getFormat().setMimeType( mimeType );
-    tileMap->generateTileSets( std::min(23u, maxLevel+1) );
+    tileMap->generateTileSets( osg::minimum(23u, maxLevel+1) );
 
 
     // write out the tilemap catalog:
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TopologyGraph osgearth-2.10.2+dfsg/src/osgEarthUtil/TopologyGraph
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TopologyGraph	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TopologyGraph	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -36,8 +36,8 @@
 {
 #define TOPOLOGY_TOLERANCE 0.0
 
-    //! Stores the noded topology of a model with unique verticies and edge definitions.
-    //! The verticies are stored rotated into the XY plane so that we can properly find
+    //! Stores the noded topology of a model with unique vertices and edge definitions.
+    //! The vertices are stored rotated into the XY plane so that we can properly find
     //! the "bottom-most" vert and walk the boundary.
     class OSGEARTHUTIL_EXPORT TopologyGraph : public osg::Object
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/TopologyGraph.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/TopologyGraph.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/TopologyGraph.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/TopologyGraph.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -23,18 +23,9 @@
 
 using namespace osgEarth::Util;
 
-#include <algorithm>
-#include <osg/Geode>
-#include <osg/Geometry>
 #include <osg/Point>
 #include <osg/TriangleIndexFunctor>
-#include <osg/ComputeBoundsVisitor>
-#include <osgEarthSymbology/Geometry>
-#include <osgEarth/SpatialReference>
 #include <osgDB/WriteFile>
-#include <map>
-#include <vector>
-#include <set>
 
 #define LC "[TopologyGraph] "
 
@@ -118,7 +109,7 @@
 
         const IndexSet& edges = ei->second;
 
-        // find the edge with the minimun delta angle to the base vector
+        // find the edge with the minimum delta angle to the base vector
         double bestScore = -DBL_MAX;
         Index  bestEdge  = _verts.end();
         
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/UTMGraticule osgearth-2.10.2+dfsg/src/osgEarthUtil/UTMGraticule
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/UTMGraticule	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/UTMGraticule	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -57,15 +57,14 @@
     public:
         virtual Config getConfig() const {
             Config conf = VisibleLayerOptions::getConfig();
-            conf.key() = "utm_graticule";
-            conf.addObjIfSet("gzd_style", _gzdStyle);
-            conf.addIfSet("text_scale", _textScale);
+            conf.set("gzd_style", _gzdStyle);
+            conf.set("text_scale", _textScale);
             return conf;
         }
 
         virtual void fromConfig(const Config& conf) {
-            conf.getObjIfSet("gzd_style", _gzdStyle);
-            conf.getIfSet("text_scale", _textScale);
+            conf.get("gzd_style", _gzdStyle);
+            conf.get("text_scale", _textScale);
         }
 
     protected:
@@ -109,7 +108,7 @@
     class OSGEARTHUTIL_EXPORT UTMGraticule : public VisibleLayer
     {
     public:
-        META_Layer(osgEarthUtil, UTMGraticule, UTMGraticuleOptions);
+        META_Layer(osgEarthUtil, UTMGraticule, UTMGraticuleOptions, utm_graticule);
 
         /**
          * Construct a new UTM graticule with default settings.
@@ -137,7 +136,7 @@
 
         virtual void removedFromMap(const Map* map);
         
-        virtual osg::Node* getOrCreateNode();
+        virtual osg::Node* getNode() const;
 
         virtual void init();
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/UTMGraticule.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/UTMGraticule.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/UTMGraticule.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/UTMGraticule.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -22,19 +22,10 @@
 #include <osgEarthFeatures/TextSymbolizer>
 
 #include <osgEarth/Registry>
-#include <osgEarth/NodeUtils>
-#include <osgEarth/Utils>
 #include <osgEarth/CullingUtils>
-#include <osgEarth/ThreadingUtils>
+#include <osgEarth/GLUtils>
+#include <osgEarth/Text>
 
-#include <OpenThreads/Mutex>
-#include <OpenThreads/ScopedLock>
-#include <osg/PagedLOD>
-#include <osg/Depth>
-#include <osg/Program>
-#include <osg/ClipNode>
-#include <osg/ClipPlane>
-#include <osgDB/FileNameUtils>
 
 #define LC "[UTMGraticule] "
 
@@ -43,6 +34,11 @@
 using namespace osgEarth::Features;
 using namespace osgEarth::Symbology;
 
+#ifndef GL_CLIP_DISTANCE0
+#define GL_CLIP_DISTANCE0 0x3000
+#endif
+
+
 REGISTER_OSGEARTH_LAYER(utm_graticule, UTMGraticule);
 
 //---------------------------------------------------------------------------
@@ -55,7 +51,6 @@
     static std::string s_gzdRows( "CDEFGHJKLMNPQRSTUVWX" );
     const SpatialReference* geosrs = profile->getSRS()->getGeographicSRS();
 
-    // build the lateral zones:
     for( unsigned zone = 0; zone < 60; ++zone )
     {
         for( unsigned row = 0; row < s_gzdRows.size(); ++row )
@@ -148,7 +143,7 @@
     osg::Vec3d tileCenter;
     extent.getCentroid( tileCenter.x(), tileCenter.y() );
 
-    const SpatialReference* ecefSRS = extent.getSRS()->getECEF();
+    const SpatialReference* ecefSRS = extent.getSRS()->getGeocentricSRS();
     
     osg::Vec3d centerECEF;
     extent.getSRS()->transform( tileCenter, ecefSRS, centerECEF );
@@ -165,9 +160,12 @@
 
         TextSymbolizer ts(textSym.get());
         
-        osg::Geode* textGeode = new osg::Geode();        
-        osg::Drawable* d = ts.create(name);
-        d->getOrCreateStateSet()->setRenderBinToInherit();
+        osg::Geode* textGeode = new osg::Geode(); 
+        osgText::Text* d = new osgEarth::Text();
+        d->setText(name);
+        ts.apply(d);
+        //osg::Drawable* d = ts.create(name);
+        //d->getOrCreateStateSet()->setRenderBinToInherit();
         textGeode->addDrawable(d);
         Registry::shaderGenerator().run(textGeode, Registry::stateSetCache());
 
@@ -220,6 +218,17 @@
 
     // force it to render after the terrain.
     this->getOrCreateStateSet()->setRenderBinDetails(1, "RenderBin");
+
+    _root = new osg::Group();
+
+    // install the range callback for clip plane activation
+    _root->addCullCallback( new RangeUniformCullCallback() );
+
+    if (getEnabled() == true)
+    {
+        rebuild();
+    }
+
 }
 
 void
@@ -236,18 +245,8 @@
 }
 
 osg::Node*
-UTMGraticule::getOrCreateNode()
+UTMGraticule::getNode() const
 {
-    if (_root.valid() == false)
-    {
-        _root = new osg::Group();
-
-        // install the range callback for clip plane activation
-        _root->addCullCallback( new RangeUniformCullCallback() );
-
-        rebuild();
-    }
-
     return _root.get();
 }
 
@@ -285,8 +284,9 @@
 
     //todo: do this right..
     osg::StateSet* set = this->getOrCreateStateSet();
-    set->setMode( GL_LIGHTING, 0 );
+    GLUtils::setLighting(set, 0);
     set->setMode( GL_BLEND, 1 );
+    set->setMode( GL_CLIP_DISTANCE0, 1 );
 
     // set up default options if the caller did not supply them
     if ( !options().gzdStyle().isSet() )
@@ -304,23 +304,7 @@
         text->alignment() = TextSymbol::ALIGN_CENTER_CENTER;
     }
     
-    // rebuild the graph:
-    osg::Group* top = _root.get();
-
-    // Horizon clipping plane.
-    osg::ClipPlane* cp = _clipPlane.get();
-    if ( cp == 0L )
-    {
-        osg::ClipNode* clipNode = new osg::ClipNode();
-        osgEarth::Registry::shaderGenerator().run( clipNode );
-        cp = new osg::ClipPlane( 0 );
-        clipNode->addClipPlane( cp );
-        _root->addChild(clipNode);
-        top = clipNode;
-    }
-    top->addCullCallback( new ClipToGeocentricHorizon(_profile->getSRS(), cp) );
-    
-    // intialize the UTM sector tables for this profile.
+    // initialize the UTM sector tables for this profile.
     _utmData.rebuild(_profile.get());
 
     // now build the lateral tiles for the GZD level.
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/UTMLabelingEngine osgearth-2.10.2+dfsg/src/osgEarthUtil/UTMLabelingEngine
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/UTMLabelingEngine	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/UTMLabelingEngine	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 #define OSGEARTH_UTIL_UTM_LABELING_ENGINE_H 1
 
 #include <osgEarthUtil/Common>
+#include <osgEarthUtil/GraticuleLabelingEngine>
 #include <osgEarth/GeoData>
 #include <osgEarth/MapNode>
 #include <osgEarth/Containers>
@@ -37,7 +38,7 @@
      * Node that plots UTM coordinats labels along the edge of the
      * viewport when you are looking straight down on a zoomed-in area.
      */
-    class UTMLabelingEngine : public osg::Group
+    class UTMLabelingEngine : public GraticuleLabelingEngine
     {
     public:
         //! Construct a new labeling engine with the map's SRS
@@ -46,31 +47,10 @@
         //! Sets the maximum resolution (meters) at which to render labels
         void setMaxResolution(double value);
 
-    public: // osg::Node
-        void traverse(osg::NodeVisitor& nv);
+        virtual bool updateLabels(const osg::Vec3d& LL_world, osg::Vec3d& UL_world, osg::Vec3d& LR_world, ClipSpace& window, CameraData& data);
 
     protected:
-        typedef std::vector< osg::ref_ptr<LabelNode> > LabelNodeVector;
 
-        struct CameraData
-        {
-            LabelNodeVector xLabels;
-            LabelNodeVector yLabels;
-        };
-
-        bool cullTraverse(osgUtil::CullVisitor& nv, CameraData& data);
-        
-        typedef PerObjectFastMap<osg::Camera*, CameraData> CameraDataMap;
-        CameraDataMap _cameraDataMap;
-
-        struct AcceptCameraData : public CameraDataMap::Functor {
-            AcceptCameraData(osg::NodeVisitor& nv) : _nv(nv) { }
-            void operator()(CameraData& data);
-            osg::NodeVisitor& _nv;
-        };
-
-        osg::ref_ptr<const SpatialReference> _srs;
-        Style _xLabelStyle, _yLabelStyle;
         double _maxRes;
     };
 
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/UTMLabelingEngine.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/UTMLabelingEngine.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/UTMLabelingEngine.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/UTMLabelingEngine.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -20,149 +20,14 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 #include "UTMLabelingEngine"
-#include <osgEarth/GeoData>
-#include <osgEarth/TerrainEngineNode>
-#include <osg/CoordinateSystemNode>
 
 #define LC "[UTMLabelingEngine] "
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
 
-#define MAX_LABELS 60
-
 namespace
-{
-    /**
-     * Utility class to perform ellipsoid intersections
-     * (Used by the UTMLabelingEngine)
-     * TODO: At some point this class can graduate to the core if generally useful,
-     * possibly extending osg::EllipsoidModel.
-     */
-    class EllipsoidIntersector
-    {
-    public:
-        //! Construct a new ellipsoid intersector
-        EllipsoidIntersector(const osg::EllipsoidModel* em)
-        {
-            _ellipsoidToUnitSphere.makeScale(
-                1.0 / em->getRadiusEquator(),
-                1.0 / em->getRadiusEquator(),
-                1.0 / em->getRadiusPolar());
-
-            _unitSphereToEllipsoid.makeScale(
-                em->getRadiusEquator(),
-                em->getRadiusEquator(),
-                em->getRadiusPolar());
-        }
-
-        //! Interects a line (world space) with an ellipsoid.
-        //! @param p0 First point on the line
-        //! @param p1 Second point on the line
-        //! @param out_world Output world coordinates of closest intersection
-        bool intersectLine(const osg::Vec3d& p0_world, const osg::Vec3d& p1_world, osg::Vec3d& out_world)
-        {
-            double dist2 = 0.0;
-            osg::Vec3d v;
-            osg::Vec3d p0 = p0_world * _ellipsoidToUnitSphere;
-            osg::Vec3d p1 = p1_world * _ellipsoidToUnitSphere;
-
-            const double R = 1.0; // for unit sphere.
-
-            // http://paulbourke.net/geometry/circlesphere/index.html#linesphere
-
-            osg::Vec3d d = p1 - p0;
-
-            double A = d * d;
-            double B = 2.0 * (d * p0);
-            double C = (p0 * p0) - R*R;
-
-            // now solve the quadratic A + B*t + C*t^2 = 0.
-            double D = B*B - 4.0*A*C;
-            if (D > 0)
-            {
-                // two roots (line passes through sphere twice)
-                // find the closer of the two.
-                double sqrtD = sqrt(D);
-                double t0 = (-B + sqrtD) / (2.0*A);
-                double t1 = (-B - sqrtD) / (2.0*A);
-
-                //seg; pick closest:
-                if (fabs(t0) < fabs(t1))
-                    v = d*t0;
-                else
-                    v = d*t1;
-            }
-            else if (D == 0.0)
-            {
-                // one root (line is tangent to sphere?)
-                double t = -B / (2.0*A);
-                v = d*t;
-            }
-
-            dist2 = v.length2();
-
-            if (dist2 > 0.0)
-            {
-                out_world = (p0 + v) * _unitSphereToEllipsoid;
-                return true;
-            }
-            else
-            {
-                // either no intersection, or the distance was not the max.
-                return false;
-            }
-        }
-
-    private:
-        osg::Matrix _ellipsoidToUnitSphere;
-        osg::Matrix _unitSphereToEllipsoid;
-        osg::Matrix _clipToWorld;
-    };
-
-
-    /**
-     * Utility class for perform operations in clip space
-     * (Used by the UTMLabelingEngine)
-     */
-    class ClipSpace
-    {
-    public:
-        osg::Matrix _worldToClip, _clipToWorld;
-
-        ClipSpace(const osg::Matrix& MVP, const osg::Matrix& MVPinv)
-            : _worldToClip(MVP),
-            _clipToWorld(MVPinv)
-        {
-            //nop
-        }
-
-        // Moves the input point to the bottom edge of the viewport.
-        void clampToBottom(GeoPoint& p)
-        {
-            p.transformInPlace(p.getSRS()->getGeographicSRS());
-            osg::Vec3d world;
-            p.toWorld(world);
-            osg::Vec3d clip = world * _worldToClip;
-            clip.y() = -1.0;
-            world = clip * _clipToWorld;
-            p.fromWorld(p.getSRS(), world);
-        }
-
-        // Moves the input point to left edge of the viewport.
-        void clampToLeft(GeoPoint& p)
-        {
-            p.transformInPlace(p.getSRS()->getGeographicSRS());
-            osg::Vec3d world;
-            p.toWorld(world);
-            osg::Vec3d clip = world * _worldToClip;
-            clip.x() = -1.0;
-            world = clip * _clipToWorld;
-            p.fromWorld(p.getSRS(), world);
-        }
-    };
-
-
+{   
     // Information for a single UTM zone. The labeling engine supports
     // two UTM zones (left and right) at a time.
     struct UTMZone
@@ -170,189 +35,30 @@
         osg::ref_ptr<const SpatialReference> utmSRS;
         GeoPoint UL_geo, LL_geo, LR_geo;
         GeoPoint UL_utm, LL_utm, LR_utm;
-    };
-
-
-    // Given a view matrix, return the heading of the camera relative to North;
-    // this works for geocentric maps.
-    // TODO: graduate to a utilities class somewhere in the core if generally useful
-    double getCameraHeading(const osg::Matrix& VM)
-    {
-        osg::Matrixd VMinverse;
-        VMinverse.invert(VM);
-
-        osg::Vec3d N(0, 0, 6356752); // north pole, more or less
-        osg::Vec3d b(-VM(0, 2), -VM(1, 2), -VM(2, 2)); // look vector
-        osg::Vec3d E = osg::Vec3d(0, 0, 0)*VMinverse;
-        osg::Vec3d u = E; u.normalize();
-
-        // account for looking straight downish
-        if (osg::equivalent(b*u, -1.0, 1e-4))
-        {
-            // up vec becomes the look vec.
-            b = osg::Matrixd::transform3x3(VM, osg::Vec3f(0.0, 1.0, 0.0));
-            b.normalize();
-        }
-
-        osg::Vec3d proj_d = b - u*(b*u);
-        osg::Vec3d n = N - E;
-        osg::Vec3d proj_n = n - u*(n*u);
-        osg::Vec3d proj_e = proj_n^u;
-
-        double cameraHeading = atan2(proj_e*proj_d, proj_n*proj_d);
-        return cameraHeading;
-    }
+    };    
 }
 
 //........................................................................
 
 UTMLabelingEngine::UTMLabelingEngine(const SpatialReference* srs) :
+GraticuleLabelingEngine(srs),
 _maxRes(1.0)
-{
-    _srs = srs;
-
-    // Set up the symbology for x-axis labels
-    TextSymbol* xText = _xLabelStyle.getOrCreate<TextSymbol>();
-    xText->alignment() = TextSymbol::ALIGN_CENTER_BOTTOM;
-    xText->halo()->color().set(0, 0, 0, 1);
-    xText->declutter() = false;
-
-    // Set up the symbology for y-axis labels
-    TextSymbol* yText = _yLabelStyle.getOrCreate<TextSymbol>();
-    yText->alignment() = TextSymbol::ALIGN_LEFT_BOTTOM;
-    yText->halo()->color().set(0, 0, 0, 1);
-    yText->declutter() = false;
+{    
 }
 
 void
 UTMLabelingEngine::setMaxResolution(double value)
 {
-    _maxRes = std::max(value, 1.0);
+    _maxRes = osg::maximum(value, 1.0);
     OE_INFO << LC << "Max resolution = " << _maxRes << std::endl;
 }
 
-void
-UTMLabelingEngine::AcceptCameraData::operator()(UTMLabelingEngine::CameraData& data)
-{
-    for (LabelNodeVector::iterator i = data.xLabels.begin(); i != data.xLabels.end(); ++i)
-        i->get()->accept(_nv);
-
-    for (LabelNodeVector::iterator i = data.yLabels.begin(); i != data.yLabels.end(); ++i)
-        i->get()->accept(_nv);
-}
-
-void
-UTMLabelingEngine::traverse(osg::NodeVisitor& nv)
-{
-    if (nv.getVisitorType() == nv.CULL_VISITOR)
-    {
-        osgUtil::CullVisitor* cv = dynamic_cast<osgUtil::CullVisitor*>(&nv);
-        if (cv)
-        {
-            // Find the data corresponding to this camera:
-            CameraData& data = _cameraDataMap.get(cv->getCurrentCamera());
-            bool visible = cullTraverse(*cv, data);
-            if (visible)
-            {
-                // traverse all the labels for this camera:
-                AcceptCameraData accept(nv);
-                accept(data);
-            }
-        }
-    }
-    else
-    {
-        AcceptCameraData accept(nv);
-        _cameraDataMap.forEach(accept);
-    }
-    
-    osg::Group::traverse(nv);
-}
-
 bool
-UTMLabelingEngine::cullTraverse(osgUtil::CullVisitor& nv, CameraData& data)
+UTMLabelingEngine::updateLabels(const osg::Vec3d& LL_world, osg::Vec3d& UL_world, osg::Vec3d& LR_world, ClipSpace& window, CameraData& data)
 {
-    osg::Camera* cam = nv.getCurrentCamera();
-
-    // Don't draw the labels if we are too far from North-Up:
-    double heading = getCameraHeading(cam->getViewMatrix());
-    if (osg::RadiansToDegrees(fabs(heading)) > 7.0)
-        return false;
-
-    // Initialize the label pool for this camera if we have not done so:
-    if (data.xLabels.empty())
-    {
-        for (unsigned i = 0; i < MAX_LABELS; ++i)
-        {
-            LabelNode* label = new LabelNode();
-            label->setDynamic(true);
-            label->setStyle(_xLabelStyle);
-            label->setHorizonCulling(false);
-            label->setOcclusionCulling(false);
-            data.xLabels.push_back(label);
-        }
-
-        for (unsigned i = 0; i < MAX_LABELS; ++i)
-        {
-            LabelNode* label = new LabelNode();
-            label->setDynamic(true);
-            label->setStyle(_yLabelStyle);
-            label->setHorizonCulling(false);
-            label->setOcclusionCulling(false);
-            data.yLabels.push_back(label);
-        }
-    }
-
-    // Start out with all labels off. We will then turn back on the ones we use:
-    for (unsigned i = 0; i < MAX_LABELS; ++i)
-    {
-        data.xLabels[i]->setNodeMask(0);
-        data.yLabels[i]->setNodeMask(0);
-    }
-
     if (_maxRes > 10000.0)
         return false;
 
-    // Intersect the corners of the view frustum with the ellipsoid.
-    // This will yeild the approximate geo-extent of the view.
-    // TODO: graduate this to the core if generally useful - could be helpful
-    // for displaying the extent of the current view.
-
-    // Calculate the "clip to world" matrix = MVPinv.
-    osg::Matrix MVP = (*nv.getModelViewMatrix()) * cam->getProjectionMatrix();
-    osg::Matrix MVPinv;
-    MVPinv.invert(MVP);
-
-    EllipsoidIntersector ellipsoid(_srs->getEllipsoid());
-
-    // For each corner, transform the clip coordinates at the near and far
-    // planes into world space and intersect that line with the ellipsoid:
-    osg::Vec3d p0, p1;
-
-    // find the lower-left corner of the frustum:
-    osg::Vec3d LL_world;
-    p0 = osg::Vec3d(-1, -1, -1) * MVPinv;
-    p1 = osg::Vec3d(-1, -1, +1) * MVPinv;
-    bool LL_ok = ellipsoid.intersectLine(p0, p1, LL_world);   
-    if (!LL_ok)
-        return false;
-
-    // find the upper-left corner of the frustum:
-    osg::Vec3d UL_world;
-    p0 = osg::Vec3d(-1, +1, -1) * MVPinv;
-    p1 = osg::Vec3d(-1, +1, +1) * MVPinv;
-    bool UL_ok = ellipsoid.intersectLine(p0, p1, UL_world);
-    if (!UL_ok)
-        return false;
-
-    // find the lower-right corner of the frustum:
-    osg::Vec3d LR_world;
-    p0 = osg::Vec3d(+1, -1, -1) * MVPinv;
-    p1 = osg::Vec3d(+1, -1, +1) * MVPinv;
-    bool LR_ok = ellipsoid.intersectLine(p0, p1, LR_world);
-    if (!LR_ok)
-        return false;
-
     // Split the view into (at most) 2 UTM zones. 
     UTMZone left, right;
 
@@ -417,17 +123,14 @@
     // These numbers are from trial-and-error.
     double utmInterval;
     if (utmDiff > 150000) return false;
-    else if (utmDiff > 18500) utmInterval = std::max(10000.0, _maxRes);
-    else if (utmDiff > 1750) utmInterval = std::max(1000.0, _maxRes);
-    else if (utmDiff > 170) utmInterval = std::max(100.0, _maxRes);
-    else utmInterval = std::max(10.0, _maxRes);
+    else if (utmDiff > 18500) utmInterval = osg::maximum(10000.0, _maxRes);
+    else if (utmDiff > 1750) utmInterval = osg::maximum(1000.0, _maxRes);
+    else if (utmDiff > 170) utmInterval = osg::maximum(100.0, _maxRes);
+    else utmInterval = osg::maximum(10.0, _maxRes);
 
     //OE_NOTICE << "utmDiff=" << utmDiff << ", utmInterval=" << utmInterval << std::endl;
-    
-    // Use this for clamping geopoints to the edges of the frustum:
-    ClipSpace window(MVP, MVPinv); 
 
-    // Indicies into the label pool
+    // Indices into the label pool
     unsigned xi = 0, yi = 0;
 
     // Finally, calculate all label positions and update them.
@@ -443,7 +146,7 @@
         if (numLabels < 2) numLabels = 2;
 
         // For now lets just draw 10 labels. Later we'll figure out the proper scale
-        for (unsigned i = 0; i < numLabels && xi < MAX_LABELS; ++i, ++xi)
+        for (unsigned i = 0; i < numLabels && xi < data.xLabels.size(); ++i, ++xi)
         {
             double t = (double)i / (double)(numLabels - 1);
             double x = xStart + utmInterval * i;
@@ -464,7 +167,7 @@
         numLabels = left.LL_utm.distanceTo(left.UL_utm) / utmInterval;
         if (numLabels < 2) numLabels = 2;
 
-        for (unsigned i = 0; i < numLabels && yi < MAX_LABELS; ++i, ++yi)
+        for (unsigned i = 0; i < numLabels && yi <  data.yLabels.size(); ++i, ++yi)
         {
             double t = (double)i / (double)(numLabels - 1);
             double x = left.LL_utm.x();
@@ -490,7 +193,7 @@
         unsigned numLabels = right.LL_utm.distanceTo(right.LR_utm) / utmInterval;
         if (numLabels < 2) numLabels = 2;
 
-        for (unsigned i = 0; i < numLabels && xi < MAX_LABELS; ++i, ++xi)
+        for (unsigned i = 0; i < numLabels && xi <  data.xLabels.size(); ++i, ++xi)
         {
             double t = (double)i / (double)(numLabels - 1);
             double x = xStart + utmInterval * i;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/VerticalScale osgearth-2.10.2+dfsg/src/osgEarthUtil/VerticalScale
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/VerticalScale	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/VerticalScale	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -33,6 +33,7 @@
 {
     /**
      * Terrain effect that scales the terrain height.
+     * @deprecated (remove after 2.10) see vertical_scale.earth instead
      */
     class OSGEARTHUTIL_EXPORT VerticalScale : public TerrainEffect
     {
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/VerticalScale.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/VerticalScale.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/VerticalScale.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/VerticalScale.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
+/* osgEarth - Geospatial SDK for OpenSceneGraph
 * Copyright 2008-2012 Pelican Mapping
 * http://osgearth.org
 *
@@ -21,8 +21,6 @@
 */
 #include <osgEarthUtil/VerticalScale>
 #include <osgEarth/Registry>
-#include <osgEarth/Capabilities>
-#include <osgEarth/VirtualProgram>
 #include <osgEarth/TerrainEngineNode>
 
 #define LC "[VerticalScale] "
@@ -33,7 +31,7 @@
 
 namespace
 {
-    // In the vertex shader, we use a vertex attribute that's genreated by the
+    // In the vertex shader, we use a vertex attribute that's generated by the
     // terrain engine. In this example it's called "oe_vertscale_attribs" but you 
     // can give it any name you want, as long as it's bound to the proper
     // attribute location (see code). 
@@ -139,13 +137,13 @@
 void
 VerticalScale::mergeConfig(const Config& conf)
 {
-    conf.getIfSet( "scale", _scale );
+    conf.get( "scale", _scale );
 }
 
 Config
 VerticalScale::getConfig() const
 {
     Config conf("vertical_scale");
-    conf.addIfSet( "scale", _scale );
+    conf.set( "scale", _scale );
     return conf;
 }
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ViewFitter osgearth-2.10.2+dfsg/src/osgEarthUtil/ViewFitter
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ViewFitter	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ViewFitter	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@
         double getBuffer() const { return _buffer_m; }
 
         //! Sets the reference VFOV when using an orthographic camera.
-        void setReferenceVFOV(float vfov_degrees);
+        void setReferenceVFOV(float vfov_degrees) {  _vfov = vfov_degrees; }
 
     protected:
         osg::ref_ptr<const osg::Camera> _camera;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/ViewFitter.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/ViewFitter.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/ViewFitter.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/ViewFitter.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -80,6 +80,11 @@
 
         extent.expandToInclude(p.x(), p.y());
     }
+
+    if (extent.area() == 0.0)
+    {
+        extent.expand(0.001, 0.001);
+    }
     
     double eyeDist;
     double fovy_deg, ar;
@@ -203,7 +208,7 @@
     double half_fovx_rad = half_fovy_rad * ar;
     double Zx = Mx / tan(half_fovx_rad);
     double Zy = My / tan(half_fovy_rad);
-    double Zbest = std::max(Zx, Zy);
+    double Zbest = osg::maximum(Zx, Zy);
 
     // Calcluate the new viewpoint.
     //osg::Vec3d FPworld = centroid;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/WFS osgearth-2.10.2+dfsg/src/osgEarthUtil/WFS
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/WFS	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/WFS	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/WFS.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/WFS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/WFS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/WFS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -21,7 +21,6 @@
 #include <osgEarth/XmlUtils>
 
 #include <osgDB/FileNameUtils>
-#include <osgDB/FileUtils>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/WMS osgearth-2.10.2+dfsg/src/osgEarthUtil/WMS
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/WMS	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/WMS	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -27,6 +27,7 @@
 #include <osg/Referenced>
 #include <osg/ref_ptr>
 #include <osgEarth/Common>
+#include <osgEarth/URI>
 
 #include <osgDB/ReaderWriter>
 #include <osg/Version>
@@ -53,7 +54,7 @@
         /**
         *Gets the name of the style
         */
-        const std::string& getName() {return _name;}
+	    const std::string& getName() const {return _name;}
 
         /**
         *Sets the name of the style
@@ -63,7 +64,7 @@
         /**
         *Gets the title of the style
         */
-        const std::string& getTitle() {return _title;}
+	    const std::string& getTitle() const {return _title;}
 
         /**
         *Sets the title of the style
@@ -253,7 +254,7 @@
     class OSGEARTHUTIL_EXPORT WMSCapabilitiesReader
     {
     public:
-        static WMSCapabilities* read( const std::string &location, const osgDB::ReaderWriter::Options *options );
+        static WMSCapabilities* read( const URI& location, const osgDB::Options *options );
         static WMSCapabilities* read( std::istream &in );
     private:
         WMSCapabilitiesReader(){}
diff -Nru osgearth-2.9.0+dfsg/src/osgEarthUtil/WMS.cpp osgearth-2.10.2+dfsg/src/osgEarthUtil/WMS.cpp
--- osgearth-2.9.0+dfsg/src/osgEarthUtil/WMS.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/osgEarthUtil/WMS.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
- * Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+ * Copyright 2019 Pelican Mapping
  * http://osgearth.org
  *
  * osgEarth is free software; you can redistribute it and/or modify
@@ -23,7 +23,6 @@
 #include <osgDB/FileNameUtils>
 #include <osgDB/FileUtils>
 
-#include <algorithm>
 
 using namespace osgEarth;
 using namespace osgEarth::Util;
@@ -136,12 +135,12 @@
 }
 
 WMSCapabilities* 
-WMSCapabilitiesReader::read( const std::string &location, const osgDB::ReaderWriter::Options* options )
+WMSCapabilitiesReader::read( const URI& location, const osgDB::ReaderWriter::Options* options )
 {
     WMSCapabilities *caps = NULL;
-    if ( osgDB::containsServerAddress( location ) )
+    if (location.isRemote())
     {
-        ReadResult rr = URI(location).readString( options );
+        ReadResult rr = location.readString( options );
         if ( rr.succeeded() )
         {
             std::istringstream in( rr.getString() );
@@ -150,9 +149,9 @@
     }
     else
     {
-        if ((osgDB::fileExists(location)) && (osgDB::fileType(location) == osgDB::REGULAR_FILE))
+        if ((osgDB::fileExists(location.full())) && (osgDB::fileType(location.full()) == osgDB::REGULAR_FILE))
         {
-            std::ifstream in( location.c_str() );
+            std::ifstream in( location.full().c_str() );
             caps = read( in );
         }
     }
@@ -258,6 +257,13 @@
                 maxY = as<double>(e_gbb->getSubElementText( ATTR_NORTHLAT ), 0);
                 layer->setLatLonExtents(minX, minY, maxX, maxY);
             }
+            else if (parentLayer)
+            {
+                // inherit the LL BB from the parent layer if there was one
+                double minX, minY, maxX, maxY;
+                parentLayer->getLatLonExtents(minX, minY, maxX, maxY);
+                layer->setLatLonExtents(minX, minY, maxX, maxY);
+            }
         }
 
         e_bb = e_layer->getSubElement( ELEM_BOUNDINGBOX );
diff -Nru osgearth-2.9.0+dfsg/src/tests/CMakeLists.txt osgearth-2.10.2+dfsg/src/tests/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/tests/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/tests/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -7,7 +7,7 @@
 	IF(OSGCORE_FOUND)
 		INCLUDE(${OSGCORE_USE_FILE})
 	ELSE(OSGCORE_FOUND)
-		MESSAGE(ERROR "OSGCORE neeeded but NOT FOUND")
+		MESSAGE(ERROR "OSGCORE needed but NOT FOUND")
 	ENDIF(OSGCORE_FOUND)
 	SET(CMAKE_MODULE_PATH  ${PROJECT_SOURCE_DIR}/../../Macros)
 ENDIF(NOT OSGCORE_BUNDLED)
diff -Nru osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/CacheTests.cpp osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/CacheTests.cpp
--- osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/CacheTests.cpp	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/CacheTests.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,85 @@
+/* -*-c++-*- */
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
+* http://osgearth.org
+*
+* osgEarth is free software; you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+* IN THE SOFTWARE.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#include <osgEarth/catch.hpp>
+#include <osgEarth/GeoData>
+#include <osgEarth/Registry>
+#include <osgEarth/Cache>
+
+using namespace osgEarth;
+
+TEST_CASE( "Cache" ) {
+
+    // Get the cache
+    osg::ref_ptr<Cache> cache = Registry::instance()->getDefaultCache();
+    REQUIRE(cache.valid());
+
+    // open a bin:
+    osg::ref_ptr< CacheBin > bin = cache->addBin("test_bin");
+    REQUIRE(bin.valid());
+
+    SECTION("String")
+    {
+        std::string key("string_key");
+        std::string value("What is the sound of one hand clapping?");
+        osg::ref_ptr<StringObject> s = new StringObject(value);
+
+        // Write a string to the cache
+        REQUIRE(bin->write(key, s.get(), 0L));
+
+        // Read the string from the cache
+        ReadResult r = bin->readString(key, 0L);
+        REQUIRE(r.succeeded());
+
+        // Make sure the values match
+        REQUIRE(r.getString().compare(value) == 0);
+
+        // Remove the string
+        REQUIRE(bin->remove(key));
+
+        // Try to read it again and make sure it's gone
+        ReadResult r2 = bin->readString(key, 0L);
+        REQUIRE(r2.failed());        
+    }
+
+    SECTION("Image")
+    {
+        std::string key("image_key");
+        osg::ref_ptr<osg::Image> image = ImageUtils::createOnePixelImage(osg::Vec4(1, 0, 0, 1));
+
+        // Write an image to the cache
+        REQUIRE(bin->write(key, image.get(), 0L));
+
+        // Read the image from the cache
+        ReadResult r = bin->readImage(key, 0L);
+        REQUIRE(r.succeeded());
+
+        REQUIRE(ImageUtils::areEquivalent(r.getImage(), image.get()));
+
+        // Remove the image
+        REQUIRE(bin->remove(key));
+
+        // Try to read it again and make sure it's gone
+        ReadResult r2 = bin->readImage(key, 0L);
+        REQUIRE(r2.failed());
+    }  
+}
diff -Nru osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/CMakeLists.txt osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/CMakeLists.txt
--- osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/CMakeLists.txt	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/CMakeLists.txt	2019-07-11 18:30:19.000000000 +0000
@@ -3,6 +3,7 @@
 
 SET(TARGET_SRC
     main.cpp
+    CacheTests.cpp
     EndianTests.cpp
     GeoExtentTests.cpp
     FeatureTests.cpp
diff -Nru osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/EndianTests.cpp osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/EndianTests.cpp
--- osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/EndianTests.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/EndianTests.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/FeatureTests.cpp osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/FeatureTests.cpp
--- osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/FeatureTests.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/FeatureTests.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
 /* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -51,3 +51,57 @@
         REQUIRE_FALSE(itr->get()->getExtent().crossesAntimeridian());
     }    
 }
+
+TEST_CASE("Feature handles attributes correctly.") {
+    osg::ref_ptr< Feature > feature = new Feature(new Geometry(), osgEarth::SpatialReference::create("wgs84"));
+
+    SECTION("Missing attributes get the correct default values.") {
+        REQUIRE(feature->getDouble("foo") == 0.0);
+        REQUIRE(feature->getBool("foo") == false);
+        REQUIRE(feature->getString("foo") == "");
+        REQUIRE(feature->getInt("foo") == 0);
+    }
+
+    SECTION("Setting attributes works") {
+        feature->set("string", std::string("test"));
+        REQUIRE(feature->getString("string") == "test");
+
+        feature->set("double", 6.0);
+        REQUIRE(feature->getDouble("double") == 6.0);
+
+        feature->set("int", 8);
+        REQUIRE(feature->getInt("int") == 8);
+
+        feature->set("bool", true);
+        REQUIRE(feature->getBool("bool") == true);        
+    }
+
+    SECTION("Null attributes get the correct default values") {
+        // First we set the attribute to a value before we set it to null.
+
+        feature->set("string", std::string("test"));
+        REQUIRE(feature->isSet("string") == true);
+        
+        feature->setNull("string");
+        REQUIRE(feature->isSet("string") == false);
+        REQUIRE(feature->getString("string") == "");
+
+        feature->set("double", 6.0);
+        REQUIRE(feature->isSet("double") == true);
+        feature->setNull("double");
+        REQUIRE(feature->isSet("double") == false);
+        REQUIRE(feature->getDouble("double") == 0.0);
+
+        feature->set("int", 8);
+        REQUIRE(feature->isSet("int") == true);
+        feature->setNull("int");
+        REQUIRE(feature->isSet("int") == false);
+        REQUIRE(feature->getInt("int") == 0);
+
+        feature->set("bool", true);
+        REQUIRE(feature->isSet("bool") == true);
+        feature->setNull("bool");
+        REQUIRE(feature->isSet("bool") == false);
+        REQUIRE(feature->getBool("bool") == false);
+    }
+}
diff -Nru osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/GeoExtentTests.cpp osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/GeoExtentTests.cpp
--- osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/GeoExtentTests.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/GeoExtentTests.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -111,6 +111,36 @@
         REQUIRE(invalid == GeoExtent(WGS84, -15.0, -15.0, -15.0, -15.0));
     }
 
+    SECTION("expandToInclude another geoextent to the east") {
+        GeoExtent ext(WGS84, -130, -10, -100, 10);
+        ext.expandToInclude(GeoExtent(WGS84, 0, -10, 40, 10));
+        REQUIRE(ext == GeoExtent(WGS84, -130, -10, 40, 10));
+    }
+
+    SECTION("expandToInclude another geoextent wrapping around") {
+        GeoExtent ext(WGS84, -130, -10, -100, 10);
+        ext.expandToInclude(GeoExtent(WGS84, 70, -10, 80, 10));
+        REQUIRE(ext == GeoExtent(WGS84, 70, -10, -100, 10));
+    }
+
+    SECTION("expandToInclude LHS completely contains RHS") {
+        GeoExtent ext(WGS84, -90, 0, -45, 45);
+        ext.expandToInclude(GeoExtent(WGS84, -60, 10, -50, 20));
+        REQUIRE(ext == GeoExtent(WGS84, -90, 0, -45, 45));
+    }
+
+    SECTION("expandToInclude LHS overlaps RHS") {
+        GeoExtent ext(WGS84, -90, 0, -45, 45);
+        ext.expandToInclude(GeoExtent(WGS84, -60, 20, -35, 50));
+        REQUIRE(ext == GeoExtent(WGS84, -90, 0, -35, 50));
+    }
+
+    SECTION("expandToInclude LHS overlaps RHS and RHS wraps around") {
+        GeoExtent ext(WGS84, 150, 0, 170, 10);
+        ext.expandToInclude(GeoExtent(WGS84, 160, 5, -165, 25));
+        REQUIRE(ext == GeoExtent(WGS84, 150, 0, -165, 25));
+    }
+
     //SECTION("expandToInclude expands to the full extent") {
     //    GeoExtent full(WGS84);
     //    full.expandToInclude(-180.0, -90);
@@ -163,7 +193,7 @@
         REQUIRE(e1.intersectionSameSRS(e2) == GeoExtent(WGS84, 170, -10, -170, 5));
     }
 
-    SECTION("2 extents tht abut do not intersect") {
+    SECTION("2 extents that abut do not intersect") {
         GeoExtent e1(WGS84, 0, 0, 10, 10);
         GeoExtent e2(WGS84, 10, 0, 20, 10);
         REQUIRE(e1.intersects(e2)==false);
diff -Nru osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/ImageLayerTests.cpp osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/ImageLayerTests.cpp
--- osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/ImageLayerTests.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/ImageLayerTests.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@
     osg::ref_ptr< ImageLayer > layer = new ImageLayer( ImageLayerOptions("world", opt) );
 
     Status status = layer->open();
-    REQUIRE( status.isOK() ); 
+    REQUIRE( status.isOK() );
 
     SECTION("Profiles are correct") {
         const Profile* profile = layer->getProfile();
@@ -57,3 +57,19 @@
         REQUIRE(image.getExtent() == key.getExtent());
     }
 }
+
+TEST_CASE("Attribution works") {
+
+    std::string attribution = "Attribution test";
+    GDALOptions gdalOpt;
+    gdalOpt.url() = "../data/world.tif";
+
+    ImageLayerOptions imageOpts;
+    imageOpts.driver() = gdalOpt;
+    imageOpts.attribution() = attribution;
+
+    osg::ref_ptr< ImageLayer > layer = new ImageLayer(imageOpts);
+    Status status = layer->open();
+    REQUIRE(status.isOK());
+    REQUIRE(layer->getAttribution() == attribution);
+}
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/main.cpp osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/main.cpp
--- osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/main.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/main.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/SpatialReferenceTests.cpp osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/SpatialReferenceTests.cpp
--- osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/SpatialReferenceTests.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/SpatialReferenceTests.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
diff -Nru osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/ThreadingTests.cpp osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/ThreadingTests.cpp
--- osgearth-2.9.0+dfsg/src/tests/osgEarth_tests/ThreadingTests.cpp	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/src/tests/osgEarth_tests/ThreadingTests.cpp	2019-07-11 18:30:19.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*-c++-*- */
-/* osgEarth - Dynamic map generation toolkit for OpenSceneGraph
-* Copyright 2016 Pelican Mapping
+/* osgEarth - Geospatial SDK for OpenSceneGraph
+* Copyright 2019 Pelican Mapping
 * http://osgearth.org
 *
 * osgEarth is free software; you can redistribute it and/or modify
@@ -99,7 +99,7 @@
 
 // Disabled temporarily b/c it's breaking the Travis build for some reason.  Works fine on regular machines.
 /*
-TEST_CASE( "ReadWriteMutex can handle mulitple read locks from the same thread while a writer is trying to lock" ) {    
+TEST_CASE( "ReadWriteMutex can handle multiple read locks from the same thread while a writer is trying to lock" ) {    
 
     ReadWriteMutexTest::Thread1 thread1;
     ReadWriteMutexTest::Thread2 thread2;
diff -Nru osgearth-2.9.0+dfsg/tests/annotation_dateline.earth osgearth-2.10.2+dfsg/tests/annotation_dateline.earth
--- osgearth-2.9.0+dfsg/tests/annotation_dateline.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/annotation_dateline.earth	2019-07-11 18:30:19.000000000 +0000
@@ -19,6 +19,7 @@
                 stroke:              #ffff00;
                 stroke-width:        3;
                 render-lighting:     false;
+                stroke-tessellation-size: 100km;
             </style>
         </feature>
 
diff -Nru osgearth-2.9.0+dfsg/tests/annotation_dateline_projected.earth osgearth-2.10.2+dfsg/tests/annotation_dateline_projected.earth
--- osgearth-2.9.0+dfsg/tests/annotation_dateline_projected.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/annotation_dateline_projected.earth	2019-07-11 18:30:19.000000000 +0000
@@ -30,13 +30,13 @@
 
        <!--An image overlay that crosses the date line and should be split into two chunks-->
         <imageoverlay>
-            <url>../data/flag_us.png</url>
+            <url>../data/fractal.png</url>
             <geometry>POLYGON((170 26, 190 26, 190 56, 170 56))</geometry>
         </imageoverlay>
 
         <!--An image overlay with non-axis aligned corners-->
         <imageoverlay>
-            <url>../data/flag_us.png</url>
+            <url>../data/fractal.png</url>
             <geometry>POLYGON((-81 26, -40.5 45, -40.5 75.5, -81 60))</geometry>
         </imageoverlay>
 
diff -Nru osgearth-2.9.0+dfsg/tests/annotation.earth osgearth-2.10.2+dfsg/tests/annotation.earth
--- osgearth-2.9.0+dfsg/tests/annotation.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/annotation.earth	2019-07-11 18:30:19.000000000 +0000
@@ -6,19 +6,19 @@
     <image name="ReadyMap.org - Imagery" driver="tms">
         <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
     </image>
-        
+
     <elevation name="ReadyMap.org - Elevation" driver="tms">
         <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
     </elevation>
-    
+
     <viewpoints>
-        <viewpoint name="Annotation Samples" 
+        <viewpoint name="Annotation Samples"
                    lat="33" long="-118" range="500000"
                    heading="35.27" pitch="-35" />
     </viewpoints>
-    
+
     <annotations name="Annotations Group A">
-    
+
         <label text="Label">
             <position lat="34" long="-120" />
             <style type="text/css">
@@ -32,7 +32,7 @@
                 text-bbox-border-width: 1;
             </style>
         </label>
-    
+
         <label text="Label with offsets">
             <position lat="16" long="-120" />
             <style type="text/css">
@@ -48,7 +48,7 @@
                 text-bbox-border-width: 1;
             </style>
         </label>
-        
+
         <place text="Place">
             <position lat="35" long="-110"/>
             <icon>../data/placemark32.png</icon>
@@ -57,10 +57,19 @@
                 text-halo:      #777;
             </style>
         </place>
-        
+
+        <place text="Extruded Place">
+            <position lat="35" long="-105" alt="5000"/>
+            <icon>../data/placemark32.png</icon>
+            <style type="text/css">
+                text-declutter: true;
+                text-halo:      #777;
+            </style>
+        </place>
+
         <circle name="draped circle">
             <position lat="34.051" long="-117.974"/>
-            <radius value="50" units="km"/>
+            <radius>50km</radius>
             <style type="text/css">
                 fill:               #ffff0080;
                 stroke:             #ffffff;
@@ -69,10 +78,10 @@
             </style>
         </circle>
         <label text="Draped circle" lat="34.051" long="-117.974"/>
-        
+
         <circle name="scene-clamped circle">
             <position lat="22.074" long="-159.606"/>
-            <radius value="1.2" units="km"/>
+            <radius>1.2km</radius>
             <style type="text/css">
                 stroke:             #ffffff;
                 stroke-width:       2px;
@@ -82,11 +91,11 @@
             </style>
         </circle>
         <label text="scene-clamped circle" lat="22.074" long="-159.606"/>
-        
+
         <ellipse name="ellipse relative">
             <position lat="40" long="-100" hat="5000"/>
-            <radius_major value="50" units="km"/>
-            <radius_minor value="40" units="km"/>
+            <radius_major>50km</radius_major>
+            <radius_minor>40km</radius_minor>
             <style type="text/css">
                 fill: #ff00ff7f;
                 stroke: #ffffff;
@@ -94,13 +103,13 @@
         </ellipse>
         <label text="HAT Ellipse" lat="40" long="-100.0"/>
     </annotations>
-    
+
     <annotations name="Annotations Group B">
-        
+
         <ellipse name="ellipse extruded">
             <position lat="32" long="-100.0"/>
-            <radius_major value="50" units="km"/>
-            <radius_minor value="20" units="km"/>
+            <radius_major>50km</radius_major>
+            <radius_minor>20km</radius_minor>
             <style type="text/css">
                 fill:             #ff7f007f;
                 stroke:           #ff0000ff;
@@ -147,7 +156,7 @@
                 text-bbox-border-width: 0.5;
             </style>
         </label>
-        
+
         <feature name="Draped Polygon">
             <srs>wgs84</srs>
             <geometry>
@@ -161,7 +170,7 @@
             </style>
         </feature>
         <label text="Draped Polygon" lat="45" long="-98"/>
-        
+
         <model name="Auto-Scaled Model">
             <position lat="43" long="-100"/>
             <style>
@@ -170,14 +179,14 @@
             </style>
         </model>
         <label text="Auto-Scaled Model" lat="42.5" long="-100"/>
-        
+
         <imageoverlay>
             <url>../data/fractal.png</url>
             <alpha>1.0</alpha>
             <geometry>POLYGON((-81 26, -80.5 26, -80.5 26.5, -81 26.5))</geometry>
-        </imageoverlay>            
+        </imageoverlay>
         <label text="ImageOverlay" lat="26" long="-81"/>
-        
+
         <local_geometry name="3D geometry">
             <geometry>
                 POLYGON((0 0 0, -25000 0 45000, 0 0 75000, 25000 0 45000))
@@ -207,13 +216,13 @@
                 render-lighting:     false;
             </style>
         </feature>
-        
+
         <label text="Tessellated line" lat="35" long="10">
             <style type="text/css">
                 text-align:              center_bottom;
                 text-geographic-course:  0;
             </style>
         </label>
-        
+
     </annotations>
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/annotation_flat.earth osgearth-2.10.2+dfsg/tests/annotation_flat.earth
--- osgearth-2.9.0+dfsg/tests/annotation_flat.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/annotation_flat.earth	2019-07-11 18:30:19.000000000 +0000
@@ -48,7 +48,7 @@
         
         <circle name="draped circle">
             <position lat="34.051" long="-117.974"/>
-            <radius value="50" units="km"/>
+            <radius>50km</radius>
             <style type="text/css">
                 fill:               #ffff0080;
                 stroke:             #ffffff;
@@ -60,7 +60,7 @@
         
         <circle name="scene-clamped circle">
             <position lat="22.074" long="-159.606"/>
-            <radius value="1.2" units="km"/>
+            <radius>1.2km</radius>
             <style type="text/css">
                 stroke:             #ffffff;
                 stroke-width:       2px;
@@ -72,8 +72,8 @@
         
         <ellipse name="ellipse relative">
             <position lat="40" long="-100" hat="5000"/>
-            <radius_major value="50" units="km"/>
-            <radius_minor value="40" units="km"/>
+            <radius_major>50km</radius_major>
+            <radius_minor>40km</radius_minor>
             <style type="text/css">
                 fill: #ff00ff7f;
                 stroke: #ffffff;
@@ -83,8 +83,8 @@
         
         <ellipse name="ellipse extruded">
             <position lat="32" long="-100.0"/>
-            <radius_major value="50" units="km"/>
-            <radius_minor value="20" units="km"/>
+            <radius_major>50km</radius_major>
+            <radius_minor>20km</radius_minor>
             <style type="text/css">
                 fill:             #ff7f007f;
                 stroke:           #ff0000ff;
diff -Nru osgearth-2.9.0+dfsg/tests/bing.earth osgearth-2.10.2+dfsg/tests/bing.earth
--- osgearth-2.9.0+dfsg/tests/bing.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/bing.earth	2019-07-11 18:30:19.000000000 +0000
@@ -11,8 +11,14 @@
 -->
 
 <map>    
-    <image name="bing" driver="bing">
+    <image name="Bing imagery" driver="bing">
         <key>your-api-key-here</key>
-        <imagery_set>AerialWithLabels</imagery_set>
-    </image>    
+        <imagery_set>Aerial</imagery_set>
+    </image> 
+    
+    <elevation name="Bing elevation" driver="bing">
+        <key>your-api-key-here</key>
+    </elevation>  
+
+    <xi:include href="viewpoints.xml"/>
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/boston.earth osgearth-2.10.2+dfsg/tests/boston.earth
--- osgearth-2.9.0+dfsg/tests/boston.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/boston.earth	2019-07-11 18:30:19.000000000 +0000
@@ -16,25 +16,21 @@
         <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
     </elevation>
       
-    <feature_model name="buildings">
+    <feature_model name="buildings" max_range="20000">
+         
         <features name="buildings" driver="ogr">
             <url>../data/boston_buildings_utm19.shp</url>
 			<resample min_length="2.5"/>
         </features>
         
         <!--
-           The "layout" element activates tiling and paging of the feature set. If you
-           omit the layout element, the entire feature set will render as one pre-loaded
-           model (no tiling or paging).
-           
-           Each "level" is a level of detail for features, and should select a style
-              to use for that level. It also can specify min and max camera ranges,
-              in meters.
-              
-           The "tile size factor" controls how a feature is tiled. The higher this factor,
-              the smaller the tile size, and the more tiles will be used to render a given
-              level of detail. The default is 15. tile size = max range / tile size factor.
-        -->
+         ! The "layout" element activates tiling and paging of the feature set. If you
+         ! omit the layout element, the entire feature set will render as one pre-loaded
+         ! model (no tiling or paging).
+         !  
+         ! Each "level" is a level of detail for features, and should select a style
+         ! to use for that level. It also can specify min and max camera ranges, in meters.
+         -->
         
         <layout tile_size="500">
             <level name="default" max_range="20000" style="buildings"/>
@@ -96,9 +92,6 @@
             <level max_range="1000" style="default"/>
         </layout>
         
-        <instancing>true</instancing>
-		<cluster_culling>false</cluster_culling>
-        
         <styles>
             <style type="text/css">
                 default {
@@ -124,8 +117,6 @@
             <level max_range="2000"/>
         </layout>
         
-        <instancing>true</instancing>
-		<cluster_culling>false</cluster_culling>
         <feature_indexing enabled="false"/>
         
         <styles>
diff -Nru osgearth-2.9.0+dfsg/tests/boston-gpu.earth osgearth-2.10.2+dfsg/tests/boston-gpu.earth
--- osgearth-2.9.0+dfsg/tests/boston-gpu.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/boston-gpu.earth	2019-07-11 18:30:19.000000000 +0000
@@ -107,17 +107,13 @@
             <level max_range="1000" style="default"/>
         </layout>
         
-        <instancing>true</instancing>
-		<cluster_culling>false</cluster_culling>
-        
         <styles>
             <style type="text/css">
                 default {
                     model:             "../data/streetlight.osgb";
                     model-script:      positionAlongSegments();
 					model-heading:     feature.properties.heading;
-                    altitude-clamping: terrain;                    
-                    render-depth-offset:    false;
+                    altitude-clamping: terrain;
                 }
             </style>
             <script language="javascript" profile="full">
@@ -130,26 +126,23 @@
     <feature_model name="Parks" enabled="true">
         <features name="parks" driver="ogr" build_spatial_index="true">
             <url>../data/boston-parks.shp</url>
-        </features>
+        </features>       
         
-        <layout tile_size_factor="3">
+        <layout tile_size="1000">
             <level max_range="2000"/>
         </layout>
         
-        <instancing>true</instancing>
-		<cluster_culling>false</cluster_culling>
-        
         <styles>
             <style type="text/css">
                 parks {
-                   model:                  "../data/loopix/tree4.osgb.(0.15).scale";
-				   //model-scale:            0.15 + 0.1*Math.random();
+                   model:                  "../data/loopix/tree4.osgb";
+				   model-scale:            0.15 + 0.1*Math.random();
                    model-placement:        random;
                    model-density:          3000;
 				   model-heading:          Math.random() * 360.0;
                    altitude-clamping:      terrain;
+				   render-transparent:     true;
 				   render-min-alpha:       0.15;
-                   render-depth-offset:    false;
                 }
             </style>
         </styles>        
diff -Nru osgearth-2.9.0+dfsg/tests/boston_projected.earth osgearth-2.10.2+dfsg/tests/boston_projected.earth
--- osgearth-2.9.0+dfsg/tests/boston_projected.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/boston_projected.earth	2019-07-11 18:30:19.000000000 +0000
@@ -1,19 +1,16 @@
 <!--
-osgEarth Sample.
-
-Demonstrates the use of a Resource Library in order to apply "typical" textures
-to extruded buildings.
+osgEarth Sample. Like boston.earth, but on a projected map
 -->
 
-<map name="Boston Demo" type="projected" version="2">
-
-    <options elevation_tile_size="8">
+<map name="Boston Demo" type="projected">
+    
+    <options>
 		<profile srs="+proj=utm +zone=19 +ellps=GRS80 +units=m +no_defs"
-		         xmin="291343" xmax="367343"
+		         xmin="291343"  xmax="367343"
 				 ymin="4653876" ymax="4722276"
                  num_tiles_wide_at_lod_0="1"
-				 num_tiles_high_at_lod_0="1"/>
-		<overlay_blending>false</overlay_blending>
+				 num_tiles_high_at_lod_0="1">
+        </profile>
     </options>
     
     <image name="readymap_imagery" driver="tms">
@@ -21,35 +18,26 @@
     </image>
     
     <elevation name="readymap_elevation" driver="tms">
-        <url>http://readymap.org/readymap/tiles/1.0.0/9/</url>
+        <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
     </elevation>
       
-    <model name="buildings" driver="feature_geom">
-             
+    <feature_model name="buildings" max_range="20000">
+         
         <features name="buildings" driver="ogr">
             <url>../data/boston_buildings_utm19.shp</url>
-            <build_spatial_index>true</build_spatial_index>
 			<resample min_length="2.5"/>
         </features>
         
-		<!-- Uncomment this for the featuremanip or featurequery demo. -->
-        <!-- <feature_indexing/> -->
-        
         <!--
-           The "layout" element activates tiling and paging of the feature set. If you
-           omit the layout element, the entire feature set will render as one pre-loaded
-           model (no tiling or paging).
-           
-           Each "level" is a level of detail for features, and should select a style
-              to use for that level. It also can specify min and max camera ranges,
-              in meters.
-              
-           The "tile size factor" controls how a feature is tiled. The higher this factor,
-              the smaller the tile size, and the more tiles will be used to render a given
-              level of detail. The default is 15. tile size = max range / tile size factor.
-        -->
+         ! The "layout" element activates tiling and paging of the feature set. If you
+         ! omit the layout element, the entire feature set will render as one pre-loaded
+         ! model (no tiling or paging).
+         !  
+         ! Each "level" is a level of detail for features, and should select a style
+         ! to use for that level. It also can specify min and max camera ranges, in meters.
+         -->
         
-        <layout tile_size_factor="52">
+        <layout tile_size="500">
             <level name="default" max_range="20000" style="buildings"/>
         </layout>
         
@@ -83,46 +71,32 @@
                 }
             </style>
         </styles>   
-    </model>
+    </feature_model>
     
     
-    <model name="Streets" driver="feature_geom" enabled="true">
-        <features name="streets" driver="ogr" build_spatial_index="true">
-            <url>../data/boston-scl-utm19n-meters.shp</url>
-			<resample min_length="25" max_length="25"/>
-        </features>
-        
-        <layout crop_features="true" tile_size_factor="7.5">
+    <feature_model name="Streets" feature_source="streets-data">        
+        <layout crop_features="true" tile_size="1000">
             <level max_range="5000"/>
-        </layout>
-        
+        </layout>        
         <styles>
             <style type="text/css">
-                streets {
+                default {
                     stroke:                       #ffff7f7f;
                     stroke-width:                 7.5m;
                     altitude-clamping:            terrain;
                     render-depth-offset-min-bias: 3.6;
+                    render-transparent:           true;
                 }
             </style>
         </styles>        
-    </model>
+    </feature_model>
 	
 	
-	<model name="streetlamps" driver="feature_geom">
-
-        <features name="street centerlines" driver="ogr" build_spatial_index="true">
-            <url>../data/boston-scl-utm19n-meters.shp</url>
-			<resample min_length="25" max_length="25"/>
-		</features>
-
-        <layout tile_size_factor="5" crop_features="true">
+	<feature_model name="streetlamps" feature_source="streets-data">
+        <layout tile_size="1000" crop_features="true">
             <level max_range="1000" style="default"/>
         </layout>
         
-        <instancing>true</instancing>
-		<cluster_culling>false</cluster_culling>
-        
         <styles>
             <style type="text/css">
                 default {
@@ -132,45 +106,53 @@
                     altitude-clamping: terrain;
                 }
             </style>
-            <script language="javascript">
+            <script language="javascript" profile="full">
 				<url>../data/scripts/createLineOffsetPoints.js</url>
 			</script>
         </styles>   
-    </model>
+    </feature_model>
     
     
-    <model name="Parks" driver="feature_geom" enabled="true">
-        <features name="parks" driver="ogr" build_spatial_index="true">
+    <feature_model name="Parks" enabled="true">
+        <features name="parks" driver="ogr">
             <url>../data/boston-parks.shp</url>
-        </features>
+        </features>        
         
-        <layout tile_size_factor="3">
+        <layout tile_size="1000">
             <level max_range="2000"/>
         </layout>
         
-        <instancing>true</instancing>
-		<cluster_culling>false</cluster_culling>
+        <feature_indexing enabled="false"/>
         
         <styles>
             <style type="text/css">
-                parks {
+                default {
                    model:                  "../data/loopix/tree4.osgb";
 				   model-scale:            0.15 + 0.1*Math.random();
                    model-placement:        random;
                    model-density:          3000;
 				   model-heading:          Math.random() * 360.0;
                    altitude-clamping:      terrain;
+                   render-transparent:     true;
 				   render-min-alpha:       0.15;
                 }
             </style>
         </styles>        
-    </model>
+    </feature_model>
     
-    <viewpoints>
+    <viewpoints time="1.0">
         <viewpoint name="Boston Overview" heading="24.261" height="0" lat="42.34425" long="-71.076262" pitch="-21.6" range="3450"/>
         <viewpoint name="Boston Downtown 1" heading="117" lat="42.3568" long="-71.0585" height="0" pitch="-20.4" range="1500" />
         <viewpoint name="Boston Downtown 2" heading="-128.5" lat="42.3582" long="-71.0546" height="0" pitch="-19" range="1620" />
         <viewpoint name="Boston Street Level" heading="-145.64081" lat="42.364015" long="-71.054149" pitch="-9.701" range="144.95"/>
     </viewpoints>
   
+    
+    <feature_source name="streets-data" driver="ogr">
+        <url>../data/boston-scl-utm19n-meters.shp</url>
+        <filters>
+            <resample min_length="25" max_length="25"/>
+        </filters>
+    </feature_source>
+    
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/cesium_ion.earth osgearth-2.10.2+dfsg/tests/cesium_ion.earth
--- osgearth-2.9.0+dfsg/tests/cesium_ion.earth	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/cesium_ion.earth	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,16 @@
+
+<!-- 
+Cesium Ion Driver
+
+Access image layers from the Cesium Ion service, available at https://cesium.com
+-->
+
+<map name="Cesium Ion" type="geocentric" version="2">
+ 
+    <image name="cesiumion bluemarble" driver="cesiumion">
+        <asset_id>3845</asset_id>
+        <!-- This is the default cesium ion key.  Change this to your access token to access your assets -->
+        <token>eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI0NDViM2NkNi0xYTE2LTRlZTUtODBlNy05M2Q4ODg4M2NmMTQiLCJpZCI6MjU5LCJpYXQiOjE1MTgxOTc4MDh9.sld5jPORDf_lWavMEsugh6vHPnjR6j3qd1aBkQTswNM</token>
+    </image>
+
+</map>
diff -Nru osgearth-2.9.0+dfsg/tests/clouds.earth osgearth-2.10.2+dfsg/tests/clouds.earth
--- osgearth-2.9.0+dfsg/tests/clouds.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/clouds.earth	2019-07-11 18:30:19.000000000 +0000
@@ -2,10 +2,6 @@
 osgEarth Sample - Rendering a cloud layer with a layer shader
 -->
 <map name="Imagery with clouds" type="geocentric">
-
-    <options>
-        <terrain driver="rex"/>
-    </options>
     
     <image name="readymap_imagery" driver="tms">
         <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
@@ -16,12 +12,23 @@
         <profile>global-geodetic</profile>
         <shader>
           <![CDATA[
-            #version 330
+          
+            #pragma vp_entryPoint raiseClouds
+            #pragma vp_location vertex_view
+            vec3 oe_UpVectorView;
+            const float cloudsAlt = 20000.0;
+            void raiseClouds(inout vec4 vv) {
+                vv.xyz += oe_UpVectorView*cloudsAlt;
+            }
+            
+            [break]
+            
             #pragma vp_entryPoint alphaOut
             #pragma vp_location fragment_coloring
             void alphaOut(inout vec4 color) {
                 color.a *= clamp(distance(color.rgb, vec3(0.0,0.0,0.0)), 0.0, 1.0);
             }
+            
           ]]>
         </shader>
     </image>
diff -Nru osgearth-2.9.0+dfsg/tests/contourmap.earth osgearth-2.10.2+dfsg/tests/contourmap.earth
--- osgearth-2.9.0+dfsg/tests/contourmap.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/contourmap.earth	2019-07-11 18:30:19.000000000 +0000
@@ -4,10 +4,6 @@
  
 <map>
 
-    <options>
-        <terrain driver="rex"/>
-    </options>
-
     <elevation name="ReadyMap.org - Elevation" driver="tms">
         <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
     </elevation>
diff -Nru osgearth-2.9.0+dfsg/tests/feature_draped_polygons.earth osgearth-2.10.2+dfsg/tests/feature_draped_polygons.earth
--- osgearth-2.9.0+dfsg/tests/feature_draped_polygons.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_draped_polygons.earth	2019-07-11 18:30:19.000000000 +0000
@@ -23,30 +23,24 @@
     <feature_model name="Countries" feature_source="world-data">
         <styles>        
             <style type="text/css">
-                p1 {
-                   fill:               #ffff807f;
+                base {
                    render-depth-test:  false;
                    altitude-clamping:  terrain-drape;
+                }                
+                p1 : base {
+                   fill: #ffff807f;
                 }       
-                p2 {
-                   fill:               #80ffff7f;
-                   render-depth-test:  false;
-                   altitude-clamping:  terrain-drape;
+                p2 : base {
+                   fill: #80ffff7f;
                 }   
-                p3 {
-                   fill:               #ff80ff7f;
-                   render-depth-test:  false;
-                   altitude-clamping:  terrain-drape;
+                p3 : base {
+                   fill: #ff80ff7f;
                 }       
-                p4 {
-                   fill:               #ff80807f;
-                   render-depth-test:  false;
-                   altitude-clamping:  terrain-drape;
+                p4 : base {
+                   fill: #ff80807f;
                 }     
-                p5 {
-                   fill:               #80ff807f;
-                   render-depth-test:  false;
-                   altitude-clamping:  terrain-drape;
+                p5 : base {
+                   fill: #80ff807f;
                 }                                      
             </style>
         
diff -Nru osgearth-2.9.0+dfsg/tests/feature_inline_geometry.earth osgearth-2.10.2+dfsg/tests/feature_inline_geometry.earth
--- osgearth-2.9.0+dfsg/tests/feature_inline_geometry.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_inline_geometry.earth	2019-07-11 18:30:19.000000000 +0000
@@ -18,52 +18,54 @@
     <options>
         <lighting>false</lighting>
     </options>
-    
+
     <image name="world" driver="gdal">
         <url>../data/world.tif</url>
     </image>
-    
-    
+
+
     <feature_model name="great_circle">
-	    <features driver="ogr">
-			<geometry>
-				POLYGON((-120 30, -120 50, -70 50, -70 30))
-			</geometry>
-		</features>
-        
+        <features driver="ogr">
+            <geometry>
+                POLYGON((-120 30, -120 50, -70 50, -70 30))
+            </geometry>
+        </features>
+
         <geo_interpolation>great_circle</geo_interpolation>
-        
+
         <styles>
             <style type="text/css">
                 default {
                    fill: #ffff006f;
                    stroke: #ffff00;
-                   stroke-width: 3px;
-				   altitude-clamping: terrain-drape;
+                   stroke-width: 1px;
+                   stroke-tessellation-size: 100km;
+                   altitude-clamping: terrain-drape;
                 }                    
             </style>
         </styles>        
     </feature_model>
-    
+
     <feature_model name="rhumb_line">
-	    <features driver="ogr">
-			<geometry>
-				POLYGON((-68 30, -68 50, -20 50, -20 30))
-			</geometry>
-		</features>
-        
+        <features driver="ogr">
+            <geometry>
+                POLYGON((-68 30, -68 50, -20 50, -20 30))
+            </geometry>
+        </features>
+
         <geo_interpolation>rhumb_line</geo_interpolation>
-        
+
         <styles>
             <style type="text/css">
                 default {
                    fill: #ff00ff6f;
                    stroke: #ff00ff;
-                   stroke-width: 3px;
-				   altitude-clamping: terrain-drape;
+                   stroke-width: 1px;
+                   stroke-tessellation-size: 100km;
+                   altitude-clamping: terrain-drape;
                 }                    
             </style>
         </styles>        
     </feature_model>
-  
+
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/feature_labels.earth osgearth-2.10.2+dfsg/tests/feature_labels.earth
--- osgearth-2.9.0+dfsg/tests/feature_labels.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_labels.earth	2019-07-11 18:30:19.000000000 +0000
@@ -10,14 +10,14 @@
     </image>
     
     <feature_source name="city-data" driver="ogr">
-        <url>../data/cities.shp</url>
+        <url>../data/cities.gpkg</url>
     </feature_source>
     
     <feature_model name="cities" feature_source="city-data">        
-        <feature_indexing enabled="true"/>
+        <feature_indexing enabled="false"/>
         <styles>
             <selector class="cities">
-                <query><expr><![CDATA[scalerank < 5]]></expr></query>
+                <query><expr><![CDATA[rank_max >= 8]]></expr></query>
             </selector>
             <style type="text/css">              
                 cities {
@@ -26,10 +26,11 @@
                     icon-declutter: true;
                     icon-align:     center-bottom;
                     text-content:   [name];
-                    text-priority:  10-[scalerank];
+                    text-encoding:  utf-8;
+                    text-priority:  [rank_max];
                     text-align:     center-bottom;
                     text-halo:      #1f1f1f;
-                    text-size:      6+2*(10-[scalerank]);
+                    text-size:      6+2*[rank_max];
                 }     
             </style>
         </styles>
@@ -41,7 +42,6 @@
         <min_animation_scale> 0.45 </min_animation_scale>
         <min_animation_alpha> 0.0  </min_animation_alpha>
         <sort_by_priority>    true </sort_by_priority>
-        <snap_to_pixel>       true </snap_to_pixel>
     </screen_space_layout>
   
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/feature_levels_and_selectors.earth osgearth-2.10.2+dfsg/tests/feature_levels_and_selectors.earth
--- osgearth-2.9.0+dfsg/tests/feature_levels_and_selectors.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_levels_and_selectors.earth	2019-07-11 18:30:19.000000000 +0000
@@ -4,12 +4,10 @@
 -->
 
 <map name="Feature Geometry Demo" type="geocentric" version="2">
-        
-    <image name="world" driver="gdal">
-        <url>../data/world.tif</url>
-    </image>
+
+    <xi:include href="readymap_imagery.xml"/>
     
-    <image name="boundaries" driver="agglite" max_data_level="7">
+    <feature_model name="boundaries">
         <features name="world" driver="ogr">
             <url>../data/world.shp</url>
         </features>
@@ -18,17 +16,17 @@
                 world {
                    stroke:       #9f9f7f;
                    stroke-width: 2px;
+                   render-clip-plane: 0;
+                   render-depth-test: false;
                 }            
             </style>
         </styles>        
-    </image>
+    </feature_model>    
     
-    
-    <model name="cities" driver="feature_geom">
+    <feature_model name="cities">
 
         <features name="cities" driver="ogr">
-            <url>../data/cities.shp</url>
-            <build_spatial_index>true</build_spatial_index>
+            <url>../data/cities.gpkg</url>
         </features>
         
         <layout>
@@ -40,50 +38,45 @@
         <styles>
             <selector name="large" class="label-large">
                 <query>
-                    <expr> <![CDATA[ rank_max >= 13 ]]> </expr>
+                    <expr> <![CDATA[ rank_max >= 12 ]]> </expr>
                 </query>
             </selector>
             
             <selector name="medium" class="label-medium">
                 <query>
-                    <expr> <![CDATA[ rank_max < 13 AND rank_max >= 11 ]]> </expr>
+                    <expr> <![CDATA[ rank_max >= 8 AND rank_max < 12 ]]> </expr>
                 </query>
             </selector>
             
             <selector name="small" class="label-small">
                 <query>
-                    <expr> <![CDATA[ rank_max < 11 ]]> </expr>
+                    <expr> <![CDATA[ rank_max < 8 ]]> </expr>
                 </query>
             </selector>
             
-            <style type="text/css">              
-                label-large {
+            <style type="text/css">   
+                label {
                     text-declutter: true;
                     text-content:   [name];
-                    text-size:      26.0;
+                    text-encoding:  utf-8;
                     text-align:     center_center;
                     text-priority:  [rank_max];
+                    text-halo:      #2f2f2f;
+                }                
+                label-large : label {
+                    text-size:      26.0;
+                    text-color: #ffff00;
                 }           
-                label-medium {
-                    text-declutter: true;
-                    text-content:   [name];
+                label-medium : label {
                     text-size:      20.0;
-                    text-align:     center_center;
-                    text-priority:  [rank_max];
                 }           
-                label-small {
-                    text-declutter: true;
-                    text-content:   [name];
-                    text-size:      14.0;
-                    text-align:     center_center;
-                    text-priority:  [rank_max];
+                label-small : label {
+                    text-size:      16.0;
                 }     
             </style>
         </styles>
         
-    </model>
-    
-    <options lighting="false"/>
+    </feature_model>
     
     <screen_space_layout>
         <sort_by_priority>true</sort_by_priority>
diff -Nru osgearth-2.9.0+dfsg/tests/feature_mapnikvectortiles.earth osgearth-2.10.2+dfsg/tests/feature_mapnikvectortiles.earth
--- osgearth-2.9.0+dfsg/tests/feature_mapnikvectortiles.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_mapnikvectortiles.earth	2019-07-11 18:30:19.000000000 +0000
@@ -73,7 +73,7 @@
                 }
 
                 forest {
-                   model:               "../data/tree.ive";
+                   model:               "../data/tree.osg";
                    model-placement:     random;
                    model-density:       10000;
                    model-scale:         2.5;
@@ -82,7 +82,7 @@
                 }
 
                 grass {
-                   model:               "../data/tree.ive";
+                   model:               "../data/tree.osg";
                    model-placement:     random;
                    model-density:       10000;
                    model-scale:         2.5;
@@ -198,7 +198,7 @@
     </feature_model>
 
     <image name="esri imagery" driver="arcgis">
-        <url>http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer</url>
+        <url>http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer</url>
         <nodata_image>http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer/tile/100/0/0.jpeg</nodata_image>
     </image>
 
diff -Nru osgearth-2.9.0+dfsg/tests/feature_model_scatter.earth osgearth-2.10.2+dfsg/tests/feature_model_scatter.earth
--- osgearth-2.9.0+dfsg/tests/feature_model_scatter.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_model_scatter.earth	2019-07-11 18:30:19.000000000 +0000
@@ -23,9 +23,6 @@
             <build_spatial_index>true</build_spatial_index>
         </features>
         
-        <!-- Instancing enables GL's "DrawInstanced" support. -->             
-        <instancing>true</instancing>
-        
         <!-- The stylesheet will describe how to render the feature data. In this case
              we indicate model substitution with density-based scattering. The "density"
              units are instances-per-sqkm. -->
@@ -43,32 +40,29 @@
                 park-polygons {
                    fill:                #00ff007f;
                    altitude-clamping:   terrain-drape;
-                }                
-                parks-1 {
-                   model:               "../data/tree.ive";
+                }    
+                parks {
+                   model:               "../data/tree.osg";
                    model-placement:     random;
-                   model-density:       1000;
-                   model-scale:         2.0;
                    altitude-clamping:   terrain;
                    altitude-resolution: 0.001;
+                   render-transparent:  true;
+                   render-min-alpha:    0.15;                   
+                }
+                parks-1 : parks {
+                   model-density:     1000;
+                   model-scale:       2.0;
+                   model-random-seed: 0;
                 }            
-                parks-2 {
-                   model:               "../data/tree.ive";
-                   model-placement:     random;
-                   model-density:       2500;
-                   model-scale:         2.5;
-                   model-random-seed:   1;
-                   altitude-clamping:   terrain;
-                   altitude-resolution: 0.001;
+                parks-2 : parks {
+                   model-density:     2500;
+                   model-scale:       2.5;
+                   model-random-seed: 1;
                 }              
-                parks-3 {
-                   model:               "../data/tree.ive";
-                   model-placement:     random;
-                   model-density:       5000;
-                   model-scale:         1.0
-                   model-random-seed:   2;
-                   altitude-clamping:   terrain;
-                   altitude-resolution: 0.001;
+                parks-3 : parks {
+                   model-density:     5000;
+                   model-scale:       2.25;
+                   model-random-seed: 2;
                 }                
             </style>
         </styles>        
diff -Nru osgearth-2.9.0+dfsg/tests/feature_models.earth osgearth-2.10.2+dfsg/tests/feature_models.earth
--- osgearth-2.9.0+dfsg/tests/feature_models.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_models.earth	2019-07-11 18:30:19.000000000 +0000
@@ -10,7 +10,8 @@
         <styles>
             <style type="text/css">
                 points {
-                   model: "../data/red_flag.osg.2500.scale";
+                   model: "../data/red_flag.osg";
+                   model-scale: 2500;
                 }                                            
             </style>
         </styles>   
diff -Nru osgearth-2.9.0+dfsg/tests/feature_poles.earth osgearth-2.10.2+dfsg/tests/feature_poles.earth
--- osgearth-2.9.0+dfsg/tests/feature_poles.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_poles.earth	2019-07-11 18:30:19.000000000 +0000
@@ -5,7 +5,7 @@
 
 -->
 
-<map name="Feature Pole Tesselation Test" type="geocentric" version="2">
+<map name="Feature Pole Tessellation Test" type="geocentric" version="2">
 
     <options>
         <lighting>false</lighting>
diff -Nru osgearth-2.9.0+dfsg/tests/feature_raster.earth osgearth-2.10.2+dfsg/tests/feature_raster.earth
--- osgearth-2.9.0+dfsg/tests/feature_raster.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_raster.earth	2019-07-11 18:30:19.000000000 +0000
@@ -3,18 +3,17 @@
 -->
 
 <map name="readymap.org" type="geocentric">
-    
+
     <options>        
         <terrain skirt_ratio="0.01" />
     </options>
-  
+
     <elevation name="readymap_elevation" driver="tms">
         <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
     </elevation>
 
-
     <libraries>osgEarthSplat</libraries>
-    
+
     <image name="CLASSMAP" driver="landuse" shared="true" visible="false" coverage="true" max_data_level="15">
         <base_lod>12</base_lod>
         <tile_size>256</tile_size>
@@ -29,45 +28,45 @@
         <shared_sampler> landUseTex       </shared_sampler>
         <shared_matrix>  landUseTexMatrix </shared_matrix>
     </image>
-  
-    <model name="trees" driver="feature_geom" enabled="true">
 
-        <features name="trees" driver="raster">
-            <layer>CLASSMAP</layer>
-            <level>12</level>
-        </features>
+    <!-- Layer that extracts features from an image layer -->
+    <image_to_feature name="classmap_features">
+        <image>CLASSMAP</image>
+        <level>12</level>
+        <attribute>value</attribute>
+    </image_to_feature>
 
-         <instancing>true</instancing>
+    <feature_model name="trees" feature_source="classmap_features">
 
-       <styles>                
+        <styles>                
             <style type="text/css">
                 forest {
-                   model:               "../data/tree.ive";
+                   model:               "../data/tree.osg";
                    model-placement:     random;
                    model-density:       1000;
-                   model-scale:         2.0;
+                   model-scale:         5.0;
                    altitude-clamping:   terrain;
-                                                            
+
                 }  
 
                 yellow {
                    stroke:             #ffff00;
                    stroke-width:       5px;
-                  
+
                 }
 
                 red {
                    stroke:             #ff0000;
                    stroke-width:       5px;
-                  
+
                 }  
 
             </style>
-            
+
             <selector name="default" style_expr="selectStyle()"/>
-            
+
             <script language="javascript">
-              <![CDATA[
+                <![CDATA[
                 rotator = 0;
                 function selectStyle() {
                     var value = parseFloat(feature.properties.value);
@@ -78,30 +77,30 @@
             </script>
         </styles>  
 
-    </model>
-    
-    
+    </feature_model>
+
+
     <image name="ReadyMap 15m" driver="tms" opacity="0.8">
         <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
     </image>
-  
+
     <viewpoints>            
         <viewpoint name="Trees 1">
-          <heading>-66.2945</heading>
-          <pitch>-14.0905</pitch>
-          <range>3408.89m</range>
-          <long>-121.7544800272052</long>
-          <lat>46.7792209225515</lat>
-          <height>1445.844014885835</height>
+            <heading>-66.2945</heading>
+            <pitch>-14.0905</pitch>
+            <range>3408.89m</range>
+            <long>-121.7544800272052</long>
+            <lat>46.7792209225515</lat>
+            <height>1445.844014885835</height>
         </viewpoint>
-        
+
         <viewpoint name="Trees 2">              
-          <heading>12.2384</heading>
-          <pitch>-4.26323</pitch>
-          <range>1421.77m</range>
-          <long>-121.8282019325911</long>
-          <lat>46.65132101133439</lat>
-          <height>1128.989560711198</height>
+            <heading>12.2384</heading>
+            <pitch>-4.26323</pitch>
+            <range>1421.77m</range>
+            <long>-121.8282019325911</long>
+            <lat>46.65132101133439</lat>
+            <height>1128.989560711198</height>
         </viewpoint>
     </viewpoints>
 
diff -Nru osgearth-2.9.0+dfsg/tests/feature_style_selector.earth osgearth-2.10.2+dfsg/tests/feature_style_selector.earth
--- osgearth-2.9.0+dfsg/tests/feature_style_selector.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_style_selector.earth	2019-07-11 18:30:19.000000000 +0000
@@ -26,11 +26,12 @@
         
         <styles>        
             <style type="text/css">
-                p1 { fill: #ffffff9f; altitude-clamping: terrain-drape; }       
-                p2 { fill: #cccccc9f; altitude-clamping: terrain-drape; }       
-                p3 { fill: #9999999f; altitude-clamping: terrain-drape; }       
-                p4 { fill: #6666669f; altitude-clamping: terrain-drape; }       
-                p5 { fill: #3333339f; altitude-clamping: terrain-drape; }       
+                p { altitude-clamping: terrain-drape; } 
+                p1 : p { fill: #ffffff9f; }
+                p2 : p { fill: #cccccc9f; }
+                p3 : p { fill: #9999999f; }
+                p4 : p { fill: #6666669f; }
+                p5 : p { fill: #3333339f; }
             </style>
             
             <script language="javascript">
diff -Nru osgearth-2.9.0+dfsg/tests/feature_tfs.earth osgearth-2.10.2+dfsg/tests/feature_tfs.earth
--- osgearth-2.9.0+dfsg/tests/feature_tfs.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_tfs.earth	2019-07-11 18:30:19.000000000 +0000
@@ -30,7 +30,7 @@
     </model>
 
     <image name="esri imagery" driver="arcgis">
-        <url>http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer</url>
+        <url>http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer</url>
         <nodata_image>http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer/tile/100/0/0.jpeg</nodata_image>
     </image>
 
diff -Nru osgearth-2.9.0+dfsg/tests/feature_wfs.earth osgearth-2.10.2+dfsg/tests/feature_wfs.earth
--- osgearth-2.9.0+dfsg/tests/feature_wfs.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/feature_wfs.earth	2019-07-11 18:30:19.000000000 +0000
@@ -11,7 +11,7 @@
     
     <model name="States" driver="feature_geom">
         <features name="states" driver="wfs">
-            <url>http://demo.opengeo.org/geoserver/wfs</url>           
+            <url>http://demo.boundlessgeo.com/geoserver/wfs</url>           
             <typename>topp:states</typename>
             <outputformat>json</outputformat>
         </features>
@@ -30,7 +30,7 @@
     
     <model name="Labels" driver="feature_geom">
         <features name="states" driver="wfs">
-            <url>http://demo.opengeo.org/geoserver/wfs</url>           
+            <url>http://demo.boundlessgeo.com/geoserver/wfs</url>           
             <typename>topp:states</typename>
             <outputformat>json</outputformat>
         </features>
diff -Nru osgearth-2.9.0+dfsg/tests/gdal_interp.earth osgearth-2.10.2+dfsg/tests/gdal_interp.earth
--- osgearth-2.9.0+dfsg/tests/gdal_interp.earth	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/gdal_interp.earth	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,50 @@
+<!--
+osgEarth Sample : gdal_interp.earth
+
+Shows the difference between all the available intepolation modes for the gdal driver.
+
+Because the world.tif file is very slow resolution, we increase the max_data_level to force additional tiles to be generated
+to show off the effect of the interpolation.
+
+Run with osgearth_toc to see the differences in interpolation
+
+Note, gdal image interpolation is only available if your GDAL version is 2.0 or higher.
+-->
+
+<map name="gdal_interp" type="geocentric" version="2">
+
+    <options lighting="false">
+        <cache_policy usage="no_cache"/>        
+    </options>
+
+    <image name="nearest" driver="gdal">
+        <url>../data/world.tif</url>
+        <max_data_level_override>19</max_data_level_override>
+        <interpolation>nearest</interpolation>
+    </image>
+
+    <image name="bilinear" driver="gdal">
+        <url>../data/world.tif</url>
+        <interpolation>bilinear</interpolation>
+        <max_data_level_override>19</max_data_level_override>
+    </image>
+
+    <image name="average" driver="gdal">
+        <url>../data/world.tif</url>
+        <interpolation>average</interpolation>
+        <max_data_level_override>19</max_data_level_override>
+    </image>
+
+    <image name="cubic" driver="gdal">
+        <url>../data/world.tif</url>
+        <interpolation>cubic</interpolation>
+        <max_data_level_override>19</max_data_level_override>
+    </image>
+
+    <image name="cubicspline" driver="gdal">
+        <url>../data/world.tif</url>
+        <interpolation>cubicspline</interpolation>
+        <max_data_level_override>19</max_data_level_override>
+    </image>
+
+</map>
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/tests/gdal_multiple_files.earth osgearth-2.10.2+dfsg/tests/gdal_multiple_files.earth
--- osgearth-2.9.0+dfsg/tests/gdal_multiple_files.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/gdal_multiple_files.earth	2019-07-11 18:30:19.000000000 +0000
@@ -1,5 +1,5 @@
 <!--
-osgEarth Sample - Multipe files in GDAL driver
+osgEarth Sample - Multiple files in GDAL driver
 
 This example displays how to use the GDAL driver to load files in a directory as a single, logical layer.
 
diff -Nru osgearth-2.9.0+dfsg/tests/glsl.earth osgearth-2.10.2+dfsg/tests/glsl.earth
--- osgearth-2.9.0+dfsg/tests/glsl.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/glsl.earth	2019-07-11 18:30:19.000000000 +0000
@@ -11,12 +11,14 @@
         <url>../data/world.tif</url>
         <caching_policy usage="no_cache"/>
         <shader>
+          <uniform name="gamma" value="2.2"/>
           <![CDATA[
-            #pragma vp_entryPoint invert
-            #pragma vp_location   fragment_coloring
-            void invert(inout vec4 color)
+            #pragma vp_entryPoint gammaCorrection
+            #pragma vp_location   fragment
+            uniform float gamma;
+            void gammaCorrection(inout vec4 color)
             {
-                color.rgb = 1.0-color.rgb;
+                color.rgb = pow(color.rgb, vec3(1.0/gamma));
             }            
           ]]>
         </shader>
diff -Nru osgearth-2.9.0+dfsg/tests/graticules.earth osgearth-2.10.2+dfsg/tests/graticules.earth
--- osgearth-2.9.0+dfsg/tests/graticules.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/graticules.earth	2019-07-11 18:30:19.000000000 +0000
@@ -10,6 +10,16 @@
     </image>  
     
     <gars_graticule name="GARS" visible="false">
+        <style type="text/css">
+                default {
+                    stroke: #ffff0059;
+                    stroke-width: 3px;
+                    stroke-tessellation-segments: 10;
+                    text-size: 28;
+                    text-fill: #ffffff7f;
+                    text-align: left_bottom;
+                }        
+        </style>
     </gars_graticule>  
     
     <mgrs_graticule name="MGRS" visible="true">
@@ -19,7 +29,7 @@
                 gzd {
                     stroke: #ff000059;
                     stroke-width: 4px;
-                    stroke-tessellation: 20;
+                    stroke-tessellation-segments: 10;
                     text-fill: #7f7f7fff;
                     text-align: left_bottom;
                 }
@@ -61,19 +71,22 @@
                 gzd {
                     stroke: #ffffff59;
                     stroke-width: 3px;
-                    stroke-tessellation: 20;
+                    stroke-tessellation-segments: 10;
                     text-fill: #7f7f7fff;
                     text-align: left_bottom;
                 }        
             </style>
         </styles>
     </mgrs_graticule>
-    
+            
     <geodetic_graticule name="Geodetic" visible="false">
         <color>#ffff007f</color>
         <label_color>#ffffffff</label_color>
         <grid_lines>10</grid_lines>
         <resolutions>10 5 2.5 1.0 0.5 0.25 0.125 0.0625 0.3125</resolutions>
+        <grid_lines_visible>true</grid_lines_visible>
+        <grid_labels_visible>true</grid_labels_visible>
+        <edge_labels_visible>true</edge_labels_visible>
     </geodetic_graticule>
     
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/intersect_filter.earth osgearth-2.10.2+dfsg/tests/intersect_filter.earth
--- osgearth-2.9.0+dfsg/tests/intersect_filter.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/intersect_filter.earth	2019-07-11 18:30:19.000000000 +0000
@@ -25,7 +25,7 @@
     
     <model name="Cities in France" driver="feature_geom">
         <features name="cities" driver="ogr">
-            <url>../data/cities.shp</url>
+            <url>../data/cities.gpkg</url>
             <filters>
                 <intersect>
                     <comment>
@@ -48,6 +48,7 @@
                 cities {
                     icon:           "../data/placemark32.png";
                     text-content:   [name];
+                    text-encoding:  utf-8;
                     text-halo:      #3f3f3f;
                 }     
             </style>
diff -Nru osgearth-2.9.0+dfsg/tests/land_cover_mixed.earth osgearth-2.10.2+dfsg/tests/land_cover_mixed.earth
--- osgearth-2.9.0+dfsg/tests/land_cover_mixed.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/land_cover_mixed.earth	2019-07-11 18:30:19.000000000 +0000
@@ -50,6 +50,7 @@
     <terrainshader>
         <code>
             <![CDATA[
+            #version 330
             #pragma vp_entryPoint colorize
             #pragma vp_location fragment_coloring
             uniform sampler2D CLASSMAP;
diff -Nru osgearth-2.9.0+dfsg/tests/mapbox.earth osgearth-2.10.2+dfsg/tests/mapbox.earth
--- osgearth-2.9.0+dfsg/tests/mapbox.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/mapbox.earth	2019-07-11 18:30:19.000000000 +0000
@@ -32,9 +32,6 @@
             <invert_y>true</invert_y>
         </features>
 
-
-        <instancing>true</instancing>
-
         <feature_indexing enabled="true"></feature_indexing>
 
         <styles>
@@ -72,7 +69,7 @@
                 }
 
                 forest {
-                   model:               "../data/tree.ive";
+                   model:               "../data/tree.osg";
                    model-placement:     random;
                    model-density:       10000;
                    model-scale:         2.5;
@@ -82,7 +79,7 @@
                 }
 
                 grass {
-                   model:               "../data/tree.ive";
+                   model:               "../data/tree.osg";
                    model-placement:     random;
                    model-density:       10000;
                    model-scale:         2.5;
diff -Nru osgearth-2.9.0+dfsg/tests/mb_tiles.earth osgearth-2.10.2+dfsg/tests/mb_tiles.earth
--- osgearth-2.9.0+dfsg/tests/mb_tiles.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/mb_tiles.earth	2019-07-11 18:30:19.000000000 +0000
@@ -1,15 +1,15 @@
 <!--
 osgEarth Sample
-This example shows how to access an MBTiles dataset. 
+This example shows how to access an MBTiles dataset.
 The MBTiles datasets are very large so they are no in the osgEarth repository.
 You can download the sample from:
 https://www.arcgis.com/home/item.html?id=7b650618563741ca9a5186c1aa69126e
 -->
 
-<map name="MBTiles" type="geocentric" version="2">    
-      
+<map name="MBTiles" type="geocentric" version="2">
+
     <image name="Sample MBTiles Database" driver="mbtiles">
-        <filename>world_countries.mbtiles</filename>
+        <filename>../data/world_countries.mbtiles</filename>
     </image>
-   
+
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/min_max_range.earth osgearth-2.10.2+dfsg/tests/min_max_range.earth
--- osgearth-2.9.0+dfsg/tests/min_max_range.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/min_max_range.earth	2019-07-11 18:30:19.000000000 +0000
@@ -3,8 +3,6 @@
 
 As you zoom in, you will see the aerial imagery transition into
 a street map. Zoom in further and see it transition back to aerial.
-
-TIP: set your OSG_NUM_HTTP_DATABASE_THREADS to 4 or more!
 -->
 
 <map name="MapQuest Open Aerial" type="geocentric" version="2">
@@ -14,12 +12,8 @@
         <cache_policy usage="no_cache"/>
     </image>
     
-    <image name="readymap_imagery" driver="tms" max_range="1e7" min_range="1e6">
+    <image name="readymap_imagery" driver="tms" max_range="10000000" min_range="2000000" attenuation_range="2500000">
         <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
     </image>
     
-    <options>
-        <terrain attenuation_distance="6000000"/>
-    </options>
-    
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/min_max_resolutions.earth osgearth-2.10.2+dfsg/tests/min_max_resolutions.earth
--- osgearth-2.9.0+dfsg/tests/min_max_resolutions.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/min_max_resolutions.earth	2019-07-11 18:30:19.000000000 +0000
@@ -6,22 +6,26 @@
 <map name="Min Max Resolution Levels" type="geocentric" version="2">
     
 	<!-- this level will be visible at lower resolutions -->
-	<image name="mapquest_aerial" driver="xyz">
-		<url>http://oatile[1234].mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.jpg</url>
-		<profile>spherical-mercator</profile>
-		<cache_policy usage="no_cache"/>
-		<nodata_image>http://oatile3.mqcdn.com/tiles/1.0.0/sat/13/636/6210.jpg</nodata_image>      
+	<image name="EOX cloudless" driver="wms">
+        	<url>https://tiles.maps.eox.at/wms?</url>
+        	<format>jpeg</format>
+        	<layers>s2cloudless</layers>
+        	<tile_size>256</tile_size>
+        	<srs>EPSG:4326</srs>
+        	<transparent>false</transparent> 
 		<min_resolution>7500</min_resolution>
 	</image> 
 
 	<!-- this level will be visible at higher resolutions -->
-	<image name="mapquest_osm" driver="xyz">
-		<url>http://otile[1234].mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg</url>
-		<profile>spherical-mercator</profile>       
-		<cache_policy usage="no_cache"/>
+	<image name="osm_mapnik" driver="xyz">
+        	<url>http://[abc].tile.openstreetmap.org/{z}/{x}/{y}.png</url>
+        	<profile>spherical-mercator</profile>
+        	<cache_policy usage="none"/>
+        	<attribution>&#169;OpenStreetMap contributors</attribution>
 		<max_resolution>2500</max_resolution>
 	</image>
 	
+	
 	<options lighting="false"/>
         
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/modulate.earth osgearth-2.10.2+dfsg/tests/modulate.earth
--- osgearth-2.9.0+dfsg/tests/modulate.earth	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/modulate.earth	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,14 @@
+<!--
+osgEarth Sample - Image Layer Modulation Blending
+-->
+<map name="readymap.org" type="geocentric">
+
+    <image name="readymap_imagery" driver="tms">
+        <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
+    </image>
+
+    <image name="Noise" driver="osg" blend="modulate" opacity="0.5">
+        <url> ../data/fractal.png </url>
+        <profile> global-geodetic </profile>
+    </image>
+</map>
diff -Nru osgearth-2.9.0+dfsg/tests/nationalmap.earth osgearth-2.10.2+dfsg/tests/nationalmap.earth
--- osgearth-2.9.0+dfsg/tests/nationalmap.earth	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/nationalmap.earth	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,16 @@
+<map>
+    <xi:include href="readymap_imagery.xml"/>
+    
+    <xi:include href="readymap_elevation.xml"/>    
+    
+    <image name="USGS NAIP+ Imagery" driver="wms">
+        <url>https://services.nationalmap.gov/arcgis/services/USGSNAIPPlus/MapServer/WmsServer?</url>
+        <format>png</format>
+        <layers>1</layers>
+        <tile_size>256</tile_size>
+        <srs>EPSG:4326</srs>
+        <transparent>true</transparent>
+    </image>
+    
+    <xi:include href="viewpoints.xml"/>
+</map>
diff -Nru osgearth-2.9.0+dfsg/tests/nodata.earth osgearth-2.10.2+dfsg/tests/nodata.earth
--- osgearth-2.9.0+dfsg/tests/nodata.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/nodata.earth	2019-07-11 18:30:19.000000000 +0000
@@ -17,6 +17,6 @@
     <options lighting="false"/>
 
     <viewpoints>
-        <viewpoint name="NoData" heading="0.0" height="0" lat="5.0" long="15.0" pitch="-90" range="1e6"/>
+        <viewpoint name="NoData" heading="0.0" height="0" lat="5.0" long="15.0" pitch="-75" range="1000000"/>
     </viewpoints>
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/ocean.earth osgearth-2.10.2+dfsg/tests/ocean.earth
--- osgearth-2.9.0+dfsg/tests/ocean.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/ocean.earth	2019-07-11 18:30:19.000000000 +0000
@@ -1,43 +1,46 @@
 <!--
-osgEarth Sample - ReadyMap.ORG Server - http://readymap.org
+osgEarth Sample - Simple Ocean with surface texture
 
-ReadyMap.ORG provides free global base map data for osgEarth developers!
-This tiled, worldwide dataset of imagery, elevation, and street map data
-is a great base map that provides global context for your own local datasets.
-It works "out of the box" with osgEarth applications.
-
-**** NOTICE ****
-YOU ARE RESPONSIBLE for abiding by the TERMS AND CONDITIONS outlined at:
-http://readymap.org
+You can adjust the sea level with a uniform; e.g.:
 
+  --uniform ocean_seaLevel 0 100
+  
 -->
-<map name="readymap.org" type="geocentric" version="2">
+<map name="readymap.org" type="geocentric">
 
-    <options>
-        <terrain driver="rex"/>
-    </options>
-    
-    <image name="ReadyMap.org - Imagery" driver="tms">
+    <image name="readymap_imagery" driver="tms">
         <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
     </image>
-        
-    <elevation name="ReadyMap.org - Elevation" driver="tms">
+
+    <elevation name="readymap_elevation" driver="tms" vdatum="egm96">
         <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
     </elevation>
-    
-    <simple_ocean>      
-        <color>#1D2C4FF7</color>
-        <max_altitude>500000</max_altitude>
-        <mask_layer>ocean_mask</mask_layer>
+
+    <simple_ocean>
+        <max_altitude>1e10</max_altitude>
+        <texture>../data/textures/water_modulate.png</texture>
+        <texture_lod>13</texture_lod>
+        <use_bathymetry>true</use_bathymetry>
     </simple_ocean>
-    
-    <image name="ocean_mask" visible="false" shared="true" driver="tms">
-        <url>http://readymap.org/readymap/tiles/1.0.0/2/</url>
-    </image>
-        
+
     <viewpoints>
-        <viewpoint name="Los Angeles" heading="35.27" height="97.48" lat="34.051" long="-117.974" pitch="-17" range="136405"/>
-        <viewpoint name="Above water" heading="-76.17264538992794" height="-199.5569639196619" lat="33.27975381179682" long="-118.3307776586542" pitch="-10.06523772274543" range="3739.161570538204"/>
-        <viewpoint name="Below water" heading="-24.96310172368127" height="-1300.000076910481" lat="33.27360337088133" long="-118.5514448058582" pitch="-10.0770016631354" range="6375.084038302656"/>
+        <viewpoint name="San Clemente">
+            <heading>-4.56648</heading>
+            <pitch>-15.6443</pitch>
+            <range>9272.95m</range>
+            <long>-118.4811706646827</long>
+            <lat>32.80594432832285</lat>
+            <height>-139.788777125068</height>
+            <srs>+proj=longlat +datum=WGS84 +no_defs </srs>
+        </viewpoint>
+        <viewpoint name="Capri">
+            <heading>50.1869</heading>
+            <pitch>-14.3472</pitch>
+            <range>8118.73m</range>
+            <long>14.21358890393404</long>
+            <lat>40.53085371008456</lat>
+            <height>-296.9707998111844</height>
+            <srs>+proj=longlat +datum=WGS84 +no_defs </srs>
+        </viewpoint>
     </viewpoints>
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/openstreetmap.earth osgearth-2.10.2+dfsg/tests/openstreetmap.earth
--- osgearth-2.9.0+dfsg/tests/openstreetmap.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/openstreetmap.earth	2019-07-11 18:30:19.000000000 +0000
@@ -1,22 +1,23 @@
-<!-- 
+<!--
 OpenStreetMap's Mapnik "Slippy Map" - Geocentric.
 See:
 http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames
 -->
 
 <map name="OpenStreetMap" type="geocentric" version="2">
- 
+
     <image name="osm_mapnik" driver="xyz">
         <url>http://[abc].tile.openstreetmap.org/{z}/{x}/{y}.png</url>
         <profile>spherical-mercator</profile>
         <cache_policy usage="none"/>
+        <attribution>&#169;OpenStreetMap contributors</attribution>
     </image>
-    
+
     <options>
         <lighting>false</lighting>
         <terrain>
             <min_tile_range_factor>8</min_tile_range_factor>
         </terrain>
     </options>
-    
+
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/openstreetmap_full.earth osgearth-2.10.2+dfsg/tests/openstreetmap_full.earth
--- osgearth-2.9.0+dfsg/tests/openstreetmap_full.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/openstreetmap_full.earth	2019-07-11 18:30:19.000000000 +0000
@@ -15,8 +15,6 @@
             <format>pbf</format>
         </features>
 
-        <instancing>true</instancing>
-
         <feature_indexing enabled="false"></feature_indexing>
 
         <styles>
@@ -51,7 +49,7 @@
                 }
 
                 forest {
-                   model:               "../data/tree.ive";
+                   model:               "../data/tree.osg";
                    model-placement:     random;
                    model-density:       10000;
                    model-scale:         2.5;
@@ -60,7 +58,7 @@
                 }
 
                 grass {
-                   model:               "../data/tree.ive";
+                   model:               "../data/tree.osg";
                    model-placement:     random;
                    model-density:       10000;
                    model-scale:         2.5;
@@ -178,7 +176,7 @@
 
 
     <image name="esri imagery" driver="arcgis">
-        <url>http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer</url>
+        <url>http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer</url>
         <nodata_image>http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer/tile/100/0/0.jpeg</nodata_image>
     </image>
 
diff -Nru osgearth-2.9.0+dfsg/tests/readymap_elevation.xml osgearth-2.10.2+dfsg/tests/readymap_elevation.xml
--- osgearth-2.9.0+dfsg/tests/readymap_elevation.xml	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/readymap_elevation.xml	2019-07-11 18:30:19.000000000 +0000
@@ -1,3 +1,3 @@
- <elevation name="readymap_elevation" driver="tms">
+ <elevation name="readymap_elevation" driver="tms" vdatum="egm96">
         <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
  </elevation>
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/tests/readymap_flat.earth osgearth-2.10.2+dfsg/tests/readymap_flat.earth
--- osgearth-2.9.0+dfsg/tests/readymap_flat.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/readymap_flat.earth	2019-07-11 18:30:19.000000000 +0000
@@ -15,7 +15,6 @@
     
     <options>
         <profile>plate-carre</profile>
-        <terrain driver="rex" tile_size="2" morph_terrain="false"/>
     </options>
     
     <image name="readymap_imagery" driver="tms">
diff -Nru osgearth-2.9.0+dfsg/tests/readymap-rex.earth osgearth-2.10.2+dfsg/tests/readymap-rex.earth
--- osgearth-2.9.0+dfsg/tests/readymap-rex.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/readymap-rex.earth	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<!--
- !  osgEarth Sample - REX Engine.
- !-->
-
-<map name="rex test">
-    
-    <options>        
-        <terrain driver                = "rex"
-                 tile_size             = "17"
-                 merges_per_frame      = "4"
-                 morph_terrain         = "true"
-                 morph_imagery         = "true"
-                 high_resolution_first = "true"
-                 progressive           = "false"
-                 skirt_ratio           = "0.0"
-                 normal_maps           = "true">
-        </terrain>
-    </options>
-    
-    <image name="readymap_imagery" driver="tms">
-        <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
-    </image>
-    
-    <elevation name="readymap_elevation" driver="tms">
-        <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
-    </elevation>
-    
-    <xi:include href="viewpoints.xml"/>
-    
-</map>
diff -Nru osgearth-2.9.0+dfsg/tests/roads.earth osgearth-2.10.2+dfsg/tests/roads.earth
--- osgearth-2.9.0+dfsg/tests/roads.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/roads.earth	2019-07-11 18:30:19.000000000 +0000
@@ -13,19 +13,14 @@
 -->
 <map name="readymap.org" type="geocentric">
 
-    <options>
-        <terrain driver="rex" progressive="true">
-        </terrain>
-    </options>
-
     <image name="readymap_imagery" driver="tms" visible="true" opacity="0.5">
         <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
     </image>
 
-    <image name="Tilekeys" driver="debug">
+    <image name="Tilekeys" driver="debug" enabled="false">
     </image>
 
-    <road_surface name="road-surface" min_level="14" max_level="18">
+    <road_surface name="road-surface" min_level="14" max_data_level="18">
         <cache_policy usage="no_cache"/>
         <tile_size>512</tile_size>
         <feature_source>roads-data</feature_source>
@@ -56,7 +51,7 @@
         </styles>
     </feature_model>
 
-    <feature_model name="Road skeleton" visible="false">
+    <feature_model name="Road skeleton" enabled="false">
         <feature_source>roads-data</feature_source>
         <styles>
             <style type="text/css">
@@ -65,7 +60,7 @@
                     stroke-width: 65m;
                     render-depth-test: false;
                     render-order: 2;
-                    stroke-image: "../data/grid.png";
+                    stroke-image: "../data/grid2.png";
                 }
             </style>
         </styles>
diff -Nru osgearth-2.9.0+dfsg/tests/roads-flattened.earth osgearth-2.10.2+dfsg/tests/roads-flattened.earth
--- osgearth-2.9.0+dfsg/tests/roads-flattened.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/roads-flattened.earth	2019-07-11 18:30:19.000000000 +0000
@@ -26,7 +26,7 @@
             }
 
             function getBufferWidth() {
-                return 12.0;
+                return 24.0;
             }
         ]]>
         </script>
diff -Nru osgearth-2.9.0+dfsg/tests/scene_clamping.earth osgearth-2.10.2+dfsg/tests/scene_clamping.earth
--- osgearth-2.9.0+dfsg/tests/scene_clamping.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/scene_clamping.earth	2019-07-11 18:30:19.000000000 +0000
@@ -25,7 +25,7 @@
         </viewpoint>
     </viewpoints>
 
-    <annotations>
+    <annotations name="Annotations: LocalGeometryNode">
     
         <circle name="Circle clamped directly to the ground">
             <position lat="22.074" long="-159.606"/>
@@ -33,43 +33,55 @@
             <style type="text/css">
                 stroke:             #ffffff;
                 stroke-width:       2px;
-                altitude-clamping:  relative;
-                altitude-technique: scene;
                 altitude-binding:   vertex;
-                render-depth-offset-auto: true;
+                render-depth-offset: true;
             </style>
         </circle>
-        <label text="WHITE = clamped to ground" lat="22.074" long="-159.5"/>
+        <label text="WHITE = clamped to ground" lat="22.074" long="-159.5">
+            <style>
+                text-size: 24;
+                text-halo: #000;
+            </style>
+        </label>
         
         <circle name="Circle clamped with an altitude offset">
-            <position lat="22.074" long="-159.606"/>
+            <position lat="22.074" long="-159.606" hat="1000"/>
             <radius value="1.2" units="km"/>
             <style type="text/css">
                 stroke:             #ffff00;
                 stroke-width:       2px;
-                altitude-clamping:  relative;
-                altitude-technique: scene;
                 altitude-binding:   vertex;
-                altitude-offset:    1000;
             </style>
         </circle>
         <label text="YELLOW = clamped relative to ground" lat="22.17" long="-159.606"/>
              
         <circle name="Circle clamped above the ground by its centroid">
-            <position lat="22.074" long="-159.606"/>
+            <position lat="22.074" long="-159.606" hat="2000"/>
             <radius value="1.2" units="km"/>
             <style type="text/css">
                 stroke:             #00ffff;
                 stroke-width:       2px;
-                altitude-clamping:  relative;
-                altitude-technique: scene;
                 altitude-binding:   centroid;
-                altitude-offset:    2000;
             </style>
         </circle>
         <label text="CYAN = clamped relative to ground by centroid" lat="22.074" long="-159.7"/>
-        
-        
+                
+        <local_geometry name="Local Geometry tessellated and clamped">
+            <geometry>
+                LINESTRING(0 0, 25000 0, 25000 25000, 0 25000, 0 0);
+            </geometry>
+            <position lat="22.078" long="-159.602"/>
+            <style type="text/css">
+                stroke:          #ff00ff;
+                stroke-width:    3px;
+                stroke-tessellation-size: 500m;
+                altitude-binding:    vertex;
+                render-depth-offset: true;
+            </style>
+        </local_geometry>
+    </annotations>
+    
+    <annotations name="Annotations: FeatureNode">    
         <feature name="Feature clamped to ground">
             <srs>wgs84</srs>
             <geometry>
@@ -81,14 +93,14 @@
                 stroke-tessellation-size: 500m;
                 altitude-clamping:   terrain;
                 altitude-technique:  scene;
-                render-depth-offset-auto: true;
+                render-depth-offset: true;
             </style>
         </feature>
         
         <feature name="Feature clamped relative to ground">
             <srs>wgs84</srs>
             <geometry>
-                LINESTRING(-159.606 22.074, -159.606 22.5)
+                LINESTRING(-159.606 22.074 1000, -159.606 22.5 1000)
             </geometry>
             <style type="text/css">
                 stroke:              #ffff00;
@@ -96,27 +108,26 @@
                 stroke-tessellation-size: 500m;
                 altitude-clamping:   relative;
                 altitude-technique:  scene;
-                altitude-offset:     1000;
             </style>
         </feature>
-        
-        <local_geometry name="Local Geometry tessellated and clamped">
-            <geometry>
-                LINESTRING(0 0, 25000 0, 25000 25000, 0 25000, 0 0);
-            </geometry>
-            <position lat="22.078" long="-159.602"/>
+    </annotations>
+
+    <annotations name="Annotations: Extrusion">    
+        <circle name="Circle clamped and extruded">
+            <position lat="21.974" long="-159.606"/>
+            <radius value="1.2" units="km"/>
             <style type="text/css">
-                stroke:          #ff00ff;
-                stroke-width:    3px;
-                stroke-tessellation: 128;
-                render-lighting: false;
-                altitude-clamping: terrain;
+                fill:               #8f4f107f;
+                stroke:             #ffff00;
+                stroke-width:       1px;
                 altitude-technique: scene;
-                render-depth-offset-auto: true;
+                altitude-binding:   vertex;
+                extrusion-height:   500;
             </style>
-        </local_geometry>
-        
-        
+        </circle>
+    </annotations>
+    
+    <annotations name="PlaceNode">              
         <place name="Placemark" text="Placemark">
             <position lat="22.074" long="-159.606"/>
             <icon>../data/placemark32.png</icon>
@@ -125,6 +136,5 @@
                 text-halo:      #777;
             </style>
         </place>
-
     </annotations>
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/simple_model.earth osgearth-2.10.2+dfsg/tests/simple_model.earth
--- osgearth-2.9.0+dfsg/tests/simple_model.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/simple_model.earth	2019-07-11 18:30:19.000000000 +0000
@@ -15,10 +15,6 @@
       <location>-74.018 40.717 10</location>	  
     </model>
     
-    <options lighting="false">
-        <terrain min_lod="12"/>
-    </options>
-    
     <viewpoints>
         <viewpoint name="Zoom to model" lat="40.717" long="-74.018" pitch="-60" range="6000"/>    
     </viewpoints>
diff -Nru osgearth-2.9.0+dfsg/tests/splat-blended-with-imagery.earth osgearth-2.10.2+dfsg/tests/splat-blended-with-imagery.earth
--- osgearth-2.9.0+dfsg/tests/splat-blended-with-imagery.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/splat-blended-with-imagery.earth	2019-07-11 18:30:19.000000000 +0000
@@ -28,8 +28,12 @@
     <elevation name="readymap_elevation" driver="tms" enabled="true">
         <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
     </elevation>
+    
+    <image name="readymap_imagery" driver="tms">
+        <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
+    </image>
         
-    <splat_imagery name="Splat Imagery" land_cover_layer="LandCover">
+    <splat_imagery name="Splat Imagery" land_cover_layer="LandCover" blend="modulate" max_range="250000" attenuation_range="100000">
         <zones>
             <zone name="default">
                 <surface>
@@ -38,10 +42,6 @@
             </zone>
         </zones>
     </splat_imagery>
-    
-    <image name="readymap_imagery" driver="tms" min_range="500000">
-        <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
-    </image>
             
     <xi:include href="viewpoints.xml"/>
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/splat-with-multiple-zones.earth osgearth-2.10.2+dfsg/tests/splat-with-multiple-zones.earth
--- osgearth-2.9.0+dfsg/tests/splat-with-multiple-zones.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/splat-with-multiple-zones.earth	2019-07-11 18:30:19.000000000 +0000
@@ -26,6 +26,7 @@
         <coverages>
             <coverage name="ESA GLOBCOVER" driver="gdal">
                 <url>H:/data/esa/GLOBCOVER_L4_200901_200912_V2.3_Ant_tiled.tif</url>
+                <profile>global-geodetic</profile>
                 <xi:include href="../data/land_cover_ESA_GLOBCOVER.xml"/>
                 <warp>0.05</warp>
             </coverage>
diff -Nru osgearth-2.9.0+dfsg/tests/stamen_toner.earth osgearth-2.10.2+dfsg/tests/stamen_toner.earth
--- osgearth-2.9.0+dfsg/tests/stamen_toner.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/stamen_toner.earth	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<map name="Stamen Toner" type="geocentric" version="2">
-
-    <image name="stamen_toner" driver="xyz">
-        <url>http://tile.stamen.com/toner/{z}/{x}/{y}.png</url>
-        <profile>spherical-mercator</profile>
-    </image>
-
-    <elevation name="readymap_elevation" driver="tms">
-        <url>http://readymap.org/readymap/tiles/1.0.0/9/</url>
-    </elevation>
-
-    <options>
-        <lighting>false</lighting>
-    </options>
-</map>
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/tests/stamen_watercolor.earth osgearth-2.10.2+dfsg/tests/stamen_watercolor.earth
--- osgearth-2.9.0+dfsg/tests/stamen_watercolor.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/stamen_watercolor.earth	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-<map name="Stamen Watercolor" type="geocentric" version="2">
-
-    <image name="stamen_watercolor" driver="xyz">
-        <url>http://tile.stamen.com/watercolor/{z}/{x}/{y}.jpg</url>
-        <profile>spherical-mercator</profile>
-    </image>
-
-    <elevation name="readymap_elevation" driver="tms">
-        <url>http://readymap.org/readymap/tiles/1.0.0/9/</url>
-    </elevation>
-
-    <lod_blending/>
-</map>
\ No newline at end of file
diff -Nru osgearth-2.9.0+dfsg/tests/state_plane.earth osgearth-2.10.2+dfsg/tests/state_plane.earth
--- osgearth-2.9.0+dfsg/tests/state_plane.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/state_plane.earth	2019-07-11 18:30:19.000000000 +0000
@@ -37,7 +37,7 @@
     
     <!-- This image layer returns global geodetic tiles -->
     <image name="ags-imagery" driver="arcgis" max_level="16">
-        <url>http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_Imagery_World_2D/MapServer</url>
+        <url>http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer</url>
     </image>    
     
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/tilepackage.earth osgearth-2.10.2+dfsg/tests/tilepackage.earth
--- osgearth-2.9.0+dfsg/tests/tilepackage.earth	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/tilepackage.earth	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,12 @@
+<!--
+osgEarth Sample - ArcGISTilePackage
+Loads an exploded arcgis tilepackage (tpk) repository
+http://pro.arcgis.com/en/pro-app/help/sharing/overview/tile-package.htm
+-->
+<map name="tilepackage" type="geocentric">
+
+    <image name="bluemarble" driver="tilepackage">    
+        <url>../data/bluemarble_tilepackage</url>
+    </image>
+
+</map>
diff -Nru osgearth-2.9.0+dfsg/tests/triton_drop_shader.earth osgearth-2.10.2+dfsg/tests/triton_drop_shader.earth
--- osgearth-2.9.0+dfsg/tests/triton_drop_shader.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/triton_drop_shader.earth	2019-07-11 18:30:19.000000000 +0000
@@ -1,10 +1,5 @@
 <map name="drop the ocean">
     
-    <options>        
-        <terrain driver="mp">
-        </terrain>
-    </options>
-    
     <image name="readymap_imagery" driver="tms" enabled="true">
         <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
     </image>
@@ -25,7 +20,7 @@
         </viewpoint>            
     </viewpoints>
     
-    <ocean driver="triton"/>
+    <triton/>
     
     <terrainshader>
       <code>
@@ -41,8 +36,8 @@
           out float oe_triton_elev; // osgearth-specific
           
           // amount by which to perturb the ocean verts
-          const float strength = 2.9;
-          //uniform float strength;
+          //const float strength = 5.0;
+          uniform float strength;
           
           // Triton maximum underwater visibility distance (negated)
           const float minElev = -100.0;
diff -Nru osgearth-2.9.0+dfsg/tests/triton.earth osgearth-2.10.2+dfsg/tests/triton.earth
--- osgearth-2.9.0+dfsg/tests/triton.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/triton.earth	2019-07-11 18:30:19.000000000 +0000
@@ -7,11 +7,16 @@
     <image name="readymap_imagery" driver="tms" visible="true">
         <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
     </image>
-        
+
     <elevation name="readymap_elevation" driver="tms">
         <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
     </elevation>
 
+    <!-- Triton masking layer. By default Triton will look at the elevation of
+         the terrain and will draw water where the elevation is less than zero.
+         But this will cause land below sea level to get water as well. You can
+         use a mask like this to prevent that from happening. -->
+         
     <image name="ocean_mask" driver="tms" shared="true" visible="false">
         <url>http://readymap.org/readymap/tiles/1.0.0/2/</url>
     </image>
@@ -19,7 +24,7 @@
     <triton>
         <user> my_user_name </user>
         <license_code> my_license_code </license_code>
-        <max_altitude> 500000 </max_altitude>
+        <max_altitude> 10000000 </max_altitude>
         <mask_layer>ocean_mask</mask_layer>
     </triton>
 
@@ -28,8 +33,19 @@
         <viewpoint name="Above" heading="-35.42227636584842" height="-188.2792971581221" lat="20.68154179570284" long="-156.5452311560784" pitch="-30" range="5469"/>
         <viewpoint name="Near clip" heading="-0.618211rad" height="-190.1852927561849" lat="20.67586333023495" long="-156.5418074743535" pitch="-0.2546rad" range="1154.32m"/>
         <viewpoint name="Horizon"  heading="-27.1911" height="-206.3652788307518" lat="20.69785423327782" long="-156.5550697849549" pitch="-16.0293" range="68323m"/>
+        <viewpoint>
+            <name>Positano</name>
+            <heading>6.84601</heading>
+            <pitch>-1.08752</pitch>
+            <range>11078.6m</range>
+            <long>14.49135978754529</long>
+            <lat>40.62397054670792</lat>
+            <height>55.47445763554424</height>
+            <srs>+proj=longlat +datum=WGS84 +no_defs </srs>
+        </viewpoint>
+
     </viewpoints>
-        
+
     <annotations>
         <model name="Object in the water">
             <url>../data/red_flag.osg.40.scale</url>
diff -Nru osgearth-2.9.0+dfsg/tests/vertical_scale.earth osgearth-2.10.2+dfsg/tests/vertical_scale.earth
--- osgearth-2.9.0+dfsg/tests/vertical_scale.earth	1970-01-01 00:00:00.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/vertical_scale.earth	2019-07-11 18:30:19.000000000 +0000
@@ -0,0 +1,37 @@
+<!--
+osgEarth Sample - Apply a Vertical Scale to the Terrain
+Run: osgearth_toc --uniform scale 1 5
+-->
+<map name="readymap.org" type="geocentric">
+
+    <image name="readymap_imagery" driver="tms">
+        <url>http://readymap.org/readymap/tiles/1.0.0/7/</url>
+    </image>
+
+    <elevation name="readymap_elevation" driver="tms" vdatum="egm96">
+        <url>http://readymap.org/readymap/tiles/1.0.0/116/</url>
+    </elevation>
+
+    <terrainshader>
+        <uniform name="scale" value="2"/>
+        <code>
+          <![CDATA[
+            #pragma vp_entryPoint applyScale
+            #pragma vp_location vertex_view
+            
+            uniform float scale;
+            vec4 oe_layer_tilec;
+            vec3 oe_UpVectorView;
+            float oe_terrain_getElevation(in vec2);
+            
+            void applyScale(inout vec4 vertexView)
+            {
+                float e = oe_terrain_getElevation(oe_layer_tilec);
+                vertexView.xyz += oe_UpVectorView*e*(scale-1.0);
+            }
+          ]]>
+        </code>
+    </terrainshader>
+
+    <xi:include href="viewpoints.xml"/>
+</map>
diff -Nru osgearth-2.9.0+dfsg/tests/wms_nexrad.earth osgearth-2.10.2+dfsg/tests/wms_nexrad.earth
--- osgearth-2.9.0+dfsg/tests/wms_nexrad.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/wms_nexrad.earth	2019-07-11 18:30:19.000000000 +0000
@@ -1,16 +1,32 @@
 <!--
 osgEarth Sample
-
-US NEXRAD 45 minute radar returns overlaid on imagery.
+Weather (RADAR and IR) overlaid on the map.
 -->
 
-<map name="WMS Radar returns" type="geocentric" version="2">   
+<map name="Current Weather">
      
-    <image name="world" driver="gdal">
-        <url>../data/world.tif</url>
+    <xi:include href="readymap_imagery.xml"/>
+
+    <!-- GlobalIR Imgery from http://realearth.ssec.wisc.edu/ -->	
+    <image name="GlobalIR" driver="xyz">
+        <url>http://realearth.ssec.wisc.edu/tiles/globalir/{z}/{x}/{y}.png</url>                
+        <profile>spherical-mercator</profile>
         <cache_policy usage="no_cache"/>
+		<shader>
+          <![CDATA[
+            #version 330
+            #pragma vp_entryPoint adjustAlpha
+            #pragma vp_location fragment_coloring
+            void adjustAlpha(inout vec4 color) {
+                color.a *= clamp(distance(color.rgb, vec3(0.0)), 0.0, 1.0);
+                color.a = pow(color.a, 4.0);
+            }
+          ]]>
+        </shader>
+        <altitude>10000</altitude>
     </image>
     
+    <!-- NEXRAD 45 minute RADAR returns -->
     <image name="nexrad45min" driver="wms">
         <url>http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi</url>
         <format>png</format>
@@ -19,9 +35,18 @@
         <srs>EPSG:4326</srs>
         <transparent>true</transparent>
         <cache_policy usage="no_cache"/>
+        <altitude>20000</altitude>
     </image>
     
-    <options>
-        <lighting>false</lighting>
-    </options>
+    <!-- US State Boundaries -->
+    <feature_model name="US States">
+        <features driver="ogr" url="../data/usa.shp"/>
+        <style type="text/css">
+            states {
+               stroke: #7f7f7f; 
+               stroke-width: 2px;
+               render-depth-offset: true;
+            }                    
+        </style>  
+    </feature_model>
 </map>
diff -Nru osgearth-2.9.0+dfsg/tests/wms-t_nexrad_animated.earth osgearth-2.10.2+dfsg/tests/wms-t_nexrad_animated.earth
--- osgearth-2.9.0+dfsg/tests/wms-t_nexrad_animated.earth	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/tests/wms-t_nexrad_animated.earth	2019-07-11 18:30:19.000000000 +0000
@@ -8,11 +8,9 @@
   osgearth_sequencecontrol <file.earth>
 -->
 
-<map name="WMS Radar returns" type="geocentric" version="2">   
-     
-    <image name="world" driver="gdal">
-        <url>../data/world.tif</url>
-    </image>
+<map name="WMS Radar returns" type="geocentric" version="2">
+
+    <xi:include href="readymap_imagery.xml"/>
     
     <image name="nexrad45min" driver="wms">
         <url>http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r-t.cgi</url>
diff -Nru osgearth-2.9.0+dfsg/.travis.yml osgearth-2.10.2+dfsg/.travis.yml
--- osgearth-2.9.0+dfsg/.travis.yml	2018-02-07 16:37:51.000000000 +0000
+++ osgearth-2.10.2+dfsg/.travis.yml	2019-07-11 18:30:19.000000000 +0000
@@ -1,8 +1,9 @@
 env:
   global:
-   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-   #   via the "travis encrypt" command using the project repo's public key
-   - secure: "vLe6I4mS64oabuhMJ5NHyJLJHxudgErRoKpoXZP9/8A6rx/TmZ/gYCmtENmKublSIyOmjoVoZ8lvw10a1zCgnlQEjdijxwPvO1IN4XlesjhbxFRysmYAQZsFifZ91ta/0Ajw6NV6ofhmWCBRUc2yCEexnf+xvj80+v6tq2q3YFIL0shHjm7c3Z5nOuKPTsxLEAtHYurUM3ao4gcppc5lOeOT+r+ENE0MCQwSKOXiXh4BWCkP9cQvKel8ineBl3T6qRrT0OQQ/OBeSba/orVrf6Y3Ls+BYM48NjxG0TN2PIP68eJVQnvPNZ+j42MypkrFckcJDM/N/1pI6ZiY0PrzPMX3SisP5WDKimowWuyaI/pdOO2tBqPIIdZvuAoUyh5MYBBHLGeHf4jCD+YwY2JcOdStHgkp4NE2JqjXvP9V4TizFjrZ1jb+MXHwVKF4mleo6Eoq+qOdj8Y9iFhwmpuf9oGgoEIWR4uxgrGwiSRVVQ4o5uouP1MENvqaFB5JMTep/PSAWNLw18sgza3NiEhardI73bvl/xEvJssdeoGzpRl6YAo+sprZ93wsuzSh2beils8f1CjKQsuoDIASYre93qGEdUXRnhQvF8wmlYnQLJamYEMN37yduzZ2OHuA7+1kkMSTjPZAIoEsuyOG+25eHXnPQBECe6iqWFuKVgzdero="
+  - OSGEARTH_CACHE_PATH=/tmp
+  # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+  #   via the "travis encrypt" command using the project repo's public key
+  - secure: "vLe6I4mS64oabuhMJ5NHyJLJHxudgErRoKpoXZP9/8A6rx/TmZ/gYCmtENmKublSIyOmjoVoZ8lvw10a1zCgnlQEjdijxwPvO1IN4XlesjhbxFRysmYAQZsFifZ91ta/0Ajw6NV6ofhmWCBRUc2yCEexnf+xvj80+v6tq2q3YFIL0shHjm7c3Z5nOuKPTsxLEAtHYurUM3ao4gcppc5lOeOT+r+ENE0MCQwSKOXiXh4BWCkP9cQvKel8ineBl3T6qRrT0OQQ/OBeSba/orVrf6Y3Ls+BYM48NjxG0TN2PIP68eJVQnvPNZ+j42MypkrFckcJDM/N/1pI6ZiY0PrzPMX3SisP5WDKimowWuyaI/pdOO2tBqPIIdZvuAoUyh5MYBBHLGeHf4jCD+YwY2JcOdStHgkp4NE2JqjXvP9V4TizFjrZ1jb+MXHwVKF4mleo6Eoq+qOdj8Y9iFhwmpuf9oGgoEIWR4uxgrGwiSRVVQ4o5uouP1MENvqaFB5JMTep/PSAWNLw18sgza3NiEhardI73bvl/xEvJssdeoGzpRl6YAo+sprZ93wsuzSh2beils8f1CjKQsuoDIASYre93qGEdUXRnhQvF8wmlYnQLJamYEMN37yduzZ2OHuA7+1kkMSTjPZAIoEsuyOG+25eHXnPQBECe6iqWFuKVgzdero="
 os: linux
 dist: trusty
 sudo: required