Skip to content

Commit

Permalink
Code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@SupasinTatiyanupanwong
SupasinTatiyanupanwong committed May 7, 2022
1 parent bee7cb4 commit 6fe80bf
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 52 deletions.
1 change: 1 addition & 0 deletions ...ore/src/main/java/dev/supasintatiyanupanwong/libraries/android/kits/maps/MapFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ public void onFragmentViewCreated(
* and ready to be used.
* @since 2.0.0
*/
@UiThread
public final void getMapAsync(final MapKit.OnMapAndViewReadyCallback callback) {
getMapAsync(new OnMapAndViewReadyCallbackImpl(this, callback));
}
Expand Down
2 changes: 2 additions & 0 deletions maps-core/src/main/java/dev/supasintatiyanupanwong/libraries/android/kits/maps/MapKit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ public interface OnMapReadyCallback {
* <p>Once an instance of this interface is set on a {@link MapFragment} object, the {@link
* #onMapAndViewReady(MapClient)} method is triggered when the map has undergone layout and is
* ready to be used and provides a non-null instance of {@link MapClient}.
*
* @since 2.0.0
*/
public interface OnMapAndViewReadyCallback {
/**
Expand Down
2 changes: 0 additions & 2 deletions ...asintatiyanupanwong/libraries/android/kits/maps/internal/nop/model/NopCameraPosition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@

import androidx.annotation.FloatRange;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;

import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.CameraPosition;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.CameraUpdate;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.LatLng;

@RestrictTo(LIBRARY)
Expand Down
3 changes: 0 additions & 3 deletions ...ava/dev/supasintatiyanupanwong/libraries/android/kits/maps/internal/nop/model/NopCap.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,11 @@

import static androidx.annotation.RestrictTo.Scope.LIBRARY;

import android.graphics.Bitmap;

import androidx.annotation.NonNull;
import androidx.annotation.RestrictTo;

import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.BitmapDescriptor;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.ButtCap;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.Cap;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.CustomCap;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.RoundCap;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.SquareCap;
Expand Down
1 change: 0 additions & 1 deletion .../dev/supasintatiyanupanwong/libraries/android/kits/maps/internal/nop/model/NopCircle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import androidx.annotation.RestrictTo;

import java.util.List;
import java.util.Objects;

import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.Circle;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.LatLng;
Expand Down
3 changes: 0 additions & 3 deletions ...pasintatiyanupanwong/libraries/android/kits/maps/internal/nop/model/NopGroundOverlay.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;

import java.util.Objects;

import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.BitmapDescriptor;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.GroundOverlay;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.LatLng;
Expand Down
1 change: 0 additions & 1 deletion ...upasintatiyanupanwong/libraries/android/kits/maps/internal/nop/model/NopLatLngBounds.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;

import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.LatLng;
Expand Down
1 change: 0 additions & 1 deletion ...supasintatiyanupanwong/libraries/android/kits/maps/internal/nop/model/NopPatternItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.Dash;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.Dot;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.Gap;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.PatternItem;

@RestrictTo(LIBRARY)
public class NopPatternItem implements Dash, Dot, Gap {
Expand Down
4 changes: 0 additions & 4 deletions ...dev/supasintatiyanupanwong/libraries/android/kits/maps/internal/nop/model/NopPolygon.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,13 @@
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.JointType;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.LatLng;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.PatternItem;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.Polygon;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.Polyline;

@RestrictTo(LIBRARY)
public class NopPolygon {
Expand Down
2 changes: 0 additions & 2 deletions ...supasintatiyanupanwong/libraries/android/kits/maps/internal/nop/model/NopTileOverlay.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;

import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.BitmapDescriptor;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.TileOverlay;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.TileProvider;

Expand Down
2 changes: 0 additions & 2 deletions ...upasintatiyanupanwong/libraries/android/kits/maps/internal/nop/model/NopTileProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;

import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.Tile;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.TileProvider;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.VisibleRegion;

@RestrictTo(LIBRARY)
public class NopTileProvider implements TileProvider {
Expand Down
2 changes: 0 additions & 2 deletions ...pasintatiyanupanwong/libraries/android/kits/maps/internal/nop/model/NopVisibleRegion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;

import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.LatLng;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.LatLngBounds;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.Tile;
import dev.supasintatiyanupanwong.libraries.android.kits.maps.model.VisibleRegion;

@RestrictTo(LIBRARY)
Expand Down
3 changes: 1 addition & 2 deletions .../java/dev/supasintatiyanupanwong/samples/android/kits/maps/GroundOverlayDemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ public class GroundOverlayDemoActivity extends AppCompatActivity implements
private static final LatLng NEWARK = MapKit.newLatLng(40.714086, -74.228697);

private static final LatLng NEAR_NEWARK =
MapKit
.newLatLng(NEWARK.getLatitude() - 0.001, NEWARK.getLongitude() - 0.025);
MapKit.newLatLng(NEWARK.getLatitude() - 0.001, NEWARK.getLongitude() - 0.025);

private final List<BitmapDescriptor> mImages = new ArrayList<>();

Expand Down
16 changes: 5 additions & 11 deletions .../src/main/java/dev/supasintatiyanupanwong/samples/android/kits/maps/TagsDemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,15 @@ private void addObjectsToMap() {
sydneyGroundOverlay.setTag(new CustomTag("Sydney ground overlay"));

// A marker at Hobart.
Marker hobartMarker = mMap.addMarker(
MapKit.newMarkerOptions().position(HOBART));
Marker hobartMarker = mMap.addMarker(MapKit.newMarkerOptions().position(HOBART));
hobartMarker.setTag(new CustomTag("Hobart marker"));

// A polygon centered at Darwin.
Polygon darwinPolygon = mMap.addPolygon(MapKit.newPolygonOptions()
.add(
MapKit
.newLatLng(DARWIN.getLatitude() + 3, DARWIN.getLongitude() - 3),
MapKit
.newLatLng(DARWIN.getLatitude() + 3, DARWIN.getLongitude() + 3),
MapKit
.newLatLng(DARWIN.getLatitude() - 3, DARWIN.getLongitude() + 3),
MapKit
.newLatLng(DARWIN.getLatitude() - 3, DARWIN.getLongitude() - 3))
.add(MapKit.newLatLng(DARWIN.getLatitude() + 3, DARWIN.getLongitude() - 3),
MapKit.newLatLng(DARWIN.getLatitude() + 3, DARWIN.getLongitude() + 3),
MapKit.newLatLng(DARWIN.getLatitude() - 3, DARWIN.getLongitude() + 3),
MapKit.newLatLng(DARWIN.getLatitude() - 3, DARWIN.getLongitude() - 3))
.fillColor(Color.argb(150, 34, 173, 24))
.strokeColor(Color.rgb(34, 173, 24))
.clickable(true));
Expand Down
34 changes: 16 additions & 18 deletions ...in/java/dev/supasintatiyanupanwong/samples/android/kits/maps/TileOverlayDemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,22 @@ protected void onCreate(Bundle savedInstanceState) {
public void onMapReady(@NonNull MapClient map) {
map.setMapType(MapClient.MAP_TYPE_NONE);

TileProvider tileProvider = MapKit
.newUrlTileProvider(256, 256, new UrlTileProvider() {
@Override
public synchronized URL getTileUrl(int x, int y, int zoom) {
// The moon tile coordinate system is reversed. This is not normal.
int reversedY = (1 << zoom) - y - 1;
String urlSpec =
String.format(Locale.US, MOON_MAP_URL_FORMAT, zoom, x, reversedY);
try {
return new URL(urlSpec);
} catch (MalformedURLException e) {
throw new AssertionError(e);
}
}
});

mMoonTiles = map.addTileOverlay(
MapKit.newTileOverlayOptions().tileProvider(tileProvider));
TileProvider tileProvider = MapKit.newUrlTileProvider(256, 256, new UrlTileProvider() {
@Override
public synchronized URL getTileUrl(int x, int y, int zoom) {
// The moon tile coordinate system is reversed. This is not normal.
int reversedY = (1 << zoom) - y - 1;
String urlSpec =
String.format(Locale.US, MOON_MAP_URL_FORMAT, zoom, x, reversedY);
try {
return new URL(urlSpec);
} catch (MalformedURLException e) {
throw new AssertionError(e);
}
}
});

mMoonTiles = map.addTileOverlay(MapKit.newTileOverlayOptions().tileProvider(tileProvider));
mTransparencyBar.setOnSeekBarChangeListener(this);
}

Expand Down

0 comments on commit 6fe80bf

Please sign in to comment.