Skip to content

Commit

Permalink
Merge branch 'add-poi-click' of https://github.com/hansemannn/ti.map
Browse files Browse the repository at this point in the history
…into add-poi-click
  • Loading branch information
hansemannn committed Nov 2, 2019
2 parents db1582a + a0c6cda commit fac8c27
Show file tree
Hide file tree
Showing 35 changed files with 2,574 additions and 381 deletions.
11 changes: 11 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
node_modules

android/bin/
android/build/
android/dist/
ios/build/
ios/dist/

# These should eventually be linted as well
android/example/
ios/example/
16 changes: 16 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"extends": [ "axway/env-titanium", "axway/env-node" ],
"parserOptions": {
"ecmaVersion": 2015,
"sourceType": "script"
},
"overrides": [
{
"files": [ "dangerfile.js" ],
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
}
}
]
}
11 changes: 11 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
android/documentation/
android/example/

iphone/documentation/
iphone/example/
iphone/platform/

test/
apidoc/
Jenkinsfile
dangerfile.js
7 changes: 6 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#!groovy
library 'pipeline-library'

def isMaster = env.BRANCH_NAME.equals('master')

buildModule {
sdkVersion = '8.1.1.GA'
sdkVersion = '8.1.1.GA' // use a master build with ARM64 support
npmPublish = isMaster // By default it'll do github release on master anyways too
iosLabels = 'osx && xcode-11'
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Titanium Map Module [![Build Status](https://travis-ci.org/appcelerator-modules/ti.map.svg)](https://travis-ci.org/appcelerator-modules/ti.map)
# Titanium Map Module [![Build Status](https://jenkins.appcelerator.org/buildStatus/icon?job=modules%2Fti.map%2Fmaster)](https://jenkins.appcelerator.org/job/modules/job/ti.map/job/master/) [![@titanium-sdk/ti.map](https://img.shields.io/npm/v/@titanium-sdk/ti.map.png)](https://www.npmjs.com/package/@titanium-sdk/ti.map)

This is the Map Module for Titanium. Please use [JIRA](http://jira.appcelerator.org) to report issues or ask our [TiSlack community](http://tislack.org) for help! :rocket:

Expand Down
6 changes: 0 additions & 6 deletions android/assets/README

This file was deleted.

10 changes: 5 additions & 5 deletions android/documentation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
External version of Map module to support new Google Map v2 sdk

## Getting Started
Obtain map API key from google. You can find instructions here:
Obtain map API key from google. You can find instructions here:
https://developers.google.com/maps/documentation/android/start#the_google_maps_api_key


## Requirements
Testing device needs to have Google Play installed. Otherwise map won't work.
Expand All @@ -22,7 +22,7 @@
android:name="com.google.android.maps.v2.API_KEY" android:value="API KEY HERE"/>
</application>
</manifest>

## Accessing the Ti.Map Module
To access this module from JavaScript, you would do the following:

Expand All @@ -34,8 +34,8 @@ View the [change log](changelog.html) for this module.

## Documentation

* [Google Maps v2 for Android guide](http://docs.appcelerator.com/titanium/latest/#!/guide/Google_Maps_v2_for_Android)
* [Map Module API Reference Documentation](http://docs.appcelerator.com/titanium/latest/#!/api/Modules.Map)
* [Google Maps v2 for Android guide](http://docs.appcelerator.com/platform/latest/#!/guide/Google_Maps_v2_for_Android)
* [Map Module API Reference Documentation](http://docs.appcelerator.com/platform/latest/#!/api/Modules.Map)

## Feedback and Support

Expand Down
12 changes: 0 additions & 12 deletions android/example/app.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@

/**
* If the table view rows are too small on Android, add the following to your tiapp.xml
*
<android xmlns:android="http://schemas.android.com/apk/res/android">
<manifest>
<supports-screens android:anyDensity="false"/>
</manifest>
</android>
*
*/

var IOS = (Ti.Platform.osname === 'iphone' || Ti.Platform.osname === 'ipad');
var ANDROID = (Ti.Platform.osname === 'android');
var UI = require('ui');
Expand Down
6 changes: 4 additions & 2 deletions android/example/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var nav;

function init(rows, onClick) {
var win = Ti.UI.createWindow({
backgroundColor: '#FFF',
backgroundColor: 'gray',
title: 'Ti.Map',
translucent: false
});
Expand All @@ -13,7 +13,9 @@ function init(rows, onClick) {
for (var row in rows) {
transformedRows.push({
title: rows[row].title,
hasChild: true
font: {
fontSize: 25
}
});
}

Expand Down
1 change: 0 additions & 1 deletion android/hooks/README

This file was deleted.

35 changes: 0 additions & 35 deletions android/hooks/add.py

This file was deleted.

19 changes: 0 additions & 19 deletions android/hooks/install.py

This file was deleted.

34 changes: 0 additions & 34 deletions android/hooks/remove.py

This file was deleted.

18 changes: 0 additions & 18 deletions android/hooks/uninstall.py

This file was deleted.

3 changes: 2 additions & 1 deletion android/src/ti/map/AnnotationProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ public void release()
super.release();
}

public void releaseMarker() {
public void releaseMarker()
{
if (marker != null) {
marker = null;
}
Expand Down
1 change: 1 addition & 0 deletions android/src/ti/map/MapModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public class MapModule extends KrollModule
public static final String PROPERTY_RADIUS = "radius";
public static final String PROPERTY_INDOOR_ENABLED = "indoorEnabled";
public static final String PROPERTY_PLACE_ID = "placeID";
public static final String PROPERTY_DESELECTED = "deselected";

@Kroll.constant
public static final int NORMAL_TYPE = GoogleMap.MAP_TYPE_NORMAL;
Expand Down
5 changes: 2 additions & 3 deletions android/src/ti/map/PolygonProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
{

MapModule.PROPERTY_FILL_COLOR, MapModule.PROPERTY_STROKE_COLOR, MapModule.PROPERTY_STROKE_WIDTH,
MapModule.PROPERTY_ZINDEX, MapModule.PROPERTY_POINTS,
TiC.PROPERTY_TOUCH_ENABLED
MapModule.PROPERTY_ZINDEX, MapModule.PROPERTY_POINTS, TiC.PROPERTY_TOUCH_ENABLED

})
public class PolygonProxy extends KrollProxy implements IShape
Expand Down Expand Up @@ -241,7 +240,7 @@ public void setHoles(Object[] holesList)
@Kroll.getProperty
public Object[] getHoles()
{
return (Object[])getProperty(PolygonProxy.PROPERTY_HOLES);
return (Object[]) getProperty(PolygonProxy.PROPERTY_HOLES);
}

public void setPolygon(Polygon r)
Expand Down
9 changes: 6 additions & 3 deletions android/src/ti/map/TiMarker.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,20 @@ public void release()
}

@Override
public LatLng getPosition() {
public LatLng getPosition()
{
return proxy.getMarkerOptions().getPosition();
}

@Override
public String getTitle() {
public String getTitle()
{
return proxy.getTitle();
}

@Override
public String getSnippet() {
public String getSnippet()
{
return proxy.getSubtitle();
}
}
Loading

0 comments on commit fac8c27

Please sign in to comment.