Skip to content

Commit

Permalink
Merge pull request #291 from aakash-jain-axway/MOD-2559
Browse files Browse the repository at this point in the history
  • Loading branch information
saumya-rai-axway authored May 20, 2020
2 parents 16992e3 + 7adc77c commit b5bf072
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 5.0.1
version: 5.0.2
apiversion: 4
architectures: arm64-v8a armeabi-v7a x86 x86_64
description: External version of Map module using native Google Maps library
Expand Down
8 changes: 4 additions & 4 deletions android/src/ti/map/ViewProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public boolean handleMessage(Message msg)

case MSG_ZOOM: {
result = (AsyncResult) msg.obj;
result.setResult(handleGetZoom());
result.setResult(handleGetZoomLevel());
return true;
}

Expand Down Expand Up @@ -1138,17 +1138,17 @@ public void handleZoom(int delta)
// clang-format off
@Kroll.method
@Kroll.getProperty
public float getZoom()
public float getZoomLevel()
// clang-format on
{
if (TiApplication.isUIThread()) {
return handleGetZoom();
return handleGetZoomLevel();
} else {
return (Float) TiMessenger.sendBlockingMainMessage(getMainHandler().obtainMessage(MSG_ZOOM));
}
}

private float handleGetZoom()
private float handleGetZoomLevel()
{
TiUIView view = peekView();
if (view instanceof TiUIMapView) {
Expand Down
4 changes: 2 additions & 2 deletions apidoc/View.yml
Original file line number Diff line number Diff line change
Expand Up @@ -917,13 +917,13 @@ properties:
since: "3.2.3"
platforms: [android]

- name: zoom
- name: zoomLevel
summary: The zoom level of the map.
description: |
For more details, see [Google Docs](https://developers.google.com/maps/documentation/android/views#zoom).
Cannot be used in conjunction with [longitudeDelta](MapRegionTypev2.longitudeDelta) or [latitudeDelta](MapRegionTypev2.latitudeDelta)
type: Number
since: "3.2.3"
since: "5.0.2"
platforms: [android]

---
Expand Down

0 comments on commit b5bf072

Please sign in to comment.