Refactor NCPickListener methods

Author: PavelTychinin

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 `navigine.framework` adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.6](https://github.com/Navigine/navigine_ios_framework/releases/tag/v.2.0.6) / 2022-01-27
+* Add convertest meters <-> screen
+* Refactor PickListener methods
+
 ## [2.0.5](https://github.com/Navigine/navigine_ios_framework/releases/tag/v.2.0.5) / 2022-01-27
 * Add venues renderring for all users
 

Frameworks/navigine.framework/Headers/NCBitmapRegionDecoder.h

@@ -8,8 +8,7 @@
 NAVIGINE_EXPORT
 @interface NCBitmapRegionDecoder : NSObject
 
-+ (nullable NCBitmapRegionDecoder *)newInstance:(nonnull NSData *)data
-                                         length:(int32_t)length;
++ (nullable NCBitmapRegionDecoder *)newInstance:(nonnull NSData *)data;
 
 - (nullable UIImage *)decodeRegion:(nonnull NCRectangle *)rect
                         sampleSize:(int32_t)sampleSize;

Frameworks/navigine.framework/Headers/NCLocationView.h

@@ -6,6 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class NCCircleMapObject;
 @class NCIconMapObject;
 @class NCPolylineMapObject;
+@class NCPoint;
 
 @protocol NCGestureRecognizerDelegate;
 @protocol NCPickListener;
@@ -31,9 +32,15 @@ NAVIGINE_EXPORT
 
 - (void) requestRender;
 
-- (void)pickMapObjectAt:(CGPoint)viewPosition;
+- (NCPoint*) screenPositionToMeters:(CGPoint)screenPosition;
 
-- (void)pickMapFeatureAt:(CGPoint)viewPosition;
+- (CGPoint) metersToScreenPosition:(NCPoint *)meters clipToViewport:(BOOL)clip;
+
+- (void) pickMapObjectAt:(CGPoint)viewPosition;
+
+- (void) pickMapFeatureAt:(CGPoint)viewPosition;
+
+- (void)loadConfig:(NSString *)config;
 
 @property (assign, nonatomic) CGFloat minZoomFactor;
 

Frameworks/navigine.framework/Headers/NCPickListener.h

@@ -1,16 +1,16 @@
 #import "NCExport.h"
-#import "NCPoint.h"
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 @class NCMapObjectPickResult;
 
 
 NAVIGINE_EXPORT
 @protocol NCPickListener <NSObject>
 
 - (void)onMapObjectPickComplete:(nullable NCMapObjectPickResult *)mapObjectPickResult
-                 screenPosition:(nonnull NCPoint *)screenPosition;
+                 screenPosition:(CGPoint)screenPosition;
 
 - (void)onMapFeaturePickComplete:(nonnull NSDictionary<NSString *, NSString *> *)mapFeaturePickResult
-                  screenPosition:(nonnull NCPoint *)screenPosition;
+                  screenPosition:(CGPoint)screenPosition;
 
 @end

Frameworks/navigine.framework/navigine

@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name                 = 'Navigine'
-  spec.version              = '2.0.5'
+  spec.version              = '2.0.6'
   spec.license              = { :type => 'Custom', :text => 'Navigine Licence'}
   spec.summary              = "iOS SDK for performing indoor navigation"
   spec.platform             = :ios, "11.0"
   spec.homepage             = 'https://github.com/Navigine/Indoor-Navigation-iOS-Mobile-SDK-2.0'
   spec.authors              = { 'Pavel Tychinin' => 'p.tychinin@navigine.com' }
-  spec.source               = { :git => 'https://github.com/Navigine/Indoor-Navigation-iOS-Mobile-SDK-2.0.git', :tag => 'v.2.0.5' }
+  spec.source               = { :git => 'https://github.com/Navigine/Indoor-Navigation-iOS-Mobile-SDK-2.0.git', :tag => 'v.2.0.6' }
   spec.documentation_url    = 'https://github.com/Navigine/Indoor-Navigation-iOS-Mobile-SDK-2.0/wiki/Getting-Started'
   spec.vendored_frameworks  = 'Frameworks/navigine.framework'
 #  spec.vendored_libraries   = 'Frameworks/navigine.framework/Navigine'

Navigine.podspec

@@ -8,8 +8,7 @@
 NAVIGINE_EXPORT
 @interface NCBitmapRegionDecoder : NSObject
 
-+ (nullable NCBitmapRegionDecoder *)newInstance:(nonnull NSData *)data
-                                         length:(int32_t)length;
++ (nullable NCBitmapRegionDecoder *)newInstance:(nonnull NSData *)data;
 
 - (nullable UIImage *)decodeRegion:(nonnull NCRectangle *)rect
                         sampleSize:(int32_t)sampleSize;

NavigineDemo/NavigineDemo/Frameworks/navigine.framework/Headers/NCBitmapRegionDecoder.h

@@ -6,6 +6,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class NCCircleMapObject;
 @class NCIconMapObject;
 @class NCPolylineMapObject;
+@class NCPoint;
 
 @protocol NCGestureRecognizerDelegate;
 @protocol NCPickListener;
@@ -31,9 +32,15 @@ NAVIGINE_EXPORT
 
 - (void) requestRender;
 
-- (void)pickMapObjectAt:(CGPoint)viewPosition;
+- (NCPoint*) screenPositionToMeters:(CGPoint)screenPosition;
 
-- (void)pickMapFeatureAt:(CGPoint)viewPosition;
+- (CGPoint) metersToScreenPosition:(NCPoint *)meters clipToViewport:(BOOL)clip;
+
+- (void) pickMapObjectAt:(CGPoint)viewPosition;
+
+- (void) pickMapFeatureAt:(CGPoint)viewPosition;
+
+- (void)loadConfig:(NSString *)config;
 
 @property (assign, nonatomic) CGFloat minZoomFactor;
 

NavigineDemo/NavigineDemo/Frameworks/navigine.framework/Headers/NCLocationView.h

@@ -1,16 +1,16 @@
 #import "NCExport.h"
-#import "NCPoint.h"
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 @class NCMapObjectPickResult;
 
 
 NAVIGINE_EXPORT
 @protocol NCPickListener <NSObject>
 
 - (void)onMapObjectPickComplete:(nullable NCMapObjectPickResult *)mapObjectPickResult
-                 screenPosition:(nonnull NCPoint *)screenPosition;
+                 screenPosition:(CGPoint)screenPosition;
 
 - (void)onMapFeaturePickComplete:(nonnull NSDictionary<NSString *, NSString *> *)mapFeaturePickResult
-                  screenPosition:(nonnull NCPoint *)screenPosition;
+                  screenPosition:(CGPoint)screenPosition;
 
 @end