Skip to content

Commit a3c31d5

Browse files
committed
feat: refactor some deprecated osmdroid methods
1 parent 840e928 commit a3c31d5

File tree

9 files changed

+15
-35
lines changed

9 files changed

+15
-35
lines changed

android/src/main/java/com/osmdroid/OsmMapCalloutManager.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.osmdroid;
22

3+
import androidx.annotation.NonNull;
4+
35
import com.osmdroid.utils.SizeReportingShadowNode;
46
import com.facebook.react.common.MapBuilder;
57
import com.facebook.react.uimanager.LayoutShadowNode;
@@ -19,7 +21,7 @@ public String getName() {
1921
}
2022

2123
@Override
22-
public OsmMapCallout createViewInstance(ThemedReactContext context) {
24+
public OsmMapCallout createViewInstance(@NonNull ThemedReactContext context) {
2325
return new OsmMapCallout(context);
2426
}
2527

android/src/main/java/com/osmdroid/OsmMapCircleManager.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,5 @@ public void setStrokeColor(OsmMapCircle view, int color) {
6565
view.setStrokeColor(color);
6666
}
6767

68-
// @ReactProp(name = "zIndex", defaultFloat = 1.0f)
69-
// public void setZIndex(OSMMapCircle view, float zIndex) {
70-
// view.setZIndex(zIndex);
71-
// }
7268

7369
}

android/src/main/java/com/osmdroid/OsmMapFileTile.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@
1717
import java.util.List;
1818
import java.util.Set;
1919

20-
/**
21-
* Allows to use offline tile source
22-
*
23-
* - Put zip file(s) in internal memory: /data/data/{packageName}/files/offline_tiles/
24-
* - Internal file subdirectory (offline_tiles) may be changed with setFileDirPath or fileDirPath in
25-
* js.
26-
* - Every zip must have same root directory, with same name as others: {ROOT_DIR_NAME}/z/X/Y
27-
* - Remember to remove hidden os related garbage (like .DS_Store etc.) before creating zip
28-
* - Zip files may have any name
29-
*/
3020
public class OsmMapFileTile extends OsmMapFeature {
3121

3222
private final static String TAG = "OsmMapFileTile";
@@ -42,12 +32,10 @@ public OsmMapFileTile(Context context) {
4232
@Override public void addToMap(MapView map) {
4333
setupMapProvider(map);
4434
map.setUseDataConnection(false);
45-
// map.setTilesScaledToDpi(false);
4635
}
4736

4837
@Override public void removeFromMap(MapView map) {
4938
map.setTileSource(TileSourceFactory.DEFAULT_TILE_SOURCE);
50-
// map.setTilesScaledToDpi(false);
5139
}
5240

5341
@Override public Object getFeature() {

android/src/main/java/com/osmdroid/OsmMapView.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX,
111111

112112
eventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
113113
this.setTileSource(TileSourceFactory.DEFAULT_TILE_SOURCE);
114-
// this.setTilesScaledToDpi(false);
115-
// this.setTilesScaleFactor(1);
116114
this.getZoomController().setVisibility(CustomZoomButtonsController.Visibility.NEVER);
117115
}
118116

android/src/main/java/com/osmdroid/OsmdroidPackage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.facebook.react.uimanager.ViewManager;
77

88
import java.util.Arrays;
9-
import java.util.Collections;
109
import java.util.List;
1110

1211
public class OsmdroidPackage implements ReactPackage {

android/src/main/java/com/osmdroid/utils/ImageReader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.content.Context;
44
import android.content.res.Resources;
55
import android.graphics.Bitmap;
6-
import android.graphics.BitmapFactory;
76
import android.graphics.drawable.Animatable;
87
import android.net.Uri;
98

android/src/main/java/com/osmdroid/utils/LatLngBoundsUtils.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55

66
public class LatLngBoundsUtils {
77
public static boolean BoundsAreDifferent(BoundingBox a, BoundingBox b) {
8-
GeoPoint centerA = a.getCenter();
8+
GeoPoint centerA = a.getCenterWithDateLine();
99
double latA = centerA.getLatitude();
1010
double lngA = centerA.getLongitude();
1111
double latDeltaA = a.getLatitudeSpan();
12-
double lngDeltaA = a.getLongitudeSpan();
12+
double lngDeltaA = a.getLongitudeSpanWithDateLine();
1313

14-
GeoPoint centerB = b.getCenter();
14+
GeoPoint centerB = b.getCenterWithDateLine();
1515
double latB = centerB.getLatitude();
1616
double lngB = centerB.getLongitude();
1717
double latDeltaB = b.getLatitudeSpan();
18-
double lngDeltaB = b.getLongitudeSpan();
18+
double lngDeltaB = b.getLongitudeSpanWithDateLine();
1919

2020
double latEps = LatitudeEpsilon(a, b);
2121
double lngEps = LongitudeEpsilon(a, b);
@@ -39,8 +39,8 @@ private static double LatitudeEpsilon(BoundingBox a, BoundingBox b) {
3939
}
4040

4141
private static double LongitudeEpsilon(BoundingBox a, BoundingBox b) {
42-
double sizeA = a.getLongitudeSpan();
43-
double sizeB = b.getLongitudeSpan();
42+
double sizeA = a.getLongitudeSpanWithDateLine();
43+
double sizeB = b.getLongitudeSpanWithDateLine();
4444
double size = Math.min(Math.abs(sizeA), Math.abs(sizeB));
4545
return size / 2560;
4646
}

android/src/main/java/com/osmdroid/utils/SizeReportingShadowNode.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
/**
2-
* Copyright (c) 2015-present, Facebook, Inc.
3-
* All rights reserved.
4-
* This source code is licensed under the BSD-style license found in the
5-
* LICENSE file in the root directory of this source tree. An additional grant
6-
* of patent rights can be found in the PATENTS file in the same directory.
7-
*/
81

92
package com.osmdroid.utils;
103

example/src/App.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,15 @@ export default function App() {
3232
return (
3333
<View style={{ flex: 1, position: 'relative' }}>
3434
<MapView.Animated
35-
// tileDownloadThreads={12}
3635
ref={mapRef}
3736
style={styles.container}
3837
initialRegion={initialRegion}
38+
onRegionChange={(event) => {
39+
console.log('🚀 ~ file: App.tsx:117 ~ App ~ onRegionChange:', event);
40+
}}
41+
onRegionChangeComplete={(event) => {
42+
console.log('🚀 ~ file: App.tsx:117 ~ App ~ onRegionChange:', event);
43+
}}
3944
>
4045
<Marker
4146
coordinate={{

0 commit comments

Comments
 (0)