Skip to content

Update index.android.ts - Fixes #32 Same icon for all markers added #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 14, 2022
Merged

Update index.android.ts - Fixes #32 Same icon for all markers added #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b106052
Update index.android.ts
Mar 23, 2022
2f8b68e
Fix of issue #88
Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ui-mapbox/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1345,13 +1345,13 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
if (marker.icon) {
// for markers from url see UrlMarker in https://github.com/mapbox/mapbox-gl-native/issues/5370
if (marker.icon.startsWith('res://')) {
let cached = this.iconCache[marker.iconPath];
let cached = this.iconCache[marker.icon];
if (!cached) {
const resourcename = marker.icon.substring(6);
const res = Utils.ad.getApplicationContext().getResources();
const identifier = res.getIdentifier(resourcename, 'drawable', Utils.ad.getApplication().getPackageName());
if (identifier !== 0) {
cached = this.iconCache[marker.iconPath] = iconFactory.fromResource(identifier);
cached = this.iconCache[marker.icon] = iconFactory.fromResource(identifier);
}
}
if (cached) {
Expand Down
2 changes: 1 addition & 1 deletion src/ui-mapbox/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3119,7 +3119,7 @@ export class Mapbox extends MapboxCommon implements MapboxApi {

const layer = theMap.style.layerWithIdentifier(name);

resolve(new Layer(layer));
resolve(layer ? new Layer(layer) : null);
} catch (ex) {
if (Trace.isEnabled()) {
CLog(CLogTypes.info, 'Error in mapbox.getLayer: ' + ex);
Expand Down