gitouche/osm-focus
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

update SDK and gradle, check permissions, fix location manager onPause, refactoring

Browse source
This commit is contained in:
whbosm 2018-08-29 13:59:10 +02:00
parent 49f0334ca6
commit f00148868e
13 changed files with 782 additions and 465 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
AndroidManifest.xml
View file

@ -1,33 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This file has been modified by whb. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="dk.network42.osmfocus"
android:versionCode="3"
android:versionName="0.1.1rc1" >
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.INTERNET"/>
<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
android:versionCode="4"
android:versionName="0.1.1rc2">
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="19" />
android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<application
android:allowBackup="true"
android:hardwareAccelerated="false"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:hardwareAccelerated="false" >
android:theme="@style/AppTheme">
<activity
android:name="dk.network42.osmfocus.MainActivity"
android:label="@string/app_name" >
android:name=".MainActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="dk.network42.osmfocus.SettingsActivity" android:label="@string/app_name" android:exported="true"/>
<activity
android:name=".SettingsActivity"
android:exported="true"
android:label="@string/app_name" />
<activity
android:name=".LicenseActivity"
android:exported="true"
android:label="@string/app_name" />
</application>
</manifest>

201
assets/LICENSE Normal file
View file

@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

15
build.gradle
View file

@ -4,22 +4,22 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.1.4'
}
}
apply plugin: 'com.android.application'
android {
compileSdkVersion 26
buildToolsVersion "27.0.3"
compileSdkVersion 28
buildToolsVersion "28.0.2"
defaultConfig {
applicationId "dk.network42.osmfocus"
minSdkVersion 14
targetSdkVersion 19
versionName "0.1.1rc1"
versionCode 3
targetSdkVersion 28
versionName "0.1.1rc2"
versionCode 4
}
signingConfigs {
@ -61,13 +61,14 @@ android {
manifest.srcFile "AndroidManifest.xml"
java.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets', 'src/main/assets', 'assets/']
}
}
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:support-v4:26.0.+' //compileSdkVersion
implementation 'com.android.support:support-v4:28.0.+' //compileSdkVersion
}
repositories {

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

14
res/layout/activity_license.xml Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="dk.network42.osmfocus.LicenseActivity">
<TextView
android:id="@+id/license_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin" />
</android.support.v4.widget.NestedScrollView>

4
res/menu/main_activity_actions.xml
View file

@ -1,3 +1,4 @@
<!-- This file has been modified by whb. -->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/action_whereami"
@ -11,5 +12,8 @@
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:showAsAction="never" />
<item
android:id="@+id/action_license"
android:title="License" />
</menu>

2
res/values/dimens.xml
View file

@ -1,7 +1,9 @@
<!-- This file has been modified by whb. -->
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="text_margin">16dp</dimen>
</resources>

4
res/values/strings.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This file has been modified by whb. -->
<resources>
<string name="app_name">OSMfocus</string>
@ -35,5 +36,6 @@
<string name="pref_backmap">Background Map Type</string>
<string name="pref_backmap_summ">Type of background map to show</string>
<string name="info_osm_copyright">&#169; OpenStreetMap contributors</string>
<string name="info_osm_copyright">&#169; OpenStreetMap contributors, ODbL</string>
<string name="title_activity_license">LicenseActivity</string>
</resources>

62
src/dk/network42/osmfocus/LicenseActivity.java Normal file
View file

@ -0,0 +1,62 @@
/*
* Copyright 2018 whb
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package dk.network42.osmfocus;
import android.app.Activity;
import android.os.Bundle;
import android.widget.TextView;
import android.widget.Toast;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
public class LicenseActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_license);
BufferedReader reader = null;
StringBuilder text = new StringBuilder();
try {
reader = new BufferedReader(new InputStreamReader(getAssets().open("LICENSE")));
String mLine;
while ((mLine = reader.readLine()) != null) {
text.append(mLine);
text.append('\n');
}
} catch (IOException e) {
Toast.makeText(getApplicationContext(), "Error reading file!", Toast.LENGTH_LONG).show();
e.printStackTrace();
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
}
}
TextView textView = (TextView) findViewById(R.id.license_text_view);
textView.setText((CharSequence) text);
}
}
}

386
src/dk/network42/osmfocus/MainActivity.java
View file

@ -1,32 +1,17 @@
//This file has been modified by whb.
package dk.network42.osmfocus;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.Calendar;
import java.util.Iterator;
import java.util.List;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
import android.Manifest;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.ComponentCallbacks2;
import android.content.Context;
import android.content.Intent;
import android.content.IntentSender;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.hardware.Sensor;
import android.hardware.SensorEvent;
@ -37,16 +22,15 @@ import android.location.GpsStatus;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.preference.PreferenceManager;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.NotificationCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.GestureDetectorCompat;
import android.util.Log;
import android.view.GestureDetector;
@ -57,25 +41,28 @@ import android.view.ScaleGestureDetector;
import android.view.WindowManager;
import android.widget.Toast;
import java.util.Iterator;
import java.util.List;
public class MainActivity extends Activity implements
LocationListener, GpsStatus.Listener,
SensorEventListener {
public static final String userAgent = "OSMfocus";
public static final String PREFS_NAME = "OSMFocusPrefsFile";
static final int PREFERENCE_REQUEST = 9001;
static final int INVALIDATE_VIEW = 1000;
static final int POLL_NOTIFICATIONS = 1001;
private static final int LOCATION_INTERVAL = 1000; //ms
private static final float LOCATION_DISTANCE = 1f; //meters
public static final String userAgent = "OSMfocus";
private static final String TAG = "OsmFocusActivity";
public static final String PREFS_NAME = "OSMFocusPrefsFile";
public double mLonLastUpd = 0, mLatLastUpd = 0; // Where mapview was last updated
LocationManager mLocationManager;
SensorManager sensorManager;
double mPanLon, mPanLat;
SharedData mG = null;
NotificationManager mNotificationManager;
Handler mHandler;
private Sensor sensorAccelerometer;
private Sensor sensorMagneticField;
private float[] valuesAccelerometer;
@ -84,16 +71,101 @@ public class MainActivity extends Activity implements
private float[] matrixI;
private float[] matrixValues;
private MapView mapView;
double mPanLon, mPanLat;
private OsmServer mOsmServer = new OsmServer(null, userAgent);
private GestureDetectorCompat mGestureDetector;
private ScaleGestureDetector mScaleGestureDetector;
private boolean mScaleInProgress = false;
SharedData mG = null;
public double mLonLastUpd=0, mLatLastUpd=0; // Where mapview was last updated
private final ScaleGestureDetector.OnScaleGestureListener mScaleGestureListener
= new ScaleGestureDetector.SimpleOnScaleGestureListener() {
@Override
public boolean onScaleBegin(ScaleGestureDetector scaleGestureDetector) {
float focusX = scaleGestureDetector.getFocusX();
float focusY = scaleGestureDetector.getFocusY();
Log.d(TAG, "ScaleBegin, focus=" + focusX + "," + focusY);
return true;
}
NotificationManager mNotificationManager;
Handler mHandler;
@Override
public boolean onScale(ScaleGestureDetector scaleGestureDetector) {
float focusX = scaleGestureDetector.getFocusX();
float focusY = scaleGestureDetector.getFocusY();
float scale = scaleGestureDetector.getScaleFactor();
Log.d(TAG, "Scale, scale=" + scale + ", focus=" + focusX + "," + focusY);
mG.mPcfg.setScale(mG.mPcfg.getScale() * scale, mG.mCtx);
mScaleInProgress = true;
mapView.postInvalidate();
return true;
}
@Override
public void onScaleEnd(ScaleGestureDetector scaleGestureDetector) {
Log.d(TAG, "ScaleEnd");
}
};
private final GestureDetector.SimpleOnGestureListener mGestureListener
= new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onDown(MotionEvent event) {
//Log.d(TAG,"onDown: " + event.toString());
mPanLon = mG.mLon;
mPanLat = mG.mLat;
mScaleInProgress = false;
return true;
}
@Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
float distanceY) {
if (mScaleInProgress) {
Log.d(TAG, "Scroll skipped");
return false;
}
//Log.d(TAG, "onScroll: " + e1.toString()+e2.toString());
float dx, dy;
dx = e2.getX() - e1.getX();
dy = e2.getY() - e1.getY();
Log.d(TAG, "Scroll pixels: x=" + dx + " y=" + dy);
mG.mLon = mPanLon - dx / (mG.mPcfg.mScale * MapView.prescale);
double panMercLat = dy / (mG.mPcfg.mScale * MapView.prescale);
mG.mLat = GeoMath.mercatorToLat((GeoMath.latToMercator(mPanLat) + panMercLat));
Log.d(TAG, "Scroll to lon=" + mG.mLon + " lat=" + mG.mLat + " (" + GeoMath.latToMercator(mPanLat) + "+" + panMercLat + ")");
mG.mFollowGPS = false;
mapView.postInvalidate();
return true;
}
@Override
public boolean onFling(MotionEvent event1, MotionEvent event2,
float velocityX, float velocityY) {
Log.d(TAG, "onFling: " + event1.toString() + event2.toString());
return true;
}
// @Override
// public void onLongPress(MotionEvent event) {
// Log.d(TAG, "onLongPress: " + event.toString());
// openOptionsMenu();
// }
//@Override
//public void onShowPress(MotionEvent event) {
// Log.d(TAG, "onShowPress: " + event.toString());
//}
//@Override
//public boolean onSingleTapUp(MotionEvent event) {
// Log.d(TAG, "onSingleTapUp: " + event.toString());
// return true;
// }
};
public static void showOkDialog(Context context, String txt) {
Builder builder = new AlertDialog.Builder(context);
builder.setMessage(txt);
builder.setCancelable(true);
builder.setPositiveButton("OK", null);
AlertDialog dialog = builder.create();
dialog.show();
}
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -110,11 +182,12 @@ public class MainActivity extends Activity implements
//requestWindowFeature(Window.FEATURE_NO_TITLE);
getActionBar().setDisplayShowTitleEnabled(false);
Log.i(TAG, "API level "+Build.VERSION.SDK_INT);
Log.i(TAG, "API level " + Build.VERSION.SDK_INT);
mHandler = new Handler(Looper.getMainLooper()) {
int mNotifId;
boolean mNotifActive;
@Override
public void handleMessage(Message inputMessage) {
switch (inputMessage.what) {
@ -125,9 +198,9 @@ public class MainActivity extends Activity implements
case POLL_NOTIFICATIONS:
int dlsb = mG.mTileLayerProvider.getActiveDownloads();
int dlsv = mG.mVectorLayerProvider.getActiveDownloads();
Log.d(TAG, "Downloads active="+dlsb+"+"+dlsv);
if (dlsb>0 || dlsv>0) {
if (! mNotifActive) {
Log.d(TAG, "Downloads active=" + dlsb + "+" + dlsv);
if (dlsb > 0 || dlsv > 0) {
if (!mNotifActive) {
String st = "Downloading...";
mNotifId = setOsmLoadNotif(st);
mNotifActive = true;
@ -158,23 +231,23 @@ public class MainActivity extends Activity implements
} else {
long maxMemL = Runtime.getRuntime().maxMemory();
int maxMem = (int) Math.min(maxMemL, Integer.MAX_VALUE);
Log.i(TAG, "maxMemory="+maxMem);
Log.i(TAG, "maxMemory=" + maxMem);
mG = new SharedData();
mapView.setSharedData(mG);
mG.mTileLayerProvider = new OsmTileProvider(mG.mOsmServerAgentName, OsmTile.MAX_DOWNLOAD_THREADS);
mG.mTileLayer = new OsmTileLayerBm(mG.mTileLayerProvider, maxMem/4);
mG.mTileLayer = new OsmTileLayerBm(mG.mTileLayerProvider, maxMem / 4);
mG.mTileLayer.setAttrib(getApplicationContext().getString(R.string.info_osm_copyright));
mG.mTileLayer.setMainHandler(mHandler);
mG.mTileLayer.setProviderUrl(OsmTileLayer.urlFromType(mG.mPcfg.mBackMapType));
mG.mVectorLayerProvider = new OsmTileProvider(mG.mOsmServerAgentName);
mG.mVectorLayer = new OsmTileLayerVector(mG.mVectorLayerProvider, maxMem/8);
mG.mVectorLayer = new OsmTileLayerVector(mG.mVectorLayerProvider, maxMem / 8);
mG.mVectorLayer.setSharedData(mG);
mG.mVectorLayer.setMainHandler(mHandler);
mG.update(getApplicationContext());
}
if (mG.mDeveloperMode) {
if(!(Thread.getDefaultUncaughtExceptionHandler() instanceof CustomExceptionHandler)) {
if (!(Thread.getDefaultUncaughtExceptionHandler() instanceof CustomExceptionHandler)) {
Thread.setDefaultUncaughtExceptionHandler(new CustomExceptionHandler(mG, ""));
}
}
@ -185,22 +258,8 @@ public class MainActivity extends Activity implements
mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
mLocationManager.addGpsStatusListener(this);
Location loc = getMostRecentKnownLocation();
if (loc != null)
this.onLocationChanged(loc);
if (mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
mLocationManager.requestLocationUpdates(
LocationManager.GPS_PROVIDER, LOCATION_INTERVAL, LOCATION_DISTANCE, this);
} else if (mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
mLocationManager.requestLocationUpdates(
LocationManager.NETWORK_PROVIDER, LOCATION_INTERVAL, LOCATION_DISTANCE, this);
}
if (mG.mUseCompass) {
sensorManager = (SensorManager)getSystemService(SENSOR_SERVICE);
sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
sensorAccelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
sensorMagneticField = sensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
valuesAccelerometer = new float[3];
@ -213,13 +272,15 @@ public class MainActivity extends Activity implements
//registerForContextMenu(mapView);
registerComponentCallbacks(new ComponentCallbacks2() {
@ Override
@Override
public void onTrimMemory(int level) {
appTrimMemory(level);
}
public void onLowMemory() {
appTrimMemory(TRIM_MEMORY_COMPLETE);
}
public void onConfigurationChanged(Configuration newConfig) {
//
}
@ -227,7 +288,7 @@ public class MainActivity extends Activity implements
}
public void appTrimMemory(int level) {
Log.d(TAG, "appTrimMemory("+level+")");
Log.d(TAG, "appTrimMemory(" + level + ")");
if (mG.mTileLayer != null)
mG.mTileLayer.onTrimMemory(level);
if (mG.mVectorLayer != null)
@ -256,26 +317,6 @@ public class MainActivity extends Activity implements
super.onStop();
}
// Define a DialogFragment that displays the error dialog
public static class ErrorDialogFragment extends DialogFragment {
// Global field to contain the error dialog
private Dialog mDialog;
// Default constructor. Sets the dialog field to null
public ErrorDialogFragment() {
super();
mDialog = null;
}
// Set the dialog to display
public void setDialog(Dialog dialog) {
mDialog = dialog;
}
// Return a Dialog to the DialogFragment.
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return mDialog;
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
@ -286,103 +327,14 @@ public class MainActivity extends Activity implements
}
}
public static void showOkDialog(Context context, String txt)
{
Builder builder = new AlertDialog.Builder(context);
builder.setMessage(txt);
builder.setCancelable(true);
builder.setPositiveButton("OK", null);
AlertDialog dialog = builder.create();
dialog.show();
}
@Override
public boolean onTouchEvent(MotionEvent event){
public boolean onTouchEvent(MotionEvent event) {
boolean h = mScaleGestureDetector.onTouchEvent(event);
h |= mGestureDetector.onTouchEvent(event);
h |= super.onTouchEvent(event);
return h;
}
private final ScaleGestureDetector.OnScaleGestureListener mScaleGestureListener
= new ScaleGestureDetector.SimpleOnScaleGestureListener() {
@Override
public boolean onScaleBegin(ScaleGestureDetector scaleGestureDetector) {
float focusX = scaleGestureDetector.getFocusX();
float focusY = scaleGestureDetector.getFocusY();
Log.d(TAG, "ScaleBegin, focus="+focusX+","+focusY);
return true;
}
@Override
public boolean onScale(ScaleGestureDetector scaleGestureDetector) {
float focusX = scaleGestureDetector.getFocusX();
float focusY = scaleGestureDetector.getFocusY();
float scale = scaleGestureDetector.getScaleFactor();
Log.d(TAG, "Scale, scale="+scale+", focus="+focusX+","+focusY);
mG.mPcfg.setScale(mG.mPcfg.getScale()*scale, mG.mCtx);
mScaleInProgress = true;
mapView.postInvalidate();
return true;
}
@Override
public void onScaleEnd(ScaleGestureDetector scaleGestureDetector) {
Log.d(TAG, "ScaleEnd");
}
};
private final GestureDetector.SimpleOnGestureListener mGestureListener
= new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onDown(MotionEvent event) {
//Log.d(TAG,"onDown: " + event.toString());
mPanLon = mG.mLon; mPanLat = mG.mLat;
mScaleInProgress = false;
return true;
}
@Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
float distanceY) {
if (mScaleInProgress) {
Log.d(TAG, "Scroll skipped");
return false;
}
//Log.d(TAG, "onScroll: " + e1.toString()+e2.toString());
float dx, dy;
dx = e2.getX()-e1.getX();
dy = e2.getY()-e1.getY();
Log.d(TAG, "Scroll pixels: x="+dx+" y="+dy);
mG.mLon = mPanLon - dx/(mG.mPcfg.mScale*MapView.prescale);
double panMercLat = dy/(mG.mPcfg.mScale*MapView.prescale);
mG.mLat = GeoMath.mercatorToLat((GeoMath.latToMercator(mPanLat)+panMercLat));
Log.d(TAG, "Scroll to lon="+mG.mLon+" lat="+mG.mLat+" ("+GeoMath.latToMercator(mPanLat)+"+"+panMercLat+")");
mG.mFollowGPS = false;
mapView.postInvalidate();
return true;
}
@Override
public boolean onFling(MotionEvent event1, MotionEvent event2,
float velocityX, float velocityY) {
Log.d(TAG, "onFling: " + event1.toString()+event2.toString());
return true;
}
// @Override
// public void onLongPress(MotionEvent event) {
// Log.d(TAG, "onLongPress: " + event.toString());
// openOptionsMenu();
// }
//@Override
//public void onShowPress(MotionEvent event) {
// Log.d(TAG, "onShowPress: " + event.toString());
//}
//@Override
//public boolean onSingleTapUp(MotionEvent event) {
// Log.d(TAG, "onSingleTapUp: " + event.toString());
// return true;
// }
};
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.main_activity_actions, menu);
@ -393,12 +345,6 @@ public class MainActivity extends Activity implements
return super.onCreateOptionsMenu(menu);
}
//@Override
//public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
// super.onCreateContextMenu(menu, v, menuInfo);
// getMenuInflater().inflate(R.menu.main, menu);
//}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int itemId = item.getItemId();
@ -447,15 +393,51 @@ public class MainActivity extends Activity implements
startActivityForResult(new Intent(this, SettingsActivity.class), PREFERENCE_REQUEST);
mG.update(getApplicationContext());
return true;
} else if (itemId == R.id.action_license) {
startActivity(new Intent(this, LicenseActivity.class));
mG.update(getApplicationContext());
return true;
} else {
return super.onOptionsItemSelected(item);
}
}
//@Override
//public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
// super.onCreateContextMenu(menu, v, menuInfo);
// getMenuInflater().inflate(R.menu.main, menu);
//}
@Override
protected void onResume() {
super.onResume();
//locationManager.requestLocationUpdates(mG.mLocProvider, 1000/*ms*/, 1/*meters*/, this);
mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
if (mLocationManager != null) {
if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
== PackageManager.PERMISSION_GRANTED) {
mLocationManager.addGpsStatusListener(this);
}
Location loc = getMostRecentKnownLocation();
if (loc != null)
this.onLocationChanged(loc);
if (mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
== PackageManager.PERMISSION_GRANTED) {
mLocationManager.requestLocationUpdates(
LocationManager.GPS_PROVIDER, LOCATION_INTERVAL, LOCATION_DISTANCE, this);
}
} else if (mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
== PackageManager.PERMISSION_GRANTED) {
mLocationManager.requestLocationUpdates(
LocationManager.NETWORK_PROVIDER, LOCATION_INTERVAL, LOCATION_DISTANCE, this);
}
}
}
if (mG.mUseCompass) {
sensorManager.registerListener(this,
sensorAccelerometer,
@ -469,6 +451,15 @@ public class MainActivity extends Activity implements
@Override
protected void onPause() {
super.onPause();
if (mLocationManager != null) {
try {
mLocationManager.removeUpdates(this);
} catch (Exception e) {
Log.e(TAG, "removeUpdates failed", e);
}
}
if (mG.mUseCompass) {
sensorManager.unregisterListener(this,
sensorAccelerometer);
@ -481,16 +472,19 @@ public class MainActivity extends Activity implements
Location loc = null;
long besttime = 0;
List<String> allp = mLocationManager.getAllProviders();
for (String p: allp) {
for (String p : allp) {
if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
== PackageManager.PERMISSION_GRANTED) {
Location l = mLocationManager.getLastKnownLocation(p);
if (l != null) {
long time = l.getTime();
if (time>besttime) {
if (time > besttime) {
loc = l;
besttime = time;
}
}
}
}
return loc;
}
@ -506,7 +500,7 @@ public class MainActivity extends Activity implements
}
//Log.d(TAG, "onLocationChanged, Loc="+mG.mPhyLocation);
final double noise = 0.00002;
if (Math.abs(mLonLastUpd-curr_lon)>noise || Math.abs(mLatLastUpd-curr_lat)>noise) {
if (Math.abs(mLonLastUpd - curr_lon) > noise || Math.abs(mLatLastUpd - curr_lat) > noise) {
mLonLastUpd = curr_lon;
mLatLastUpd = curr_lat;
mapView.postInvalidate();
@ -532,6 +526,8 @@ public class MainActivity extends Activity implements
boolean statchg = false;
switch (event) {
case GpsStatus.GPS_EVENT_SATELLITE_STATUS:
if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
== PackageManager.PERMISSION_GRANTED) {
GpsStatus gstat = mLocationManager.getGpsStatus(null);
if (gstat != null) {
Iterable<GpsSatellite> satellites = gstat.getSatellites();
@ -549,6 +545,7 @@ public class MainActivity extends Activity implements
mG.mSatelitesVisible = num;
mG.mSatelitesUsed = used;
}
}
break;
}
if (statchg)
@ -558,14 +555,14 @@ public class MainActivity extends Activity implements
@Override
public void onSensorChanged(SensorEvent event) {
switch(event.sensor.getType()){
switch (event.sensor.getType()) {
case Sensor.TYPE_ACCELEROMETER:
for(int i =0; i < 3; i++){
for (int i = 0; i < 3; i++) {
valuesAccelerometer[i] = event.values[i];
}
break;
case Sensor.TYPE_MAGNETIC_FIELD:
for(int i =0; i < 3; i++){
for (int i = 0; i < 3; i++) {
valuesMagneticField[i] = event.values[i];
}
break;
@ -577,7 +574,7 @@ public class MainActivity extends Activity implements
valuesAccelerometer,
valuesMagneticField);
if(success){
if (success) {
SensorManager.getOrientation(matrixR, matrixValues);
mG.mAzimuth = Math.toDegrees(matrixValues[0]);
@ -607,16 +604,39 @@ public class MainActivity extends Activity implements
mNotificationManager.notify(
notifyID,
mBuilder.build());
Log.d(TAG, "Set OSM notif, id="+notifyID);
Log.d(TAG, "Set OSM notif, id=" + notifyID);
return notifyID;
}
void cancelOsmLoadNotif(int notifyID) {
Log.d(TAG, "Clear OSM notif, id="+notifyID);
Log.d(TAG, "Clear OSM notif, id=" + notifyID);
mNotificationManager.cancel(notifyID);
}
@Override
public void onAccuracyChanged(Sensor sensor, int accuracy) {
}
// Define a DialogFragment that displays the error dialog
public static class ErrorDialogFragment extends DialogFragment {
// Global field to contain the error dialog
private Dialog mDialog;
// Default constructor. Sets the dialog field to null
public ErrorDialogFragment() {
super();
mDialog = null;
}
// Set the dialog to display
public void setDialog(Dialog dialog) {
mDialog = dialog;
}
// Return a Dialog to the DialogFragment.
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return mDialog;
}
}
}

1
src/dk/network42/osmfocus/OsmServer.java
View file

@ -1,3 +1,4 @@
//This file has been modified by whb.
package dk.network42.osmfocus;

2
src/dk/network42/osmfocus/OsmTile.java
View file

@ -1,3 +1,5 @@
//This file has been modified by whb.
package dk.network42.osmfocus;
import java.io.IOException;

2
src/dk/network42/osmfocus/OsmTileLayer.java
View file

@ -1,3 +1,5 @@
//This file has been modified by whb.
package dk.network42.osmfocus;
import android.content.ComponentCallbacks2;