pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Fixed bug with duplicate peak icon.

Browse source
This commit is contained in:
v.mikhaylenko 2015-06-18 21:55:43 +03:00 • committed by Alex Zolotarev
parent 10dd481d3c
commit f074299ef0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
iphone/Maps/Classes/MWMBasePlacePageView.mm
View file

@ -109,6 +109,7 @@ static CGFloat const kTitleBottomOffset = 2.;
self.typeLabel.origin = CGPointMake(kLeftOffset, typeMinY);
[self layoutDistanceLabelWithPlacePageWidth:placePageWidth];
[self.typeDescriptionView removeFromSuperview];
if (isExtendedType)
[self layoutTypeDescription];
@ -123,15 +124,15 @@ static CGFloat const kTitleBottomOffset = 2.;
{
MWMPlacePageEntity * entity = self.entity;
CGFloat const typeMinY = self.titleLabel.maxY + kTitleBottomOffset;
[self.typeDescriptionView removeFromSuperview];
self.typeDescriptionView = nil;
MWMPlacePageTypeDescription * typeDescription = [[MWMPlacePageTypeDescription alloc] initWithPlacePageEntity:entity];
self.typeDescriptionView = entity.type == MWMPlacePageEntityTypeHotel ? (UIView *)typeDescription.hotelDescription : (UIView *)typeDescription.eleDescription;
self.typeDescriptionView.autoresizingMask = UIViewAutoresizingNone;
BOOL const typeLabelIsNotEmpty = self.typeLabel.text.length > 0;
CGFloat const minX = typeLabelIsNotEmpty ? self.typeLabel.minX + self.typeLabel.width + 2 * kTitleBottomOffset : kLeftOffset;
CGFloat const minY = typeLabelIsNotEmpty ? self.typeLabel.center.y - self.typeDescriptionView.height / 2. - 1.: typeMinY;
[self addSubview:self.typeDescriptionView];
if (![self.subviews containsObject:self.typeDescriptionView])
[self addSubview:self.typeDescriptionView];
self.typeDescriptionView.origin = CGPointMake(minX, minY);
}