Add marker name escaping, use v2 access-token

Update call to get access-token from v1 to v2.
Pull up latest acdb submodule and add marker name html escaping
capabilities for getSearchMarkers

Author: molacek-garmin

ActiveCaptainCommunitySDK/ActiveCaptainCommunitySDK/ActiveCaptainDatabase.h

@@ -144,7 +144,7 @@ typedef struct TileXY {
     @param maxResultCount maximum number of results to return
     @return Array of SearchMarkers in the given bounding box (matching name, if specified)
  */
-- (NSArray<SearchMarker *> *)getSearchMarkersByName: (NSString *)name south:(double)south west:(double)west north:(double)north east:(double)east maxResultCount:(int)maxResultCount;
+- (NSArray<SearchMarker *> *)getSearchMarkersByName: (NSString *)name south:(double)south west:(double)west north:(double)north east:(double)east maxResultCount:(int)maxResultCount escapeHtml:(bool)escapeHtml;
 /*!
    @brief Set content of HTML &lt;head&gt; tag to be used in rendered HTML.  If not called, default CSS will be used.
    @param value content of HTML &lt;head&gt; tag, including CSS style values

ActiveCaptainCommunitySDK/ActiveCaptainCommunitySDK/ActiveCaptainDatabase.mm

@@ -23,6 +23,7 @@
 #import "NavDateTimeExtensions.hpp"
 #import "Repository.hpp"
 #import "SearchMarker.h"
+#import "StringUtil.hpp"
 #import "UpdateService.hpp"
 #import "UTL_pub_lib_cnvt.h"
 #import "Version.hpp"
@@ -147,7 +148,7 @@ - (void)installTileWithPath: (NSString *)path tileX:(int) tileX tileY:(int) tile
 }
 
 // DataService
-- (NSArray<SearchMarker *> *)getSearchMarkersByName: (NSString *)name south:(double)south west:(double)west north:(double)north east:(double)east maxResultCount:(int)maxResultCount {
+- (NSArray<SearchMarker *> *)getSearchMarkersByName: (NSString *)name south:(double)south west:(double)west north:(double)north east:(double)east maxResultCount:(int)maxResultCount escapeHtml:(bool)escapeHtml {
     Acdb::SearchMarkerFilter filter;
 
     std::string nameStr = [self toString:name];
@@ -202,6 +203,11 @@ - (void)installTileWithPath: (NSString *)path tileX:(int) tileX tileY:(int) tile
 
     NSMutableArray *results = [[NSMutableArray alloc] init];
     for (std::vector<Acdb::ISearchMarkerPtr>::iterator it = searchMarkers.begin(); it != searchMarkers.end(); it++) {
+        std::string markerName = it->get()->GetName();
+        if (escapeHtml == true) {
+            Acdb::String::HtmlEscape(markerName);
+        }
+
         std::map<ACDB_type_type, MarkerType>::const_iterator markerTypeIt = MARKER_TYPES.find((*it)->GetType());
         if (markerTypeIt == MARKER_TYPES.end()) {
             markerTypeIt = MARKER_TYPES.begin();
@@ -214,7 +220,7 @@ - (void)installTileWithPath: (NSString *)path tileX:(int) tileX tileY:(int) tile
 
         SearchMarker* result = [[SearchMarker alloc] init];
         result.markerId = (*it)->GetId();
-        result.name = [self toNSString:(*it)->GetName()];
+        result.name = [self toNSString:markerName];
         result.markerType = markerTypeIt->second;
         result.latitude = (*it)->GetPosition().lat * UTL_SEMI_TO_DEG;
         result.longitude = (*it)->GetPosition().lon * UTL_SEMI_TO_DEG;

ActiveCaptainCommunitySDK/ActiveCaptainCommunitySDK/cpp/acdb

@@ -21,7 +21,7 @@ import PromiseKit
 class ActiveCaptainAPIClient {
     func getAccessToken(serviceUrl: String, serviceTicket: String) -> Promise<String> {
         var components = URLComponents(string:ActiveCaptainConfiguration.apiBaseURL)!
-        components.path += "/api/v1/authentication/access-token"
+        components.path += "/api/v2/authentication/access-token"
         components.queryItems = [URLQueryItem(name:"serviceUrl", value:serviceUrl), URLQueryItem(name:"serviceTicket", value:serviceTicket)]
 
         return sendRequestAndDecode(String.self, .get, components)

ActiveCaptainSample/ActiveCaptainSample/ActiveCaptainAPIClient.swift

@@ -113,7 +113,7 @@ class SearchViewController: UITableViewController, UISearchResultsUpdating {
 
     func updateSearchResults(for searchController: UISearchController) {
         if searchController.searchBar.text!.count > ActiveCaptainConfiguration.markerMinSearchLength {
-            searchMarkers = ActiveCaptainManager.instance.database.getSearchMarkers(byName: searchController.searchBar.text!, south:-90.0, west:-180.0, north: 90.0, east:180.0, maxResultCount:Int32(ActiveCaptainConfiguration.markerMaxSearchResults))
+            searchMarkers = ActiveCaptainManager.instance.database.getSearchMarkers(byName: searchController.searchBar.text!, south:-90.0, west:-180.0, north: 90.0, east:180.0, maxResultCount:Int32(ActiveCaptainConfiguration.markerMaxSearchResults), escapeHtml:false)
         }
 
         self.tableView.reloadData()