Use preferred tile.openstreetmap.org URL

openstreetmap/operations#737 Signed-off-by: Grant Slater <[email protected]>
Firefishy · Aug 30, 2022 · ca95158 · ca95158
1 parent b4ba20d
commit ca95158
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 29 deletions.
diff --git a/example/lib/pages/animated_map_controller.dart b/example/lib/pages/animated_map_controller.dart
@@ -182,7 +182,7 @@ class AnimatedMapControllerPageState extends State<AnimatedMapControllerPage>
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/circle.dart b/example/lib/pages/circle.dart
@@ -40,7 +40,7 @@ class CirclePage extends StatelessWidget {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/home.dart b/example/lib/pages/home.dart
@@ -66,7 +66,7 @@ class HomePage extends StatelessWidget {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/interactive_test_page.dart b/example/lib/pages/interactive_test_page.dart
@@ -158,7 +158,7 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/latlng_to_screen_point.dart b/example/lib/pages/latlng_to_screen_point.dart
@@ -59,7 +59,7 @@ class _LatLngScreenPointTestPageState extends State<LatLngScreenPointTestPage> {
               children: [
                 TileLayer(
                   urlTemplate:
-                      'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                      'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                   subdomains: ['a', 'b', 'c'],
                   userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                 ),

diff --git a/example/lib/pages/live_location.dart b/example/lib/pages/live_location.dart
@@ -142,7 +142,7 @@ class _LiveLocationPageState extends State<LiveLocationPage> {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/many_markers.dart b/example/lib/pages/many_markers.dart
@@ -80,7 +80,7 @@ class _ManyMarkersPageState extends State<ManyMarkersPage> {
               children: [
                 TileLayer(
                   urlTemplate:
-                      'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                      'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                   subdomains: ['a', 'b', 'c'],
                   userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                 ),

diff --git a/example/lib/pages/map_controller.dart b/example/lib/pages/map_controller.dart
@@ -162,7 +162,7 @@ class MapControllerPageState extends State<MapControllerPage> {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/map_inside_listview.dart b/example/lib/pages/map_inside_listview.dart
@@ -30,7 +30,7 @@ class MapInsideListViewPage extends StatelessWidget {
                 children: [
                   TileLayer(
                       urlTemplate:
-                          'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                          'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                       subdomains: ['a', 'b', 'c'],
                       userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                     ),

diff --git a/example/lib/pages/marker_anchor.dart b/example/lib/pages/marker_anchor.dart
@@ -115,7 +115,7 @@ class MarkerAnchorPageState extends State<MarkerAnchorPage> {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/marker_rotate.dart b/example/lib/pages/marker_rotate.dart
@@ -140,7 +140,7 @@ class MarkerRotatePageState extends State<MarkerRotatePage> {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/max_bounds.dart b/example/lib/pages/max_bounds.dart
@@ -34,7 +34,7 @@ class MaxBoundsPage extends StatelessWidget {
                   TileLayer(
                     maxZoom: 15,
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/moving_markers.dart b/example/lib/pages/moving_markers.dart
@@ -61,7 +61,7 @@ class _MovingMarkersPageState extends State<MovingMarkersPage> {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/network_tile_provider.dart b/example/lib/pages/network_tile_provider.dart
@@ -67,7 +67,7 @@ class NetworkTileProviderPage extends StatelessWidget {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     tileProvider: NetworkTileProvider(),
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',

diff --git a/example/lib/pages/on_tap.dart b/example/lib/pages/on_tap.dart
@@ -87,7 +87,7 @@ class OnTapPageState extends State<OnTapPage> {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/overlay_image.dart b/example/lib/pages/overlay_image.dart
@@ -49,7 +49,7 @@ class OverlayImagePage extends StatelessWidget {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/plugin_scalebar.dart b/example/lib/pages/plugin_scalebar.dart
@@ -37,7 +37,7 @@ class PluginScaleBar extends StatelessWidget {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/plugin_zoombuttons.dart b/example/lib/pages/plugin_zoombuttons.dart
@@ -36,7 +36,7 @@ class PluginZoomButtons extends StatelessWidget {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/point_to_latlng.dart b/example/lib/pages/point_to_latlng.dart
@@ -68,7 +68,7 @@ class PointToLatlngPage extends State<PointToLatLngPage> {
             children: [
               TileLayer(
                 urlTemplate:
-                    'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                    'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                 subdomains: ['a', 'b', 'c'],
                 userAgentPackageName: 'dev.fleaflet.flutter_map.example',
               ),

diff --git a/example/lib/pages/polygon.dart b/example/lib/pages/polygon.dart
@@ -70,7 +70,7 @@ class PolygonPage extends StatelessWidget {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/polyline.dart b/example/lib/pages/polyline.dart
@@ -83,7 +83,7 @@ class _PolylinePageState extends State<PolylinePage> {
                         children: [
                           TileLayer(
                             urlTemplate:
-                                'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                                'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                             subdomains: ['a', 'b', 'c'],
                             userAgentPackageName:
                                 'dev.fleaflet.flutter_map.example',

diff --git a/example/lib/pages/reset_tile_layer.dart b/example/lib/pages/reset_tile_layer.dart
@@ -19,7 +19,7 @@ class ResetTileLayerPage extends StatefulWidget {
 class ResetTileLayerPageState extends State<ResetTileLayerPage> {
   StreamController<void> resetController = StreamController.broadcast();
 
-  String layer1 = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+  String layer1 = 'https://tile.openstreetmap.org/{z}/{x}/{y}.png';
   String layer2 = 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png';
   bool layerToggle = true;
 

diff --git a/example/lib/pages/stateful_markers.dart b/example/lib/pages/stateful_markers.dart
@@ -66,7 +66,7 @@ class _StatefulMarkersPageState extends State<StatefulMarkersPage> {
                 children: [
                   TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c'],
                     userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/pages/tile_builder_example.dart b/example/lib/pages/tile_builder_example.dart
@@ -113,7 +113,7 @@ class _TileBuilderPageState extends State<TileBuilderPage> {
           ),
           children: [
             TileLayer(
-              urlTemplate: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+              urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
               subdomains: ['a', 'b', 'c'],
               userAgentPackageName: 'dev.fleaflet.flutter_map.example',
               tileBuilder: tileBuilder,

diff --git a/example/lib/pages/tile_loading_error_handle.dart b/example/lib/pages/tile_loading_error_handle.dart
@@ -41,7 +41,7 @@ class _TileLoadingErrorHandleState extends State<TileLoadingErrorHandle> {
                   children: [
                     TileLayer(
                       urlTemplate:
-                          'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                          'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                       subdomains: ['a', 'b', 'c'],
                       // For example purposes. It is recommended to use
                       // TileProvider with a caching and retry strategy, like

diff --git a/example/lib/pages/widgets.dart b/example/lib/pages/widgets.dart
@@ -46,7 +46,7 @@ class WidgetsPage extends StatelessWidget {
                 children: [
                   TileLayer(
                       urlTemplate:
-                          'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                          'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                       subdomains: ['a', 'b', 'c'],
                       userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                   ),

diff --git a/example/lib/test_app.dart b/example/lib/test_app.dart
@@ -35,7 +35,7 @@ class _TestAppState extends State<TestApp> {
               children: [
                 TileLayer(
                   urlTemplate:
-                      'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                      'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                   subdomains: ['a', 'b', 'c'],
                   userAgentPackageName: 'dev.fleaflet.flutter_map.example',
                 ),

diff --git a/lib/src/core/util.dart b/lib/src/core/util.dart
@@ -6,7 +6,7 @@ var _templateRe = RegExp(r'\{ *([\w_-]+) *\}');
 
 /// Replaces the templating placeholders with the provided data map.
 ///
-/// Example input: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png
+/// Example input: https://tile.openstreetmap.org/{z}/{x}/{y}.png
 ///
 /// Throws an [Exception] if any placeholder remains unresolved.
 String template(String str, Map<String, String> data) {

diff --git a/test/flutter_map_test.dart b/test/flutter_map_test.dart
@@ -112,7 +112,7 @@ class _TestAppState extends State<TestApp> {
               children: [
                 TileLayer(
                     urlTemplate:
-                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                        'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                     subdomains: ['a', 'b', 'c']),
                 MarkerLayer(markers: _markers),
               ],