version 2.0.1

Author: PavelTychinin

CHANGELOG.md

@@ -2,5 +2,9 @@
 All notable changes to this project will be documented in this file.
 `navigine.framework` adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.1](https://github.com/Navigine/navigine_ios_framework/releases/tag/v.2.0.1) / 2021-11-14
+* Add function pickMapObjectAt(x, y)
+* Add function getDeviceid()
+
 ## [2.0.0](https://github.com/Navigine/navigine_ios_framework/releases/tag/v.2.0.0) / 2021-11-14
 * Initial version

Frameworks/navigine.framework/Headers/NCAsyncRouteListener.h

@@ -5,7 +5,7 @@
 
 
 NAVIGINE_EXPORT
-@protocol NCAsyncRouteListener
+@protocol NCAsyncRouteListener <NSObject>
 
 - (void)onRouteChanged:(nullable NCRoutePath *)currentPath
           pendingPaths:(nonnull NSArray<NCRoutePath *> *)pendingPaths;

Frameworks/navigine.framework/Headers/NCCircleMapObject.h

@@ -1,11 +1,12 @@
 #import "NCAnimationType.h"
 #import "NCExport.h"
 #import "NCLocationPoint.h"
+#import "NCMapObject.h"
 #import <Foundation/Foundation.h>
 
 
 NAVIGINE_EXPORT
-@interface NCCircleMapObject : NSObject
+@interface NCCircleMapObject : NCMapObject
 
 - (BOOL)setPosition:(nonnull NCLocationPoint *)point;
 
@@ -15,11 +16,4 @@ NAVIGINE_EXPORT
 
 - (BOOL)setRadius:(float)radius;
 
-- (BOOL)setVisible:(BOOL)visible;
-
-- (BOOL)setColor:(float)red
-           green:(float)green
-            blue:(float)blue
-           alpha:(float)alpha;
-
 @end

Frameworks/navigine.framework/Headers/NCIconMapObject.h

@@ -1,12 +1,13 @@
 #import "NCAnimationType.h"
 #import "NCExport.h"
 #import "NCLocationPoint.h"
+#import "NCMapObject.h"
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
 
 NAVIGINE_EXPORT
-@interface NCIconMapObject : NSObject
+@interface NCIconMapObject : NCMapObject
 
 - (BOOL)setPosition:(nonnull NCLocationPoint *)point;
 
@@ -19,8 +20,4 @@ NAVIGINE_EXPORT
 - (BOOL)setSize:(float)width
          height:(float)height;
 
-- (BOOL)setVisible:(BOOL)visible;
-
-- (BOOL)setInteractive:(BOOL)interactive;
-
 @end

Frameworks/navigine.framework/Headers/NCLocationEditListener.h

@@ -3,7 +3,7 @@
 
 
 NAVIGINE_EXPORT
-@protocol NCLocationEditListener
+@protocol NCLocationEditListener <NSObject>
 
 - (void)onLocationUploaded;
 

Frameworks/navigine.framework/Headers/NCLocationListListener.h

@@ -4,7 +4,7 @@
 
 
 NAVIGINE_EXPORT
-@protocol NCLocationListListener
+@protocol NCLocationListListener <NSObject>
 
 - (void)onLocationListLoaded:(nonnull NSDictionary<NSNumber *, NCLocationInfo *> *)locationInfos;
 

Frameworks/navigine.framework/Headers/NCLocationListener.h

@@ -4,7 +4,7 @@
 
 
 NAVIGINE_EXPORT
-@protocol NCLocationListener
+@protocol NCLocationListener <NSObject>
 
 - (void)onLocationLoaded:(nullable NCLocation *)location;
 

Frameworks/navigine.framework/Headers/NCLocationView.h

@@ -6,11 +6,9 @@ NS_ASSUME_NONNULL_BEGIN
 @class NCCircleMapObject;
 @class NCIconMapObject;
 @class NCPolylineMapObject;
-@class NCPoint;
-@class NCSublocation;
 
 @protocol NCGestureRecognizerDelegate;
-@protocol NCLocationViewDelegate;
+@protocol NCPickListener;
 
 NAVIGINE_EXPORT
 @interface NCLocationView : UIView
@@ -45,7 +43,7 @@ NAVIGINE_EXPORT
 
 @property (assign, nonatomic) NSInteger preferredFramesPerSecond;
 
-@property (weak, nonatomic, nullable) id<NCLocationViewDelegate> locationViewDelegate;
+@property (weak, nonatomic, nullable) id<NCPickListener> pickListener;
 
 #pragma mark Gesture Recognizers
 

Frameworks/navigine.framework/Headers/NCLocationViewDelegate.h

@@ -19,8 +19,8 @@
  @param pickResult A result object with information about the picked object or `nil` if no object was found.
  @param position The view position where object was picked.
  */
-- (void)locationView:(nonnull NCLocationView *)mapView
-didSelectMapObject:(nullable NCMapObjectPickResult *)markerPickResult
+- (void)locationView:(nonnull NCLocationView *) locationView
+didSelectMapObject:(nullable NCMapObjectPickResult *)mapObjectPickResult
 atScreenPosition:(CGPoint)position;
 
 @end // protocol NCLocationViewDelegate

Frameworks/navigine.framework/Headers/NCMapObject.h

@@ -0,0 +1,26 @@
+#import "NCExport.h"
+#import "NCMapObjectType.h"
+#import <Foundation/Foundation.h>
+
+
+NAVIGINE_EXPORT
+@interface NCMapObject : NSObject
+
+- (BOOL)setVisible:(BOOL)visible;
+
+- (BOOL)setColor:(float)red
+           green:(float)green
+            blue:(float)blue
+           alpha:(float)alpha;
+
+- (BOOL)setInteractive:(BOOL)interactive;
+
+- (void)setData:(nonnull NSData *)data;
+
+@property (nonatomic, readonly) int32_t id;
+
+@property (nonatomic, readonly) NCMapObjectType type;
+
+@property (nonatomic, nonnull, readonly) NSData * data;
+
+@end