Skip to content

Commit 92049c5

Browse files
authored
Merge pull request #288 from merlos/weitieda-master
Add a custom scalebar
2 parents 72c1e36 + 800c289 commit 92049c5

File tree

47 files changed

+2100
-575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2100
-575
lines changed

OpenGpxTracker.xcodeproj/project.pbxproj

Lines changed: 66 additions & 0 deletions
Large diffs are not rendered by default.

OpenGpxTracker/Base.lproj/Main.storyboard

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2657" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3-
<device id="ipad12_9" orientation="portrait">
4-
<adaptation id="fullscreen"/>
5-
</device>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24127" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3+
<device id="retina6_12" orientation="portrait" appearance="light"/>
64
<dependencies>
75
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24063"/>
97
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
108
</dependencies>
119
<scenes>
1210
<!--View Controller-->
1311
<scene sceneID="tne-QT-ifu">
1412
<objects>
15-
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="OpenGpxTracker" customModuleProvider="target" sceneMemberID="viewController">
13+
<viewController storyboardIdentifier="RootViewController" id="BYZ-38-t0r" customClass="ViewController" customModule="OpenGpxTracker" customModuleProvider="target" sceneMemberID="viewController">
1614
<layoutGuides>
1715
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
1816
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
1917
</layoutGuides>
2018
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
21-
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
19+
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
2220
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2321
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2422
</view>

OpenGpxTracker/GPXMapView.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ class GPXMapView: MKMapView {
6464
/// initialized on MapViewDelegate
6565
var headingImageView: UIImageView?
6666

67+
/// A custom ScaleBar
68+
var scaleBar: GPXScaleBar?
69+
6770
/// Selected tile server.
6871
/// - SeeAlso: GPXTileServer
6972
var tileServer: GPXTileServer = .apple {

0 commit comments

Comments
 (0)