Skip to content

Commit

Permalink
Merge pull request #6 from antonyraphel/development
Browse files Browse the repository at this point in the history
pod update changes
  • Loading branch information
antonyraphel committed Sep 13, 2018
2 parents 2b36361 + 202f0a4 commit cdfb123
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 25 deletions.
25 changes: 18 additions & 7 deletions ARCarMovement.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
363671A50CD8AE8C63A9E663 /* Pods_ARCarMovement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DE2196FB7F26D597796831E /* Pods_ARCarMovement.framework */; settings = {ATTRIBUTES = (Required, ); }; };
7BDA878D1EBB564C0048CD44 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BDA878C1EBB564C0048CD44 /* main.m */; };
7BDA87901EBB564C0048CD44 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BDA878F1EBB564C0048CD44 /* AppDelegate.m */; };
7BDA87931EBB564C0048CD44 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BDA87921EBB564C0048CD44 /* ViewController.m */; };
Expand All @@ -25,7 +26,7 @@
7BE0A89F1EBC41F100C08FA5 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BE0A89E1EBC41F100C08FA5 /* OpenGLES.framework */; };
7BE0A8A11EBC41FB00C08FA5 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BE0A8A01EBC41FB00C08FA5 /* SystemConfiguration.framework */; };
7BE0A8A31EBC58C000C08FA5 /* coordinates.json in Resources */ = {isa = PBXBuildFile; fileRef = 7BE0A8A21EBC58C000C08FA5 /* coordinates.json */; };
CEEABD31D6AFB7B9302BBEED /* Pods_ARCarMovement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DE2196FB7F26D597796831E /* Pods_ARCarMovement.framework */; };
DEEC0D34214A46DB0096B9A5 /* ARCarMovement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4897361F9F3A8800227B1D /* ARCarMovement.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -75,7 +76,7 @@
7BE0A8911EBC41A900C08FA5 /* CoreGraphics.framework in Frameworks */,
7BE0A88F1EBC419E00C08FA5 /* CoreData.framework in Frameworks */,
7BE0A88D1EBC419400C08FA5 /* Accelerate.framework in Frameworks */,
CEEABD31D6AFB7B9302BBEED /* Pods_ARCarMovement.framework in Frameworks */,
363671A50CD8AE8C63A9E663 /* Pods_ARCarMovement.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -193,7 +194,7 @@
7BDA87801EBB564C0048CD44 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0900;
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = "Antony Raphel";
TargetAttributes = {
7BDA87871EBB564C0048CD44 = {
Expand Down Expand Up @@ -296,6 +297,7 @@
files = (
7BDA87931EBB564C0048CD44 /* ViewController.m in Sources */,
7BDA87901EBB564C0048CD44 /* AppDelegate.m in Sources */,
DEEC0D34214A46DB0096B9A5 /* ARCarMovement.swift in Sources */,
7BDA878D1EBB564C0048CD44 /* main.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -335,13 +337,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand All @@ -368,7 +372,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -388,13 +392,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand All @@ -415,9 +421,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -426,12 +433,14 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5680AFD25D6849914F2AE547 /* Pods-ARCarMovement.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = ARCarMovement/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.antonyraphel.ARCarMovement;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -445,12 +454,14 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 85BE9E362D18E261502D6674 /* Pods-ARCarMovement.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = ARCarMovement/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.antonyraphel.ARCarMovement;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>ARCarMovement.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
</dict>
Expand Down
Binary file not shown.
14 changes: 7 additions & 7 deletions ARCarMovement/ARCarMovement/ARCarMovement.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// ARCarMovement.swift
// ARCarMovement
//
// Created by Mac05 on 24/10/17.
// Created by Antony Raphel on 24/10/17.
// Copyright © 2017 Antony Raphel. All rights reserved.
//

Expand All @@ -28,32 +28,32 @@ extension FloatingPoint {
func ARCarMovementMoved(_ Marker: GMSMarker)
}

public class ARCarMovement: NSObject {

@objcMembers public class ARCarMovement: NSObject {
// MARK: Public properties
public weak var delegate: ARCarMovementDelegate?
public var duration: Float = 2.0

public func ARCarMovement(marker: GMSMarker, oldCoordinate: CLLocationCoordinate2D, newCoordinate:CLLocationCoordinate2D, mapView: GMSMapView, bearing: Float) {

//calculate the bearing value from old and new coordinates
//
let calBearing: Float = getHeadingForDirection(fromCoordinate: oldCoordinate, toCoordinate: newCoordinate)
marker.groundAnchor = CGPoint(x: CGFloat(0.5), y: CGFloat(0.5))
marker.rotation = CLLocationDegrees(calBearing); //found bearing value by calculation when marker add
marker.position = oldCoordinate; //this can be old position to make car movement to new position

//marker movement animation
CATransaction.begin()
CATransaction.setValue(duration, forKey: kCATransactionAnimationDuration)
CATransaction.setCompletionBlock({() -> Void in
marker.rotation = (Int(bearing) != 0) ? CLLocationDegrees(bearing) : CLLocationDegrees(calBearing)
})

// delegate method pass value
//
delegate?.ARCarMovementMoved(marker)

marker.position = newCoordinate; //this can be new position after car moved from old position to new position with animation
marker.map = mapView;
marker.rotation = CLLocationDegrees(calBearing);
Expand Down
2 changes: 1 addition & 1 deletion ARCarMovement/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// AppDelegate.h
// ARCarMovement
//
// Created by Mac05 on 04/05/17.
// Created by Antony Raphel on 04/05/17.
// Copyright © 2017 Antony Raphel. All rights reserved.
//

Expand Down
2 changes: 1 addition & 1 deletion ARCarMovement/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// AppDelegate.m
// ARCarMovement
//
// Created by Mac05 on 04/05/17.
// Created by Antony Raphel on 04/05/17.
// Copyright © 2017 Antony Raphel. All rights reserved.
//

Expand Down
2 changes: 1 addition & 1 deletion ARCarMovement/ViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// ViewController.h
// ARCarMovement
//
// Created by Mac05 on 04/05/17.
// Created by Antony Raphel on 04/05/17.
// Copyright © 2017 Antony Raphel. All rights reserved.
//

Expand Down
4 changes: 2 additions & 2 deletions ARCarMovement/main.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// main.m
// ARCarMovement
//
// Created by Active Mac05 on 04/05/17.
// Copyright © 2017 Active Mac05. All rights reserved.
// Created by Antony Raphel on 04/05/17.
// Copyright © 2017 Active Antony Raphel. All rights reserved.
//

#import <UIKit/UIKit.h>
Expand Down
10 changes: 5 additions & 5 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
PODS:
- GoogleMaps (2.6.0):
- GoogleMaps/Maps (= 2.6.0)
- GoogleMaps/Base (2.6.0)
- GoogleMaps/Maps (2.6.0):
- GoogleMaps (2.7.0):
- GoogleMaps/Maps (= 2.7.0)
- GoogleMaps/Base (2.7.0)
- GoogleMaps/Maps (2.7.0):
- GoogleMaps/Base

DEPENDENCIES:
- GoogleMaps

SPEC CHECKSUMS:
GoogleMaps: 42f91c68b7fa2f84d5c86597b18ceb99f5414c7f
GoogleMaps: f79af95cb24d869457b1f961c93d3ce8b2f3b848

PODFILE CHECKSUM: 69c3a2daf626d456d7bf4c6a967d6c2497f54e80

Expand Down

0 comments on commit cdfb123

Please sign in to comment.