fix wikimedia photos #3278
Merged
fix wikimedia photos #3278
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sync cm_place url with android;
tigrim
reviewed
Dec 8, 2023
| self.location.latitude, | ||
| self.location.longitude, | ||
| [OAIAPHelper isPaidVersion] ? @"paid" : @"free", | ||
| (preferredLang && preferredLang.length > 0 ? [@"&lang=" stringByAppendingString:preferredLang] : @""), |
There was a problem hiding this comment.
It's better not to use two ternary operators in one condition
| _wikiCardsReady = YES; | ||
| [self sendNearbyOtherImagesRequest:cards]; | ||
| }]; | ||
| [self sendNearbyOtherImagesRequest:[NSMutableArray array]]; |
Sources/Helpers/OAWikiImageHelper.h
Outdated
| @@ -15,6 +15,10 @@ | |||
| #define CM_LIMIT @"&cmlimit=500" | |||
| #define FORMAT_JSON @"&format=json" | |||
| #define IMAGE_BASE_URL @"https://commons.wikimedia.org/wiki/Special:FilePath/" | |||
| #define USE_OSMAND_WIKI_API YES | |||
| #define OSMAND_API_ENDPOINT @"https://osmand.net/api/" | |||
There was a problem hiding this comment.
don't use #define. it is not type-safe. static NSString* const OSMAND_API_ENDPOINT = @"https://osmand.net/api/";
| - (OAWikiImage *)getOsmandApiWikiImage:(NSString *)imageUrl | ||
| { | ||
| NSString *url = [imageUrl stringByRemovingPercentEncoding]; | ||
| NSString *imageHiResUrl = [url stringByReplacingOccurrencesOfString:@" " withString:@"_"]; |
There was a problem hiding this comment.
imageHiResUrl - Interesting name:)
Sources/Helpers/OAWikiImageHelper.mm
Outdated
| { | ||
| url = [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; | ||
| NSURL *urlObj = [[NSURL alloc] initWithString:url]; | ||
| NSURLSession *aSession = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]]; |
Sources/Helpers/OAWikiImageHelper.mm
Outdated
| } | ||
| dispatch_async(dispatch_get_main_queue(), ^{ | ||
| [cards addObjectsFromArray:resultCards]; | ||
| (byCategory ? _wikimediaCardsReady : _wikidataCardsReady) = YES; |
There was a problem hiding this comment.
Replace duplicate checks with 'if byCategory'.
| NSURLSession *aSession = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]]; | ||
| [[aSession dataTaskWithURL:urlObj completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { | ||
| NSMutableArray<OAAbstractCard *> *resultCards = [NSMutableArray array]; | ||
| if (((NSHTTPURLResponse *)response).statusCode == 200) |
There was a problem hiding this comment.
Maybe we should add error logging to the log output?
Sources/Helpers/OAWikiImageHelper.mm
Outdated
| { | ||
| NSString *safeWikidataTagContent = [wikidataTagContent stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; | ||
| NSURL *urlObj = [[NSURL alloc] initWithString: [NSString stringWithFormat:@"%@%@%@%@", WIKIDATA_API_ENDPOINT, WIKIDATA_ACTION, safeWikidataTagContent, FORMAT_JSON]]; | ||
| NSURLSession *aSession = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]]; |
Sources/Helpers/OAWikiImageHelper.mm
Outdated
| NSString *url = [NSString stringWithFormat:@"%@%@%@%@%@", WIKIMEDIA_API_ENDPOINT, WIKIMEDIA_ACTION, wikiMediaTagContent, CM_LIMIT, FORMAT_JSON]; | ||
| url = [url stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]]; | ||
| NSURL *urlObj = [[NSURL alloc] initWithString:url]; | ||
| NSURLSession *aSession = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]]; |
tigrim
approved these changes
Dec 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.