xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Markers: increase properly the view to show partially visible items

Browse Source
This commit is contained in:
Emux 2018-02-20 16:15:24 +02:00
parent e85e056a0c
commit 28e938b536
No known key found for this signature in database
GPG Key ID: 89C6921D7AF2BDD0
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtm/src/org/oscim/layers/marker/ClusterMarkerRenderer.java
View File

@ -2,7 +2,7 @@
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016 Izumi Kawashima * Copyright 2016 Izumi Kawashima
* Copyright 2017 Longri * Copyright 2017 Longri
* Copyright 2017 devemux86 * Copyright 2017-2018 devemux86
* Copyright 2017 nebular * Copyright 2017 nebular
* Copyright 2017 Wolfgang Schramm * Copyright 2017 Wolfgang Schramm
* *
@ -243,7 +243,8 @@ public class ClusterMarkerRenderer extends MarkerRenderer {
//int changedVisible = 0; //int changedVisible = 0;
int numVisible = 0; int numVisible = 0;
mMarkerLayer.map().viewport().getMapExtents(mBox, mExtents); // Increase view to show items that are partially visible
mMarkerLayer.map().viewport().getMapExtents(mBox, Tile.SIZE / 2);
long flip = (long) (Tile.SIZE * v.pos.scale) >> 1; long flip = (long) (Tile.SIZE * v.pos.scale) >> 1;

3
vtm/src/org/oscim/layers/marker/ItemizedLayer.java
View File

@ -24,6 +24,7 @@ package org.oscim.layers.marker;
import org.oscim.backend.CanvasAdapter; import org.oscim.backend.CanvasAdapter;
import org.oscim.core.Box; import org.oscim.core.Box;
import org.oscim.core.Point; import org.oscim.core.Point;
import org.oscim.core.Tile;
import org.oscim.event.Gesture; import org.oscim.event.Gesture;
import org.oscim.event.GestureListener; import org.oscim.event.GestureListener;
import org.oscim.event.MotionEvent; import org.oscim.event.MotionEvent;
@ -190,7 +191,7 @@ public class ItemizedLayer<Item extends MarkerInterface> extends MarkerLayer<Ite
int eventY = (int) event.getY() - mMap.getHeight() / 2; int eventY = (int) event.getY() - mMap.getHeight() / 2;
Viewport mapPosition = mMap.viewport(); Viewport mapPosition = mMap.viewport();
Box box = mapPosition.getBBox(null, 128); Box box = mapPosition.getBBox(null, Tile.SIZE / 2);
box.map2mercator(); box.map2mercator();
box.scale(1E6); box.scale(1E6);

10
vtm/src/org/oscim/layers/marker/MarkerRenderer.java
View File

@ -2,7 +2,7 @@
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016 Izumi Kawashima * Copyright 2016 Izumi Kawashima
* Copyright 2017 Longri * Copyright 2017 Longri
* Copyright 2017 devemux86 * Copyright 2017-2018 devemux86
* Copyright 2017 nebular * Copyright 2017 nebular
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
@ -41,11 +41,6 @@ public class MarkerRenderer extends BucketRenderer {
protected final MarkerLayer<MarkerInterface> mMarkerLayer; protected final MarkerLayer<MarkerInterface> mMarkerLayer;
protected final Point mMapPoint = new Point(); protected final Point mMapPoint = new Point();
/**
* increase view to show items that are partially visible
*/
protected int mExtents = 100;
/** /**
* flag to force update of markers * flag to force update of markers
*/ */
@ -74,7 +69,8 @@ public class MarkerRenderer extends BucketRenderer {
//int changedVisible = 0; //int changedVisible = 0;
int numVisible = 0; int numVisible = 0;
mMarkerLayer.map().viewport().getMapExtents(mBox, mExtents); // Increase view to show items that are partially visible
mMarkerLayer.map().viewport().getMapExtents(mBox, Tile.SIZE / 2);
long flip = (long) (Tile.SIZE * v.pos.scale) >> 1; long flip = (long) (Tile.SIZE * v.pos.scale) >> 1;