From 6a7eeace155eb9f2cb9fe9ace233817127f9ea2c Mon Sep 17 00:00:00 2001
From: Lapisoft <contact@lapisoft.es>
Date: Thu, 3 Mar 2022 07:56:15 +0100
Subject: [PATCH 01/26] Localize strings

* Add localization files to podspec to allow the app that
uses the library to load correct strings
---
 SitumWayfinding.podspec                       |   6 +-
 .../Assets/SitumWayfinding.storyboard         |  13 +-
 .../Positioning/PositioningPresenter.swift    |  19 ++-
 .../PositioningViewController.swift           |  94 ++++++++++----
 .../Protocols/OnNavigationListener.swift      |  12 +-
 .../WayfindingLibrary/SitumMapsLibrary.swift  |   8 +-
 .../WayfindingLibrary/WayfindingError.swift   |   4 +-
 .../en.lproj/Localizable.strings              | 116 ++++++++++++++++++
 .../es.lproj/Localizable.strings              | 116 ++++++++++++++++++
 9 files changed, 340 insertions(+), 48 deletions(-)
 create mode 100644 SitumWayfinding/Localizations/en.lproj/Localizable.strings
 create mode 100644 SitumWayfinding/Localizations/es.lproj/Localizable.strings

diff --git a/SitumWayfinding.podspec b/SitumWayfinding.podspec
index 8c5f186..f3b88fa 100644
--- a/SitumWayfinding.podspec
+++ b/SitumWayfinding.podspec
@@ -26,7 +26,11 @@ Pod::Spec.new do |s|
   s.swift_version = '5.0'
 
   s.source_files = 'SitumWayfinding/Classes/**/*'
-  s.resources = ['SitumWayfinding/Assets/*.storyboard', 'SitumWayfinding/Assets/Images/**/*.png']
+  s.resources = [
+    'SitumWayfinding/Assets/*.storyboard',
+    'SitumWayfinding/Assets/Images/**/*.png',
+    'SitumWayfinding/Localizations/**/*',
+  ]
   s.dependency 'GoogleMaps', '~> 4.2.0'
   s.dependency 'SitumSDK', '~> 2.52.0'
 
diff --git a/SitumWayfinding/Assets/SitumWayfinding.storyboard b/SitumWayfinding/Assets/SitumWayfinding.storyboard
index 55e6e67..f2eb9e8 100644
--- a/SitumWayfinding/Assets/SitumWayfinding.storyboard
+++ b/SitumWayfinding/Assets/SitumWayfinding.storyboard
@@ -267,6 +267,7 @@
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="backButton" destination="ysb-eJ-ja8" id="Tse-P7-KFK"/>
                         <outlet property="cancelNavigationButton" destination="0tN-NH-EBq" id="SkR-PT-9nf"/>
                         <outlet property="centerButton" destination="x1X-sn-fxl" id="mzE-8y-1mR"/>
                         <outlet property="currentIndicationLabel" destination="IVC-BM-fvT" id="8Sh-au-DXE"/>
@@ -304,27 +305,27 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SearchCell" id="8KY-KK-mXF" customClass="SearchTableViewCell" customModule="SitumWayfinding" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="44.5" width="375" height="50"/>
+                                <rect key="frame" x="0.0" y="44.5" width="375" height="50.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="8KY-KK-mXF" id="Z6g-Fm-MMK">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="50.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="oib-4P-aeh" userLabel="Icon">
-                                            <rect key="frame" x="10" y="10" width="30" height="30"/>
+                                            <rect key="frame" x="10" y="10.5" width="30" height="30"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="30" id="GUe-t4-7iC"/>
                                                 <constraint firstAttribute="width" constant="30" id="a45-7Y-oa3"/>
                                             </constraints>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YTV-B7-qbv" userLabel="Name">
-                                            <rect key="frame" x="55" y="5" width="315" height="21"/>
+                                            <rect key="frame" x="55" y="5" width="315" height="21.5"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Distance" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="29y-7F-mVo" userLabel="Distance">
-                                            <rect key="frame" x="299" y="18" width="70" height="14"/>
+                                            <rect key="frame" x="299" y="18.5" width="70" height="14"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="70" id="SN1-bF-8Wh"/>
                                             </constraints>
@@ -333,7 +334,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Floor" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5R0-pb-rb3" userLabel="Floor">
-                                            <rect key="frame" x="55" y="31" width="315" height="14"/>
+                                            <rect key="frame" x="55" y="31.5" width="315" height="14"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                             <color key="textColor" systemColor="systemGray4Color"/>
                                             <nil key="highlightedColor"/>
diff --git a/SitumWayfinding/Classes/Positioning/PositioningPresenter.swift b/SitumWayfinding/Classes/Positioning/PositioningPresenter.swift
index 3ecb537..91be2a5 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningPresenter.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningPresenter.swift
@@ -34,9 +34,12 @@ class PositioningPresenter: NSObject, SITLocationDelegate, SITDirectionsDelegate
     
     var useRemoteConfig: Bool = false
     
-    let compassCalibrationAlertTitle = "Compass calibration needed"
-    let oobAlertTitle = "User outside building"
-    let outsideRouteAlertTitle = "User ouside route"
+    let compassCalibrationAlertTitle = NSLocalizedString("positioning.calibrationNeeded.alert.title",
+        comment: "The user needs to calibrate the compass")
+    let oobAlertTitle = NSLocalizedString("positioning.outsideBuilding.alert.title",
+        comment: "Alert title to show user is outside of building")
+    let outsideRouteAlertTitle = NSLocalizedString("positioning.outsideRoute.alert.title",
+        comment: "Alert title to show user is outside of route")
 
     init(view: PositioningView, buildingInfo: SITBuildingInfo, interceptorsManager: InterceptorsManager) {
         self.view = view
@@ -387,14 +390,16 @@ class PositioningPresenter: NSObject, SITLocationDelegate, SITDirectionsDelegate
             break;
         case .compassNeedsCalibration:
             stateName = "Compass needs calibration"
-            showAlertIfNeeded(type: .compassCalibrationNeeded, title: self.compassCalibrationAlertTitle, message: "Your device's compass isn't calibrated right now. Please recalibrate it to obtain the best navigation experience.")
+            showAlertIfNeeded(type: .compassCalibrationNeeded, title: self.compassCalibrationAlertTitle,
+                message: NSLocalizedString("positioning.calibrationNeeded.alert.message", comment: ""))
             break;
         case .userNotInBuilding:
             stateName = "User not in building"
             if isUserNavigating(){
                 view?.stopNavigation(status: .error(NavigationError.outsideBuilding))
             }
-            showAlertIfNeeded(type: .outOfBuilding, title: self.oobAlertTitle, message: "The user is currently outside of the building. Positioning will resume when the user returns.")
+            showAlertIfNeeded(type: .outOfBuilding, title: self.oobAlertTitle,
+                message: NSLocalizedString("positioning.outsideBuilding.alert.message", comment: "") )
             break;
         }
         Logger.logDebugMessage("Location manager updates state: \(stateName)")
@@ -442,7 +447,9 @@ class PositioningPresenter: NSObject, SITLocationDelegate, SITDirectionsDelegate
         Logger.logDebugMessage("user outside route detected: \(route.debugDescription)");
         
         if isUserIndoor(){
-            showAlertIfNeeded(type: .outsideRoute, title: self.outsideRouteAlertTitle, message: "The user is not currently detected on the route. Please go back to resume navigation.")
+            let message = NSLocalizedString("positioning.outsideBuilding.alert.message",
+                comment: "Alert message to show user is outside of route")
+            showAlertIfNeeded(type: .outsideRoute, title: self.outsideRouteAlertTitle, message: message)
         }else{
             view?.stopNavigation(status: .error(NavigationError.outsideBuilding))
         }
diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index a3b67a6..a3c10f0 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -29,6 +29,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     @IBOutlet weak var levelsTableView: UITableView!
     @IBOutlet weak var levelsTableHeightConstaint: NSLayoutConstraint!
     @IBOutlet weak var centerButton: UIButton!
+    @IBOutlet weak var backButton: UIBarButtonItem!
     @IBOutlet weak var numberBeaconsRangedView: UIView!
     @IBOutlet weak var numberBeaconsRangedLabel: UILabel!
     @IBOutlet weak var loadingIndicator: UIActivityIndicatorView!
@@ -95,10 +96,20 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     let DEFAULT_SITUM_COLOR = "#283380"
     let DEFAULT_POI_NAME: String = "POI"
     let DEFAULT_BUILDING_NAME: String = "Current Building"
-    let fakeLocationsOptions = ["0º", "90º", "180º", "270º", "Create marker"]
+    let fakeLocationsOptions = [
+        "0º",
+        "90º",
+        "180º",
+        "270º",
+        NSLocalizedString("positioning.createMarker", comment: "")
+    ]
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        backButton.title = NSLocalizedString("positioning.back",
+            comment: "Button to go back when the user is in the positioning controller (where the map is shown)")
+        centerButton.setTitle(NSLocalizedString("positioning.center",
+            comment: "Button to center map in current location of user"), for: .normal)
         initSearchController()
         definesPresentationContext = true
         mapReadinessChecker = SitumMapReadinessChecker { [weak self] in
@@ -112,7 +123,9 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         positionDrawer = GoogleMapsPositionDrawer(mapView: mapView)
-        let loadingAlert = UIAlertController(title:  "Loading", message: "Hold on for a moment", preferredStyle: .actionSheet)
+        let loading = NSLocalizedString("alert.loading.title", comment: "Alert title when loading library")
+        let message = NSLocalizedString("alert.loading.message", comment: "Alert message when loading library")
+        let loadingAlert = UIAlertController(title: loading, message: message, preferredStyle: .actionSheet)
         self.present(loadingAlert, animated: true, completion: {
             if (self.loadFinished){
                 self.situmLoadFinished(loadingAlert: loadingAlert)
@@ -178,7 +191,11 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     func situmLoadFinished(loadingAlert : UIAlertController){
         loadingAlert.dismiss(animated: true) {
             if (self.loadingError){
-                self.showAlertMessage(title: "Error obtaining building info", message: "An unexpected error ocurred while downloading the building's information. Please try again.",alertType: .otherAlert)
+                let title = NSLocalizedString("alert.error.building.title",
+                    comment: "Alert title after an error retrieving a building happens")
+                let message = NSLocalizedString("alert.error.building.message",
+                    comment: "Alert message after an error retrieving a building happens")
+                self.showAlertMessage(title: title, message: message, alertType: .otherAlert)
             }
         }
         loadFinished = true
@@ -420,6 +437,10 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
             displayFloorplan(forLevel: levelIdentifier)
             self.mapReadinessChecker.currentFloorMapLoaded()
         } else {
+            let title = NSLocalizedString("positioning.error.emptyFloor.alert.title",
+                comment: "Alert title error when download the floor plan fails")
+            let message = NSLocalizedString("positioning.error.emptyFloor.alert.message",
+                comment: "Alert title error when download the floor plan fails")
             let wasMapFetched = SITCommunicationManager.shared().fetchMap(from: orderedFloors(buildingInfo: buildingInfo)![selectedLevelIndex], withCompletion: { imageData in
                 
                 if let imageData = imageData {
@@ -429,11 +450,11 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
                     self.displayFloorplan(forLevel: levelIdentifier)
                     self.mapReadinessChecker.currentFloorMapLoaded()
                 } else {
-                    self.showAlertMessage(title: "Empty floorplan", message: "An unexpected error ocurred while downloading the floorplan. Please try again.", alertType: .otherAlert)
+                    self.showAlertMessage(title: title, message: message, alertType: .otherAlert)
                 }
             })
             if !wasMapFetched {
-                self.showAlertMessage(title: "Empty floorplan", message: "An unexpected error ocurred while downloading the floorplan. Please try again.", alertType: .otherAlert)
+                self.showAlertMessage(title: title, message: message, alertType: .otherAlert)
             }
         }
     }
@@ -745,9 +766,13 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     }
     
     func showFakeLocationsAlert() {
-        let alert = UIAlertController(title: "Long press actions", message: "Select an action:", preferredStyle: .alert)
+        let title = NSLocalizedString("positioning.longPressAction.alert.title",
+            comment: "Alert title to show for a long press action")
+        let message = NSLocalizedString("positioning.longPressAction.alert.message",
+            comment: "Alert message to show for a long press action")
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
 
-        alert.addAction(UIAlertAction(title: "Cancel", style: .default, handler: { _ in
+        alert.addAction(UIAlertAction(title: NSLocalizedString("cancel", comment: "Generic cancel action "), style: .default, handler: { _ in
             self.presenter?.alertViewClosed(.otherAlert)
         }))
         for (buttonIndex, text) in fakeLocationsOptions.enumerated() {
@@ -862,7 +887,9 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         if (self.numberBeaconsRangedView.isHidden) {
             self.numberBeaconsRangedView.isHidden = false
         }
-        self.numberBeaconsRangedLabel.text = String(format: "%d beacons", text)
+        let format = NSLocalizedString("positioning.numBeacons",
+            comment: "Used to show the user the number of beacons that library detects nearby")
+        self.numberBeaconsRangedLabel.text = String(format: format, text)
     }
     
     func updateUI(with location: SITLocation) {
@@ -897,8 +924,9 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     func showAlertMessage(title: String, message: String, alertType:AlertType) {
         
         let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
-
-        alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: { _ in
+    
+        let title = NSLocalizedString("ok", comment: "Generic ok action")
+        alert.addAction(UIAlertAction(title: title, style: .default, handler: { _ in
             self.presenter?.alertViewClosed(alertType)
         }))
 
@@ -918,7 +946,11 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     func updateProgress(progress: SITNavigationProgress) {
         self.progress = progress;
         self.indicationsView.isHidden = false
-        self.updateInfoBarLabels(mainLabel: self.destinationMarker?.gmsMarker.title ?? DEFAULT_POI_NAME, secondaryLabel: String(format: "%.1fm remaining", progress.distanceToGoal))
+        let localizedFormat = NSLocalizedString("positioning.navigationProgress",
+            comment: "Show to the user distance to next point")
+        let secondaryLabel = String(format: localizedFormat, progress.distanceToGoal)
+        self.updateInfoBarLabels(mainLabel: self.destinationMarker?.gmsMarker.title ?? DEFAULT_POI_NAME,
+            secondaryLabel: secondaryLabel)
         
         // Update route based on this information
         for line in self.polyline {
@@ -952,7 +984,9 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         if(!self.isUserNavigating()) {
             self.removeLastCustomMarkerIfOutsideRoute()
             self.lastCustomMarker = SitumMarker(from:  self.createMarker(withCoordinate: coordinate, floorId: floorId))
-            self.updateInfoBarLabels(mainLabel: "Custom destination", secondaryLabel: self.buildingInfo?.building.name ?? DEFAULT_BUILDING_NAME)
+            let mainLabel = NSLocalizedString("positioning.customDestination",
+                comment: "Shown to user when select a destination (destination is any free point that user selects on the map)")
+            self.updateInfoBarLabels(mainLabel: mainLabel, secondaryLabel: self.buildingInfo?.building.name ?? DEFAULT_BUILDING_NAME)
             self.changeNavigationButtonVisibility(isVisible: true)
             self.lastSelectedMarker = self.lastCustomMarker
         }
@@ -980,7 +1014,8 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     
     func createMarker(withCoordinate coordinate: CLLocationCoordinate2D, floorId floor: String) -> GMSMarker {
         let marker: GMSMarker = GMSMarker(position: coordinate)
-        marker.title = "Custom destination"
+        marker.title = NSLocalizedString("positioning.customDestination",
+            comment: "Shown to user when select a destination (destination is any free point that user selects on the map)")
         marker.userData = floor
         marker.map = self.mapView
         
@@ -1112,25 +1147,34 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
             if let error = error as? NavigationError {
                 switch error {
                 case .positionUnknown:
-                    self.showAlertMessage(title: "Position unknown", message: error.localizedDescription, alertType: .otherAlert)
+                    let title = NSLocalizedString("positioning.error.positionUnknown.alert.title",
+                        comment: "Alert title error when the user position is unknown")
+                    self.showAlertMessage(title: title, message: error.localizedDescription, alertType: .otherAlert)
                 case .outdoorOrigin:
-                    self.showAlertMessage(title: "Position outdoor", message: error.localizedDescription, alertType: .otherAlert)
+                    let title = NSLocalizedString("positioning.error.positionOutdoor.alert.title",
+                        comment: "Alert title error when the user is outdoor")
+                    self.showAlertMessage(title: title, message: error.localizedDescription, alertType: .otherAlert)
                 case .noDestinationSelected:
-                    self.showAlertMessage(title: "No destination selected", message: error.localizedDescription, alertType: .otherAlert)
-                case .unableToComputeRoute:
-                    self.showAlertMessage(title: "Unable to compute route", message: error.localizedDescription, alertType: .otherAlert)
-                case .noAvailableRoute:
-                    self.showAlertMessage(title: "Unable to compute route", message: error.localizedDescription, alertType: .otherAlert)
-                case .outsideBuilding:
-                    self.showAlertMessage(title: "Unable to compute route", message: error.localizedDescription, alertType: .otherAlert)
+                    let title = NSLocalizedString("positioning.error.noDestinationSelected.alert.title",
+                        comment: "Alert title error when the user does not select a destination")
+                    self.showAlertMessage(title: title, message: error.localizedDescription, alertType: .otherAlert)
+                case .unableToComputeRoute, .noAvailableRoute, .outsideBuilding:
+                    let title = NSLocalizedString("positioning.error.unableToComputeRoute.alert.title",
+                        comment: "Alert title error when WayFinding cannot compute route to destination")
+                    self.showAlertMessage(title: title, message: error.localizedDescription, alertType: .otherAlert)
                 case .locationError(let error):
                     let errorMessage = error?.localizedDescription ?? WayfindingError.unknown.localizedDescription
-                    self.showAlertMessage(title: "Error", message: errorMessage, alertType: .otherAlert)
+                    let title = NSLocalizedString("alert.error.title", comment: "Alert title for generic errors ")
+                    self.showAlertMessage(title: title, message: errorMessage, alertType: .otherAlert)
                 }
             }
         } else {
             if case .destinationReached = status {
-                self.showAlertMessage(title: "Destination Reached", message: "You've arrived to your destination", alertType: .otherAlert)
+                let title = NSLocalizedString("positioning.destinationReached.alert.title",
+                    comment: "Alert title to show to the user when destination was reached")
+                let message = NSLocalizedString("positioning.destinationReached.alert.message",
+                    comment: "Alert message to show to the user when destination was reached")
+                self.showAlertMessage(title: title, message: message, alertType: .otherAlert)
             }
             self.delegateNotifier?.navigationDelegate?.onNavigationFinished(navigation: navigation)
         }
@@ -1220,7 +1264,7 @@ extension PositioningViewController: UISearchControllerDelegate, UISearchBarDele
         if let searchViewPlaceholder = library?.settings?.searchViewPlaceholder, searchViewPlaceholder.count > 0{
             return searchViewPlaceholder
         }else{
-            return "Search Pois"
+            return NSLocalizedString("positioning.searchPois", comment: "Placeholder for searching pois")
         }
     }
     
diff --git a/SitumWayfinding/Classes/WayfindingLibrary/Protocols/OnNavigationListener.swift b/SitumWayfinding/Classes/WayfindingLibrary/Protocols/OnNavigationListener.swift
index bf1406c..59f89af 100644
--- a/SitumWayfinding/Classes/WayfindingLibrary/Protocols/OnNavigationListener.swift
+++ b/SitumWayfinding/Classes/WayfindingLibrary/Protocols/OnNavigationListener.swift
@@ -147,17 +147,17 @@ extension NavigationError: LocalizedError {
     public var errorDescription: String? {
         switch self {
         case .positionUnknown:
-            return "User actual location is unknown, please activate the positioning before computing a route and try again."
+            return NSLocalizedString("navigationError.positionUnknown", comment: "")
         case .outdoorOrigin:
-            return "User actual location is outdoor, navegation is only avaialble indoor."
+            return NSLocalizedString("navigationError.outdoorOrigin", comment: "")
         case .noDestinationSelected:
-            return "There is no destination currently selected, the navigation cannot be started. Please select a POI (or longpress to create a custom one) and try again."
+            return NSLocalizedString("navigationError.noDestinationSelected", comment: "")
         case .unableToComputeRoute:
-            return "An unexpected error was found while computing the route. Please try again."
+            return NSLocalizedString("navigationError.unableToComputeRoute", comment: "")
         case .noAvailableRoute:
-            return "There is no route between the selected locations. Try to compute a different route or to switch accessibility mode"
+            return NSLocalizedString("navigationError.noAvailableRoute", comment: "")
         case .outsideBuilding:
-            return "The user is not currently detected on the route and is out of the building. Please go back to resume navigation."
+            return NSLocalizedString("navigationError.outsideBuilding", comment: "")
         case .locationError(let error):
             return error?.localizedDescription
         }
diff --git a/SitumWayfinding/Classes/WayfindingLibrary/SitumMapsLibrary.swift b/SitumWayfinding/Classes/WayfindingLibrary/SitumMapsLibrary.swift
index b457e19..d717f7b 100644
--- a/SitumWayfinding/Classes/WayfindingLibrary/SitumMapsLibrary.swift
+++ b/SitumWayfinding/Classes/WayfindingLibrary/SitumMapsLibrary.swift
@@ -316,13 +316,17 @@ extension SitumMapsLibrary {
         if let credentials = credentials {
             CredentialsStrategy.checkCredentials(credentials: credentials)
         } else {
-            throw UnsupportedConfigurationError.missingCredentials(message: "You must set your auth info with setCredentials() before calling load(buildingWithId:)")
+            let message = NSLocalizedString("situmMapsLibrary.error.credentials",
+                comment: "Error when user does not set credentials")
+            throw UnsupportedConfigurationError.missingCredentials(message: message)
         }
     }
     
     internal func validateActiveBuilding(_ buildingId: String?) throws {
         if(buildingId == nil || buildingId!.isEmpty) {
-            throw UnsupportedConfigurationError.invalidActiveBuilding(message: "The building ID in plist file is not correct. Please add a valid ID with key: es.situm.sdk.ACTIVE_BUILDING_ID")
+            let message = NSLocalizedString("situmMapsLibrary.error.invalidBuilding",
+                comment: "Error when user does not set correctly building id")
+            throw UnsupportedConfigurationError.invalidActiveBuilding(message: message)
         }
     }
     
diff --git a/SitumWayfinding/Classes/WayfindingLibrary/WayfindingError.swift b/SitumWayfinding/Classes/WayfindingLibrary/WayfindingError.swift
index b265313..3eb6738 100644
--- a/SitumWayfinding/Classes/WayfindingLibrary/WayfindingError.swift
+++ b/SitumWayfinding/Classes/WayfindingLibrary/WayfindingError.swift
@@ -26,9 +26,9 @@ extension WayfindingError {
     public var errorDescription: String? {
         switch self {
         case .invalidPOI:
-            return "The poi selected is not valid in this building"
+            return NSLocalizedString("wayfindingError.invalidPoi", comment: "")
         case .unknown:
-            return "An unknown error happened"
+            return NSLocalizedString("wayfindingError.unknown", comment: "")
         }
     }
     /**
diff --git a/SitumWayfinding/Localizations/en.lproj/Localizable.strings b/SitumWayfinding/Localizations/en.lproj/Localizable.strings
new file mode 100644
index 0000000..c44a675
--- /dev/null
+++ b/SitumWayfinding/Localizations/en.lproj/Localizable.strings
@@ -0,0 +1,116 @@
+/* Alert message after an error retrieving a building happens */
+"alert.error.building.message" = "An unexpected error ocurred while downloading the building's information. Please try again.";
+
+/* Alert title after an error retrieving a building happens */
+"alert.error.building.title" = "Error obtaining building info";
+
+/* Alert title for generic errors  */
+"alert.error.title" = "Error";
+
+/* Message of alert when loading library */
+"alert.loading.message" = "Hold on for a moment";
+
+/* Title of alert when loading library */
+"alert.loading.title" = "Loading";
+
+/* Generic cancel action  */
+"cancel" = "Cancel";
+
+/* No comment provided by engineer. */
+"navigationError.noAvailableRoute" = "There is no route between the selected locations. Try to compute a different route or to switch accessibility mode";
+
+/* No comment provided by engineer. */
+"navigationError.noDestinationSelected" = "There is no destination currently selected, the navigation cannot be started. Please select a POI (or longpress to create a custom one) and try again.";
+
+/* No comment provided by engineer. */
+"navigationError.outdoorOrigin" = "User actual location is outdoor, navegation is only avaialble indoor.";
+
+/* No comment provided by engineer. */
+"navigationError.outsideBuilding" = "The user is not currently detected on the route and is out of the building. Please go back to resume navigation.";
+
+/* No comment provided by engineer. */
+"navigationError.positionUnknown" = "User actual location is unknown, please activate the positioning before computing a route and try again.";
+
+/* No comment provided by engineer. */
+"navigationError.unableToComputeRoute" = "An unexpected error was found while computing the route. Please try again.";
+
+/* Generic ok action */
+"ok" = "Ok";
+
+/* Button to go back when the user is in the positioning controller (where the map is shown) */
+"positioning.back" = "Back";
+
+/* No comment provided by engineer. */
+"positioning.calibrationNeeded.alert.message" = "Your device's compass isn't calibrated right now. Please recalibrate it to obtain the best navigation experience.";
+
+/* The user needs to calibrate the compass */
+"positioning.calibrationNeeded.alert.title" = "Compass calibration needed";
+
+/* Button to center map in current location of user */
+"positioning.center" = "Center";
+
+/* No comment provided by engineer. */
+"positioning.createMarker" = "Create marker";
+
+/* Shown to user when select a destination (destination is any free point that user selects on the map) */
+"positioning.customDestination" = "Custom destination";
+
+/* Alert message to show to the user when destination was reached */
+"positioning.destinationReached.alert.message" = "You've arrived to your destination";
+
+/* Alert title to show to the user when destination was reached */
+"positioning.destinationReached.alert.title" = "Destination Reached";
+
+/* Alert title error when download the floor plan fails */
+"positioning.error.emptyFloor.alert.message" = "An unexpected error ocurred while downloading the floorplan. Please try again.";
+
+/* Alert title error when download the floor plan fails */
+"positioning.error.emptyFloor.alert.title" = "Empty floorplan";
+
+/* Alert title error when the user does not select a destination */
+"positioning.error.noDestinationSelected.alert.title" = "No destination selected";
+
+/* Alert title error when the user is outdoor */
+"positioning.error.positionOutdoor.alert.title" = "Position outdoor";
+
+/* Alert title error when the user position is unknown */
+"positioning.error.positionUnknown.alert.title" = "Position unknown";
+
+/* Alert title error when WayFinding cannot compute route to destination */
+"positioning.error.unableToComputeRoute.alert.title" = "Unable to compute route";
+
+/* Alert message to show for a long press action */
+"positioning.longPressAction.alert.message" = "Select an action:";
+
+/* Alert title to show for a long press action */
+"positioning.longPressAction.alert.title" = "Long press actions";
+
+/* Show to the user distance to next point */
+"positioning.navigationProgress" = "%.1fm remaining";
+
+/* Used to show the user the number of beacons that library detects nearby */
+"positioning.numBeacons" = "%d beacons";
+
+/* Alert message to show user is outside of route */
+"positioning.outsideBuilding.alert.message" = "The user is currently outside of the building. Positioning will resume when the user returns.";
+
+/* Alert title to show user is outside of building */
+"positioning.outsideBuilding.alert.title" = "User outside building";
+
+/* Alert title to show user is outside of route */
+"positioning.outsideRoute.alert.title" = "User outside route";
+
+/* Placeholder for searching pois */
+"positioning.searchPois" = "Search Pois";
+
+/* Error when user does not set credentials */
+"situmMapsLibrary.error.credentials" = "You must set your auth info with setCredentials() before calling load(buildingWithId:)";
+
+/* Error when user does not set correctly building id */
+"situmMapsLibrary.error.invalidBuilding" = "The building ID in plist file is not correct. Please add a valid ID with key: es.situm.sdk.ACTIVE_BUILDING_ID";
+
+/* No comment provided by engineer. */
+"wayfindingError.invalidPoi" = "The poi selected is not valid in this building";
+
+/* No comment provided by engineer. */
+"wayfindingError.unknown" = "An unknown error happened";
diff --git a/SitumWayfinding/Localizations/es.lproj/Localizable.strings b/SitumWayfinding/Localizations/es.lproj/Localizable.strings
new file mode 100644
index 0000000..8671d59
--- /dev/null
+++ b/SitumWayfinding/Localizations/es.lproj/Localizable.strings
@@ -0,0 +1,116 @@
+/* Alert message after an error retrieving a building happens */
+"alert.error.building.message" = "Ha ocurrido un error en la descarga de la información del edificio. Por favor, vuelve a intentarlo";
+
+/* Alert title after an error retrieving a building happens */
+"alert.error.building.title" = "Error obteniendo la información del edificio";
+
+/* Alert title for generic errors  */
+"alert.error.title" = "Error";
+
+/* Message of alert when loading library */
+"alert.loading.message" = "Espera un momento";
+
+/* Title of alert when loading library */
+"alert.loading.title" = "Cargando";
+
+/* Generic cancel action  */
+"cancel" = "Cancelar";
+
+/* No comment provided by engineer. */
+"navigationError.noAvailableRoute" = "No existe una ruta entre las localizaciones seleccionadas. Intenta otra ruta o cambia al modo de accesibilidad";
+
+/* No comment provided by engineer. */
+"navigationError.noDestinationSelected" = "No hay ninguna localización seleccionada actualmente, la navegación no puede comenzar. Por favor, selecciona un POI (o realiza una pulsación larga para una localización personalizada) e inténtalo de nuevo,";
+
+/* No comment provided by engineer. */
+"navigationError.outdoorOrigin" = "La ubicación actual es en el exterior, la navegación solo está disponible en ubicaciones interiores";
+
+/* No comment provided by engineer. */
+"navigationError.outsideBuilding" = "El usuario no está actualmente en la ruta y está fuera el edificio. Por favor, vuelve a inicar la navegación";
+
+/* No comment provided by engineer. */
+"navigationError.positionUnknown" = "La localización actual es desconocida, por favor activa el posicionamiento antes de calcular la ruta y vuelve a intentarlo.";
+
+/* No comment provided by engineer. */
+"navigationError.unableToComputeRoute" = "Un error inesperado ha ocurrida mientras se calculaba la ruta. Por favor, vuelve a intentarlo.";
+
+/* Generic ok action */
+"ok" = "Ok";
+
+/* Button to go back when the user is in the positioning controller (where the map is shown) */
+"positioning.back" = "Atrás";
+
+/* No comment provided by engineer. */
+"positioning.calibrationNeeded.alert.message" = "La brújula de tu dispositivo no está calibrada. Por favor, vuelve a calibrarla para obtener la mejor experiencia de navegación.";
+
+/* The user needs to calibrate the compass */
+"positioning.calibrationNeeded.alert.title" = "Se necesita calibración de la brújula";
+
+/* Button to center map in current location of user */
+"positioning.center" = "Centrar";
+
+/* No comment provided by engineer. */
+"positioning.createMarker" = "Crear marcador";
+
+/* Shown to user when select a destination (destination is any free point that user selects on the map) */
+"positioning.customDestination" = "Destino personalizado";
+
+/* Alert message to show to the user when destination was reached */
+"positioning.destinationReached.alert.message" = "Has llegado a tu destino";
+
+/* Alert title to show to the user when destination was reached */
+"positioning.destinationReached.alert.title" = "Destino alcanzado";
+
+/* Alert title error when download the floor plan fails */
+"positioning.error.emptyFloor.alert.message" = "Ha ocurrido un error inesperado mientras se descargaba la información del piso. Por favor, vuelve a intentarlo.";
+
+/* Alert title error when download the floor plan fails */
+"positioning.error.emptyFloor.alert.title" = "Sin información del piso";
+
+/* Alert title error when the user does not select a destination */
+"positioning.error.noDestinationSelected.alert.title" = "No se ha seleccionado un destino";
+
+/* Alert title error when the user is outdoor */
+"positioning.error.positionOutdoor.alert.title" = "Posición en el exterior";
+
+/* Alert title error when the user position is unknown */
+"positioning.error.positionUnknown.alert.title" = "Posición desconocida";
+
+/* Alert title error when WayFinding cannot compute route to destination */
+"positioning.error.unableToComputeRoute.alert.title" = "No se ha podido calcular la ruta";
+
+/* Alert message to show for a long press action */
+"positioning.longPressAction.alert.message" = "Selecciona una acción:";
+
+/* Alert title to show for a long press action */
+"positioning.longPressAction.alert.title" = "Acción de pulsación larga";
+
+/* Show to the user distance to next point */
+"positioning.navigationProgress" = "%.1fm restantes";
+
+/* Used to show the user the number of beacons that library detecst nearby */
+"positioning.numBeacons" = "%d beacons";
+
+/* Alert message to show user is outside of route */
+"positioning.outsideBuilding.alert.message" = "El usuario está fuera del edificio. El posicionamiento se reestablecerá cuando el usuario regrese al edificio.";
+
+/* Alert title to show user is outside of building */
+"positioning.outsideBuilding.alert.title" = "Usuario fuera de edificio";
+
+/* Alert title to show user is outside of route */
+"positioning.outsideRoute.alert.title" = "Usuario fuera de ruta";
+
+/* Placeholder for searching pois */
+"positioning.searchPois" = "Buscar Pois";
+
+/* Error when user does not set credentials */
+"situmMapsLibrary.error.credentials" = "Necesitas establecer la información de autenticación con setCredentials() antes de llamar a load(buildingWithId:)";
+
+/* Error when user does not set credentials */
+"situmMapsLibrary.error.invalidBuilding" = "El identificador de edificio en el archivo plist no es correcto. Por favor, introduce un identificado válido con la clave: es.situm.sdk.ACTIVE_BUILDING_ID ";
+
+/* No comment provided by engineer. */
+"wayfindingError.invalidPoi" = "El poi seleccionado no es válido en este edificio";
+
+/* No comment provided by engineer. */
+"wayfindingError.unknown" = "Ha ocurrido un error inesperado";

From 7a0ba844e800985d045cc10463914b6339f602a0 Mon Sep 17 00:00:00 2001
From: Lapisoft <contact@lapisoft.es>
Date: Thu, 3 Mar 2022 07:58:44 +0100
Subject: [PATCH 02/26] Update changelog_unreleased with changes

---
 CHANGELOG_UNRELEASED.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG_UNRELEASED.md b/CHANGELOG_UNRELEASED.md
index 139597f..c1b97df 100644
--- a/CHANGELOG_UNRELEASED.md
+++ b/CHANGELOG_UNRELEASED.md
@@ -1,2 +1,4 @@
+## [0.3.0] 
 
-
+### Added
+* Added localization for spanish language in Wayfinding
\ No newline at end of file

From 7b3e49be06ba355afc591cec61e8fcb976aa3c05 Mon Sep 17 00:00:00 2001
From: Lapisoft <contact@lapisoft.es>
Date: Mon, 7 Mar 2022 13:11:55 +0100
Subject: [PATCH 03/26] Localize strings in custom bundle

* For consistency put strings where they are used instead at the init
of the class in PositioningPresenter.swift
* Revert changes of storyboard that do not modify anything
---
 .../SitumWayfinding.xcodeproj/project.pbxproj |  2 +
 SitumWayfinding.podspec                       |  6 ++-
 .../Assets/SitumWayfinding.storyboard         | 12 ++---
 .../Positioning/PositioningPresenter.swift    | 31 ++++++++-----
 .../PositioningViewController.swift           | 45 +++++++++++++++----
 .../Protocols/OnNavigationListener.swift      | 12 ++---
 .../WayfindingLibrary/SitumMapsLibrary.swift  | 12 +++++
 .../WayfindingLibrary/WayfindingError.swift   |  4 +-
 8 files changed, 89 insertions(+), 35 deletions(-)

diff --git a/Example/SitumWayfinding.xcodeproj/project.pbxproj b/Example/SitumWayfinding.xcodeproj/project.pbxproj
index a19069d..6f994b5 100644
--- a/Example/SitumWayfinding.xcodeproj/project.pbxproj
+++ b/Example/SitumWayfinding.xcodeproj/project.pbxproj
@@ -353,6 +353,7 @@
 				"${PODS_ROOT}/../../SitumWayfinding/Assets/Images/logo/swf_logo@2x.png",
 				"${PODS_ROOT}/../../SitumWayfinding/Assets/Images/logo/swf_logo@3x.png",
 				"${PODS_ROOT}/../../SitumWayfinding/Assets/Images/radius/swf_radius.png",
+				"${PODS_CONFIGURATION_BUILD_DIR}/SitumWayfinding/SitumWayfinding.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
@@ -379,6 +380,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/swf_logo@2x.png",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/swf_logo@3x.png",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/swf_radius.png",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SitumWayfinding.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
diff --git a/SitumWayfinding.podspec b/SitumWayfinding.podspec
index f3b88fa..acced4b 100644
--- a/SitumWayfinding.podspec
+++ b/SitumWayfinding.podspec
@@ -29,8 +29,12 @@ Pod::Spec.new do |s|
   s.resources = [
     'SitumWayfinding/Assets/*.storyboard',
     'SitumWayfinding/Assets/Images/**/*.png',
-    'SitumWayfinding/Localizations/**/*',
   ]
+  s.resource_bundles = {
+    'SitumWayfinding' => [
+        'SitumWayfinding/Localizations/**/*',
+    ]
+  }
   s.dependency 'GoogleMaps', '~> 4.2.0'
   s.dependency 'SitumSDK', '~> 2.52.0'
 
diff --git a/SitumWayfinding/Assets/SitumWayfinding.storyboard b/SitumWayfinding/Assets/SitumWayfinding.storyboard
index f2eb9e8..1a0aa68 100644
--- a/SitumWayfinding/Assets/SitumWayfinding.storyboard
+++ b/SitumWayfinding/Assets/SitumWayfinding.storyboard
@@ -305,27 +305,27 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SearchCell" id="8KY-KK-mXF" customClass="SearchTableViewCell" customModule="SitumWayfinding" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="44.5" width="375" height="50.5"/>
+                                <rect key="frame" x="0.0" y="44.5" width="375" height="50"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="8KY-KK-mXF" id="Z6g-Fm-MMK">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="50.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="oib-4P-aeh" userLabel="Icon">
-                                            <rect key="frame" x="10" y="10.5" width="30" height="30"/>
+                                            <rect key="frame" x="10" y="10" width="30" height="30"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="30" id="GUe-t4-7iC"/>
                                                 <constraint firstAttribute="width" constant="30" id="a45-7Y-oa3"/>
                                             </constraints>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YTV-B7-qbv" userLabel="Name">
-                                            <rect key="frame" x="55" y="5" width="315" height="21.5"/>
+                                            <rect key="frame" x="55" y="5" width="315" height="21"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Distance" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="29y-7F-mVo" userLabel="Distance">
-                                            <rect key="frame" x="299" y="18.5" width="70" height="14"/>
+                                            <rect key="frame" x="299" y="18" width="70" height="14"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="70" id="SN1-bF-8Wh"/>
                                             </constraints>
@@ -334,7 +334,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Floor" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5R0-pb-rb3" userLabel="Floor">
-                                            <rect key="frame" x="55" y="31.5" width="315" height="14"/>
+                                            <rect key="frame" x="55" y="31" width="315" height="14"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                             <color key="textColor" systemColor="systemGray4Color"/>
                                             <nil key="highlightedColor"/>
diff --git a/SitumWayfinding/Classes/Positioning/PositioningPresenter.swift b/SitumWayfinding/Classes/Positioning/PositioningPresenter.swift
index 91be2a5..3a2d9a8 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningPresenter.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningPresenter.swift
@@ -33,13 +33,6 @@ class PositioningPresenter: NSObject, SITLocationDelegate, SITDirectionsDelegate
     var locationManager: SITLocationManager = SITLocationManager.sharedInstance()
     
     var useRemoteConfig: Bool = false
-    
-    let compassCalibrationAlertTitle = NSLocalizedString("positioning.calibrationNeeded.alert.title",
-        comment: "The user needs to calibrate the compass")
-    let oobAlertTitle = NSLocalizedString("positioning.outsideBuilding.alert.title",
-        comment: "Alert title to show user is outside of building")
-    let outsideRouteAlertTitle = NSLocalizedString("positioning.outsideRoute.alert.title",
-        comment: "Alert title to show user is outside of route")
 
     init(view: PositioningView, buildingInfo: SITBuildingInfo, interceptorsManager: InterceptorsManager) {
         self.view = view
@@ -390,16 +383,26 @@ class PositioningPresenter: NSObject, SITLocationDelegate, SITDirectionsDelegate
             break;
         case .compassNeedsCalibration:
             stateName = "Compass needs calibration"
-            showAlertIfNeeded(type: .compassCalibrationNeeded, title: self.compassCalibrationAlertTitle,
-                message: NSLocalizedString("positioning.calibrationNeeded.alert.message", comment: ""))
+            let compassCalibrationAlertTitle = NSLocalizedString("positioning.calibrationNeeded.alert.title",
+                bundle: SitumMapsLibrary.bundle,
+                comment: "The user needs to calibrate the compass")
+            showAlertIfNeeded(type: .compassCalibrationNeeded, title: compassCalibrationAlertTitle,
+                message: NSLocalizedString("positioning.calibrationNeeded.alert.message",
+                    bundle: SitumMapsLibrary.bundle,
+                    comment: ""))
             break;
         case .userNotInBuilding:
             stateName = "User not in building"
             if isUserNavigating(){
                 view?.stopNavigation(status: .error(NavigationError.outsideBuilding))
             }
-            showAlertIfNeeded(type: .outOfBuilding, title: self.oobAlertTitle,
-                message: NSLocalizedString("positioning.outsideBuilding.alert.message", comment: "") )
+            let oobAlertTitle = NSLocalizedString("positioning.outsideBuilding.alert.title",
+                bundle: SitumMapsLibrary.bundle,
+                comment: "Alert title to show user is outside of building")
+            showAlertIfNeeded(type: .outOfBuilding, title: oobAlertTitle,
+                message: NSLocalizedString("positioning.outsideBuilding.alert.message",
+                    bundle: SitumMapsLibrary.bundle,
+                    comment: "") )
             break;
         }
         Logger.logDebugMessage("Location manager updates state: \(stateName)")
@@ -448,8 +451,12 @@ class PositioningPresenter: NSObject, SITLocationDelegate, SITDirectionsDelegate
         
         if isUserIndoor(){
             let message = NSLocalizedString("positioning.outsideBuilding.alert.message",
+                bundle: SitumMapsLibrary.bundle,
                 comment: "Alert message to show user is outside of route")
-            showAlertIfNeeded(type: .outsideRoute, title: self.outsideRouteAlertTitle, message: message)
+            let outsideRouteAlertTitle = NSLocalizedString("positioning.outsideRoute.alert.title",
+                bundle: SitumMapsLibrary.bundle,
+                comment: "Alert title to show user is outside of route")
+            showAlertIfNeeded(type: .outsideRoute, title: outsideRouteAlertTitle, message: message)
         }else{
             view?.stopNavigation(status: .error(NavigationError.outsideBuilding))
         }
diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index a3c10f0..0b14b29 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -101,14 +101,16 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         "90º",
         "180º",
         "270º",
-        NSLocalizedString("positioning.createMarker", comment: "")
+        NSLocalizedString("positioning.createMarker", bundle: SitumMapsLibrary.bundle, comment: "")
     ]
     
     override func viewDidLoad() {
         super.viewDidLoad()
         backButton.title = NSLocalizedString("positioning.back",
+            bundle: SitumMapsLibrary.bundle,
             comment: "Button to go back when the user is in the positioning controller (where the map is shown)")
         centerButton.setTitle(NSLocalizedString("positioning.center",
+            bundle: SitumMapsLibrary.bundle,
             comment: "Button to center map in current location of user"), for: .normal)
         initSearchController()
         definesPresentationContext = true
@@ -123,8 +125,12 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         positionDrawer = GoogleMapsPositionDrawer(mapView: mapView)
-        let loading = NSLocalizedString("alert.loading.title", comment: "Alert title when loading library")
-        let message = NSLocalizedString("alert.loading.message", comment: "Alert message when loading library")
+        let loading = NSLocalizedString("alert.loading.title",
+            bundle: SitumMapsLibrary.bundle,
+            comment: "Alert title when loading library")
+        let message = NSLocalizedString("alert.loading.message",
+            bundle: SitumMapsLibrary.bundle,
+            comment: "Alert message when loading library")
         let loadingAlert = UIAlertController(title: loading, message: message, preferredStyle: .actionSheet)
         self.present(loadingAlert, animated: true, completion: {
             if (self.loadFinished){
@@ -192,8 +198,10 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         loadingAlert.dismiss(animated: true) {
             if (self.loadingError){
                 let title = NSLocalizedString("alert.error.building.title",
+                    bundle: SitumMapsLibrary.bundle,
                     comment: "Alert title after an error retrieving a building happens")
                 let message = NSLocalizedString("alert.error.building.message",
+                    bundle: SitumMapsLibrary.bundle,
                     comment: "Alert message after an error retrieving a building happens")
                 self.showAlertMessage(title: title, message: message, alertType: .otherAlert)
             }
@@ -438,8 +446,10 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
             self.mapReadinessChecker.currentFloorMapLoaded()
         } else {
             let title = NSLocalizedString("positioning.error.emptyFloor.alert.title",
+                bundle: SitumMapsLibrary.bundle,
                 comment: "Alert title error when download the floor plan fails")
             let message = NSLocalizedString("positioning.error.emptyFloor.alert.message",
+                bundle: SitumMapsLibrary.bundle,
                 comment: "Alert title error when download the floor plan fails")
             let wasMapFetched = SITCommunicationManager.shared().fetchMap(from: orderedFloors(buildingInfo: buildingInfo)![selectedLevelIndex], withCompletion: { imageData in
                 
@@ -767,12 +777,17 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     
     func showFakeLocationsAlert() {
         let title = NSLocalizedString("positioning.longPressAction.alert.title",
+            bundle: SitumMapsLibrary.bundle,
             comment: "Alert title to show for a long press action")
         let message = NSLocalizedString("positioning.longPressAction.alert.message",
+            bundle: SitumMapsLibrary.bundle,
             comment: "Alert message to show for a long press action")
+        let cancel = NSLocalizedString("cancel",
+            bundle: SitumMapsLibrary.bundle,
+            comment: "Generic cancel action ")
+        
         let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
-
-        alert.addAction(UIAlertAction(title: NSLocalizedString("cancel", comment: "Generic cancel action "), style: .default, handler: { _ in
+        alert.addAction(UIAlertAction(title: cancel, style: .default, handler: { _ in
             self.presenter?.alertViewClosed(.otherAlert)
         }))
         for (buttonIndex, text) in fakeLocationsOptions.enumerated() {
@@ -888,6 +903,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
             self.numberBeaconsRangedView.isHidden = false
         }
         let format = NSLocalizedString("positioning.numBeacons",
+            bundle: SitumMapsLibrary.bundle,
             comment: "Used to show the user the number of beacons that library detects nearby")
         self.numberBeaconsRangedLabel.text = String(format: format, text)
     }
@@ -925,7 +941,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         
         let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
     
-        let title = NSLocalizedString("ok", comment: "Generic ok action")
+        let title = NSLocalizedString("ok", bundle: SitumMapsLibrary.bundle, comment: "Generic ok action")
         alert.addAction(UIAlertAction(title: title, style: .default, handler: { _ in
             self.presenter?.alertViewClosed(alertType)
         }))
@@ -947,6 +963,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         self.progress = progress;
         self.indicationsView.isHidden = false
         let localizedFormat = NSLocalizedString("positioning.navigationProgress",
+            bundle: SitumMapsLibrary.bundle,
             comment: "Show to the user distance to next point")
         let secondaryLabel = String(format: localizedFormat, progress.distanceToGoal)
         self.updateInfoBarLabels(mainLabel: self.destinationMarker?.gmsMarker.title ?? DEFAULT_POI_NAME,
@@ -985,6 +1002,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
             self.removeLastCustomMarkerIfOutsideRoute()
             self.lastCustomMarker = SitumMarker(from:  self.createMarker(withCoordinate: coordinate, floorId: floorId))
             let mainLabel = NSLocalizedString("positioning.customDestination",
+                bundle: SitumMapsLibrary.bundle,
                 comment: "Shown to user when select a destination (destination is any free point that user selects on the map)")
             self.updateInfoBarLabels(mainLabel: mainLabel, secondaryLabel: self.buildingInfo?.building.name ?? DEFAULT_BUILDING_NAME)
             self.changeNavigationButtonVisibility(isVisible: true)
@@ -1015,6 +1033,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     func createMarker(withCoordinate coordinate: CLLocationCoordinate2D, floorId floor: String) -> GMSMarker {
         let marker: GMSMarker = GMSMarker(position: coordinate)
         marker.title = NSLocalizedString("positioning.customDestination",
+            bundle: SitumMapsLibrary.bundle,
             comment: "Shown to user when select a destination (destination is any free point that user selects on the map)")
         marker.userData = floor
         marker.map = self.mapView
@@ -1148,31 +1167,39 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
                 switch error {
                 case .positionUnknown:
                     let title = NSLocalizedString("positioning.error.positionUnknown.alert.title",
+                        bundle: SitumMapsLibrary.bundle,
                         comment: "Alert title error when the user position is unknown")
                     self.showAlertMessage(title: title, message: error.localizedDescription, alertType: .otherAlert)
                 case .outdoorOrigin:
                     let title = NSLocalizedString("positioning.error.positionOutdoor.alert.title",
+                        bundle: SitumMapsLibrary.bundle,
                         comment: "Alert title error when the user is outdoor")
                     self.showAlertMessage(title: title, message: error.localizedDescription, alertType: .otherAlert)
                 case .noDestinationSelected:
                     let title = NSLocalizedString("positioning.error.noDestinationSelected.alert.title",
+                        bundle: SitumMapsLibrary.bundle,
                         comment: "Alert title error when the user does not select a destination")
                     self.showAlertMessage(title: title, message: error.localizedDescription, alertType: .otherAlert)
                 case .unableToComputeRoute, .noAvailableRoute, .outsideBuilding:
                     let title = NSLocalizedString("positioning.error.unableToComputeRoute.alert.title",
+                        bundle: SitumMapsLibrary.bundle,
                         comment: "Alert title error when WayFinding cannot compute route to destination")
                     self.showAlertMessage(title: title, message: error.localizedDescription, alertType: .otherAlert)
                 case .locationError(let error):
                     let errorMessage = error?.localizedDescription ?? WayfindingError.unknown.localizedDescription
-                    let title = NSLocalizedString("alert.error.title", comment: "Alert title for generic errors ")
+                    let title = NSLocalizedString("alert.error.title",
+                        bundle: SitumMapsLibrary.bundle,
+                        comment: "Alert title for generic errors ")
                     self.showAlertMessage(title: title, message: errorMessage, alertType: .otherAlert)
                 }
             }
         } else {
             if case .destinationReached = status {
                 let title = NSLocalizedString("positioning.destinationReached.alert.title",
+                    bundle: SitumMapsLibrary.bundle,
                     comment: "Alert title to show to the user when destination was reached")
                 let message = NSLocalizedString("positioning.destinationReached.alert.message",
+                    bundle: SitumMapsLibrary.bundle,
                     comment: "Alert message to show to the user when destination was reached")
                 self.showAlertMessage(title: title, message: message, alertType: .otherAlert)
             }
@@ -1264,7 +1291,9 @@ extension PositioningViewController: UISearchControllerDelegate, UISearchBarDele
         if let searchViewPlaceholder = library?.settings?.searchViewPlaceholder, searchViewPlaceholder.count > 0{
             return searchViewPlaceholder
         }else{
-            return NSLocalizedString("positioning.searchPois", comment: "Placeholder for searching pois")
+            return NSLocalizedString("positioning.searchPois",
+                bundle: SitumMapsLibrary.bundle,
+                comment: "Placeholder for searching pois")
         }
     }
     
diff --git a/SitumWayfinding/Classes/WayfindingLibrary/Protocols/OnNavigationListener.swift b/SitumWayfinding/Classes/WayfindingLibrary/Protocols/OnNavigationListener.swift
index 59f89af..4662cec 100644
--- a/SitumWayfinding/Classes/WayfindingLibrary/Protocols/OnNavigationListener.swift
+++ b/SitumWayfinding/Classes/WayfindingLibrary/Protocols/OnNavigationListener.swift
@@ -147,17 +147,17 @@ extension NavigationError: LocalizedError {
     public var errorDescription: String? {
         switch self {
         case .positionUnknown:
-            return NSLocalizedString("navigationError.positionUnknown", comment: "")
+            return NSLocalizedString("navigationError.positionUnknown", bundle: SitumMapsLibrary.bundle, comment: "")
         case .outdoorOrigin:
-            return NSLocalizedString("navigationError.outdoorOrigin", comment: "")
+            return NSLocalizedString("navigationError.outdoorOrigin", bundle: SitumMapsLibrary.bundle, comment: "")
         case .noDestinationSelected:
-            return NSLocalizedString("navigationError.noDestinationSelected", comment: "")
+            return NSLocalizedString("navigationError.noDestinationSelected", bundle: SitumMapsLibrary.bundle, comment: "")
         case .unableToComputeRoute:
-            return NSLocalizedString("navigationError.unableToComputeRoute", comment: "")
+            return NSLocalizedString("navigationError.unableToComputeRoute", bundle: SitumMapsLibrary.bundle, comment: "")
         case .noAvailableRoute:
-            return NSLocalizedString("navigationError.noAvailableRoute", comment: "")
+            return NSLocalizedString("navigationError.noAvailableRoute", bundle: SitumMapsLibrary.bundle, comment: "")
         case .outsideBuilding:
-            return NSLocalizedString("navigationError.outsideBuilding", comment: "")
+            return NSLocalizedString("navigationError.outsideBuilding", bundle: SitumMapsLibrary.bundle, comment: "")
         case .locationError(let error):
             return error?.localizedDescription
         }
diff --git a/SitumWayfinding/Classes/WayfindingLibrary/SitumMapsLibrary.swift b/SitumWayfinding/Classes/WayfindingLibrary/SitumMapsLibrary.swift
index d717f7b..b51dbda 100644
--- a/SitumWayfinding/Classes/WayfindingLibrary/SitumMapsLibrary.swift
+++ b/SitumWayfinding/Classes/WayfindingLibrary/SitumMapsLibrary.swift
@@ -21,6 +21,16 @@ import GoogleMaps
     internal let interceptorsManager: InterceptorsManager = InterceptorsManager()
     internal var onBackPressedCallback: ((Any) -> Void)?
     internal var delegatesNotifier = WayfindingDelegatesNotifier()
+    static internal var bundle: Bundle = {
+        let libraryBundle = Bundle(for: SitumMapsLibrary.self)
+        guard let resourceBundleURL = libraryBundle.url(forResource: "SitumWayfinding", withExtension: "bundle") else {
+            fatalError("SitumWayfinding.bundle not found!")
+        }
+        guard let resourceBundle = Bundle(url: resourceBundleURL) else {
+            fatalError("Cannot access MySDK.bundle!")
+        }
+        return resourceBundle
+    }()
     
     /// Credentials object used to authenticate the user before loading the wayfinding module
     // public private(set) var credentials: Credentials?
@@ -317,6 +327,7 @@ extension SitumMapsLibrary {
             CredentialsStrategy.checkCredentials(credentials: credentials)
         } else {
             let message = NSLocalizedString("situmMapsLibrary.error.credentials",
+                bundle: SitumMapsLibrary.bundle,
                 comment: "Error when user does not set credentials")
             throw UnsupportedConfigurationError.missingCredentials(message: message)
         }
@@ -325,6 +336,7 @@ extension SitumMapsLibrary {
     internal func validateActiveBuilding(_ buildingId: String?) throws {
         if(buildingId == nil || buildingId!.isEmpty) {
             let message = NSLocalizedString("situmMapsLibrary.error.invalidBuilding",
+                bundle: SitumMapsLibrary.bundle,
                 comment: "Error when user does not set correctly building id")
             throw UnsupportedConfigurationError.invalidActiveBuilding(message: message)
         }
diff --git a/SitumWayfinding/Classes/WayfindingLibrary/WayfindingError.swift b/SitumWayfinding/Classes/WayfindingLibrary/WayfindingError.swift
index 3eb6738..e21969a 100644
--- a/SitumWayfinding/Classes/WayfindingLibrary/WayfindingError.swift
+++ b/SitumWayfinding/Classes/WayfindingLibrary/WayfindingError.swift
@@ -26,9 +26,9 @@ extension WayfindingError {
     public var errorDescription: String? {
         switch self {
         case .invalidPOI:
-            return NSLocalizedString("wayfindingError.invalidPoi", comment: "")
+            return NSLocalizedString("wayfindingError.invalidPoi", bundle: SitumMapsLibrary.bundle, comment: "")
         case .unknown:
-            return NSLocalizedString("wayfindingError.unknown", comment: "")
+            return NSLocalizedString("wayfindingError.unknown", bundle: SitumMapsLibrary.bundle, comment: "")
         }
     }
     /**

From 2eaeb15c34bae171b878e448f4490d16ba01b923 Mon Sep 17 00:00:00 2001
From: Lapisoft <contact@lapisoft.es>
Date: Tue, 8 Mar 2022 11:00:40 +0100
Subject: [PATCH 04/26] Fix some localization strings

---
 .../Positioning/PositioningViewController.swift    |  4 ++--
 .../Localizations/en.lproj/Localizable.strings     | 14 +++++++-------
 .../Localizations/es.lproj/Localizable.strings     | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index 0b14b29..a265926 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -782,7 +782,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         let message = NSLocalizedString("positioning.longPressAction.alert.message",
             bundle: SitumMapsLibrary.bundle,
             comment: "Alert message to show for a long press action")
-        let cancel = NSLocalizedString("cancel",
+        let cancel = NSLocalizedString("generic.cancel",
             bundle: SitumMapsLibrary.bundle,
             comment: "Generic cancel action ")
         
@@ -941,7 +941,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         
         let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
     
-        let title = NSLocalizedString("ok", bundle: SitumMapsLibrary.bundle, comment: "Generic ok action")
+        let title = NSLocalizedString("generic.ok", bundle: SitumMapsLibrary.bundle, comment: "Generic ok action")
         alert.addAction(UIAlertAction(title: title, style: .default, handler: { _ in
             self.presenter?.alertViewClosed(alertType)
         }))
diff --git a/SitumWayfinding/Localizations/en.lproj/Localizable.strings b/SitumWayfinding/Localizations/en.lproj/Localizable.strings
index c44a675..fbc1b7f 100644
--- a/SitumWayfinding/Localizations/en.lproj/Localizable.strings
+++ b/SitumWayfinding/Localizations/en.lproj/Localizable.strings
@@ -14,7 +14,10 @@
 "alert.loading.title" = "Loading";
 
 /* Generic cancel action  */
-"cancel" = "Cancel";
+"generic.cancel" = "Cancel";
+
+/* Generic ok action */
+"generic.ok" = "Ok";
 
 /* No comment provided by engineer. */
 "navigationError.noAvailableRoute" = "There is no route between the selected locations. Try to compute a different route or to switch accessibility mode";
@@ -34,9 +37,6 @@
 /* No comment provided by engineer. */
 "navigationError.unableToComputeRoute" = "An unexpected error was found while computing the route. Please try again.";
 
-/* Generic ok action */
-"ok" = "Ok";
-
 /* Button to go back when the user is in the positioning controller (where the map is shown) */
 "positioning.back" = "Back";
 
@@ -71,10 +71,10 @@
 "positioning.error.noDestinationSelected.alert.title" = "No destination selected";
 
 /* Alert title error when the user is outdoor */
-"positioning.error.positionOutdoor.alert.title" = "Position outdoor";
+"positioning.error.positionOutdoor.alert.title" = "Outdoor position";
 
 /* Alert title error when the user position is unknown */
-"positioning.error.positionUnknown.alert.title" = "Position unknown";
+"positioning.error.positionUnknown.alert.title" = "Unknown position";
 
 /* Alert title error when WayFinding cannot compute route to destination */
 "positioning.error.unableToComputeRoute.alert.title" = "Unable to compute route";
@@ -107,7 +107,7 @@
 "situmMapsLibrary.error.credentials" = "You must set your auth info with setCredentials() before calling load(buildingWithId:)";
 
 /* Error when user does not set correctly building id */
-"situmMapsLibrary.error.invalidBuilding" = "The building ID in plist file is not correct. Please add a valid ID with key: es.situm.sdk.ACTIVE_BUILDING_ID";
+"situmMapsLibrary.error.invalidBuilding" = "The builidng ID is not correct. Please add a valid building ID in LibrarySettings";
 
 /* No comment provided by engineer. */
 "wayfindingError.invalidPoi" = "The poi selected is not valid in this building";
diff --git a/SitumWayfinding/Localizations/es.lproj/Localizable.strings b/SitumWayfinding/Localizations/es.lproj/Localizable.strings
index 8671d59..6731b3e 100644
--- a/SitumWayfinding/Localizations/es.lproj/Localizable.strings
+++ b/SitumWayfinding/Localizations/es.lproj/Localizable.strings
@@ -14,7 +14,10 @@
 "alert.loading.title" = "Cargando";
 
 /* Generic cancel action  */
-"cancel" = "Cancelar";
+"generic.cancel" = "Cancelar";
+
+/* Generic ok action */
+"generic.ok" = "Ok";
 
 /* No comment provided by engineer. */
 "navigationError.noAvailableRoute" = "No existe una ruta entre las localizaciones seleccionadas. Intenta otra ruta o cambia al modo de accesibilidad";
@@ -32,10 +35,7 @@
 "navigationError.positionUnknown" = "La localización actual es desconocida, por favor activa el posicionamiento antes de calcular la ruta y vuelve a intentarlo.";
 
 /* No comment provided by engineer. */
-"navigationError.unableToComputeRoute" = "Un error inesperado ha ocurrida mientras se calculaba la ruta. Por favor, vuelve a intentarlo.";
-
-/* Generic ok action */
-"ok" = "Ok";
+"navigationError.unableToComputeRoute" = "Un error inesperado ha ocurrido mientras se calculaba la ruta. Por favor, vuelve a intentarlo.";
 
 /* Button to go back when the user is in the positioning controller (where the map is shown) */
 "positioning.back" = "Atrás";
@@ -107,7 +107,7 @@
 "situmMapsLibrary.error.credentials" = "Necesitas establecer la información de autenticación con setCredentials() antes de llamar a load(buildingWithId:)";
 
 /* Error when user does not set credentials */
-"situmMapsLibrary.error.invalidBuilding" = "El identificador de edificio en el archivo plist no es correcto. Por favor, introduce un identificado válido con la clave: es.situm.sdk.ACTIVE_BUILDING_ID ";
+"situmMapsLibrary.error.invalidBuilding" = "El identificador del edificio no es correcto. Por favor, introduce un identificador correcto en LibrarySettings";
 
 /* No comment provided by engineer. */
 "wayfindingError.invalidPoi" = "El poi seleccionado no es válido en este edificio";

From 388356733b3d5ed01c3cc4ef9dc9aac9fc28f076 Mon Sep 17 00:00:00 2001
From: Lapisoft <contact@lapisoft.es>
Date: Tue, 8 Mar 2022 13:28:45 +0100
Subject: [PATCH 05/26] Add barty crouch file configuration

---
 .bartycrouch.toml | 25 +++++++++++++++++++++++++
 DEVELOPMENT.md    | 28 ++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 .bartycrouch.toml
 create mode 100644 DEVELOPMENT.md

diff --git a/.bartycrouch.toml b/.bartycrouch.toml
new file mode 100644
index 0000000..482fa23
--- /dev/null
+++ b/.bartycrouch.toml
@@ -0,0 +1,25 @@
+[update]
+tasks = ["code", "normalize"]
+
+[update.code]
+codePaths = ["SitumWayfinding/"]
+subpathsToIgnore = [".git", "carthage", "pods", "build", ".build", "docs"]
+localizablePaths = ["SitumWayfinding/"]
+defaultToKeys = false
+additive = true
+unstripped = false
+plistArguments = true
+ignoreKeys = ["#bartycrouch-ignore!", "#bc-ignore!", "#i!"]
+
+[update.normalize]
+paths = ["SitumWayfinding/"]
+subpathsToIgnore = [".git", "carthage", "pods", "build", ".build", "docs"]
+sourceLocale = "en"
+harmonizeWithSource = true
+sortByKeys = true
+
+[lint]
+paths = ["SitumWayfinding/"]
+subpathsToIgnore = [".git", "carthage", "pods", "build", ".build", "docs"]
+duplicateKeys = true
+emptyValues = true
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
new file mode 100644
index 0000000..4bd2dfd
--- /dev/null
+++ b/DEVELOPMENT.md
@@ -0,0 +1,28 @@
+# SitumWayfinding develompent
+
+## Localization treatment
+To make localization easy [BartyCrouch](https://github.com/Flinesoft/BartyCrouch) is used. You need to install it first
+before use https://github.com/Flinesoft/BartyCrouch#installation. There is a file `.bartycrouch.toml` in the root 
+directory of the project with configuration for this library. It is configured to only localize files under 
+`SitumWayfinding/` folder. (If we need to change this in the future the documentation about this file is in 
+https://github.com/Flinesoft/BartyCrouch#configuration)
+
+Cheatsheet:
+```bash
+bartycrouhc update # search for all NSLocalizedString in project and update Localizable.strings accordingly
+bartycrouch lint # check the content of Localizable.strings for empty values and duplicates
+```
+
+A useful script to set in `.git/hooks/pre-commit` is the following:
+```bash
+#!/bin/sh
+/usr/local/bin/bartycrouch update
+/usr/local/bin/bartycrouch lint -w # -w fails on warning to avoid commit 
+```
+
+## Documentation
+The documentation is made with [jazzy](https://github.com/realm/jazzy). In order to build documentation execute
+the following from the root of the project:
+```bash
+./scripts/generate_appledoc.sh
+```
\ No newline at end of file

From eeccb2ab4bfdeb042f54927ed4ce0ed375a2acf7 Mon Sep 17 00:00:00 2001
From: Lapisoft <contact@lapisoft.es>
Date: Tue, 8 Mar 2022 13:45:14 +0100
Subject: [PATCH 06/26] Fix typo in Develompent documentation

---
 DEVELOPMENT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 4bd2dfd..9195152 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -9,7 +9,7 @@ https://github.com/Flinesoft/BartyCrouch#configuration)
 
 Cheatsheet:
 ```bash
-bartycrouhc update # search for all NSLocalizedString in project and update Localizable.strings accordingly
+bartycrouch update # search for all NSLocalizedString in project and update Localizable.strings accordingly
 bartycrouch lint # check the content of Localizable.strings for empty values and duplicates
 ```
 

From 2e3bd704f778d3237eb71d7005d5137813e37e43 Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Wed, 9 Mar 2022 13:25:52 +0100
Subject: [PATCH 07/26] Method allows that the name of each POIs is shown on
 the map above the POI icon

---
 .../PositioningViewController.swift           |  29 ++++-
 SitumWayfinding/Classes/UI/ColorHex.swift     |  29 +++++
 .../Classes/UI/CustomMarkerView.swift         | 102 ++++++++++++++++++
 .../WayfindingLibrary/LibrarySettings.swift   |  12 +++
 4 files changed, 169 insertions(+), 3 deletions(-)
 create mode 100644 SitumWayfinding/Classes/UI/ColorHex.swift
 create mode 100644 SitumWayfinding/Classes/UI/CustomMarkerView.swift

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index a3b67a6..6f6d667 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -971,13 +971,36 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         let poiMarker = GMSMarker(position: coordinate)
         poiMarker.title = poi.name
         poiMarker.userData = poi
-        iconsStore.obtainIconFor(category: poi.category) { icon in
-            poiMarker.icon=icon
-            poiMarker.map=self.mapView
+        iconsStore.obtainIconFor(category: poi.category) { item in
+            if let icon = item {
+                let customMarker = CustomMarkerView(markerImage: icon)
+                
+                if self.showTextPois() {
+                    customMarker.titlePoi(
+                        title: poi.name.uppercased(),
+                        size: 12.0,
+                        color: UIColor(hex: "#5b5b5bff") ?? UIColor.gray,
+                        weight: .medium
+                    )
+                }
+                poiMarker.icon = customMarker.getIcon()
+            }
+            
+            poiMarker.map = self.mapView
         }
         return poiMarker
     }
     
+    func showTextPois() -> Bool {
+        if let settings = self.library?.settings {
+            if let showText = settings.showTextPois {
+                return showText
+            }
+        }
+        
+        return false
+    }
+    
     func createMarker(withCoordinate coordinate: CLLocationCoordinate2D, floorId floor: String) -> GMSMarker {
         let marker: GMSMarker = GMSMarker(position: coordinate)
         marker.title = "Custom destination"
diff --git a/SitumWayfinding/Classes/UI/ColorHex.swift b/SitumWayfinding/Classes/UI/ColorHex.swift
new file mode 100644
index 0000000..54edb3f
--- /dev/null
+++ b/SitumWayfinding/Classes/UI/ColorHex.swift
@@ -0,0 +1,29 @@
+import Foundation
+
+extension UIColor {
+    public convenience init?(hex: String) {
+        let r, g, b, a: CGFloat
+
+        if hex.hasPrefix("#") {
+            let start = hex.index(hex.startIndex, offsetBy: 1)
+            let hexColor = String(hex[start...])
+
+            if hexColor.count == 8 {
+                let scanner = Scanner(string: hexColor)
+                var hexNumber: UInt64 = 0
+
+                if scanner.scanHexInt64(&hexNumber) {
+                    r = CGFloat((hexNumber & 0xff000000) >> 24) / 255
+                    g = CGFloat((hexNumber & 0x00ff0000) >> 16) / 255
+                    b = CGFloat((hexNumber & 0x0000ff00) >> 8) / 255
+                    a = CGFloat(hexNumber & 0x000000ff) / 255
+
+                    self.init(red: r, green: g, blue: b, alpha: a)
+                    return
+                }
+            }
+        }
+
+        return nil
+    }
+}
diff --git a/SitumWayfinding/Classes/UI/CustomMarkerView.swift b/SitumWayfinding/Classes/UI/CustomMarkerView.swift
new file mode 100644
index 0000000..76bf7f0
--- /dev/null
+++ b/SitumWayfinding/Classes/UI/CustomMarkerView.swift
@@ -0,0 +1,102 @@
+import Foundation
+
+class CustomMarkerView {
+    private let subView = UIView()
+    private let mainView = UIView()
+    private let markerImgView = UIImageView()
+    
+    private var markerImage: UIImage
+    private var padding: CGFloat = 8.0
+    private var titleLabel: UILabel?
+    private var displayFont = false
+    
+    init(markerImage: UIImage) {
+        self.markerImage = markerImage
+    }
+    
+    private func getLabel(font: UIFont, color: UIColor, title: String) -> UILabel {
+        let sizeFrame = CGRect(x: 4.0, y: 4.0, width: 150.0, height: font.lineHeight)
+        let titleLabel : UILabel = UILabel(frame: sizeFrame)
+        
+        let textFontAttributes: [NSAttributedString.Key : Any]  = [
+            NSAttributedString.Key.font : font,
+            NSAttributedString.Key.foregroundColor: color,
+            NSAttributedString.Key.strokeColor: UIColor.white,
+            NSAttributedString.Key.strokeWidth: -2
+        ]
+        
+        let mutableString = NSMutableAttributedString(string: title, attributes: textFontAttributes)
+        
+        titleLabel.lineBreakMode = .byWordWrapping
+        titleLabel.textAlignment = .center
+        titleLabel.attributedText = mutableString
+        titleLabel.numberOfLines = 0
+        titleLabel.sizeToFit()
+        titleLabel.backgroundColor = UIColor.clear
+        
+        let noLines = titleLabel.frame.size.height / font.lineHeight
+
+        if noLines > 2 {
+            titleLabel.numberOfLines = 2
+        }
+        
+        titleLabel.frame = CGRect(
+            x: 4.0,
+            y: 4.0,
+            width: titleLabel.frame.width,
+            height: (noLines > 2) ? 2 * font.lineHeight : 24.0
+        )
+        
+        return titleLabel
+    }
+    
+    func titlePoi(title: String, size: CGFloat, color: UIColor, weight: UIFont.Weight) {
+        self.displayFont = true
+        
+        let font = UIFont.systemFont(ofSize: size, weight: weight)
+        
+        let titleLabel = self.getLabel(font: font, color: color, title: title)
+        
+        self.subView.addSubview(titleLabel)
+        self.subView.frame = CGRect(
+            x: 0.0,
+            y: 0.0,
+            width: 2 * 4.0 + titleLabel.frame.width,
+            height: 2 * 4.0 + titleLabel.frame.height
+        )
+        self.subView.backgroundColor = UIColor.clear
+    }
+    
+    func getIcon() -> UIImage {
+        markerImgView.frame = CGRect(
+            x: subView.center.x - self.markerImage.size.width / 2,
+            y: subView.frame.height,
+            width: self.markerImage.size.width,
+            height: self.markerImage.size.height
+        )
+        markerImgView.image = self.markerImage
+        markerImgView.contentMode = .scaleAspectFit
+
+        mainView.addSubview(markerImgView)
+
+        mainView.frame = CGRect(
+            x: 0.0,
+            y: 0.0,
+            width: subView.frame.width,
+            height: subView.frame.height + 4.0 + markerImgView.frame.height
+        )
+        mainView.addSubview(subView)
+        mainView.backgroundColor = UIColor.clear
+        
+        UIGraphicsBeginImageContextWithOptions(mainView.bounds.size, false, UIScreen.main.scale)
+        
+        if displayFont {
+            mainView.layer.render(in: UIGraphicsGetCurrentContext()!)
+            let icon : UIImage = UIGraphicsGetImageFromCurrentImageContext()!
+            UIGraphicsEndImageContext()
+            return icon
+        } else {
+            return markerImage
+        }
+    }
+}
diff --git a/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift b/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift
index 4b0fe2f..8c7e180 100644
--- a/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift
+++ b/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift
@@ -32,6 +32,9 @@ import GoogleMaps
     /// Boolean to configure if location system should use the remote configuration (true) or not (false). See https://situm.com/docs/07-remote-configuration/ to learn more on how to use this functionality.
     private (set) var useRemoteConfig: Bool = false
     
+    /// Boolen configure if show name POI above it
+    private (set) var showTextPois: Bool? = true
+    
     // private(set) var orgDetails: OrganizationTheme?
     private override init() {
 
@@ -101,6 +104,13 @@ import GoogleMaps
             instance.useRemoteConfig = useRemoteConfig
             return self
         }
+        
+        /// Establish if show name of POI above it
+        @discardableResult
+        @objc public func setShowTextPois(showTextPois: Bool) -> Builder {
+            instance.showTextPois = showTextPois
+            return self
+        }
 
         /// Returns an instance of LibrarySettings
         @objc public func build() -> LibrarySettings {
@@ -140,6 +150,8 @@ import GoogleMaps
                 builderCopy.setUseRemoteConfig(useRemoteConfig: settings.useRemoteConfig)
             }
 
+            builderCopy.setShowTextPois(showTextPois: settings.showTextPois ?? false)
+
             return builderCopy
         }
     }

From a8b3fffe5b90c18831cfda86eded59168eda41bc Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Thu, 10 Mar 2022 10:29:33 +0100
Subject: [PATCH 08/26] Delete function hex to UIColor and delete public init
 extension class UIColor in ColorHex

---
 .../PositioningViewController.swift           | 27 ++-----------------
 SitumWayfinding/Classes/UI/ColorHex.swift     |  2 +-
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index 6f6d667..0458ad7 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -1191,36 +1191,13 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         if let settings = library?.settings {
             if settings.useDashboardTheme == true {
                 if let organizationTheme = organizationTheme { // Check if string is a valid string
-                    color = organizationTheme.themeColors.primary.isEmpty ? defaultColor : self.hexStringToUIColor(hex: organizationTheme.themeColors.primary)
+                    let generalColor = UIColor(hex: organizationTheme.themeColors.primary) ?? UIColor.gray
+                    color = organizationTheme.themeColors.primary.isEmpty ? defaultColor : generalColor
                 }
             }
         }
         return color
     }
-
-    // Extension hex color to rgb
-    func hexStringToUIColor (hex:String) -> UIColor {
-        var cString:String = hex.trimmingCharacters(in: .whitespacesAndNewlines).uppercased()
-
-        if (cString.hasPrefix("#")) {
-            cString.remove(at: cString.startIndex)
-        }
-
-        if ((cString.count) != 6) {
-            return UIColor.gray
-        }
-
-        var rgbValue:UInt64 = 0
-        Scanner(string: cString).scanHexInt64(&rgbValue)
-
-        return UIColor(
-            red: CGFloat((rgbValue & 0xFF0000) >> 16) / 255.0,
-            green: CGFloat((rgbValue & 0x00FF00) >> 8) / 255.0,
-            blue: CGFloat(rgbValue & 0x0000FF) / 255.0,
-            alpha: CGFloat(1.0)
-        )
-    }
-
 }
 
 extension PositioningViewController: UISearchControllerDelegate, UISearchBarDelegate{
diff --git a/SitumWayfinding/Classes/UI/ColorHex.swift b/SitumWayfinding/Classes/UI/ColorHex.swift
index 54edb3f..feed105 100644
--- a/SitumWayfinding/Classes/UI/ColorHex.swift
+++ b/SitumWayfinding/Classes/UI/ColorHex.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension UIColor {
-    public convenience init?(hex: String) {
+    convenience init?(hex: String) {
         let r, g, b, a: CGFloat
 
         if hex.hasPrefix("#") {

From 0a2c677bed993b413c4152aa600a44917eee3783 Mon Sep 17 00:00:00 2001
From: Lapisoft <contact@lapisoft.es>
Date: Thu, 10 Mar 2022 12:28:07 +0100
Subject: [PATCH 09/26] Enable localization for example app

---
 DEVELOPMENT.md                                |  4 ++++
 .../SitumWayfinding.xcodeproj/project.pbxproj |  3 +++
 Example/SitumWayfinding/es.lproj/Main.strings | 21 +++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 Example/SitumWayfinding/es.lproj/Main.strings

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 9195152..c82ee11 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -20,6 +20,10 @@ A useful script to set in `.git/hooks/pre-commit` is the following:
 /usr/local/bin/bartycrouch lint -w # -w fails on warning to avoid commit 
 ```
 
+In order to see the localizations of the module WayFinding in the app, you must configure localization for the languages
+that you need to support. To do that in your app go to Project (click on root folder in project navigator) 
+-> Info -> Localizations, and click in the `+` icon to add the language you want to support.
+
 ## Documentation
 The documentation is made with [jazzy](https://github.com/realm/jazzy). In order to build documentation execute
 the following from the root of the project:
diff --git a/Example/SitumWayfinding.xcodeproj/project.pbxproj b/Example/SitumWayfinding.xcodeproj/project.pbxproj
index 6f994b5..5f6078e 100644
--- a/Example/SitumWayfinding.xcodeproj/project.pbxproj
+++ b/Example/SitumWayfinding.xcodeproj/project.pbxproj
@@ -57,6 +57,7 @@
 		87DA24DF57187B9EDCD8A06B /* Pods-SitumWayfinding_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SitumWayfinding_Example.debug.xcconfig"; path = "Target Support Files/Pods-SitumWayfinding_Example/Pods-SitumWayfinding_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		8B54116471FA3975AF6EC8F1 /* Pods_SitumWayfinding_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SitumWayfinding_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9ED9CFBA6AF02E01E1C341BF /* Pods-SitumWayfinding_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SitumWayfinding_Example.release.xcconfig"; path = "Target Support Files/Pods-SitumWayfinding_Example/Pods-SitumWayfinding_Example.release.xcconfig"; sourceTree = "<group>"; };
+		D7EC26F127DA18A200ABD5A7 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Main.strings; sourceTree = "<group>"; };
 		DEA375CE0ED3393820EC8160 /* SitumWayfinding.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = SitumWayfinding.podspec; path = ../SitumWayfinding.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 /* End PBXFileReference section */
 
@@ -249,6 +250,7 @@
 				English,
 				en,
 				Base,
+				es,
 			);
 			mainGroup = 607FACC71AFB9204008FA782;
 			productRefGroup = 607FACD11AFB9204008FA782 /* Products */;
@@ -423,6 +425,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				607FACDA1AFB9204008FA782 /* Base */,
+				D7EC26F127DA18A200ABD5A7 /* es */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
diff --git a/Example/SitumWayfinding/es.lproj/Main.strings b/Example/SitumWayfinding/es.lproj/Main.strings
new file mode 100644
index 0000000..04d6480
--- /dev/null
+++ b/Example/SitumWayfinding/es.lproj/Main.strings
@@ -0,0 +1,21 @@
+
+/* Class = "UILabel"; text = "Use remote configuratioon"; ObjectID = "8Dl-6u-dKQ"; */
+"8Dl-6u-dKQ.text" = "Use remote configuratioon";
+
+/* Class = "UILabel"; text = "Wayfinding Example"; ObjectID = "LYZ-5T-B5U"; */
+"LYZ-5T-B5U.text" = "Wayfinding Example";
+
+/* Class = "UILabel"; text = "List of available POIs"; ObjectID = "TUz-42-YwY"; */
+"TUz-42-YwY.text" = "List of available POIs";
+
+/* Class = "UIButton"; normalTitle = "Load Wayfinding and navigate to coordinate"; ObjectID = "Z1c-hI-Wjv"; */
+"Z1c-hI-Wjv.normalTitle" = "Load Wayfinding and navigate to coordinate";
+
+/* Class = "UIButton"; normalTitle = "Load Wayfinding and navigate to POI"; ObjectID = "ey9-zA-wx2"; */
+"ey9-zA-wx2.normalTitle" = "Load Wayfinding and navigate to POI";
+
+/* Class = "UIButton"; normalTitle = "Load Wayfinding"; ObjectID = "kYz-PR-o25"; */
+"kYz-PR-o25.normalTitle" = "Load Wayfinding";
+
+/* Class = "UIButton"; normalTitle = "Load Wayfinding and select POI"; ObjectID = "xXD-lc-Tl4"; */
+"xXD-lc-Tl4.normalTitle" = "Load Wayfinding and select POI";

From b7022be1973177e431a488c16a63c6b221ec591a Mon Sep 17 00:00:00 2001
From: lapisoft <97731230+lapisoft@users.noreply.github.com>
Date: Thu, 10 Mar 2022 12:59:57 +0100
Subject: [PATCH 10/26] Update Develompent.md file with better structure

---
 DEVELOPMENT.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index c82ee11..cb73e82 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -1,5 +1,10 @@
 # SitumWayfinding develompent
 
+## Enable localizations in apps 
+In order to see the localizations of the module WayFinding in the app, you must configure localization for the languages
+that you need to support. To do that in your app go to Project (click on root folder in project navigator) 
+-> Info -> Localizations, and click in the `+` icon to add the language you want to support.
+
 ## Localization treatment
 To make localization easy [BartyCrouch](https://github.com/Flinesoft/BartyCrouch) is used. You need to install it first
 before use https://github.com/Flinesoft/BartyCrouch#installation. There is a file `.bartycrouch.toml` in the root 
@@ -20,13 +25,9 @@ A useful script to set in `.git/hooks/pre-commit` is the following:
 /usr/local/bin/bartycrouch lint -w # -w fails on warning to avoid commit 
 ```
 
-In order to see the localizations of the module WayFinding in the app, you must configure localization for the languages
-that you need to support. To do that in your app go to Project (click on root folder in project navigator) 
--> Info -> Localizations, and click in the `+` icon to add the language you want to support.
-
 ## Documentation
 The documentation is made with [jazzy](https://github.com/realm/jazzy). In order to build documentation execute
 the following from the root of the project:
 ```bash
 ./scripts/generate_appledoc.sh
-```
\ No newline at end of file
+```

From 76099bef9f00e0ee6d574f1991321e7bc24363a3 Mon Sep 17 00:00:00 2001
From: Lapisoft <contact@lapisoft.es>
Date: Fri, 11 Mar 2022 09:17:45 +0100
Subject: [PATCH 11/26] Add missing localizable strings

* Improve documentation about how to translate strings in library
using the bundle
---
 DEVELOPMENT.md                                |  4 ++++
 .../SearchResultsTableViewController.swift    | 19 ++++++++++++++-----
 .../en.lproj/Localizable.strings              |  9 +++++++++
 .../es.lproj/Localizable.strings              |  9 +++++++++
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index cb73e82..7f38e4e 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -6,6 +6,10 @@ that you need to support. To do that in your app go to Project (click on root fo
 -> Info -> Localizations, and click in the `+` icon to add the language you want to support.
 
 ## Localization treatment
+A bundle is used to store string localization files of SitumWayfinding library. Because of this when you translate a
+string in the library you must make reference to library bundle.  
+Use `NSLocalizedString("key", bundle: SitumMapsLibrary.bundle, comment: "")` to reference library bundle.
+
 To make localization easy [BartyCrouch](https://github.com/Flinesoft/BartyCrouch) is used. You need to install it first
 before use https://github.com/Flinesoft/BartyCrouch#installation. There is a file `.bartycrouch.toml` in the root 
 directory of the project with configuration for this library. It is configured to only localize files under 
diff --git a/SitumWayfinding/Classes/Positioning/Search/SearchResultsTableViewController.swift b/SitumWayfinding/Classes/Positioning/Search/SearchResultsTableViewController.swift
index ff006f4..9f51f52 100644
--- a/SitumWayfinding/Classes/Positioning/Search/SearchResultsTableViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/Search/SearchResultsTableViewController.swift
@@ -12,6 +12,7 @@ protocol SearcheableItem {
     var name: String { get }
     //TODO make it more generic
     func floor(activeBuildingInfo: SITBuildingInfo?) -> String
+    func distance() -> String
     func obtainIconImage(iconsStore:IconsStore?, completion:@escaping(UIImage?) -> Void)
 }
 
@@ -22,8 +23,17 @@ extension SITPOI: SearcheableItem {
     }
 
     func floor(activeBuildingInfo: SITBuildingInfo?) -> String {
-        let floor = activeBuildingInfo?.floors.first(where: { $0.identifier ==  self.position().floorIdentifier })
-        return floor?.floor != nil ? "Floor \(floor!.floor)" : ""
+        guard let floor = activeBuildingInfo?.floors.first(where: { $0.identifier ==  self.position().floorIdentifier }) else {
+            return ""
+        }
+        return "\(NSLocalizedString("search.floor", bundle: SitumMapsLibrary.bundle, comment: "")) \(floor.floor)"
+    }
+    
+    func distance() -> String {
+        // TODO en proxima tarea se debe calcular este valor
+        // localized string to use in the future for distance
+        let _ = NSLocalizedString("search.distance", bundle: SitumMapsLibrary.bundle, comment: "")
+        return ""
     }
 
     //TODO migrate to await-async
@@ -44,7 +54,6 @@ class SearchResultsTableViewController: UITableViewController {
     var activeBuildingInfo : SITBuildingInfo?
     var filteredPois: [SearcheableItem] = []
     var iconsStore : IconsStore?
-    let noResultsFoundText = "No se ha encontrado ningún resultado."
     
     private var myTableView: UITableView!
 
@@ -74,7 +83,7 @@ class SearchResultsTableViewController: UITableViewController {
 
         let searchableItem = filteredPois[indexPath.row]
         cell.name = searchableItem.name
-        cell.distance = "" //TODO en proxima tarea se debe calcular este valor
+        cell.distance = searchableItem.distance()
         cell.floor = searchableItem.floor(activeBuildingInfo: activeBuildingInfo)
         searchableItem.obtainIconImage(iconsStore: iconsStore) { image in
             cell.icon=image
@@ -100,7 +109,7 @@ class SearchResultsTableViewController: UITableViewController {
     //MARK : UI customization methods
     func arrangeForNoResultsFound(the tableView: UITableView){
         let noDataLabel = UITextField(frame: CGRect(x: 0, y: 0, width: tableView.bounds.size.width, height: tableView.bounds.size.width))
-        noDataLabel.text          = noResultsFoundText
+        noDataLabel.text          = NSLocalizedString("search.noResultFound", bundle: SitumMapsLibrary.bundle, comment: "")
         noDataLabel.textAlignment = .center
         tableView.backgroundView  = noDataLabel
         tableView.backgroundColor = UIColor.white
diff --git a/SitumWayfinding/Localizations/en.lproj/Localizable.strings b/SitumWayfinding/Localizations/en.lproj/Localizable.strings
index fbc1b7f..52de2d3 100644
--- a/SitumWayfinding/Localizations/en.lproj/Localizable.strings
+++ b/SitumWayfinding/Localizations/en.lproj/Localizable.strings
@@ -103,6 +103,15 @@
 /* Placeholder for searching pois */
 "positioning.searchPois" = "Search Pois";
 
+/* No comment provided by engineer. */
+"search.distance" = "Distance";
+
+/* No comment provided by engineer. */
+"search.floor" = "Floor";
+
+/* No comment provided by engineer. */
+"search.noResultFound" = "No results were found";
+
 /* Error when user does not set credentials */
 "situmMapsLibrary.error.credentials" = "You must set your auth info with setCredentials() before calling load(buildingWithId:)";
 
diff --git a/SitumWayfinding/Localizations/es.lproj/Localizable.strings b/SitumWayfinding/Localizations/es.lproj/Localizable.strings
index 6731b3e..3e4f129 100644
--- a/SitumWayfinding/Localizations/es.lproj/Localizable.strings
+++ b/SitumWayfinding/Localizations/es.lproj/Localizable.strings
@@ -103,6 +103,15 @@
 /* Placeholder for searching pois */
 "positioning.searchPois" = "Buscar Pois";
 
+/* No comment provided by engineer. */
+"search.distance" = "Distancia";
+
+/* No comment provided by engineer. */
+"search.floor" = "Piso";
+
+/* No comment provided by engineer. */
+"search.noResultFound" = "No se ha encontrado ningún resultado";
+
 /* Error when user does not set credentials */
 "situmMapsLibrary.error.credentials" = "Necesitas establecer la información de autenticación con setCredentials() antes de llamar a load(buildingWithId:)";
 

From a165e32eb199d5d83bf305fb96a863f10bb5744a Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Fri, 11 Mar 2022 11:24:10 +0100
Subject: [PATCH 12/26] Extension class UIImage with method for title POIs

---
 .../PositioningViewController.swift           | 22 +++----
 ...ustomMarkerView.swift => TitledIcon.swift} | 60 ++++++++-----------
 .../WayfindingLibrary/LibrarySettings.swift   |  4 +-
 3 files changed, 36 insertions(+), 50 deletions(-)
 rename SitumWayfinding/Classes/UI/{CustomMarkerView.swift => TitledIcon.swift} (73%)

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index 0458ad7..a3ea242 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -973,17 +973,13 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         poiMarker.userData = poi
         iconsStore.obtainIconFor(category: poi.category) { item in
             if let icon = item {
-                let customMarker = CustomMarkerView(markerImage: icon)
-                
-                if self.showTextPois() {
-                    customMarker.titlePoi(
-                        title: poi.name.uppercased(),
-                        size: 12.0,
-                        color: UIColor(hex: "#5b5b5bff") ?? UIColor.gray,
-                        weight: .medium
-                    )
-                }
-                poiMarker.icon = customMarker.getIcon()
+                poiMarker.icon = icon.setTitlePoi(
+                    title: poi.name.uppercased(),
+                    size: 12.0,
+                    color: UIColor(hex: "#5b5b5bff") ?? UIColor.gray,
+                    weight: .medium,
+                    displayFont: self.showTextPois()
+                )
             }
             
             poiMarker.map = self.mapView
@@ -992,10 +988,8 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
     }
     
     func showTextPois() -> Bool {
-        if let settings = self.library?.settings {
-            if let showText = settings.showTextPois {
+        if let settings = self.library?.settings, let showText = settings.showTextPois {
                 return showText
-            }
         }
         
         return false
diff --git a/SitumWayfinding/Classes/UI/CustomMarkerView.swift b/SitumWayfinding/Classes/UI/TitledIcon.swift
similarity index 73%
rename from SitumWayfinding/Classes/UI/CustomMarkerView.swift
rename to SitumWayfinding/Classes/UI/TitledIcon.swift
index 76bf7f0..3723414 100644
--- a/SitumWayfinding/Classes/UI/CustomMarkerView.swift
+++ b/SitumWayfinding/Classes/UI/TitledIcon.swift
@@ -1,17 +1,23 @@
 import Foundation
 
-class CustomMarkerView {
-    private let subView = UIView()
-    private let mainView = UIView()
-    private let markerImgView = UIImageView()
-    
-    private var markerImage: UIImage
-    private var padding: CGFloat = 8.0
-    private var titleLabel: UILabel?
-    private var displayFont = false
-    
-    init(markerImage: UIImage) {
-        self.markerImage = markerImage
+extension UIImage {
+    func setTitlePoi(title: String, size: CGFloat, color: UIColor, weight: UIFont.Weight, displayFont: Bool) -> UIImage {
+        let subView = UIView()
+        
+        let font = UIFont.systemFont(ofSize: size, weight: weight)
+        
+        let titleLabel = self.getLabel(font: font, color: color, title: title)
+        
+        subView.addSubview(titleLabel)
+        subView.frame = CGRect(
+            x: 0.0,
+            y: 0.0,
+            width: 2 * 4.0 + titleLabel.frame.width,
+            height: 2 * 4.0 + titleLabel.frame.height
+        )
+        subView.backgroundColor = UIColor.clear
+        
+        return prepareIconPoi(subView: subView, displayFont: displayFont)
     }
     
     private func getLabel(font: UIFont, color: UIColor, title: String) -> UILabel {
@@ -50,31 +56,17 @@ class CustomMarkerView {
         return titleLabel
     }
     
-    func titlePoi(title: String, size: CGFloat, color: UIColor, weight: UIFont.Weight) {
-        self.displayFont = true
-        
-        let font = UIFont.systemFont(ofSize: size, weight: weight)
+    private func prepareIconPoi(subView: UIView, displayFont: Bool) -> UIImage {
+        let markerImgView = UIImageView()
+        let mainView = UIView()
         
-        let titleLabel = self.getLabel(font: font, color: color, title: title)
-        
-        self.subView.addSubview(titleLabel)
-        self.subView.frame = CGRect(
-            x: 0.0,
-            y: 0.0,
-            width: 2 * 4.0 + titleLabel.frame.width,
-            height: 2 * 4.0 + titleLabel.frame.height
-        )
-        self.subView.backgroundColor = UIColor.clear
-    }
-    
-    func getIcon() -> UIImage {
         markerImgView.frame = CGRect(
-            x: subView.center.x - self.markerImage.size.width / 2,
+            x: subView.center.x - self.size.width / 2,
             y: subView.frame.height,
-            width: self.markerImage.size.width,
-            height: self.markerImage.size.height
+            width: self.size.width,
+            height: self.size.height
         )
-        markerImgView.image = self.markerImage
+        markerImgView.image = self
         markerImgView.contentMode = .scaleAspectFit
 
         mainView.addSubview(markerImgView)
@@ -96,7 +88,7 @@ class CustomMarkerView {
             UIGraphicsEndImageContext()
             return icon
         } else {
-            return markerImage
+            return self
         }
     }
 }
diff --git a/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift b/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift
index 8c7e180..8e61247 100644
--- a/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift
+++ b/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift
@@ -32,7 +32,7 @@ import GoogleMaps
     /// Boolean to configure if location system should use the remote configuration (true) or not (false). See https://situm.com/docs/07-remote-configuration/ to learn more on how to use this functionality.
     private (set) var useRemoteConfig: Bool = false
     
-    /// Boolen configure if show name POI above it
+    /// Boolean that configure if the name of the POIs is shown above its icons when painting them on the map
     private (set) var showTextPois: Bool? = true
     
     // private(set) var orgDetails: OrganizationTheme?
@@ -105,7 +105,7 @@ import GoogleMaps
             return self
         }
         
-        /// Establish if show name of POI above it
+        /// Boolean that configure if the name of the POIs is shown above its icons when painting them on the map
         @discardableResult
         @objc public func setShowTextPois(showTextPois: Bool) -> Builder {
             instance.showTextPois = showTextPois

From 2bc27cb04b80c8f66770e8019c6e950f3a828dad Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Fri, 11 Mar 2022 13:37:15 +0100
Subject: [PATCH 13/26] Add description in changelog

---
 CHANGELOG_UNRELEASED.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG_UNRELEASED.md b/CHANGELOG_UNRELEASED.md
index 139597f..b4e92ab 100644
--- a/CHANGELOG_UNRELEASED.md
+++ b/CHANGELOG_UNRELEASED.md
@@ -1,2 +1,3 @@
-
+### Added:
+* The setShowTextPois method has been added in SitumMapsLibrary. This method allows that the name of each POIs is shown on the map above the POI icon. If it is set to true, the POI name is seen above the POI icon, if it is set to false, only the POI icon appears.
 

From 4a6b3f5181f3452dfeb47ab8ce38624692b56ed1 Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Fri, 11 Mar 2022 14:01:29 +0100
Subject: [PATCH 14/26] Change name method UIImage

---
 .../PositioningViewController.swift            | 13 ++++++-------
 SitumWayfinding/Classes/UI/TitledIcon.swift    | 18 +++++++-----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index a3ea242..2c10e77 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -973,13 +973,12 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         poiMarker.userData = poi
         iconsStore.obtainIconFor(category: poi.category) { item in
             if let icon = item {
-                poiMarker.icon = icon.setTitlePoi(
-                    title: poi.name.uppercased(),
-                    size: 12.0,
-                    color: UIColor(hex: "#5b5b5bff") ?? UIColor.gray,
-                    weight: .medium,
-                    displayFont: self.showTextPois()
-                )
+                if self.showTextPois() {
+                    let color = UIColor(hex: "#5b5b5bff") ?? UIColor.gray
+                    poiMarker.icon = icon.setTitle(title: poi.name.uppercased(), size: 12.0, color: color, weight: .medium)
+                } else {
+                    poiMarker.icon = icon
+                }
             }
             
             poiMarker.map = self.mapView
diff --git a/SitumWayfinding/Classes/UI/TitledIcon.swift b/SitumWayfinding/Classes/UI/TitledIcon.swift
index 3723414..fab4144 100644
--- a/SitumWayfinding/Classes/UI/TitledIcon.swift
+++ b/SitumWayfinding/Classes/UI/TitledIcon.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension UIImage {
-    func setTitlePoi(title: String, size: CGFloat, color: UIColor, weight: UIFont.Weight, displayFont: Bool) -> UIImage {
+    func setTitle(title: String, size: CGFloat, color: UIColor, weight: UIFont.Weight) -> UIImage {
         let subView = UIView()
         
         let font = UIFont.systemFont(ofSize: size, weight: weight)
@@ -17,7 +17,7 @@ extension UIImage {
         )
         subView.backgroundColor = UIColor.clear
         
-        return prepareIconPoi(subView: subView, displayFont: displayFont)
+        return prepareIconPoi(subView: subView)
     }
     
     private func getLabel(font: UIFont, color: UIColor, title: String) -> UILabel {
@@ -56,7 +56,7 @@ extension UIImage {
         return titleLabel
     }
     
-    private func prepareIconPoi(subView: UIView, displayFont: Bool) -> UIImage {
+    private func prepareIconPoi(subView: UIView) -> UIImage {
         let markerImgView = UIImageView()
         let mainView = UIView()
         
@@ -82,13 +82,9 @@ extension UIImage {
         
         UIGraphicsBeginImageContextWithOptions(mainView.bounds.size, false, UIScreen.main.scale)
         
-        if displayFont {
-            mainView.layer.render(in: UIGraphicsGetCurrentContext()!)
-            let icon : UIImage = UIGraphicsGetImageFromCurrentImageContext()!
-            UIGraphicsEndImageContext()
-            return icon
-        } else {
-            return self
-        }
+        mainView.layer.render(in: UIGraphicsGetCurrentContext()!)
+        let icon : UIImage = UIGraphicsGetImageFromCurrentImageContext()!
+        UIGraphicsEndImageContext()
+        return icon
     }
 }

From 6a49dd1bf82dedfc1fb3426ca4fda51508d57c34 Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Mon, 14 Mar 2022 07:24:14 +0100
Subject: [PATCH 15/26] Simplifies the condition of showing icon with text or
 without it

---
 .../Positioning/PositioningViewController.swift | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index 2c10e77..97c06ae 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -972,16 +972,15 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         poiMarker.title = poi.name
         poiMarker.userData = poi
         iconsStore.obtainIconFor(category: poi.category) { item in
-            if let icon = item {
-                if self.showTextPois() {
-                    let color = UIColor(hex: "#5b5b5bff") ?? UIColor.gray
-                    poiMarker.icon = icon.setTitle(title: poi.name.uppercased(), size: 12.0, color: color, weight: .medium)
-                } else {
-                    poiMarker.icon = icon
-                }
+            if var icon = item {
+                let color = UIColor(hex: "#5b5b5bff") ?? UIColor.gray
+                let title = poi.name.uppercased()
+                icon = self.showTextPois() ?
+                    icon.setTitle(title: title, size: 12.0, color: color, weight: .medium) :
+                    icon
+                poiMarker.icon = icon
+                poiMarker.map = self.mapView
             }
-            
-            poiMarker.map = self.mapView
         }
         return poiMarker
     }

From 3c346e5c2669f0bd1fe7298a5d8b3f9fa4fcac85 Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Mon, 14 Mar 2022 07:35:41 +0100
Subject: [PATCH 16/26] Simplifies the condition of showing icon with text or
 without it

---
 .../Classes/Positioning/PositioningViewController.swift      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index 97c06ae..12e6b64 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -972,13 +972,12 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         poiMarker.title = poi.name
         poiMarker.userData = poi
         iconsStore.obtainIconFor(category: poi.category) { item in
-            if var icon = item {
+            if let icon = item {
                 let color = UIColor(hex: "#5b5b5bff") ?? UIColor.gray
                 let title = poi.name.uppercased()
-                icon = self.showTextPois() ?
+                poiMarker.icon = self.showTextPois() ?
                     icon.setTitle(title: title, size: 12.0, color: color, weight: .medium) :
                     icon
-                poiMarker.icon = icon
                 poiMarker.map = self.mapView
             }
         }

From 8dc784d7bcc191423f0caf8bf892d0619675878b Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Mon, 14 Mar 2022 10:29:46 +0100
Subject: [PATCH 17/26] Change changelog

---
 CHANGELOG_UNRELEASED.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG_UNRELEASED.md b/CHANGELOG_UNRELEASED.md
index 5f7c8b4..c654dd2 100644
--- a/CHANGELOG_UNRELEASED.md
+++ b/CHANGELOG_UNRELEASED.md
@@ -2,6 +2,4 @@
 
 ### Added:
 * The setShowTextPois method has been added in SitumMapsLibrary. This method allows that the name of each POIs is shown on the map above the POI icon. If it is set to true, the POI name is seen above the POI icon, if it is set to false, only the POI icon appears.
-
-### Added
 * Added localization for spanish language in Wayfinding

From 8f960cf357d5eed77701785c75247f042d8a3410 Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Mon, 14 Mar 2022 10:32:24 +0100
Subject: [PATCH 18/26] Change poiMarker.map

---
 .../Classes/Positioning/PositioningViewController.swift         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index a3f7fb9..3a26575 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -1030,8 +1030,8 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
                 poiMarker.icon = self.showTextPois() ?
                     icon.setTitle(title: title, size: 12.0, color: color, weight: .medium) :
                     icon
-                poiMarker.map = self.mapView
             }
+            poiMarker.map = self.mapView
         }
         return poiMarker
     }

From 2da05c89688ede23a5ab369432600b8273a59c8f Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Mon, 14 Mar 2022 13:07:49 +0100
Subject: [PATCH 19/26] Change name preferences

---
 .../Classes/Positioning/PositioningViewController.swift   | 8 ++++----
 .../Classes/WayfindingLibrary/LibrarySettings.swift       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index 3a26575..3e96230 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -1027,7 +1027,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
             if let icon = item {
                 let color = UIColor(hex: "#5b5b5bff") ?? UIColor.gray
                 let title = poi.name.uppercased()
-                poiMarker.icon = self.showTextPois() ?
+                poiMarker.icon = self.showPoiNames() ?
                     icon.setTitle(title: title, size: 12.0, color: color, weight: .medium) :
                     icon
             }
@@ -1036,9 +1036,9 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
         return poiMarker
     }
     
-    func showTextPois() -> Bool {
-        if let settings = self.library?.settings, let showText = settings.showTextPois {
-                return showText
+    func showPoiNames() -> Bool {
+        if let settings = self.library?.settings, let showText = settings.showPoiNames {
+            return showText
         }
         
         return false
diff --git a/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift b/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift
index 8e61247..bca69ea 100644
--- a/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift
+++ b/SitumWayfinding/Classes/WayfindingLibrary/LibrarySettings.swift
@@ -33,7 +33,7 @@ import GoogleMaps
     private (set) var useRemoteConfig: Bool = false
     
     /// Boolean that configure if the name of the POIs is shown above its icons when painting them on the map
-    private (set) var showTextPois: Bool? = true
+    private (set) var showPoiNames: Bool? = true
     
     // private(set) var orgDetails: OrganizationTheme?
     private override init() {
@@ -107,8 +107,8 @@ import GoogleMaps
         
         /// Boolean that configure if the name of the POIs is shown above its icons when painting them on the map
         @discardableResult
-        @objc public func setShowTextPois(showTextPois: Bool) -> Builder {
-            instance.showTextPois = showTextPois
+        @objc public func setShowPoiNames(showPoiNames: Bool) -> Builder {
+            instance.showPoiNames = showPoiNames
             return self
         }
 
@@ -150,7 +150,7 @@ import GoogleMaps
                 builderCopy.setUseRemoteConfig(useRemoteConfig: settings.useRemoteConfig)
             }
 
-            builderCopy.setShowTextPois(showTextPois: settings.showTextPois ?? false)
+            builderCopy.setShowPoiNames(showPoiNames: settings.showPoiNames ?? false)
 
             return builderCopy
         }

From 28c9b9be05338acc5f68dcf035baded24151f938 Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Mon, 14 Mar 2022 13:50:56 +0100
Subject: [PATCH 20/26] Shadow name poi

---
 SitumWayfinding/Classes/UI/TitledIcon.swift | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/SitumWayfinding/Classes/UI/TitledIcon.swift b/SitumWayfinding/Classes/UI/TitledIcon.swift
index fab4144..b7039bf 100644
--- a/SitumWayfinding/Classes/UI/TitledIcon.swift
+++ b/SitumWayfinding/Classes/UI/TitledIcon.swift
@@ -24,11 +24,15 @@ extension UIImage {
         let sizeFrame = CGRect(x: 4.0, y: 4.0, width: 150.0, height: font.lineHeight)
         let titleLabel : UILabel = UILabel(frame: sizeFrame)
         
+        let shadow = NSShadow()
+        shadow.shadowOffset = CGSize(width: 2, height: 2)
+        shadow.shadowColor = UIColor.white
+        
         let textFontAttributes: [NSAttributedString.Key : Any]  = [
-            NSAttributedString.Key.font : font,
-            NSAttributedString.Key.foregroundColor: color,
-            NSAttributedString.Key.strokeColor: UIColor.white,
-            NSAttributedString.Key.strokeWidth: -2
+            .font : font,
+            .shadow: shadow,
+            .strokeWidth: -2,
+            .foregroundColor: color,
         ]
         
         let mutableString = NSMutableAttributedString(string: title, attributes: textFontAttributes)

From 5d23e256bf301e30e988b52d3076e4803cf341bc Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Mon, 14 Mar 2022 14:21:46 +0100
Subject: [PATCH 21/26] Change weight font

---
 .../Positioning/PositioningViewController.swift        |  2 +-
 SitumWayfinding/Classes/UI/TitledIcon.swift            | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index 3e96230..cc95634 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -1028,7 +1028,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
                 let color = UIColor(hex: "#5b5b5bff") ?? UIColor.gray
                 let title = poi.name.uppercased()
                 poiMarker.icon = self.showPoiNames() ?
-                    icon.setTitle(title: title, size: 12.0, color: color, weight: .medium) :
+                icon.setTitle(title: title, size: 12.0, color: color, weight: .heavy) :
                     icon
             }
             poiMarker.map = self.mapView
diff --git a/SitumWayfinding/Classes/UI/TitledIcon.swift b/SitumWayfinding/Classes/UI/TitledIcon.swift
index b7039bf..dd974a6 100644
--- a/SitumWayfinding/Classes/UI/TitledIcon.swift
+++ b/SitumWayfinding/Classes/UI/TitledIcon.swift
@@ -23,16 +23,12 @@ extension UIImage {
     private func getLabel(font: UIFont, color: UIColor, title: String) -> UILabel {
         let sizeFrame = CGRect(x: 4.0, y: 4.0, width: 150.0, height: font.lineHeight)
         let titleLabel : UILabel = UILabel(frame: sizeFrame)
-        
-        let shadow = NSShadow()
-        shadow.shadowOffset = CGSize(width: 2, height: 2)
-        shadow.shadowColor = UIColor.white
-        
+    
         let textFontAttributes: [NSAttributedString.Key : Any]  = [
             .font : font,
-            .shadow: shadow,
+            .strokeColor: UIColor.white,
             .strokeWidth: -2,
-            .foregroundColor: color,
+            .foregroundColor: color
         ]
         
         let mutableString = NSMutableAttributedString(string: title, attributes: textFontAttributes)

From c7bb7d7bc839bd92c9438b94d260fb66a43c77f9 Mon Sep 17 00:00:00 2001
From: brunodimensiona <bruno.gomez@dimensiona.com>
Date: Mon, 14 Mar 2022 14:44:23 +0100
Subject: [PATCH 22/26] Background text

---
 .../Classes/Positioning/PositioningViewController.swift      | 2 +-
 SitumWayfinding/Classes/UI/TitledIcon.swift                  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
index cc95634..fe31c20 100644
--- a/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
+++ b/SitumWayfinding/Classes/Positioning/PositioningViewController.swift
@@ -1028,7 +1028,7 @@ class PositioningViewController: UIViewController, GMSMapViewDelegate, UITableVi
                 let color = UIColor(hex: "#5b5b5bff") ?? UIColor.gray
                 let title = poi.name.uppercased()
                 poiMarker.icon = self.showPoiNames() ?
-                icon.setTitle(title: title, size: 12.0, color: color, weight: .heavy) :
+                icon.setTitle(title: title, size: 12.0, color: color, weight: .semibold) :
                     icon
             }
             poiMarker.map = self.mapView
diff --git a/SitumWayfinding/Classes/UI/TitledIcon.swift b/SitumWayfinding/Classes/UI/TitledIcon.swift
index dd974a6..1bc9024 100644
--- a/SitumWayfinding/Classes/UI/TitledIcon.swift
+++ b/SitumWayfinding/Classes/UI/TitledIcon.swift
@@ -26,9 +26,8 @@ extension UIImage {
     
         let textFontAttributes: [NSAttributedString.Key : Any]  = [
             .font : font,
-            .strokeColor: UIColor.white,
-            .strokeWidth: -2,
-            .foregroundColor: color
+            .foregroundColor: color,
+            .backgroundColor: UIColor.white
         ]
         
         let mutableString = NSMutableAttributedString(string: title, attributes: textFontAttributes)

From 1a070ecedc9d07d7da4f83d0f44ad7f789458a4d Mon Sep 17 00:00:00 2001
From: Fernando Sanchez <fernando.sanchez@situm.es>
Date: Mon, 14 Mar 2022 17:26:54 +0100
Subject: [PATCH 23/26] Update changelog

---
 CHANGELOG.md            | 6 ++++++
 CHANGELOG_UNRELEASED.md | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8656dcd..3959711 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 All non released changes should be in CHANGELOG_UNRELEASED.md file
 
 ---------
+## [0.3.0] - 2022-03-14
+
+### Added:
+* The setShowTextPois method has been added in SitumMapsLibrary. This method allows that the name of each POIs is shown on the map above the POI icon. If it is set to true, the POI name is seen above the POI icon, if it is set to false, only the POI icon appears.
+* Added localization for spanish language in Wayfinding
+
 ## [0.2.0] - 2022-02-21
 ### Added
 * Added protocol OnNavigationListener and a method setOnNavigationListener on SitumMapsLibrary. As a developer you can 
diff --git a/CHANGELOG_UNRELEASED.md b/CHANGELOG_UNRELEASED.md
index c654dd2..8b13789 100644
--- a/CHANGELOG_UNRELEASED.md
+++ b/CHANGELOG_UNRELEASED.md
@@ -1,5 +1 @@
-## [0.3.0] 
 
-### Added:
-* The setShowTextPois method has been added in SitumMapsLibrary. This method allows that the name of each POIs is shown on the map above the POI icon. If it is set to true, the POI name is seen above the POI icon, if it is set to false, only the POI icon appears.
-* Added localization for spanish language in Wayfinding

From 1877c81d29926c9810ed7974239f4b4eef18e238 Mon Sep 17 00:00:00 2001
From: Fernando Sanchez <fernando.sanchez@situm.es>
Date: Mon, 14 Mar 2022 17:28:45 +0100
Subject: [PATCH 24/26] Updated podspec

---
 SitumWayfinding.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SitumWayfinding.podspec b/SitumWayfinding.podspec
index acced4b..4583c1e 100644
--- a/SitumWayfinding.podspec
+++ b/SitumWayfinding.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SitumWayfinding'
-  s.version          = '0.2.0'
+  s.version          = '0.3.0'
   s.summary          = 'Indoor Location for iOS.'
   s.static_framework = true
 

From 86252043f8c45b0d05594048c8fa484cbe813358 Mon Sep 17 00:00:00 2001
From: Fernando Sanchez <fernando.sanchez@situm.es>
Date: Mon, 14 Mar 2022 17:29:33 +0100
Subject: [PATCH 25/26] Updated framework.properties

---
 scripts/framework.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/framework.properties b/scripts/framework.properties
index a9a7a46..61f6788 100644
--- a/scripts/framework.properties
+++ b/scripts/framework.properties
@@ -1 +1 @@
-frameworkVersion=0.2.0
+frameworkVersion=0.3.0

From 8614193d4ad311293e49993ac973c2ad6ad2eda2 Mon Sep 17 00:00:00 2001
From: Fernando Sanchez <fernando.sanchez@situm.es>
Date: Mon, 14 Mar 2022 17:30:46 +0100
Subject: [PATCH 26/26] Updated Pofile.lock

---
 Example/Podfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index 364cafa..b6e8692 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -8,7 +8,7 @@ PODS:
   - SitumSDK (2.52.0):
     - Protobuf (~> 3.7)
     - SSZipArchive (~> 2.4)
-  - SitumWayfinding (0.2.0):
+  - SitumWayfinding (0.3.0):
     - GoogleMaps (~> 4.2.0)
     - SitumSDK (~> 2.52.0)
   - SSZipArchive (2.4.3)
@@ -31,7 +31,7 @@ SPEC CHECKSUMS:
   GoogleMaps: eb03e327edfd70b06de1e6e321653f73712df7ad
   Protobuf: 235750e4696ff59fb07d949a9dbbc92b3c0700fe
   SitumSDK: cc0a5b48a90669c463622b12ae6f07588863f5af
-  SitumWayfinding: 5a7a574f799580866b751b57522a224b04fa8ec6
+  SitumWayfinding: c759a99469f88361d5881700d3a5aa5370d2438a
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
 
 PODFILE CHECKSUM: 181eb894514efe3e0119ec84dae5349934aaaa20