Release/2.0.1

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog for Open Mobile Maps
 
-## Version 2.0.0 (16.02.2023)
+## Version 2.0.1 (07.03.2024)
+- Fixed WGS84 bounding box parsing for WMTS layers
+- Fix deadlock in renderToImage on iOS
+- Fix crash for geojsons without type
+- Fix renderToImage for vector layers
+- Reference djinni by version on iOS
+- Fix crash on certain polygon patters on iOS
+- Fix constant loading for some geojsons
+- Fix crash of symbol objects
+- Fix crash from race condition in geojson reload
+- Fix deallocation on OffscreenMapRenderer on Android
+
+## Version 2.0.0 (16.02.2024)
 - Major improvements in vector map performance, stability, and rendering, alongside expanded options for style specifications and GeoJSON support.
 - Enhanced stability and performance for raster, icon, polygon, and line layers.
 - Many additional improvements and bug fixes.

Package.swift

@@ -23,7 +23,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/UbiqueInnovation/djinni.git", branch: "master"),
+        .package(url: "https://github.com/UbiqueInnovation/djinni.git", .upToNextMajor(from: "1.0.6")),
     ],
     targets: [
         .target(

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.0
-VERSION_CODE=2000000
+VERSION_NAME=2.0.1
+VERSION_CODE=2000100
 
 POM_NAME=mapscore
 POM_PACKAGING=aar

android/src/main/java/io/openmobilemaps/mapscore/map/util/OffscreenMapRenderer.kt

@@ -2,7 +2,6 @@ package io.openmobilemaps.mapscore.map.util
 
 import android.opengl.GLSurfaceView
 import io.openmobilemaps.mapscore.graphics.GLThread
-import io.openmobilemaps.mapscore.map.scheduling.AndroidScheduler
 import io.openmobilemaps.mapscore.map.scheduling.AndroidSchedulerCallback
 import io.openmobilemaps.mapscore.shared.graphics.common.Color
 import io.openmobilemaps.mapscore.shared.graphics.common.Vec2I
@@ -56,6 +55,7 @@ open class OffscreenMapRenderer(val sizePx: Vec2I, val density: Float = 72f) : G
 
 	protected open fun onGlThreadFinishing() {
 		glThread.renderer = null
+		mapInterface?.destroy()
 		mapInterface = null
 	}
 

ios/graphics/Model/Polygon/PolygonPatternGroup2d.swift

@@ -109,6 +109,7 @@ final class PolygonPatternGroup2d: BaseGraphicsObject {
         } else {
             var scaleFactors = customScreenPixelFactor.x != 0 ? customScreenPixelFactor :  SIMD2<Float>([pixelFactor, pixelFactor])
             encoder.setVertexBytes(&scaleFactors, length: MemoryLayout<SIMD2<Float>>.stride, index: 2)
+            encoder.setVertexBytes(&posOffset, length: MemoryLayout<SIMD2<Float>>.stride, index: 3)
         }
 
         // texture

ios/graphics/Shader/Metal/PolygonGroupShader.metal

@@ -150,7 +150,7 @@ polygonPatternGroupFadeInFragmentShader(PolygonPatternGroupVertexOut in [[stage_
     const float scalingFactorFactor = (scalingFactor.x / screenPixelAsRealMeterFactor) - 1.0;
     const float2 spacing = pixelSize * scalingFactorFactor;
     const float2 totalSize = pixelSize + spacing;
-    const float2 adjustedPixelPosition = in.pixelPosition + totalSize * 0.5; // in other project pixelSize
+    const float2 adjustedPixelPosition = in.pixelPosition + pixelSize * 0.5; // in other project pixelSize
     float2 uvTot = fmod(adjustedPixelPosition, totalSize);
 
     const int yIndex = int(adjustedPixelPosition.y / totalSize.y) % 2;

ios/maps/MCMapView.swift

@@ -190,15 +190,18 @@ extension MCMapView: MTKViewDelegate {
         }
     }
 
-    public func renderToImage(size: CGSize, timeout: Float, bounds: MCRectCoord, callback: @escaping (UIImage?, MCLayerReadyState) -> Void) {
+    public func renderToImage(size: CGSize, timeout: Float, bounds: MCRectCoord, callbackQueue: DispatchQueue = .main, callback: @escaping (UIImage?, MCLayerReadyState) -> Void) {
         renderToImageQueue.async {
-            self.frame = CGRect(origin: .zero, size: .init(width: size.width / UIScreen.main.scale, height: size.height / UIScreen.main.scale))
-            self.setNeedsLayout()
-            self.layoutIfNeeded()
+            DispatchQueue.main.sync {
+                self.frame = CGRect(origin: .zero, size: .init(width: size.width / UIScreen.main.scale, height: size.height / UIScreen.main.scale))
+                self.setNeedsLayout()
+                self.layoutIfNeeded()
+            }
 
             let mapReadyCallbacks = MCMapViewMapReadyCallbacks()
             mapReadyCallbacks.delegate = self
             mapReadyCallbacks.callback = callback
+            mapReadyCallbacks.callbackQueue = callbackQueue
 
             self.mapInterface.drawReadyFrame(bounds, timeout: timeout, callbacks: mapReadyCallbacks)
         }
@@ -319,13 +322,17 @@ public extension MCMapView {
 private class MCMapViewMapReadyCallbacks: MCMapReadyCallbackInterface {
     public weak var delegate: MCMapView?
     public var callback: ((UIImage?, MCLayerReadyState) -> Void)?
+    public var callbackQueue: DispatchQueue?
+    public let semaphore = DispatchSemaphore(value: 1)
 
     func stateDidUpdate(_ state: MCLayerReadyState) {
         guard let delegate = self.delegate else { return }
 
+        semaphore.wait()
+
         delegate.draw(in: delegate)
 
-        DispatchQueue.main.async {
+        callbackQueue?.async {
             switch state {
                 case .NOT_READY:
                     break
@@ -336,6 +343,7 @@ private class MCMapViewMapReadyCallbacks: MCMapReadyCallbackInterface {
                 @unknown default:
                     break
             }
+            self.semaphore.signal()
         }
     }
 }

shared/public/GeoJsonTypes.h

@@ -67,6 +67,7 @@ class GeoJSONTileInterface {
 class GeoJSONTileDelegate {
 public:
     virtual void didLoad(uint8_t maxZoom) = 0;
+    virtual void failedToLoad() = 0;
 };
 
 class GeoJson {

shared/public/Tiled2dMapRasterSource.h

@@ -40,8 +40,8 @@ class Tiled2dMapRasterSource
 
     virtual bool hasExpensivePostLoadingTask() override;
 
-    virtual std::shared_ptr<::TextureHolderInterface> postLoadingTask(const std::shared_ptr<TextureLoaderResult> &loadedData,
-                                                                      const Tiled2dMapTileInfo &tile) override;
+    virtual std::shared_ptr<::TextureHolderInterface> postLoadingTask(std::shared_ptr<TextureLoaderResult> loadedData,
+                                                                      Tiled2dMapTileInfo tile) override;
 
 
   private:

shared/public/Tiled2dMapSource.h

@@ -125,7 +125,7 @@ class Tiled2dMapSource :
   protected:
     virtual bool hasExpensivePostLoadingTask() = 0;
 
-    virtual R postLoadingTask(const L &loadedData, const Tiled2dMapTileInfo &tile) = 0;
+    virtual R postLoadingTask(L loadedData, Tiled2dMapTileInfo tile) = 0;
 
     MapConfig mapConfig;
     std::shared_ptr<Tiled2dMapLayerConfig> layerConfig;

shared/public/Tiled2dMapSourceImpl.h

@@ -126,9 +126,7 @@ void Tiled2dMapSource<T, L, R>::onVisibleBoundsChanged(const ::RectCoord &visibl
     const double visibleBottom = visibleBoundsLayer.bottomRight.y - signHeight * viewboundsPadding;
     visibleHeight = std::abs(visibleHeight) + 2 * viewboundsPadding;
 
-
-
-    size_t visibleTileHash = 0;
+    size_t visibleTileHash = targetZoomLevelIdentifier;
 
     for (int i = startZoomLayer; i <= endZoomLevel; i++) {
         const Tiled2dMapZoomLevelInfo &zoomLevelInfo = zoomLevelInfos.at(i);
@@ -396,10 +394,10 @@ void Tiled2dMapSource<T, L, R>::performLoadingTask(Tiled2dMapTileInfo tile, size
     auto weakActor = WeakActor<Tiled2dMapSource>(mailbox, std::static_pointer_cast<Tiled2dMapSource>(shared_from_this()));
 
     currentlyLoading.insert({tile, loaderIndex});
+    std::string layerName = layerConfig->getLayerName();
     readyTiles.erase(tile);
 
-    loadDataAsync(tile, loaderIndex).then([weakActor, loaderIndex, tile, weakSelfPtr](::djinni::Future<L> result) {
-
+    loadDataAsync(tile, loaderIndex).then([weakActor, loaderIndex, tile, weakSelfPtr, layerName](::djinni::Future<L> result) {
         auto strongSelf = weakSelfPtr.lock();
         if (strongSelf) {
             auto res = result.get();
@@ -430,7 +428,7 @@ void Tiled2dMapSource<T, L, R>::performLoadingTask(Tiled2dMapTileInfo tile, size
 template<class T, class L, class R>
 void Tiled2dMapSource<T, L, R>::didLoad(Tiled2dMapTileInfo tile, size_t loaderIndex, const R &result) {
     currentlyLoading.erase(tile);
-
+    std::string layerName = layerConfig->getLayerName();
     const bool isVisible = currentVisibleTiles.count(tile);
     if (!isVisible) {
         errorTiles[loaderIndex].erase(tile);

shared/public/Tiled2dMapVectorSource.h

@@ -52,7 +52,7 @@ class Tiled2dMapVectorSource : public Tiled2dMapSource<std::shared_ptr<djinni::D
 
     virtual bool hasExpensivePostLoadingTask() override;
 
-    virtual Tiled2dMapVectorTileInfo::FeatureMap postLoadingTask(const std::shared_ptr<DataLoaderResult> &loadedData, const Tiled2dMapTileInfo &tile) override;
+    virtual Tiled2dMapVectorTileInfo::FeatureMap postLoadingTask(std::shared_ptr<DataLoaderResult> loadedData, Tiled2dMapTileInfo tile) override;
 
     const std::vector<std::shared_ptr<::LoaderInterface>> loaders;
     const std::unordered_set<std::string> layersToDecode;

shared/public/Tiled2dMapVectorStyleParser.h

@@ -377,9 +377,6 @@ class Tiled2dMapVectorStyleParser {
     };
 
     ValueVariant getVariant(const nlohmann::json &json) {
-        if (json == "–") {
-            LogDebug <<= "break";
-        }
         if (json.is_number_float()) {
             return json.get<float>();
         } else if (json.is_number_integer()) {

shared/public/VectorTilePolygonHandler.h

@@ -23,18 +23,13 @@ class VectorTilePolygonHandler {
     void ring_begin(uint32_t count) {
         currentRing = std::vector<::Coord>();
         currentRing.reserve(count);
-        /*LogDebug <<= "        new Polygon with TopLeft: (" + tileCoords.topLeft.systemIdentifier + ": " + std::to_string(tileCoords.topLeft.x) + ", " + std::to_string(tileCoords.topLeft.y) + ")";
-        LogDebug <<= "                     BottomRight: (" + tileCoords.bottomRight.systemIdentifier + ": " + std::to_string(tileCoords.bottomRight.x) + ", " + std::to_string(tileCoords.bottomRight.y) + ")";
-        LogDebug <<= "                and width/height: (" + std::to_string(tileWidth) + ", " + std::to_string(tileHeight) + ")";*/
     }
 
     void ring_point(vtzero::point point) noexcept {
         double x = tileCoords.topLeft.x + tileWidth * (point.x / extent);
         double y = tileCoords.topLeft.y + tileHeight * (point.y / extent);
         Coord newCoord = Coord(tileCoords.topLeft.systemIdentifier, x, y, 0.0);
         currentRing.push_back(newCoord);
-        /*LogDebug <<= "        -> new point: (" + std::to_string(point.x) + ", " + std::to_string(point.y) + ") in extent " + std::to_string(extent);
-        LogDebug <<= "            -> coord (" + newCoord.systemIdentifier + ": " + std::to_string(newCoord.x) + ", " + std::to_string(newCoord.y) + ")";*/
     }
 
     void ring_end(vtzero::ring_type ringType) noexcept {

shared/src/MapsCoreSharedModule.cpp

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