Merge branch 'main' into release-0.13

maplibre · Oct 6, 2021 · 9200abb · 9200abb
2 parents 4422028 + 012db25
commit 9200abb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,9 +17,8 @@ Further improvements:
 * Emit onTap only for the feature above the others [#589](https://github.com/tobrun/flutter-mapbox-gl/pull/589)
 * Add annotationOrder to web [#588](https://github.com/tobrun/flutter-mapbox-gl/pull/588)
 
-## Below is the original changelog of the tobrun/flutter-mapbox-gl project, before the fork.
 
-## 0.11.0, March 30, 2020
+### Changes cherry-picked/ported from tobrun/flutter-mapbox-gl:0.11.0
 * Fixed issues caused by new android API [#544](https://github.com/tobrun/flutter-mapbox-gl/pull/544)
 * Add option to set maximum offline tile count [#549](https://github.com/tobrun/flutter-mapbox-gl/pull/549)
 * Fixed web build failure due to http package upgrade [#550](https://github.com/tobrun/flutter-mapbox-gl/pull/550)
@@ -32,6 +31,9 @@ Further improvements:
 * Define which annotations consume the tap events [#575](https://github.com/tobrun/flutter-mapbox-gl/pull/575)
 * Remove failed offline region downloads [#583](https://github.com/tobrun/flutter-mapbox-gl/pull/583)
 
+## Below is the original changelog of the tobrun/flutter-mapbox-gl project, before the fork.
+
+
 ## 0.10.0, February 12, 2020
 * Merge offline regions [#532](https://github.com/tobrun/flutter-mapbox-gl/pull/532)
 * Update offline region metadata [#530](https://github.com/tobrun/flutter-mapbox-gl/pull/530)

diff --git a/maplibre_gl_platform_interface/CHANGELOG.md b/maplibre_gl_platform_interface/CHANGELOG.md
@@ -3,12 +3,11 @@
 
 ### Changes cherry-picked/ported from tobrun/flutter-mapbox-gl:0.12.0
 * Batch creation/removal for circles, fills and lines [#576](https://github.com/tobrun/flutter-mapbox-gl/pull/576)
+### Changes cherry-picked/ported from tobrun/flutter-mapbox-gl:0.11.0
+* Add batch mode of screen locations [#554](https://github.com/tobrun/flutter-mapbox-gl/pull/554)
 
 ## Below is the original changelog of the tobrun/flutter-mapbox-gl project, before the fork.
 
-## 0.11.0, March 30, 2020
-* Add batch mode of screen locations [#554](https://github.com/tobrun/flutter-mapbox-gl/pull/554)
-
 ## 0.10.0, February 12, 2020
 * Added web support for fills [#501](https://github.com/tobrun/flutter-mapbox-gl/pull/501)
 * Add heading to UserLocation and expose UserLocation type [#522](https://github.com/tobrun/flutter-mapbox-gl/pull/522)

diff --git a/maplibre_gl_web/CHANGELOG.md b/maplibre_gl_web/CHANGELOG.md
@@ -7,12 +7,12 @@
 * Emit onTap only for the feature above the others [#589](https://github.com/tobrun/flutter-mapbox-gl/pull/589)
 * Add annotationOrder to web [#588](https://github.com/tobrun/flutter-mapbox-gl/pull/588)
 
-## Below is the original changelog of the tobrun/flutter-mapbox-gl project, before the fork.
-
-## 0.11.0, March 30, 2020
+### Changes cherry-picked/ported from tobrun/flutter-mapbox-gl:0.11.0
 * Fix Mapbox GL JS CSS embedding on web [#551](https://github.com/tobrun/flutter-mapbox-gl/pull/551)
 * Add batch mode of screen locations [#554](https://github.com/tobrun/flutter-mapbox-gl/pull/554)
 
+## Below is the original changelog of the tobrun/flutter-mapbox-gl project, before the fork.
+
 ## 0.10.0, February 12, 2020
 * Added web support for fills [#501](https://github.com/tobrun/flutter-mapbox-gl/pull/501)
 * Add heading to UserLocation and expose UserLocation type [#522](https://github.com/tobrun/flutter-mapbox-gl/pull/522)