Skip to content

Commit

Permalink
feat: WDM-32 - add a new zip for version 1.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Thierry Vilmart committed Mar 3, 2022
1 parent 2c0ad65 commit 0a05a94
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
8 changes: 4 additions & 4 deletions livemap-ios-sdk.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 9;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 5PQJ73JT76;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -398,7 +398,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.7.0;
MARKETING_VERSION = 1.9.0;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.getwemap.livemap-ios-sdk";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand All @@ -418,7 +418,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 9;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 5PQJ73JT76;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -432,7 +432,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.7.0;
MARKETING_VERSION = 1.9.0;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.getwemap.livemap-ios-sdk";
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand Down
13 changes: 9 additions & 4 deletions livemap-ios-sdk/Livemap.swift
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,11 @@ extension wemapsdk {

if (configuration.urlParameters != nil)
{
urlStr += "&" + configuration.urlParameters!.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)!
let join1 = configuration.urlParameters!.joined(separator: "&")
urlStr += "&" + join1.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)!
}
}

webView.load(
URLRequest(url: URL(string: urlStr)!, cachePolicy: .reloadIgnoringLocalAndRemoteCacheData)
)
Expand Down Expand Up @@ -720,8 +722,7 @@ public struct wemapsdk_config {
self.livemapRootUrl = livemapRootUrl ?? wemapsdk_config.defaultLivemapRootUrl
self.maxbounds = maxbounds ?? nil
self.introcard = introcard ?? nil
let join1 = urlParameters?.joined(separator: "&")
self.urlParameters = join1 ?? nil
self.urlParameters = urlParameters ?? nil
}

public static let defaultLivemapRootUrl = "https://livemap.getwemap.com"
Expand All @@ -730,6 +731,10 @@ public struct wemapsdk_config {
return BoundingBox.map(dict: dict)
}

public static func introcardFromNSDictionary(dict: NSDictionary) -> IntroCardParameter? {
return IntroCardParameter.map(dict: dict)
}

public static func maxBoundsFromUrl(maxbounds: String) -> BoundingBox? {
if let parsedStruct: MaxBoundsSnippet = MaxBoundsSnippet.map(string: maxbounds) {
let result: BoundingBox = BoundingBox(
Expand Down Expand Up @@ -766,7 +771,7 @@ public struct wemapsdk_config {
public let livemapRootUrl: String
public let maxbounds: BoundingBox?
public let introcard: IntroCardParameter?
public let urlParameters: String?
public let urlParameters: [String]?
}

enum WebCommands: String {
Expand Down
Binary file added releases/v1.9.0/xcframework.zip
Binary file not shown.

0 comments on commit 0a05a94

Please sign in to comment.