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

MapUrl: fix parameters

Browse Source
This commit is contained in:
Emux 2018-01-26 15:30:30 +02:00
parent fd647f7458
commit 08c20daef2
No known key found for this signature in database
GPG Key ID: 89C6921D7AF2BDD0
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
vtm-web/src/org/oscim/gdx/client/MapUrl.java
View File

@ -1,3 +1,20 @@
/*
* Copyright 2013 Hannes Janetzek
* Copyright 2018 devemux86
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.gdx.client; package org.oscim.gdx.client;
import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Timer;
@ -90,19 +107,17 @@ public class MapUrl extends Timer {
@Override @Override
public void run() { public void run() {
mMap.viewport().getMapPosition(pos); mMap.viewport().getMapPosition(pos);
int lat = (int) (MercatorProjection.toLatitude(pos.y) * 1000); int lat = (int) (pos.getLatitude() * 1000);
int lon = (int) (MercatorProjection.toLongitude(pos.x) * 1000); int lon = (int) (pos.getLongitude() * 1000);
int tilt = (int) (pos.tilt);
int rot = (int) (pos.bearing); int rot = (int) (pos.bearing);
rot = (int) (pos.bearing) % 360;
//rot = rot < 0 ? -rot : rot;
if (curZoom != pos.zoomLevel || curLat != lat || curLon != lon if (curZoom != pos.zoomLevel || curLat != lat || curLon != lon
|| curTilt != rot || curRot != (int) (pos.bearing)) { || curTilt != tilt || curRot != rot) {
curLat = lat; curLat = lat;
curLon = lon; curLon = lon;
curZoom = pos.zoomLevel; curZoom = pos.zoomLevel;
curTilt = (int) pos.tilt; curTilt = tilt;
curRot = rot; curRot = rot;
String newURL = Window.Location String newURL = Window.Location