Release: 2.0.6

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog for Open Mobile Maps
 
+## Version 2.0.6 (10.04.2024)
+- log exception when a font can not be loaded
+
 ## Version 2.0.5 (08.04.2024)
 - Expose thread_pool_callbacks in scheduler interface
 - call onRemoved on layerInterface before the mapScene is destroyed

android/gradle.properties

@@ -31,8 +31,8 @@ SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/
 
 GROUP=io.openmobilemaps
 POM_ARTIFACT_ID=mapscore
-VERSION_NAME=2.0.5
-VERSION_CODE=2000500
+VERSION_NAME=2.0.6
+VERSION_CODE=2000600
 
 POM_NAME=mapscore
 POM_PACKAGING=aar

ios/readme.md

@@ -31,7 +31,7 @@ For App integration within XCode, add this package to your App target. To do thi
 Once you have your Swift package set up, adding Open Mobile Maps as a dependency is as easy as adding it to the dependencies value of your Package.swift.
 ```swift
 dependencies: [
-    .package(url: "https://github.com/openmobilemaps/maps-core.git", .upToNextMajor(from: "2.0.5"))
+    .package(url: "https://github.com/openmobilemaps/maps-core.git", .upToNextMajor(from: "2.0.6"))
 ]
 ```
 

shared/src/MapsCoreSharedModule.cpp

@@ -10,4 +10,4 @@
 
 #include "MapsCoreSharedModule.h"
 
-std::string MapsCoreSharedModule::version() { return "2.0.5"; }
+std::string MapsCoreSharedModule::version() { return "2.0.6"; }

shared/src/map/layers/tiled/vector/symbol/Tiled2dMapVectorSymbolObject.cpp

@@ -18,6 +18,7 @@
 #include "Tiled2dMapSource.h"
 #include "Tiled2dMapVectorStyleParser.h"
 #include "CollisionUtil.h"
+#include "ExceptionLogger.h"
 
 Tiled2dMapVectorSymbolObject::Tiled2dMapVectorSymbolObject(const std::weak_ptr<MapInterface> &mapInterface,
                                                            const std::shared_ptr<Tiled2dMapVectorLayerConfig> &layerConfig,
@@ -106,7 +107,7 @@ Tiled2dMapVectorSymbolObject::Tiled2dMapVectorSymbolObject(const std::weak_ptr<M
     // only load the font if we actually need it
     if (hasText) {
 
-        std::shared_ptr<FontLoaderResult> fontResult;
+        std::shared_ptr<FontLoaderResult> fontResult = nullptr;
 
         for (const auto &font: fontList) {
             // try to load a font until we succeed
@@ -124,26 +125,37 @@ Tiled2dMapVectorSymbolObject::Tiled2dMapVectorSymbolObject(const std::weak_ptr<M
             }
         }
 
-
-        auto textOffset = description->style.getTextOffset(evalContext);
-        const auto textRadialOffset = description->style.getTextRadialOffset(evalContext);
-        const auto letterSpacing = description->style.getTextLetterSpacing(evalContext);
-
-        SymbolAlignment labelRotationAlignment = description->style.getTextRotationAlignment(evalContext);
-        boundingBoxRotationAlignment = labelRotationAlignment;
-        labelObject = std::make_shared<Tiled2dMapVectorSymbolLabelObject>(converter, featureContext, description, text, fullText,
-                                                                          coordinate, lineCoordinates, textAnchor, angle,
-                                                                          textJustify, fontResult, textOffset, textRadialOffset,
-                                                                          description->style.getTextLineHeight(evalContext),
-                                                                          letterSpacing,
-                                                                          description->style.getTextMaxWidth(evalContext),
-                                                                          description->style.getTextMaxAngle(evalContext),
-                                                                          labelRotationAlignment, textSymbolPlacement,
-                                                                          animationCoordinator, featureStateManager,
-                                                                          dpFactor);
-
-        instanceCounts.textCharacters = labelObject->getCharacterCount();
-
+        fontResult = nullptr;
+
+        if (fontResult) {
+            auto textOffset = description->style.getTextOffset(evalContext);
+            const auto textRadialOffset = description->style.getTextRadialOffset(evalContext);
+            const auto letterSpacing = description->style.getTextLetterSpacing(evalContext);
+
+            SymbolAlignment labelRotationAlignment = description->style.getTextRotationAlignment(evalContext);
+            boundingBoxRotationAlignment = labelRotationAlignment;
+            labelObject = std::make_shared<Tiled2dMapVectorSymbolLabelObject>(converter, featureContext, description, text, fullText,
+                                                                              coordinate, lineCoordinates, textAnchor, angle,
+                                                                              textJustify, fontResult, textOffset, textRadialOffset,
+                                                                              description->style.getTextLineHeight(evalContext),
+                                                                              letterSpacing,
+                                                                              description->style.getTextMaxWidth(evalContext),
+                                                                              description->style.getTextMaxAngle(evalContext),
+                                                                              labelRotationAlignment, textSymbolPlacement,
+                                                                              animationCoordinator, featureStateManager,
+                                                                              dpFactor);
+
+            instanceCounts.textCharacters = labelObject->getCharacterCount();
+        } else {
+            // font could not be loaded
+            std::string fontString;
+            for (const auto &font: fontList) {
+                fontString.append(font + ",");
+            }
+            fontString.pop_back();
+            ExceptionLogger::instance().logMessage("map-core:Tiled2dMapVectorSymbolObject", 0, "font (" + fontString + ") could not be loaded");
+            LogError << "font (" << fontString <<=") could not be loaded";
+        }
     } else {
         boundingBoxRotationAlignment = iconRotationAlignment;
     }