Showing
1 changed file
with
10 additions
and
4 deletions
| ... | @@ -475,14 +475,11 @@ import MapKit | ... | @@ -475,14 +475,11 @@ import MapKit |
| 475 | 475 | ||
| 476 | let currentMerchant = merchantModel | 476 | let currentMerchant = merchantModel |
| 477 | 477 | ||
| 478 | + if (self.isMarket == true) { | ||
| 478 | if let parent = self.parentMerchantsArray.first(where: {($0._uuid == currentMerchant._parent)}) { | 479 | if let parent = self.parentMerchantsArray.first(where: {($0._uuid == currentMerchant._parent)}) { |
| 479 | let currentMerchantParent = parent | 480 | let currentMerchantParent = parent |
| 480 | 481 | ||
| 481 | - if (self.isMarket == true) { | ||
| 482 | logoImageView.load(link: currentMerchantParent._img_preview , placeholder: UIImage(), cache: URLCache()) | 482 | logoImageView.load(link: currentMerchantParent._img_preview , placeholder: UIImage(), cache: URLCache()) |
| 483 | - } else { | ||
| 484 | - logoImageView.load(link: currentMerchant._img_preview , placeholder: UIImage(), cache: URLCache()) | ||
| 485 | - } | ||
| 486 | 483 | ||
| 487 | pinImageView.addSubview(logoImageView) | 484 | pinImageView.addSubview(logoImageView) |
| 488 | annotationView?.addSubview(pinImageView) | 485 | annotationView?.addSubview(pinImageView) |
| ... | @@ -493,6 +490,15 @@ import MapKit | ... | @@ -493,6 +490,15 @@ import MapKit |
| 493 | } | 490 | } |
| 494 | 491 | ||
| 495 | } else { | 492 | } else { |
| 493 | + logoImageView.load(link: currentMerchant._img_preview , placeholder: UIImage(), cache: URLCache()) | ||
| 494 | + | ||
| 495 | + pinImageView.addSubview(logoImageView) | ||
| 496 | + annotationView?.addSubview(pinImageView) | ||
| 497 | + | ||
| 498 | + return annotationView | ||
| 499 | + } | ||
| 500 | + | ||
| 501 | + } else { | ||
| 496 | return nil | 502 | return nil |
| 497 | } | 503 | } |
| 498 | } | 504 | } | ... | ... |
-
Please register or login to post a comment