Merge pull request #3666 from osmandapp/fix_wikimedia_photos_4

fix wikimedia photos 4
osmandapp · May 3, 2024 · bae9424 · bae9424
2 parents dcc4246 + a9f2354
commit bae9424
Show file tree

Hide file tree

Showing 4 changed files with 247 additions and 189 deletions.
diff --git a/Sources/Cards/OAWikiImageCard.h b/Sources/Cards/OAWikiImageCard.h
@@ -21,14 +21,12 @@
 
 - (instancetype)initWithWikiMediaTag:(NSString *)wikiMediaTag imageName:(NSString *)imageName imageStubUrl:(NSString *)imageStubUrl imageHiResUrl:(NSString *)imageHiResUrl;
 
-- (NSString *)getUrlWithCommonAttributions:(BOOL)isWikimediaCategory;
+- (NSString *)getUrlWithCommonAttributions;
 
 @end
 
 @interface OAWikiImageCard : OAImageCard
 
 - (instancetype)initWithWikiImage:(OAWikiImage *)wikiImage type:(NSString *)type;
 
-- (instancetype)initWithWikiImage:(OAWikiImage *)wikiImage type:(NSString *)type wikimediaCategory:(BOOL)isWikimediaCategory;
-
 @end
diff --git a/Sources/Cards/OAWikiImageCard.mm b/Sources/Cards/OAWikiImageCard.mm
@@ -29,18 +29,9 @@ - (instancetype)initWithWikiMediaTag:(NSString *)wikiMediaTag imageName:(NSStrin
     return self;
 }
 
-- (NSString *)getUrlWithCommonAttributions:(BOOL)isWikimediaCategory;
+- (NSString *)getUrlWithCommonAttributions
 {
-    if (!isWikimediaCategory)
-    {
-        NSString *url = [NSString stringWithFormat:@"%@%@%@", WIKIMEDIA_COMMONS_URL, WIKIMEDIA_FILE, _wikiMediaTag];
-        return url;
-    }
-    else
-    {
-        NSString *url = [NSString stringWithFormat:@"%@%@", WIKIMEDIA_COMMONS_URL, _wikiMediaTag];
-        return url;
-    }
+    return [NSString stringWithFormat:@"%@%@%@", WIKIMEDIA_COMMONS_URL, WIKIMEDIA_FILE, _wikiMediaTag];
 }
 
 @end
@@ -58,24 +49,17 @@ @interface OAWikiImageCard ()
 @implementation OAWikiImageCard
 {
     NSString *_urlWithCommonAttributions;
-    BOOL _isWikimediaCategory;
 }
 
 @dynamic type, title, url, imageUrl, topIcon;
 
 - (instancetype)initWithWikiImage:(OAWikiImage *)wikiImage type:(NSString *)type
-{
-    return [self initWithWikiImage:wikiImage type:type wikimediaCategory:NO];
-}
-
-- (instancetype)initWithWikiImage:(OAWikiImage *)wikiImage type:(NSString *)type wikimediaCategory:(BOOL)isWikimediaCategory
 {
     self = [super init];
     if (self)
     {
-        _isWikimediaCategory = isWikimediaCategory;
         self.type = type;
-        _urlWithCommonAttributions =  [wikiImage getUrlWithCommonAttributions:_isWikimediaCategory];
+        _urlWithCommonAttributions =  [wikiImage getUrlWithCommonAttributions];
         if (self.topIcon.length == 0)
             self.topIcon = @"ic_custom_logo_wikimedia.png";
         [self setImageUrl:@""];