Merge remote-tracking branch 'origin/3.0.x'

build.gradle

@@ -17,7 +17,7 @@ ext {
     mapboxVersion = '4.2.0'
     mapboxServicesVersion = '1.2.1'
     retrofitVersion = '2.3.0'
-    okhttpVersion = '2.3.0'
+    okhttpVersion = '3.9.1'
     simplexmlRetrofitVersion = '2.3.0'
     simplexmlVersion = '2.7.1'
     licensesdialogVersion = '1.8.1'
@@ -123,7 +123,6 @@ android {
         debug {
             versionNameSuffix ".debug-3"
             buildConfigField "String", "BASE_OSM_URL", '"https://www.openstreetmap.org/api/0.6/"'
-            //buildConfigField "String", "BASE_OSM_URL", '"https://master.apis.dev.openstreetmap.org/api/0.6/"'
         }
     }
 
@@ -158,11 +157,11 @@ android {
             buildConfigField "String", "APP_NAME", '"Jungle Bus"'
             buildConfigField "String", "CRASHLYTICS_PACKAGE_NAME", '"io.jawg.osmcontributor.store"'
             buildConfigField "int", "MAX_POIS_ON_MAP", "300"
-            buildConfigField "int", "MAP_AREA_FACTOR", "60"
+            buildConfigField "int", "MAP_AREA_FACTOR", "30"
             buildConfigField "int", "DEFAULT_ZOOM", "16"
             buildConfigField "int", "ZOOM_VECTORIAL", "18"
             buildConfigField "int", "ZOOM_MAX_PROVIDER", "19"
-            buildConfigField "float", "ZOOM_MARKER_MIN", "14.5f"
+            buildConfigField "float", "ZOOM_MARKER_MIN", "14f"
             buildConfigField "float", "ZOOM_MAX", "21.99f"
             buildConfigField "boolean", "WITH_FILTER", "false"
             buildConfigField "String", "MAP_URL", '"http://tile.openstreetmap.org/{z}/{x}/{y}.png"'
@@ -219,7 +218,7 @@ dependencies {
     }
     // network
     compile "com.squareup.retrofit2:retrofit:$retrofitVersion"
-    compile "com.squareup.okhttp:okhttp:$okhttpVersion"
+    compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
     compile "com.squareup.retrofit2:converter-simplexml:$simplexmlRetrofitVersion"
     compile "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
     compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
@@ -273,7 +272,7 @@ dependencies {
 // The official API url is https://api.openstreetmap.org/api/0.6
 def osmUrl() {
     def osmUrl = project.getProperties().get("osmUrl")
-    return osmUrl != null ? '"' + osmUrl + '"' : '"https://www.openstreetmap.org/api/"'
+    return osmUrl != null ? '"' + osmUrl + '"' : '"https://www.openstreetmap.org/api/0.6/"'
 }
 
 // Load the properties from the given file