From bd29fe7171db219bcd62eefdb4836e40cbafd21a Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 15 Sep 2012 02:46:07 +0200 Subject: [PATCH 1/3] Fix display test --- Osmand-kernel/osmand/src/rendering.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osmand-kernel/osmand/src/rendering.cpp b/Osmand-kernel/osmand/src/rendering.cpp index fda881b132..5382296d37 100644 --- a/Osmand-kernel/osmand/src/rendering.cpp +++ b/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; } From 8a5ae6accfc2af6b627db43270466515db3344db Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 15 Sep 2012 17:12:00 +0200 Subject: [PATCH 2/3] Fix exception --- .../plus/activities/FavouritesActivity.java | 7 +++++-- .../net/osmand/plus/activities/MapActivity.java | 15 +++++++++------ .../net/osmand/plus/osmedit/OsmEditingPlugin.java | 3 +++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java index f90278c9f7..4e2196b392 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java +++ b/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 fvs = helper.getFavoriteGroups().get(model); + if (fvs != null) { + favoritesToDelete.addAll(fvs); + } favouritesAdapter.notifyDataSetInvalidated(); } else { groupsToDelete.remove(model); diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 8f310e69c6..5feb0b05b1 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/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 task = new AsyncTask() { @Override protected GPXFile doInBackground(String... params) { diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java index 088a60c8b9..d9e4217df2 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditingPlugin.java +++ b/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); From 3a3f7c44b07bb003993a3eeebf24ac4a6745cf2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an?= Date: Sat, 15 Sep 2012 18:27:44 +0300 Subject: [PATCH 3/3] updated slovak translation --- OsmAnd/res/values-sk/strings.xml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 43cec57c29..0a299fac7c 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -1,11 +1,25 @@ -Zmeny vo verzii 0.8.3 : + + Parkovanie + Pomoc v núdzi + Verejná doprava + Zábava + Ubytovanie + Reštaurácie + Pamiatky + Pomoc s automobilom + Jedlo + Pre turistov + Palivo + Pridať značku + Pokročilý režim... + 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 - + Prichytenie pozície k cestám počas navigácie Prichytiť k ceste Diaľniciam @@ -512,12 +526,8 @@ km/h m Verzia indexu \'\'{0}\'\' nie je podporovaná - Pomoc s automobilom Najbližsí bod záujmu Vlastný filter - Obchody s jedlom - Pre turistov - Palivo Online hľadač mien Načítavajú sa dlaždice zo zásobníka… Index \'\'{0}\'\' sa nezmestil do pamäti