- release version 1.1.0

suale-dev · suale-dev · commit 743a751fc604 · 2019-01-15T17:03:12.000+07:00
diff --git a/map4dsdk.podspec b/map4dsdk.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name              = 'map4dsdk'
-    s.version           = '1.0.0'
+    s.version           = '1.1.0'
     s.summary           = 'Map4D SDK'
     s.homepage          = 'http://map4d.vn'
 
diff --git a/sdk/map4dsdk.framework/Assets.car b/sdk/map4dsdk.framework/Assets.car
diff --git a/sdk/map4dsdk.framework/Headers/MFCameraPosition.h b/sdk/map4dsdk.framework/Headers/MFCameraPosition.h
@@ -10,20 +10,20 @@
 #import <CoreLocation/CoreLocation.h>
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-@class MFMapView;
+
 @interface MFCameraPosition: NSObject
 
-  - (instancetype) init: (MFMapView*) mapView;
-  - (id)initWithTarget:(CLLocationCoordinate2D) target zoom: (float) zoom;
-  - (id)initWithTarget:(CLLocationCoordinate2D) target zoom: (float) zoom duration: (long) duration;
-  - (id)initWithTarget:(CLLocationCoordinate2D) target zoom: (float) zoom tilt :(float) tilt ;
-  - (id)initWithTarget:(CLLocationCoordinate2D) target zoom: (float) zoom bearing: (float) bearing;
-  - (id)initWithTarget:(CLLocationCoordinate2D) target zoom: (float) zoom tilt :(float) tilt bearing: (float) bearing;
-  @property(nonatomic, assign, getter = target) CLLocationCoordinate2D target;
-  @property(nonatomic, assign, getter = zoom) float zoom;
-  @property(nonatomic, assign, getter = bearing) float bearing;
-  @property(nonatomic, assign, getter = tilt) float tilt;
-  @property(nonatomic, assign, getter = duration) long duration;
+  - (id)initWithTarget:(CLLocationCoordinate2D) target zoom: (double) zoom;
+  - (id)initWithTarget:(CLLocationCoordinate2D) target zoom: (double) zoom duration: (long) duration;
+  - (id)initWithTarget:(CLLocationCoordinate2D) target zoom: (double) zoom tilt :(double) tilt ;
+  - (id)initWithTarget:(CLLocationCoordinate2D) target zoom: (double) zoom bearing: (float) bearing;
+  - (id)initWithTarget:(CLLocationCoordinate2D) target zoom: (double) zoom tilt :(double) tilt bearing: (float) bearing;
+
+  @property(nonatomic) CLLocationCoordinate2D target;
+  @property(nonatomic) double zoom;
+  @property(nonatomic) float bearing;
+  @property(nonatomic) double tilt;
+  @property(nonatomic) long duration;
 
 @end
 
diff --git a/sdk/map4dsdk.framework/Headers/MFCircle.h b/sdk/map4dsdk.framework/Headers/MFCircle.h
@@ -15,10 +15,16 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, assign) CGFloat fillOpacity;
 /** The fill color. Defaults to blueColor. */
 @property(nonatomic, strong) UIColor* _Nullable fillColor;
+/** Position on Earth of circle center. */
+@property(nonatomic, assign) CLLocationCoordinate2D position;
+/** Radius of the circle in meters; must be positive. */
+@property(nonatomic, assign) CLLocationDistance radius;
 
-- (instancetype _Nonnull ) init: (CLLocationCoordinate2D) center radius: (CGFloat) radius;
+- (instancetype _Nonnull ) init NS_UNAVAILABLE;
 
-- (instancetype _Nonnull ) init: (CLLocationCoordinate2D) center radius: (CGFloat) radius fillColor: (UIColor*) fillColor fillOpacity: (CGFloat) fillOpacity;
+- (instancetype _Nonnull ) init: (CLLocationCoordinate2D) position radius: (CLLocationDistance) radius;
+
+- (instancetype _Nonnull ) init: (CLLocationCoordinate2D) position radius: (CLLocationDistance) radius fillColor: (UIColor*) fillColor fillOpacity: (CGFloat) fillOpacity;
 
 @end
 
diff --git a/sdk/map4dsdk.framework/Headers/MFMapView.h b/sdk/map4dsdk.framework/Headers/MFMapView.h
@@ -14,21 +14,30 @@
 @class MFProjection;
 @class MFCameraPosition;
 
-@interface MFMapView : UIView 
 
+typedef NS_ENUM(NSUInteger, MFSwitchMode) {
+  MFSwitchModeDefault,
+  MFSwitchModeAuto2DTo3D,
+  MFSwitchModeAuto3DTo2D,
+  MFSwitchModeAuto,
+  MFSwitchModeManual
+};
+
+@interface MFMapView : UIView 
 
   @property (nonatomic, strong, setter=setMapUrl:) NSString* _Nullable mapUrl;
-  @property (nonatomic, strong, setter=setMinZoom:) NSNumber* _Nullable minZoom;
-  @property (nonatomic, strong, setter=setMaxZoom:) NSNumber* _Nullable maxZoom;
 
   // Delegate
   @property(nonatomic, weak, nullable) IBOutlet id<MFMapViewDelegate> delegate;
 
   //Projection
   @property(nonatomic, readonly) MFProjection * _Nullable projection;
 
+  //SwitchMode
+  @property(nonatomic) MFSwitchMode switchMode;
+
   // Camera
-  @property(nonatomic, copy, setter=setCamera:) MFCameraPosition * _Nullable camera;
+  @property(nonatomic, copy) MFCameraPosition * _Nullable camera;
 
   - (instancetype _Nonnull )initWithFrame: (CGRect)frame;
   // Enable My Location
@@ -39,12 +48,22 @@
 
   - (void) enable3dMode: (bool) enabled;
 
+  // Get Mode
   - (bool) is3dMode;
 
+- (void) setMinZoom: (double) minZoom maxZoom: (double) maxZoom;
+
   /*
   * Clears all markup that has been added to the map, including markers, polylines and ground
   * overlays.  This will not clear the visible location dot or reset the current mapType.
   */
   - (void) clear;
 
+  /*
+   * Set time display for map
+   * Default curent time
+   * return  current time if date is NULL
+   */
+  - (void) setTime: (nullable NSDate*) date;
+
 @end
diff --git a/sdk/map4dsdk.framework/Headers/MFMapViewDelegate.h b/sdk/map4dsdk.framework/Headers/MFMapViewDelegate.h
@@ -15,12 +15,14 @@
 @class MFObject;
 @class MFPolyline;
 @class MFPolygon;
+@class MFCircle;
 
 @protocol MFMapViewDelegate<NSObject>
 @optional
-- (void)mapview: (MFMapView*)  mapView didTapMarker: (MFMarker*) marker;
+- (BOOL)mapview: (MFMapView*)  mapView didTapMarker: (MFMarker*) marker;
 - (void)mapview: (MFMapView*)  mapView didTapPolyline: (MFPolyline*) polyline;
 - (void)mapview: (MFMapView*)  mapView didTapPolygon: (MFPolygon*) polygon;
+- (void)mapview: (MFMapView*)  mapView didTapCircle: (MFCircle*) circle;
 - (void)mapView: (MFMapView*)  mapView willMove: (BOOL) gesture;
 - (void)mapView: (MFMapView*)  mapView movingCameraPosition: (MFCameraPosition*) position;
 - (void)mapView: (MFMapView*)  mapView didChangeCameraPosition:(MFCameraPosition*) position;
@@ -30,6 +32,9 @@
 - (void)mapView: (MFMapView*)  mapView didTapObject: (MFObject*) object;
 - (void)mapView: (MFMapView*)  mapView didTapMyLocation: (CLLocationCoordinate2D) location;
 
+- (BOOL)didTapMyLocationButtonForMapView: (MFMapView*) mapView;
+- (UIView *) mapView: (MFMapView *) mapView markerInfoWindow: (MFMarker *) marker;
+
 @end
 
 #endif /* MFMapViewDelegate_h */
diff --git a/sdk/map4dsdk.framework/Headers/MFMarker.h b/sdk/map4dsdk.framework/Headers/MFMarker.h
@@ -13,10 +13,35 @@
 @interface MFMarker: MFOverlay
   @property(nonatomic) CLLocationCoordinate2D position;
   @property(nonatomic) CGPoint groundAnchor;
-  @property(nonatomic, strong, setter=setIconView:) UIView *iconView;
+  @property(nonatomic, strong, setter=setIconView:) UIView * _Nullable iconView;
   @property(nonatomic) double elevation;
-  @property(nonatomic, strong) UIImage *icon;
+  @property(nonatomic, strong) UIImage * _Nullable icon;
   @property(nonatomic, assign, setter=setVisible:) bool isVisible;
+  
+  /**
+   * Title, a short description of the overlay. Some overlays, such as markers, will display the title
+   * on the map. The title is also the default accessibility text.
+   */
+  @property(nonatomic, strong, nullable) NSString *title;
+  
+  /** Snippet text, shown beneath the title in the info window when selected. */
+  @property(nonatomic, copy, nullable) NSString *snippet;
+  
+  /**
+   * The info window anchor specifies the point in the icon image at which to anchor the info window,
+   * which will be displayed directly above this point. This point is specified within the same space
+   * as groundAnchor.
+   */
+  @property(nonatomic, assign) CGPoint infoWindowAnchor;
+  
+  /**
+   * Higher |zIndex| value overlays will be drawn on top of lower |zIndex| value tile layers and
+   * overlays.  Equal values result in undefined draw ordering.  Markers are an exception that
+   * regardless of |zIndex|, they will always be drawn above tile layers and other non-marker
+   * overlays; they are effectively considered to be in a separate z-index group compared to other
+   * overlays.
+   */
+  @property(nonatomic, assign) float zIndex;
 @end
 
 #endif /* MFMarker_h */
diff --git a/sdk/map4dsdk.framework/Headers/MFMutablePath.h b/sdk/map4dsdk.framework/Headers/MFMutablePath.h
@@ -14,8 +14,10 @@
 
 @interface MFMutablePath: MFPath
 
+@property (readonly, getter=getCount) NSUInteger count;
  - (void)addCoordinate:(CLLocationCoordinate2D)coord;
  - (void)addLatitude:(CLLocationDegrees)latitude longitude:(CLLocationDegrees)longitude;
+ - (CLLocationCoordinate2D)objectAtIndex:(NSUInteger)idx;
  - (void)insertCoordinate:(CLLocationCoordinate2D)coord atIndex:(NSUInteger)index;
  - (void)replaceCoordinateAtIndex:(NSUInteger)index withCoordinate:(CLLocationCoordinate2D)coord;
  - (void)removeCoordinateAtIndex:(NSUInteger)index;
diff --git a/sdk/map4dsdk.framework/Headers/MFObject.h b/sdk/map4dsdk.framework/Headers/MFObject.h
@@ -10,12 +10,25 @@
 #import <CoreLocation/CoreLocation.h>
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-
+@class MFCameraPosition;
+@class MFModel;
 @interface MFObject: NSObject
-  @property(nonatomic, strong) NSString* Id;
-  @property(nonatomic, strong) NSString* name;
-  @property(nonatomic) CLLocationCoordinate2D position;
-  @property(nonatomic) float elevation;
+  @property(nonatomic, strong) NSString* _Nullable Id;
+  @property(nonatomic, strong) NSString* _Nullable name;
+  @property(nonatomic, strong, nullable) NSMutableArray* places;
+  @property(nonatomic) double  scale;
+  @property(nonatomic) double  bearing;
+  @property(nonatomic) CLLocationCoordinate2D coordinate;
+  @property(nonatomic) double elevation;
+  @property(nonatomic) double heightScale;
+  @property(nonatomic, strong) MFCameraPosition* _Nullable camera;
+  @property(nonatomic, strong) MFModel* _Nullable model;
+  @property(nonatomic, strong, nullable) NSMutableArray* types;
+  @property(nonatomic) bool isVerified;
+  @property(nonatomic) double minZoom;
+  @property(nonatomic) double maxZoom;
+  @property(nonatomic) NSDate* _Nullable startDate;
+  @property(nonatomic) NSDate* _Nullable endDate;
 @end
 
 #endif /* MFObject_h */
diff --git a/sdk/map4dsdk.framework/Headers/MFOverlay.h b/sdk/map4dsdk.framework/Headers/MFOverlay.h
@@ -14,7 +14,7 @@
 @class MFMapView;
 
 @interface MFOverlay: NSObject
-  @property(nonatomic, weak) MFMapView *map;
+  @property(nonatomic, weak) MFMapView * _Nullable map;
   @property(nonatomic, readonly, getter=getId) long Id;
   - (long) getId;
 @end
diff --git a/sdk/map4dsdk.framework/Headers/MFPolygon.h b/sdk/map4dsdk.framework/Headers/MFPolygon.h
@@ -14,13 +14,14 @@
 @class MFPath;
 
 @interface MFPolygon : MFOverlay
-  @property(nonatomic, strong, readonly, nullable) MFPath *path;
-  @property(nonatomic, strong, readonly, nullable) NSArray<MFPath *> *holes;
+  @property(nonatomic, strong, nullable) MFPath *path;
+  @property(nonatomic, strong, nullable) NSArray<MFPath *> *holes;
   @property(nonatomic, assign) bool visible;
   @property(nonatomic, assign) CGFloat fillOpacity;
   /** The fill color. Defaults to blueColor. */
   @property(nonatomic, strong) UIColor* _Nullable fillColor;
 
+  - (instancetype _Nonnull ) init NS_UNAVAILABLE;
   - (instancetype _Nonnull ) init: (MFPath* _Nullable) path;
 
   - (instancetype _Nonnull ) init: (MFPath* _Nullable) path holes: (NSArray<MFPath *>* _Nonnull) holes;
diff --git a/sdk/map4dsdk.framework/Headers/MFPolyline.h b/sdk/map4dsdk.framework/Headers/MFPolyline.h
@@ -13,15 +13,17 @@
 @class MFPath;
 
 @interface MFPolyline : MFOverlay
-  @property(nonatomic, strong, readonly, nullable) MFPath *path;
+  @property(nonatomic, strong, nullable) MFPath *path;
   @property(nonatomic, assign) bool visible;
   @property(nonatomic, assign) CGFloat width;
   @property(nonatomic, assign) CGFloat opacity;
   @property(nonatomic, strong) UIColor* _Nullable color;
   @property(nonatomic, assign, readonly) bool closedPolyline;
-- (instancetype _Nonnull ) init: (MFPath* _Nullable) path;
-- (instancetype _Nonnull ) init: (MFPath* _Nullable) path closedPolyline: (bool) closedPolyline;
-- (instancetype _Nonnull ) init: (MFPath* _Nullable) path color: (UIColor* _Nullable) color width: (CGFloat) width opacity: (CGFloat) opacity closedPolyline: (bool) closedPolyline;
+
+  - (instancetype _Nonnull ) init NS_UNAVAILABLE;
+  - (instancetype _Nonnull ) init: (MFPath* _Nullable) path;
+  - (instancetype _Nonnull ) init: (MFPath* _Nullable) path closedPolyline: (bool) closedPolyline;
+  - (instancetype _Nonnull ) init: (MFPath* _Nullable) path color: (UIColor* _Nullable) color width: (CGFloat) width opacity: (CGFloat) opacity closedPolyline: (bool) closedPolyline;
 
 @end
 
diff --git a/sdk/map4dsdk.framework/Headers/MFProjection.h b/sdk/map4dsdk.framework/Headers/MFProjection.h
@@ -13,9 +13,9 @@
 @class MFMapView;
 
 @interface MFProjection : NSObject
+- (instancetype _Nonnull ) init NS_UNAVAILABLE;
 
-  
-  - (instancetype) init: (MFMapView*) mapView;
+- (instancetype _Nonnull ) init: (MFMapView* _Nonnull ) mapView;
 
   /** Maps an Earth coordinate to a point coordinate in the map's view. */
   - (CGPoint) pointForCoordinate:(CLLocationCoordinate2D) coordinate;
diff --git a/sdk/map4dsdk.framework/Headers/map4dsdk.h b/sdk/map4dsdk.framework/Headers/map4dsdk.h
@@ -1,6 +1,6 @@
 //
 //  Map4D
-//  Version: 0.0.5
+//  Version: 1.1.0
 //  Created by Sua Le on 7/31/18.
 //  Copyright@2018 by IOT Link
 //
diff --git a/sdk/map4dsdk.framework/InforWindowsDefault.nib/objects-11.0+.nib b/sdk/map4dsdk.framework/InforWindowsDefault.nib/objects-11.0+.nib
diff --git a/sdk/map4dsdk.framework/InforWindowsDefault.nib/runtime.nib b/sdk/map4dsdk.framework/InforWindowsDefault.nib/runtime.nib
diff --git a/sdk/map4dsdk.framework/map4dsdk b/sdk/map4dsdk.framework/map4dsdk
diff --git a/sdk/map4dsdk.framework/shaders/infoWindow.fs b/sdk/map4dsdk.framework/shaders/infoWindow.fs
@@ -0,0 +1,10 @@
+#ifdef GL_ES
+precision mediump float;
+#endif
+
+uniform sampler2D u_texture;
+varying vec2 v_uv;
+
+void main() {
+    gl_FragColor = texture2D(u_texture, v_uv);
+}
diff --git a/sdk/map4dsdk.framework/shaders/infoWindow.vs b/sdk/map4dsdk.framework/shaders/infoWindow.vs
@@ -0,0 +1,11 @@
+attribute vec3 a_position;
+attribute vec2 a_uv;
+
+uniform mat4 u_mvpMatrix;
+
+varying vec2 v_uv;
+
+void main() {
+	gl_Position = u_mvpMatrix * vec4(a_position, 1.0);
+	v_uv = a_uv;
+}
