Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-06-26 19:17:48 +02:00
commit 29476edd29
5 changed files with 73 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -107,6 +107,7 @@ import net.osmand.plus.views.OsmAndMapLayersView;
import net.osmand.plus.views.OsmAndMapSurfaceView;
import net.osmand.plus.views.OsmandMapLayer;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.plus.views.RulerControlLayer;
import net.osmand.plus.views.corenative.NativeCoreContext;
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControllerType;
@ -293,6 +294,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
@Override
public void onDrawerSlide(View drawerView, float slideOffset) {
mapView.setMultiTouch(false);
mapView.setMultiTouchEndTime(0);
mapView.getLayerByClass(RulerControlLayer.class).refreshMapDelayed();
}
@Override

6
OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
View file

@ -408,10 +408,10 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
for(int i = 0; i < name.length(); i++) {
char c = name.charAt(i);
if(Character.isLetter(c) || Character.getType(c) == Character.LETTER_NUMBER) {
if(Character.toUpperCase(c) != c && Character.toLowerCase(c) == c) {
lower ++;
} else {
if(Character.isUpperCase(c)) {
capital ++;
} else {
lower ++;
}
} else {
nonalpha ++;

20
OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java
View file

@ -166,7 +166,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
private float secondTouchPointX;
private float secondTouchPointY;
private boolean multiTouch;
private long multiTouchTime;
private long multiTouchEndTime;
public OsmandMapTileView(MapActivity activity, int w, int h) {
this.activity = activity;
@ -336,8 +336,12 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
this.multiTouch = multiTouch;
}
public long getMultiTouchTime() {
return multiTouchTime;
public long getMultiTouchEndTime() {
return multiTouchEndTime;
}
public void setMultiTouchEndTime(long multiTouchEndTime) {
this.multiTouchEndTime = multiTouchEndTime;
}
public void setIntZoom(int zoom) {
@ -995,6 +999,8 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
private LatLon initialCenterLatLon;
private boolean startRotating = false;
private static final float ANGLE_THRESHOLD = 30;
private int cacheIntZoom = getZoom();
private double cacheFractionalZoom = getZoomFractionalPart();
@Override
public void onZoomOrRotationEnded(double relativeToStart, float angleRelative) {
@ -1048,7 +1054,6 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
secondTouchPointX = x2;
secondTouchPointY = y2;
multiTouch = true;
multiTouchTime = System.currentTimeMillis();
}
}
@ -1064,6 +1069,13 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
@Override
public void onActionPointerUp() {
multiTouch = false;
if (cacheIntZoom != getZoom() || cacheFractionalZoom != getZoomFractionalPart()) {
cacheIntZoom = getZoom();
cacheFractionalZoom = getZoomFractionalPart();
multiTouchEndTime = 0;
} else {
multiTouchEndTime = System.currentTimeMillis();
}
}
@Override

56
OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java
View file

@ -8,6 +8,8 @@ import android.graphics.Paint;
import android.graphics.Paint.Style;
import android.graphics.Path;
import android.graphics.Rect;
import android.os.Handler;
import android.os.Message;
import android.view.View;
import net.osmand.Location;
@ -25,7 +27,9 @@ import gnu.trove.list.array.TIntArrayList;
public class RulerControlLayer extends OsmandMapLayer {
public static final long DELAY = 1500;
private static final int TEXT_SIZE = 14;
private final MapActivity mapActivity;
private OsmandApplication app;
private OsmandMapTileView view;
@ -38,10 +42,11 @@ public class RulerControlLayer extends OsmandMapLayer {
private double roundedDist;
private QuadPoint cacheCenter;
private int cacheZoom;
private int cacheIntZoom;
private double cacheFractionalZoom;
private double cacheTileX;
private double cacheTileY;
private long cacheMultiTouchTime;
private long cacheMultiTouchEndTime;
private ArrayList<String> cacheDistances;
private Path distancePath;
private TIntArrayList tx;
@ -53,12 +58,14 @@ public class RulerControlLayer extends OsmandMapLayer {
private RenderingLineAttributes lineAttrs;
private RenderingLineAttributes circleAttrs;
private Handler handler;
public RulerControlLayer(MapActivity mapActivity) {
this.mapActivity = mapActivity;
}
@Override
public void initLayer(OsmandMapTileView view) {
public void initLayer(final OsmandMapTileView view) {
app = mapActivity.getMyApplication();
this.view = view;
cacheDistances = new ArrayList<>();
@ -87,6 +94,13 @@ public class RulerControlLayer extends OsmandMapLayer {
circleAttrs.paint3.setTextSize(TEXT_SIZE * mapActivity.getResources().getDisplayMetrics().density);
circleAttrs.shadowPaint.setStrokeWidth(6);
circleAttrs.shadowPaint.setColor(Color.WHITE);
handler = new Handler() {
@Override
public void handleMessage(Message msg) {
view.refreshMap();
}
};
}
@Override
@ -99,15 +113,21 @@ public class RulerControlLayer extends OsmandMapLayer {
final QuadPoint center = tb.getCenterPixelPoint();
final RulerMode mode = app.getSettings().RULER_MODE.get();
if (cacheMultiTouchTime != view.getMultiTouchTime()) {
cacheMultiTouchTime = view.getMultiTouchTime();
if (cacheIntZoom != view.getZoom() || cacheFractionalZoom != view.getZoomFractionalPart()) {
cacheIntZoom = view.getZoom();
cacheFractionalZoom = view.getZoomFractionalPart();
view.setMultiTouchEndTime(0);
cacheMultiTouchEndTime = 0;
} else if (cacheMultiTouchEndTime != view.getMultiTouchEndTime()) {
cacheMultiTouchEndTime = view.getMultiTouchEndTime();
refreshMapDelayed();
}
if (view.isMultiTouch() || System.currentTimeMillis() - cacheMultiTouchTime < 3000) {
if (!view.isZooming() && view.isMultiTouch() || System.currentTimeMillis() - cacheMultiTouchEndTime < DELAY) {
float x1 = view.getFirstTouchPointX();
float y1 = view.getFirstTouchPointY();
float x2 = view.getSecondTouchPointX();
float y2 = view.getSecondTouchPointY();
drawFingerDistance(canvas, tb, center, x1, y1, x2, y2);
drawFingerDistance(canvas, tb, center, x1, y1, x2, y2, settings.isNightMode());
} else if (mode == RulerMode.FIRST) {
drawCenterIcon(canvas, tb, center, settings.isNightMode());
Location currentLoc = app.getLocationProvider().getLastKnownLocation();
@ -125,12 +145,28 @@ public class RulerControlLayer extends OsmandMapLayer {
}
}
private void drawFingerDistance(Canvas canvas, RotatedTileBox tb, QuadPoint center, float x1, float y1, float x2, float y2) {
public void refreshMapDelayed() {
handler.sendEmptyMessageDelayed(0, DELAY + 50);
}
private void drawFingerDistance(Canvas canvas, RotatedTileBox tb, QuadPoint center, float x1, float y1, float x2, float y2, boolean nightMode) {
canvas.rotate(-tb.getRotate(), center.x, center.y);
canvas.drawLine(x1, y1, x2, y2, lineAttrs.paint);
drawFingerTouchIcon(canvas, x1, y1, nightMode);
drawFingerTouchIcon(canvas, x2, y2, nightMode);
canvas.rotate(tb.getRotate(), center.x, center.y);
}
private void drawFingerTouchIcon(Canvas canvas, float x, float y, boolean nightMode) {
if (nightMode) {
canvas.drawBitmap(centerIconNight, x - centerIconNight.getWidth() / 2,
y - centerIconNight.getHeight() / 2, bitmapPaint);
} else {
canvas.drawBitmap(centerIconDay, x - centerIconDay.getWidth() / 2,
y - centerIconDay.getHeight() / 2, bitmapPaint);
}
}
private void drawCenterIcon(Canvas canvas, RotatedTileBox tb, QuadPoint center, boolean nightMode) {
canvas.rotate(-tb.getRotate(), center.x, center.y);
if (nightMode) {
@ -166,11 +202,11 @@ public class RulerControlLayer extends OsmandMapLayer {
updateCenter(tb, center);
}
boolean move = tb.getZoom() != cacheZoom || Math.abs(tb.getCenterTileX() - cacheTileX) > 1 ||
boolean move = tb.getZoom() != cacheIntZoom || Math.abs(tb.getCenterTileX() - cacheTileX) > 1 ||
Math.abs(tb.getCenterTileY() - cacheTileY) > 1;
if (!mapActivity.getMapView().isZooming() && move) {
cacheZoom = tb.getZoom();
cacheIntZoom = tb.getZoom();
cacheTileX = tb.getCenterTileX();
cacheTileY = tb.getCenterTileY();
cacheDistances.clear();

9
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -31,6 +31,7 @@ import net.osmand.plus.routing.RouteDirectionInfo;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.OsmandMapLayer.DrawSettings;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.plus.views.RulerControlLayer;
import net.osmand.plus.views.mapwidgets.NextTurnInfoWidget.TurnDrawable;
import net.osmand.router.TurnType;
import net.osmand.util.Algorithms;
@ -185,18 +186,18 @@ public class MapInfoWidgetsFactory {
final String title = map.getResources().getString(R.string.map_widget_show_ruler);
final TextInfoWidget rulerControl = new TextInfoWidget(map) {
boolean needNewLatLon;
long cacheMultiTouchTime;
long cacheMultiTouchEndTime;
@Override
public boolean updateInfo(DrawSettings drawSettings) {
RulerMode mode = map.getMyApplication().getSettings().RULER_MODE.get();
OsmandMapTileView view = map.getMapView();
if (cacheMultiTouchTime != view.getMultiTouchTime()) {
cacheMultiTouchTime = view.getMultiTouchTime();
if (cacheMultiTouchEndTime != view.getMultiTouchEndTime()) {
cacheMultiTouchEndTime = view.getMultiTouchEndTime();
needNewLatLon = true;
}
if (view.isMultiTouch() || System.currentTimeMillis() - cacheMultiTouchTime < 3000) {
if (!view.isZooming() && view.isMultiTouch() || System.currentTimeMillis() - cacheMultiTouchEndTime < RulerControlLayer.DELAY) {
if (needNewLatLon) {
float x1 = view.getFirstTouchPointX();
float y1 = view.getFirstTouchPointY();