@@ -133,11 +133,11 @@ - (void)didTapCircleWithIdentifier:(NSString *)identifier {
133133}
134134+ (CLLocationCoordinate2D)getPosition : (NSDictionary *)circle {
135135 NSArray *center = circle[@" center" ];
136- return [FLTGoogleMapJsonConversions toLocation : center];
136+ return [FLTGoogleMapJsonConversions getLocationFromData : center];
137137}
138138+ (CLLocationDistance)getRadius : (NSDictionary *)circle {
139139 NSNumber *radius = circle[@" radius" ];
140- return [FLTGoogleMapJsonConversions toFloat : radius];
140+ return [FLTGoogleMapJsonConversions getFloatFromData : radius];
141141}
142142+ (NSString *)getCircleId : (NSDictionary *)circle {
143143 return circle[@" circleId" ];
@@ -146,42 +146,42 @@ + (NSString *)getCircleId:(NSDictionary *)circle {
146146+ (void )interpretCircleOptions : (NSDictionary *)data sink : (id <FLTGoogleMapCircleOptionsSink>)sink {
147147 NSNumber *consumeTapEvents = data[@" consumeTapEvents" ];
148148 if (consumeTapEvents != nil ) {
149- [sink setConsumeTapEvents: [FLTGoogleMapJsonConversions toBool : consumeTapEvents]];
149+ [sink setConsumeTapEvents: [FLTGoogleMapJsonConversions getBoolFromData : consumeTapEvents]];
150150 }
151151
152152 NSNumber *visible = data[@" visible" ];
153153 if (visible != nil ) {
154- [sink setVisible: [FLTGoogleMapJsonConversions toBool : visible]];
154+ [sink setVisible: [FLTGoogleMapJsonConversions getBoolFromData : visible]];
155155 }
156156
157157 NSNumber *zIndex = data[@" zIndex" ];
158158 if (zIndex != nil ) {
159- [sink setZIndex: [FLTGoogleMapJsonConversions toInt : zIndex]];
159+ [sink setZIndex: [FLTGoogleMapJsonConversions getIntFromData : zIndex]];
160160 }
161161
162162 NSArray *center = data[@" center" ];
163163 if (center) {
164- [sink setCenter: [FLTGoogleMapJsonConversions toLocation : center]];
164+ [sink setCenter: [FLTGoogleMapJsonConversions getLocationFromData : center]];
165165 }
166166
167167 NSNumber *radius = data[@" radius" ];
168168 if (radius != nil ) {
169- [sink setRadius: [FLTGoogleMapJsonConversions toFloat : radius]];
169+ [sink setRadius: [FLTGoogleMapJsonConversions getFloatFromData : radius]];
170170 }
171171
172172 NSNumber *strokeColor = data[@" strokeColor" ];
173173 if (strokeColor != nil ) {
174- [sink setStrokeColor: [FLTGoogleMapJsonConversions toColor : strokeColor]];
174+ [sink setStrokeColor: [FLTGoogleMapJsonConversions getColorFromData : strokeColor]];
175175 }
176176
177177 NSNumber *strokeWidth = data[@" strokeWidth" ];
178178 if (strokeWidth != nil ) {
179- [sink setStrokeWidth: [FLTGoogleMapJsonConversions toInt : strokeWidth]];
179+ [sink setStrokeWidth: [FLTGoogleMapJsonConversions getIntFromData : strokeWidth]];
180180 }
181181
182182 NSNumber *fillColor = data[@" fillColor" ];
183183 if (fillColor != nil ) {
184- [sink setFillColor: [FLTGoogleMapJsonConversions toColor : fillColor]];
184+ [sink setFillColor: [FLTGoogleMapJsonConversions getColorFromData : fillColor]];
185185 }
186186}
187187
0 commit comments