status-im/react-native-mapbox-gl
1
0
Fork 0
mirror of https://github.com/status-im/react-native-mapbox-gl.git synced 2026-08-31 04:51:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace image! with source: { uri }

Browse Source
This commit is contained in:
Marius Petcu
2016-07-11 21:47:42 +03:00
parent 8fc0354df8
commit d7f107d0fb
7 changed files with 65 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/mapbox/reactnativemapboxgl/RNMGLAnnotationOptionsFactory.java
+8 -6
View File
@@ -21,6 +21,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -97,16 +98,17 @@ public class RNMGLAnnotationOptionsFactory {
static Map<String, Icon> iconCache = new HashMap();
static Icon iconFromPathAndSize(Context context, String path, int width, int height) throws IOException {
static Icon iconFromSourceAndSize(Context context, ReadableMap source, int width, int height) throws IOException {
String path = source.getString("uri");
String cacheKey = path + "||" + width + "||" + height;
Icon icon = iconCache.get(cacheKey);
if (icon != null) { return icon; }
Drawable drawable;
if (path.startsWith("image!")) {
drawable = drawableFromDrawableName(context, path.replace("image!", ""));
} else {
try {
drawable = drawableFromUrl(context, path);
} catch (MalformedURLException ex) {
drawable = drawableFromDrawableName(context, path);
}
IconFactory iconFactory = IconFactory.getInstance(context);
@@ -148,7 +150,7 @@ public class RNMGLAnnotationOptionsFactory {
if (annotation.hasKey("annotationImage")) {
ReadableMap annotationImage = annotation.getMap("annotationImage");
String annotationURL = annotationImage.getString("url");
ReadableMap annotationSource = annotationImage.getMap("source");
try {
int width = -1;
int height = -1;
@@ -159,7 +161,7 @@ public class RNMGLAnnotationOptionsFactory {
width = Math.round((float)annotationImage.getInt("width") * scale);
}
marker.icon(iconFromPathAndSize(context, annotationURL, width, height));
marker.icon(iconFromSourceAndSize(context, annotationSource, width, height));
} catch (Exception e) {
e.printStackTrace();
}