Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .flutter-plugins

This file was deleted.

1 change: 0 additions & 1 deletion .flutter-plugins-dependencies

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ build/
ios/.generated/
packages
pubspec.lock

.flutter-plugins
.flutter-plugins-dependencies
14 changes: 0 additions & 14 deletions .vscode/launch.json

This file was deleted.

12 changes: 0 additions & 12 deletions .vscode/settings.json

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ You will find links to the API docs on the [pub page](https://pub.dartlang.org/p
## Getting Started

For help getting started with Flutter, view our online
[documentation](http://flutter.io/).
[documentation](https://flutter.dev/).

For help on editing plugin code, view the [documentation](https://flutter.io/platform-plugins/#edit-code).
For help on editing plugin code, view the [documentation](https://flutter.dev/platform-plugins/#edit-code).
3 changes: 2 additions & 1 deletion lib/geocoder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ export 'model.dart';

class Geocoder {
static final Geocoding local = LocalGeocoding();
static Geocoding google(String apiKey, {String? language}) => GoogleGeocoding(apiKey, language: language);
static Geocoding google(String apiKey, {String? language}) =>
GoogleGeocoding(apiKey, language: language);
}
16 changes: 12 additions & 4 deletions lib/services/distant_google.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@ class GoogleGeocoding implements Geocoding {

GoogleGeocoding(this.apiKey, {this.language}) : _httpClient = HttpClient();

Future<List<Address>> findAddressesFromCoordinates(Coordinates coordinates) async {
final url = '$_host?key=$apiKey${language != null ? '&language=' + language! : ''}&latlng=${coordinates.latitude},${coordinates.longitude}';
Future<List<Address>> findAddressesFromCoordinates(
Coordinates coordinates) async {
String languageArgument = language == null ? '' : '&language=' + language!;

final url =
'$_host?key=$apiKey$languageArgument&latlng=${coordinates.latitude},${coordinates.longitude}';
return _send(url);
}

Expand All @@ -41,7 +45,10 @@ class GoogleGeocoding implements Geocoding {

if (results == null) return [];

return results.map(_convertAddress).map<Address>((map) => Address.fromMap(map)).toList();
return results
.map(_convertAddress)
.map<Address>((map) => Address.fromMap(map))
.toList();
}

Map? _convertCoordinates(dynamic geometry) {
Expand Down Expand Up @@ -84,7 +91,8 @@ class GoogleGeocoding implements Geocoding {
result["adminArea"] = item["long_name"];
} else if (types.contains("administrative_area_level_2")) {
result["subAdminArea"] = item["long_name"];
} else if (types.contains("sublocality") || types.contains("sublocality_level_1")) {
} else if (types.contains("sublocality") ||
types.contains("sublocality_level_1")) {
result["subLocality"] = item["long_name"];
} else if (types.contains("premise")) {
result["featureName"] = item["long_name"];
Expand Down