diff --git a/CHANGELOG.md b/CHANGELOG.md index 52660fe14..d5f7ae20b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,15 +2,24 @@ Mapbox welcomes participation and contributions from everyone. +## 4.2.0-beta.3 - September 21, 2016 +* Mapbox Android SDK v4.2.0-beta.3 +* Landuse Styling - lab example +* OffRoute example + +## 4.2.0-beta.2 - August 25, 2016 +* Mapbox Android SDK v4.2.0-beta.2 +* Query features examples added + ## 4.2.0-beta.1 - August 6, 2016 * Mapbox Android SDK v4.2.0-beta.1 +* Runtime style examples added ## 4.1.1 * Mapbox Android SDK v4.1.1 * Mapbox Android Service v1.2.1 ## 4.1.0 - * Lab category has been added giving a section for more complex code examples * Location picker example * Track user location example diff --git a/MapboxAndroidDemo/build.gradle b/MapboxAndroidDemo/build.gradle index 06685d269..8a47a30f2 100644 --- a/MapboxAndroidDemo/build.gradle +++ b/MapboxAndroidDemo/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' ext { - supportLibVersion = '24.2.0' + supportLibVersion = '24.2.1' } android { @@ -11,8 +11,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 24 - versionCode 30 - versionName "4.2.0-beta.2" + versionCode 31 + versionName "4.2.0-beta.3" } buildTypes { @@ -39,10 +39,10 @@ dependencies { compile 'com.squareup.picasso:picasso:2.5.2' // Mapbox dependencies - compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-SNAPSHOT@aar') { + compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-beta.3@aar') { transitive = true } - compile('com.mapbox.mapboxsdk:mapbox-android-services:2.0.0-SNAPSHOT@aar') { + compile('com.mapbox.mapboxsdk:mapbox-android-services:1.3.1@aar') { transitive = true } diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AddWmsSourceActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AddWmsSourceActivity.java index 27ff4dcaa..4e65b9410 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AddWmsSourceActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/AddWmsSourceActivity.java @@ -38,8 +38,7 @@ public void onMapReady(MapboxMap mapboxMap) { "web-map-source", new TileSet("tileset", "https://geodata.state.nj.us/imagerywms/Natural2015?bbox={" + "bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&" - + "srs=EPSG:3857&width=256&height=256&layers=Natural2015")) - .withTileSize(256); + + "srs=EPSG:3857&width=256&height=256&layers=Natural2015"), 256); mapboxMap.addSource(webMapSource); diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/CreateHeatmapPointsActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/CreateHeatmapPointsActivity.java index dcc4f3283..281a7ba1c 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/CreateHeatmapPointsActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/CreateHeatmapPointsActivity.java @@ -11,6 +11,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.style.layers.CircleLayer; +import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; import java.net.MalformedURLException; @@ -88,10 +89,13 @@ private void addClusteredGeoJsonSource(MapboxMap mapboxMap) { mapboxMap.addSource( // Point to GeoJSON data. This example visualizes all M1.0+ earthquakes from // 12/22/15 to 1/21/16 as logged by USGS' Earthquake hazards program. - new GeoJsonSource("earthquakes", new URL("https://www.mapbox.com/mapbox-gl-js/assets/earthquakes.geojson")) - .withCluster(true) - .withClusterMaxZoom(15) // Max zoom to cluster points on - .withClusterRadius(20) // Use small cluster radius for the heatmap look + new GeoJsonSource("earthquakes", + new URL("https://www.mapbox.com/mapbox-gl-js/assets/earthquakes.geojson"), + new GeoJsonOptions() + .withCluster(true) + .withClusterMaxZoom(15) // Max zoom to cluster points on + .withClusterRadius(20) // Use small cluster radius for the heatmap look + ) ); } catch (MalformedURLException malformedUrlException) { Log.e("heatmapActivity", "Check the URL " + malformedUrlException.getMessage()); diff --git a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LanguageSwitchActivity.java b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LanguageSwitchActivity.java index 58d039935..1ae172430 100644 --- a/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LanguageSwitchActivity.java +++ b/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/styles/LanguageSwitchActivity.java @@ -97,6 +97,9 @@ public boolean onOptionsItemSelected(MenuItem item) { default: mapText.setProperties(textField("{name_en}")); return true; + case android.R.id.home: + onBackPressed(); + return true; } } return super.onOptionsItemSelected(item); diff --git a/build.gradle b/build.gradle index 40fb53724..178874cb1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.android.tools.build:gradle:2.2.0' } }