Merge pull request graphhopper#970 from devemux86/vtm

Android: update VTM 0.7.0 OpenGL vector map library

Author: karussell

android/app/build.gradle

@@ -41,15 +41,15 @@ dependencies {
        exclude group: 'org.apache.xmlgraphics', module: 'xmlgraphics-commons'
     }
 
-    compile 'org.mapsforge:vtm:0.6.0'
-    compile 'org.mapsforge:vtm-android:0.6.0'
-    compile 'org.mapsforge:vtm-android:0.6.0:natives-armeabi'
-    compile 'org.mapsforge:vtm-android:0.6.0:natives-armeabi-v7a'
-    compile 'org.mapsforge:vtm-android:0.6.0:natives-x86'
-    compile 'org.mapsforge:vtm-jts:0.6.0'
-    compile 'org.mapsforge:vtm-themes:0.6.0'
+    compile 'org.mapsforge:vtm:0.7.0'
+    compile 'org.mapsforge:vtm-android:0.7.0'
+    compile 'org.mapsforge:vtm-android:0.7.0:natives-armeabi'
+    compile 'org.mapsforge:vtm-android:0.7.0:natives-armeabi-v7a'
+    compile 'org.mapsforge:vtm-android:0.7.0:natives-x86'
+    compile 'org.mapsforge:vtm-jts:0.7.0'
+    compile 'org.mapsforge:vtm-themes:0.7.0'
     compile 'com.caverock:androidsvg:1.2.2-beta-1'
-    compile 'com.vividsolutions:jts:1.13'
+    compile 'com.vividsolutions:jts-core:1.14.0'
 
     compile 'org.slf4j:slf4j-api:1.7.21'
     compile 'org.slf4j:slf4j-android:1.7.21'

android/app/src/main/java/com/graphhopper/android/MainActivity.java

@@ -354,8 +354,8 @@ protected void onPostExecute(Object _ignore) {
     void loadMap(File areaFolder) {
         logUser("loading map");
 
-        // Long press receiver
-        mapView.map().layers().add(new LongPressLayer(mapView.map()));
+        // Map events receiver
+        mapView.map().layers().add(new MapEventsReceiver(mapView.map()));
 
         // Map file source
         MapFileTileSource tileSource = new MapFileTileSource();
@@ -393,7 +393,7 @@ protected void onPostExecute(Path o) {
                     logUser("An error happened while creating graph:"
                             + getErrorMessage());
                 } else {
-                    logUser("Finished loading graph. Press long to define where to start and end the route.");
+                    logUser("Finished loading graph. Long press to define where to start and end the route.");
                 }
 
                 finishPrepare();
@@ -513,9 +513,9 @@ public interface MySpinnerListener {
         void onSelect(String selectedArea, String selectedFile);
     }
 
-    class LongPressLayer extends Layer implements GestureListener {
+    class MapEventsReceiver extends Layer implements GestureListener {
 
-        LongPressLayer(org.oscim.map.Map map) {
+        MapEventsReceiver(org.oscim.map.Map map) {
             super(map);
         }