Skip to content

Commit c3bf2c9

Browse files
committed
Release v1.1.0 (#56)
1 parent 6fc758d commit c3bf2c9

File tree

10 files changed

+50
-25
lines changed

10 files changed

+50
-25
lines changed

libandroid/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
Mapbox welcomes participation and contributions from everyone.
44

5+
### v1.1.0
6+
7+
* Updated to `libjava` v1.1.0
8+
* Removed extra dependencies to reduce method count
9+
10+
Full changelog: https://github.com/mapbox/mapbox-java/issues?q=milestone%3Av1.1.0+is%3Aclosed
11+
512
### v1.0.0
613

714
* Initial release

libandroid/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
android:theme="@style/AppTheme.NoActionBar" />
3333
<activity
3434
android:name=".directions.DirectionsV5Activity"
35-
android:label="Directions v5 (experimental)"
35+
android:label="Directions v5"
3636
android:parentActivityName=".MainActivity"
3737
android:theme="@style/AppTheme.NoActionBar" />
3838
<activity

libandroid/app/src/main/java/com/mapbox/services/android/testapp/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public class MainActivity extends AppCompatActivity {
4343
private RecyclerView.LayoutManager mLayoutManager;
4444

4545
private final static List<SampleItem> samples = new ArrayList<>(Arrays.asList(
46+
new SampleItem("Directions v5", "", DirectionsV5Activity.class),
4647
new SampleItem("Directions v4", "", DirectionsV4Activity.class),
47-
new SampleItem("Directions v5 (experimental)", "", DirectionsV5Activity.class),
4848
new SampleItem("Directions icons", "", DirectionsIconsActivity.class),
4949
new SampleItem("Reverse geocoding", "", GeocodingReverseActivity.class),
5050
new SampleItem("Geocoding widget", "", GeocodingWidgetActivity.class),

libandroid/app/src/main/java/com/mapbox/services/android/testapp/staticimage/StaticImageActivity.java

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
import android.support.v7.widget.GridLayoutManager;
77
import android.support.v7.widget.RecyclerView;
88
import android.support.v7.widget.Toolbar;
9+
import android.util.Log;
910

1011
import com.mapbox.services.Constants;
1112
import com.mapbox.services.android.testapp.R;
1213
import com.mapbox.services.android.testapp.Utils;
14+
import com.mapbox.services.commons.ServicesException;
1315
import com.mapbox.services.staticimage.v1.MapboxStaticImage;
1416

1517
public class StaticImageActivity extends AppCompatActivity {
@@ -76,25 +78,35 @@ private String[] buildDataset() {
7678
int i = 0;
7779
for (double[] place: PLACES) {
7880
for (String style: MAPBOX_STYLES) {
79-
MapboxStaticImage staticImage = new MapboxStaticImage.Builder()
80-
.setAccessToken(Utils.getMapboxAccessToken(this))
81-
.setUsername(Constants.MAPBOX_USER)
82-
.setStyleId(style)
83-
.setLon(place[1])
84-
.setLat(place[0])
85-
.setZoom(16)
86-
.setBearing(45)
87-
.setPitch(60)
88-
.setWidth(500)
89-
.setHeight(500)
90-
.setRetina(isRetina)
91-
.build();
92-
dataset[i] = staticImage.getUrl().toString();
93-
i++;
81+
String imageUrl = null;
82+
try {
83+
imageUrl = getImageUrl(style, place, isRetina);
84+
dataset[i] = imageUrl;
85+
i++;
86+
} catch (ServicesException e) {
87+
Log.e(LOG_TAG, "Error: " + e.getMessage());
88+
e.printStackTrace();
89+
}
9490
}
9591
}
9692

9793
return dataset;
9894
}
9995

96+
private String getImageUrl(String style, double[] place, boolean isRetina) throws ServicesException {
97+
MapboxStaticImage staticImage = new MapboxStaticImage.Builder()
98+
.setAccessToken(Utils.getMapboxAccessToken(this))
99+
.setUsername(Constants.MAPBOX_USER)
100+
.setStyleId(style)
101+
.setLon(place[1])
102+
.setLat(place[0])
103+
.setZoom(16)
104+
.setBearing(45)
105+
.setPitch(60)
106+
.setWidth(500)
107+
.setHeight(500)
108+
.setRetina(isRetina)
109+
.build();
110+
return staticImage.getUrl().toString();
111+
}
100112
}

libandroid/lib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
compile 'com.android.support:design:23.3.0'
3434

3535
// Mapbox Java Services
36-
compile ('com.mapbox.mapboxsdk:mapbox-java-services:1.0.0@jar') {
36+
compile ('com.mapbox.mapboxsdk:mapbox-java-services:1.1.0@jar') {
3737
transitive=true
3838
}
3939

libandroid/lib/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Version name should be updated in build.gradle too.
2-
VERSION_NAME=1.1.0-SNAPSHOT
2+
VERSION_NAME=1.2.0-SNAPSHOT
33

44
GROUP=com.mapbox.mapboxsdk
55

libandroid/lib/src/main/java/com/mapbox/services/android/geocoder/ui/GeocoderAdapter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010
import android.widget.TextView;
1111

1212
import com.mapbox.services.commons.ServicesException;
13+
import com.mapbox.services.commons.utils.TextUtils;
1314
import com.mapbox.services.geocoding.v5.MapboxGeocoding;
1415
import com.mapbox.services.geocoding.v5.models.GeocodingFeature;
1516
import com.mapbox.services.geocoding.v5.models.GeocodingResponse;
1617
import com.mapbox.services.commons.models.Position;
1718

18-
import org.apache.commons.lang3.StringUtils;
19-
2019
import java.io.IOException;
2120
import java.util.List;
2221

@@ -141,7 +140,7 @@ protected FilterResults performFiltering(CharSequence constraint) {
141140
FilterResults results = new FilterResults();
142141

143142
// No constraint
144-
if (StringUtils.isEmpty(constraint)) {
143+
if (TextUtils.isEmpty(constraint)) {
145144
return results;
146145
}
147146

libjava/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
Mapbox welcomes participation and contributions from everyone.
44

5+
### v1.1.0
6+
7+
* Support for directions API v5
8+
* Support for Maki 3 and directions icons in Test App
9+
* Fixed a bug where locale was different from `Locale.US`
10+
11+
Full changelog: https://github.com/mapbox/mapbox-java/issues?q=milestone%3Av1.1.0+is%3Aclosed
12+
513
### v1.0.0
614

715
* Initial release: Java module with no Android dependencies

libjava/lib/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION_NAME=1.1.0-SNAPSHOT
1+
VERSION_NAME=1.2.0-SNAPSHOT
22
GROUP=com.mapbox.mapboxsdk
33

44
POM_DESCRIPTION=Mapbox Java Services

libjava/lib/src/main/java/com/mapbox/services/commons/geojson/custom/GeometryDeserializer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
/**
1212
* Required to handle the "Unable to invoke no-args constructor for interface {@link Geometry} error
13-
* that Gson shows when trying to deserialize a List<Geometry>. There must be a better way to handle
14-
* this case.
13+
* that Gson shows when trying to deserialize a list of {@link Geometry}.
1514
*/
1615
public class GeometryDeserializer implements JsonDeserializer<Geometry> {
1716

0 commit comments

Comments
 (0)