tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace mapbox watermark on the maps with maplibre #643 and replace mapbox resource names (#647)

Browse Source 
Co-authored-by: Birk Skyum <74932975+birkskyum@users.noreply.github.com>
This commit is contained in:
Bart Louwers
2023-01-04 11:32:11 +01:00
committed by GitHub
parent da9c7ae2a5
commit d51759b137
166 changed files with 799 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java
View File

@@ -53,7 +53,7 @@ public class IconTest extends EspressoTest {
@UiThreadTest
public void testAddDifferentIconMarker() {
validateTestSetup();
Icon icon = IconFactory.getInstance(rule.getActivity()).fromResource(R.drawable.mapbox_logo_icon);
Icon icon = IconFactory.getInstance(rule.getActivity()).fromResource(R.drawable.maplibre_logo_icon);
mapboxMap.addMarker(new MarkerOptions().icon(icon).position(new LatLng()));
mapboxMap.addMarker(new MarkerOptions().position(new LatLng(1, 1)));
assertEquals(iconMap.size(), 2);
@@ -65,7 +65,7 @@ public class IconTest extends EspressoTest {
@UiThreadTest
public void testAddRemoveIconMarker() {
validateTestSetup();
Icon icon = IconFactory.getInstance(rule.getActivity()).fromResource(R.drawable.mapbox_logo_icon);
Icon icon = IconFactory.getInstance(rule.getActivity()).fromResource(R.drawable.maplibre_logo_icon);
Marker marker = mapboxMap.addMarker(new MarkerOptions().icon(icon).position(new LatLng()));
mapboxMap.addMarker(new MarkerOptions().position(new LatLng(1, 1)));
assertEquals(iconMap.size(), 2);
@@ -104,11 +104,11 @@ public class IconTest extends EspressoTest {
// add 4 unique icon markers
mapboxMap.addMarker(new MarkerOptions()
.icon(iconFactory.fromResource(R.drawable.mapbox_logo_icon))
.icon(iconFactory.fromResource(R.drawable.maplibre_logo_icon))
.position(new LatLng(3, 1))
);
mapboxMap.addMarker(new MarkerOptions()
.icon(iconFactory.fromResource(R.drawable.mapbox_compass_icon))
.icon(iconFactory.fromResource(R.drawable.maplibre_compass_icon))
.position(new LatLng(4, 1))
);
mapboxMap.addMarker(new MarkerOptions()

6
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java
View File

@@ -74,7 +74,7 @@ public class AttributionTest extends EspressoTest {
// click on View to open dialog
onView(withTagValue(is("attrView"))).perform(click());
onView(withText(R.string.mapbox_attributionsDialogTitle)).check(matches(isDisplayed()));
onView(withText(R.string.maplibre_attributionsDialogTitle)).check(matches(isDisplayed()));
// test for trigger url intent
Matcher<Intent> expectedIntent = allOf(hasAction(Intent.ACTION_VIEW), hasData(Uri.parse(urlSpans[0].getURL())));
@@ -95,7 +95,7 @@ public class AttributionTest extends EspressoTest {
// click on View to open dialog
onView(withTagValue(is("attrView"))).perform(click());
onView(withText(R.string.mapbox_attributionsDialogTitle)).check(matches(isDisplayed()));
onView(withText(R.string.maplibre_attributionsDialogTitle)).check(matches(isDisplayed()));
// test for trigger url intent
Matcher<Intent> expectedIntent = allOf(hasAction(Intent.ACTION_VIEW), hasData(Uri.parse(urlSpans[1].getURL())));
@@ -116,7 +116,7 @@ public class AttributionTest extends EspressoTest {
// click on View to open dialog
onView(withTagValue(is("attrView"))).perform(click());
onView(withText(R.string.mapbox_attributionsDialogTitle)).check(matches(isDisplayed()));
onView(withText(R.string.maplibre_attributionsDialogTitle)).check(matches(isDisplayed()));
// test for trigger url intent
Matcher<Intent> expectedIntent = hasAction(Intent.ACTION_VIEW);

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt
View File

@@ -43,7 +43,7 @@ class QueryRenderedFeaturesBoxSymbolCountActivity : AppCompatActivity() {
R.raw.test_points_utrecht
)
val markerImage =
BitmapFactory.decodeResource(resources, R.drawable.mapbox_marker_icon_default)
BitmapFactory.decodeResource(resources, R.drawable.maplibre_marker_icon_default)
mapboxMap.setStyle(
Style.Builder()
.withLayer(

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.kt
View File

@@ -85,7 +85,7 @@ class DynamicInfoWindowAdapterActivity : AppCompatActivity(), OnMapReadyCallback
IconUtils.drawableToIcon(
this,
R.drawable.ic_location_city,
ResourcesCompat.getColor(resources, R.color.mapbox_blue, theme)
ResourcesCompat.getColor(resources, R.color.maplibre_blue, theme)
)
)
)

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.kt
View File

@@ -73,7 +73,7 @@ class LocationComponentActivationActivity : AppCompatActivity(), OnMapReadyCallb
.elevation(5f)
.accuracyAlpha(.6f)
.accuracyColor(Color.GREEN)
.foregroundDrawable(R.drawable.mapbox_logo_helmet)
.foregroundDrawable(R.drawable.maplibre_logo_helmet)
.build()
val locationComponentActivationOptions = LocationComponentActivationOptions
.builder(this, style)

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.kt
View File

@@ -204,7 +204,7 @@ class LocationModesActivity :
defaultStyle = !defaultStyle
var options = LocationComponentOptions.createFromAttributes(
this,
if (defaultStyle) R.style.mapbox_LocationComponent else R.style.CustomLocationComponent
if (defaultStyle) R.style.maplibre_LocationComponent else R.style.CustomLocationComponent
)
if (defaultStyle) {
val padding: IntArray

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.kt
View File

@@ -20,7 +20,7 @@ import com.mapbox.mapboxsdk.utils.MapFragmentUtils
* Test activity showcasing having 2 maps on top of each other.
*
*
* The small map is using the `mapbox_enableZMediaOverlay="true"` configuration
* The small map is using the `maplibre_enableZMediaOverlay="true"` configuration
*
*/
class DoubleMapActivity : AppCompatActivity() {

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.kt
View File

@@ -86,7 +86,7 @@ class MapSnapshotterBitMapOverlayActivity :
private fun addMarker(snapshot: MapSnapshot): Bitmap {
val canvas = Canvas(snapshot.bitmap)
val marker =
BitmapFactory.decodeResource(resources, R.drawable.mapbox_marker_icon_default, null)
BitmapFactory.decodeResource(resources, R.drawable.maplibre_marker_icon_default, null)
// Dom toren
val markerLocation = snapshot.pixelForLatLng(LatLng(52.090649433011315, 5.121310651302338))
canvas.drawBitmap(

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
View File

@@ -10,9 +10,9 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="52.519003"
app:mapbox_cameraTargetLng="13.400972"
app:mapbox_cameraZoom="16"/>
app:maplibre_cameraTargetLat="52.519003"
app:maplibre_cameraTargetLng="13.400972"
app:maplibre_cameraZoom="16"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@id/fab"

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_image_source.xml
View File

@@ -9,8 +9,8 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="41.9567"
app:mapbox_cameraTargetLng="-78.6430"
app:mapbox_cameraZoom="5"/>
app:maplibre_cameraTargetLat="41.9567"
app:maplibre_cameraTargetLng="-78.6430"
app:maplibre_cameraZoom="5"/>
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
View File

@@ -10,8 +10,8 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:mapbox_cameraTargetLat="38.90962"
app:mapbox_cameraTargetLng="-77.04341"
app:mapbox_cameraZoom="15"/>
app:maplibre_cameraTargetLat="38.90962"
app:maplibre_cameraTargetLng="-77.04341"
app:maplibre_cameraZoom="15"/>
</LinearLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml
View File

@@ -6,10 +6,10 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="40.7135"
app:mapbox_cameraTargetLng="-74.0066"
app:mapbox_cameraTilt="45"
app:mapbox_cameraZoom="15"/>
app:maplibre_cameraTargetLat="40.7135"
app:maplibre_cameraTargetLng="-74.0066"
app:maplibre_cameraTilt="45"
app:maplibre_cameraZoom="15"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabLightPosition"

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
View File

@@ -10,9 +10,9 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="51.50325"
app:mapbox_cameraTargetLng="-0.11968"
app:mapbox_cameraZoom="15"/>
app:maplibre_cameraTargetLat="51.50325"
app:maplibre_cameraTargetLng="-0.11968"
app:maplibre_cameraZoom="15"/>
<LinearLayout
style="?android:attr/buttonBarStyle"

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animator.xml
View File

@@ -10,9 +10,9 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="37.787947"
app:mapbox_cameraTargetLng="-122.407432"
app:mapbox_cameraZoom="11"/>
app:maplibre_cameraTargetLat="37.787947"
app:maplibre_cameraTargetLng="-122.407432"
app:maplibre_cameraZoom="11"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
View File

@@ -18,8 +18,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?android:attr/actionBarSize"
app:mapbox_localIdeographFontFamilies="@array/array_local_ideograph_family_test"
app:mapbox_uiAttributionTintColor="@color/redAccent"/>
app:maplibre_localIdeographFontFamilies="@array/array_local_ideograph_family_test"
app:maplibre_uiAttributionTintColor="@color/redAccent"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_test.xml
View File

@@ -10,7 +10,7 @@
android:id="@id/mapView"
android:layout_width="512px"
android:layout_height="512px"
app:mapbox_pixelRatio="1"
app:mapbox_cameraZoom="1"/>
app:maplibre_pixelRatio="1"
app:maplibre_cameraZoom="1"/>
</FrameLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml
View File

@@ -9,9 +9,9 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="1.350057"
app:mapbox_cameraTargetLng="103.849218"
app:mapbox_cameraZoom="10"/>
app:maplibre_cameraTargetLat="1.350057"
app:maplibre_cameraTargetLng="103.849218"
app:maplibre_cameraZoom="10"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_route"

12
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
View File

@@ -10,12 +10,12 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraBearing="90"
app:mapbox_cameraTargetLat="51.506675"
app:mapbox_cameraTargetLng="-0.128699"
app:mapbox_cameraTilt="40"
app:mapbox_cameraZoom="10"
app:mapbox_uiCompassFadeFacingNorth="false"/>
app:maplibre_cameraBearing="90"
app:maplibre_cameraTargetLat="51.506675"
app:maplibre_cameraTargetLng="-0.128699"
app:maplibre_cameraTilt="40"
app:maplibre_cameraZoom="10"
app:maplibre_uiCompassFadeFacingNorth="false"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_espresso_test.xml
View File

@@ -10,6 +10,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"
app:mapbox_cameraZoom="1"/>
app:maplibre_cameraZoom="1"/>
</RelativeLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml
View File

@@ -9,9 +9,9 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="40.7135"
app:mapbox_cameraTargetLng="-74.0066"
app:mapbox_cameraTilt="45"
app:mapbox_cameraZoom="15"/>
app:maplibre_cameraTargetLat="40.7135"
app:maplibre_cameraTargetLng="-74.0066"
app:maplibre_cameraTilt="45"
app:maplibre_cameraZoom="15"/>
</RelativeLayout>

10
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml
View File

@@ -9,10 +9,10 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="46.343350"
app:mapbox_cameraTargetLng="7.497989"
app:mapbox_cameraZoom="9"
app:mapbox_cameraBearing="140"
app:mapbox_cameraTilt="60"/>
app:maplibre_cameraTargetLat="46.343350"
app:maplibre_cameraTargetLng="7.497989"
app:maplibre_cameraZoom="9"
app:maplibre_cameraBearing="140"
app:maplibre_cameraTilt="60"/>
</RelativeLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml
View File

@@ -10,10 +10,10 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_localIdeographEnabled="false"
app:mapbox_cameraTargetLat="51.50325"
app:mapbox_cameraTargetLng="-0.11968"
app:mapbox_cameraZoom="15" />
app:maplibre_localIdeographEnabled="false"
app:maplibre_cameraTargetLat="51.50325"
app:maplibre_cameraTargetLng="-0.11968"
app:maplibre_cameraZoom="15" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/alerts_recycler"

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gradient_line.xml
View File

@@ -5,6 +5,6 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="45.38301927899065"
app:mapbox_cameraTargetLng="8.63525390625"
app:mapbox_cameraZoom="7"/>
app:maplibre_cameraTargetLat="45.38301927899065"
app:maplibre_cameraTargetLng="8.63525390625"
app:maplibre_cameraZoom="7"/>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml
View File

@@ -9,8 +9,8 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="41.9567"
app:mapbox_cameraTargetLng="-78.6430"
app:mapbox_cameraZoom="5"/>
app:maplibre_cameraTargetLat="41.9567"
app:maplibre_cameraTargetLng="-78.6430"
app:maplibre_cameraZoom="5"/>
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml
View File

@@ -9,8 +9,8 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="52.090710"
app:mapbox_cameraTargetLng="5.121125"
app:mapbox_cameraZoom="10"/>
app:maplibre_cameraTargetLat="52.090710"
app:maplibre_cameraTargetLng="5.121125"
app:maplibre_cameraZoom="10"/>
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
View File

@@ -10,8 +10,8 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="38.897705003219784"
app:mapbox_cameraTargetLng="-77.03655168667463"
app:mapbox_cameraZoom="15"/>
app:maplibre_cameraTargetLat="38.897705003219784"
app:maplibre_cameraTargetLng="-77.03655168667463"
app:maplibre_cameraZoom="15"/>
</LinearLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
View File

@@ -10,8 +10,8 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="47.798202"
app:mapbox_cameraTargetLng="7.573781"
app:mapbox_cameraZoom="4"/>
app:maplibre_cameraTargetLat="47.798202"
app:maplibre_cameraTargetLng="7.573781"
app:maplibre_cameraZoom="4"/>
</LinearLayout>

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
View File

@@ -12,6 +12,6 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_localIdeographFontFamily="Droid Sans" />
app:maplibre_localIdeographFontFamily="Droid Sans" />
</LinearLayout>

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml
View File

@@ -12,6 +12,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="0dp"
app:mapbox_uiAttribution="false"/>
app:maplibre_uiAttribution="false"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml
View File

@@ -8,6 +8,6 @@
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_uiAttribution="false"/>
app:maplibre_uiAttribution="false"/>
</FrameLayout>

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml
View File

@@ -14,7 +14,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:mapbox_uiAttribution="false" />
app:maplibre_uiAttribution="false" />
<LinearLayout
android:id="@+id/linearLayout"

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_map_change.xml
View File

@@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="0dp"
app:mapbox_uiAttribution="false"/>
app:maplibre_uiAttribution="false"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabStyles"

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_mode.xml
View File

@@ -14,7 +14,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:mapbox_uiAttribution="false" />
app:maplibre_uiAttribution="false" />
<View
android:id="@+id/view_protected_gesture_area"

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_manual_update.xml
View File

@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="0dp"
app:mapbox_uiAttribution="false" />
app:maplibre_uiAttribution="false" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabToggleManualLocation"

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
View File

@@ -10,9 +10,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
app:mapbox_cameraBearing="220"
app:mapbox_cameraTargetLat="50.871062"
app:mapbox_cameraTargetLng="1.583210"
app:mapbox_cameraZoom="10"/>
app:maplibre_cameraBearing="220"
app:maplibre_cameraTargetLat="50.871062"
app:maplibre_cameraTargetLng="1.583210"
app:maplibre_cameraZoom="10"/>
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="@dimen/map_padding_left"
android:layout_height="match_parent"
android:alpha="0.5"
android:background="@color/mapbox_blue"/>
android:background="@color/maplibre_blue"/>
<View
android:layout_width="match_parent"
@@ -21,13 +21,13 @@
android:layout_marginRight="@dimen/map_padding_right"
android:layout_marginStart="@dimen/map_padding_left"
android:alpha="0.5"
android:background="@color/mapbox_blue"/>
android:background="@color/maplibre_blue"/>
<View
android:layout_width="@dimen/map_padding_right"
android:layout_height="match_parent"
android:layout_gravity="end"
android:alpha="0.5"
android:background="@color/mapbox_blue"/>
android:background="@color/maplibre_blue"/>
</merge>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
View File

@@ -10,8 +10,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"
app:mapbox_cameraTargetLat="38.87031"
app:mapbox_cameraTargetLng="-77.00897"
app:mapbox_cameraZoom="10"/>
app:maplibre_cameraTargetLat="38.87031"
app:maplibre_cameraTargetLng="-77.00897"
app:maplibre_cameraZoom="10"/>
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
View File

@@ -9,8 +9,8 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:mapbox_cameraTargetLat="-1.063510"
app:mapbox_cameraTargetLng=" 32.895425"
app:mapbox_cameraZoom="4"/>
app:maplibre_cameraTargetLat="-1.063510"
app:maplibre_cameraTargetLng=" 32.895425"
app:maplibre_cameraZoom="4"/>
</RelativeLayout>

24
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml
View File

@@ -21,9 +21,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.5"
mapbox:mapbox_cameraTargetLat="38.913187"
mapbox:mapbox_cameraTargetLng="-77.032546"
mapbox:mapbox_cameraZoom="12" />
mapbox:maplibre_cameraTargetLat="38.913187"
mapbox:maplibre_cameraTargetLng="-77.032546"
mapbox:maplibre_cameraZoom="12" />
<!-- SF -->
<fragment
@@ -32,9 +32,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.5"
mapbox:mapbox_cameraTargetLat="37.775732"
mapbox:mapbox_cameraTargetLng="-122.413985"
mapbox:mapbox_cameraZoom="13"/>
mapbox:maplibre_cameraTargetLat="37.775732"
mapbox:maplibre_cameraTargetLng="-122.413985"
mapbox:maplibre_cameraZoom="13"/>
</LinearLayout>
<LinearLayout
@@ -51,9 +51,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.5"
mapbox:mapbox_cameraTargetLat="12.97913"
mapbox:mapbox_cameraTargetLng="77.59188"
mapbox:mapbox_cameraZoom="14" />
mapbox:maplibre_cameraTargetLat="12.97913"
mapbox:maplibre_cameraTargetLng="77.59188"
mapbox:maplibre_cameraZoom="14" />
<!-- Ayacucho -->
<fragment
@@ -62,8 +62,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.5"
mapbox:mapbox_cameraTargetLat="-13.155980"
mapbox:mapbox_cameraTargetLng="-74.217134"
mapbox:mapbox_cameraZoom="15" />
mapbox:maplibre_cameraTargetLat="-13.155980"
mapbox:maplibre_cameraTargetLng="-74.217134"
mapbox:maplibre_cameraZoom="15" />
</LinearLayout>
</LinearLayout>

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml
View File

@@ -8,9 +8,9 @@
<com.mapbox.mapboxsdk.maps.MapView
android:layout_gravity="center"
android:id="@id/mapView"
app:mapbox_cameraZoom="1"
app:maplibre_cameraZoom="1"
android:layout_width="1080px"
android:layout_height="1920px"
app:mapbox_pixelRatio="1"/>
app:maplibre_pixelRatio="1"/>
</FrameLayout>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
View File

@@ -9,10 +9,10 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_uiAttributionTintColor="@android:color/holo_green_dark"
app:mapbox_cameraTargetLat="47.798202"
app:mapbox_cameraTargetLng="7.573781"
app:mapbox_cameraZoom="4" />
app:maplibre_uiAttributionTintColor="@android:color/holo_green_dark"
app:maplibre_cameraTargetLat="47.798202"
app:maplibre_cameraTargetLng="7.573781"
app:maplibre_cameraZoom="4" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"

12
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
View File

@@ -10,11 +10,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar"
app:mapbox_cameraTargetLat="45.1855569"
app:mapbox_cameraTargetLng="5.7215506"
app:mapbox_cameraZoom="11"
app:mapbox_uiAttributionGravity="top|end"
app:mapbox_uiLogoGravity="top|end"
app:mapbox_uiLogoMarginRight="28dp"/>
app:maplibre_cameraTargetLat="45.1855569"
app:maplibre_cameraTargetLng="5.7215506"
app:maplibre_cameraZoom="11"
app:maplibre_uiAttributionGravity="top|end"
app:maplibre_uiLogoGravity="top|end"
app:maplibre_uiLogoMarginRight="28dp"/>
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml
View File

@@ -10,9 +10,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"
app:mapbox_cameraTargetLat="52.0907"
app:mapbox_cameraTargetLng="5.1214"
app:mapbox_cameraZoom="16"/>
app:maplibre_cameraTargetLat="52.0907"
app:maplibre_cameraTargetLng="5.1214"
app:maplibre_cameraZoom="16"/>
<FrameLayout
android:id="@+id/selection_box"

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_point.xml
View File

@@ -9,8 +9,8 @@
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="52.0907"
app:mapbox_cameraTargetLng="5.1214"
app:mapbox_cameraZoom="16"/>
app:maplibre_cameraTargetLat="52.0907"
app:maplibre_cameraTargetLng="5.1214"
app:maplibre_cameraZoom="16"/>
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml
View File

@@ -10,9 +10,9 @@
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="51"
app:mapbox_cameraTargetLng="17.25"
app:mapbox_cameraZoom="8" />
app:maplibre_cameraTargetLat="51"
app:maplibre_cameraTargetLng="17.25"
app:maplibre_cameraZoom="8" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_restricted_bounds.xml
View File

@@ -10,8 +10,8 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="64.840048"
app:mapbox_cameraTargetLng="-18.910457"
app:mapbox_cameraZoom="4"/>
app:maplibre_cameraTargetLat="64.840048"
app:maplibre_cameraTargetLng="-18.910457"
app:maplibre_cameraZoom="4"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
View File

@@ -84,9 +84,9 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="37.176546"
app:mapbox_cameraTargetLng="-3.599007"
app:mapbox_cameraZoom="15" />
app:maplibre_cameraTargetLat="37.176546"
app:maplibre_cameraTargetLng="-3.599007"
app:maplibre_cameraZoom="15" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_stretchable_image.xml
View File

@@ -9,6 +9,6 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraZoom="1"/>
app:maplibre_cameraZoom="1"/>
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
View File

@@ -9,9 +9,9 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="52.519003"
app:mapbox_cameraTargetLng="13.400972"
app:mapbox_cameraZoom="16"/>
app:maplibre_cameraTargetLat="52.519003"
app:maplibre_cameraTargetLng="13.400972"
app:maplibre_cameraZoom="16"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_style_json"

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_animate.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/mapbox_blue"
android:background="@color/maplibre_blue"
android:orientation="vertical">
@@ -14,7 +14,7 @@
android:layout_margin="50dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_renderTextureMode="true"/>
app:maplibre_renderTextureMode="true"/>
<TextView
android:id="@+id/fpsView"

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_debug_mode.xml
View File

@@ -20,10 +20,10 @@
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_renderTextureMode="true"
app:mapbox_uiAttribution="false"
app:mapbox_uiCompass="false"
app:mapbox_uiLogo="false"/>
app:maplibre_renderTextureMode="true"
app:maplibre_uiAttribution="false"
app:maplibre_uiCompass="false"
app:maplibre_uiLogo="false"/>
<TextView
android:id="@+id/textZoom"

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_textureview_resize.xml
View File

@@ -12,7 +12,7 @@
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_renderTextureMode="true"/>
app:maplibre_renderTextureMode="true"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabResize"

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_zoom_symbol_layer.xml
View File

@@ -9,8 +9,8 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:mapbox_cameraTargetLat="40.730648"
app:mapbox_cameraTargetLng="-73.993619"
app:mapbox_cameraZoom="11"/>
app:maplibre_cameraTargetLat="40.730648"
app:maplibre_cameraTargetLng="-73.993619"
app:maplibre_cameraZoom="11"/>
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
View File

@@ -9,8 +9,8 @@
android:id="@+id/mapView"
android:layout_width="match_parent"
android:layout_height="match_parent"
mapbox:mapbox_cameraTargetLat="47.6077"
mapbox:mapbox_cameraTargetLng="-122.3421"
mapbox:mapbox_cameraZoom="11"/>
mapbox:maplibre_cameraTargetLat="47.6077"
mapbox:maplibre_cameraTargetLng="-122.3421"
mapbox:maplibre_cameraZoom="11"/>
</LinearLayout>

2
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml
View File

@@ -16,7 +16,7 @@
<com.mapbox.mapboxsdk.maps.MapView
android:id="@+id/mini_map"
android:layout_width="100dp"
maps:mapbox_enableZMediaOverlay="true"
maps:maplibre_enableZMediaOverlay="true"
android:layout_height="100dp" />
</FrameLayout>
</RelativeLayout>

6
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml
View File

@@ -5,6 +5,6 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="256dp"
app:mapbox_cameraTargetLat="45.38301927899065"
app:mapbox_cameraTargetLng="8.63525390625"
app:mapbox_cameraZoom="7"/>
app:maplibre_cameraTargetLat="45.38301927899065"
app:maplibre_cameraTargetLng="8.63525390625"
app:maplibre_cameraZoom="7"/>

8
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml
View File

@@ -5,7 +5,7 @@
android:id="@id/mapView"
android:layout_width="match_parent"
android:layout_height="256dp"
app:mapbox_cameraTargetLat="45.38301927899065"
app:mapbox_cameraTargetLng="8.63525390625"
app:mapbox_renderTextureMode="true"
app:mapbox_cameraZoom="7"/>
app:maplibre_cameraTargetLat="45.38301927899065"
app:maplibre_cameraTargetLng="8.63525390625"
app:maplibre_renderTextureMode="true"
app:maplibre_cameraZoom="7"/>

20
platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
View File

@@ -38,20 +38,20 @@
<style name="AppTheme" parent="AppBaseTheme" />
<style name="CustomLocationComponent" parent="mapbox_LocationComponent">
<item name="mapbox_foregroundDrawable">@drawable/custom_user_icon</item>
<style name="CustomLocationComponent" parent="maplibre_LocationComponent">
<item name="maplibre_foregroundDrawable">@drawable/custom_user_icon</item>
<item name="mapbox_bearingDrawable">@drawable/custom_user_arrow</item>
<item name="mapbox_gpsDrawable">@drawable/custom_user_puck_icon</item>
<item name="maplibre_bearingDrawable">@drawable/custom_user_arrow</item>
<item name="maplibre_gpsDrawable">@drawable/custom_user_puck_icon</item>
<item name="mapbox_accuracyAlpha">0.15</item>
<item name="mapbox_accuracyColor">#FF82C6</item>
<item name="maplibre_accuracyAlpha">0.15</item>
<item name="maplibre_accuracyColor">#FF82C6</item>
<item name="mapbox_elevation">0dp</item>
<item name="mapbox_compassAnimationEnabled">false</item>
<item name="mapbox_accuracyAnimationEnabled">false</item>
<item name="maplibre_elevation">0dp</item>
<item name="maplibre_compassAnimationEnabled">false</item>
<item name="maplibre_accuracyAnimationEnabled">false</item>
<item name="mapbox_layer_above">road-label</item>
<item name="maplibre_layer_above">road-label</item>
</style>
</resources>