diff --git a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java index 07cc006282..5eb1f7b16d 100644 --- a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java +++ b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java @@ -224,12 +224,11 @@ public class MapPoiTypes { } public String getTranslation(AbstractPoiType abstractPoiType) { - String translation = null; if(poiTranslator != null) { - translation = poiTranslator.getTranslation(abstractPoiType); - } - if(translation != null) { - return translation; + String translation = poiTranslator.getTranslation(abstractPoiType); + if(translation != null) { + return translation; + } } return Algorithms.capitalizeFirstLetterAndLowercase(abstractPoiType.getName().replace('_', ' ')); } diff --git a/OsmAnd/res/values-ja/phrases.xml b/OsmAnd/res/values-ja/phrases.xml index 64bb23bfa2..07c2e8e873 100644 --- a/OsmAnd/res/values-ja/phrases.xml +++ b/OsmAnd/res/values-ja/phrases.xml @@ -245,4 +245,18 @@ 井戸(Water well) 消火栓(Standpipe) 浄水場(Water works) + ボートヤード(Boatyard) + 下水処理場(Wastewater plant) + 貯水塔(Water tower) + 閘門型水門(Lock gate) + 船舶転回所(Waterway turning point) + 堰(Weir) + ダム(Dam) + 水車小屋(Water mill) + + 変電所(Substation) + 変圧器・トランス(Transformer) + 発電所・発電施設(Power plant) + 発電機(Power generator) + diff --git a/OsmAnd/res/values-ru/phrases.xml b/OsmAnd/res/values-ru/phrases.xml index d885071f89..dbb563f43a 100644 --- a/OsmAnd/res/values-ru/phrases.xml +++ b/OsmAnd/res/values-ru/phrases.xml @@ -691,4 +691,8 @@ Утилизация мусора Проживание Детская одежда + Учебный центр + Квартал + Хоккейная площадка + Командный гандбол diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java index 79a7ba17c5..f58773061d 100644 --- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java @@ -457,7 +457,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment { if(getMyApplication().getRoutingHelper().isRouteCalculated()) { targetPointsHelper.updateRouteAndReferesh(true); } - IntermediatePointsDialog.openIntermediatePointsDialog(getActivity(), getMyApplication(), false); + IntermediatePointsDialog.openIntermediatePointsDialog(getActivity(), getMyApplication(), true); //MapActivity.launchMapActivityMoveToTop(getActivity()); } } diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index 21c6a1f35b..8f2104e08b 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -3,6 +3,45 @@ */ package net.osmand.plus.activities.search; +import gnu.trove.set.hash.TLongHashSet; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import net.osmand.ResultMatcher; +import net.osmand.access.AccessibleToast; +import net.osmand.access.NavigationInfo; +import net.osmand.data.Amenity; +import net.osmand.data.LatLon; +import net.osmand.data.PointDescription; +import net.osmand.osm.PoiCategory; +import net.osmand.osm.PoiType; +import net.osmand.plus.OsmAndFormatter; +import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; +import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.activities.EditPOIFilterActivity; +import net.osmand.plus.activities.MapActivity; +import net.osmand.plus.activities.OsmandListActivity; +import net.osmand.plus.dashboard.DashLocationFragment; +import net.osmand.plus.dialogs.DirectionsDialogs; +import net.osmand.plus.poi.NameFinderPoiFilter; +import net.osmand.plus.poi.PoiLegacyFilter; +import net.osmand.plus.poi.SearchByNameFilter; +import net.osmand.plus.render.RenderingIcons; +import net.osmand.plus.views.DirectionDrawable; +import net.osmand.util.Algorithms; +import net.osmand.util.MapUtils; +import net.osmand.util.OpeningHoursParser; +import net.osmand.util.OpeningHoursParser.OpeningHours; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.content.DialogInterface; @@ -40,47 +79,6 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import net.osmand.ResultMatcher; -import net.osmand.access.AccessibleToast; -import net.osmand.access.NavigationInfo; -import net.osmand.data.Amenity; -import net.osmand.data.LatLon; -import net.osmand.data.PointDescription; -import net.osmand.osm.PoiCategory; -import net.osmand.osm.PoiType; -import net.osmand.plus.OsmAndConstants; -import net.osmand.plus.OsmAndFormatter; -import net.osmand.plus.OsmAndLocationProvider.OsmAndCompassListener; -import net.osmand.plus.OsmAndLocationProvider.OsmAndLocationListener; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.OsmandSettings; -import net.osmand.plus.R; -import net.osmand.plus.activities.EditPOIFilterActivity; -import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.activities.OsmandListActivity; -import net.osmand.plus.dashboard.DashLocationFragment; -import net.osmand.plus.dialogs.DirectionsDialogs; -import net.osmand.plus.poi.NameFinderPoiFilter; -import net.osmand.plus.poi.PoiLegacyFilter; -import net.osmand.plus.poi.SearchByNameFilter; -import net.osmand.plus.render.RenderingIcons; -import net.osmand.plus.views.DirectionDrawable; -import net.osmand.util.Algorithms; -import net.osmand.util.MapUtils; -import net.osmand.util.OpeningHoursParser; -import net.osmand.util.OpeningHoursParser.OpeningHours; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import gnu.trove.set.hash.TLongHashSet; - /** * Search poi activity */ @@ -779,7 +777,6 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa } DirectionDrawable draw = new DirectionDrawable(SearchPOIActivity.this, width, height, R.drawable.ic_destination_arrow_white, - R.color.color_distance); int screenOrientation = DashLocationFragment.getScreenOrientation(SearchPOIActivity.this); if (loc != null) { diff --git a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java index 06a73a4031..d19090985a 100644 --- a/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java +++ b/OsmAnd/src/net/osmand/plus/monitoring/DashTrackFragment.java @@ -157,7 +157,7 @@ public class DashTrackFragment extends DashBaseFragment { } } - private void updateShowOnMap(final OsmandApplication app, final File f, View v, final ImageButton showOnMap) { + private void updateShowOnMap(final OsmandApplication app, final File f, final View pView, final ImageButton showOnMap) { final GpxSelectionHelper selectedGpxHelper = app.getSelectedGpxHelper(); final SelectedGpxFile selected = selectedGpxHelper.getSelectedFileByPath(f.getAbsolutePath()); if(selected != null) { @@ -169,7 +169,7 @@ public class DashTrackFragment extends DashBaseFragment { AvailableGPXFragment.GpxInfo info = new AvailableGPXFragment.GpxInfo(); info.subfolder = ""; info.file = f; - AvailableGPXFragment.udpateGpxInfoView(v, info, app, true); + AvailableGPXFragment.udpateGpxInfoView(pView, info, app, true); updateShowOnMap(app, f, v, showOnMap); } }); diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java b/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java index fca0346b3e..8f33222638 100644 --- a/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java +++ b/OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java @@ -307,7 +307,7 @@ public class PoiFiltersHelper { public class PoiFilterDbHelper { public static final String DATABASE_NAME = "poi_filters"; //$NON-NLS-1$ - private static final int DATABASE_VERSION = 2; + private static final int DATABASE_VERSION = 4; private static final String FILTER_NAME = "poi_filters"; //$NON-NLS-1$ private static final String FILTER_COL_NAME = "name"; //$NON-NLS-1$ private static final String FILTER_COL_ID = "id"; //$NON-NLS-1$ @@ -399,11 +399,12 @@ public class PoiFiltersHelper { } public void onUpgrade(SQLiteConnection conn, int oldVersion, int newVersion) { - if (newVersion == 2 || newVersion == 3) { - upgradeFilters(conn, false); - } else { - upgradeFilters(conn, true); - } +// if (newVersion == 2 || newVersion == 3) { +// upgradeFilters(conn, false); +// } else { + // from version 4 (upgrade) + upgradeFilters(conn, true); +// } conn.setVersion(newVersion); } diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java index 082a3e6952..3104cc4744 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java @@ -231,6 +231,9 @@ public class MapInfoWidgetsFactory { if (routingHelper.isFollowingMode()) { if(settings.SHOW_STREET_NAME.get()) { text = routingHelper.getCurrentName(type); + if(text == null) { + text = ""; + } } } else { int di = MapRouteInfoControl.getDirectionInfo(); @@ -243,6 +246,9 @@ public class MapInfoWidgetsFactory { // if(next.distance > 0) { // text += " " + OsmAndFormatter.getFormattedDistance(next.distance, map.getMyApplication()); // } + if(text == null) { + text = ""; + } } } @@ -252,7 +258,8 @@ public class MapInfoWidgetsFactory { RouteDataObject rt = locationProvider.getLastKnownRouteSegment(); if(rt != null) { text = RoutingHelper.formatStreetName(rt.getName(), rt.getRef(), rt.getDestinationName()); - } else { + } + if(text == null) { text = ""; } } diff --git a/eclipse-compile/observable/.gitignore b/eclipse-compile/observable/.gitignore index 26fc8ba847..15f46acd99 100755 --- a/eclipse-compile/observable/.gitignore +++ b/eclipse-compile/observable/.gitignore @@ -1,2 +1,4 @@ /build -bin +/bin +/gen + diff --git a/plugins/.gitignore b/plugins/.gitignore index cdf0046e9b..d646ac4aa1 100644 --- a/plugins/.gitignore +++ b/plugins/.gitignore @@ -7,4 +7,5 @@ */local.properties # Output files -*/build \ No newline at end of file +*/build +