gwt: add MapUrl for url hash parsing and updates

vtm-web-js/src/org/oscim/web/client/GwtLauncher.java

@@ -17,6 +17,7 @@
 package org.oscim.web.client;
 
 import org.oscim.core.Tile;
+import org.oscim.gdx.client.MapConfig;
 import org.timepedia.exporter.client.ExporterUtil;
 
 import com.badlogic.gdx.ApplicationListener;

vtm-web-js/src/org/oscim/web/client/GwtMap.java

@@ -23,7 +23,8 @@ import org.oscim.core.MapPosition;
 import org.oscim.gdx.GdxAssets;
 import org.oscim.gdx.GdxMap;
 import org.oscim.gdx.client.GwtGdxGraphics;
-import org.oscim.gdx.client.UrlUpdater;
+import org.oscim.gdx.client.MapConfig;
+import org.oscim.gdx.client.MapUrl;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.web.js.JsMap;
 import org.slf4j.Logger;
@@ -31,7 +32,6 @@ import org.slf4j.LoggerFactory;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.backends.gwt.GwtApplication;
-import com.google.gwt.user.client.Window;
 
 public class GwtMap extends GdxMap {
 	static final Logger log = LoggerFactory.getLogger(GwtMap.class);
@@ -48,10 +48,6 @@ public class GwtMap extends GdxMap {
 
 		JsMap.init(mMap);
 
-		// 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())
 			GwtGdxGraphics.NO_STROKE_TEXT = true;
@@ -59,45 +55,13 @@ public class GwtMap extends GdxMap {
 		MapConfig c = MapConfig.get();
 		super.create();
 
-		double lat = c.getLatitude();
-		double lon = c.getLongitude();
-		int zoom = c.getZoom();
-
-		float tilt = 0;
-		float rotation = 0;
-
-		if (Window.Location.getHash() != null) {
-			String hash = Window.Location.getHash();
-
-			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);
-		p.bearing = rotation;
-		p.tilt = tilt;
-		mMap.setMapPosition(p);
+		p.setZoomLevel(c.getZoom());
+		p.setPosition(c.getLatitude(), c.getLongitude());
 
-		UrlUpdater urlUpdater = new UrlUpdater(mMap);
-		urlUpdater.scheduleRepeating(4000);
+		MapUrl mapUrl = new MapUrl(mMap);
+		mapUrl.parseUrl(p);
+		mapUrl.scheduleRepeating(5000);
 	}
 
 	private final native void createLayersN()/*-{

vtm-web-js/src/org/oscim/web/client/MapConfig.java

@@ -1,57 +0,0 @@
-/*
- * Copyright 2013 Hannes Janetzek
- *
- * 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.web.client;
-
-import com.google.gwt.core.client.JavaScriptObject;
-
-class MapConfig extends JavaScriptObject {
-	protected MapConfig() {
-	}
-
-	public static native MapConfig get()/*-{
-		return $wnd.mapconfig;
-	}-*/;
-
-	public final native double getLatitude() /*-{
-		return this.latitude;
-	}-*/;
-
-	public final native double getLongitude() /*-{
-		return this.longitude;
-	}-*/;
-
-	public final native int getZoom() /*-{
-		return this.zoom;
-	}-*/;
-
-	public final native String getTileSource() /*-{
-		return this.tilesource;
-	}-*/;
-
-	public final native String getTileUrl() /*-{
-		return this.tileurl;
-	}-*/;
-
-	public final native String getBackgroundLayer() /*-{
-		return this.background;
-	}-*/;
-
-	public final native int getTileSize() /*-{
-		return this.tileSize || 256;
-	}-*/;
-
-}