Merge pull request #586 from openmobilemaps/feature/geojson-point-par…

…sing GeoJSON Parsing Verbesserungen
openmobilemaps · Feb 5, 2024 · 17a6435 · 17a6435
2 parents dc980b1 + e744ce5
commit 17a6435
Show file tree

Hide file tree

Showing 20 changed files with 449 additions and 18 deletions.
diff --git a/.../java/io/openmobilemaps/mapscore/shared/map/layers/tiled/GeoJsonFeatureParserInterface.kt b/.../java/io/openmobilemaps/mapscore/shared/map/layers/tiled/GeoJsonFeatureParserInterface.kt
diff --git a/bridging/android/java/io/openmobilemaps/mapscore/shared/map/layers/tiled/GeoJsonPoint.kt b/bridging/android/java/io/openmobilemaps/mapscore/shared/map/layers/tiled/GeoJsonPoint.kt
diff --git a/bridging/android/jni/map/layers/tiled/NativeGeoJsonFeatureParserInterface.cpp b/bridging/android/jni/map/layers/tiled/NativeGeoJsonFeatureParserInterface.cpp
diff --git a/bridging/android/jni/map/layers/tiled/NativeGeoJsonPoint.cpp b/bridging/android/jni/map/layers/tiled/NativeGeoJsonPoint.cpp
diff --git a/bridging/android/jni/map/layers/tiled/NativeGeoJsonPoint.h b/bridging/android/jni/map/layers/tiled/NativeGeoJsonPoint.h
diff --git a/bridging/ios/MCGeoJsonFeatureParserInterface+Private.mm b/bridging/ios/MCGeoJsonFeatureParserInterface+Private.mm
diff --git a/bridging/ios/MCGeoJsonFeatureParserInterface.h b/bridging/ios/MCGeoJsonFeatureParserInterface.h
diff --git a/bridging/ios/MCGeoJsonPoint+Private.h b/bridging/ios/MCGeoJsonPoint+Private.h
diff --git a/bridging/ios/MCGeoJsonPoint+Private.mm b/bridging/ios/MCGeoJsonPoint+Private.mm
diff --git a/bridging/ios/MCGeoJsonPoint.h b/bridging/ios/MCGeoJsonPoint.h
diff --git a/bridging/ios/MCGeoJsonPoint.mm b/bridging/ios/MCGeoJsonPoint.mm
diff --git a/djinni/map/layers/tiled/geo_json_parser.djinni b/djinni/map/layers/tiled/geo_json_parser.djinni
@@ -1,7 +1,14 @@
-
 @extern "../../../yaml/vector_layer_feature_info.yaml"
+@extern "../../../yaml/coord.yaml"
 
 geo_json_feature_parser_interface = interface +c {
     static create() : geo_json_feature_parser_interface;
     parse(geo_json: string): optional<list<vector_layer_feature_info>>;
+
+    parseWithPointGeometry(geo_json: string): optional<list<geo_json_point>>;
+}
+
+geo_json_point = record {
+    point: coord;
+    feature_info: vector_layer_feature_info;
 }
diff --git a/djinni/yaml/geo_json_point.yaml b/djinni/yaml/geo_json_point.yaml
diff --git a/ios/graphics/Texture/TextureHolder.swift b/ios/graphics/Texture/TextureHolder.swift
@@ -75,6 +75,51 @@ public class TextureHolder: NSObject {
         let texture = try MetalContext.current.textureLoader.newTexture(data: data, options: options)
         self.init(texture, textureUsableSize: textureUsableSize)
     }
+
+    public convenience init(_ size: CGSize, drawCallback: ((CGContext) -> Void)) throws {
+        guard size.width > 0, size.height > 0 else {
+            throw TextureHolderError.emptyData
+        }
+
+        let width : Int = Int(size.width)
+        let height : Int = Int(size.height)
+
+        let bytesPerPixel = 4
+        let bytesPerRow = bytesPerPixel * width
+
+        let td = MTLTextureDescriptor.texture2DDescriptor(pixelFormat: .rgba8Unorm, width: width, height: height, mipmapped: false)
+        td.usage = .shaderRead
+
+        guard let texture = MetalContext.current.device.makeTexture(descriptor: td) else {
+            throw TextureHolderError.emptyData
+        }
+
+        let length = 4 * width * height
+        guard let imageData = calloc(width * height, 4) else {
+            throw TextureHolderError.emptyData
+        }
+
+        let data = NSMutableData(bytesNoCopy: imageData, length: length, freeWhenDone: true)
+
+        let colorSpace = CGColorSpaceCreateDeviceRGB()
+        let bitmapInfo = CGBitmapInfo(rawValue: CGBitmapInfo.byteOrder32Big.rawValue | CGImageAlphaInfo.premultipliedLast.rawValue)
+
+        guard let context = CGContext(data: data.mutableBytes, width: width, height: height, bitsPerComponent: 8, bytesPerRow: 4 * width, space: colorSpace, bitmapInfo: bitmapInfo.rawValue) else {
+            throw TextureHolderError.emptyData
+        }
+
+        context.translateBy(x: 0, y: size.height)
+        context.scaleBy(x: 1.0, y: -1.0)
+
+        UIGraphicsPushContext(context)
+        drawCallback(context)
+        UIGraphicsPopContext()
+
+        let region = MTLRegionMake2D(0, 0, width, height)
+        texture.replace(region: region, mipmapLevel: 0, withBytes: data.bytes, bytesPerRow: bytesPerRow)
+
+        self.init(texture, textureUsableSize: nil)
+    }
 }
 
 extension TextureHolder: MCTextureHolderInterface {

diff --git a/shared/public/GeoJsonFeatureParser.h b/shared/public/GeoJsonFeatureParser.h
@@ -18,4 +18,6 @@ class GeoJsonFeatureParser: public GeoJsonFeatureParserInterface {
     GeoJsonFeatureParser();
 
     std::optional<std::vector<::VectorLayerFeatureInfo>> parse(const std::string & geoJson) override;
+
+    std::optional<std::vector<GeoJsonPoint>> parseWithPointGeometry(const std::string & geoJson) override;
 };
diff --git a/shared/public/GeoJsonFeatureParserInterface.h b/shared/public/GeoJsonFeatureParserInterface.h
@@ -9,11 +9,15 @@
 #include <string>
 #include <vector>
 
+struct GeoJsonPoint;
+
 class GeoJsonFeatureParserInterface {
 public:
     virtual ~GeoJsonFeatureParserInterface() = default;
 
     static /*not-null*/ std::shared_ptr<GeoJsonFeatureParserInterface> create();
 
     virtual std::optional<std::vector<::VectorLayerFeatureInfo>> parse(const std::string & geoJson) = 0;
+
+    virtual std::optional<std::vector<GeoJsonPoint>> parseWithPointGeometry(const std::string & geoJson) = 0;
 };