update with version 0.15.4

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ---
 
+## [0.15.4]
+
+### Fixed
+
+* PosSDK(VPS): Switch to SCAN_REQUIRED state when user is static in an elevator or escalator in navigation mode
+* PosSDK(VPS): Change VPS request timeout to 20s
+
 ## [0.15.3]
 
 ### Fixed

Examples.xcodeproj/project.pbxproj

@@ -634,7 +634,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 0.14.2;
+				MARKETING_VERSION = 0.15.4;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -691,7 +691,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 0.14.2;
+				MARKETING_VERSION = 0.15.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;

Examples/Map+Positioning/Resources/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="9Br-Si-CgX">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="9Br-Si-CgX">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -265,29 +265,18 @@
                                     </button>
                                 </subviews>
                             </stackView>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eoN-AW-Sdz">
-                                <rect key="frame" x="20" y="107.33333333333331" width="350" height="280"/>
-                                <color key="backgroundColor" red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="280" id="Ppd-ze-cqo"/>
-                                </constraints>
-                            </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="bKC-0F-On0"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="eoN-AW-Sdz" firstAttribute="top" secondItem="VlV-Oc-B3x" secondAttribute="bottom" constant="20" id="0OK-FI-MOz"/>
                             <constraint firstItem="nwe-j2-iDT" firstAttribute="bottom" secondItem="bKC-0F-On0" secondAttribute="bottom" constant="-20" id="96R-C0-FYg"/>
                             <constraint firstItem="nwe-j2-iDT" firstAttribute="centerX" secondItem="4sh-1W-JyX" secondAttribute="centerX" id="AQl-Wh-wc6"/>
-                            <constraint firstItem="bKC-0F-On0" firstAttribute="trailing" secondItem="eoN-AW-Sdz" secondAttribute="trailing" constant="20" id="N9R-iP-GKb"/>
                             <constraint firstItem="VlV-Oc-B3x" firstAttribute="centerX" secondItem="4sh-1W-JyX" secondAttribute="centerX" id="Q9i-vU-q0i"/>
-                            <constraint firstItem="eoN-AW-Sdz" firstAttribute="leading" secondItem="bKC-0F-On0" secondAttribute="leading" constant="20" id="Yyy-Dk-kR4"/>
                             <constraint firstItem="VlV-Oc-B3x" firstAttribute="top" secondItem="bKC-0F-On0" secondAttribute="top" constant="20" id="qMr-5Q-7fO"/>
                         </constraints>
                     </view>
                     <connections>
                         <outlet property="infoLabel" destination="VlV-Oc-B3x" id="nGt-R2-qq9"/>
-                        <outlet property="previewImageView" destination="eoN-AW-Sdz" id="R6p-1Q-fuw"/>
                         <outlet property="startScanButton" destination="BMS-2O-skb" id="l9j-05-GWf"/>
                         <outlet property="stopScanButton" destination="X3W-wH-3aV" id="bCH-tu-2AP"/>
                     </connections>

Examples/Map+Positioning/Resources/Settings.bundle/Root.plist

@@ -118,6 +118,114 @@
 			<key>AutocorrectionType</key>
 			<string>No</string>
 		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>VPS Preferences</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Static position detector</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+			<key>Title</key>
+			<string>Window duration seconds</string>
+			<key>Key</key>
+			<string>staticPositionDetectorWindowDurationSeconds</string>
+			<key>DefaultValue</key>
+			<string>3</string>
+			<key>IsSecure</key>
+			<false/>
+			<key>KeyboardType</key>
+			<string>NumberPad</string>
+			<key>AutocapitalizationType</key>
+			<string>None</string>
+			<key>AutocorrectionType</key>
+			<string>No</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+			<key>Title</key>
+			<string>Geofence radius meters</string>
+			<key>Key</key>
+			<string>staticPositionDetectorGeofenceRadiusMeters</string>
+			<key>DefaultValue</key>
+			<string>1</string>
+			<key>IsSecure</key>
+			<false/>
+			<key>KeyboardType</key>
+			<string>NumberPad</string>
+			<key>AutocapitalizationType</key>
+			<string>None</string>
+			<key>AutocorrectionType</key>
+			<string>No</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Conveying detector</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+			<key>Title</key>
+			<string>Duration seconds</string>
+			<key>Key</key>
+			<string>conveyingDetectionDurationSeconds</string>
+			<key>DefaultValue</key>
+			<string>3</string>
+			<key>IsSecure</key>
+			<false/>
+			<key>KeyboardType</key>
+			<string>NumberPad</string>
+			<key>AutocapitalizationType</key>
+			<string>None</string>
+			<key>AutocorrectionType</key>
+			<string>No</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+			<key>Title</key>
+			<string>Elevator buffer width</string>
+			<key>Key</key>
+			<string>conveyingDetectorElevatorBufferWidth</string>
+			<key>DefaultValue</key>
+			<string>5</string>
+			<key>IsSecure</key>
+			<false/>
+			<key>KeyboardType</key>
+			<string>NumberPad</string>
+			<key>AutocapitalizationType</key>
+			<string>None</string>
+			<key>AutocorrectionType</key>
+			<string>No</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+			<key>Title</key>
+			<string>Linear conveying buffers width</string>
+			<key>Key</key>
+			<string>conveyingDetectorLinearConveyingBuffersWidth</string>
+			<key>DefaultValue</key>
+			<string>2</string>
+			<key>IsSecure</key>
+			<false/>
+			<key>KeyboardType</key>
+			<string>NumberPad</string>
+			<key>AutocapitalizationType</key>
+			<string>None</string>
+			<key>AutocorrectionType</key>
+			<string>No</string>
+		</dict>
 	</array>
 </dict>
 </plist>

Examples/Map+Positioning/Sources/Config.swift

@@ -14,7 +14,12 @@ enum PreferencesKey: String {
     case mapVersion,
          positioningVersion,
          mapLibreVersion,
-         cameraImageMaxSizeSmallerSide
+         cameraImageMaxSizeSmallerSide,
+         staticPositionDetectorWindowDurationSeconds,
+         staticPositionDetectorGeofenceRadiusMeters,
+         conveyingDetectorDurationSeconds,
+         conveyingDetectorElevatorBufferWidth,
+         conveyingDetectorLinearConveyingBuffersWidth
 }
 
 func customKeysAndValues() -> [String: Any] {
@@ -28,6 +33,31 @@ func customKeysAndValues() -> [String: Any] {
         .positioningVersion: Bundle.positioning.version
     ]
 
+    VPSARKitConstants.StaticPositionDetector.windowDurationSeconds = UserDefaults.double(
+        forKey: .staticPositionDetectorWindowDurationSeconds,
+        defaultValue: VPSARKitConstants.StaticPositionDetector.windowDurationSeconds
+    )
+
+    VPSARKitConstants.StaticPositionDetector.geofenceRadiusMeters = UserDefaults.float(
+        forKey: .staticPositionDetectorGeofenceRadiusMeters,
+        defaultValue: VPSARKitConstants.StaticPositionDetector.geofenceRadiusMeters
+    )
+
+    VPSARKitConstants.ConveyingDetector.durationSeconds = UserDefaults.int(
+        forKey: .conveyingDetectorDurationSeconds,
+        defaultValue: VPSARKitConstants.ConveyingDetector.durationSeconds
+    )
+
+    VPSARKitConstants.ConveyingDetector.elevatorBufferWidth = UserDefaults.double(
+        forKey: .conveyingDetectorElevatorBufferWidth,
+        defaultValue: VPSARKitConstants.ConveyingDetector.elevatorBufferWidth
+    )
+
+    VPSARKitConstants.ConveyingDetector.linearConveyingBuffersWidth = UserDefaults.double(
+        forKey: .conveyingDetectorLinearConveyingBuffersWidth,
+        defaultValue: VPSARKitConstants.ConveyingDetector.linearConveyingBuffersWidth
+    )
+
     let dict = Dictionary(uniqueKeysWithValues: specificKeysAndValues.map { ($0.rawValue, $1) })
     return dict
 }

Examples/Map+Positioning/Sources/ViewControllers/CameraViewController.swift

@@ -16,7 +16,6 @@ import WemapPositioningSDKVPSARKit
 class CameraViewController: UIViewController {
 
     @IBOutlet var infoLabel: UILabel!
-    @IBOutlet var previewImageView: UIImageView!
     @IBOutlet var startScanButton: UIButton!
     @IBOutlet var stopScanButton: UIButton!
 
@@ -34,8 +33,6 @@ class CameraViewController: UIViewController {
         view.insertSubview(arView, at: 0)
         arView.session = session
 
-        vpsLocationSource.observer = self
-
         weak var previousToast: UIView?
         vpsLocationSource
             .rx.didFail
@@ -80,11 +77,3 @@ class CameraViewController: UIViewController {
         stateListener.dispose()
     }
 }
-
-@available(iOS 13.0, *)
-extension CameraViewController: VPSARKitLocationSourceObserver {
-
-    func locationSource(_: VPSARKitLocationSource, willSendImage image: UIImage) {
-        previewImageView.image = image
-    }
-}

Examples/Map+Positioning/Sources/ViewControllers/NavigationViewController.swift

@@ -64,6 +64,7 @@ final class NavigationViewController: MapViewController {
                 "1 annotation to start from user location. 2 annotations to start from custom location",
             onView: view, hideDelay: Delay.short
         )
+        map.userTrackingMode = .follow
     }
 
     @IBAction func closeTouched() {

Examples/Sources/SettingsBundleHelper.swift

@@ -18,11 +18,11 @@ private enum GlobalPreferencesKey: String {
          turfVersion
 }
 
-final class SettingsBundleHelper {
+enum SettingsBundleHelper {
 
     private static let defaults = UserDefaults.standard
 
-    class func applySettings(customKeysAndValues: [String: Any] = [:]) {
+    static func applySettings(customKeysAndValues: [String: Any] = [:]) {
 
         defaults.setValuesForKeys(customKeysAndValues)
 

Examples/Sources/UserDefaults+Additions.swift

@@ -21,4 +21,12 @@ extension UserDefaults {
     static func double(forKey key: PreferencesKey, defaultValue: Double) -> Double {
         UserDefaults.value(forKey: key) != nil ? standard.double(forKey: key.rawValue) : defaultValue
     }
+
+    static func float(forKey key: PreferencesKey, defaultValue: Float) -> Float {
+        UserDefaults.value(forKey: key) != nil ? standard.float(forKey: key.rawValue) : defaultValue
+    }
+
+    static func int(forKey key: PreferencesKey, defaultValue: Int) -> Int {
+        UserDefaults.value(forKey: key) != nil ? standard.integer(forKey: key.rawValue) : defaultValue
+    }
 }

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -22,17 +22,17 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.937.0)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.944.0)
+    aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.82.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.84.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.151.0)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-s3 (1.152.3)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -80,13 +80,13 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     drb (2.2.1)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.16.3)
+    ffi (1.17.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -103,8 +103,8 @@ GEM
     netrc (0.11.0)
     nkf (0.2.0)
     public_suffix (4.0.7)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.2.9)
+      strscan
     ruby-macho (2.5.1)
     strscan (3.1.0)
     typhoeus (1.4.1)
@@ -127,4 +127,4 @@ DEPENDENCIES
   cocoapods-s3-download
 
 BUNDLED WITH
-   2.5.11
+   2.5.12

Podfile

@@ -9,7 +9,7 @@ platform :ios, '12.0'
 
 #################################################################################
 
-wemap_sdks_version = '~>0.15.3'
+wemap_sdks_version = '~>0.15.4'
 
 abstract_target 'Map' do