尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Thomas Rasch
Commit 65b9cedbc0ad3ee0900335ef705eec8a78ed8ac5 2 parents 603d1a5f 8af3af6e

Merge branch 'develop' into release

Inline Side-by-side
Showing 3 changed files with 13 additions and 15 deletions
1 -The Route-Me library is copyright (c) 2008-2010, Route-Me Contributors 1 +The Route-Me library is copyright (c) 2008-2012, Route-Me Contributors
2 All rights reserved. 2 All rights reserved.
3 3
4 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 4 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -25,6 +25,11 @@ @@ -25,6 +25,11 @@
25 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 25 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26 // POSSIBILITY OF SUCH DAMAGE. 26 // POSSIBILITY OF SUCH DAMAGE.
27 27
  28 +//
  29 +// Please note the MapQuest Terms of Use for attribution and limitations before using this tile source:
  30 +// http://developer.mapquest.com/web/products/open/map#terms
  31 +//
  32 +
28 #import "RMAbstractWebMapSource.h" 33 #import "RMAbstractWebMapSource.h"
29 34
30 @interface RMMapQuestOpenAerialSource : RMAbstractWebMapSource 35 @interface RMMapQuestOpenAerialSource : RMAbstractWebMapSource
1 Route-Me: iOS map library (Alpstein fork) 1 Route-Me: iOS map library (Alpstein fork)
2 ----------------------------------------- 2 -----------------------------------------
3 3
4 -Route-Me is an open source map library that runs natively on iOS. It's designed  
5 -to look and feel much like the inbuilt iOS map library, but it's entirely open,  
6 -and works with any map source. 4 +Route-Me is an open source map library that runs natively on iOS. It's designed to look and feel much like the built-in iOS map library, but it's entirely open, and works with any map source.
7 5
8 -Currently, [OpenStreetMap][1], [OpenCycleMap][2], [OpenSeaMap][3], [MapQuest OSM][4], [MapQuest Open Aerial][5] and two offline,  
9 -database-backed formats (DBMap and [MBTiles][6]) are supported as map  
10 -sources. 6 +Currently, [OpenStreetMap][1], [OpenCycleMap][2], [OpenSeaMap][3], [MapQuest OSM][4], [MapQuest Open Aerial][5] and two offline, database-backed formats (DBMap and [MBTiles][6]) are supported as map sources.
11 7
12 -Please note that you are responsible for getting permission to use the map data,  
13 -and for ensuring your use adheres to the relevant terms of use. 8 +Please note that you are responsible for getting permission to use the map data, and for ensuring your use adheres to the relevant terms of use.
14 9
15 10
16 [1]: http://www.openstreetmap.org/index.html 11 [1]: http://www.openstreetmap.org/index.html
@@ -24,8 +19,7 @@ and for ensuring your use adheres to the relevant terms of use. @@ -24,8 +19,7 @@ and for ensuring your use adheres to the relevant terms of use.
24 Installing 19 Installing
25 ---------- 20 ----------
26 21
27 -As Route-Me is undergoing some significant changes, the recommended course of  
28 -action is to clone a copy of the repository: 22 +As Route-Me is undergoing some significant changes, the recommended course of action is to clone a copy of the repository:
29 23
30 git://github.com/Alpstein/route-me.git 24 git://github.com/Alpstein/route-me.git
31 25
@@ -48,8 +42,7 @@ See LicenseRouteMe.txt for license details. In any app that uses the Route-Me li @@ -48,8 +42,7 @@ See LicenseRouteMe.txt for license details. In any app that uses the Route-Me li
48 News, Support and Contributing 42 News, Support and Contributing
49 ------------------------------ 43 ------------------------------
50 44
51 -Join our [mailing list][list] for news and to communicate with project members  
52 -and other users: 45 +Join our [mailing list][list] for news and to communicate with project members and other users:
53 46
54 To report bugs and help fix them, please use the [issue tracker][tracker] 47 To report bugs and help fix them, please use the [issue tracker][tracker]
55 48
@@ -57,8 +50,8 @@ To report bugs and help fix them, please use the [issue tracker][tracker] @@ -57,8 +50,8 @@ To report bugs and help fix them, please use the [issue tracker][tracker]
57 [tracker]: https://github.com/Alpstein/route-me/issues 50 [tracker]: https://github.com/Alpstein/route-me/issues
58 51
59 52
60 -Changes in this fork (Alpstein/route-me)  
61 ------------------------------------------ 53 +Major changes in this fork (Alpstein/route-me)
  54 +----------------------------------------------
62 55
63 * RMMapView and RMMapContents have been merged into one file 56 * RMMapView and RMMapContents have been merged into one file
64 57