@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.4

package/ios/RCTMGL/RCTMGLShapeSource.m

@@ -1,194 +0,0 @@
-//
-//  RCTMGLShapeSource.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/19/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLShapeSource.h"
-#import "RCTMGLUtils.h"
-#import "RCTMGLMapView.h"
-
-@implementation RCTMGLShapeSource
-
-static UIImage * _placeHolderImage;
-
-- (void)setUrl: (NSString*) url
-{
-    _url = url;
-    if (self.source != nil) {
-        MGLShapeSource *source = (MGLShapeSource *)self.source;
-        [source setURL: url == nil ? nil : [NSURL URLWithString:url]];
-    }
-}
-
-- (void)setShape:(NSString *)shape
-{
-    _shape = shape;
-
-    if (self.source != nil) {
-        MGLShapeSource *source = (MGLShapeSource *)self.source;
-        [source setShape: shape == nil ? nil : [RCTMGLUtils shapeFromGeoJSON:_shape]];
-    }
-}
-
-- (void)addToMap
-{
-    if (self.map.style == nil) {
-        return;
-    }
-    [super addToMap];
-}
-
-- (void)removeFromMap
-{
-    if (self.map.style == nil) {
-        return;
-    }
-
-    [super removeFromMap];
-}
-
-- (nullable MGLSource*)makeSource
-{
-    NSDictionary<MGLShapeSourceOption, id> *options = [self _getOptions];
-
-    if (_shape != nil) {
-        MGLShape *shape = [RCTMGLUtils shapeFromGeoJSON:_shape];
-        return [[MGLShapeSource alloc] initWithIdentifier:self.id shape:shape options:options];
-    }
-
-    if (_url != nil) {
-        NSURL *url = [[NSURL alloc] initWithString:_url];
-        return [[MGLShapeSource alloc] initWithIdentifier:self.id URL:url options:options];
-    }
-    return nil;
-}
-
-- (NSDictionary<MGLShapeSourceOption, id>*)_getOptions
-{
-    NSMutableDictionary<MGLShapeSourceOption, id> *options = [[NSMutableDictionary alloc] init];
-
-    if (_cluster != nil) {
-        options[MGLShapeSourceOptionClustered] = [NSNumber numberWithBool:[_cluster intValue] == 1];
-    }
-
-    if (_clusterRadius != nil) {
-        options[MGLShapeSourceOptionClusterRadius] = _clusterRadius;
-    }
-
-    if (_clusterMaxZoomLevel != nil) {
-        options[MGLShapeSourceOptionMaximumZoomLevelForClustering] = _clusterMaxZoomLevel;
-    }
-
-    if (_maxZoomLevel != nil) {
-        options[MGLShapeSourceOptionMaximumZoomLevel] = _maxZoomLevel;
-    }
-    
-    if (_clusterProperties != nil) {
-       NSMutableDictionary<NSString *, NSArray *> *properties = [NSMutableDictionary new];
-
-        for (NSString *propertyName in _clusterProperties.allKeys) {
-            NSArray<NSExpression *> *expressions = [_clusterProperties objectForKey: propertyName];
-            NSExpression *firstExpression = [NSExpression expressionWithMGLJSONObject:[expressions objectAtIndex: 0]];
-            NSExpression *secondExpression = [NSExpression expressionWithMGLJSONObject:[expressions objectAtIndex: 1]];
-
-            [properties setObject:@[firstExpression, secondExpression] forKey:propertyName];
-        }
-
-        options[MGLShapeSourceOptionClusterProperties] = properties;
-    }
-
-    if (_buffer != nil) {
-        options[MGLShapeSourceOptionBuffer] = _buffer;
-    }
-
-    if (_tolerance != nil) {
-        options[MGLShapeSourceOptionSimplificationTolerance] = _tolerance;
-    }
-
-    if (_lineMetrics != nil) {
-        options[MGLShapeSourceOptionLineDistanceMetrics] = _lineMetrics;
-    }
-
-    return options;
-}
-
-- (nonnull NSArray<id <MGLFeature>> *)featuresMatchingPredicate:(nullable NSPredicate *)predicate
-{
-    MGLShapeSource *shapeSource = (MGLShapeSource *)self.source;
-
-    return [shapeSource featuresMatchingPredicate:predicate];
-}
-
-- (double)getClusterExpansionZoom:(nonnull NSString *)featureJSON
-{
-    MGLShapeSource *shapeSource = (MGLShapeSource *)self.source;
-
-    MGLPointFeature *feature = (MGLPointFeature*)[RCTMGLUtils shapeFromGeoJSON:featureJSON];
- 
-    return [shapeSource zoomLevelForExpandingCluster:(MGLPointFeatureCluster *)feature];
-}
-
-- (nonnull NSArray<id <MGLFeature>> *)getClusterLeaves:(nonnull NSString *)featureJSON
-    number:(NSUInteger)number
-    offset:(NSUInteger)offset
-{
-    MGLShapeSource *shapeSource = (MGLShapeSource *)self.source;
-
-    MGLPointFeature *feature = (MGLPointFeature*)[RCTMGLUtils shapeFromGeoJSON:featureJSON];
-
-    MGLPointFeatureCluster * cluster = (MGLPointFeatureCluster *)feature;
-    return [shapeSource leavesOfCluster:cluster offset:offset limit:number];
-}
-
-- (nonnull NSArray<id <MGLFeature>> *)getClusterChildren:(nonnull NSString *)featureJSON
-{
-    MGLShapeSource *shapeSource = (MGLShapeSource *)self.source;
-    
-    MGLPointFeature *feature = (MGLPointFeature*)[RCTMGLUtils shapeFromGeoJSON:featureJSON];
-    
-    MGLPointFeatureCluster * cluster = (MGLPointFeatureCluster *)feature;
-    return [shapeSource childrenOfCluster:cluster];
-}
-
-
-// Deprecated. Will be removed in 9+ ver.
-- (double)getClusterExpansionZoomById:(nonnull NSNumber *)clusterId
-{
-    MGLShapeSource *shapeSource = (MGLShapeSource *)self.source;
-    NSArray<id<MGLFeature>> *features = [shapeSource featuresMatchingPredicate: [NSPredicate predicateWithFormat:@"%K = %i", @"cluster_id", clusterId.intValue]];
-    if (features.count == 0) {
-        return -1;
-    }
-    return [shapeSource zoomLevelForExpandingCluster:(MGLPointFeatureCluster *)features[0]];
-}
-
-// Deprecated. Will be removed in 9+ ver.
-- (nonnull NSArray<id <MGLFeature>> *)getClusterLeavesById:(nonnull NSNumber *)clusterId
-    number:(NSUInteger)number
-    offset:(NSUInteger)offset
-{
-    MGLShapeSource *shapeSource = (MGLShapeSource *)self.source;
-    
-    NSPredicate* predicate = [NSPredicate predicateWithFormat:@"cluster_id == %@", clusterId];
-    NSArray<id<MGLFeature>> *features = [shapeSource featuresMatchingPredicate:predicate];
-    
-    MGLPointFeatureCluster * cluster = (MGLPointFeatureCluster *)features[0];
-    return [shapeSource leavesOfCluster:cluster offset:offset limit:number];
-}
-
-// Deprecated. Will be removed in 9+ ver.
-- (nonnull NSArray<id <MGLFeature>> *)getClusterChildrenById:(nonnull NSNumber *)clusterId
-{
-    MGLShapeSource *shapeSource = (MGLShapeSource *)self.source;
-    
-    NSPredicate* predicate = [NSPredicate predicateWithFormat:@"cluster_id == %@", clusterId];
-    NSArray<id<MGLFeature>> *features = [shapeSource featuresMatchingPredicate:predicate];
-    
-    MGLPointFeatureCluster * cluster = (MGLPointFeatureCluster *)features[0];
-    return [shapeSource childrenOfCluster:cluster];
-}
-
-@end

package/ios/RCTMGL/RCTMGLShapeSourceManager.h

@@ -1,14 +0,0 @@
-//
-//  RCTMGLShapeSourceManager.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/19/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "ViewManager.h"
-#import <React/RCTBridgeModule.h>
-
-@interface RCTMGLShapeSourceManager : ViewManager<RCTBridgeModule>
-
-@end

package/ios/RCTMGL/RCTMGLShapeSourceManager.m

@@ -1,206 +0,0 @@
-//
-//  RCTMGLShapeSourceManager.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/19/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-#import <React/RCTUIManager.h>
-
-#import "RCTMGLShapeSourceManager.h"
-#import "RCTMGLShapeSource.h"
-
-#import "FilterParser.h"
-
-@implementation RCTMGLShapeSourceManager
-
-RCT_EXPORT_MODULE(RCTMGLShapeSource)
-
-RCT_EXPORT_VIEW_PROPERTY(id, NSString)
-RCT_EXPORT_VIEW_PROPERTY(url, NSString)
-RCT_EXPORT_VIEW_PROPERTY(shape, NSString)
-
-RCT_EXPORT_VIEW_PROPERTY(cluster, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(clusterRadius, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(clusterMaxZoomLevel, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(clusterProperties, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(buffer, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(tolerance, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(lineMetrics, NSNumber)
-RCT_EXPORT_VIEW_PROPERTY(images, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(nativeImages, NSArray)
-RCT_EXPORT_VIEW_PROPERTY(hasPressListener, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(hitbox, NSDictionary)
-RCT_REMAP_VIEW_PROPERTY(onMapboxShapeSourcePress, onPress, RCTBubblingEventBlock)
-
-- (UIView*)view
-{
-    RCTMGLShapeSource *source = [RCTMGLShapeSource new];
-    source.bridge = self.bridge;
-    return source;
-}
-
-RCT_EXPORT_METHOD(features:(nonnull NSNumber*)reactTag
-                  withFilter:(NSArray *)filter
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        RCTMGLShapeSource* shapeSource = viewRegistry[reactTag];
-
-        if (![shapeSource isKindOfClass:[RCTMGLShapeSource class]]) {
-            RCTLogError(@"Invalid react tag, could not find RCTMGLMapView");
-            return;
-        }
-
-        NSPredicate* predicate = [FilterParser parse:filter];
-        NSArray<id<MGLFeature>> *shapes = [shapeSource featuresMatchingPredicate: predicate];
-
-        NSMutableArray<NSDictionary*> *features = [[NSMutableArray alloc] initWithCapacity:shapes.count];
-        for (int i = 0; i < shapes.count; i++) {
-            [features addObject:shapes[i].geoJSONDictionary];
-        }
-
-        resolve(@{
-                  @"data": @{ @"type": @"FeatureCollection", @"features": features }
-                  });
-    }];
-}
-
-RCT_EXPORT_METHOD(getClusterExpansionZoom:(nonnull NSNumber*)reactTag
-                                featureJSON:(nonnull NSString*)featureJSON
-                                 resolver:(RCTPromiseResolveBlock)resolve
-                                 rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        RCTMGLShapeSource* shapeSource = (RCTMGLShapeSource *)viewRegistry[reactTag];
-
-        if (![shapeSource isKindOfClass:[RCTMGLShapeSource class]]) {
-            RCTLogError(@"Invalid react tag, could not find RCTMGLMapView");
-            return;
-        }
-
-        double zoom = [shapeSource getClusterExpansionZoom: featureJSON];
-        if (zoom == -1) {
-          reject(@"zoom_error", [NSString stringWithFormat:@"Could not get zoom for cluster %@", featureJSON], nil);
-          return;
-        }
-        resolve(@{@"data":@(zoom)});
-    }];
-}
-
-
-RCT_EXPORT_METHOD(getClusterLeaves:(nonnull NSNumber*)reactTag
-                  featureJSON:(nonnull NSString*)featureJSON
-                  number:(NSUInteger) number
-                  offset:(NSUInteger) offset
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        RCTMGLShapeSource* shapeSource = (RCTMGLShapeSource *)viewRegistry[reactTag];
-
-        NSArray<id<MGLFeature>> *shapes = [shapeSource getClusterLeaves:featureJSON number:number offset:offset];
-
-        NSMutableArray<NSDictionary*> *features = [[NSMutableArray alloc] initWithCapacity:shapes.count];
-        for (int i = 0; i < shapes.count; i++) {
-            [features addObject:shapes[i].geoJSONDictionary];
-        }
-
-        resolve(@{
-                  @"data": @{ @"type": @"FeatureCollection", @"features": features }
-                  });
-    }];
-}
-
-RCT_EXPORT_METHOD(getClusterChildren:(nonnull NSNumber*)reactTag
-                  featureJSON:(nonnull NSString*)featureJSON                
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        RCTMGLShapeSource* shapeSource = (RCTMGLShapeSource *)viewRegistry[reactTag];
-
-        NSArray<id<MGLFeature>> *shapes = [shapeSource getClusterChildren: featureJSON];
-
-        NSMutableArray<NSDictionary*> *features = [[NSMutableArray alloc] initWithCapacity:shapes.count];
-        for (int i = 0; i < shapes.count; i++) {
-            [features addObject:shapes[i].geoJSONDictionary];
-        }
-
-        resolve(@{
-                  @"data": @{ @"type": @"FeatureCollection", @"features": features }
-                  });
-    }];
-}
-
-// Deprecated. Will be removed in 9+ ver.
-RCT_EXPORT_METHOD(getClusterExpansionZoomById:(nonnull NSNumber*)reactTag
-                                clusterId:(nonnull NSNumber*)clusterId
-                                 resolver:(RCTPromiseResolveBlock)resolve
-                                 rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        RCTMGLShapeSource* shapeSource = (RCTMGLShapeSource *)viewRegistry[reactTag];
-
-        if (![shapeSource isKindOfClass:[RCTMGLShapeSource class]]) {
-            RCTLogError(@"Invalid react tag, could not find RCTMGLMapView");
-            return;
-        }
-
-        double zoom = [shapeSource getClusterExpansionZoomById:clusterId];
-        if (zoom == -1) {
-          reject(@"zoom_error", [NSString stringWithFormat:@"Could not get zoom for cluster id %@", clusterId], nil);
-          return;
-        }
-        resolve(@{@"data":@(zoom)});
-    }];
-}
-
-// Deprecated. Will be removed in 9+ ver.
-RCT_EXPORT_METHOD(getClusterLeavesById:(nonnull NSNumber*)reactTag
-                  clusterId:(nonnull NSNumber *)clusterId
-                  number:(NSUInteger) number
-                  offset:(NSUInteger) offset
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        RCTMGLShapeSource* shapeSource = (RCTMGLShapeSource *)viewRegistry[reactTag];
-
-        NSArray<id<MGLFeature>> *shapes = [shapeSource getClusterLeavesById:clusterId number:number offset:offset];
-
-        NSMutableArray<NSDictionary*> *features = [[NSMutableArray alloc] initWithCapacity:shapes.count];
-        for (int i = 0; i < shapes.count; i++) {
-            [features addObject:shapes[i].geoJSONDictionary];
-        }
-
-        resolve(@{
-                  @"data": @{ @"type": @"FeatureCollection", @"features": features }
-                  });
-    }];
-}
-// Deprecated. Will be removed in 9+ ver.
-RCT_EXPORT_METHOD(getClusterChildrenById:(nonnull NSNumber*)reactTag
-                  clusterId:(nonnull NSNumber *)clusterId                  
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        RCTMGLShapeSource* shapeSource = (RCTMGLShapeSource *)viewRegistry[reactTag];
-
-        NSArray<id<MGLFeature>> *shapes = [shapeSource getClusterChildrenById: clusterId];
-
-        NSMutableArray<NSDictionary*> *features = [[NSMutableArray alloc] initWithCapacity:shapes.count];
-        for (int i = 0; i < shapes.count; i++) {
-            [features addObject:shapes[i].geoJSONDictionary];
-        }
-
-        resolve(@{
-                  @"data": @{ @"type": @"FeatureCollection", @"features": features }
-                  });
-    }];
-}
-
-@end

package/ios/RCTMGL/RCTMGLSource.h

@@ -1,35 +0,0 @@
-//
-//  BaseSource.h
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/8/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import <React/RCTComponent.h>
-#import "RCTMGLLayer.h"
-#import <UIKit/UIKit.h>
-@import Mapbox;
-
-@interface RCTMGLSource : UIView
-
-extern NSString * _Nonnull const DEFAULT_SOURCE_ID;
-
-@property (nonatomic, strong) NSMutableArray<id<RCTComponent>> *reactSubviews;
-@property (nonatomic, strong) NSMutableArray<RCTMGLLayer*> *layers;
-@property (nonatomic, strong) MGLSource *source;
-@property (nonatomic, strong) RCTMGLMapView *map;
-@property (nonatomic, strong) NSDictionary<NSString *, NSNumber *> *hitbox;
-
-@property (nonatomic, copy) NSString *id;
-@property (nonatomic, assign) BOOL hasPressListener;
-@property (nonatomic, copy) RCTBubblingEventBlock onPress;
-
-- (void)addToMap;
-- (void)removeFromMap;
-- (nullable MGLSource*)makeSource;
-- (NSArray<NSString *> *)getLayerIDs;
-
-+ (BOOL)isDefaultSource:(NSString*)sourceID;
-
-@end

package/ios/RCTMGL/RCTMGLSource.m

@@ -1,143 +0,0 @@
-//
-//  BaseSource.m
-//  RCTMGL
-//
-//  Created by Nick Italiano on 9/8/17.
-//  Copyright © 2017 Mapbox Inc. All rights reserved.
-//
-
-#import "RCTMGLSource.h"
-#import <React/UIView+React.h>
-#import "RCTMGLMapView.h"
-#import <React/RCTLog.h>
-
-@implementation RCTMGLSource
-
-double const DEFAULT_HITBOX_AREA = 44.0;
-NSString *const DEFAULT_SOURCE_ID = @"composite";
-
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    if (self = [super initWithFrame:frame]) {
-        _layers = [[NSMutableArray alloc] init];
-        _reactSubviews = [[NSMutableArray alloc] init];
-        _hitbox = @{ @"width": @(DEFAULT_HITBOX_AREA), @"height": @(DEFAULT_HITBOX_AREA) };
-    }
-    return self;
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-- (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex {
-    if ([subview isKindOfClass:[RCTMGLLayer class]]) {
-        RCTMGLLayer *layer = (RCTMGLLayer*)subview;
-        
-        if (_map.style != nil) {
-            [layer addToMap:_map style:_map.style];
-        }
-
-        [_layers addObject:layer];
-        [_reactSubviews insertObject:layer atIndex:atIndex];
-    }
-}
-#pragma clang diagnostic pop
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-- (void)removeReactSubview:(id<RCTComponent>)subview {
-    if ([subview isKindOfClass:[RCTMGLLayer class]]) {
-        RCTMGLLayer *layer = (RCTMGLLayer*)subview;
-        [layer removeFromMap:_map.style];
-        [_layers removeObject:layer];
-        [_reactSubviews removeObject:layer];
-    }
-}
-#pragma clang diagnostic pop
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-- (NSArray<id<RCTComponent>> *)reactSubviews {
-    return _reactSubviews;
-}
-#pragma clang diagnostic pop
-
-- (void)setMap:(RCTMGLMapView *)map
-{
-    if (map == nil) {
-        [self removeFromMap];
-        _map = nil;
-    } else {
-        _map = map;
-        [self addToMap];
-    }
-}
-
-- (void)addToMap
-{
-    if (_map.style == nil) {
-        return;
-    }
-    
-    MGLSource *existingSource = [_map.style sourceWithIdentifier:_id];
-    if (existingSource != nil) {
-        _source = existingSource;
-    } else {
-        _source = [self makeSource];
-        if (_source != nil) {
-            [_map.style addSource:_source];
-        } else {
-            RCTLogError(@"Could not create source with id:%@. Make sure url/shape is provided", _id);
-        }
-    }
-    
-    if (_layers.count > 0) {
-        for (int i = 0; i < _layers.count; i++) {
-            RCTMGLLayer *layer = [_layers objectAtIndex:i];
-            [layer addToMap:_map style:_map.style];
-        }
-    }
-}
-
-- (void)removeFromMap
-{
-    if (_map.style == nil) {
-        return;
-    }
-    
-    for (int i = 0; i < _layers.count; i++) {
-        RCTMGLLayer *layer = [_layers objectAtIndex:i];
-        [layer removeFromMap:_map.style];
-    }
-    
-    if (![RCTMGLSource isDefaultSource:_id]) {
-        if (_source != nil) {
-            [_map.style removeSource:_source];
-        }
-    }
-}
-
-- (nullable MGLSource*)makeSource
-{
-    @throw [NSException exceptionWithName:NSInternalInconsistencyException
-                        reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
-                        userInfo:nil];
-}
-
-- (NSArray<NSString *> *)getLayerIDs
-{
-    NSMutableArray *layerIDs = [[NSMutableArray alloc] init];
-    
-    for (RCTMGLLayer *layer in _layers) {
-        [layerIDs addObject:layer.id];
-    }
-    
-    return layerIDs;
-}
-
-+ (BOOL)isDefaultSource:(NSString *)sourceID
-{
-    return [sourceID isEqualToString:DEFAULT_SOURCE_ID];
-}
-
-@end