Fix Android obfuscation breaking MapObject manipulation

Unact · Jul 4, 2023 · 2fa8b37 · 2fa8b37
1 parent 11d250f
commit 2fa8b37
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 18 deletions.
diff --git a/lib/src/types/map_objects/circle_map_object.dart b/lib/src/types/map_objects/circle_map_object.dart
@@ -2,6 +2,8 @@ part of yandex_mapkit;
 
 /// A circle to be displayed on [YandexMap].
 class CircleMapObject extends Equatable implements MapObject<CircleMapObject> {
+  static const _kType = 'CircleMapObject';
+
   const CircleMapObject({
     required this.mapId,
     required this.circle,
@@ -150,7 +152,7 @@ class CircleMapObject extends Equatable implements MapObject<CircleMapObject> {
   @override
   Map<String, dynamic> _createJson() {
     return toJson()..addAll({
-      'type': runtimeType.toString()
+      'type': _kType
     });
   }
 
@@ -159,15 +161,15 @@ class CircleMapObject extends Equatable implements MapObject<CircleMapObject> {
     assert(mapId == previous.mapId);
 
     return toJson()..addAll({
-      'type': runtimeType.toString(),
+      'type': _kType
     });
   }
 
   @override
   Map<String, dynamic> _removeJson() {
     return {
       'id': mapId.value,
-      'type': runtimeType.toString()
+      'type': _kType
     };
   }
 

diff --git a/lib/src/types/map_objects/clusterized_placemark_collection.dart b/lib/src/types/map_objects/clusterized_placemark_collection.dart
@@ -5,6 +5,8 @@ part of yandex_mapkit;
 /// Depending on distance from each other and current zoom level
 /// can be grouped into a single or multiple [Cluster]
 class ClusterizedPlacemarkCollection extends Equatable implements MapObject {
+  static const _kType = 'ClusterizedPlacemarkCollection';
+
   ClusterizedPlacemarkCollection({
     required this.mapId,
     required List<PlacemarkMapObject> placemarks,
@@ -168,7 +170,7 @@ class ClusterizedPlacemarkCollection extends Equatable implements MapObject {
   @override
   Map<String, dynamic> _createJson() {
     return toJson()..addAll({
-      'type': runtimeType.toString(),
+      'type': _kType,
       'placemarks': MapObjectUpdates.from(
         const <PlacemarkMapObject>{...[]},
         placemarks.toSet()
@@ -181,7 +183,7 @@ class ClusterizedPlacemarkCollection extends Equatable implements MapObject {
     assert(mapId == previous.mapId);
 
     return toJson()..addAll({
-      'type': runtimeType.toString(),
+      'type': _kType,
       'placemarks': MapObjectUpdates.from(
         (previous as ClusterizedPlacemarkCollection).placemarks.toSet(),
         placemarks.toSet()
@@ -193,7 +195,7 @@ class ClusterizedPlacemarkCollection extends Equatable implements MapObject {
   Map<String, dynamic> _removeJson() {
     return {
       'id': mapId.value,
-      'type': runtimeType.toString()
+      'type': _kType
     };
   }
 

diff --git a/lib/src/types/map_objects/map_object_collection.dart b/lib/src/types/map_objects/map_object_collection.dart
@@ -3,6 +3,8 @@ part of yandex_mapkit;
 /// A collection of [MapObject] to be displayed on [YandexMap]
 /// All [mapObjects] must be unique, i.e. each [MapObject.mapId] must be unique
 class MapObjectCollection extends Equatable implements MapObject {
+  static const _kType = 'MapObjectCollection';
+
   MapObjectCollection({
     required this.mapId,
     required List<MapObject> mapObjects,
@@ -114,7 +116,7 @@ class MapObjectCollection extends Equatable implements MapObject {
   @override
   Map<String, dynamic> _createJson() {
     return toJson()..addAll({
-      'type': runtimeType.toString(),
+      'type': _kType,
       'mapObjects': MapObjectUpdates.from(
         const <MapObject>{...[]},
         mapObjects.toSet()
@@ -127,7 +129,7 @@ class MapObjectCollection extends Equatable implements MapObject {
     assert(mapId == previous.mapId);
 
     return toJson()..addAll({
-      'type': runtimeType.toString(),
+      'type': _kType,
       'mapObjects': MapObjectUpdates.from(
         (previous as MapObjectCollection).mapObjects.toSet(),
         mapObjects.toSet()
@@ -139,7 +141,7 @@ class MapObjectCollection extends Equatable implements MapObject {
   Map<String, dynamic> _removeJson() {
     return {
       'id': mapId.value,
-      'type': runtimeType.toString()
+      'type': _kType
     };
   }
 

diff --git a/lib/src/types/map_objects/placemark_map_object.dart b/lib/src/types/map_objects/placemark_map_object.dart
@@ -2,6 +2,8 @@ part of yandex_mapkit;
 
 /// A placemark to be displayed on [YandexMap] at a specific point
 class PlacemarkMapObject extends Equatable implements MapObject {
+  static const _kType = 'PlacemarkMapObject';
+
   const PlacemarkMapObject({
     required this.mapId,
     required this.point,
@@ -171,7 +173,7 @@ class PlacemarkMapObject extends Equatable implements MapObject {
   @override
   Map<String, dynamic> _createJson() {
     return toJson()..addAll({
-      'type': runtimeType.toString()
+      'type': _kType
     });
   }
 
@@ -180,15 +182,15 @@ class PlacemarkMapObject extends Equatable implements MapObject {
     assert(mapId == previous.mapId);
 
     return toJson()..addAll({
-      'type': runtimeType.toString(),
+      'type': _kType
     });
   }
 
   @override
   Map<String, dynamic> _removeJson() {
     return {
       'id': mapId.value,
-      'type': runtimeType.toString()
+      'type': _kType
     };
   }
 

diff --git a/lib/src/types/map_objects/polygon_map_object.dart b/lib/src/types/map_objects/polygon_map_object.dart
@@ -2,6 +2,8 @@ part of yandex_mapkit;
 
 /// A polygon to be displayed on [YandexMap]
 class PolygonMapObject extends Equatable implements MapObject {
+  static const _kType = 'PolygonMapObject';
+
   const PolygonMapObject({
     required this.mapId,
     required this.polygon,
@@ -151,7 +153,7 @@ class PolygonMapObject extends Equatable implements MapObject {
   @override
   Map<String, dynamic> _createJson() {
     return toJson()..addAll({
-      'type': runtimeType.toString()
+      'type': _kType
     });
   }
 
@@ -160,15 +162,15 @@ class PolygonMapObject extends Equatable implements MapObject {
     assert(mapId == previous.mapId);
 
     return toJson()..addAll({
-      'type': runtimeType.toString(),
+      'type': _kType
     });
   }
 
   @override
   Map<String, dynamic> _removeJson() {
     return {
       'id': mapId.value,
-      'type': runtimeType.toString()
+      'type': _kType
     };
   }
 

diff --git a/lib/src/types/map_objects/polyline_map_object.dart b/lib/src/types/map_objects/polyline_map_object.dart
@@ -2,6 +2,8 @@ part of yandex_mapkit;
 
 /// Collection of points connected by lines to be displayed on [YandexMap]
 class PolylineMapObject extends Equatable implements MapObject {
+  static const _kType = 'PolylineMapObject';
+
   const PolylineMapObject({
     required this.mapId,
     required this.polyline,
@@ -206,7 +208,7 @@ class PolylineMapObject extends Equatable implements MapObject {
   @override
   Map<String, dynamic> _createJson() {
     return toJson()..addAll({
-      'type': runtimeType.toString()
+      'type': _kType
     });
   }
 
@@ -215,15 +217,15 @@ class PolylineMapObject extends Equatable implements MapObject {
     assert(mapId == previous.mapId);
 
     return toJson()..addAll({
-      'type': runtimeType.toString(),
+      'type': _kType
     });
   }
 
   @override
   Map<String, dynamic> _removeJson() {
     return {
       'id': mapId.value,
-      'type': runtimeType.toString()
+      'type': _kType
     };
   }