From febe8b05077664cf9558ce05d1750551bc295c30 Mon Sep 17 00:00:00 2001 From: Tyler Burgett Date: Tue, 6 Apr 2021 17:04:22 -0600 Subject: [PATCH] Fix for xyz downloads. 1.3.1 --- mapcache-ios.xcodeproj/project.pbxproj | 8 ++++---- mapcache-ios/data/MCTileServerRepository.swift | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mapcache-ios.xcodeproj/project.pbxproj b/mapcache-ios.xcodeproj/project.pbxproj index ccfadf4..dcc57a5 100644 --- a/mapcache-ios.xcodeproj/project.pbxproj +++ b/mapcache-ios.xcodeproj/project.pbxproj @@ -1342,14 +1342,14 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 44; + CURRENT_PROJECT_VERSION = 45; DEVELOPMENT_TEAM = ZL8G5D9G2H; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "mapcache-ios/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 2.0.3; + MARKETING_VERSION = 2.0.4; PRODUCT_BUNDLE_IDENTIFIER = mil.nga.mapcache; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -1368,13 +1368,13 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 44; + CURRENT_PROJECT_VERSION = 45; DEVELOPMENT_TEAM = ZL8G5D9G2H; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "mapcache-ios/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 2.0.3; + MARKETING_VERSION = 2.0.4; PRODUCT_BUNDLE_IDENTIFIER = mil.nga.mapcache; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; diff --git a/mapcache-ios/data/MCTileServerRepository.swift b/mapcache-ios/data/MCTileServerRepository.swift index 46d3f30..271ac46 100644 --- a/mapcache-ios/data/MCTileServerRepository.swift +++ b/mapcache-ios/data/MCTileServerRepository.swift @@ -73,7 +73,7 @@ import Foundation let tileServer = MCTileServer.init(serverName: urlString) tileServer.url = urlString; - if (urlString.contains("{x}") && urlString.contains("{y}") && urlString.contains("{x}")) { + if (urlString.contains("{z}") && urlString.contains("{y}") && urlString.contains("{x}")) { editedURLString.replaceSubrange(editedURLString.range(of: "{x}")!, with: "0") editedURLString.replaceSubrange(editedURLString.range(of: "{y}")!, with: "0")