Merge remote-tracking branch 'origin/master'

OsmAnd/res/values-sk/strings.xml

@@ -1,11 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources><string name="tip_recent_changes_0_8_3_t">Zmeny vo verzii 0.8.3 :
+<resources>
+  <string name="poi_filter_parking">Parkovanie</string>
+  <string name="poi_filter_emergency">Pomoc v núdzi</string>
+  <string name="poi_filter_public_transport">Verejná doprava</string>
+  <string name="poi_filter_entertainment">Zábava</string>
+  <string name="poi_filter_accomodation">Ubytovanie</string>
+  <string name="poi_filter_restaurants">Reštaurácie</string>
+  <string name="poi_filter_sightseeing">Pamiatky</string>
+  <string name="poi_filter_car_aid">Pomoc s automobilom</string>
+  <string name="poi_filter_food_shop">Jedlo</string>
+  <string name="poi_filter_for_tourists">Pre turistov</string>
+  <string name="poi_filter_fuel">Palivo</string>
+  <string name="btn_add_tag">Pridať značku</string>
+  <string name="btn_advanced_mode">Pokročilý režim...</string>
+  <string name="tip_recent_changes_0_8_3_t">Zmeny vo verzii 0.8.3 :
   \n\t* Vylepšená navigácia
   \n\t* Voľba obídenia diaľnic
   \n\t* Zobrazenie Cycleway=track
   \n\t* Vylepšený vzhľad rozhrania (ikony)
   \n\t* Opravy chýb
-</string>
+  </string>
   <string name="snap_to_road_descr">Prichytenie pozície k cestám počas navigácie</string>
   <string name="snap_to_road">Prichytiť k ceste</string>
   <string name="avoid_motorway">Diaľniciam</string>
@@ -512,12 +526,8 @@
   <string name="km_h">km/h</string>
   <string name="m">m</string>
   <string name="old_map_index_is_not_supported">Verzia indexu \'\'{0}\'\' nie je podporovaná</string>
-  <string name="poi_filter_car_aid">Pomoc s automobilom</string>
   <string name="poi_filter_closest_poi">Najbližsí bod záujmu</string>
   <string name="poi_filter_custom_filter">Vlastný filter</string>
-  <string name="poi_filter_food_shop">Obchody s jedlom</string>
-  <string name="poi_filter_for_tourists">Pre turistov</string>
-  <string name="poi_filter_fuel">Palivo</string>
   <string name="poi_filter_namefinder">Online hľadač mien</string>
   <string name="reading_cached_tiles">Načítavajú sa dlaždice zo zásobníka…</string>
   <string name="version_index_is_big_for_memory">Index \'\'{0}\'\' sa nezmestil do pamäti</string>

OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java

@@ -613,9 +613,12 @@ public class FavouritesActivity extends OsmandExpandableListActivity {
 				ch.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
-						if(ch.isChecked()){
+						if (ch.isChecked()) {
 							groupsToDelete.add(model);
-							favoritesToDelete.addAll(helper.getFavoriteGroups().get(model));
+							List<FavouritePoint> fvs = helper.getFavoriteGroups().get(model);
+							if (fvs != null) {
+								favoritesToDelete.addAll(fvs);
+							}
 							favouritesAdapter.notifyDataSetInvalidated();
 						} else {
 							groupsToDelete.remove(model);

OsmAnd/src/net/osmand/plus/activities/MapActivity.java

@@ -352,15 +352,16 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
 					builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
-							restoreRoutingMode();
+							quit = true;
+							restoreRoutingModeInner();
 
 						}
 					});
 					builder.setNegativeButton(R.string.default_buttons_no, new DialogInterface.OnClickListener() {
 						@Override
 						public void onClick(DialogInterface dialog, int which) {
-							notRestoreRoutingMode();
 							quit = true;
+							notRestoreRoutingMode();
 						}
 					});
 					final AlertDialog dlg = builder.show();
@@ -383,8 +384,11 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
 								delay --;
 								tv.setText(getString(R.string.continue_follow_previous_route_auto, delay + ""));
 								if(delay <= 0) {
-									dlg.dismiss();
-									restoreRoutingMode();
+									if(dlg.isShowing()) {
+										dlg.dismiss();
+									}
+									quit = true;
+									restoreRoutingModeInner();
 								} else {
 									uiHandler.postDelayed(delayDisplay, 1000);
 								}
@@ -394,8 +398,7 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
 					delayDisplay.run();
 				}
 
-				private void restoreRoutingMode() {
-					quit = true;
+				private void restoreRoutingModeInner() {
 					AsyncTask<String, Void, GPXFile> task = new AsyncTask<String, Void, GPXFile>() {
 						@Override
 						protected GPXFile doInBackground(String... params) {

OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java

@@ -45,6 +45,9 @@ public class OsmEditingPlugin extends OsmandPlugin {
 	
 	@Override
 	public void updateLayers(OsmandMapTileView mapView, MapActivity activity){
+		if (osmBugsLayer == null) {
+			registerLayers(activity);
+		}
 		if(mapView.getLayers().contains(osmBugsLayer) != settings.SHOW_OSM_BUGS.get()){
 			if(settings.SHOW_OSM_BUGS.get()){
 				mapView.addLayer(osmBugsLayer, 2);

Osmand-kernel/osmand/src/rendering.cpp

@@ -497,7 +497,7 @@ void drawPolygon(MapDataObject* mObj, RenderingRuleSearchRequest* req, SkCanvas*
 		if (tx > rc->getWidth()) {
 			tx = rc->getWidth();
 		}
-		float ty = rc->calcX;
+		float ty = rc->calcY;
 		if (ty < 0) {
 			ty = 0;
 		}