From 80634a4adf55fbf124707ef0356043b7233f82c1 Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Wed, 10 Jan 2018 20:53:56 +0200
Subject: [PATCH] Samples improvements #32
---
.../src/org/oscim/android/test/AtlasThemeActivity.java | 9 ++++++++-
.../oscim/android/test/MapsforgePolyLabelActivity.java | 9 ++++++++-
.../src/org/oscim/android/test/NewGesturesActivity.java | 1 -
.../src/org/oscim/android/test/POTTextureActivity.java | 9 ++++++++-
4 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/vtm-android-example/src/org/oscim/android/test/AtlasThemeActivity.java b/vtm-android-example/src/org/oscim/android/test/AtlasThemeActivity.java
index d0dcb1dd..c5188dc8 100644
--- a/vtm-android-example/src/org/oscim/android/test/AtlasThemeActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/AtlasThemeActivity.java
@@ -1,6 +1,6 @@
/*
* Copyright 2017 Longri
- * Copyright 2017 devemux86
+ * Copyright 2017-2018 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
@@ -27,4 +27,11 @@ public class AtlasThemeActivity extends SimpleMapActivity {
super.onCreate(savedInstanceState);
}
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+
+ Parameters.TEXTURE_ATLAS = false;
+ }
}
diff --git a/vtm-android-example/src/org/oscim/android/test/MapsforgePolyLabelActivity.java b/vtm-android-example/src/org/oscim/android/test/MapsforgePolyLabelActivity.java
index 8c2ac434..cc250ed2 100644
--- a/vtm-android-example/src/org/oscim/android/test/MapsforgePolyLabelActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/MapsforgePolyLabelActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 devemux86
+ * Copyright 2017-2018 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
@@ -26,4 +26,11 @@ public class MapsforgePolyLabelActivity extends MapsforgeMapActivity {
super.onCreate(savedInstanceState);
}
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+
+ Parameters.POLY_LABEL = false;
+ }
}
diff --git a/vtm-android-example/src/org/oscim/android/test/NewGesturesActivity.java b/vtm-android-example/src/org/oscim/android/test/NewGesturesActivity.java
index 2045c040..599a6e75 100644
--- a/vtm-android-example/src/org/oscim/android/test/NewGesturesActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/NewGesturesActivity.java
@@ -27,7 +27,6 @@ public class NewGesturesActivity extends MarkerOverlayActivity {
protected void onDestroy() {
super.onDestroy();
- // Revert gestures for other activities
Parameters.MAP_EVENT_LAYER2 = false;
}
}
diff --git a/vtm-android-example/src/org/oscim/android/test/POTTextureActivity.java b/vtm-android-example/src/org/oscim/android/test/POTTextureActivity.java
index bef12fc1..bacb5ee0 100644
--- a/vtm-android-example/src/org/oscim/android/test/POTTextureActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/POTTextureActivity.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 devemux86
+ * Copyright 2017-2018 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
@@ -26,4 +26,11 @@ public class POTTextureActivity extends SimpleMapActivity {
super.onCreate(savedInstanceState);
}
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+
+ Parameters.POT_TEXTURES = false;
+ }
}