Skip to content
This repository has been archived by the owner on Oct 7, 2024. It is now read-only.

Light cleanup of FeatureCollection and Source initialization #1310

Merged
merged 2 commits into from
May 19, 2020
Merged

Light cleanup of FeatureCollection and Source initialization #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
813f08c
light cleanup of FeatureCollection and Source initialization
langsmith Mar 4, 2020
a132fec
Merge branch 'master' into ls-empty-source-cleanup
May 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...n/java/com/mapbox/mapboxandroiddemo/examples/labs/DashedLineDirectionsPickerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
public class DashedLineDirectionsPickerActivity extends AppCompatActivity
implements OnMapReadyCallback, MapboxMap.OnCameraIdleListener {

private static final String DIRECTIONS_LAYER_ID = "DIRECTIONS_LAYER_ID";
private static final String LAYER_BELOW_ID = "road-label-small";
private static final String SOURCE_ID = "SOURCE_ID";
private MapView mapView;
private MapboxMap mapboxMap;
private FeatureCollection dashedLineDirectionsFeatureCollection;
Expand Down Expand Up @@ -117,16 +120,15 @@ public void onCameraIdle() {
* to the place picker location
*/
private void initDottedLineSourceAndLayer(@NonNull Style loadedMapStyle) {
dashedLineDirectionsFeatureCollection = FeatureCollection.fromFeatures(new Feature[] {});
loadedMapStyle.addSource(new GeoJsonSource("SOURCE_ID", dashedLineDirectionsFeatureCollection));
loadedMapStyle.addSource(new GeoJsonSource(SOURCE_ID));
loadedMapStyle.addLayerBelow(
new LineLayer(
"DIRECTIONS_LAYER_ID", "SOURCE_ID").withProperties(
DIRECTIONS_LAYER_ID, SOURCE_ID).withProperties(
lineWidth(4.5f),
lineColor(Color.BLACK),
lineTranslate(new Float[] {0f, 4f}),
lineDasharray(new Float[] {1.2f, 1.2f})
), "road-label-small");
), LAYER_BELOW_ID);
}

/**
Expand Down Expand Up @@ -185,7 +187,7 @@ public void onStyleLoaded(@NonNull Style style) {
directionsRouteFeatureList.add(Feature.fromGeometry(LineString.fromLngLats(coordinates)));
}
dashedLineDirectionsFeatureCollection = FeatureCollection.fromFeatures(directionsRouteFeatureList);
GeoJsonSource source = style.getSourceAs("SOURCE_ID");
GeoJsonSource source = style.getSourceAs(SOURCE_ID);
if (source != null) {
source.setGeoJson(dashedLineDirectionsFeatureCollection);
}
Expand Down
1 change: 0 additions & 1 deletion ...o/src/main/java/com/mapbox/mapboxandroiddemo/examples/labs/RecyclerViewOnMapActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ public void onStyleLoaded(@NonNull Style style) {
}

private void initFeatureCollection() {
featureCollection = FeatureCollection.fromFeatures(new Feature[] {});
List<Feature> featureList = new ArrayList<>();
if (featureCollection != null) {
for (LatLng latLng : coordinates) {
Expand Down