Merge remote-tracking branch 'upstream/master'

analysis_options.yaml

@@ -27,7 +27,6 @@ linter:
     type_annotate_public_apis: true
     unnecessary_statements: true
     use_named_constants: true
-    use_super_parameters: true
     cast_nullable_to_non_nullable: true
     only_throw_errors: true
     sort_unnamed_constructors_first: true

benchmark/crs.dart

@@ -0,0 +1,107 @@
+import 'dart:async';
+import 'dart:math' as math;
+
+import 'package:flutter_map/src/geo/crs.dart';
+import 'package:latlong2/latlong.dart';
+import 'package:logger/logger.dart';
+
+class NoFilter extends LogFilter {
+  @override
+  bool shouldLog(LogEvent event) => true;
+}
+
+typedef Result = ({
+  String name,
+  Duration duration,
+});
+
+Future<Result> timedRun(String name, dynamic Function() body) async {
+  Logger().i('running $name...');
+  final watch = Stopwatch()..start();
+  await body();
+  watch.stop();
+
+  return (name: name, duration: watch.elapsed);
+}
+
+// NOTE: to have a more prod like comparison, run with:
+//     $ dart compile exe benchmark/crs.dart && ./benchmark/crs.exe
+//
+// If you run in JIT mode, the resulting execution times will be a lot more similar.
+Future<void> main() async {
+  Logger.level = Level.all;
+  Logger.defaultFilter = () => NoFilter();
+  Logger.defaultPrinter = () => SimplePrinter();
+
+  final results = <Result>[];
+  const N = 100000000;
+
+  const crs = Epsg3857();
+  results.add(await timedRun('Concrete type: ${crs.code}.latLngToXY()', () {
+    double x = 0;
+    double y = 0;
+    for (int i = 0; i < N; ++i) {
+      final latlng = LatLng((i % 90).toDouble(), (i % 180).toDouble());
+      final (cx, cy) = crs.latLngToXY(latlng, 1);
+      x += cx;
+      y += cy;
+    }
+    return x + y;
+  }));
+
+  results.add(await timedRun('Concrete type: ${crs.code}.latLngToPoint()', () {
+    double x = 0;
+    double y = 0;
+    for (int i = 0; i < N; ++i) {
+      final latlng = LatLng((i % 90).toDouble(), (i % 180).toDouble());
+      final p = crs.latLngToPoint(latlng, 1);
+      x += p.x;
+      y += p.y;
+    }
+    return x + y;
+  }));
+
+  const crss = <Crs>[
+    Epsg3857(),
+    Epsg4326(),
+  ];
+
+  for (final crs in crss) {
+    results.add(await timedRun('${crs.code}.latLngToXY()', () {
+      double x = 0;
+      double y = 0;
+      for (int i = 0; i < N; ++i) {
+        final latlng = LatLng((i % 90).toDouble(), (i % 180).toDouble());
+        final (cx, cy) = crs.latLngToXY(latlng, 1);
+        x += cx;
+        y += cy;
+      }
+      return x + y;
+    }));
+
+    results.add(await timedRun('${crs.code}.latlngToPoint()', () {
+      double x = 0;
+      double y = 0;
+      for (int i = 0; i < N; ++i) {
+        final latlng = LatLng((i % 90).toDouble(), (i % 180).toDouble());
+        final point = crs.latLngToPoint(latlng, 1);
+        x += point.x;
+        y += point.y;
+      }
+      return x + y;
+    }));
+
+    results.add(await timedRun('${crs.code}.pointToLatLng()', () {
+      double x = 0;
+      double y = 0;
+      for (int i = 0; i < N; ++i) {
+        final latlng = crs.pointToLatLng(math.Point<double>(x, y), 1);
+        x += latlng.longitude;
+        y += latlng.latitude;
+      }
+      return x + y;
+    }));
+  }
+
+  Logger().i('Results:\n${results.map((r) => r.toString()).join('\n')}');
+}

example/.metadata

@@ -4,20 +4,20 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "2524052335ec76bb03e04ede244b071f1b86d190"
-  channel: "stable"
+  revision: "0b591f2c82e9f59276ed68c7d4cbd63196f7c865"
+  channel: "beta"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: 2524052335ec76bb03e04ede244b071f1b86d190
-      base_revision: 2524052335ec76bb03e04ede244b071f1b86d190
-    - platform: windows
-      create_revision: 2524052335ec76bb03e04ede244b071f1b86d190
-      base_revision: 2524052335ec76bb03e04ede244b071f1b86d190
+      create_revision: 0b591f2c82e9f59276ed68c7d4cbd63196f7c865
+      base_revision: 0b591f2c82e9f59276ed68c7d4cbd63196f7c865
+    - platform: android
+      create_revision: 0b591f2c82e9f59276ed68c7d4cbd63196f7c865
+      base_revision: 0b591f2c82e9f59276ed68c7d4cbd63196f7c865
 
   # User provided section
 

example/analysis_options.yaml

@@ -1,30 +1,8 @@
-include: package:flutter_lints/flutter.yaml
-
-analyzer:
-  language:
-    strict-casts: true
-    strict-inference: true
-    strict-raw-types: true
-  errors:
-    missing_required_param: error
-    missing_return: error
+# match the lint rules from flutter_map
+include: ./../analysis_options.yaml
 
+# only specify things that should be different from the package
 linter:
   rules:
-    library_private_types_in_public_api: false # Not relevant to the example
-
-    always_declare_return_types: true
-    always_use_package_imports: true
-    avoid_dynamic_calls: true
-    cancel_subscriptions: true
-    close_sinks: false 
-    package_api_docs: true
-    prefer_constructors_over_static_methods: true
-    prefer_final_in_for_each: true
-    prefer_final_locals: true
-    prefer_int_literals: true
-    test_types_in_equals: true
-    throw_in_finally: true
-    type_annotate_public_apis: true
-    unnecessary_statements: true
-    use_named_constants: true
+    # using the default parameter values are used as explanation and for showcase
+    avoid_redundant_argument_values: false

example/android/.gitignore

@@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+**/*.keystore
+**/*.jks

example/android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '6'
@@ -21,21 +22,27 @@ if (flutterVersionName == null) {
     flutterVersionName = '6.0.1'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion 33
+    namespace "dev.fleaflet.flutter_map.example"
+    compileSdk flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "me.jpryan.flutter_map_example"
-        minSdkVersion 16
+        applicationId "dev.fleaflet.flutter_map.example"
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -48,13 +55,10 @@ android {
             signingConfig signingConfigs.debug
         }
     }
-    namespace 'me.jpryan.flutter_map_example'
 }
 
 flutter {
     source '../..'
 }
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
+dependencies {}

example/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Flutter needs it to communicate with the running application
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

example/android/app/src/main/AndroidManifest.xml

@@ -1,22 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Requried for fetching tiles -->
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="https" />
-        </intent>
-    </queries>
-   <application
+    <application
         android:label="flutter_map Demo"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:exported="true"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as

example/android/app/src/main/kotlin/me/jpryan/example/MainActivity.kt → example/android/app/src/main/kotlin/dev/fleaflet/flutter_map/example/MainActivity.kt

@@ -1,4 +1,4 @@
-package me.jpryan.example
+package dev.fleaflet.flutter_map.example
 
 import io.flutter.embedding.android.FlutterActivity
 

example/android/app/src/main/res/values-night/styles.xml

@@ -3,14 +3,14 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>

example/android/app/src/main/res/values/styles.xml

@@ -3,14 +3,14 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>

example/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Flutter needs it to communicate with the running application
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

example/android/build.gradle

@@ -2,19 +2,19 @@ buildscript {
     ext.kotlin_version = '1.8.21'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        // AGP version is set in settings.gradle.
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

example/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,3 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME