Merge pull request #80 from olgadanylova/master

Changes 0.0.11
Backendless · Jun 18, 2019 · 80937e8 · 80937e8
2 parents d299c23 + ebf1b74
commit 80937e8
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,11 @@
 # RELEASE HISTORY
 
-### 0.0.12, / June, 17 2019
-* customized serialization/deserialization for the next classes: DeliveryOptions, GeoPoint, GeoQueryRectangle
-
-### 0.0.11, / ?, 12 2019
+### 0.0.11, / June, 18 2019
 * fixed the GeoPoint saving issue which caused crash when sending custom object in metadata
+* customized serialization/deserialization for the next classes: DeliveryOptions, GeoPoint, GeoQueryRectangle
 
 ### 0.0.10, / June, 12 2019
-* fixed password issue when updating the BackendlessUser object
+* fixed password issue when updating the BackendlessUser objects
 * fixed Date type issue when retrieving object or registering BackendlessUser with custom Date field
 * fixed the BackendlessUser properties methods
 * added support of custom smart-text substitutions for push templates:

diff --git a/Sources/SwiftSDK/Geo/BackendlessGeoQuery.swift b/Sources/SwiftSDK/Geo/BackendlessGeoQuery.swift
@@ -62,6 +62,8 @@
     open var rectangle: GeoQueryRectangle?
     open var pageSize: Int = 10
     open var offset: Int = 0
+    open var relativeFindMetadata: [String : String]?
+    open var relativeFindPercentThreshold: Double = 0.0
 
     open private(set) var degreePerPixel: Double = 0.0
     open private(set) var clusterGridSize: Double = 100.0

diff --git a/Sources/SwiftSDK/Geo/GeoPoint.swift b/Sources/SwiftSDK/Geo/GeoPoint.swift
@@ -122,6 +122,19 @@
         try container.encodeIfPresent(_metadata, forKey: ._metadata)
     }
 
+    public func pointDescription() -> String {
+        let categories = self.categories.joined(separator: ",")
+        var metadata = "{"
+        if let pointMetadata = self.metadata {
+            for (key, value) in pointMetadata {
+                metadata.append("\(key):\(value);")
+            }
+        }
+        metadata.removeLast()
+        metadata += "}"
+        return "GeoPoint{objectId='\(self.objectId ?? "")', latitude=\(self.latitude), longitude=\(self.longitude), categories=[\(categories)], metadata=\(metadata)}"
+    }
+
     func setObjectId(objectId: String) {
         self.objectId = objectId
     }

diff --git a/Sources/SwiftSDK/Geo/GeoService.swift b/Sources/SwiftSDK/Geo/GeoService.swift
@@ -273,6 +273,10 @@
                 restMethod += "&includemetadata=false"
             }
             restMethod += "&dpp=\(geoQuery.degreePerPixel)&clusterGridSize=\(geoQuery.clusterGridSize)"
+            if let relativeFindMetadata = geoQuery.relativeFindMetadata,
+                let relativeFindMetadataString = dataTypesUtils.dictionaryToUrlString(dictionary: relativeFindMetadata) {
+                restMethod += "&relativeFindMetadata=\(relativeFindMetadataString)&relativeFindPercentThreshold=\(geoQuery.relativeFindPercentThreshold)"
+            }
         }
         return restMethod
     }

diff --git a/SwiftSDK.xcworkspace/xcuserdata/olhadanylova.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftSDK.xcworkspace/xcuserdata/olhadanylova.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...tSDK.xcworkspace/xcuserdata/olhadanylova.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...tSDK.xcworkspace/xcuserdata/olhadanylova.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -19,21 +19,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Sources/SwiftSDK/Geo/GeoService.swift"
-            timestampString = "581966050.149226"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "236"
-            endingLineNumber = "236"
-            landmarkName = "unknown"
-            landmarkType = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>