xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'mapsforge:master' into master

Browse Source
This commit is contained in:
Youcef HILEM 2022-10-21 19:51:51 +02:00 committed by GitHub
commit f9c696e393
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/Integration.md
View File

@ -16,27 +16,27 @@ implementation 'org.slf4j:slf4j-api:1.7.28'
### Android
```groovy
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi-v7a'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-arm64-v8a'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86_64'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]'
implementation 'com.caverock:androidsvg:1.4'
```
### Android (libGDX)
```groovy
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-armeabi-v7a'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-arm64-v8a'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86_64'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]'
implementation 'org.mapsforge:vtm-gdx:[CURRENT-VERSION]'
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]'
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-armeabi-v7a'
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-arm64-v8a'
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86'
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]:natives-x86_64'
implementation 'org.mapsforge:vtm-android-gdx:[CURRENT-VERSION]'
implementation 'com.badlogicgames.gdx:gdx:1.9.10'
implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.10'
implementation 'com.caverock:androidsvg:1.4'

2
gradle.properties
View File

@ -12,7 +12,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Enables namespacing of each library's R class so that its R class includes only the

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

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

2
vtm-android-example/build.gradle
View File

@ -58,7 +58,7 @@ android {
lintOptions { abortOnError false }
packagingOptions {
exclude 'META-INF/services/org.jeo.data.Driver'
exclude 'META-INF/services/io.jeo.data.Driver'
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
}

2
vtm-playground/build.gradle
View File

@ -32,7 +32,7 @@ run {
task fatJar(type: Jar, dependsOn: configurations.runtimeClasspath) {
classifier 'jar-with-dependencies'
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF'
exclude 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/services/io.jeo.data.Driver'
manifest {
attributes 'Main-Class': "${mainClassName}"
}

10
vtm/src/org/oscim/renderer/MapRenderer.java
View File

@ -1,7 +1,7 @@
/*
* Copyright 2012, 2013 Hannes Janetzek
* Copyright 2016 Longri
* Copyright 2018 devemux86
* Copyright 2018-2022 devemux86
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
@ -34,7 +34,7 @@ import java.nio.ShortBuffer;
import static org.oscim.backend.GLAdapter.gl;
public class MapRenderer {
static final Logger log = LoggerFactory.getLogger(MapRenderer.class);
private static final Logger log = LoggerFactory.getLogger(MapRenderer.class);
/**
* scale factor used for short vertices
@ -93,7 +93,11 @@ public class MapRenderer {
mMap.beginFrame();
draw();
try {
draw();
} catch (Throwable t) {
log.error(t.getMessage(), t);
}
mMap.doneFrame(rerender);

4
vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
View File

@ -308,13 +308,11 @@ public class MapDatabase implements ITileDataSource {
processBlocks(sink, queryParameters, subFileParameter, tile.getBoundingBox(), Selector.ALL, new MapReadResult());
else
processBlocks(sink, queryParameters, subFileParameter);
sink.completed(QueryResult.SUCCESS);
} catch (Throwable t) {
log.error(t.getMessage(), t);
sink.completed(QueryResult.FAILED);
return;
}
sink.completed(QueryResult.SUCCESS);
}
@Override

3
vtm/src/org/oscim/tiling/source/mapfile/MultiMapDatabase.java
View File

@ -74,12 +74,11 @@ public class MultiMapDatabase implements ITileDataSource {
mapDatabase.query(tile, dataSink);
}
}
sink.completed(QueryResult.SUCCESS);
} catch (Throwable t) {
log.error(t.getMessage(), t);
sink.completed(QueryResult.FAILED);
return;
}
sink.completed(QueryResult.SUCCESS);
}
@Override