Skip to content

Commit b03c610

Browse files
Splicer97Splicer97
committed
feat: refactor deprecated native methods
1 parent 7872a7b commit b03c610

File tree

7 files changed

+39
-83
lines changed

7 files changed

+39
-83
lines changed

‎android/src/main/java/com/osmdroid/OsmMapCircle.java‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public class OsmMapCircle extends OsmMapFeature {
1515
private int strokeColor;
1616
private int fillColor;
1717
private float strokeWidth;
18-
private float zIndex;
1918
private MapView mapView;
2019

2120
public OsmMapCircle(Context context) {
@@ -39,34 +38,27 @@ public void setRadius(double radius) {
3938
public void setFillColor(int color) {
4039
this.fillColor = color;
4140
if (polygon != null) {
42-
polygon.setFillColor(color);
41+
polygon.getFillPaint().setColor(color);
4342
mapView.invalidate();
4443
}
4544
}
4645

4746
public void setStrokeColor(int color) {
4847
this.strokeColor = color;
4948
if (polygon != null) {
50-
polygon.setStrokeColor(color);
49+
polygon.getOutlinePaint().setColor(color);
5150
mapView.invalidate();
5251
}
5352
}
5453

5554
public void setStrokeWidth(float width) {
5655
this.strokeWidth = width;
5756
if (polygon != null) {
58-
polygon.setStrokeWidth(width);
57+
polygon.getOutlinePaint().setStrokeWidth(width);
5958
mapView.invalidate();
6059
}
6160
}
6261

63-
// public void setZIndex(float zIndex) {
64-
// this.zIndex = zIndex;
65-
// if (circle != null) {
66-
// circle.setZIndex(zIndex);
67-
// }
68-
// }
69-
7062
@Override
7163
public Object getFeature() {
7264
return polygon;
@@ -77,9 +69,9 @@ public void addToMap(MapView map) {
7769
polygon = new Polygon();
7870
mapView = map;
7971
polygon.setPoints(Polygon.pointsAsCircle(center, radius));
80-
polygon.setFillColor(fillColor);
81-
polygon.setStrokeColor(strokeColor);
82-
polygon.setStrokeWidth(strokeWidth);
72+
polygon.getFillPaint().setColor(fillColor);
73+
polygon.getOutlinePaint().setColor(strokeColor);
74+
polygon.getOutlinePaint().setStrokeWidth(strokeWidth);
8375
map.getOverlays().add(polygon);
8476
mapView.invalidate();
8577
}

‎android/src/main/java/com/osmdroid/OsmMapPolygon.java‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ public class OsmMapPolygon extends OsmMapFeature {
2020
private int strokeColor;
2121
private int fillColor;
2222
private float strokeWidth;
23-
private boolean geodesic;
24-
private float zIndex;
2523
private MapView mapView;
2624

2725
public OsmMapPolygon(Context context) {
@@ -46,40 +44,27 @@ public void setCoordinates(ReadableArray coordinates) {
4644
public void setFillColor(int color) {
4745
this.fillColor = color;
4846
if (polygon != null) {
49-
polygon.setFillColor(color);
47+
polygon.getFillPaint().setColor(color);
5048
mapView.invalidate();
5149
}
5250
}
5351

5452
public void setStrokeColor(int color) {
5553
this.strokeColor = color;
5654
if (polygon != null) {
57-
polygon.setStrokeColor(color);
55+
polygon.getOutlinePaint().setColor(color);
5856
mapView.invalidate();
5957
}
6058
}
6159

6260
public void setStrokeWidth(float width) {
6361
this.strokeWidth = width;
6462
if (polygon != null) {
65-
polygon.setStrokeWidth(width);
63+
polygon.getOutlinePaint().setStrokeWidth(width);
6664
mapView.invalidate();
6765
}
6866
}
6967

70-
// public void setGeodesic(boolean geodesic) {
71-
// this.geodesic = geodesic;
72-
// if (polygon != null) {
73-
// polygon.setGeodesic(geodesic);
74-
// }
75-
// }
76-
77-
// public void setZIndex(float zIndex) {
78-
// this.zIndex = zIndex;
79-
// if (polygon != null) {
80-
// polygon.setZIndex(zIndex);
81-
// }
82-
// }
8368

8469
@Override
8570
public Object getFeature() {
@@ -91,9 +76,9 @@ public void addToMap(MapView map) {
9176
polygon = new Polygon();
9277
mapView = map;
9378
polygon.setPoints(coordinates);
94-
polygon.setFillColor(fillColor);
95-
polygon.setStrokeColor(strokeColor);
96-
polygon.setStrokeWidth(strokeWidth);
79+
polygon.getFillPaint().setColor(fillColor);
80+
polygon.getOutlinePaint().setColor(strokeColor);
81+
polygon.getOutlinePaint().setStrokeWidth(strokeWidth);
9782
map.getOverlays().add(polygon);
9883
mapView.invalidate();
9984
}

‎android/src/main/java/com/osmdroid/OsmMapPolygonManager.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,6 @@ public void setStrokeColor(OsmMapPolygon view, int color) {
6363
view.setStrokeColor(color);
6464
}
6565

66-
// @ReactProp(name = "geodesic", defaultBoolean = false)
67-
// public void setGeodesic(AirMapPolygon view, boolean geodesic) {
68-
// view.setGeodesic(geodesic);
69-
// }
70-
//
71-
// @ReactProp(name = "zIndex", defaultFloat = 1.0f)
72-
// public void setZIndex(AirMapPolygon view, float zIndex) {
73-
// view.setZIndex(zIndex);
74-
// }
7566

7667
@Override
7768
@Nullable

‎android/src/main/java/com/osmdroid/OsmMapPolyline.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,19 @@ public void setCoordinates(ReadableArray coordinates) {
4343
public void setColor(int color) {
4444
this.color = color;
4545
if (polyline != null) {
46-
polyline.setColor(color);
46+
polyline.getOutlinePaint().setColor(color);
4747
mapView.invalidate();
4848
}
4949
}
5050

5151
public void setWidth(float width) {
5252
this.width = width;
5353
if (polyline != null) {
54-
polyline.setWidth(width);
54+
polyline.getOutlinePaint().setStrokeWidth(width);
5555
mapView.invalidate();
5656
}
5757
}
5858

59-
// public void setZIndex(float zIndex) {
60-
// this.zIndex = zIndex;
61-
// if (polyline != null) {
62-
// polyline.setZIndex(zIndex);
63-
// }
64-
// }
65-
//
6659
public void setGeodesic(boolean geodesic) {
6760
this.geodesic = geodesic;
6861
if (polyline != null) {
@@ -81,8 +74,8 @@ public void addToMap(MapView map) {
8174
polyline = new Polyline();
8275
mapView = map;
8376
polyline.setPoints(coordinates);
84-
polyline.setColor(color);
85-
polyline.setWidth(width);
77+
polyline.getOutlinePaint().setColor(color);
78+
polyline.getOutlinePaint().setStrokeWidth(width);
8679
polyline.setGeodesic(geodesic);
8780
mapView.getOverlayManager().add(polyline);
8881
mapView.invalidate();

‎android/src/main/java/com/osmdroid/OsmMapPolylineManager.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public OsmMapPolylineManager(ReactApplicationContext reactContext) {
2525
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
2626
metrics = new DisplayMetrics();
2727
((WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE))
28-
.getDefaultDisplay()
29-
.getRealMetrics(metrics);
28+
.getDefaultDisplay()
29+
.getRealMetrics(metrics);
3030
} else {
3131
metrics = reactContext.getResources().getDisplayMetrics();
3232
}
@@ -63,16 +63,12 @@ public void setGeodesic(OsmMapPolyline view, boolean geodesic) {
6363
view.setGeodesic(geodesic);
6464
}
6565

66-
// @ReactProp(name = "zIndex", defaultFloat = 1.0f)
67-
// public void setZIndex(AirMapPolyline view, float zIndex) {
68-
// view.setZIndex(zIndex);
69-
// }
7066

7167
@Override
7268
@Nullable
7369
public Map getExportedCustomDirectEventTypeConstants() {
7470
return MapBuilder.of(
75-
"onPress", MapBuilder.of("registrationName", "onPress")
71+
"onPress", MapBuilder.of("registrationName", "onPress")
7672
);
7773
}
7874
}

‎android/src/main/java/com/osmdroid/OsmMapUrlTile.java‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,12 @@
77
import org.osmdroid.tileprovider.tilesource.ITileSource;
88
import org.osmdroid.tileprovider.tilesource.OnlineTileSourceBase;
99
import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
10-
import org.osmdroid.tileprovider.tilesource.XYTileSource;
1110
import org.osmdroid.util.MapTileIndex;
1211
import org.osmdroid.views.MapView;
1312

14-
import java.net.MalformedURLException;
15-
import java.net.URL;
1613

1714
public class OsmMapUrlTile extends OsmMapFeature {
1815

19-
private ITileSource tileSource;
2016

2117
private String urlTemplate;
2218
private float maximumZ = 100.f;
@@ -25,22 +21,23 @@ public class OsmMapUrlTile extends OsmMapFeature {
2521
public class OsmMapTileSource extends OnlineTileSourceBase {
2622

2723
public OsmMapTileSource(final String aName, final int aZoomMinLevel,
28-
final int aZoomMaxLevel, final int aTileSizePixels,
29-
final String urlTemplate) {
24+
final int aZoomMaxLevel, final int aTileSizePixels,
25+
final String urlTemplate) {
3026
super(aName, aZoomMinLevel, aZoomMaxLevel, aTileSizePixels,
31-
null, new String[] { urlTemplate },null);
27+
null, new String[]{urlTemplate}, null);
3228
}
3329

3430
@Override
35-
public String toString(){
31+
public String toString() {
3632
return name();
3733
}
34+
3835
@Override
3936
public String getTileURLString(final long pMapTileIndex) {
4037
String url = getBaseUrl()
41-
.replace("{x}", Integer.toString(MapTileIndex.getX(pMapTileIndex)))
42-
.replace("{y}", Integer.toString(MapTileIndex.getY(pMapTileIndex)))
43-
.replace("{z}", Integer.toString(MapTileIndex.getZoom(pMapTileIndex)));
38+
.replace("{x}", Integer.toString(MapTileIndex.getX(pMapTileIndex)))
39+
.replace("{y}", Integer.toString(MapTileIndex.getY(pMapTileIndex)))
40+
.replace("{z}", Integer.toString(MapTileIndex.getZoom(pMapTileIndex)));
4441

4542
Log.e("OsmMapTileSource", url);
4643
return url;
@@ -49,9 +46,9 @@ public String getTileURLString(final long pMapTileIndex) {
4946
@Override
5047
public String getTileRelativeFilenameString(long pMapTileIndex) {
5148
return pathBase()
52-
.replace("{x}", Integer.toString(MapTileIndex.getX(pMapTileIndex)))
53-
.replace("{y}", Integer.toString(MapTileIndex.getY(pMapTileIndex)))
54-
.replace("{z}", Integer.toString(MapTileIndex.getZoom(pMapTileIndex)));
49+
.replace("{x}", Integer.toString(MapTileIndex.getX(pMapTileIndex)))
50+
.replace("{y}", Integer.toString(MapTileIndex.getY(pMapTileIndex)))
51+
.replace("{z}", Integer.toString(MapTileIndex.getZoom(pMapTileIndex)));
5552
}
5653
}
5754

@@ -78,14 +75,12 @@ public Object getFeature() {
7875

7976
@Override
8077
public void addToMap(MapView map) {
81-
final ITileSource tileSource = new OsmMapTileSource( "OsmMapTileSource", (int)minimumZ, (int)maximumZ, 256, urlTemplate);
78+
final ITileSource tileSource = new OsmMapTileSource("OsmMapTileSource", (int) minimumZ, (int) maximumZ, 256, urlTemplate);
8279
map.setTileSource(tileSource);
83-
// map.setTilesScaledToDpi(false);
8480
}
8581

8682
@Override
8783
public void removeFromMap(MapView map) {
8884
map.setTileSource(TileSourceFactory.DEFAULT_TILE_SOURCE);
89-
// map.setTilesScaledToDpi(false);
9085
}
9186
}

‎example/src/App.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export default function App() {
6161
coordinates={[
6262
{
6363
latitude: 55.7521,
64-
longitude: 37.60556,
64+
longitude: 37.18139,
6565
},
6666
{
6767
latitude: 55.75223,
@@ -71,6 +71,10 @@ export default function App() {
7171
latitude: 55.75224,
7272
longitude: 37.61558,
7373
},
74+
{
75+
latitude: 45.75224,
76+
longitude: 33.61558,
77+
},
7478
]}
7579
/>
7680
<Polygon
@@ -92,13 +96,13 @@ export default function App() {
9296
]}
9397
/>
9498
<Circle
95-
strokeWidth={40}
96-
strokeColor="white"
99+
strokeWidth={100}
100+
strokeColor="green"
97101
center={{
98102
latitude: 55.72324,
99103
longitude: 37.62358,
100104
}}
101-
radius={40}
105+
radius={100}
102106
/>
103107
<UrlTile urlTemplate={toner} />
104108
</MapView.Animated>

0 commit comments

Comments
 (0)