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

html: add SearchBox for nominatim

Browse Source 
- add simple WKT parser
- extract GwtLaucher inner classes
This commit is contained in:
Hannes Janetzek
2013-08-10 15:00:57 +02:00
parent 8c9eaaea96
commit 6dfd180cb9
6 changed files with 844 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
vtm-gdx-html/src/org/oscim/gdx/client/GwtLauncher.java
View File

@@ -1,32 +1,16 @@
package org.oscim.gdx.client;
// -draftCompile -localWorkers 2
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.oscim.backend.Log;
import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection;
import org.oscim.core.Tile;
import org.oscim.gdx.GdxMap;
import org.oscim.layers.Layer;
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.tile.bitmap.NaturalEarth;
import org.oscim.renderer.GLRenderer;
import org.oscim.tilesource.TileSource;
import org.oscim.tilesource.oscimap2.OSciMap2TileSource;
import org.oscim.tilesource.oscimap4.OSciMap4TileSource;
import org.oscim.view.MapView;
import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.gwt.GwtApplication;
import com.badlogic.gdx.backends.gwt.GwtApplicationConfiguration;
import com.badlogic.gdx.backends.gwt.GwtGraphics;
import com.badlogic.gdx.backends.gwt.preloader.Preloader.PreloaderCallback;
import com.badlogic.gdx.backends.gwt.preloader.Preloader.PreloaderState;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.DockLayoutPanel;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.RootPanel;
@@ -86,121 +70,4 @@ public class GwtLauncher extends GwtApplication {
}
};
}
private static native String getMapConfig(String key)/*-{
return $wnd.mapconfig && $wnd.mapconfig[key] || null;
}-*/;
class GwtGdxMap extends GdxMap {
@Override
public void create() {
// stroke text takes about 70% cpu time in firefox:
// https://bug568526.bugzilla.mozilla.org/attachment.cgi?id=447932
// <- circle/stroke test 800ms firefox, 80ms chromium..
// TODO use texture atlas to avoid drawing text-textures
if (GwtApplication.agentInfo().isLinux() && GwtApplication.agentInfo().isFirefox())
GwtCanvasAdapter.NO_STROKE_TEXT = true;
CanvasAdapter.g = GwtCanvasAdapter.INSTANCE;
GLAdapter.g = (GL20) Gdx.graphics.getGL20();
GLAdapter.GDX_WEBGL_QUIRKS = true;
GLRenderer.setBackgroundColor(0xffffff);
//Gdx.app.setLogLevel(Application.LOG_DEBUG);
super.create();
double lat = Double.parseDouble(getMapConfig("latitude"));
double lon = Double.parseDouble(getMapConfig("longitude"));
int zoom = Integer.parseInt(getMapConfig("zoom"));
float tilt = 0;
float rotation = 0;
if (Window.Location.getHash() != null) {
String hash = Window.Location.getHash();
//Log.d("...", "hash: " + hash);
hash = hash.substring(1);
String[] pairs = hash.split(",");
for (String p : pairs) {
try {
if (p.startsWith("lat="))
lat = Double.parseDouble(p.substring(4));
else if (p.startsWith("lon="))
lon = Double.parseDouble(p.substring(4));
else if (p.startsWith("scale="))
zoom = Integer.parseInt(p.substring(6));
else if (p.startsWith("rot="))
rotation = Float.parseFloat(p.substring(4));
else if (p.startsWith("tilt="))
tilt = Float.parseFloat(p.substring(5));
} catch (NumberFormatException e) {
}
}
}
MapPosition p = new MapPosition();
p.setZoomLevel(zoom);
p.setPosition(lat, lon);
mMapView.setMapPosition(p);
mMapView.getMapViewPosition().setTilt(tilt);
mMapView.getMapViewPosition().setRotation(rotation);
String url = getMapConfig("tileurl");
TileSource tileSource;
if ("oscimap4".equals(getMapConfig("tilesource")))
tileSource = new OSciMap4TileSource();
else
tileSource = new OSciMap2TileSource();
tileSource.setOption("url", url);
initDefaultMap(tileSource, false, true, true);
mMapView.getLayerManager().add(new UrlPositionUpdate(mMapView));
mMapView.setBackgroundMap(new BitmapTileLayer(mMapView, NaturalEarth.INSTANCE));
}
}
class UrlPositionUpdate extends Layer {
public UrlPositionUpdate(MapView mapView) {
super(mapView);
}
private int curLon, curLat, curZoom, curTilt, curRot;
@Override
public void onUpdate(MapPosition pos, boolean changed, boolean clear) {
if (!changed)
return;
int lat = (int) (MercatorProjection.toLatitude(pos.y) * 1000);
int lon = (int) (MercatorProjection.toLongitude(pos.x) * 1000);
int rot = (int) (pos.angle);
rot = (int) (pos.angle) % 360;
rot = rot < 0 ? -rot : rot;
if (curZoom != pos.zoomLevel
|| curLat != lat
|| curLon != lon
|| curTilt != rot
|| curRot != (int) (pos.angle)) {
curLat = lat;
curLon = lon;
curZoom = pos.zoomLevel;
curTilt = (int) pos.tilt;
curRot = rot;
//String newURL = Window.Location.createUrlBuilder()
// .setHash("scale=" + pos.zoomLevel + ",rot=" + curRot + ",tilt=" +
// curTilt + ",lat=" + (curLat / 1000f) + ",lon=" + (curLon / 1000f))
// .buildString();
//Window.Location.replace(newURL);
//Window.Location.
}
}
}
}