diff --git a/lib/src/types/map_objects/circle_map_object.dart b/lib/src/types/map_objects/circle_map_object.dart index 3ce158e5..4f632fb5 100644 --- 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 { + static const _kType = 'CircleMapObject'; + const CircleMapObject({ required this.mapId, required this.circle, @@ -150,7 +152,7 @@ class CircleMapObject extends Equatable implements MapObject { @override Map _createJson() { return toJson()..addAll({ - 'type': runtimeType.toString() + 'type': _kType }); } @@ -159,7 +161,7 @@ class CircleMapObject extends Equatable implements MapObject { assert(mapId == previous.mapId); return toJson()..addAll({ - 'type': runtimeType.toString(), + 'type': _kType }); } @@ -167,7 +169,7 @@ class CircleMapObject extends Equatable implements MapObject { Map _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 index ba3fee91..a9df0a99 100644 --- 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 placemarks, @@ -168,7 +170,7 @@ class ClusterizedPlacemarkCollection extends Equatable implements MapObject { @override Map _createJson() { return toJson()..addAll({ - 'type': runtimeType.toString(), + 'type': _kType, 'placemarks': MapObjectUpdates.from( const {...[]}, 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 _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 index ffddfae2..5b9805d7 100644 --- 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 mapObjects, @@ -114,7 +116,7 @@ class MapObjectCollection extends Equatable implements MapObject { @override Map _createJson() { return toJson()..addAll({ - 'type': runtimeType.toString(), + 'type': _kType, 'mapObjects': MapObjectUpdates.from( const {...[]}, 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 _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 index 3fd74e56..50a4aa8f 100644 --- 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 _createJson() { return toJson()..addAll({ - 'type': runtimeType.toString() + 'type': _kType }); } @@ -180,7 +182,7 @@ class PlacemarkMapObject extends Equatable implements MapObject { assert(mapId == previous.mapId); return toJson()..addAll({ - 'type': runtimeType.toString(), + 'type': _kType }); } @@ -188,7 +190,7 @@ class PlacemarkMapObject extends Equatable implements MapObject { Map _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 index 8d0d0e20..2d273e13 100644 --- 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 _createJson() { return toJson()..addAll({ - 'type': runtimeType.toString() + 'type': _kType }); } @@ -160,7 +162,7 @@ class PolygonMapObject extends Equatable implements MapObject { assert(mapId == previous.mapId); return toJson()..addAll({ - 'type': runtimeType.toString(), + 'type': _kType }); } @@ -168,7 +170,7 @@ class PolygonMapObject extends Equatable implements MapObject { Map _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 index c3339a23..5678cf9f 100644 --- 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 _createJson() { return toJson()..addAll({ - 'type': runtimeType.toString() + 'type': _kType }); } @@ -215,7 +217,7 @@ class PolylineMapObject extends Equatable implements MapObject { assert(mapId == previous.mapId); return toJson()..addAll({ - 'type': runtimeType.toString(), + 'type': _kType }); } @@ -223,7 +225,7 @@ class PolylineMapObject extends Equatable implements MapObject { Map _removeJson() { return { 'id': mapId.value, - 'type': runtimeType.toString() + 'type': _kType }; }