Skip to content
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.

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

feat/google-map-utils #298

Open
wants to merge 40 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
6d98a2a
feat(google-map-utils): Init
herefishyfish Jul 5, 2022
424d5d0
chore(google-maps-utils): ReadMe
herefishyfish Jul 5, 2022
f6cd792
feat(google-maps-utils): iOS init
herefishyfish Jul 6, 2022
8f3a61f
feat(google-maps-utils): iOS GeoJson wip
herefishyfish Jul 6, 2022
48f174b
feat(google-maps-utils): iOS GeoJson
herefishyfish Jul 6, 2022
c1c68de
feat(google-maps-utils): Android GeoJson Styles
herefishyfish Jul 6, 2022
4cf8289
feat(google-maps-utils): Android map clustering
herefishyfish Jul 9, 2022
08ec261
fix(google-maps-utils): Android heatmap provider
herefishyfish Jul 9, 2022
755958c
feat(google-maps-utils): ios heatmap wip
herefishyfish Jul 10, 2022
3afbca1
feat(google-maps-utils): iOS Heatmap Tiles
herefishyfish Jul 11, 2022
8b62441
feat(google-maps-utils): iOS clustering
herefishyfish Jul 11, 2022
b635450
feat(google-maps-utils): demo marker info
herefishyfish Jul 11, 2022
8b74920
Merge branch 'NativeScript:main' into feat/google-map-utils
herefishyfish Jul 14, 2022
0413bac
Fix/google maps ground overlay (#303)
tommag21 Jul 15, 2022
47c5e9f
Merge branch 'NativeScript:main' into feat/google-map-utils
herefishyfish Jul 16, 2022
860f3c3
feat(google-maps-utils):android clustermarker opts
herefishyfish Jul 16, 2022
08b7f6a
feat(google-maps-utils): match cluster styles
herefishyfish Jul 16, 2022
34e85fd
feat(google-maps-utils): Readme
herefishyfish Jul 16, 2022
94c63c5
cleanup wip
herefishyfish Jul 21, 2022
a7f29ad
fix: remove wip functionality from demo
herefishyfish Jul 21, 2022
1aa9756
fix: android heatmap gradient
herefishyfish Jul 21, 2022
3bf7f5e
Merge branch 'main' into feat/google-map-utils
NathanWalker Aug 8, 2022
f9ffcfa
fix: remove console log
herefishyfish Aug 8, 2022
0f9209c
Merge branch 'main' into feat/google-map-utils
NathanWalker Sep 23, 2022
6c1c567
Merge branch 'NativeScript:main' into feat/google-map-utils
herefishyfish Oct 7, 2022
5959139
fix(gmaps-utils): refactor to align more with gmap
herefishyfish Nov 12, 2022
83ef5da
fix(gmap-utils): ios refactor
herefishyfish Nov 12, 2022
d1f4b2e
chore(google-map-utils): rename member functions
herefishyfish Dec 1, 2022
064ad74
Merge branch 'NativeScript:main' into feat/google-map-utils
herefishyfish Dec 6, 2022
b14f552
feat(google-map-utils): use mixin
herefishyfish Dec 16, 2022
87ce260
Merge branch 'feat/google-map-utils' of https://github.com/herefishyf…
herefishyfish Dec 16, 2022
0922e78
fix(google-map-utils): mixin
herefishyfish Dec 16, 2022
1d91771
fix(google-map-utils): ios geojson
herefishyfish Dec 16, 2022
51a871b
fix(google-map-utils): remove logging
herefishyfish Dec 16, 2022
eb87b86
Merge branch 'main' into feat/google-map-utils
herefishyfish May 19, 2023
0972ed0
chore: update android
herefishyfish May 19, 2023
050136b
Merge branch 'main' into feat/google-map-utils
herefishyfish May 19, 2023
0904788
Merge branch 'main' into feat/google-map-utils
herefishyfish Jul 7, 2023
6da8e45
Merge branch 'main' into feat/google-map-utils
herefishyfish Aug 9, 2023
cb9c7bf
chore: update cluster item
herefishyfish Jan 28, 2024
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
Prev Previous commit
chore: update cluster item
herefishyfish committed Jan 28, 2024
commit cb9c7bffb017da2fb18b55916e9bcde0664b92e1
6 changes: 4 additions & 2 deletions packages/google-maps-utils/index.android.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Color, ImageSource, Utils } from '@nativescript/core';
import { GeoJSON } from 'geojson';
import { Coordinate, GoogleMap, ITileProvider, MarkerOptions } from '@nativescript/google-maps';
import { Coordinate, GoogleMap, ITileProvider, MarkerOptions, hueFromColor } from '@nativescript/google-maps';
import { HeatmapOptions, IClusterManager, IFeature, IGeoJsonLayer, IGeometry, IGeometryStyle, IGradient, IHeatmapTileProvider } from '.';
import { hueFromColor } from '../google-maps/utils';
import { applyMixins } from './utils/common';
import { intoNativeClusterManager, intoNativeColor, intoNativeHeatmapGradient, intoNativeHeatmapProvider } from './utils';

@@ -132,6 +131,9 @@ export class ClusterItem extends com.google.maps.android.clustering.ClusterItem
getTitle: (): string => {
return this.options?.title ?? '';
},
getZIndex: (): any => {
return java.lang.Float.valueOf(this.options?.zIndex ?? 0);
},
});
}
}
3 changes: 1 addition & 2 deletions packages/google-maps-utils/index.ios.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Color, encoding } from '@nativescript/core';
import { GeoJSON } from 'geojson';
import { Coordinate, GoogleMap, ITileProvider, MarkerOptions } from '@nativescript/google-maps';
import { Coordinate, GoogleMap, ITileProvider, MarkerOptions, intoNativeMarkerOptions } from '@nativescript/google-maps';
import { HeatmapOptions, IClusterManager, IFeature, IGeoJsonLayer, IGeometry, IGeometryStyle, IGradient, IHeatmapTileProvider, intoNativeClusterManager, intoNativeHeatmapGradient, intoNativeHeatmapProvider } from '.';
import { intoNativeMarkerOptions } from '../google-maps/utils';
import { applyMixins } from './utils/common';

// export * from './experimental/datalayer';