From 5cd6e2e6c823b79e249b1ac0f24ac6380947b48b Mon Sep 17 00:00:00 2001 From: Yoshi Date: Fri, 23 Aug 2024 07:15:37 +0300 Subject: [PATCH] Delete 2gis --- lib/app/modules/geolocation.dart | 15 ++++----------- lib/app/modules/map/view/map.dart | 14 ++++---------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/lib/app/modules/geolocation.dart b/lib/app/modules/geolocation.dart index 8f37fdb..6e3dc67 100644 --- a/lib/app/modules/geolocation.dart +++ b/lib/app/modules/geolocation.dart @@ -80,9 +80,7 @@ class _SelectGeolocationState extends State { Widget _buildMapTileLayer() { return TileLayer( - urlTemplate: settings.language == 'ru_RU' - ? 'https://tile2.maps.2gis.com/tiles?x={x}&y={y}&z={z}' - : 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', + urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', userAgentPackageName: 'com.darkmoonight.rain', ); } @@ -173,15 +171,10 @@ class _SelectGeolocationState extends State { animationConfig: const ScaleRAWA(), attributions: [ TextSourceAttribution( - settings.language == 'ru_RU' - ? '2GIS contributors' - : 'OpenStreetMap contributors', + 'OpenStreetMap contributors', onTap: () => weatherController - .urlLauncher(settings - .language == - 'ru_RU' - ? 'https://law.2gis.ru/copyright' - : 'https://openstreetmap.org/copyright'), + .urlLauncher( + 'https://openstreetmap.org/copyright'), ), ], ), diff --git a/lib/app/modules/map/view/map.dart b/lib/app/modules/map/view/map.dart index 402d4ba..619c8a4 100644 --- a/lib/app/modules/map/view/map.dart +++ b/lib/app/modules/map/view/map.dart @@ -178,9 +178,7 @@ class _MapWeatherState extends State with TickerProviderStateMixin { Widget _buildMapTileLayer(CacheStore cacheStore) { return TileLayer( - urlTemplate: settings.language == 'ru_RU' - ? 'https://tile2.maps.2gis.com/tiles?x={x}&y={y}&z={z}' - : 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', + urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', userAgentPackageName: 'com.darkmoonight.rain', tileProvider: CachedTileProvider( store: cacheStore, @@ -279,13 +277,9 @@ class _MapWeatherState extends State with TickerProviderStateMixin { alignment: AttributionAlignment.bottomLeft, attributions: [ TextSourceAttribution( - settings.language == 'ru_RU' - ? '2GIS contributors' - : 'OpenStreetMap contributors', - onTap: () => weatherController.urlLauncher( - settings.language == 'ru_RU' - ? 'https://law.2gis.ru/copyright' - : 'https://openstreetmap.org/copyright'), + 'OpenStreetMap contributors', + onTap: () => weatherController + .urlLauncher('https://openstreetmap.org/copyright'), ), ], ),