0.6.0

.travis.yml

@@ -6,9 +6,8 @@ android:
   components:
   - platform-tools
   - tools
-  - build-tools-24.0.3
+  - build-tools-25.0.0
-  - android-24
+  - android-25
-  - extra-android-m2repository
 env:
   global:
   - GRADLE_OPTS="-Xmx2048m"

README.md

@@ -4,7 +4,7 @@
 
 # V™
 
-VTM was developed within the [OpenScienceMap](http://opensciencemap.org) project.
+VTM was developed within the [OpenScienceMap](https://github.com/opensciencemap) project.
 
 **This fork continues VTM development. And provides compatibility with latest [Mapsforge](https://github.com/mapsforge/mapsforge).**
 

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }
@@ -13,7 +13,7 @@ allprojects {
     version = 'master-SNAPSHOT'
     ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
-    ext.androidBuildVersionTools = "24.0.3"
+    ext.androidBuildVersionTools = "25.0.0"
     ext.gdxVersion = "1.9.4"
 
     if (JavaVersion.current().isJava8Compatible()) {
@@ -25,7 +25,7 @@ allprojects {
     }
 }
 
-def androidCompileSdk() { return 24 }
+def androidCompileSdk() { return 25 }
 
 def androidMinSdk() { return 10 }
 

docs/Changelog.md

@@ -2,9 +2,20 @@
 
 ## Version 0.6.X
 
-**Version 0.6.0-rc1 (2016-10-08)**
+### Version 0.6.0 (2016-10-28) -- VTM revive
 
-**Revive of VTM vector map library**
+- Same as 0.6.0-rc3
+
+#### Version 0.6.0-rc3 (2016-10-22)
+
+- Minor improvements and bug fixes
+
+#### Version 0.6.0-rc2 (2016-10-16)
+
+- Location layer [#171](https://github.com/mapsforge/vtm/issues/171)
+- Minor improvements and bug fixes
+
+#### Version 0.6.0-rc1 (2016-10-08)
 
 - Render theme SVG resources [#60](https://github.com/mapsforge/vtm/issues/60)
 - Mapsforge multilingual maps [#34](https://github.com/mapsforge/vtm/issues/34)

vtm-android-example/AndroidManifest.xml

@@ -38,6 +38,9 @@
         <activity
             android:name=".LineTexActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".LocationActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".MapsforgeMapActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />

vtm-android-example/src/org/oscim/android/test/LocationActivity.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2016 devemux86
+ *
+ * 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.android.test;
+
+import android.content.Context;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.os.Bundle;
+
+import org.oscim.core.MapPosition;
+import org.oscim.layers.LocationLayer;
+
+public class LocationActivity extends SimpleMapActivity implements LocationListener {
+    private LocationLayer locationLayer;
+    private LocationManager locationManager;
+    private final MapPosition mapPosition = new MapPosition();
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
+
+        locationLayer = new LocationLayer(mMap);
+        mMap.layers().add(locationLayer);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        enableAvailableProviders();
+        locationLayer.setEnabled(true);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        locationManager.removeUpdates(this);
+        locationLayer.setEnabled(false);
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        locationLayer.setPosition(location.getLatitude(), location.getLongitude(), location.getAccuracy());
+
+        // Follow location
+        mMap.getMapPosition(mapPosition);
+        mapPosition.setPosition(location.getLatitude(), location.getLongitude());
+        mMap.setMapPosition(mapPosition);
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+    }
+
+    @Override
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+    }
+
+    private void enableAvailableProviders() {
+        locationManager.removeUpdates(this);
+
+        for (String provider : locationManager.getProviders(true)) {
+            if (LocationManager.GPS_PROVIDER.equals(provider)
+                    || LocationManager.NETWORK_PROVIDER.equals(provider)) {
+                locationManager.requestLocationUpdates(provider, 0, 0, this);
+            }
+        }
+    }
+}

vtm-android-example/src/org/oscim/android/test/Samples.java

@@ -26,14 +26,10 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.LinearLayout;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * A simple start screen for the sample activities.
  */
 public class Samples extends Activity {
-    public static Logger log = LoggerFactory.getLogger(Samples.class);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,6 +44,7 @@ public class Samples extends Activity {
         linearLayout.addView(createButton(PathOverlayActivity.class));
         linearLayout.addView(createButton(LineTexActivity.class));
         linearLayout.addView(createButton(LayerGroupActivity.class));
+        linearLayout.addView(createButton(LocationActivity.class));
         linearLayout.addView(createButton(ThemeStylerActivity.class));
         linearLayout.addView(createButton(S3DBMapActivity.class));
         linearLayout.addView(createButton(JeoIndoorMapActivity.class));

vtm-app/src/org/oscim/app/location/LocationHandler.java

@@ -2,6 +2,7 @@
  * Copyright 2010, 2011, 2012 mapsforge.org
  * Copyright 2013 Hannes Janetzek
  * Copyright 2013 Ahmad Al-saleem
+ * Copyright 2016 devemux86
  *
  * 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
@@ -31,7 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class LocationHandler implements LocationListener {
-    final static Logger log = LoggerFactory.getLogger(LocationHandler.class);
+    private final static Logger log = LoggerFactory.getLogger(LocationHandler.class);
 
     public enum Mode {
         OFF,
@@ -43,7 +44,7 @@ public class LocationHandler implements LocationListener {
     private final static int SHOW_LOCATION_ZOOM = 14;
 
     private final LocationManager mLocationManager;
-    private final LocationOverlay mLocationOverlay;
+    private final LocationLayerImpl mLocationLayer;
 
     private Mode mMode = Mode.OFF;
 
@@ -54,7 +55,7 @@ public class LocationHandler implements LocationListener {
         mLocationManager = (LocationManager) tileMap
                 .getSystemService(Context.LOCATION_SERVICE);
 
-        mLocationOverlay = new LocationOverlay(App.map, compass);
+        mLocationLayer = new LocationLayerImpl(App.map, compass);
 
         mMapPosition = new MapPosition();
     }
@@ -115,13 +116,13 @@ public class LocationHandler implements LocationListener {
         if (location == null)
             return false;
 
-        mLocationOverlay.setEnabled(true);
+        mLocationLayer.setEnabled(true);
-        mLocationOverlay.setPosition(location.getLatitude(),
+        mLocationLayer.setPosition(location.getLatitude(),
                 location.getLongitude(),
                 location.getAccuracy());
 
         // FIXME -> implement LayerGroup
-        App.map.layers().add(4, mLocationOverlay);
+        App.map.layers().add(4, mLocationLayer);
 
         App.map.updateMap(true);
         return true;
@@ -133,9 +134,9 @@ public class LocationHandler implements LocationListener {
     private boolean disableShowMyLocation() {
 
         mLocationManager.removeUpdates(this);
-        mLocationOverlay.setEnabled(false);
+        mLocationLayer.setEnabled(false);
 
-        App.map.layers().remove(mLocationOverlay);
+        App.map.layers().remove(mLocationLayer);
         App.map.updateMap(true);
 
         return true;
@@ -199,7 +200,7 @@ public class LocationHandler implements LocationListener {
             App.map.setMapPosition(mMapPosition);
         }
 
-        mLocationOverlay.setPosition(lat, lon, location.getAccuracy());
+        mLocationLayer.setPosition(lat, lon, location.getAccuracy());
     }
 
     @Override

vtm-app/src/org/oscim/app/location/LocationLayerImpl.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013 Ahmad Saleem
+ * Copyright 2013 Hannes Janetzek
+ * Copyright 2016 devemux86
+ *
+ * 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.app.location;
+
+import org.oscim.layers.LocationLayer;
+import org.oscim.map.Map;
+
+class LocationLayerImpl extends LocationLayer {
+    private final Compass mCompass;
+
+    LocationLayerImpl(Map map, Compass compass) {
+        super(map);
+        mCompass = compass;
+
+        locationRenderer.setCallback(compass);
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+
+        mCompass.setEnabled(enabled);
+    }
+}

vtm-desktop/src/org/oscim/gdx/GdxMapApp.java

@@ -60,6 +60,7 @@ public class GdxMapApp extends GdxMap {
     }
 
     static protected LwjglApplicationConfiguration getConfig() {
+        LwjglApplicationConfiguration.disableAudio = true;
         LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration();
         cfg.title = "vtm-gdx";
         cfg.width = 800;

vtm/src/org/oscim/core/BoundingBox.java

@@ -267,7 +267,7 @@ public class BoundingBox {
      * @return the longitude span of this BoundingBox in degrees.
      */
     public double getLongitudeSpan() {
-        return getMaxLongitude() - getMinLatitude();
+        return getMaxLongitude() - getMinLongitude();
     }
 
     /**

vtm/src/org/oscim/layers/LocationLayer.java

@@ -14,31 +14,19 @@
  * 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.app.location;
+package org.oscim.layers;
 
 import org.oscim.core.MercatorProjection;
-import org.oscim.layers.Layer;
 import org.oscim.map.Map;
 import org.oscim.renderer.LocationRenderer;
 
-public class LocationOverlay extends Layer {
+public class LocationLayer extends Layer {
-    private final Compass mCompass;
+    public final LocationRenderer locationRenderer;
-    private final LocationRenderer mLocationRenderer;
 
-    public LocationOverlay(Map map, Compass compass) {
+    public LocationLayer(Map map) {
         super(map);
-        mCompass = compass;
 
-        mRenderer = mLocationRenderer = new LocationRenderer(mMap, this);
+        mRenderer = locationRenderer = new LocationRenderer(mMap, this);
-        mLocationRenderer.setCallback(compass);
-    }
-
-    public void setPosition(double latitude, double longitude, double accuracy) {
-        double x = MercatorProjection.longitudeToX(longitude);
-        double y = MercatorProjection.latitudeToY(latitude);
-        double radius = accuracy / MercatorProjection.groundResolution(latitude, 1);
-        mLocationRenderer.setLocation(x, y, radius);
-        mLocationRenderer.animate(true);
     }
 
     @Override
@@ -49,8 +37,14 @@ public class LocationOverlay extends Layer {
         super.setEnabled(enabled);
 
         if (!enabled)
-            mLocationRenderer.animate(false);
+            locationRenderer.animate(false);
+    }
 
-        mCompass.setEnabled(enabled);
+    public void setPosition(double latitude, double longitude, double accuracy) {
+        double x = MercatorProjection.longitudeToX(longitude);
+        double y = MercatorProjection.latitudeToY(latitude);
+        double radius = accuracy / MercatorProjection.groundResolution(latitude, 1);
+        locationRenderer.setLocation(x, y, radius);
+        locationRenderer.animate(true);
     }
 }

vtm/src/org/oscim/renderer/LocationRenderer.java

@@ -2,6 +2,7 @@
  * Copyright 2013 Ahmad Saleem
  * Copyright 2013 Hannes Janetzek
  * Copyright 2016 devemux86
+ * Copyright 2016 ocsike
  *
  * 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
@@ -265,7 +266,7 @@ public class LocationRenderer extends LayerRenderer {
     }
 
     private static final String vShaderStr = ""
-            + "precision highp float;"
+            + "precision mediump float;"
             + "uniform mat4 u_mvp;"
             + "uniform float u_phase;"
             + "uniform float u_scale;"
@@ -277,7 +278,7 @@ public class LocationRenderer extends LayerRenderer {
             + "}";
 
     private static final String fShaderStr1 = ""
-            + "precision highp float;"
+            + "precision mediump float;"
             + "varying vec2 v_tex;"
             + "uniform float u_scale;"
             + "uniform float u_phase;"
@@ -306,7 +307,7 @@ public class LocationRenderer extends LayerRenderer {
             + "}}";
 
     private static final String fShaderStr2 = ""
-            + "precision highp float;"
+            + "precision mediump float;"
             + "varying vec2 v_tex;"
             + "uniform float u_scale;"
             + "uniform float u_phase;"