summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Rex <julian.rex@mapbox.com>2018-11-02 10:58:40 -0400
committerJulian Rex <julian.rex@mapbox.com>2018-11-02 10:58:40 -0400
commit4642c2562049ebef1e115170a5d6107cd540f332 (patch)
treeee7dd05183da5c36196270d88bd3b280c6eb687b
parenta3d0ff777b015bac7c1b16a1dd0a030b915782b0 (diff)
downloadqtlocation-mapboxgl-4642c2562049ebef1e115170a5d6107cd540f332.tar.gz
Changed event attributes to be JSON serialization friendly.
-rw-r--r--platform/darwin/src/MGLShapeOfflineRegion.mm2
-rw-r--r--platform/darwin/src/MGLTilePyramidOfflineRegion.mm3
2 files changed, 3 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLShapeOfflineRegion.mm b/platform/darwin/src/MGLShapeOfflineRegion.mm
index 7a2de8a82b..c016c30ee4 100644
--- a/platform/darwin/src/MGLShapeOfflineRegion.mm
+++ b/platform/darwin/src/MGLShapeOfflineRegion.mm
@@ -32,7 +32,7 @@
MMEEventKeyShapeForOfflineRegion: @"shaperegion",
MMEEventKeyMinZoomLevel: @(self.minimumZoomLevel),
MMEEventKeyMaxZoomLevel: @(self.maximumZoomLevel),
- MMEEventKeyStyleURL: self.styleURL
+ MMEEventKeyStyleURL: self.styleURL.absoluteString ?: [NSNull null]
#endif
};
}
diff --git a/platform/darwin/src/MGLTilePyramidOfflineRegion.mm b/platform/darwin/src/MGLTilePyramidOfflineRegion.mm
index 2e06be679e..fae9414e14 100644
--- a/platform/darwin/src/MGLTilePyramidOfflineRegion.mm
+++ b/platform/darwin/src/MGLTilePyramidOfflineRegion.mm
@@ -29,12 +29,13 @@
MMEEventKeyShapeForOfflineRegion: @"tileregion",
MMEEventKeyMinZoomLevel: @(self.minimumZoomLevel),
MMEEventKeyMaxZoomLevel: @(self.maximumZoomLevel),
- MMEEventKeyStyleURL: self.styleURL
+ MMEEventKeyStyleURL: self.styleURL.absoluteString ?: [NSNull null]
#endif
};
}
+ (BOOL)supportsSecureCoding {
+
return YES;
}