Release 13022023

Navigine · Feb 13, 2023 · bde0bb7 · bde0bb7
1 parent 26491a6
commit bde0bb7
Show file tree

Hide file tree

Showing 22 changed files with 77 additions and 63 deletions.
diff --git a/CHANGELOG.md b/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.2.0](https://github.com/Navigine/navigine_ios_framework/releases/tag/v.2.2.0) / 2023-02-13
+* Changed PositionListener
+* Added outdoor positioning
+
 ## [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

diff --git a/Frameworks/Navigine.framework/Headers/NCAsyncRouteListener.h b/Frameworks/Navigine.framework/Headers/NCAsyncRouteListener.h
@@ -10,8 +10,7 @@
 DEFAULT_EXPORT_ATTRIBUTE
 @protocol NCAsyncRouteListener <NSObject>
 
-- (void)onRouteChanged:(nullable NCRoutePath *)currentPath
-          pendingPaths:(nonnull NSArray<NCRoutePath *> *)pendingPaths;
+- (void)onRouteChanged:(nullable NCRoutePath *)currentPath;
 
 - (void)onRouteAdvanced:(float)distance
                   point:(nonnull NCLocationPoint *)point;

diff --git a/Frameworks/Navigine.framework/Headers/NCAsyncRouteManager.h b/Frameworks/Navigine.framework/Headers/NCAsyncRouteManager.h
@@ -10,7 +10,8 @@
 DEFAULT_EXPORT_ATTRIBUTE
 @interface NCAsyncRouteManager : NSObject
 
-- (nullable NCRouteSession *)createRouteSession:(nonnull NCLocationPoint *)wayPoint;
+- (nullable NCRouteSession *)createRouteSession:(nonnull NCLocationPoint *)wayPoint
+                                   smoothRadius:(float)smoothRadius;
 
 - (void)cancelRouteSession:(nullable NCRouteSession *)session;
 

diff --git a/Frameworks/Navigine.framework/Headers/NCGlobalPoint.h b/Frameworks/Navigine.framework/Headers/NCGlobalPoint.h
@@ -6,13 +6,13 @@
 
 DEFAULT_EXPORT_ATTRIBUTE
 @interface NCGlobalPoint : NSObject
-- (nonnull instancetype)initWithLatitude:(float)latitude
-                               longitude:(float)longitude;
-+ (nonnull instancetype)globalPointWithLatitude:(float)latitude
-                                      longitude:(float)longitude;
+- (nonnull instancetype)initWithLatitude:(double)latitude
+                               longitude:(double)longitude;
++ (nonnull instancetype)globalPointWithLatitude:(double)latitude
+                                      longitude:(double)longitude;
 
-@property (nonatomic, readonly) float latitude;
+@property (nonatomic, readonly) double latitude;
 
-@property (nonatomic, readonly) float longitude;
+@property (nonatomic, readonly) double longitude;
 
 @end
diff --git a/Frameworks/Navigine.framework/Headers/NCPosition.h b/Frameworks/Navigine.framework/Headers/NCPosition.h
@@ -2,30 +2,31 @@
 // This file was generated by Djinni from position.djinni
 
 #import "NCExport.h"
-#import "NCPoint.h"
+#import "NCGlobalPoint.h"
+#import "NCLocationPoint.h"
 #import <Foundation/Foundation.h>
 
 DEFAULT_EXPORT_ATTRIBUTE
 @interface NCPosition : NSObject
-- (nonnull instancetype)initWithPoint:(nonnull NCPoint *)point
-                           locationId:(int32_t)locationId
-                        sublocationId:(int32_t)sublocationId
-                             accuracy:(float)accuracy
-                              azimuth:(float)azimuth;
-+ (nonnull instancetype)positionWithPoint:(nonnull NCPoint *)point
-                               locationId:(int32_t)locationId
-                            sublocationId:(int32_t)sublocationId
-                                 accuracy:(float)accuracy
-                                  azimuth:(float)azimuth;
+- (nonnull instancetype)initWithPoint:(nonnull NCGlobalPoint *)point
+                             accuracy:(double)accuracy
+                              heading:(nullable NSNumber *)heading
+                        locationPoint:(nullable NCLocationPoint *)locationPoint
+                      locationHeading:(nullable NSNumber *)locationHeading;
++ (nonnull instancetype)positionWithPoint:(nonnull NCGlobalPoint *)point
+                                 accuracy:(double)accuracy
+                                  heading:(nullable NSNumber *)heading
+                            locationPoint:(nullable NCLocationPoint *)locationPoint
+                          locationHeading:(nullable NSNumber *)locationHeading;
 
-@property (nonatomic, readonly, nonnull) NCPoint * point;
+@property (nonatomic, readonly, nonnull) NCGlobalPoint * point;
 
-@property (nonatomic, readonly) int32_t locationId;
+@property (nonatomic, readonly) double accuracy;
 
-@property (nonatomic, readonly) int32_t sublocationId;
+@property (nonatomic, readonly, nullable) NSNumber * heading;
 
-@property (nonatomic, readonly) float accuracy;
+@property (nonatomic, readonly, nullable) NCLocationPoint * locationPoint;
 
-@property (nonatomic, readonly) float azimuth;
+@property (nonatomic, readonly, nullable) NSNumber * locationHeading;
 
 @end
diff --git a/Frameworks/Navigine.framework/Headers/NCRoutePath.h b/Frameworks/Navigine.framework/Headers/NCRoutePath.h
@@ -5,11 +5,14 @@
 #import "NCLocationPoint.h"
 #import "NCRouteEvent.h"
 #import <Foundation/Foundation.h>
+@class NCRoutePath;
 
 
 DEFAULT_EXPORT_ATTRIBUTE
 @interface NCRoutePath : NSObject
 
+- (nonnull NSArray<NCRoutePath *> *)split:(float)advance;
+
 @property (nonatomic, readonly) float length;
 
 @property (nonatomic, nonnull, readonly) NSArray<NCRouteEvent *> * events;

diff --git a/Frameworks/Navigine.framework/Headers/NCRouteSession.h b/Frameworks/Navigine.framework/Headers/NCRouteSession.h
@@ -2,7 +2,6 @@
 // This file was generated by Djinni from route_manager.djinni
 
 #import "NCExport.h"
-#import "NCLocationPoint.h"
 #import <Foundation/Foundation.h>
 @protocol NCAsyncRouteListener;
 
@@ -14,6 +13,4 @@ DEFAULT_EXPORT_ATTRIBUTE
 
 - (void)removeRouteListener:(nullable id<NCAsyncRouteListener>)listener;
 
-- (void)checkIn:(nonnull NCLocationPoint *)point;
-
 @end
diff --git a/Frameworks/Navigine.framework/Headers/NCSublocation.h b/Frameworks/Navigine.framework/Headers/NCSublocation.h
@@ -43,6 +43,8 @@ DEFAULT_EXPORT_ATTRIBUTE
 
 @property (nonatomic, nonnull, readonly) NCGlobalPoint * originPoint;
 
+@property (nonatomic, nonnull, readonly) NSString * levelId;
+
 @property (nonatomic, nonnull, readonly) NSArray<NCBeacon *> * beacons;
 
 @property (nonatomic, nonnull, readonly) NSArray<NCEddystone *> * eddystones;

diff --git a/Frameworks/Navigine.framework/Info.plist b/Frameworks/Navigine.framework/Info.plist
diff --git a/Frameworks/Navigine.framework/Navigine b/Frameworks/Navigine.framework/Navigine
diff --git a/Navigine.podspec b/Navigine.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name                 = 'Navigine'
-  spec.version              = '2.1.0'
+  spec.version              = '2.2.0'
   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.1.0' }
+  spec.source               = { :git => 'https://github.com/Navigine/Indoor-Navigation-iOS-Mobile-SDK-2.0.git', :tag => 'v.2.2.0' }
   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'

diff --git a/NavigineDemo/NavigineDemo/Frameworks/Navigine.framework/Headers/NCAsyncRouteListener.h b/NavigineDemo/NavigineDemo/Frameworks/Navigine.framework/Headers/NCAsyncRouteListener.h
@@ -10,8 +10,7 @@
 DEFAULT_EXPORT_ATTRIBUTE
 @protocol NCAsyncRouteListener <NSObject>
 
-- (void)onRouteChanged:(nullable NCRoutePath *)currentPath
-          pendingPaths:(nonnull NSArray<NCRoutePath *> *)pendingPaths;
+- (void)onRouteChanged:(nullable NCRoutePath *)currentPath;
 
 - (void)onRouteAdvanced:(float)distance
                   point:(nonnull NCLocationPoint *)point;

diff --git a/NavigineDemo/NavigineDemo/Frameworks/Navigine.framework/Headers/NCAsyncRouteManager.h b/NavigineDemo/NavigineDemo/Frameworks/Navigine.framework/Headers/NCAsyncRouteManager.h
@@ -10,7 +10,8 @@
 DEFAULT_EXPORT_ATTRIBUTE
 @interface NCAsyncRouteManager : NSObject
 
-- (nullable NCRouteSession *)createRouteSession:(nonnull NCLocationPoint *)wayPoint;
+- (nullable NCRouteSession *)createRouteSession:(nonnull NCLocationPoint *)wayPoint
+                                   smoothRadius:(float)smoothRadius;
 
 - (void)cancelRouteSession:(nullable NCRouteSession *)session;
 

diff --git a/NavigineDemo/NavigineDemo/Frameworks/Navigine.framework/Headers/NCGlobalPoint.h b/NavigineDemo/NavigineDemo/Frameworks/Navigine.framework/Headers/NCGlobalPoint.h
@@ -6,13 +6,13 @@
 
 DEFAULT_EXPORT_ATTRIBUTE
 @interface NCGlobalPoint : NSObject
-- (nonnull instancetype)initWithLatitude:(float)latitude
-                               longitude:(float)longitude;
-+ (nonnull instancetype)globalPointWithLatitude:(float)latitude
-                                      longitude:(float)longitude;
+- (nonnull instancetype)initWithLatitude:(double)latitude
+                               longitude:(double)longitude;
++ (nonnull instancetype)globalPointWithLatitude:(double)latitude
+                                      longitude:(double)longitude;
 
-@property (nonatomic, readonly) float latitude;
+@property (nonatomic, readonly) double latitude;
 
-@property (nonatomic, readonly) float longitude;
+@property (nonatomic, readonly) double longitude;
 
 @end
diff --git a/NavigineDemo/NavigineDemo/Frameworks/Navigine.framework/Headers/NCPosition.h b/NavigineDemo/NavigineDemo/Frameworks/Navigine.framework/Headers/NCPosition.h
@@ -2,30 +2,31 @@
 // This file was generated by Djinni from position.djinni
 
 #import "NCExport.h"
-#import "NCPoint.h"
+#import "NCGlobalPoint.h"
+#import "NCLocationPoint.h"
 #import <Foundation/Foundation.h>
 
 DEFAULT_EXPORT_ATTRIBUTE
 @interface NCPosition : NSObject
-- (nonnull instancetype)initWithPoint:(nonnull NCPoint *)point
-                           locationId:(int32_t)locationId
-                        sublocationId:(int32_t)sublocationId
-                             accuracy:(float)accuracy
-                              azimuth:(float)azimuth;
-+ (nonnull instancetype)positionWithPoint:(nonnull NCPoint *)point
-                               locationId:(int32_t)locationId
-                            sublocationId:(int32_t)sublocationId
-                                 accuracy:(float)accuracy
-                                  azimuth:(float)azimuth;
+- (nonnull instancetype)initWithPoint:(nonnull NCGlobalPoint *)point
+                             accuracy:(double)accuracy
+                              heading:(nullable NSNumber *)heading
+                        locationPoint:(nullable NCLocationPoint *)locationPoint
+                      locationHeading:(nullable NSNumber *)locationHeading;
++ (nonnull instancetype)positionWithPoint:(nonnull NCGlobalPoint *)point
+                                 accuracy:(double)accuracy
+                                  heading:(nullable NSNumber *)heading
+                            locationPoint:(nullable NCLocationPoint *)locationPoint
+                          locationHeading:(nullable NSNumber *)locationHeading;
 
-@property (nonatomic, readonly, nonnull) NCPoint * point;
+@property (nonatomic, readonly, nonnull) NCGlobalPoint * point;
 
-@property (nonatomic, readonly) int32_t locationId;
+@property (nonatomic, readonly) double accuracy;
 
-@property (nonatomic, readonly) int32_t sublocationId;
+@property (nonatomic, readonly, nullable) NSNumber * heading;
 
-@property (nonatomic, readonly) float accuracy;
+@property (nonatomic, readonly, nullable) NCLocationPoint * locationPoint;
 
-@property (nonatomic, readonly) float azimuth;
+@property (nonatomic, readonly, nullable) NSNumber * locationHeading;
 
 @end