Skip to content

Commit

Permalink
v2.7.1.3
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 66f183afe2afad74d7b63ebfd908efc24743bfdb
Author: 8bhsolutions <48874658+8bhsolutions@users.noreply.github.com>
Date:   Sat Oct 23 14:25:12 2021 +1100

    fix: Custom markers not working for cordova-android 10+ and add checked for https scheme

    Original credits goes to @ebhsgit (mapsplugin@514426a)

commit afc72f5d4503cd96bf79ff339bff153312c4d6ca
Author: 8bhsolutions <48874658+8bhsolutions@users.noreply.github.com>
Date:   Fri May 21 17:33:55 2021 +1000

    fix: Blank map when starting app using cordova-android branch which has upgraded AGP to 4.1.3

    Original credits goes to @ebhsgit (mapsplugin#2871)

commit 230040f778f3a5f46686e02e960acf00b8040ba0
Author: Mathieu Castets <mathieu.castets@4sh.fr>
Date:   Tue Dec 21 18:40:40 2021 +0100

    fix: Remove JS calls to getMessage() as this method does not exist on error object
  • Loading branch information
mcastets authored and claudioscheer committed Feb 13, 2024
1 parent d4ceed9 commit ceedb51
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions src/android/plugin/google/maps/AsyncLoadImage.java
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,13 @@ protected AsyncLoadImageResult doInBackground(Void... params) {
if (!iconUrl.startsWith("data:image")) {

if (iconUrl.startsWith("http://localhost") ||
iconUrl.startsWith("http://127.0.0.1")) {
iconUrl.startsWith("https://localhost") ||
iconUrl.startsWith("http://127.0.0.1") ||
iconUrl.startsWith("https://127.0.0.1")
) {
// Log.d(TAG, String.format("---->(201)iconURL = %s", iconUrl));
if (iconUrl.contains("://")) {
iconUrl = iconUrl.replaceAll("http://.+?/", "file:///android_asset/www/");
iconUrl = iconUrl.replaceAll("https?://.+?/", "file:///android_asset/www/");
} else {
// Avoid WebViewLocalServer (because can not make a connection for some reason)
iconUrl = "file:///android_asset/www/".concat(iconUrl);
Expand Down
2 changes: 1 addition & 1 deletion src/browser/PluginMarker.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ PluginMarker.prototype.__create = function(markerId, pluginOptions, onSuccess, o
});
};
img.onerror = function(error) {
console.warn(error.getMessage());
console.warn('[PluginMarker] Could not load img', error);
onSuccess(marker, {
'__pgmId': markerId,
'width': 20,
Expand Down
2 changes: 1 addition & 1 deletion src/browser/PluginMarkerCluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ PluginMarkerCluster.prototype.redrawClusters = function(onSuccess, onError, args
}
self.pluginMarkers[clusterId_markerId] = STATUS.DELETED;

console.warn(error.getMessage());
console.warn('[PluginMarkerCluster] Could not read icon', error);
self.deleteMarkers.push(clusterId_markerId);
resolve();
});
Expand Down

0 comments on commit ceedb51

Please sign in to comment.