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

Review fixes.

Browse source
This commit is contained in:
tatiana-yan 2020-02-05 14:46:09 +03:00 • committed by Aleksandr Zatsepin
parent 1effa57a13
commit 9d00b21198
2 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
View file

@ -31,31 +31,20 @@ public class MapObject implements Parcelable, PopularityProvider, ShareableInfoP
// Order must correspond indexer/map_object.hpp
public enum OsmProps
{
OpeningHours(0),
Phone(1),
Fax(2),
Website(3),
Email(4),
Cuisine(5),
Stars(6),
Operator(7),
Elevation(8),
Internet(9),
Wikipedia(10),
Flats(11),
BuildingLevels(12),
Level(13);
private final int mType;
OsmProps(int type)
{
mType = type;
}
public int toInt()
{
return mType;
}
OpeningHours,
Phone,
Fax,
Website,
Email,
Cuisine,
Stars,
Operator,
Elevation,
Internet,
Wikipedia,
Flats,
BuildingLevels,
Level;
}
@Retention(RetentionPolicy.SOURCE)

14
android/src/com/mapswithme/maps/editor/EditorFragment.java
View file

@ -463,13 +463,13 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
mReset = (TextView) view.findViewById(R.id.reset);
mReset.setOnClickListener(this);
mDetailsBlocks.append(OsmProps.OpeningHours.toInt(), blockOpeningHours);
mDetailsBlocks.append(OsmProps.Phone.toInt(), blockPhone);
mDetailsBlocks.append(OsmProps.Website.toInt(), blockWeb);
mDetailsBlocks.append(OsmProps.Email.toInt(), blockEmail);
mDetailsBlocks.append(OsmProps.Cuisine.toInt(), blockCuisine);
mDetailsBlocks.append(OsmProps.Operator.toInt(), blockOperator);
mDetailsBlocks.append(OsmProps.Internet.toInt(), blockWifi);
mDetailsBlocks.append(OsmProps.OpeningHours.ordinal(), blockOpeningHours);
mDetailsBlocks.append(OsmProps.Phone.ordinal(), blockPhone);
mDetailsBlocks.append(OsmProps.Website.ordinal(), blockWeb);
mDetailsBlocks.append(OsmProps.Email.ordinal(), blockEmail);
mDetailsBlocks.append(OsmProps.Cuisine.ordinal(), blockCuisine);
mDetailsBlocks.append(OsmProps.Operator.ordinal(), blockOperator);
mDetailsBlocks.append(OsmProps.Internet.ordinal(), blockWifi);
}
private static EditText findInput(View blockWithInput)