Merge remote-tracking branch 'upstream/main' into m0-set-layer-proper…

…ties
maplibre · Oct 10, 2023 · 95ad362 · 95ad362
2 parents 94c12e3 + 4d0f609
commit 95ad362
Show file tree

Hide file tree

Showing 37 changed files with 36 additions and 190 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## upcoming version
 * Developers do not need to adapt their Podfile for iOS apps anymore as it was previously described in the Readme.  [https://github.com/maplibre/flutter-maplibre-gl/pull/278](https://github.com/maplibre/flutter-maplibre-gl/pull/278)
 ### Breaking Change:
+* `maplibre_gl/mapbox_gl.dart` was renamed to `maplibre_gl/maplibre_gl.dart`. You can do a replace-all from `import 'package:maplibre_gl/mapbox_gl.dart';` to `import 'package:maplibre_gl/maplibre_gl.dart';`
 * `useDelayedDisposal` was removed since its now fixed in https://github.com/maplibre/flutter-maplibre-gl/pull/259
 * `useHybridCompositionOverride` was removed since it was added in the following fix: https://github.com/maplibre/flutter-maplibre-gl/pull/203 and we reverted the fix and used another approach to fix the actual issue.
 * The default for `myLocationRenderMode` was changed from `COMPASS` to `NORMAL` in https://github.com/maplibre/flutter-maplibre-gl/pull/244, since the previous default value of `COMPASS` implicitly enables displaying the location on iOS, which could crash apps that didn't want to display the device location. If you want to continue to use `MyLocationRenderMode.COMPASS`, please explicitly specify it in the constructor like this:

diff --git a/example/lib/animate_camera.dart b/example/lib/animate_camera.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/annotation_order_maps.dart b/example/lib/annotation_order_maps.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart'; // ignore: unnecessary_import
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 import 'util.dart';

diff --git a/example/lib/attribution.dart b/example/lib/attribution.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/click_annotations.dart b/example/lib/click_annotations.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 import 'util.dart';

diff --git a/example/lib/custom_marker.dart b/example/lib/custom_marker.dart
@@ -4,7 +4,7 @@ import 'dart:math';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart'; // ignore: unnecessary_import
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/full_map.dart b/example/lib/full_map.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/get_map_informations.dart b/example/lib/get_map_informations.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/given_bounds.dart b/example/lib/given_bounds.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/layer.dart b/example/lib/layer.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 import 'package:maplibre_gl_example/page.dart';
 
 import 'util.dart';

diff --git a/example/lib/line.dart b/example/lib/line.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/local_style.dart b/example/lib/local_style.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 import 'package:path_provider/path_provider.dart';
 
 import 'page.dart';

diff --git a/example/lib/localized_map.dart b/example/lib/localized_map.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -34,7 +34,7 @@ import 'place_batch.dart';
 import 'layer.dart';
 import 'sources.dart';
 
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 final List<ExamplePage> _allPages = <ExamplePage>[
   const MapUiPage(),

diff --git a/example/lib/map_ui.dart b/example/lib/map_ui.dart
@@ -6,7 +6,7 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:collection/collection.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/move_camera.dart b/example/lib/move_camera.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/no_location_permission_page.dart b/example/lib/no_location_permission_page.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/offline_region_map.dart b/example/lib/offline_region_map.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'offline_regions.dart';
 

diff --git a/example/lib/offline_regions.dart b/example/lib/offline_regions.dart
@@ -1,6 +1,6 @@
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'offline_region_map.dart';
 import 'page.dart';

diff --git a/example/lib/place_batch.dart b/example/lib/place_batch.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 import 'util.dart';

diff --git a/example/lib/place_circle.dart b/example/lib/place_circle.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/place_fill.dart b/example/lib/place_fill.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/place_source.dart b/example/lib/place_source.dart
@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/place_symbol.dart b/example/lib/place_symbol.dart
@@ -9,7 +9,7 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:http/http.dart' as http;
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 

diff --git a/example/lib/scrolling_map.dart b/example/lib/scrolling_map.dart
@@ -6,7 +6,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart'; // ignore: unnecessary_import
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 import 'package:maplibre_gl_example/util.dart';
 
 import 'page.dart';

diff --git a/example/lib/sources.dart b/example/lib/sources.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 import 'page.dart';
 import 'package:maplibre_gl_platform_interface/maplibre_gl_platform_interface.dart';

diff --git a/example/lib/util.dart b/example/lib/util.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/services.dart';
-import 'package:maplibre_gl/mapbox_gl.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 /// Adds an asset image to the currently displayed style
 Future<void> addImageFromAsset(

diff --git a/lib/mapbox_gl.dart → lib/maplibre_gl.dart b/lib/mapbox_gl.dart → lib/maplibre_gl.dart
diff --git a/maplibre_gl_platform_interface/lib/maplibre_gl_platform_interface.dart b/maplibre_gl_platform_interface/lib/maplibre_gl_platform_interface.dart
@@ -14,9 +14,9 @@ part 'src/camera.dart';
 part 'src/circle.dart';
 part 'src/line.dart';
 part 'src/location.dart';
-part 'src/method_channel_mapbox_gl.dart';
+part 'src/method_channel_maplibre_gl.dart';
 part 'src/symbol.dart';
 part 'src/fill.dart';
 part 'src/ui.dart';
-part 'src/mapbox_gl_platform_interface.dart';
+part 'src/maplibre_gl_platform_interface.dart';
 part 'src/source_properties.dart';
diff --git a/...lib/src/mapbox_gl_platform_interface.dart → ...b/src/maplibre_gl_platform_interface.dart b/...lib/src/mapbox_gl_platform_interface.dart → ...b/src/maplibre_gl_platform_interface.dart
diff --git a/...ace/lib/src/method_channel_mapbox_gl.dart → ...e/lib/src/method_channel_maplibre_gl.dart b/...ace/lib/src/method_channel_mapbox_gl.dart → ...e/lib/src/method_channel_maplibre_gl.dart
diff --git a/maplibre_gl_web/lib/mapbox_gl_web.dart → maplibre_gl_web/lib/maplibre_gl_web.dart b/maplibre_gl_web/lib/mapbox_gl_web.dart → maplibre_gl_web/lib/maplibre_gl_web.dart
@@ -35,8 +35,8 @@ import 'package:maplibre_gl_web/src/util/evented.dart';
 
 part 'src/convert.dart';
 
-part 'src/mapbox_map_plugin.dart';
+part 'src/maplibre_map_plugin.dart';
 
 part 'src/options_sink.dart';
 
-part 'src/mapbox_web_gl_platform.dart';
+part 'src/maplibre_web_gl_platform.dart';
diff --git a/...bre_gl_web/lib/src/mapbox_map_plugin.dart → ...e_gl_web/lib/src/maplibre_map_plugin.dart b/...bre_gl_web/lib/src/mapbox_map_plugin.dart → ...e_gl_web/lib/src/maplibre_map_plugin.dart
@@ -1,7 +1,7 @@
 part of maplibre_gl_web;
 
-class MapboxMapPlugin {
-  /// Registers this class as the default instance of [MapboxGlPlatform].
+class MapLibreMapPlugin {
+  /// Registers this class as the default instance of [MapLibreGlPlatform].
   static void registerWith(Registrar registrar) {
     MapLibreGlPlatform.createInstance = () => MaplibreMapController();
   }

diff --git a/...l_web/lib/src/mapbox_web_gl_platform.dart → ...web/lib/src/maplibre_web_gl_platform.dart b/...l_web/lib/src/mapbox_web_gl_platform.dart → ...web/lib/src/maplibre_web_gl_platform.dart
diff --git a/maplibre_gl_web/pubspec.yaml b/maplibre_gl_web/pubspec.yaml
@@ -7,8 +7,8 @@ flutter:
   plugin:
     platforms:
       web:
-        pluginClass: MapboxMapPlugin
-        fileName: mapbox_gl_web.dart
+        pluginClass: MapLibreMapPlugin
+        fileName: maplibre_gl_web.dart
 
 dependencies:
   js: ^0.6.7