Skip to content

feat: Configure custom ID when adding objects such as markers. #293

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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

feat: Configure custom ID when adding objects such as markers. #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a5155f
feat: User can configure custom id for marker / polyline / polygon / …
fummicc1 Feb 28, 2025
d180bc7
test: Fix test to follow the internal api change.
fummicc1 Feb 28, 2025
12553dc
test: Test add operation with custom id specified.
fummicc1 Feb 28, 2025
3ff00c4
test: Add missing test cases.
fummicc1 Feb 28, 2025
5cdf2e3
Merge remote-tracking branch 'origin/main' into feature/custom-id
fummicc1 Mar 6, 2025
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
39 changes: 38 additions & 1 deletion lib/src/google_maps_map_view_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,15 @@ class GoogleMapViewController {

/// Add markers to the map view.
Future<List<Marker?>> addMarkers(List<MarkerOptions> markerOptions) {
return GoogleMapsNavigationPlatform.instance.viewAPI.addMarkers(
viewId: _viewId,
markerOptions:
markerOptions.map((e) => (options: e, markerId: null)).toList());
}

// Add markers to the map view with custom id
Future<List<Marker?>> addMarkersWithCustomId(
List<({MarkerOptions options, String? markerId})> markerOptions) {
return GoogleMapsNavigationPlatform.instance.viewAPI
.addMarkers(viewId: _viewId, markerOptions: markerOptions);
}
Expand Down Expand Up @@ -265,6 +274,15 @@ class GoogleMapViewController {

/// Add polygons to the map view.
Future<List<Polygon?>> addPolygons(List<PolygonOptions> polygonOptions) {
return GoogleMapsNavigationPlatform.instance.viewAPI.addPolygons(
viewId: _viewId,
polygonOptions:
polygonOptions.map((e) => (options: e, polygonId: null)).toList());
}

// Add polygons to the map view with custom id
Future<List<Polygon?>> addPolygonsWithCustomId(
List<({PolygonOptions options, String? polygonId})> polygonOptions) {
return GoogleMapsNavigationPlatform.instance.viewAPI
.addPolygons(viewId: _viewId, polygonOptions: polygonOptions);
}
Expand Down Expand Up @@ -303,6 +321,16 @@ class GoogleMapViewController {

/// Add polylines to the map view.
Future<List<Polyline?>> addPolylines(List<PolylineOptions> polylineOptions) {
return GoogleMapsNavigationPlatform.instance.viewAPI.addPolylines(
viewId: _viewId,
polylineOptions: (polylineOptions
.map((e) => (options: e, polylineId: null))
.toList()));
}

// Add polylines to the map view with custom id
Future<List<Polyline?>> addPolylinesWithCustomId(
List<({PolylineOptions options, String? polylineId})> polylineOptions) {
return GoogleMapsNavigationPlatform.instance.viewAPI
.addPolylines(viewId: _viewId, polylineOptions: polylineOptions);
}
Expand Down Expand Up @@ -341,8 +369,17 @@ class GoogleMapViewController {

/// Add circles to the map view.
Future<List<Circle?>> addCircles(List<CircleOptions> options) {
return GoogleMapsNavigationPlatform.instance.viewAPI.addCircles(
viewId: _viewId,
circleOptions:
options.map((e) => (options: e, circleId: null)).toList());
}

// Add circles to the map view with custom id
Future<List<Circle?>> addCirclesWithCustomId(
List<({CircleOptions options, String? circleId})> circleOptions) {
return GoogleMapsNavigationPlatform.instance.viewAPI
.addCircles(viewId: _viewId, options: options);
.addCircles(viewId: _viewId, circleOptions: circleOptions);
}

/// Update circles to the map view.
Expand Down
97 changes: 62 additions & 35 deletions lib/src/method_channel/map_view_api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,33 +31,37 @@ class MapViewAPIImpl {
StreamController<_ViewIdEventWrapper>.broadcast();

/// Keep track of marker count, used to generate marker ID's.
/// if markerId is provided, it will be used as the ID.
int _markerCounter = 0;
String _createMarkerId() {
final String markerId = 'Marker_$_markerCounter';
String _createMarkerIdIfNeeded({required String? markerId}) {
markerId ??= 'Marker_$_markerCounter';
_markerCounter += 1;
return markerId;
}

/// Keep track of polygon count, used to generate polygon ID's.
/// if polygonId is provided, it will be used as the ID.
int _polygonCounter = 0;
String _createPolygonId() {
final String polygonId = 'Polygon_$_polygonCounter';
String _createPolygonIdIfNeeded({required String? polygonId}) {
polygonId ??= 'Polygon_$_polygonCounter';
_polygonCounter += 1;
return polygonId;
}

/// Keep track of polyline count, used to generate polyline ID's.
/// if polylineId is provided, it will be used as the ID.
int _polylineCounter = 0;
String _createPolylineId() {
final String polylineId = 'Polyline_$_polylineCounter';
String _createPolylineIdIfNeeded({required String? polylineId}) {
polylineId ??= 'Polyline_$_polylineCounter';
_polylineCounter += 1;
return polylineId;
}

/// Keep track of circle count, used to generate circle ID's.
/// if circleId is provided, it will be used as the ID.
int _circleCounter = 0;
String _createCircleId() {
final String circleId = 'Circle_$_circleCounter';
String _createCircleIdIfNeeded({required String? circleId}) {
circleId ??= 'Circle_$_circleCounter';
_circleCounter += 1;
return circleId;
}
Expand Down Expand Up @@ -624,15 +628,22 @@ class MapViewAPIImpl {

/// Add markers to map view.
Future<List<Marker>> addMarkers(
{required int viewId, required List<MarkerOptions> markerOptions}) async {
{required int viewId,
required List<({MarkerOptions options, String? markerId})>
markerOptions}) async {
// Convert options to pigeon format
final List<MarkerOptionsDto> options =
markerOptions.map((MarkerOptions opt) => opt.toDto()).toList();

// Create marker objects with new ID's
final List<({MarkerOptionsDto options, String? markerId})> options =
markerOptions
.map((e) => (options: e.options.toDto(), markerId: e.markerId))
.toList();
// Create marker objects
// Create new ID's for markers if not provided
final List<MarkerDto> markersToAdd = options
.map((MarkerOptionsDto options) =>
MarkerDto(markerId: _createMarkerId(), options: options))
.map(
(e) => MarkerDto(
markerId: _createMarkerIdIfNeeded(markerId: e.markerId),
options: e.options),
)
.toList();

// Add markers to map
Expand Down Expand Up @@ -709,15 +720,20 @@ class MapViewAPIImpl {
/// Add polygons to map view.
Future<List<Polygon?>> addPolygons(
{required int viewId,
required List<PolygonOptions> polygonOptions}) async {
required List<({PolygonOptions options, String? polygonId})>
polygonOptions}) async {
// Convert options to pigeon format
final List<PolygonOptionsDto> options =
polygonOptions.map((PolygonOptions opt) => opt.toDto()).toList();
final List<({PolygonOptionsDto options, String? polygonId})> options =
polygonOptions
.map((e) => (options: e.options.toDto(), polygonId: e.polygonId))
.toList();

// Create polygon objects with new ID's
// Create polygon objects
// Create new ID's for polygons if not provided
final List<PolygonDto> polygonsToAdd = options
.map((PolygonOptionsDto options) =>
PolygonDto(polygonId: _createPolygonId(), options: options))
.map((e) => PolygonDto(
polygonId: _createPolygonIdIfNeeded(polygonId: e.polygonId),
options: e.options))
.toList();

// Add polygons to map
Expand Down Expand Up @@ -789,15 +805,20 @@ class MapViewAPIImpl {
/// Add polylines to map view.
Future<List<Polyline?>> addPolylines(
{required int viewId,
required List<PolylineOptions> polylineOptions}) async {
required List<({PolylineOptions options, String? polylineId})>
polylineOptions}) async {
// Convert options to pigeon format
final List<PolylineOptionsDto> options =
polylineOptions.map((PolylineOptions opt) => opt.toDto()).toList();
final List<({PolylineOptionsDto options, String? polylineId})> options =
polylineOptions
.map((e) => (options: e.options.toDto(), polylineId: e.polylineId))
.toList();

// Create polyline objects with new ID's
// Create polyline objects
// Create new ID's for polylines if not provided
final List<PolylineDto> polylinesToAdd = options
.map((PolylineOptionsDto options) =>
PolylineDto(polylineId: _createPolylineId(), options: options))
.map((e) => PolylineDto(
polylineId: _createPolylineIdIfNeeded(polylineId: e.polylineId),
options: e.options))
.toList();

// Add polylines to map
Expand Down Expand Up @@ -870,15 +891,21 @@ class MapViewAPIImpl {

/// Add circles to map view.
Future<List<Circle?>> addCircles(
{required int viewId, required List<CircleOptions> options}) async {
{required int viewId,
required List<({CircleOptions options, String? circleId})>
circleOptions}) async {
// Convert options to pigeon format
final List<CircleOptionsDto> optionsDto =
options.map((CircleOptions opt) => opt.toDto()).toList();

// Create circle objects with new ID's
final List<CircleDto> circlesToAdd = optionsDto
.map((CircleOptionsDto options) =>
CircleDto(circleId: _createCircleId(), options: options))
final List<({CircleOptionsDto options, String? circleId})> options =
circleOptions
.map((e) => (options: e.options.toDto(), circleId: e.circleId))
.toList();

// Create circle objects
// Create new ID's for circles if not provided
final List<CircleDto> circlesToAdd = options
.map((e) => CircleDto(
circleId: _createCircleIdIfNeeded(circleId: e.circleId),
options: e.options))
.toList();

// Add circles to map
Expand Down
Loading