Use OPG Tiles / Use correct OTP Endpoint

Author: amenk

lib/base/blocks/map_tile_provider/map_tile_local_storage.dart

@@ -0,0 +1,19 @@
+import 'package:hive/hive.dart';
+
+class MapTileLocalStorage {
+  static const String customLayersStorage = "map_tile_layers_storage";
+
+  late Box _box;
+
+  MapTileLocalStorage() {
+    _box = Hive.box(customLayersStorage);
+  }
+
+  Future<void> save(String mapLayerId) async {
+    await _box.put(customLayersStorage, mapLayerId);
+  }
+
+  Future<String?> load() async {
+    return _box.get(customLayersStorage);
+  }
+}

lib/base/blocks/map_tile_provider/map_tile_provider.dart

@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:trufi_core/base/blocs/map_tile_provider/map_tile_provider.dart';
+
+class OpenPlaceGuideMapTile extends MapTileProvider {
+  @override
+  List<LayerOptions> buildTileLayerOptions() {
+    return [
+      TileLayerOptions(
+        urlTemplate: "https://africa.tiles.openplaceguide.org/styles/bright/{z}/{x}/{y}.png",
+        tileProvider: const DefaultMapTileCaching(),
+      ),
+    ];
+  }
+
+  @override
+  String get id => "OpenPlaceGuideMapTile";
+
+  @override
+  WidgetBuilder get imageBuilder => (context) => Image.asset(
+        "assets/images/OpenMapTiles.png",
+        package: "trufi_core",
+        fit: BoxFit.cover,
+      );
+
+  @override
+  String name(BuildContext context) {
+    return id;
+  }
+}
+
+class OSMMapLayer extends MapTileProvider {
+  final String? mapTilesUrl;
+
+  OSMMapLayer({
+    required this.mapTilesUrl,
+  }) : super();
+
+  @override
+  List<LayerOptions> buildTileLayerOptions() {
+    return [
+      TileLayerOptions(
+        urlTemplate: mapTilesUrl,
+        subdomains: ['a', 'b', 'c'],
+        tileProvider: const DefaultMapTileCaching(),
+      ),
+    ];
+  }
+
+  @override
+  String get id => "OpenPlaceGuideMapTile";
+
+  @override
+  WidgetBuilder get imageBuilder => (context) => Image.asset(
+        "assets/images/OpenMapTiles.png",
+        fit: BoxFit.cover,
+      );
+
+  @override
+  String name(BuildContext context) {
+    return id;
+  }
+}
+
+class DefaultMapTileCaching extends TileProvider {
+  const DefaultMapTileCaching();
+
+  @override
+  ImageProvider getImage(Coords coords, TileLayerOptions options) {
+    return CachedNetworkImageProvider(getTileUrl(coords, options));
+  }
+}

lib/base/blocks/map_tile_provider/map_tile_provider_cubit.dart

@@ -0,0 +1,35 @@
+import 'package:bloc/bloc.dart';
+import 'package:collection/collection.dart';
+import 'package:equatable/equatable.dart';
+import 'package:meta/meta.dart';
+import 'package:trufi_core/base/blocs/map_tile_provider/map_tile_provider.dart';
+
+import 'map_tile_local_storage.dart';
+
+part 'map_tile_provider_state.dart';
+
+class MapTileProviderCubit extends Cubit<MapTileProviderState> {
+  final MapTileLocalStorage _localStorage = MapTileLocalStorage();
+  final List<MapTileProvider> mapTileProviders;
+
+  MapTileProviderCubit({
+    required this.mapTileProviders,
+  }) : super(
+          MapTileProviderState(currentMapTileProvider: mapTileProviders.first),
+        ) {
+    _loadSavedStatus();
+  }
+
+  Future<void> _loadSavedStatus() async {
+    final mapTileSavedId = await _localStorage.load();
+    final MapTileProvider? mapTileProvider = mapTileProviders.firstWhereOrNull(
+      (element) => element.id == mapTileSavedId,
+    );
+    emit(state.copyWith(currentMapTileProvider: mapTileProvider));
+  }
+
+  void changeMapTileProvider(MapTileProvider mapTileProvider) {
+    emit(state.copyWith(currentMapTileProvider: mapTileProvider));
+    _localStorage.save(mapTileProvider.id);
+  }
+}

lib/base/blocks/map_tile_provider/map_tile_provider_state.dart

@@ -0,0 +1,22 @@
+part of 'map_tile_provider_cubit.dart';
+
+@immutable
+class MapTileProviderState extends Equatable {
+  final MapTileProvider currentMapTileProvider;
+
+  const MapTileProviderState({
+    required this.currentMapTileProvider,
+  });
+
+  MapTileProviderState copyWith({
+    MapTileProvider? currentMapTileProvider,
+  }) {
+    return MapTileProviderState(
+      currentMapTileProvider:
+          currentMapTileProvider ?? this.currentMapTileProvider,
+    );
+  }
+
+  @override
+  List<Object> get props => [currentMapTileProvider];
+}

lib/main.dart

@@ -6,29 +6,31 @@ import 'package:trufi_core/base/widgets/drawer/menu/social_media_item.dart';
 import 'package:trufi_core/default_values.dart';
 import 'package:trufi_core/trufi_core.dart';
 import 'package:trufi_core/trufi_router.dart';
+import 'package:addismaptransit_app/base/blocks/map_tile_provider/map_tile_provider.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await initHiveForFlutter();
   runApp(
     TrufiApp(
-      appNameTitle: 'ExampleApp',
+      appNameTitle: 'AddisMapTransit',
       blocProviders: [
         ...DefaultValues.blocProviders(
-          otpEndpoint: "https://cbba.trufi.app/otp",
-          otpGraphqlEndpoint: "https://cbba.trufi.app/otp/index/graphql",
+          otpEndpoint: "https://pt.addismap.com/otp/routers/default",
+          otpGraphqlEndpoint: "https://pt.addismap.com/otp/routers/default/index/graphql",
           mapConfiguration: MapConfiguration(
-            center: const TrufiLatLng(-17.392600, -66.158787),
+            center: const TrufiLatLng(9.005401, 38.763611),
           ),
-          searchAssetPath: "assets/data/search.json",
-          photonUrl: "https://cbba.trufi.app/photon",
+          searchAssetPath: "",
+          photonUrl: "https://photon.komoot.io",
+          mapTileProviders: [OpenPlaceGuideMapTile()]
         ),
       ],
       trufiRouter: TrufiRouter(
         routerDelegate: DefaultValues.routerDelegate(
-          appName: 'ExampleApp',
-          cityName: 'City',
-          countryName: 'Country',
+          appName: 'AddisMapTransit',
+          cityName: 'Addis Ababa',
+          countryName: 'Ethiopia',
           backgroundImageBuilder: (_) {
             return Image.asset(
               'assets/images/drawer-bg.jpg',