diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2015-03-23 11:16:49 -0700 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2015-03-23 11:16:49 -0700 |
commit | df437208aa59c8972a6f29a83000975968ec60ca (patch) | |
tree | 6397f562c8c11697b27169e6083f5e1613ad4f46 /platform | |
parent | 9d30d4042c3311d02568adbb38dd13fb82faf75d (diff) | |
download | qtlocation-mapboxgl-df437208aa59c8972a6f29a83000975968ec60ca.tar.gz |
Assume UTF-8–encoded JSON stylesheets
Fixes #1068.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/ios/MGLMapView.mm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index 8593e9da5c..76b6d68b18 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -178,7 +178,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; { if (accessToken) { - mbglMap->setAccessToken((std::string)[accessToken cStringUsingEncoding:[NSString defaultCStringEncoding]]); + mbglMap->setAccessToken((std::string)[accessToken UTF8String]); } } @@ -193,7 +193,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; else { if ([@(mbglMap->getStyleJSON().c_str()) length]) mbglMap->stop(); - mbglMap->setStyleJSON((std::string)[styleJSON cStringUsingEncoding:[NSString defaultCStringEncoding]]); + mbglMap->setStyleJSON((std::string)[styleJSON UTF8String]); mbglMap->start(); } } @@ -282,7 +282,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; // setup annotations // _annotationsStore = [NSMapTable mapTableWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory]; - std::string defaultSymbolName([MGLDefaultStyleMarkerSymbolName cStringUsingEncoding:[NSString defaultCStringEncoding]]); + std::string defaultSymbolName([MGLDefaultStyleMarkerSymbolName UTF8String]); mbglMap->setDefaultPointAnnotationSymbol(defaultSymbolName); // setup logo bug @@ -1099,14 +1099,14 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng) { const std::string styleJSON = mbglMap->getStyleJSON(); - return [NSJSONSerialization JSONObjectWithData:[@(styleJSON.c_str()) dataUsingEncoding:[NSString defaultCStringEncoding]] options:0 error:nil]; + return [NSJSONSerialization JSONObjectWithData:[@(styleJSON.c_str()) dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil]; } - (void)setRawStyle:(NSDictionary *)style { NSData *data = [NSJSONSerialization dataWithJSONObject:style options:0 error:nil]; - [self setStyleJSON:[[NSString alloc] initWithData:data encoding:[NSString defaultCStringEncoding]]]; + [self setStyleJSON:[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]]; } - (NSArray *)bundledStyleNames @@ -1212,7 +1212,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng) for (NSString *appliedClass in appliedClasses) { - newAppliedClasses.insert(newAppliedClasses.end(), [appliedClass cStringUsingEncoding:[NSString defaultCStringEncoding]]); + newAppliedClasses.insert(newAppliedClasses.end(), [appliedClass UTF8String]); } mbglMap->setDefaultTransitionDuration(secondsAsDuration(transitionDuration)); @@ -1609,7 +1609,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng) symbolName = [self.delegate mapView:self symbolNameForAnnotation:annotation]; } - symbols.push_back((symbolName ? [symbolName cStringUsingEncoding:[NSString defaultCStringEncoding]] : "")); + symbols.push_back((symbolName ? [symbolName UTF8String] : "")); } std::vector<uint32_t> annotationIDs = mbglMap->addPointAnnotations(latLngs, symbols); |