feat(ios, android): add new API's, fix existing API's (merge conflicts solved) by hansemannn · Pull Request #519 · tidev/ti.map

hansemannn · 2022-02-03T13:39:31Z

Basically #261 with latest upstream master.

Open issues / regressions:

Polylines are not drawn anymore

…into add-poi-click

to be able to listen to the location updated immediately after granting the permission instead of closing and reopening the current view

# Conflicts: # android/src/ti/map/TiUIMapView.java

…add-poi-click # Conflicts: # android/build.gradle # ios/titanium.xcconfig

…into add-poi-click

…add-poi-click

all credits to tidev#446 !

all credits to https://github.com/appcelerator-modules/ti.map/pull/424/files

… into add-poi-click-merged # Conflicts: # android/src/ti/map/MapModule.java # android/src/ti/map/PolygonProxy.java # android/src/ti/map/PolylineProxy.java # android/src/ti/map/TiUIMapView.java # android/src/ti/map/ViewProxy.java # apidoc/View.yml # ios/Classes/TiMapPolygonProxy.m # ios/Classes/TiMapPolylineProxy.m # ios/Classes/TiMapView.h # ios/Classes/TiMapView.m # ios/Classes/TiMapViewProxy.h # ios/Classes/TiMapViewProxy.m # ios/titanium.xcconfig

build · 2022-02-03T13:40:43Z

	Fails
🚫	`npm run lint` failed, please check messages below for output.

	Warnings
⚠️	SDK version declared in Jenkinsfile (10.0.1.GA) does not match iOS' titanium.xcconfig value (10.1.1.GA)
⚠️	🔍 Can't find junit reports at `./TESTS-*.xml`, skipping generating JUnit Report.

Messages

📖

💣 Here's the output of npm run lint:

> @titanium-sdk/ti.map@7.1.1 lint
> npm run lint:android && npm run lint:ios && npm run lint:js && npm run lint:docs


> @titanium-sdk/ti.map@7.1.1 lint:android
> clang-format-lint android/src/**/*.java

Error: Formatting incorrect on "android/src/ti/map/MapModule.java", proposed changes: <?xml version='1.0'?>
<replacements xml:space='preserve' incomplete_format='false'>
<replacement offset='339' length='696'>import android.location.Location;&#10;import com.google.android.gms.common.GoogleApiAvailability;&#10;import com.google.android.gms.maps.GoogleMap;&#10;import com.google.android.gms.maps.MapsInitializer;&#10;import com.google.android.gms.maps.model.BitmapDescriptorFactory;&#10;import com.google.android.gms.maps.model.LatLng;&#10;import com.google.maps.android.PolyUtil;&#10;import java.util.ArrayList;&#10;import java.util.HashMap;&#10;import java.util.List;&#10;import org.appcelerator.kroll.KrollDict;&#10;import org.appcelerator.kroll.KrollModule;&#10;import org.appcelerator.kroll.annotations.Kroll;&#10;import org.appcelerator.titanium.TiApplication;&#10;import org.appcelerator.titanium.TiC;&#10;import org.appcelerator.titanium.util.TiConvert;</replacement>
<replacement offset='7932' length='0'>&#10;									 </replacement>
<replacement offset='8055' length='0'> </replacement>
<replacement offset='8187' length='0'> </replacement>
<replacement offset='8278' length='1'>&#10;								   </replacement>
<replacement offset='8407' length='4'>&#10;&#10;	</replacement>
<replacement offset='8769' length='1'>&#10;									  </replacement>
<replacement offset='8927' length='1'>&#10;									  </replacement>
<replacement offset='9135' length='1'>&#10;								 </replacement>
<replacement offset='9145' length='8'>&#10;&#10;		</replacement>
</replacements>

Error: Formatting incorrect on "android/src/ti/map/PolygonProxy.java", proposed changes: <?xml version='1.0'?>
<replacements xml:space='preserve' incomplete_format='false'>
<replacement offset='4904' length='9'>&#10;			</replacement>
<replacement offset='4941' length='9'>&#10;		</replacement>
<replacement offset='4990' length='13'>&#10;			</replacement>
<replacement offset='5044' length='13'>&#10;			</replacement>
<replacement offset='5103' length='17'>&#10;				</replacement>
<replacement offset='5148' length='17'>&#10;				</replacement>
<replacement offset='5203' length='13'>&#10;			</replacement>
<replacement offset='5217' length='30'>&#10;&#10;			</replacement>
<replacement offset='5268' length='9'>&#10;			</replacement>
<replacement offset='5303' length='9'>&#10;		</replacement>
<replacement offset='5554' length='3'>&#10;			</replacement>
<replacement offset='5614' length='2'> </replacement>
</replacements>

Error: Formatting incorrect on "android/src/ti/map/PolylineProxy.java", proposed changes: <?xml version='1.0'?>
<replacements xml:space='preserve' incomplete_format='false'>
<replacement offset='1135' length='0'>&#10;</replacement>
<replacement offset='1196' length='5'>&#10;	  </replacement>
<replacement offset='1288' length='12'>&#10;							</replacement>
<replacement offset='1375' length='12'>&#10;							</replacement>
<replacement offset='1457' length='12'>&#10;							</replacement>
<replacement offset='2312' length='5'>&#10;	</replacement>
<replacement offset='3393' length='6'>&#10;&#10;		</replacement>
<replacement offset='7189' length='18'>&#10;&#10;		</replacement>
<replacement offset='7235' length='9'>&#10;		</replacement>
<replacement offset='7277' length='13'>&#10;			</replacement>
<replacement offset='7331' length='13'>&#10;			</replacement>
<replacement offset='7390' length='17'>&#10;				</replacement>
<replacement offset='7435' length='17'>&#10;				</replacement>
<replacement offset='7490' length='13'>&#10;			</replacement>
<replacement offset='7504' length='26'>&#10;&#10;			</replacement>
<replacement offset='7551' length='9'>&#10;			</replacement>
<replacement offset='7586' length='9'>&#10;		</replacement>
<replacement offset='7745' length='9'>&#10;			</replacement>
<replacement offset='9841' length='6'>&#10;												</replacement>
<replacement offset='10028' length='6'>&#10;												</replacement>
</replacements>

Error: Formatting incorrect on "android/src/ti/map/TiUIMapView.java", proposed changes: <?xml version='1.0'?>
<replacements xml:space='preserve' incomplete_format='false'>
<replacement offset='259' length='2323'>import android.Manifest;&#10;import android.app.Activity;&#10;import android.content.pm.PackageManager;&#10;import android.content.res.Resources;&#10;import android.graphics.Bitmap;&#10;import android.graphics.Color;&#10;import android.graphics.Point;&#10;import android.location.Location;&#10;import android.os.Build;&#10;import android.view.MotionEvent;&#10;import android.view.SurfaceView;&#10;import android.view.View;&#10;import android.view.ViewGroup;&#10;import androidx.fragment.app.Fragment;&#10;import com.google.android.gms.maps.CameraUpdate;&#10;import com.google.android.gms.maps.CameraUpdateFactory;&#10;import com.google.android.gms.maps.GoogleMap;&#10;import com.google.android.gms.maps.GoogleMapOptions;&#10;import com.google.android.gms.maps.OnMapReadyCallback;&#10;import com.google.android.gms.maps.SupportMapFragment;&#10;import com.google.android.gms.maps.model.CameraPosition;&#10;import com.google.android.gms.maps.model.Circle;&#10;import com.google.android.gms.maps.model.LatLng;&#10;import com.google.android.gms.maps.model.LatLngBounds;&#10;import com.google.android.gms.maps.model.MapStyleOptions;&#10;import com.google.android.gms.maps.model.Marker;&#10;import com.google.android.gms.maps.model.PointOfInterest;&#10;import com.google.android.gms.maps.model.Polyline;&#10;import com.google.android.gms.maps.model.PolylineOptions;&#10;import com.google.android.gms.maps.model.TileOverlayOptions;&#10;import com.google.maps.android.clustering.Cluster;&#10;import com.google.maps.android.clustering.ClusterManager;&#10;import com.google.maps.android.clustering.view.DefaultClusterRenderer;&#10;import com.google.maps.android.collections.MarkerManager;&#10;import java.io.ByteArrayOutputStream;&#10;import java.io.IOException;&#10;import java.io.InputStream;&#10;import java.util.ArrayList;&#10;import java.util.HashMap;&#10;import org.appcelerator.kroll.KrollDict;&#10;import org.appcelerator.kroll.KrollProxy;&#10;import org.appcelerator.kroll.common.Log;&#10;import org.appcelerator.titanium.TiApplication;&#10;import org.appcelerator.titanium.TiBlob;&#10;import org.appcelerator.titanium.TiC;&#10;import org.appcelerator.titanium.io.TiFileFactory;&#10;import org.appcelerator.titanium.proxy.TiViewProxy;&#10;import org.appcelerator.titanium.util.TiConvert;&#10;import org.appcelerator.titanium.view.TiUIFragment;&#10;import org.json.JSONArray;&#10;import org.json.JSONException;&#10;import org.json.JSONObject;&#10;import org.json.JSONTokener;&#10;import ti.map.Shape.Boundary;&#10;import ti.map.Shape.IShape;</replacement>
<replacement offset='3136' length='1'>&#10;			   </replacement>
<replacement offset='3189' length='16'> </replacement>
<replacement offset='7595' length='6'>&#10;&#10;		</replacement>
<replacement offset='7992' length='9'>&#10;		</replacement>
<replacement offset='8033' length='9'>&#10;		</replacement>
<replacement offset='11435' length='9'>&#10;		</replacement>
<replacement offset='11486' length='13'>&#10;			</replacement>
<replacement offset='11548' length='9'>&#10;		</replacement>
<replacement offset='13406' length='9'>&#10;		</replacement>
<replacement offset='13461' length='13'>&#10;			</replacement>
<replacement offset='13520' length='9'>&#10;		</replacement>
<replacement offset='16543' length='3'>&#10;	</replacement>
<replacement offset='25596' length='1'></replacement>
<replacement offset='25627' length='1'></replacement>
<replacement offset='25633' length='4'>&#10;&#10;	</replacement>
<replacement offset='25701' length='1'>&#10;	</replacement>
<replacement offset='27105' length='1'></replacement>
<replacement offset='27136' length='1'></replacement>
<replacement offset='43629' length='1'>&#10;	</replacement>
<replacement offset='43669' length='6'>&#10;&#10;		</replacement>
<replacement offset='43929' length='6'>&#10;&#10;		</replacement>
<replacement offset='44111' length='6'>&#10;&#10;		</replacement>
</replacements>

Error: Formatting incorrect on "android/src/ti/map/ViewProxy.java", proposed changes: <?xml version='1.0'?>
<replacements xml:space='preserve' incomplete_format='false'>
<replacement offset='258' length='1520'>import android.app.Activity;&#10;import android.graphics.Color;&#10;import android.os.Message;&#10;import com.google.android.gms.maps.CameraUpdate;&#10;import com.google.android.gms.maps.CameraUpdateFactory;&#10;import com.google.android.gms.maps.GoogleMap;&#10;import com.google.android.gms.maps.MapView;&#10;import com.google.android.gms.maps.model.Dash;&#10;import com.google.android.gms.maps.model.Gap;&#10;import com.google.android.gms.maps.model.LatLng;&#10;import com.google.android.gms.maps.model.LatLngBounds;&#10;import com.google.android.gms.maps.model.PatternItem;&#10;import com.google.android.gms.maps.model.PolylineOptions;&#10;import com.google.android.gms.maps.model.TileOverlay;&#10;import com.google.android.gms.maps.model.TileOverlayOptions;&#10;import com.google.maps.android.SphericalUtil;&#10;import com.google.maps.android.heatmaps.HeatmapTileProvider;&#10;import java.util.ArrayList;&#10;import java.util.Arrays;&#10;import java.util.HashMap;&#10;import java.util.List;&#10;import org.appcelerator.kroll.KrollDict;&#10;import org.appcelerator.kroll.KrollFunction;&#10;import org.appcelerator.kroll.KrollObject;&#10;import org.appcelerator.kroll.annotations.Kroll;&#10;import org.appcelerator.kroll.common.AsyncResult;&#10;import org.appcelerator.kroll.common.Log;&#10;import org.appcelerator.kroll.common.TiMessenger;&#10;import org.appcelerator.titanium.TiApplication;&#10;import org.appcelerator.titanium.TiC;&#10;import org.appcelerator.titanium.proxy.TiViewProxy;&#10;import org.appcelerator.titanium.util.TiConvert;&#10;import org.appcelerator.titanium.view.TiUIView;&#10;import ti.map.AnnotationProxy.AnnotationDelegate;</replacement>
<replacement offset='2191' length='1'>&#10;							</replacement>
<replacement offset='2224' length='8'> </replacement>
<replacement offset='10771' length='17'>&#10;				</replacement>
<replacement offset='11228' length='9'>&#10;&#10;			</replacement>
<replacement offset='13990' length='3'>&#10;	</replacement>
<replacement offset='14266' length='3'>&#10;	</replacement>
<replacement offset='29202' length='4'>&#10;&#10;	</replacement>
<replacement offset='29566' length='1'>&#10;							   </replacement>
<replacement offset='29701' length='1'>&#10;							   </replacement>
<replacement offset='29887' length='0'> </replacement>
<replacement offset='34210' length='4'>&#10;		</replacement>
<replacement offset='34261' length='4'>&#10;&#10;	</replacement>
<replacement offset='34327' length='1'>&#10;	</replacement>
<replacement offset='34329' length='4'>&#10;		</replacement>
<replacement offset='34360' length='4'>&#10;		</replacement>
<replacement offset='34400' length='3'>&#10;			</replacement>
<replacement offset='34424' length='0'> </replacement>
<replacement offset='34461' length='4'>&#10;		</replacement>
<replacement offset='34466' length='4'>&#10;		</replacement>
</replacements>

Generated by 🚫 dangerJS against 89eb31e

m1ga · 2023-05-13T19:28:57Z

android/src/ti/map/TiUIMapView.java

+        map.setOnPoiClickListener(this);
+        map.setOnPolylineClickListener(this);


Spaces -> Tabs

m1ga · 2023-05-13T19:32:40Z

@hansemannn
Reviewed a different PR with Chris today and merged a TiColor deprecation fix.
I've made a draft PR with the changes. Want to run npm run lint here so the lint errors are gone?

Is the Polylines are not drawn anymore issue still open? Both iOS and Android?

hansemannn and others added 30 commits March 11, 2019 23:49

feat(android): add „poiclick“ event

6b22c99

fix: add poi-click listener to map instance

5e6f870

fix: fix null-check in MapView#zoom

bf2373e

fix: add „conatinsCoordinate“ method for parity

7cef29e

refactor: remove old xcode version guards

2a2ba17

refactor: use TitaniumKit imports, fix all warnings and leaks

fd5a51c

chore: remove old build scripts, require SDK 8

8c07870

Merge branch 'master' into add-poi-click

91a76f2

Merge branch 'master' into add-poi-click

a0c6cda

feat: add containsCoordinate method

67816d6

build: replace maps utils with latest version

7888c77

feat(android): add new API’s

db1582a

Merge branch 'add-poi-click' of https://github.com/hansemannn/ti.map …

fac8c27

…into add-poi-click

fix: use current activity for permission check

7bc0632

to be able to listen to the location updated immediately after granting the permission instead of closing and reopening the current view

chore(ios): expose mapType

4c94feb

refactor(android): use new „OnPolylineClickListener“

409d4ce

# Conflicts: # android/src/ti/map/TiUIMapView.java

Merge branch 'master' of github.com:appcelerator-modules/ti.map into …

ade2bcc

…add-poi-click # Conflicts: # android/build.gradle # ios/titanium.xcconfig

chore: bump version

d5259bb

fix: remove unused aar

57d57d6

feat: add geodesic support

8c306c3

Merge branch 'master' into add-poi-click

7eabf4a

chore: use latest dependencies

8542fbf

fix: fix imports

2380d12

feat: support encoded polylines

a300247

Merge branch 'add-poi-click' of https://github.com/hansemannn/ti.map …

b6adf41

…into add-poi-click

Merge branch 'master' of github.com:appcelerator-modules/ti.map into …

3626571

…add-poi-click

fix: fix polyline encoding

ccc621c

fix(android): pass zoom level to region changed event

09c3510

feat(android): add „drawRoundedPolylineBetweenCoordinates“ method

7992bc0

chore: allow “userLocation: true” with “ACCESS_COARSE_LOCATION”

64aa434

hansemannn added 10 commits March 12, 2021 15:56

fix: fix brackets

033e7f5

fix: guard proxy

26015f5

all credits to tidev#446 !

fix(android): guard markers

150a3f7

all credits to https://github.com/appcelerator-modules/ti.map/pull/424/files

chore: migrate from MKPinAnnotationView

121d567

fix: guard markers to prevent uncaught exceptions

167fafa

fix: add null check

c3d2864

chore: add try-catch block

fd20292

chore: merge changes

fc76248

fix: fix additional merge conflicts

56c7b20

fix: fix merge issues

89eb31e

m1ga mentioned this pull request Apr 19, 2022

Open tickets tidev/titanium-sdk#13411

Open

hansemannn mentioned this pull request Dec 15, 2022

fix: guard invalid blob creation #608

Merged

Merge branch 'master' into add-poi-click-merged

03cdcc4

m1ga reviewed May 13, 2023

View reviewed changes

hansemannn closed this Sep 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(ios, android): add new API's, fix existing API's (merge conflicts solved)#519

feat(ios, android): add new API's, fix existing API's (merge conflicts solved)#519
hansemannn wants to merge 42 commits intotidev:masterfrom
hansemannn:add-poi-click-merged

hansemannn commented Feb 3, 2022 •

edited

Loading

Uh oh!

build commented Feb 3, 2022 •

edited

Loading

Uh oh!

m1ga May 13, 2023

Uh oh!

m1ga commented May 13, 2023 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		map.setOnPoiClickListener(this);
		map.setOnPolylineClickListener(this);

Uh oh!

Conversation

hansemannn commented Feb 3, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

build commented Feb 3, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

m1ga May 13, 2023

Choose a reason for hiding this comment

Uh oh!

m1ga commented May 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

hansemannn commented Feb 3, 2022 •

edited

Loading

build commented Feb 3, 2022 •

edited

Loading

m1ga commented May 13, 2023 •

edited

Loading