Fix gpx routing

osmandapp · Jul 31, 2018 · ab4a5a2 · ab4a5a2
1 parent aab6c51
commit ab4a5a2
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 5 deletions.
diff --git a/Sources/GPX/OAGPXDocumentPrimitives.h b/Sources/GPX/OAGPXDocumentPrimitives.h
@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
+#import "OALocationPoint.h"
 
 #include <OsmAndCore.h>
 #include <OsmAndCore/GpxDocument.h>
@@ -44,7 +45,7 @@ typedef enum
 
 @end
 
-@interface OALocationMark : NSObject
+@interface OALocationMark : NSObject<OALocationPoint>
 
 @property (nonatomic) CLLocationCoordinate2D position;
 @property (nonatomic) NSString *name;
@@ -150,7 +151,7 @@ typedef enum
 @property (nonatomic) double ageOfGpsData;
 @property (nonatomic) int dgpsStationId;
 
-- (void)fillWithWpt:(OAGpxWpt *)gpxWpt;
+- (void) fillWithWpt:(OAGpxWpt *)gpxWpt;
 
 @end
 

diff --git a/Sources/GPX/OAGPXDocumentPrimitives.mm b/Sources/GPX/OAGPXDocumentPrimitives.mm
@@ -9,6 +9,7 @@
 #import "OAGPXDocumentPrimitives.h"
 #import "OAGPXTrackAnalysis.h"
 #import "OAUtilities.h"
+#import "OAPointDescription.h"
 
 @implementation OAMetadata
 @end
@@ -84,14 +85,39 @@ - (NSUInteger) hash
     return result;
 }
 
+- (double) getLatitude
+{
+    return self.position.latitude;
+}
+
+- (double) getLongitude
+{
+    return self.position.longitude;
+}
+
+- (UIColor *) getColor
+{
+    return nil;
+}
+
+- (OAPointDescription *) getPointDescription
+{
+    return [[OAPointDescription alloc] initWithType:POINT_TYPE_WPT name:self.name];
+}
+
+- (BOOL) isVisible
+{
+    return YES;
+}
+
 @end
 
 @implementation OAExtraData
 @end
 
 @implementation OAGpxWpt
 
-- (instancetype)init
+- (instancetype) init
 {
     self = [super init];
     if (self)
@@ -110,7 +136,7 @@ - (instancetype)init
     return self;
 }
 
-- (void)fillWithWpt:(OAGpxWpt *)gpxWpt
+- (void) fillWithWpt:(OAGpxWpt *)gpxWpt
 {
     self.wpt = gpxWpt.wpt;
 
@@ -139,14 +165,19 @@ - (void)fillWithWpt:(OAGpxWpt *)gpxWpt
     self.extraData = gpxWpt.extraData;
 }
 
+- (UIColor *) getColor
+{
+    return [OAUtilities colorFromString:self.color];
+}
+
 @end
 
 @implementation OAGpxTrk
 @end
 
 @implementation OAGpxTrkPt
 
-- (instancetype)init
+- (instancetype) init
 {
     self = [super init];
     if (self)