Skip to content

Commit 90eaa7f

Browse files
mranawaqasmranawaqas
committed
name changed
1 parent 4feb767 commit 90eaa7f

16 files changed

Lines changed: 104 additions & 99 deletions

File tree

‎platform/android/MapLibreAndroid/src/main/res-public/values/public.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<public name="maplibre_compass_icon" type="drawable" />
104104
<public name="maplibre_marker_icon_default" type="drawable" />
105105
<public name="maplibre_info_bg_selector" type="drawable" />
106-
<public name="maplibre_info_icon_default" type="drawable" />
106+
<public name="mapmetrics_info_icon_default" type="drawable" />
107107
<public name="maplibre_info_icon_selected" type="drawable" />
108108

109109
<!-- Exposed colors -->

‎platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_info_bg_selector.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33
<item android:drawable="@drawable/maplibre_info_icon_selected" android:state_pressed="true" />
4-
<item android:drawable="@drawable/maplibre_info_icon_default" />
4+
<item android:drawable="@drawable/mapmetrics_info_icon_default" />
55
</selector>

platform/android/MapLibreAndroid/src/main/res/drawable/maplibre_info_icon_default.xml renamed to platform/android/MapLibreAndroid/src/main/res/drawable/mapmetrics_info_icon_default.xml

File renamed without changes.

‎platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/BulkMarkerActivity.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import kotlin.math.min
3030
* Test activity showcasing adding a large amount of Markers.
3131
*/
3232
class BulkMarkerActivity : AppCompatActivity(), OnItemSelectedListener {
33-
private lateinit var maplibreMap: MapMetricsMap
33+
private lateinit var mapMetricsMap: MapMetricsMap
3434
private lateinit var mapView: MapView
3535
private var locations: List<LatLng>? = null
3636
private var progressDialog: ProgressDialog? = null
@@ -42,9 +42,9 @@ class BulkMarkerActivity : AppCompatActivity(), OnItemSelectedListener {
4242
mapView.getMapAsync { initMap(it) }
4343
}
4444

45-
private fun initMap(maplibreMap: MapMetricsMap) {
46-
this.maplibreMap = maplibreMap
47-
maplibreMap.setStyle(TestStyles.getPredefinedStyleWithFallback("Streets"))
45+
private fun initMap(mapMetricsMap: MapMetricsMap) {
46+
this.mapMetricsMap = mapMetricsMap
47+
mapMetricsMap.setStyle(TestStyles.getPredefinedStyleWithFallback("Streets"))
4848
}
4949

5050
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -84,10 +84,10 @@ class BulkMarkerActivity : AppCompatActivity(), OnItemSelectedListener {
8484
}
8585

8686
private fun showMarkers(amount: Int) {
87-
if (!this::maplibreMap.isInitialized || locations == null || mapView.isDestroyed) {
87+
if (!this::mapMetricsMap.isInitialized || locations == null || mapView.isDestroyed) {
8888
return
8989
}
90-
maplibreMap.clear()
90+
mapMetricsMap.clear()
9191
showGlMarkers(min(amount, locations!!.size))
9292
}
9393

@@ -106,7 +106,7 @@ class BulkMarkerActivity : AppCompatActivity(), OnItemSelectedListener {
106106
.snippet(formatter.format(latLng.latitude) + "`, " + formatter.format(latLng.longitude))
107107
)
108108
}
109-
maplibreMap.addMarkers(markerOptionsList)
109+
mapMetricsMap.addMarkers(markerOptionsList)
110110
}
111111

112112
override fun onNothingSelected(parent: AdapterView<*>?) {

‎platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/annotation/JsonApiActivity.kt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import org.maplibre.android.geometry.LatLngBounds
2323
import org.maplibre.android.maps.MapMetricsMap
2424
import org.maplibre.android.maps.MapView
2525
import org.maplibre.android.testapp.R
26+
import org.maplibre.android.testapp.styles.TestStyles
2627
import java.io.IOException
2728
import java.text.SimpleDateFormat
2829
import java.util.Locale
@@ -33,8 +34,8 @@ class JsonApiActivity : AppCompatActivity() {
3334
// Declare a variable for MapView
3435
private lateinit var mapView: MapView
3536

36-
// Declare a variable for MapLibreMap
37-
private lateinit var maplibreMap: MapMetricsMap
37+
// Declare a variable for MapMetricsMap
38+
private lateinit var mapMetricsMap: MapMetricsMap
3839
// # --8<-- [end:top]
3940

4041
override fun onCreate(savedInstanceState: Bundle?) {
@@ -50,9 +51,9 @@ class JsonApiActivity : AppCompatActivity() {
5051

5152
// # --8<-- [start:mapAsync]
5253
mapView.getMapAsync { map ->
53-
maplibreMap = map
54+
mapMetricsMap = map
5455

55-
maplibreMap.setStyle("https://demotiles.maplibre.org/style.json")
56+
mapMetricsMap.setStyle(TestStyles.getMapMetricsStyle())
5657

5758
// Fetch data from USGS
5859
getEarthQuakeDataFromUSGS()
@@ -102,7 +103,7 @@ class JsonApiActivity : AppCompatActivity() {
102103
this.resources,
103104
// Intentionally specify package name
104105
// This makes copy from another project easier
105-
org.maplibre.android.R.drawable.maplibre_info_icon_default,
106+
org.maplibre.android.R.drawable.mapmetrics_info_icon_default,
106107
theme
107108
)!!
108109
val bitmapBlue = infoIconDrawable.toBitmap()
@@ -134,16 +135,16 @@ class JsonApiActivity : AppCompatActivity() {
134135
.title(dateString)
135136
.snippet(title)
136137
.icon(icon)
137-
maplibreMap.addMarker(markerOptions)
138+
mapMetricsMap.addMarker(markerOptions)
138139
}
139140

140141
// Move camera to newly added annotations
141-
maplibreMap.getCameraForLatLngBounds(LatLngBounds.fromLatLngs(bounds))?.let {
142+
mapMetricsMap.getCameraForLatLngBounds(LatLngBounds.fromLatLngs(bounds))?.let {
142143
val newCameraPosition = CameraPosition.Builder()
143144
.target(it.target)
144145
.zoom(it.zoom - 0.5)
145146
.build()
146-
maplibreMap.cameraPosition = newCameraPosition
147+
mapMetricsMap.cameraPosition = newCameraPosition
147148
}
148149
}
149150
// # --8<-- [end:addMarkers]

‎platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraAnimationTypeActivity.kt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ class CameraAnimationTypeActivity : AppCompatActivity(), OnMapReadyCallback {
4949
}
5050
// # --8<-- [end:callback]
5151

52-
private lateinit var maplibreMap: MapMetricsMap
52+
private lateinit var mapMetricsMap: MapMetricsMap
5353
private lateinit var mapView: MapView
5454
private var cameraState = false
5555
private val cameraIdleListener = OnCameraIdleListener {
56-
if (this::maplibreMap.isInitialized) {
57-
Timber.w(maplibreMap.cameraPosition.toString())
56+
if (this::mapMetricsMap.isInitialized) {
57+
Timber.w(mapMetricsMap.cameraPosition.toString())
5858
}
5959
}
6060

@@ -69,13 +69,13 @@ class CameraAnimationTypeActivity : AppCompatActivity(), OnMapReadyCallback {
6969
}
7070

7171
override fun onMapReady(map: MapMetricsMap) {
72-
maplibreMap = map
72+
mapMetricsMap = map
7373

74-
maplibreMap.setStyle(TestStyles.getMapMetricsStyle())
74+
mapMetricsMap.setStyle(TestStyles.getMapMetricsStyle())
7575

76-
maplibreMap.uiSettings.isAttributionEnabled = false
77-
maplibreMap.uiSettings.isLogoEnabled = false
78-
maplibreMap.addOnCameraIdleListener(cameraIdleListener)
76+
mapMetricsMap.uiSettings.isAttributionEnabled = false
77+
mapMetricsMap.uiSettings.isLogoEnabled = false
78+
mapMetricsMap.addOnCameraIdleListener(cameraIdleListener)
7979

8080
// handle move button clicks
8181
val moveButton = findViewById<View>(R.id.cameraMoveButton)
@@ -88,7 +88,7 @@ class CameraAnimationTypeActivity : AppCompatActivity(), OnMapReadyCallback {
8888
.tilt(30.0)
8989
.tilt(0.0)
9090
.build()
91-
maplibreMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition))
91+
mapMetricsMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition))
9292
// # --8<-- [end:moveCamera]
9393
}
9494

@@ -103,7 +103,7 @@ class CameraAnimationTypeActivity : AppCompatActivity(), OnMapReadyCallback {
103103
.bearing(180.0)
104104
.tilt(30.0)
105105
.build()
106-
maplibreMap.easeCamera(
106+
mapMetricsMap.easeCamera(
107107
CameraUpdateFactory.newCameraPosition(cameraPosition),
108108
7500,
109109
callback
@@ -117,7 +117,7 @@ class CameraAnimationTypeActivity : AppCompatActivity(), OnMapReadyCallback {
117117
// # --8<-- [start:animateCamera]
118118
val cameraPosition =
119119
CameraPosition.Builder().target(nextLatLng).bearing(270.0).tilt(20.0).build()
120-
maplibreMap.animateCamera(
120+
mapMetricsMap.animateCamera(
121121
CameraUpdateFactory.newCameraPosition(cameraPosition),
122122
7500,
123123
callback
@@ -159,8 +159,8 @@ class CameraAnimationTypeActivity : AppCompatActivity(), OnMapReadyCallback {
159159

160160
override fun onDestroy() {
161161
super.onDestroy()
162-
if (this::maplibreMap.isInitialized) {
163-
maplibreMap.removeOnCameraIdleListener(cameraIdleListener)
162+
if (this::mapMetricsMap.isInitialized) {
163+
mapMetricsMap.removeOnCameraIdleListener(cameraIdleListener)
164164
}
165165
mapView.onDestroy()
166166
}

‎platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/CameraAnimatorActivity.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
2929
private val animators = LongSparseArray<Animator>()
3030
private lateinit var set: Animator
3131
private lateinit var mapView: MapView
32-
private lateinit var maplibreMap: MapMetricsMap
32+
private lateinit var mapMetricsMap: MapMetricsMap
3333
override fun onCreate(savedInstanceState: Bundle?) {
3434
super.onCreate(savedInstanceState)
3535
setContentView(R.layout.activity_camera_animator)
@@ -44,7 +44,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
4444
}
4545

4646
override fun onMapReady(map: MapMetricsMap) {
47-
maplibreMap = map
47+
mapMetricsMap = map
4848
map.setStyle(TestStyles.getMapMetricsStyle())
4949
initFab()
5050
}
@@ -59,7 +59,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
5959
.zoom(14.5)
6060
.bearing(135.0)
6161
.build()
62-
set = createExampleAnimator(maplibreMap.cameraPosition, animatedPosition)
62+
set = createExampleAnimator(mapMetricsMap.cameraPosition, animatedPosition)
6363
set.start()
6464
}
6565
}
@@ -85,7 +85,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
8585
latLngAnimator.duration = (1000 * ANIMATION_DELAY_FACTOR).toLong()
8686
latLngAnimator.interpolator = FastOutSlowInInterpolator()
8787
latLngAnimator.addUpdateListener { animation: ValueAnimator ->
88-
maplibreMap.moveCamera(
88+
mapMetricsMap.moveCamera(
8989
CameraUpdateFactory.newLatLng((animation.animatedValue as LatLng))
9090
)
9191
}
@@ -98,7 +98,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
9898
zoomAnimator.startDelay = (600 * ANIMATION_DELAY_FACTOR).toLong()
9999
zoomAnimator.interpolator = AnticipateOvershootInterpolator()
100100
zoomAnimator.addUpdateListener { animation: ValueAnimator ->
101-
maplibreMap.moveCamera(
101+
mapMetricsMap.moveCamera(
102102
CameraUpdateFactory.zoomTo((animation.animatedValue as Float).toDouble())
103103
)
104104
}
@@ -112,7 +112,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
112112
bearingAnimator.startDelay = (1000 * ANIMATION_DELAY_FACTOR).toLong()
113113
bearingAnimator.interpolator = FastOutLinearInInterpolator()
114114
bearingAnimator.addUpdateListener { animation: ValueAnimator ->
115-
maplibreMap.moveCamera(
115+
mapMetricsMap.moveCamera(
116116
CameraUpdateFactory.bearingTo((animation.animatedValue as Float).toDouble())
117117
)
118118
}
@@ -124,7 +124,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
124124
tiltAnimator.duration = (1000 * ANIMATION_DELAY_FACTOR).toLong()
125125
tiltAnimator.startDelay = (1500 * ANIMATION_DELAY_FACTOR).toLong()
126126
tiltAnimator.addUpdateListener { animation: ValueAnimator ->
127-
maplibreMap.moveCamera(
127+
mapMetricsMap.moveCamera(
128128
CameraUpdateFactory.tiltTo((animation.animatedValue as Float).toDouble())
129129
)
130130
}
@@ -144,7 +144,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
144144
}
145145

146146
override fun onOptionsItemSelected(item: MenuItem): Boolean {
147-
if (!::maplibreMap.isInitialized) {
147+
if (!::mapMetricsMap.isInitialized) {
148148
return false
149149
}
150150
if (item.itemId != android.R.id.home) {
@@ -156,7 +156,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
156156
}
157157

158158
private fun resetCameraPosition() {
159-
maplibreMap.moveCamera(
159+
mapMetricsMap.moveCamera(
160160
CameraUpdateFactory.newCameraPosition(
161161
CameraPosition.Builder()
162162
.target(START_LAT_LNG)
@@ -181,7 +181,7 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
181181
zoomAnimator.duration = (duration * ANIMATION_DELAY_FACTOR).toLong()
182182
zoomAnimator.interpolator = interpolator
183183
zoomAnimator.addUpdateListener { animation: ValueAnimator ->
184-
maplibreMap.moveCamera(
184+
mapMetricsMap.moveCamera(
185185
CameraUpdateFactory.zoomTo((animation.animatedValue as Float).toDouble())
186186
)
187187
}

‎platform/android/MapLibreAndroidTestApp/src/main/java/org/maplibre/android/testapp/activity/camera/GestureDetectorActivity.kt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import org.maplibre.android.testapp.utils.ResourceUtils
4141
/** Test activity showcasing APIs around gestures implementation. */
4242
class GestureDetectorActivity : AppCompatActivity() {
4343
private lateinit var mapView: MapView
44-
private lateinit var maplibreMap: MapMetricsMap
44+
private lateinit var mapMetricsMap: MapMetricsMap
4545
private lateinit var recyclerView: RecyclerView
4646
private var gestureAlertsAdapter: GestureAlertsAdapter? = null
4747
private var gesturesManager: AndroidGesturesManager? = null
@@ -53,8 +53,8 @@ class GestureDetectorActivity : AppCompatActivity() {
5353
mapView = findViewById(R.id.mapView)
5454
mapView.onCreate(savedInstanceState)
5555
mapView.getMapAsync { map: MapMetricsMap ->
56-
maplibreMap = map
57-
maplibreMap.setStyle(TestStyles.getPredefinedStyleWithFallback("Streets"))
56+
mapMetricsMap = map
57+
mapMetricsMap.setStyle(TestStyles.getPredefinedStyleWithFallback("Streets"))
5858
initializeMap()
5959
}
6060
recyclerView = findViewById(R.id.alerts_recycler)
@@ -100,18 +100,18 @@ class GestureDetectorActivity : AppCompatActivity() {
100100
}
101101

102102
private fun initializeMap() {
103-
gesturesManager = maplibreMap.gesturesManager
103+
gesturesManager = mapMetricsMap.gesturesManager
104104
val layoutParams = recyclerView.layoutParams as RelativeLayout.LayoutParams
105105
layoutParams.height = (mapView.height / 1.75).toInt()
106106
layoutParams.width = mapView.width / 3
107107
recyclerView.layoutParams = layoutParams
108108
attachListeners()
109-
fixedFocalPointEnabled(maplibreMap.uiSettings.focalPoint != null)
109+
fixedFocalPointEnabled(mapMetricsMap.uiSettings.focalPoint != null)
110110
}
111111

112112
fun attachListeners() {
113113
// # --8<-- [start:addOnMoveListener]
114-
maplibreMap.addOnMoveListener(
114+
mapMetricsMap.addOnMoveListener(
115115
object : OnMoveListener {
116116
override fun onMoveBegin(detector: MoveGestureDetector) {
117117
gestureAlertsAdapter!!.addAlert(
@@ -134,7 +134,7 @@ class GestureDetectorActivity : AppCompatActivity() {
134134
}
135135
)
136136
// # --8<-- [end:addOnMoveListener]
137-
maplibreMap.addOnRotateListener(
137+
mapMetricsMap.addOnRotateListener(
138138
object : OnRotateListener {
139139
override fun onRotateBegin(detector: RotateGestureDetector) {
140140
gestureAlertsAdapter!!.addAlert(
@@ -156,7 +156,7 @@ class GestureDetectorActivity : AppCompatActivity() {
156156
}
157157
}
158158
)
159-
maplibreMap.addOnScaleListener(
159+
mapMetricsMap.addOnScaleListener(
160160
object : OnScaleListener {
161161
override fun onScaleBegin(detector: StandardScaleGestureDetector) {
162162
gestureAlertsAdapter!!.addAlert(
@@ -204,7 +204,7 @@ class GestureDetectorActivity : AppCompatActivity() {
204204
}
205205
}
206206
)
207-
maplibreMap.addOnShoveListener(
207+
mapMetricsMap.addOnShoveListener(
208208
object : OnShoveListener {
209209
override fun onShoveBegin(detector: ShoveGestureDetector) {
210210
gestureAlertsAdapter!!.addAlert(
@@ -233,7 +233,7 @@ class GestureDetectorActivity : AppCompatActivity() {
233233
}
234234

235235
override fun onOptionsItemSelected(item: MenuItem): Boolean {
236-
val uiSettings = maplibreMap.uiSettings
236+
val uiSettings = mapMetricsMap.uiSettings
237237
when (item.itemId) {
238238
R.id.menu_gesture_focus_point -> {
239239
fixedFocalPointEnabled(focalPointLatLng == null)
@@ -284,8 +284,8 @@ class GestureDetectorActivity : AppCompatActivity() {
284284
private fun fixedFocalPointEnabled(enabled: Boolean) {
285285
if (enabled) {
286286
focalPointLatLng = LatLng(51.50325, -0.12968)
287-
marker = maplibreMap.addMarker(MarkerOptions().position(focalPointLatLng))
288-
maplibreMap.easeCamera(
287+
marker = mapMetricsMap.addMarker(MarkerOptions().position(focalPointLatLng))
288+
mapMetricsMap.easeCamera(
289289
CameraUpdateFactory.newLatLngZoom(focalPointLatLng!!, 16.0),
290290
object : CancelableCallback {
291291
override fun onCancel() {
@@ -299,18 +299,18 @@ class GestureDetectorActivity : AppCompatActivity() {
299299
)
300300
} else {
301301
if (marker != null) {
302-
maplibreMap.removeMarker(marker!!)
302+
mapMetricsMap.removeMarker(marker!!)
303303
marker = null
304304
}
305305
focalPointLatLng = null
306-
maplibreMap.uiSettings.focalPoint = null
306+
mapMetricsMap.uiSettings.focalPoint = null
307307
}
308308
}
309309

310310
private fun recalculateFocalPoint() {
311311
if (focalPointLatLng != null) {
312-
maplibreMap.uiSettings.focalPoint =
313-
maplibreMap.projection.toScreenLocation(focalPointLatLng!!)
312+
mapMetricsMap.uiSettings.focalPoint =
313+
mapMetricsMap.projection.toScreenLocation(focalPointLatLng!!)
314314
}
315315
}
316316

0 commit comments

Comments
 (0)