Commit e1e9a924 authored by 7c00's avatar 7c00

Rename AMapModel to AMapOverlay

parent a189d648
#import <MAMapKit/MAMapKit.h> #import <MAMapKit/MAMapKit.h>
#import "AMapModel.h" #import "AMapOverlay.h"
#pragma ide diagnostic ignored "OCUnusedPropertyInspection" #pragma ide diagnostic ignored "OCUnusedPropertyInspection"
@interface AMapCircle : AMapModel @interface AMapCircle : AMapOverlay
@property(nonatomic, readonly) CLLocationCoordinate2D coordinate; @property(nonatomic, readonly) CLLocationCoordinate2D coordinate;
@property(nonatomic, readonly) MAMapRect boundingMapRect; @property(nonatomic, readonly) MAMapRect boundingMapRect;
......
#import <MAMapKit/MAMapKit.h> #import <MAMapKit/MAMapKit.h>
#import "AMapModel.h" #import "AMapOverlay.h"
@interface AMapHeatMap : AMapModel @interface AMapHeatMap : AMapOverlay
@end @end
#import <React/RCTComponent.h> #import <React/RCTComponent.h>
#import <MAMapKit/MAMapKit.h> #import <MAMapKit/MAMapKit.h>
#import "AMapModel.h" #import "AMapOverlay.h"
@interface AMapMultiPoint : AMapModel <MAMultiPointOverlayRendererDelegate> @interface AMapMultiPoint : AMapOverlay <MAMultiPointOverlayRendererDelegate>
@property(nonatomic, copy) RCTBubblingEventBlock onItemPress; @property(nonatomic, copy) RCTBubblingEventBlock onItemPress;
@end @end
#import <MAMapKit/MAOverlayRenderer.h> #import <MAMapKit/MAOverlayRenderer.h>
@interface AMapModel : UIView <MAOverlay> @interface AMapOverlay : UIView <MAOverlay>
- (MAOverlayRenderer *)renderer; - (MAOverlayRenderer *)renderer;
@end @end
#import "AMapModel.h" #import "AMapOverlay.h"
@implementation AMapModel { @implementation AMapOverlay {
} }
- (MAOverlayRenderer *)renderer { - (MAOverlayRenderer *)renderer {
......
#import "AMapModel.h" #import "AMapOverlay.h"
#pragma ide diagnostic ignored "OCUnusedPropertyInspection" #pragma ide diagnostic ignored "OCUnusedPropertyInspection"
@interface AMapPolygon : AMapModel @interface AMapPolygon : AMapOverlay
@property(nonatomic, readonly) CLLocationCoordinate2D coordinate; @property(nonatomic, readonly) CLLocationCoordinate2D coordinate;
@property(nonatomic, readonly) MAMapRect boundingMapRect; @property(nonatomic, readonly) MAMapRect boundingMapRect;
......
#import <MAMapKit/MAMapKit.h> #import <MAMapKit/MAMapKit.h>
#import "AMapModel.h" #import "AMapOverlay.h"
#pragma ide diagnostic ignored "OCUnusedPropertyInspection" #pragma ide diagnostic ignored "OCUnusedPropertyInspection"
@interface AMapPolyline : AMapModel @interface AMapPolyline : AMapOverlay
@property(nonatomic, readonly) CLLocationCoordinate2D coordinate; @property(nonatomic, readonly) CLLocationCoordinate2D coordinate;
@property(nonatomic, readonly) MAMapRect boundingMapRect; @property(nonatomic, readonly) MAMapRect boundingMapRect;
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
_markers[[@(marker.annotation.hash) stringValue]] = marker; _markers[[@(marker.annotation.hash) stringValue]] = marker;
[self addAnnotation:marker.annotation]; [self addAnnotation:marker.annotation];
} }
if ([subview isKindOfClass:[AMapModel class]]) { if ([subview isKindOfClass:[AMapOverlay class]]) {
[self addOverlay:(id <MAOverlay>) subview]; [self addOverlay:(id <MAOverlay>) subview];
} }
} }
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
AMapMarker *marker = (AMapMarker *) subview; AMapMarker *marker = (AMapMarker *) subview;
[self removeAnnotation:marker.annotation]; [self removeAnnotation:marker.annotation];
} }
if ([subview isKindOfClass:[AMapModel class]]) { if ([subview isKindOfClass:[AMapOverlay class]]) {
[self removeOverlay:(id <MAOverlay>) subview]; [self removeOverlay:(id <MAOverlay>) subview];
} }
} }
......
#import <React/RCTUIManager.h> #import <React/RCTUIManager.h>
#import "AMapView.h" #import "AMapView.h"
#import "AMapMarker.h" #import "AMapMarker.h"
#import "AMapModel.h" #import "AMapOverlay.h"
#pragma ide diagnostic ignored "OCUnusedClassInspection" #pragma ide diagnostic ignored "OCUnusedClassInspection"
#pragma ide diagnostic ignored "-Woverriding-method-mismatch" #pragma ide diagnostic ignored "-Woverriding-method-mismatch"
...@@ -112,8 +112,8 @@ RCT_EXPORT_METHOD(animateTo:(nonnull NSNumber *)reactTag params:(NSDictionary *) ...@@ -112,8 +112,8 @@ RCT_EXPORT_METHOD(animateTo:(nonnull NSNumber *)reactTag params:(NSDictionary *)
} }
- (MAOverlayRenderer *)mapView:(MAMapView *)mapView rendererForOverlay:(id <MAOverlay>)overlay { - (MAOverlayRenderer *)mapView:(MAMapView *)mapView rendererForOverlay:(id <MAOverlay>)overlay {
if ([overlay isKindOfClass:[AMapModel class]]) { if ([overlay isKindOfClass:[AMapOverlay class]]) {
return ((AMapModel *) overlay).renderer; return ((AMapOverlay *) overlay).renderer;
} }
return nil; return nil;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment