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

Update dependencies

Browse Source
This commit is contained in:
Emux 2019-09-18 21:11:15 +03:00
parent 055cd54beb
commit c91833519e
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
11 changed files with 65 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -17,7 +17,7 @@ allprojects {
ext.androidBuildVersionTools = "29.0.2" ext.androidBuildVersionTools = "29.0.2"
ext.gdxVersion = "1.9.10" ext.gdxVersion = "1.9.10"
ext.gwtVersion = "2.8.2" ext.gwtVersion = "2.8.2"
ext.slf4jVersion = "1.7.25" ext.slf4jVersion = "1.7.28"
if (JavaVersion.current().isJava8Compatible()) { if (JavaVersion.current().isJava8Compatible()) {
tasks.withType(Javadoc) { tasks.withType(Javadoc) {

45
docs/Integration.md
View File

@ -10,7 +10,7 @@ Current version is [![Maven Central](https://img.shields.io/maven-central/v/org.
```groovy ```groovy
implementation 'org.mapsforge:vtm:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm:[CURRENT-VERSION]'
implementation 'org.mapsforge:vtm-themes:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-themes:[CURRENT-VERSION]'
implementation 'org.slf4j:slf4j-api:1.7.25' implementation 'org.slf4j:slf4j-api:1.7.28'
``` ```
### Android ### Android
@ -20,7 +20,7 @@ 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-arm64-v8a'
implementation 'org.mapsforge:vtm-android:[CURRENT-VERSION]:natives-x86' 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]:natives-x86_64'
implementation 'com.caverock:androidsvg:1.3' implementation 'com.caverock:androidsvg:1.4'
``` ```
### Android (libGDX) ### Android (libGDX)
@ -38,7 +38,7 @@ 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]:natives-x86_64'
implementation 'com.badlogicgames.gdx:gdx:1.9.10' implementation 'com.badlogicgames.gdx:gdx:1.9.10'
implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.10' implementation 'com.badlogicgames.gdx:gdx-backend-android:1.9.10'
implementation 'com.caverock:androidsvg:1.3' implementation 'com.caverock:androidsvg:1.4'
``` ```
### iOS ### iOS
@ -59,12 +59,12 @@ implementation 'org.mapsforge:vtm-desktop:[CURRENT-VERSION]:natives-windows'
implementation 'org.mapsforge:vtm-desktop-lwjgl:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-desktop-lwjgl:[CURRENT-VERSION]'
implementation 'com.badlogicgames.gdx:gdx:1.9.10' implementation 'com.badlogicgames.gdx:gdx:1.9.10'
implementation 'com.badlogicgames.gdx:gdx-platform:1.9.10:natives-desktop' implementation 'com.badlogicgames.gdx:gdx-platform:1.9.10:natives-desktop'
implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10'
implementation 'com.github.blackears:svgSalamander:v1.1.1' implementation 'com.github.blackears:svgSalamander:v1.1.1'
``` ```
### Desktop (LWJGL) ### Desktop (LWJGL)
```groovy ```groovy
implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10'
implementation 'org.lwjgl.lwjgl:lwjgl:2.9.3' implementation 'org.lwjgl.lwjgl:lwjgl:2.9.3'
implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-linux' implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-linux'
implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-osx' implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-osx'
@ -73,25 +73,28 @@ implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.3:natives-windows'
### Desktop (LWJGL 3) ### Desktop (LWJGL 3)
```groovy ```groovy
implementation 'org.lwjgl:lwjgl:3.2.1' implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl3:1.9.10'
implementation 'org.lwjgl:lwjgl:3.2.1:natives-linux' implementation 'org.lwjgl:lwjgl:3.2.3'
implementation 'org.lwjgl:lwjgl:3.2.1:natives-macos' implementation 'org.lwjgl:lwjgl:3.2.3:natives-linux'
implementation 'org.lwjgl:lwjgl:3.2.1:natives-windows' implementation 'org.lwjgl:lwjgl:3.2.3:natives-macos'
implementation 'org.lwjgl:lwjgl:3.2.3:natives-windows'
``` ```
### JTS geometries ### JTS geometries
```groovy ```groovy
implementation 'org.mapsforge:vtm-jts:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-jts:[CURRENT-VERSION]'
implementation 'org.locationtech.jts:jts-core:1.15.0' // https://github.com/locationtech/jts/issues/145
implementation 'org.locationtech.jts:jts-core:1.15.1'
``` ```
### Online tiles ### Online tiles
```groovy ```groovy
implementation 'org.mapsforge:vtm-http:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-http:[CURRENT-VERSION]'
implementation 'com.squareup.okhttp3:okhttp:3.8.0' // https://github.com/square/okhttp/issues/4481
implementation 'com.squareup.okio:okio:1.13.0' implementation 'com.squareup.okhttp3:okhttp:3.12.5'
implementation 'com.squareup.okio:okio:1.15.0'
``` ```
### MBTiles (Android) ### MBTiles (Android)
@ -99,27 +102,29 @@ implementation 'com.squareup.okio:okio:1.13.0'
```groovy ```groovy
implementation 'org.mapsforge:vtm-android-mvt:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-android-mvt:[CURRENT-VERSION]'
implementation 'org.mapsforge:vtm-mvt:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-mvt:[CURRENT-VERSION]'
implementation 'com.google.protobuf:protobuf-java:3.5.1' implementation 'com.google.protobuf:protobuf-java:3.6.1'
implementation 'com.wdtinc:mapbox-vector-tile:3.0.0' implementation 'com.wdtinc:mapbox-vector-tile:3.1.0'
implementation 'org.locationtech.jts:jts-core:1.15.0' // https://github.com/locationtech/jts/issues/145
implementation 'org.locationtech.jts:jts-core:1.15.1'
``` ```
### Mapbox vector tiles ### Mapbox vector tiles
```groovy ```groovy
implementation 'org.mapsforge:vtm-mvt:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-mvt:[CURRENT-VERSION]'
implementation 'com.google.protobuf:protobuf-java:3.5.1' implementation 'com.google.protobuf:protobuf-java:3.6.1'
implementation 'com.wdtinc:mapbox-vector-tile:3.0.0' implementation 'com.wdtinc:mapbox-vector-tile:3.1.0'
implementation 'org.locationtech.jts:jts-core:1.15.0' // https://github.com/locationtech/jts/issues/145
implementation 'org.locationtech.jts:jts-core:1.15.1'
``` ```
### GeoJSON vector tiles ### GeoJSON vector tiles
```groovy ```groovy
implementation 'org.mapsforge:vtm-json:[CURRENT-VERSION]' implementation 'org.mapsforge:vtm-json:[CURRENT-VERSION]'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.8.4' implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.9'
implementation 'com.fasterxml.jackson.core:jackson-core:2.8.4' implementation 'com.fasterxml.jackson.core:jackson-core:2.9.9'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.8.4' implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.9'
``` ```
### jeo (indoor maps) ### jeo (indoor maps)

27
vtm-android-example/src/org/oscim/android/test/MapilionMvtActivity.java
View File

@ -14,8 +14,11 @@
*/ */
package org.oscim.android.test; package org.oscim.android.test;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import okhttp3.CipherSuite;
import okhttp3.ConnectionSpec;
import okhttp3.OkHttpClient;
import org.oscim.android.cache.TileCache; import org.oscim.android.cache.TileCache;
import org.oscim.layers.tile.bitmap.BitmapTileLayer; import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
@ -27,6 +30,10 @@ import org.oscim.tiling.source.UrlTileSource;
import org.oscim.tiling.source.bitmap.DefaultSources; import org.oscim.tiling.source.bitmap.DefaultSources;
import org.oscim.tiling.source.mvt.MapilionMvtTileSource; import org.oscim.tiling.source.mvt.MapilionMvtTileSource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class MapilionMvtActivity extends MapActivity { public class MapilionMvtActivity extends MapActivity {
// Metered API key for demonstration purposes // Metered API key for demonstration purposes
@ -40,7 +47,23 @@ public class MapilionMvtActivity extends MapActivity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
OkHttpEngine.OkHttpFactory factory = new OkHttpEngine.OkHttpFactory(); OkHttpClient.Builder builder = new OkHttpClient.Builder();
// https://github.com/square/okhttp/issues/4053
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
List<CipherSuite> cipherSuites = new ArrayList<>();
List<CipherSuite> modernTlsCipherSuites = ConnectionSpec.MODERN_TLS.cipherSuites();
if (modernTlsCipherSuites != null)
cipherSuites.addAll(modernTlsCipherSuites);
cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA);
cipherSuites.add(CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA);
ConnectionSpec legacyTls = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
.cipherSuites(cipherSuites.toArray(new CipherSuite[0]))
.build();
builder.connectionSpecs(Arrays.asList(legacyTls, ConnectionSpec.CLEARTEXT));
}
OkHttpEngine.OkHttpFactory factory = new OkHttpEngine.OkHttpFactory(builder);
UrlTileSource tileSource = MapilionMvtTileSource.builder() UrlTileSource tileSource = MapilionMvtTileSource.builder()
.apiKey(API_KEY) .apiKey(API_KEY)

2
vtm-android/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'com.github.dcendents.android-maven'
dependencies { dependencies {
api project(':vtm') api project(':vtm')
api 'com.caverock:androidsvg:1.3' api 'com.caverock:androidsvg:1.4'
} }
android { android {

3
vtm-app/build.gradle
View File

@ -4,7 +4,8 @@ dependencies {
implementation project(':vtm-android') implementation project(':vtm-android')
implementation project(':vtm-extras') implementation project(':vtm-extras')
implementation project(':vtm-themes') implementation project(':vtm-themes')
implementation 'com.squareup.okhttp3:okhttp:3.8.0' // https://github.com/square/okhttp/issues/4481
implementation 'com.squareup.okhttp3:okhttp:3.12.5'
implementation "org.slf4j:slf4j-android:$slf4jVersion" implementation "org.slf4j:slf4j-android:$slf4jVersion"
} }

7
vtm-extras/build.gradle
View File

@ -3,9 +3,10 @@ apply plugin: 'maven'
dependencies { dependencies {
api project(':vtm') api project(':vtm')
api 'com.fasterxml.jackson.core:jackson-core:2.8.4' api 'com.fasterxml.jackson.core:jackson-core:2.9.9'
api 'org.locationtech.jts:jts-core:1.15.0' // https://github.com/locationtech/jts/issues/145
api 'org.openstreetmap.osmosis:osmosis-osm-binary:0.46' api 'org.locationtech.jts:jts-core:1.15.1'
api 'org.openstreetmap.osmosis:osmosis-osm-binary:0.47'
} }
sourceSets { sourceSets {

3
vtm-http/build.gradle
View File

@ -3,7 +3,8 @@ apply plugin: 'maven'
dependencies { dependencies {
api project(':vtm') api project(':vtm')
api 'com.squareup.okhttp3:okhttp:3.8.0' // https://github.com/square/okhttp/issues/4481
api 'com.squareup.okhttp3:okhttp:3.12.5'
} }
sourceSets { sourceSets {

2
vtm-json/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'maven'
dependencies { dependencies {
api project(':vtm') api project(':vtm')
api 'com.fasterxml.jackson.core:jackson-core:2.8.4' api 'com.fasterxml.jackson.core:jackson-core:2.9.9'
} }
sourceSets { sourceSets {

3
vtm-jts/build.gradle
View File

@ -3,7 +3,8 @@ apply plugin: 'maven'
dependencies { dependencies {
api project(':vtm') api project(':vtm')
api 'org.locationtech.jts:jts-core:1.15.0' // https://github.com/locationtech/jts/issues/145
api 'org.locationtech.jts:jts-core:1.15.1'
} }
sourceSets { sourceSets {

2
vtm-mvt/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'maven'
dependencies { dependencies {
api project(':vtm') api project(':vtm')
api 'com.wdtinc:mapbox-vector-tile:3.0.0' api 'com.wdtinc:mapbox-vector-tile:3.1.0'
} }
sourceSets { sourceSets {

2
vtm/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'maven'
dependencies { dependencies {
api "org.slf4j:slf4j-api:$slf4jVersion" api "org.slf4j:slf4j-api:$slf4jVersion"
compileOnly 'com.google.code.findbugs:jsr305:3.0.1' compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
} }
sourceSets { sourceSets {