Merge branch 'SDK_V3'

CHANGELOG.md

@@ -1,4 +1,9 @@
-# V3
+# MapsIndoors iOS SDK v3
+
+### \[3.50.4] 2024-03-22[​](https://docs.mapsindoors.com/changelogs/ios#3504-2024-03-22) <a href="#3503-2023-11-22" id="3503-2023-11-22"></a>
+
+#### Fixed
+- Use of JSONModel library in MapsIndoors no longer prevents using it in your own app or using other libraries that also use JSONModel.
 
 ### \[3.50.3] 2023-11-22[​](https://docs.mapsindoors.com/changelogs/ios#3503-2023-11-22) <a href="#3503-2023-11-22" id="3503-2023-11-22"></a>
 

MapsIndoors.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "MapsIndoors"
-  s.version          = "3.50.3"
+  s.version          = "3.50.4"
   s.summary          = "Library making the MapsIndoors experience available to your iOS users."
   s.description      = "The MapsIndoors SDK is the idea of integrating everything at your venue, like people, goods, offices, shops, rooms and buildings with the mapping, positioning and wayfinding technologies provided in the MapsIndoors platform. We make the MapsIndoors platform available to interested businesses and/or partners. So if you think you should be one of them, please call us or send us an email. Meanwhile, you are most welcome to check out the demo project using 'pod try MapsIndoors'."
 

MapsIndoors.xcframework/Info.plist

@@ -5,30 +5,34 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>MapsIndoors.framework/MapsIndoors</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>MapsIndoors.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>x86_64</string>
+				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>MapsIndoors.framework/MapsIndoors</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>MapsIndoors.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
-				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPAppData.h

@@ -6,14 +6,14 @@
 //  Copyright (c) 2017 MapsPeople A/S. All rights reserved.
 //
 
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 #import "MPMenuItem.h"
 
 
 /** 
    Provides the contextual information needed for setting up a map with specific MapsPeople site data
  */
-@interface MPAppData : JSONModel
+@interface MPAppData : MPJSONModel
 /**
  Ruleset that defines how and when to show the different map markers
  */

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPBeacon.h

@@ -8,14 +8,14 @@
 
 #import <Foundation/Foundation.h>
 #import "MPPoint.h"
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 
 
 @protocol MPBeacon
 @end
 
 
-@interface MPBeacon : JSONModel
+@interface MPBeacon : MPJSONModel
 
 @property (nonatomic, strong, nullable) NSString* beaconId;
 @property (nonatomic, strong, nullable) NSNumber* maxTxPower;

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPBeaconCollection.h

@@ -9,7 +9,7 @@
 #import "MPBeacon.h"
 
 
-@interface MPBeaconCollection : JSONModel
+@interface MPBeaconCollection : MPJSONModel
 
 @property (nonatomic, strong, nullable) NSArray<MPBeacon*><MPBeacon>* list;
 

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPBuilding.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2017 MapsPeople A/S. All rights reserved.
 //
 
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 
 @class GMSCoordinateBounds;
 @class GMSMapView;
@@ -32,7 +32,7 @@
 /**
  Holds relevant data for a single building, and the buildings floor levels.
  */
-@interface MPBuilding : JSONModel
+@interface MPBuilding : MPJSONModel
 /**
  Holds the current floor.
  */

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPBuildingCollection.h

@@ -6,11 +6,11 @@
 //  Copyright (c) 2014 MapsPeople A/S. All rights reserved.
 //
 
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 #import "MPBuilding.h"
 
 
-@interface MPBuildingCollection : JSONModel
+@interface MPBuildingCollection : MPJSONModel
 
 @property (nonatomic, strong, nullable) NSArray<MPBuilding*><MPBuilding>* buildings;
 

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPBuildingDataset.h

@@ -6,13 +6,13 @@
 //  Copyright (c) 2017 MapsPeople A/S. All rights reserved.
 //
 
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 #import "MPBuilding.h"
 
 /**
  Collection of buildings with some retrieval and calculation functionality.
  */
-@interface MPBuildingDataset : JSONModel
+@interface MPBuildingDataset : MPJSONModel
 /**
  The type of data (equals "FeatureCollection").
  */

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPBuildingReference.h

@@ -7,9 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 
-@interface MPBuildingReference : JSONModel
+@interface MPBuildingReference : MPJSONModel
 
 @property (nonatomic, strong, nullable) NSString* refId;
 

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPCategories.h

@@ -6,12 +6,12 @@
 //  Copyright  Daniel Nielsen. All rights reserved.
 //
 
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 
 @class MPDataField;
 @protocol MPDataField;
 
-@interface MPCategories : JSONModel
+@interface MPCategories : MPJSONModel
 
 @property (nonatomic, strong, nullable) NSArray<MPDataField*><MPDataField>* list;
 

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPContactModule.h

@@ -7,10 +7,10 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 #import "MPDataField.h"
 
-@interface MPContactModule : JSONModel
+@interface MPContactModule : MPJSONModel
 
 @property (nonatomic, strong, nullable) MPDataField<Optional>* email;
 @property (nonatomic, strong, nullable) MPDataField<Optional>* phone;

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPDataField.h

@@ -7,12 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 
 @class MPLocationField;
 @protocol MPLocationField;
 
-@interface MPDataField : JSONModel
+@interface MPDataField : MPJSONModel
 
 @property (nonatomic, strong, nullable) NSString<Optional>* key;
 @property (nonatomic, strong, nullable) NSString* value;

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPDistanceMatrixElements.h

@@ -1,11 +1,11 @@
 #import <Foundation/Foundation.h>
 #import "MPRouteProperty.h"
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 
 @protocol MPDistanceMatrixElements
 @end
 
-@interface MPDistanceMatrixElements : JSONModel
+@interface MPDistanceMatrixElements : MPJSONModel
 	@property (nonatomic, strong, nullable) MPRouteProperty<Optional>* distance;
 	@property (nonatomic, strong, nullable) MPRouteProperty<Optional>* duration;
 	@property (nonatomic, strong, nullable) NSString* status; 

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPDistanceMatrixResult.h

@@ -1,8 +1,8 @@
 #import <Foundation/Foundation.h> 
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 #import "MPDistanceMatrixRows.h"
 
-@interface MPDistanceMatrixResult : JSONModel
+@interface MPDistanceMatrixResult : MPJSONModel
 
 @property (nonatomic, strong, nullable) NSArray* destination_addresses;
 @property (nonatomic, strong, nullable) NSArray* origin_addresses;

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPDistanceMatrixRows.h

@@ -1,12 +1,12 @@
 #import <Foundation/Foundation.h> 
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 #import "MPDistanceMatrixElements.h"
 
 
 @protocol MPDistanceMatrixRows
 @end
 
 
-@interface MPDistanceMatrixRows : JSONModel
+@interface MPDistanceMatrixRows : MPJSONModel
 	@property (nonatomic, strong, nullable) NSArray<MPDistanceMatrixElements*><MPDistanceMatrixElements>* elements;
 @end

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPEncodedPolyline.h

@@ -5,9 +5,9 @@
 //  Created by Daniel Nielsen on 07/07/14.
 //  Copyright (c) 2014 MapsPeople A/S. All rights reserved.
 //
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 
-@interface MPEncodedPolyline : JSONModel
+@interface MPEncodedPolyline : MPJSONModel
 
 @property (nonatomic, strong, nullable) NSString* points;
 

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPFloor.h

@@ -6,14 +6,14 @@
 //  Copyright (c) 2014 MapsPeople A/S. All rights reserved.
 //
 
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 
 @class GMSTileLayer;
 
 /**
  Floor data model. Holds the floor geometry, display name, z-index and id of the building it belongs to.
  */
-@interface MPFloor : JSONModel
+@interface MPFloor : MPJSONModel
 
 /// Floor id
 @property (nonatomic, strong, nonnull, readonly) NSString* floorId;

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPGeometry.h

@@ -6,12 +6,12 @@
 //
 //
 
-#import "JSONModel.h"
+#import "MPJSONModel.h"
 
 /**
  Basic geometry class holding one or more coordinate sets
  */
-@interface MPGeometry : JSONModel
+@interface MPGeometry : MPJSONModel
 
 /**
  Type of data (equals Geometry)

MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/JSONKeyMapper.h → MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPJSONKeyMapper.h

@@ -37,14 +37,14 @@ typedef NSString *(^JSONModelKeyMapBlock)(NSString *keyName);
  * }
  * </pre>
  */
-@interface JSONKeyMapper : NSObject
+@interface MPJSONKeyMapper : NSObject
 
 // deprecated
 @property (readonly, nonatomic) JSONModelKeyMapBlock JSONToModelKeyBlock DEPRECATED_ATTRIBUTE;
 - (NSString *)convertValue:(NSString *)value isImportingToModel:(BOOL)importing DEPRECATED_MSG_ATTRIBUTE("use convertValue:");
 - (instancetype)initWithDictionary:(NSDictionary *)map DEPRECATED_MSG_ATTRIBUTE("use initWithModelToJSONDictionary:");
 - (instancetype)initWithJSONToModelBlock:(JSONModelKeyMapBlock)toModel modelToJSONBlock:(JSONModelKeyMapBlock)toJSON DEPRECATED_MSG_ATTRIBUTE("use initWithModelToJSONBlock:");
-+ (instancetype)mapper:(JSONKeyMapper *)baseKeyMapper withExceptions:(NSDictionary *)exceptions DEPRECATED_MSG_ATTRIBUTE("use baseMapper:withModelToJSONExceptions:");
++ (instancetype)mapper:(MPJSONKeyMapper *)baseKeyMapper withExceptions:(NSDictionary *)exceptions DEPRECATED_MSG_ATTRIBUTE("use baseMapper:withModelToJSONExceptions:");
 + (instancetype)mapperFromUnderscoreCaseToCamelCase DEPRECATED_MSG_ATTRIBUTE("use mapperForSnakeCase:");
 + (instancetype)mapperFromUpperCaseToLowerCase DEPRECATED_ATTRIBUTE;
 
@@ -91,6 +91,6 @@ typedef NSString *(^JSONModelKeyMapBlock)(NSString *keyName);
  * Creates a JSONKeyMapper based on a built-in JSONKeyMapper, with specific exceptions.
  * Use your JSONModel property names as keys, and the JSON key names as values.
  */
-+ (instancetype)baseMapper:(JSONKeyMapper *)baseKeyMapper withModelToJSONExceptions:(NSDictionary *)toJSON;
++ (instancetype)baseMapper:(MPJSONKeyMapper *)baseKeyMapper withModelToJSONExceptions:(NSDictionary *)toJSON;
 
 @end

MapsIndoors.xcframework/ios-x86_64-simulator/MapsIndoors.framework/Headers/JSONModel.h → MapsIndoors.xcframework/ios-arm64/MapsIndoors.framework/Headers/MPJSONModel.h

@@ -5,9 +5,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "JSONModelError.h"
-#import "JSONValueTransformer.h"
-#import "JSONKeyMapper.h"
+#import "MPJSONModelError.h"
+#import "MPJSONValueTransformer.h"
+#import "MPJSONKeyMapper.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 #if TARGET_IPHONE_SIMULATOR
@@ -59,7 +59,7 @@ DEPRECATED_ATTRIBUTE
  * A protocol describing an abstract JSONModel class
  * JSONModel conforms to this protocol, so it can use itself abstractly
  */
-@protocol AbstractJSONModelProtocol <NSCopying, NSCoding>
+@protocol MPAbstractJSONModelProtocol <NSCopying, NSCoding>
 
 @required
 /**
@@ -117,11 +117,11 @@ DEPRECATED_ATTRIBUTE
  * Instead you should subclass it, and define the properties you want your data model
  * to have as properties of your own class.
  */
-@interface JSONModel : NSObject <AbstractJSONModelProtocol, NSSecureCoding>
+@interface MPJSONModel : NSObject <MPAbstractJSONModelProtocol, NSSecureCoding>
 
 // deprecated
 + (NSMutableArray *)arrayOfModelsFromDictionaries:(NSArray *)array DEPRECATED_MSG_ATTRIBUTE("use arrayOfModelsFromDictionaries:error:");
-+ (void)setGlobalKeyMapper:(JSONKeyMapper *)globalKeyMapper DEPRECATED_MSG_ATTRIBUTE("override +keyMapper in a base model class instead");
++ (void)setGlobalKeyMapper:(MPJSONKeyMapper *)globalKeyMapper DEPRECATED_MSG_ATTRIBUTE("override +keyMapper in a base model class instead");
 + (NSString *)protocolForArrayProperty:(NSString *)propertyName DEPRECATED_MSG_ATTRIBUTE("use classForCollectionProperty:");
 - (void)mergeFromDictionary:(NSDictionary *)dict useKeyMapping:(BOOL)useKeyMapping DEPRECATED_MSG_ATTRIBUTE("use mergeFromDictionary:useKeyMapping:error:");
 - (NSString *)indexPropertyName DEPRECATED_ATTRIBUTE;
@@ -137,7 +137,7 @@ DEPRECATED_ATTRIBUTE
  * or a property type in your model is not supported by JSONValueTransformer and its categories
  * @see initWithString:usingEncoding:error: for use of custom text encodings
  */
-- (instancetype)initWithString:(NSString *)string error:(JSONModelError **)err;
+- (instancetype)initWithString:(NSString *)string error:(MPJSONModelError **)err;
 
 /**
  * Create a new model instance and initialize it with the JSON from a text parameter using the given encoding.
@@ -147,7 +147,7 @@ DEPRECATED_ATTRIBUTE
  * @exception JSONModelTypeNotAllowedException thrown when unsupported type is found in the incoming JSON,
  * or a property type in your model is not supported by JSONValueTransformer and its categories
  */
-- (instancetype)initWithString:(NSString *)string usingEncoding:(NSStringEncoding)encoding error:(JSONModelError **)err;
+- (instancetype)initWithString:(NSString *)string usingEncoding:(NSStringEncoding)encoding error:(MPJSONModelError **)err;
 
 /** @name Exporting model contents */
 
@@ -231,7 +231,7 @@ DEPRECATED_ATTRIBUTE
  * Overwrite in your models if your property names don't match your JSON key names.
  * Lookup JSONKeyMapper docs for more details.
  */
-+ (JSONKeyMapper *)keyMapper;
++ (MPJSONKeyMapper *)keyMapper;
 
 /**
  * Indicates whether the property with the given name is Optional.