diff --git a/DataExtractionOSM/src/net/osmand/data/preparation/IndexVectorMapCreator.java b/DataExtractionOSM/src/net/osmand/data/preparation/IndexVectorMapCreator.java index 259a435321..7949a5755f 100644 --- a/DataExtractionOSM/src/net/osmand/data/preparation/IndexVectorMapCreator.java +++ b/DataExtractionOSM/src/net/osmand/data/preparation/IndexVectorMapCreator.java @@ -102,6 +102,7 @@ public class IndexVectorMapCreator extends AbstractIndexPartCreator { } } if(propogated != null) { + ctx.loadEntityRelation((Relation) e); for(EntityId id : ((Relation) e).getMembersMap().keySet()) { if(!propogatedTags.containsKey(id)) { propogatedTags.put(id, new LinkedHashMap()); diff --git a/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java b/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java index 27ec5efb87..c97dd162d6 100644 --- a/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java +++ b/DataExtractionOSM/src/net/osmand/osm/MapRenderingTypes.java @@ -122,6 +122,7 @@ public class MapRenderingTypes { } public boolean isRelationalTagValuePropogated(String tag, String val) { + Map types = getEncodingRuleTypes(); MapRulType rType = types.get(constructRuleKey(tag, val)); if (rType == null) { rType = types.get(constructRuleKey(tag, null)); diff --git a/DataExtractionOSM/src/net/osmand/osm/rendering_types.xml b/DataExtractionOSM/src/net/osmand/osm/rendering_types.xml index d1793e5485..ebc918dd4a 100644 --- a/DataExtractionOSM/src/net/osmand/osm/rendering_types.xml +++ b/DataExtractionOSM/src/net/osmand/osm/rendering_types.xml @@ -700,4 +700,4 @@ - \ No newline at end of file + diff --git a/OsmAnd/res/drawable-hdpi/info_target.png b/OsmAnd/res/drawable-hdpi/info_target.png index c0a351fbb5..a51a91d7aa 100644 Binary files a/OsmAnd/res/drawable-hdpi/info_target.png and b/OsmAnd/res/drawable-hdpi/info_target.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_configuration.png b/OsmAnd/res/drawable-hdpi/list_activities_configuration.png new file mode 100644 index 0000000000..e44dcd3e36 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_configuration.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_day_night_mode.png b/OsmAnd/res/drawable-hdpi/list_activities_day_night_mode.png new file mode 100644 index 0000000000..9b3322ff0a Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_day_night_mode.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_directions_to_here.png b/OsmAnd/res/drawable-hdpi/list_activities_directions_to_here.png index c9fc29b5cd..d45a72a65f 100644 Binary files a/OsmAnd/res/drawable-hdpi/list_activities_directions_to_here.png and b/OsmAnd/res/drawable-hdpi/list_activities_directions_to_here.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_lock_screen.png b/OsmAnd/res/drawable-hdpi/list_activities_lock_screen.png new file mode 100644 index 0000000000..fe598ed90c Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_lock_screen.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_no_polygon.png b/OsmAnd/res/drawable-hdpi/list_activities_no_polygon.png new file mode 100644 index 0000000000..edee18fb3d Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_no_polygon.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_rendering_mode.png b/OsmAnd/res/drawable-hdpi/list_activities_rendering_mode.png new file mode 100644 index 0000000000..41117aebcf Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_rendering_mode.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_rendering_style.png b/OsmAnd/res/drawable-hdpi/list_activities_rendering_style.png new file mode 100644 index 0000000000..c28e52b43c Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_rendering_style.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_ruler.png b/OsmAnd/res/drawable-hdpi/list_activities_ruler.png new file mode 100644 index 0000000000..e26b584436 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_ruler.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_show_contours.png b/OsmAnd/res/drawable-hdpi/list_activities_show_contours.png new file mode 100644 index 0000000000..d8e11a1c2e Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_show_contours.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_street_name.png b/OsmAnd/res/drawable-hdpi/list_activities_street_name.png new file mode 100644 index 0000000000..1d0fb33e96 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_street_name.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_text_size.png b/OsmAnd/res/drawable-hdpi/list_activities_text_size.png new file mode 100644 index 0000000000..0336ce5860 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_text_size.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_time_to_distance.png b/OsmAnd/res/drawable-hdpi/list_activities_time_to_distance.png new file mode 100644 index 0000000000..b3de8bc44f Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_time_to_distance.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_unlocked_screen.png b/OsmAnd/res/drawable-hdpi/list_activities_unlocked_screen.png new file mode 100644 index 0000000000..28db8a4460 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_unlocked_screen.png differ diff --git a/OsmAnd/res/drawable-hdpi/list_activities_viewing_direction.png b/OsmAnd/res/drawable-hdpi/list_activities_viewing_direction.png new file mode 100644 index 0000000000..690453862e Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/list_activities_viewing_direction.png differ diff --git a/OsmAnd/res/drawable-hdpi/progress_blue.png b/OsmAnd/res/drawable-hdpi/progress_blue.png index 3da81b3634..846a5a0c3d 100644 Binary files a/OsmAnd/res/drawable-hdpi/progress_blue.png and b/OsmAnd/res/drawable-hdpi/progress_blue.png differ diff --git a/OsmAnd/res/drawable-large/info_target.png b/OsmAnd/res/drawable-large/info_target.png index c0a351fbb5..a51a91d7aa 100644 Binary files a/OsmAnd/res/drawable-large/info_target.png and b/OsmAnd/res/drawable-large/info_target.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_configuration.png b/OsmAnd/res/drawable-large/list_activities_configuration.png new file mode 100644 index 0000000000..e44dcd3e36 Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_configuration.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_day_night_mode.png b/OsmAnd/res/drawable-large/list_activities_day_night_mode.png new file mode 100644 index 0000000000..9b3322ff0a Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_day_night_mode.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_directions_to_here.png b/OsmAnd/res/drawable-large/list_activities_directions_to_here.png index c9fc29b5cd..d45a72a65f 100644 Binary files a/OsmAnd/res/drawable-large/list_activities_directions_to_here.png and b/OsmAnd/res/drawable-large/list_activities_directions_to_here.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_lock_screen.png b/OsmAnd/res/drawable-large/list_activities_lock_screen.png new file mode 100644 index 0000000000..fe598ed90c Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_lock_screen.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_no_polygon.png b/OsmAnd/res/drawable-large/list_activities_no_polygon.png new file mode 100644 index 0000000000..edee18fb3d Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_no_polygon.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_rendering_mode.png b/OsmAnd/res/drawable-large/list_activities_rendering_mode.png new file mode 100644 index 0000000000..41117aebcf Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_rendering_mode.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_rendering_style.png b/OsmAnd/res/drawable-large/list_activities_rendering_style.png new file mode 100644 index 0000000000..c28e52b43c Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_rendering_style.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_ruler.png b/OsmAnd/res/drawable-large/list_activities_ruler.png new file mode 100644 index 0000000000..e26b584436 Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_ruler.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_show_contours.png b/OsmAnd/res/drawable-large/list_activities_show_contours.png new file mode 100644 index 0000000000..d8e11a1c2e Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_show_contours.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_street_name.png b/OsmAnd/res/drawable-large/list_activities_street_name.png new file mode 100644 index 0000000000..1d0fb33e96 Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_street_name.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_text_size.png b/OsmAnd/res/drawable-large/list_activities_text_size.png new file mode 100644 index 0000000000..0336ce5860 Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_text_size.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_time_to_distance.png b/OsmAnd/res/drawable-large/list_activities_time_to_distance.png new file mode 100644 index 0000000000..b3de8bc44f Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_time_to_distance.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_unlocked_screen.png b/OsmAnd/res/drawable-large/list_activities_unlocked_screen.png new file mode 100644 index 0000000000..28db8a4460 Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_unlocked_screen.png differ diff --git a/OsmAnd/res/drawable-large/list_activities_viewing_direction.png b/OsmAnd/res/drawable-large/list_activities_viewing_direction.png new file mode 100644 index 0000000000..690453862e Binary files /dev/null and b/OsmAnd/res/drawable-large/list_activities_viewing_direction.png differ diff --git a/OsmAnd/res/drawable-large/progress_blue.png b/OsmAnd/res/drawable-large/progress_blue.png index 3da81b3634..846a5a0c3d 100644 Binary files a/OsmAnd/res/drawable-large/progress_blue.png and b/OsmAnd/res/drawable-large/progress_blue.png differ diff --git a/OsmAnd/res/drawable-mdpi/info_target.png b/OsmAnd/res/drawable-mdpi/info_target.png index 1222f0bc18..e7ba93ba54 100644 Binary files a/OsmAnd/res/drawable-mdpi/info_target.png and b/OsmAnd/res/drawable-mdpi/info_target.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_configuration.png b/OsmAnd/res/drawable-mdpi/list_activities_configuration.png new file mode 100644 index 0000000000..6af0d0b864 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_configuration.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_day_night_mode.png b/OsmAnd/res/drawable-mdpi/list_activities_day_night_mode.png new file mode 100644 index 0000000000..b1eb782863 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_day_night_mode.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_directions_to_here.png b/OsmAnd/res/drawable-mdpi/list_activities_directions_to_here.png index 34427abb89..835f20689d 100644 Binary files a/OsmAnd/res/drawable-mdpi/list_activities_directions_to_here.png and b/OsmAnd/res/drawable-mdpi/list_activities_directions_to_here.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_lock_screen.png b/OsmAnd/res/drawable-mdpi/list_activities_lock_screen.png new file mode 100644 index 0000000000..b78e1bb940 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_lock_screen.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_no_polygon.png b/OsmAnd/res/drawable-mdpi/list_activities_no_polygon.png new file mode 100644 index 0000000000..d852ce345f Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_no_polygon.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_rendering_mode.png b/OsmAnd/res/drawable-mdpi/list_activities_rendering_mode.png new file mode 100644 index 0000000000..52d47eea5b Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_rendering_mode.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_rendering_style.png b/OsmAnd/res/drawable-mdpi/list_activities_rendering_style.png new file mode 100644 index 0000000000..8086f7dad4 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_rendering_style.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_ruler.png b/OsmAnd/res/drawable-mdpi/list_activities_ruler.png new file mode 100644 index 0000000000..490a0976fa Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_ruler.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_show_contours.png b/OsmAnd/res/drawable-mdpi/list_activities_show_contours.png new file mode 100644 index 0000000000..c64e8c55e4 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_show_contours.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_street_name.png b/OsmAnd/res/drawable-mdpi/list_activities_street_name.png new file mode 100644 index 0000000000..6b8bcdb21b Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_street_name.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_text_size.png b/OsmAnd/res/drawable-mdpi/list_activities_text_size.png new file mode 100644 index 0000000000..97e3351664 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_text_size.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_time_to_distance.png b/OsmAnd/res/drawable-mdpi/list_activities_time_to_distance.png new file mode 100644 index 0000000000..775f629718 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_time_to_distance.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_unlocked_screen.png b/OsmAnd/res/drawable-mdpi/list_activities_unlocked_screen.png new file mode 100644 index 0000000000..7bd86814ee Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_unlocked_screen.png differ diff --git a/OsmAnd/res/drawable-mdpi/list_activities_viewing_direction.png b/OsmAnd/res/drawable-mdpi/list_activities_viewing_direction.png new file mode 100644 index 0000000000..e7d307f275 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/list_activities_viewing_direction.png differ diff --git a/OsmAnd/res/drawable-mdpi/progress_blue.png b/OsmAnd/res/drawable-mdpi/progress_blue.png index b3ae5a97be..3c5b463052 100644 Binary files a/OsmAnd/res/drawable-mdpi/progress_blue.png and b/OsmAnd/res/drawable-mdpi/progress_blue.png differ