This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release-agua' back to master.
- Loading branch information
Showing
125 changed files
with
3,235 additions
and
655 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 6 additions & 3 deletions
9
platform/android/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...ndroid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/attribution/Attribution.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package com.mapbox.mapboxsdk.attribution; | ||
|
|
||
| public class Attribution { | ||
|
|
||
| private static final String OPENSTREETMAP = "OpenStreetMap"; | ||
| private static final String OPENSTREETMAP_ABBR = "OSM"; | ||
| static final String TELEMETRY = "Telemetry Settings"; | ||
|
|
||
| static final String IMPROVE_MAP_URL = "https://www.mapbox.com/map-feedback/"; | ||
| static final String MAPBOX_URL = "https://www.mapbox.com/about/maps/"; | ||
| static final String TELEMETRY_URL = "https://www.mapbox.com/telemetry/"; | ||
|
|
||
| private String title; | ||
| private String url; | ||
|
|
||
| Attribution(String title, String url) { | ||
| this.title = title; | ||
| this.url = url; | ||
| } | ||
|
|
||
| public String getTitle() { | ||
| return title; | ||
| } | ||
|
|
||
| public String getTitleAbbreviated() { | ||
| if (title.equals(OPENSTREETMAP)) { | ||
| return OPENSTREETMAP_ABBR; | ||
| } | ||
| return title; | ||
| } | ||
|
|
||
| public String getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
|
|
||
| Attribution that = (Attribution) o; | ||
|
|
||
| if (title != null ? !title.equals(that.title) : that.title != null) { | ||
| return false; | ||
| } | ||
| return url != null ? url.equals(that.url) : that.url == null; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| int result = title != null ? title.hashCode() : 0; | ||
| result = 31 * result + (url != null ? url.hashCode() : 0); | ||
| return result; | ||
| } | ||
| } |
Oops, something went wrong.