@situm/cordova 3.5.4 → 3.5.6

package/example/README.md

@@ -62,10 +62,10 @@ npm install
 This example provides you with a template on [`src/constants.ts.example`](src/constants.ts.example) to set all your credentials used on the sdk tab just in one file. So rename this file to `constants.ts` and set up your credentials before running the app:
 
 ```typescript
-export const API_USER = "YOUR_SITUM_API_USER";
-export const API_KEY = "YOUR_SITUM_API_KEY";
-export const BUILDING_IDENTIFIER = "YOUR_BUILDING_IDENTIFIER";
-export const VIEWER_DOMAIN = "https://map-viewer.situm.com";
+export const API_USER = 'YOUR_SITUM_API_USER';
+export const API_KEY = 'YOUR_SITUM_API_KEY';
+export const BUILDING_IDENTIFIER = 'YOUR_BUILDING_IDENTIFIER';
+export const VIEWER_DOMAIN = 'https://map-viewer.situm.com';
 ```
 
 > [!NOTE]
@@ -85,7 +85,7 @@ ionic cap run ios
 > [!NOTE]
 > iOS only
 >
-> You might need to update the pods of this app by executing inside `example/ios`:
+> You might need to update the pods of this app by executing inside `example/ios/App`:
 >
 > $ pod install --repo-update
 >
@@ -103,7 +103,10 @@ To integrate our plugin in a Cordova project, follow this 3 steps:
 1. Configure your Content-Security-Policy \<meta\> tag in your `www/index.html` to be able to display our MapView on Android:
 
 ```html
-<meta http-equiv="Content-Security-Policy" content="default-src 'self' data: https://ssl.gstatic.com https://map-viewer.situm.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; img-src 'self' data: content:;" />
+<meta
+  http-equiv="Content-Security-Policy"
+  content="default-src 'self' data: https://ssl.gstatic.com https://map-viewer.situm.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; img-src 'self' data: content:;"
+/>
 ```
 
 2. Configure your `config.xml` file to be able to display our MapView on iOS by adding the following \<allow-navigation\> tag:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@situm/cordova",
-  "version": "3.5.4",
+  "version": "3.5.6",
   "description": "Situm Wayfinding for Capacitor and Cordova. Integrate plug&play indoor navigation experience with floorplans, POIs, routes and turn-by-turn directions in no time. With the power of Situm.",
   "private": false,
   "repository": "https://github.com/situmtech/cordova",

package/plugin.xml

@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="@situm/cordova"
-    version="3.5.4">
+    version="3.5.6">
     <name>Situm Cordova plugin Official</name>
     <description>This is the stable branch.</description>
     <license>MIT</license>
@@ -90,7 +90,7 @@
             <config>
             </config>
             <pods use-frameworks="false">
-                <pod name="SitumSDK" spec="~> 3.11.0"/>
+                <pod name="SitumSDK" spec="~> 3.12.0"/>
             </pods>
         </podspec>
 

package/src/android/app/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     implementation ('com.googlecode.json-simple:json-simple:1.1.1'){
         exclude group: 'junit', module:'junit'
     }
-    implementation ('es.situm:situm-sdk:3.13.0@aar') {
+    implementation ('es.situm:situm-sdk:3.13.1@aar') {
         transitive = true
     }
     implementation 'org.apache.cordova:framework:10.1.1'

package/src/android/app/src/test/java/es/situm/plugin/SitumMapperTest.java

@@ -1209,8 +1209,8 @@ public class SitumMapperTest {
     }
 
     private void testIndication(JSONObject indication, JSONObject defaultIndication) throws JSONException {
-        Assert.assertEquals(Indication.Orientation.class, indication.get(ORIENTATION_TYPE).getClass());
-        Assert.assertEquals(Indication.Orientation.valueOf(defaultIndication.get(ORIENTATION_TYPE).toString()), indication.get(ORIENTATION_TYPE));
+        Assert.assertEquals(Indication.Orientation.valueOf(defaultIndication.get(ORIENTATION_TYPE).toString()),
+                Indication.Orientation.valueOf(indication.get(ORIENTATION_TYPE).toString()));
         Assert.assertEquals(Double.class, indication.get(ORIENTATION).getClass());
         Assert.assertEquals(defaultIndication.getDouble(ORIENTATION), indication.getDouble(ORIENTATION), 0);
         Assert.assertEquals(Integer.class, indication.get(STEP_IDX_DESTINTATION).getClass());

package/src/android/situm.gradle

@@ -12,7 +12,7 @@ allprojects {
 
 dependencies {
     implementation 'com.google.android.gms:play-services-location:16.0.0'
-    implementation('es.situm:situm-sdk:3.13.0@aar') {
+    implementation('es.situm:situm-sdk:3.13.1@aar') {
         transitive = true
     }
 }

package/src/ios/Podfile

@@ -1,5 +1,5 @@
 target 'SitumCordovaPlugin' do
   use_frameworks!
   platform :ios, '9.0'
-  pod 'SitumSDK', '3.11.0'
+  pod 'SitumSDK', '3.12.0'
 end

package/src/ios/SitumCordovaPlugin.xcodeproj/project.pbxproj

@@ -48,6 +48,7 @@
 		0DF4AB1E21143D5800D81A31 /* SitumPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DF4AB1421143D5700D81A31 /* SitumPlugin.m */; };
 		0DF4AB1F21143D5800D81A31 /* ViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0DF4AB1521143D5700D81A31 /* ViewController.h */; };
 		0DF4AB2021143D5800D81A31 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DF4AB1621143D5700D81A31 /* ViewController.m */; };
+		230FADC12BC815C30079D285 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 230FADB52BC8145A0079D285 /* libc++.tbd */; };
 		29A6B8BBD41A308233C44F3E /* Pods_SitumCordovaPlugin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF639F8C42C24AB0EC736F85 /* Pods_SitumCordovaPlugin.framework */; };
 		3A4011372153B0D500AC3BD5 /* InputCoordinateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A4011362153B0D500AC3BD5 /* InputCoordinateTests.m */; };
 		3A4011392153B24400AC3BD5 /* InputLocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A4011382153B24400AC3BD5 /* InputLocationTests.m */; };
@@ -100,7 +101,6 @@
 		954995F0214F8BBB007F3C28 /* Constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 954995EE214F8BBB007F3C28 /* Constants.h */; };
 		954995F1214F8BBB007F3C28 /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 954995EF214F8BBB007F3C28 /* Constants.m */; };
 		954995F2214F8BBB007F3C28 /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 954995EF214F8BBB007F3C28 /* Constants.m */; };
-		954995F8214FACD8007F3C28 /* PoiCategoryIconTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 954995F7214FACD8007F3C28 /* PoiCategoryIconTests.m */; };
 		957695E1217DA8960082E679 /* LocationRequestTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 957695E0217DA8960082E679 /* LocationRequestTest.m */; };
 		95B14A2B214A402E0073A9E1 /* PointTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 95B14A2A214A402E0073A9E1 /* PointTests.m */; };
 		95B14A2D214A44800073A9E1 /* AngleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 95B14A2C214A44800073A9E1 /* AngleTests.m */; };
@@ -115,7 +115,6 @@
 		95B14A41214A4CF20073A9E1 /* LocationStatusTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 95B14A40214A4CF20073A9E1 /* LocationStatusTests.m */; };
 		95B14A43214A4E550073A9E1 /* NavigationProgressTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 95B14A42214A4E550073A9E1 /* NavigationProgressTests.m */; };
 		95B14A45214A50E60073A9E1 /* PoiCategoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 95B14A44214A50E60073A9E1 /* PoiCategoryTests.m */; };
-		95B14A47214A51BA0073A9E1 /* RouteTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 95B14A46214A51BA0073A9E1 /* RouteTests.m */; };
 		95B14A49214A535A0073A9E1 /* RouteStepTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 95B14A48214A535A0073A9E1 /* RouteStepTests.m */; };
 		95B14A4B214A54CA0073A9E1 /* ConversionAreaTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 95B14A4A214A54CA0073A9E1 /* ConversionAreaTests.m */; };
 		95B14A4D214A56CE0073A9E1 /* BuildingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 95B14A4C214A56CE0073A9E1 /* BuildingTests.m */; };
@@ -202,6 +201,7 @@
 		0DF4AB1421143D5700D81A31 /* SitumPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SitumPlugin.m; sourceTree = "<group>"; };
 		0DF4AB1521143D5700D81A31 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
 		0DF4AB1621143D5700D81A31 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
+		230FADB52BC8145A0079D285 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.4.sdk/usr/lib/libc++.tbd"; sourceTree = DEVELOPER_DIR; };
 		30325A0B136B343700982B63 /* VERSION */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VERSION; sourceTree = "<group>"; };
 		3A4011362153B0D500AC3BD5 /* InputCoordinateTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InputCoordinateTests.m; sourceTree = "<group>"; };
 		3A4011382153B24400AC3BD5 /* InputLocationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InputLocationTests.m; sourceTree = "<group>"; };
@@ -257,7 +257,6 @@
 		952D03AF21B160DE000C6530 /* DirectionsRequestTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DirectionsRequestTest.m; sourceTree = "<group>"; };
 		954995EE214F8BBB007F3C28 /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = "<group>"; };
 		954995EF214F8BBB007F3C28 /* Constants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = "<group>"; };
-		954995F7214FACD8007F3C28 /* PoiCategoryIconTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PoiCategoryIconTests.m; sourceTree = "<group>"; };
 		957695E0217DA8960082E679 /* LocationRequestTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocationRequestTest.m; sourceTree = "<group>"; };
 		95B14A2A214A402E0073A9E1 /* PointTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PointTests.m; sourceTree = "<group>"; };
 		95B14A2C214A44800073A9E1 /* AngleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AngleTests.m; sourceTree = "<group>"; };
@@ -272,7 +271,6 @@
 		95B14A40214A4CF20073A9E1 /* LocationStatusTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LocationStatusTests.m; sourceTree = "<group>"; };
 		95B14A42214A4E550073A9E1 /* NavigationProgressTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NavigationProgressTests.m; sourceTree = "<group>"; };
 		95B14A44214A50E60073A9E1 /* PoiCategoryTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PoiCategoryTests.m; sourceTree = "<group>"; };
-		95B14A46214A51BA0073A9E1 /* RouteTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RouteTests.m; sourceTree = "<group>"; };
 		95B14A48214A535A0073A9E1 /* RouteStepTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RouteStepTests.m; sourceTree = "<group>"; };
 		95B14A4A214A54CA0073A9E1 /* ConversionAreaTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ConversionAreaTests.m; sourceTree = "<group>"; };
 		95B14A4C214A56CE0073A9E1 /* BuildingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BuildingTests.m; sourceTree = "<group>"; };
@@ -290,6 +288,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				230FADC12BC815C30079D285 /* libc++.tbd in Frameworks */,
 				3AC2FF4E21ADA883005D438A /* SitumSDK.framework in Frameworks */,
 				0D884A1321145F820066C765 /* libCordova.a in Frameworks */,
 				0D884A232114644C0066C765 /* SitumSDK.framework in Frameworks */,
@@ -325,7 +324,7 @@
 			name = Products;
 			sourceTree = CORDOVALIB;
 		};
-		0867D691FE84028FC02AAC07 = {
+		0867D691FE84028FC02AAC07 /* CordovaLib */ = {
 			isa = PBXGroup;
 			children = (
 				0DF4AB0521143D5700D81A31 /* situmcordovaplugin */,
@@ -344,6 +343,7 @@
 		0D5184E921145DEB00BFA9E3 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				230FADB52BC8145A0079D285 /* libc++.tbd */,
 				0D884A0821145E510066C765 /* SitumSDK.framework */,
 				3AC2FF4D21ADA883005D438A /* SitumSDK.framework */,
 				BF639F8C42C24AB0EC736F85 /* Pods_SitumCordovaPlugin.framework */,
@@ -447,11 +447,9 @@
 				95B14A40214A4CF20073A9E1 /* LocationStatusTests.m */,
 				95B14A42214A4E550073A9E1 /* NavigationProgressTests.m */,
 				95B14A44214A50E60073A9E1 /* PoiCategoryTests.m */,
-				95B14A46214A51BA0073A9E1 /* RouteTests.m */,
 				95B14A48214A535A0073A9E1 /* RouteStepTests.m */,
 				95B14A4A214A54CA0073A9E1 /* ConversionAreaTests.m */,
 				95D33B48214B9680000E073E /* PoiTests.m */,
-				954995F7214FACD8007F3C28 /* PoiCategoryIconTests.m */,
 			);
 			path = situmcordovaplugintests;
 			sourceTree = "<group>";
@@ -696,7 +694,6 @@
 				D2AAC07B0554694100DB518D /* Sources */,
 				D2AAC07C0554694100DB518D /* Frameworks */,
 				0D884E7E2116FD8E0066C765 /* Resources */,
-				DF7CE5352F475FBC1C87C1F3 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -738,7 +735,7 @@
 				en,
 				Base,
 			);
-			mainGroup = 0867D691FE84028FC02AAC07;
+			mainGroup = 0867D691FE84028FC02AAC07 /* CordovaLib */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -756,7 +753,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				0D884E7D2116FAA20066C765 /* resources in Resources */,
-				0D884E88211708900066C765 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -797,21 +793,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DF7CE5352F475FBC1C87C1F3 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SitumCordovaPlugin/Pods-SitumCordovaPlugin-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -831,7 +812,6 @@
 				0D5CFD64212C275E00C6E436 /* CDVUIWebViewNavigationDelegate.m in Sources */,
 				95B14A37214A47D20073A9E1 /* DimensionTests.m in Sources */,
 				95B14A41214A4CF20073A9E1 /* LocationStatusTests.m in Sources */,
-				954995F8214FACD8007F3C28 /* PoiCategoryIconTests.m in Sources */,
 				954995F2214F8BBB007F3C28 /* Constants.m in Sources */,
 				95B14A35214A476B0073A9E1 /* CoordinateTests.m in Sources */,
 				952D03B021B160DE000C6530 /* DirectionsRequestTest.m in Sources */,
@@ -844,7 +824,6 @@
 				95D33B49214B9680000E073E /* PoiTests.m in Sources */,
 				95B14A2F214A45B10073A9E1 /* BoundTests.m in Sources */,
 				3A40113D2153CBA800AC3BD5 /* InputIndicationTests.m in Sources */,
-				95B14A47214A51BA0073A9E1 /* RouteTests.m in Sources */,
 				0D5CFD61212C275E00C6E436 /* CDVUIWebViewDelegate.m in Sources */,
 				95B14A33214A46E20073A9E1 /* CartesianCoordinateTests.m in Sources */,
 				3A4011372153B0D500AC3BD5 /* InputCoordinateTests.m in Sources */,

package/src/ios/situmcordovaplugintests/SitumCreatorTests.m

@@ -57,8 +57,7 @@
     CLLocationCoordinate2D center = CLLocationCoordinate2DMake(42.8723472943445, -8.56325268745422);
     SITDimensions *dimensions = [[SITDimensions alloc] initWithWidth:71.0686153823893 height:42.6106416714803];
     SITAngle *angle = [[SITAngle alloc] initWithRadians:-3.31881803875501];
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
-    [dateFormatter setDateFormat:kDateFormat];
+    NSDateFormatter *dateFormatter = [SitumCreatorTests createDateFormatter];
     NSDate *createdAt = [dateFormatter dateFromString:@"Wed Jan 04 18:41:43 +0000 2017"];
     NSDate *updatedAt = [dateFormatter dateFromString:@"Wed Sep 12 12:10:25 +0000 2018"];
     
@@ -113,8 +112,7 @@
 //floor1.json
 + (SITFloor *) createFloorWithAltitude {
     SITFloor *floor = [[SITFloor alloc] init];
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
-    [dateFormatter setDateFormat:kDateFormat];
+    NSDateFormatter *dateFormatter = [SitumCreatorTests createDateFormatter];
     floor.createdAt = [dateFormatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     floor.updatedAt = [dateFormatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     floor.altitude = 2.5;
@@ -132,8 +130,7 @@
 + (SITFloor *) createFloorWithoutAltitude {
     SITFloor *floor = [[SITFloor alloc] init];
     
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
-    [dateFormatter setDateFormat:kDateFormat];
+    NSDateFormatter *dateFormatter = [SitumCreatorTests createDateFormatter];
     floor.createdAt = [dateFormatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     floor.updatedAt = [dateFormatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     floor.name = @"testName";
@@ -533,8 +530,7 @@
     category.name = string;
     CLLocationCoordinate2D coordinate = CLLocationCoordinate2DMake(5, 2);
     SITPoint *point = [[SITPoint alloc] initWithCoordinate:coordinate buildingIdentifier:@"101"];
-    NSDateFormatter *formatter = [NSDateFormatter new];
-    [formatter setDateFormat:kDateFormat];
+    NSDateFormatter *formatter = [SitumCreatorTests createDateFormatter];
     NSDate *createdAt = [formatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     NSDate *updatedAt = [formatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     
@@ -563,8 +559,7 @@
     SITMultilanguageString *string = [[SITMultilanguageString alloc] initWithValue:@"Sin categoría" defaultLocale:[NSLocale localeWithLocaleIdentifier:@"es_ES"]];
     category.name = string;
     
-    NSDateFormatter *formatter = [NSDateFormatter new];
-    [formatter setDateFormat:kDateFormat];
+    NSDateFormatter *formatter = [SitumCreatorTests createDateFormatter];
     NSDate *createdAt = [formatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     NSDate *updatedAt = [formatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     
@@ -590,8 +585,7 @@
     CLLocationCoordinate2D coordinate = CLLocationCoordinate2DMake(5, 7);
     SITPoint *point = [[SITPoint alloc] initWithCoordinate:coordinate buildingIdentifier:@"101"];
     
-    NSDateFormatter *formatter = [NSDateFormatter new];
-    [formatter setDateFormat:kDateFormat];
+    NSDateFormatter *formatter = [SitumCreatorTests createDateFormatter];
     NSDate *createdAt = [formatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     NSDate *updatedAt = [formatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     
@@ -616,8 +610,7 @@
     building.identifier = @"101";
     SITPoint *point = [[SITPoint alloc] initWithCoordinate:coordinate buildingIdentifier:@"101" floorIdentifier:@"12" cartesianCoordinate:cartesianCoordinate];
     
-    NSDateFormatter *formatter = [NSDateFormatter new];
-    [formatter setDateFormat:kDateFormat];
+    NSDateFormatter *formatter = [SitumCreatorTests createDateFormatter];
     NSDate *createdAt = [formatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     NSDate *updatedAt = [formatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     
@@ -648,8 +641,7 @@
     building.identifier = @"101";
     SITPoint *point = [[SITPoint alloc] initWithCoordinate:coordinate buildingIdentifier:@"101" floorIdentifier:@"12" cartesianCoordinate:cartesianCoordinate];
     
-    NSDateFormatter *formatter = [NSDateFormatter new];
-    [formatter setDateFormat:kDateFormat];
+    NSDateFormatter *formatter = [SitumCreatorTests createDateFormatter];
     NSDate *createdAt = [formatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     NSDate *updatedAt = [formatter dateFromString:@"Thu Jan 01 00:00:00 +0000 1970"];
     
@@ -924,5 +916,13 @@
     return ca;
 }
 
++ (NSDateFormatter *)createDateFormatter{
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
+    [dateFormatter setDateFormat:kDateFormat];
+    [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]];
+    [dateFormatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"UTC"]];
+    return dateFormatter;
+}
+
 @end
 

package/tests/common-resources/locationRequest/locationRequest2.json

@@ -1,32 +1,28 @@
 [
-    {
-        "buildingIdentifier": 1051,
-        "name": "Ed. Emprendia - Situm"
+  {
+    "buildingIdentifier": 1051,
+    "name": "Ed. Emprendia - Situm",
+    "interval": 1000,
+    "indoorProvider": "INPHONE",
+    "useBle": true,
+    "useWifi": true,
+    "motionMode": "BY_FOOT",
+    "useForegroundService": true,
+    "outdoorLocationOptions": {
+      "userDefinedThreshold": false,
+      "computeInterval": 1,
+      "averageSnrThreshold": 25.0
     },
-    {
-        "buildingIdentifier": 1051,
-        "interval": 1000,
-        "indoorProvider": "INPHONE",
-        "useBle": true,
-        "useWifi": true,
-        "motionMode": "BY_FOOT",
-        "useForegroundService": true,
-        "outdoorLocationOptions": 
-        {
-            "userDefinedThreshold": false,
-            "computeInterval": 1,
-            "averageSnrThreshold": 25.0
-        },
-        "beaconFilters": [
-            {
-                "uuid": "54"
-            },
-            {
-                "uuid": "68"
-            }
-        ],
-        "smallestDisplacement": 1.0,
-        "realtimeUpdateInterval": "REALTIME",
-        "autoEnableBleDuringPositioning": false
-    }
- ]
+    "beaconFilters": [
+      {
+        "uuid": "54"
+      },
+      {
+        "uuid": "68"
+      }
+    ],
+    "smallestDisplacement": 1.0,
+    "realtimeUpdateInterval": "REALTIME",
+    "autoEnableBleDuringPositioning": false
+  }
+]

package/tests/common-resources/locationRequest/locationRequest3.json

@@ -1,33 +1,29 @@
 [
-    {
-        "buildingIdentifier": 1051,
-        "name": "Ed. Emprendia - Situm"
+  {
+    "buildingIdentifier": 1051,
+    "name": "Ed. Emprendia - Situm",
+    "interval": 1000,
+    "indoorProvider": "INPHONE",
+    "useBle": true,
+    "useWifi": true,
+    "motionMode": "BY_FOOT",
+    "useForegroundService": true,
+    "useDeadReckoning": true,
+    "useGps": true,
+    "outdoorLocationOptions": {
+      "userDefinedThreshold": false,
+      "computeInterval": 1,
+      "averageSnrThreshold": 25.0
     },
-    {
-        "buildingIdentifier": 1051,
-        "interval": 1000,
-        "indoorProvider": "INPHONE",
-        "useBle": true,
-        "useWifi": true,
-        "motionMode": "BY_FOOT",
-        "useForegroundService": true,
-        "useDeadReckoning": true,
-        "useGps": true,
-        "outdoorLocationOptions": 
-        {
-            "userDefinedThreshold": false,
-            "computeInterval": 1,
-            "averageSnrThreshold": 25.0
-        },
-        "beaconFilters": [
-            {
-                "uuid": "54"
-            },
-            {
-                "uuid": "68"
-            }
-        ],
-        "smallestDisplacement": 1.0,
-        "realtimeUpdateInterval": "REALTIME"
-    }
- ]
+    "beaconFilters": [
+      {
+        "uuid": "54"
+      },
+      {
+        "uuid": "68"
+      }
+    ],
+    "smallestDisplacement": 1.0,
+    "realtimeUpdateInterval": "REALTIME"
+  }
+]

package/tests/common-resources/locationRequest/locationRequest4.json

@@ -1,31 +1,27 @@
 [
-    {
-        "buildingIdentifier": 1051,
-        "name": "Ed. Emprendia - Situm"
+  {
+    "buildingIdentifier": 1051,
+    "name": "Ed. Emprendia - Situm",
+    "interval": 1000,
+    "indoorProvider": "INPHONE",
+    "useBle": true,
+    "useWifi": true,
+    "motionMode": "BY_FOOT",
+    "useForegroundService": true,
+    "outdoorLocationOptions": {
+      "userDefinedThreshold": false,
+      "computeInterval": 1,
+      "averageSnrThreshold": 25.0
     },
-    {
-        "buildingIdentifier": 1051,
-        "interval": 1000,
-        "indoorProvider": "INPHONE",
-        "useBle": true,
-        "useWifi": true,
-        "motionMode": "BY_FOOT",
-        "useForegroundService": true,
-        "outdoorLocationOptions": 
-        {
-            "userDefinedThreshold": false,
-            "computeInterval": 1,
-            "averageSnrThreshold": 25.0
-        },
-        "beaconFilters": [
-            {
-                "uuid": "54"
-            },
-            {
-                "uuid": "68"
-            }
-        ],
-        "smallestDisplacement": 1.0,
-        "realtimeUpdateInterval": "BATTERY_SAVER"
-    }
- ]
+    "beaconFilters": [
+      {
+        "uuid": "54"
+      },
+      {
+        "uuid": "68"
+      }
+    ],
+    "smallestDisplacement": 1.0,
+    "realtimeUpdateInterval": "BATTERY_SAVER"
+  }
+]

package/tests/common-resources/locationStatus/locationStatus12.json

@@ -1,4 +1,4 @@
 {
-  "statusOrdinal":14,
-  "statusName":"TIME_SETTINGS_MANUAL"
-}
+  "statusOrdinal": 15,
+  "statusName": "TIME_SETTINGS_MANUAL"
+}

package/tests/scripts/copy_android_resources.sh

@@ -1,3 +1,3 @@
 #! /bin/bash
-
-cp -r tests/common-resources/ src/android/app/src/test/resources/
+mkdir src/android/app/src/test/resources/
+cp -r tests/common-resources/* src/android/app/src/test/resources/

package/src/ios/situmcordovaplugintests/PoiCategoryIconTests.m

@@ -1,43 +0,0 @@
-//
-//  PoiCategoryIconTests.m
-//  situmcordovaplugintests
-//
-//  Created by Cristina Sánchez Barreiro on 17/09/2018.
-//
-
-#import <XCTest/XCTest.h>
-#import "SitumCreatorTests.h"
-#import "SitumLocationWrapper.h"
-#import "TestingHelper.h"
-
-@interface PoiCategoryIconTests : XCTestCase
-
-@property (nonatomic, strong) NSString *filePath;
-@property (nonatomic, strong) TestingHelper *helper;
-
-@end
-
-
-@implementation PoiCategoryIconTests
-
-- (void)setUp {
-    [super setUp];
-    _filePath = @"resources/poiCategoryIcon";
-    _helper = [TestingHelper new];
-}
-
-- (void)tearDown {
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
-- (void) testPoiCategoryIcon {
-    UIImage *image = [SitumCreatorTests createPoiCategoryIcon];
-
-    NSDictionary *imageJO = [SitumLocationWrapper.shared bitmapToJsonObject:image];
-    NSString *fileName = @"poiCategoryIcon1";
-    //read from json object in resources
-    NSDictionary *jsonImage = [TestingHelper dataFromJSONFileNamed: fileName inDirectory : _filePath];
-    [_helper assertImage: jsonImage: imageJO];
-}
-
-@end

package/src/ios/situmcordovaplugintests/RouteTests.m

@@ -1,42 +0,0 @@
-//
-//  RouteTests.m
-//  situmcordovaplugintests
-//
-//  Created by Cristina Sánchez Barreiro on 13/09/2018.
-//
-
-#import <XCTest/XCTest.h>
-#import "SitumCreatorTests.h"
-#import "SitumLocationWrapper.h"
-#import "TestingHelper.h"
-
-@interface RouteTests : XCTestCase
-
-@property (nonatomic, strong) NSString *filePath;
-@property (nonatomic, strong) TestingHelper *helper;
-
-@end
-
-@implementation RouteTests
-
-- (void)setUp {
-    [super setUp];
-    _filePath = @"resources/route";
-    _helper = [TestingHelper new];
-}
-
-- (void)tearDown {
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    [super tearDown];
-}
-
-- (void) testRoute {
-    SITRoute *route1 = [SitumCreatorTests createRouteBuildingWithDegreesPointWithCoordinates];
-    NSDictionary *routeJO1 = [SitumLocationWrapper.shared routeToJsonObject:route1];
-    NSString *fileName1 =  @"route1";
-    //read from json object in resources
-    NSDictionary *jsonRoute1 = [TestingHelper dataFromJSONFileNamed: fileName1 inDirectory : _filePath];
-    [_helper assertRoute: jsonRoute1: routeJO1];
-}
-
-@end