Skip to content

Commit

Permalink
updating project and SDK to v2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
u10int committed Aug 28, 2015
1 parent 3371a87 commit 6e5eff9
Show file tree
Hide file tree
Showing 145 changed files with 241 additions and 10 deletions.
Binary file modified AerisSDK/Aeris.framework/Versions/A/Aeris
Binary file not shown.
2 changes: 2 additions & 0 deletions AerisSDK/Aeris.framework/Versions/A/Headers/AWFAdvisory.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
@property (readonly, nonatomic) AWFGeoPolygon *geoPolygon;

+ (NSDictionary *)colorMappingsForTypes;
+ (NSDictionary *)namesByType;

+ (UIColor *)colorForAdvisoryWithType:(NSString *)type;

@end
10 changes: 9 additions & 1 deletion AerisSDK/Aeris.framework/Versions/A/Headers/AWFForecastModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ typedef NS_ENUM(NSInteger, AWFForecastModelType) {
* An invalid or unknown model type.
*/
AWFForecastModelTypeUnknown = 0,
AWFForecastModelTypeAeris,
/**
* NDFD (National Digital Forecast Database) model.
*/
Expand All @@ -22,6 +23,11 @@ typedef NS_ENUM(NSInteger, AWFForecastModelType) {
* HRRR (High Resolution Rapid Refresh) model.
*/
AWFForecastModelTypeHRRR,
/**
* HRRR (High Resolution Rapid Refresh) sub-hourly model.
*/
AWFForecastModelTypeHRRRSub,

/**
* NAM (North Americal Mesoscale) model at a 4km resolution.
*/
Expand All @@ -33,7 +39,9 @@ typedef NS_ENUM(NSInteger, AWFForecastModelType) {
/**
* GFS (Global Forecast System) model.
*/
AWFForecastModelTypeGFS
AWFForecastModelTypeGFS,
AWFForecastModelTypeGFSMOS,
AWFForecastModelTypeGEFS
};

@interface AWFForecastModel : NSObject
Expand Down
19 changes: 19 additions & 0 deletions AerisSDK/Aeris.framework/Versions/A/Headers/AWFGlobals.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,25 @@
#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type
#endif

//-----------------------------------------------------------------------------
// @name Unit Conversions
//-----------------------------------------------------------------------------

CGFloat AWFConvertFtoC(CGFloat value);
CGFloat AWFConvertCtoF(CGFloat value);
CGFloat AWFConvertMPHtoKMH(CGFloat value);
CGFloat AWFConvertKMHtoMPH(CGFloat value);
CGFloat AWFConvertMPHtoKTS(CGFloat value);
CGFloat AWFConvertKMHtoKTS(CGFloat value);
CGFloat AWFConvertKTStoMPH(CGFloat value);
CGFloat AWFConvertKTStoKMH(CGFloat value);
CGFloat AWFConvertMItoKM(CGFloat value);
CGFloat AWFConvertKMtoMI(CGFloat value);
CGFloat AWFConvertINtoCM(CGFloat value);
CGFloat AWFConvertCMtoIN(CGFloat value);
CGFloat AWFConvertINtoMB(CGFloat value);
CGFloat AWFConvertMBtoIN(CGFloat value);

/**
* Tests if an object is a non-empty string.
*/
Expand Down
7 changes: 7 additions & 0 deletions AerisSDK/Aeris.framework/Versions/A/Headers/AWFObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@
*/
+ (NSDictionary *)propertyRelationships;

/**
* Returns the API property key mapped to the model object's property name.
*
* @param propertyName The model object's property name of which to return the mapped property key
*/
+ (NSString *)remotePropertyNameMappedToPropertyName:(NSString *)propertyName;

@optional

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ typedef NS_ENUM (NSUInteger, AWFRequestOperator) {
*
* @since 2.0
*/
@interface AWFRequestOptions : NSObject
@interface AWFRequestOptions : NSObject <NSCopying>

/**
* The place to use for the request. This corresponds to the `AerisAPIParamKeyPlace`, or `p`, parameter when accessing the API directly.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@ typedef NS_ENUM (NSUInteger, AWFWeatherDataType) {
AWFWeatherDataTypeLight,
AWFWeatherDataTypeVisibility,
AWFWeatherDataTypeTemperature,
AWFWeatherDataTypeMaxTemperature,
AWFWeatherDataTypeMinTemperature,
AWFWeatherDataTypeDewPoint,
AWFWeatherDataTypeHumidity,
AWFWeatherDataTypeWindSpeed,
AWFWeatherDataTypeWindGust,
AWFWeatherDataTypePressure,
AWFWeatherDataTypePrecipitation,
AWFWeatherDataTypeAccumulatedPrecipitation,
AWFWeatherDataTypeSnowfall,
AWFWeatherDataTypeAccumulatedSnowfall,
AWFWeatherDataTypeSolarRadiation
};
1 change: 1 addition & 0 deletions AerisSDK/Aeris.framework/Versions/A/Headers/NSDate+Aeris.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ extern NSString * const AWFDateFormatTimeZoneLocation;
- (NSDate *)awf_previousDateOfDateName:(AWFDay)day;

- (NSDate *)awf_dateByIgnoringTime;
- (NSDate *)awf_dateByIgnoringSeconds;

//----------------------
// @name Date Comparisons
Expand Down
Binary file modified AerisSDK/AerisGoogleMap.framework/Versions/A/AerisGoogleMap
Binary file not shown.
Binary file modified AerisSDK/AerisMap.framework/Versions/A/AerisMap
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ typedef NS_ENUM(NSUInteger, AWFLayerType) {
* Radar tile overlay.
*/
AWFLayerTypeRadar,
AWFLayerTypeRadarDev,
/**
* NEXRAD radar overlay (NIDs).
*/
Expand Down
139 changes: 139 additions & 0 deletions AerisSDK/AerisMap.framework/Versions/A/Headers/AWFTimelineView.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,55 +10,194 @@
@class AWFTimelineView;
@class AWFTimelineBarView, AWFTimelinePositionView;

/**
* The `AWFTimelineViewDelegate` protocol defines a set of optional methods that you can use to receive messages related to updates or changes
* to a timeline.
*/
@protocol AWFTimelineViewDelegate <NSObject>
@optional

/**
* Tells the delegate that the timeline was scrubbed to the given `date`.
*
* @param timelineView The timeline that was panned
* @param date The date that the timeline was panned to
*/
- (void)timelineView:(AWFTimelineView *)timelineView didPanToDate:(NSDate *)date;

/**
* Tells the delegate that the timeline was changed to a different date.
*
* @param timelineView The timeline that changed
* @param date The new date for the timeline's current position
*/
- (void)timelineView:(AWFTimelineView *)timelineView didSelectDate:(NSDate *)date;

@end


/**
* An `AWFTimelineView` is a view that provides a play/stop control, the current date and time and a scrubbable timeline slider bar for use with animatable weather
* data layers on an `AWFWeatherMap` instance.
*/
@interface AWFTimelineView : AWFStyledView

/**
* The current date and time being displayed. Setting this value will automatically update the day and time labels with the specified date.
*/
@property (nonatomic, strong) NSDate *currentTime;

/**
* The starting date and time for the animation timeline. This should correspond to the `timelineStartDate` property on `AWFWeatherMap`.
*/
@property (nonatomic, strong) NSDate *startDate;

/**
* The ending date and time for the animation timeline. This should correspond to the `timelineEndDate` property on `AWFWeatherMap`.
*/
@property (nonatomic, strong) NSDate *endDate;

/**
* The current animation position along the timeline, from `0.0` (beginning) to `1.0` (end).
*/
@property (readonly, nonatomic, assign) CGFloat position;

/**
* The timeline bar view.
*/
@property (readonly, nonatomic, strong) AWFTimelineBarView *barView;

/**
* The circular view indicating the timeline's current position.
*/
@property (readonly, nonatomic, strong) AWFTimelinePositionView *positionView;

/**
* The play button used to start and stop an animation. If an animation is currently playing, this button will update to a stop icon instead.
*/
@property (readonly, nonatomic, strong) UIButton *playButton;

/**
* Used to update the timeline position immediately to the current date and time.
*/
@property (readonly, nonatomic, strong) UIButton *nowButton;

/**
* Whether or not the animation and timeline are currently playing.
*/
@property (nonatomic, assign, getter = isPlaying) BOOL playing;


@property (nonatomic, weak) id<AWFTimelineViewDelegate> delegate;

/**
* Whether or not to display the loading indicator on the timeline view. This is used when data has to be requested from a remote source before an animation
* can begin playback.
*
* @param loading A Boolean indicating whether or not to display the loading indicator.
*/
- (void)showLoading:(BOOL)loading;

/**
* Updates the timeline loading progress position based on the download progress when requesting remote data required for the animation.
*
* @param progress The download progress of animation data, from `0.0` (none) to `1.0` (complete).
* @param animated A Boolean indicating whether or not the update should be animated.
*/
- (void)setProgress:(CGFloat)progress animated:(BOOL)animated;

/**
* Updates the timeline's position indicator view to the current date and time along the timeline.
*/
- (void)updatePositionForCurrentTime;

@end



/**
* An `AWFTimelineBarView` object is used in an `AWFTimelineView` instance to represent the timeline bar and full date/time range of the animation.
*/
@interface AWFTimelineBarView : UIView

/**
* The current data loading progress for an animation, from `0.0` to `1.0`. Updating this value will adjust the width of the bar filled using the `barFillColor` color
* and is used to represent what percentage of the data required for an animation has loaded, if required.
*/
@property (nonatomic, assign) CGFloat progress;

/**
* Indicates the position along the timeline, from `0.0` (beginning) to `1.0` (ending), where the date and time range changes to be in the future. This position
* be just to the right of the current date and time. If the timeline range does not include the current date and time, then this value will not be used.
*/
@property (nonatomic, assign) CGFloat futurePosition;

/**
* The fill color used to indicate the portion of the timeline that has been loaded based on the `progress` value.
*/
@property (nonatomic, strong) UIColor *barFillColor;

/**
* The fill color used to indiciate the time range in the future. The timeline bar will be filled with this color from the position along the timeline bar indicated
* by `futurePosition` and extend to the right bounds of the bar.
*/
@property (nonatomic, strong) UIColor *futureBarFillColor;

/**
* The stroke color to apply around the timeline bar.
*/
@property (nonatomic, strong) UIColor *barStrokeColor;

@end



/**
* An `AWFTimelinePositionView` object is used in an `AWFTimelineView` instance to represent an animation's current position along a timeline.
*/
@interface AWFTimelinePositionView : UIView

/**
* The primary text label displayed above the indicator. This is typically used for displaying the current time at a give position along the timeline.
*/
@property (readonly, nonatomic, strong) UILabel *textLabel;

/**
* The secondary text label displayed below the indicator. This is typically used for displaying the current day and date at a given position along the timeline.
*/
@property (readonly, nonatomic, strong) UILabel *detailTextLabel;

/**
* The corner radius for the indicator.
*/
@property (nonatomic, assign) CGFloat radius;

/**
* The fill color for the indicator.
*/
@property (nonatomic, strong) UIColor *fillColor;

/**
* The stroke color for the indicator.
*/
@property (nonatomic, strong) UIColor *strokeColor;

/**
* The stroke width for the indicator.
*/
@property (nonatomic, assign) CGFloat strokeWidth;

/**
* A Boolean indicating whether or not the indicator should appear in a pressed state. When in a pressed state, the indicator increases in scale.
*/
@property (nonatomic, assign) BOOL pressed;

/**
* Whether or not to update the indicator to the loading state. When in a loading state, the indiciator is scaled up to reveal an animated loading indicator
* and the text labels are hidden until the control is updated back to its default state.
*
* @param loading A Boolean indicating whether the indicator should appear in a loading state
*/
- (void)showLoading:(BOOL)loading;

@end
17 changes: 10 additions & 7 deletions AerisSDK/AerisMap.framework/Versions/A/Headers/AWFWeatherMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ typedef NS_ENUM (NSUInteger, AWFWeatherMapType) {
*/
@property (readonly, nonatomic) NSDate *timelineCurrentTime;

/**
* Returns an array of layer types currently active on the map.
*/
@property (readonly, nonatomic) NSArray *activeLayerTypes;

/**
* Returns an array of codes corresponding to the active layer types currently active on the map.
*/
@property (readonly, nonatomic) NSArray *activeLayerTypeCodes;

/**
* Forecast model type to be used for all active future data layers (when supported).
*/
Expand Down Expand Up @@ -152,13 +162,6 @@ typedef NS_ENUM (NSUInteger, AWFWeatherMapType) {
*/
- (instancetype)initWithMapView:(id)mapView config:(AWFWeatherMapConfig *)mapConfig;

/**
* Returns an array of layer types currently active on the map.
*
* @return The array of active layer types.
*/
- (NSArray *)activeLayerTypes;

//-----------------------------------------------------------------------------
// @name Managing Overlay Types
//-----------------------------------------------------------------------------
Expand Down
Binary file modified AerisSDK/AerisMapboxMap.framework/Versions/A/AerisMapboxMap
Binary file not shown.
Binary file modified AerisSDK/AerisUI.framework/Versions/A/AerisUI
Binary file not shown.
23 changes: 23 additions & 0 deletions AerisSDK/AerisUI.framework/Versions/A/Headers/AWFCalloutView.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,29 @@ extern NSTimeInterval kAWFCalloutViewRepositionDelayForUIScrollView;
// your own touches to any accessory views, since CALayer doesn't relay touch events.
- (void)presentCalloutFromRect:(CGRect)rect inLayer:(CALayer *)layer constrainedToLayer:(CALayer *)constrainedLayer animated:(BOOL)animated;

/**
* Updates the callout position by providing a new target rect and view.
*
* @param rect The rect to move the callout to
* @param view The view in which the callout will appear
* @param constrainedView The view in which the callout should be constrained to
*/
- (void)moveCalloutToRect:(CGRect)rect inView:(UIView *)view constrainedToView:(UIView *)constrainedView;

/**
* Updates the callout position by providing a new target rect and layer.
*
* @param rect The rect to move the callout to
* @param layer The layer in which the callout will appear
* @param constrainedLayer The layer in which the callout will be constrained to
*/
- (void)moveCalloutToRect:(CGRect)rect inLayer:(CALayer *)layer constrainedToLayer:(CALayer *)constrainedLayer;

/**
* Dismisses the callout.
*
* @param animated A Boolean indicating if the dismissal should be animated using a fade out effect.
*/
- (void)dismissCalloutAnimated:(BOOL)animated;

// For subclassers. You can override this method to provide your own custom animation for presenting/dismissing the callout.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ typedef NS_ENUM(NSInteger, AWFGraphAxisOrientation) {
* Redraws the axis.
*/
- (void)renderAxis;
- (void)updateLayout;

/**
* Updates the axis for the specified zoom scale.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ typedef NS_ENUM(NSInteger, AWFGraphRendererType) {
* Updates all series items managed by this renderer.
*/
- (void)update;
- (void)reset;

/**
* Updates all series items managed by this renderer for the specified zoom scale.
Expand Down
Loading

0 comments on commit 6e5eff9

Please sign in to comment.