Permalink
Browse files

updated copyright info, simplified sample app

  • Loading branch information...
1 parent cbb91e7 commit a9314cc8f1f82ffaae0d2bfa28589d37b14227cb @incanus incanus committed Jan 23, 2013
Showing with 286 additions and 902 deletions.
  1. +4 −5 LICENSE.md
  2. +2 −2 README.md
  3. +15 −0 sample/Classes/SKExampleAppDelegate.h
  4. +25 −0 sample/Classes/SKExampleAppDelegate.m
  5. +15 −0 sample/Classes/SKExampleViewController.h
  6. +13 −10 sample/Classes/{Simple_KML_ExampleViewController.m → SKExampleViewController.m}
  7. +0 −13 sample/Classes/Simple_KML_ExampleAppDelegate.h
  8. +0 −25 sample/Classes/Simple_KML_ExampleAppDelegate.m
  9. +0 −13 sample/Classes/Simple_KML_ExampleViewController.h
  10. +0 −203 sample/MainWindow.xib
  11. +12 −20 sample/Simple KML Example.xcodeproj/project.pbxproj
  12. +0 −2 sample/Simple_KML_Example-Info.plist
  13. +0 −362 sample/Simple_KML_ExampleViewController.xib
  14. +6 −5 sample/main.m
  15. +4 −5 source/SimpleKML.h
  16. +4 −5 source/SimpleKML.m
  17. +4 −5 source/SimpleKMLBalloonStyle.h
  18. +4 −5 source/SimpleKMLBalloonStyle.m
  19. +4 −5 source/SimpleKMLColorStyle.h
  20. +4 −5 source/SimpleKMLColorStyle.m
  21. +4 −5 source/SimpleKMLContainer.h
  22. +4 −5 source/SimpleKMLContainer.m
  23. +4 −5 source/SimpleKMLDocument.h
  24. +4 −5 source/SimpleKMLDocument.m
  25. +4 −5 source/SimpleKMLFeature.h
  26. +4 −5 source/SimpleKMLFeature.m
  27. +4 −5 source/SimpleKMLFolder.h
  28. +4 −5 source/SimpleKMLFolder.m
  29. +4 −5 source/SimpleKMLGeometry.h
  30. +4 −5 source/SimpleKMLGeometry.m
  31. +4 −5 source/SimpleKMLGroundOverlay.h
  32. +4 −5 source/SimpleKMLGroundOverlay.m
  33. +4 −5 source/SimpleKMLIconStyle.h
  34. +4 −5 source/SimpleKMLIconStyle.m
  35. +4 −5 source/SimpleKMLLineString.h
  36. +4 −5 source/SimpleKMLLineString.m
  37. +4 −5 source/SimpleKMLLineStyle.h
  38. +4 −5 source/SimpleKMLLineStyle.m
  39. +4 −5 source/SimpleKMLLinearRing.h
  40. +4 −5 source/SimpleKMLLinearRing.m
  41. +5 −6 source/SimpleKMLMultiGeometry.h
  42. +5 −6 source/SimpleKMLMultiGeometry.m
  43. +4 −5 source/SimpleKMLObject.h
  44. +4 −5 source/SimpleKMLObject.m
  45. +4 −5 source/SimpleKMLOverlay.h
  46. +4 −5 source/SimpleKMLOverlay.m
  47. +4 −5 source/SimpleKMLPlacemark.h
  48. +4 −5 source/SimpleKMLPlacemark.m
  49. +4 −5 source/SimpleKMLPoint.h
  50. +4 −5 source/SimpleKMLPoint.m
  51. +4 −5 source/SimpleKMLPolyStyle.h
  52. +4 −5 source/SimpleKMLPolyStyle.m
  53. +4 −5 source/SimpleKMLPolygon.h
  54. +4 −5 source/SimpleKMLPolygon.m
  55. +4 −5 source/SimpleKMLStyle.h
  56. +4 −5 source/SimpleKMLStyle.m
  57. +4 −5 source/SimpleKMLStyleSelector.h
  58. +4 −5 source/SimpleKMLStyleSelector.m
  59. +4 −5 source/SimpleKMLSubStyle.h
  60. +4 −5 source/SimpleKMLSubStyle.m
  61. +4 −5 source/SimpleKML_UIImage.h
  62. +4 −5 source/SimpleKML_UIImage.m
View
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012, Code Sorcery Workshop, LLC and Development Seed, Inc.
+Copyright (c) 2010-2013, MapBox.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -11,10 +11,9 @@ modification, are permitted provided that the following conditions are met:
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- * Neither the names of Code Sorcery Workshop, LLC or Development Seed,
- Inc., nor the names of its contributors may be used to endorse or
- promote products derived from this software without specific prior
- written permission.
+ * Neither the name of MapBox, nor the names of its contributors may be
+ used to endorse or promote products derived from this software
+ without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
View
@@ -78,6 +78,6 @@ If you find a bug or want to otherwise contribute, please fork the project on Gi
## License
-Copyright (c) 2010-2012 Code Sorcery Workshop, LLC and Development Seed, Inc.
+Copyright (c) 2010-2013 MapBox.
-The Simple KML library should be accompanied by a LICENSE file. This file contains the license relevant to this distribution. If no license exists, please contact [Development Seed](http://developmentseed.org).
+The Simple KML library should be accompanied by a LICENSE file. This file contains the license relevant to this distribution. If no license exists, please contact [MapBox](http://mapbox.com).
@@ -0,0 +1,15 @@
+//
+// SKExampleAppDelegate.h
+// Simple KML Example
+//
+// Created by Justin R. Miller on 9/22/10.
+// Copyright MapBox 2010-2013. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface SKExampleAppDelegate : NSObject <UIApplicationDelegate>
+
+@property (nonatomic, strong) UIWindow *window;
+
+@end
@@ -0,0 +1,25 @@
+//
+// SKExampleAppDelegate.m
+// Simple KML Example
+//
+// Created by Justin R. Miller on 9/22/10.
+// Copyright MapBox 2010-2013. All rights reserved.
+//
+
+#import "SKExampleAppDelegate.h"
+#import "SKExampleViewController.h"
+
+@implementation SKExampleAppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+ self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+
+ self.window.rootViewController = [SKExampleViewController new];
+
+ [self.window makeKeyAndVisible];
+
+ return YES;
+}
+
+@end
@@ -0,0 +1,15 @@
+//
+// SKExampleViewController.h
+// Simple KML Example
+//
+// Created by Justin R. Miller on 9/22/10.
+// Copyright MapBox 2010-2013. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#import <MapKit/MapKit.h>
+
+@interface SKExampleViewController : UIViewController <MKMapViewDelegate>
+
+@end
@@ -1,14 +1,12 @@
//
-// Simple_KML_ExampleViewController.m
+// SKExampleViewController.m
// Simple KML Example
//
// Created by Justin R. Miller on 9/22/10.
-// Copyright Development Seed 2010-2012. All rights reserved.
+// Copyright MapBox 2010-2013. All rights reserved.
//
-#import "Simple_KML_ExampleViewController.h"
-
-#import <MapKit/MapKit.h>
+#import "SKExampleViewController.h"
#import "SimpleKML.h"
#import "SimpleKMLContainer.h"
@@ -19,15 +17,20 @@
#import "SimpleKMLPolygon.h"
#import "SimpleKMLLinearRing.h"
-@implementation Simple_KML_ExampleViewController
-{
- IBOutlet MKMapView *mapView;
-}
+@implementation SKExampleViewController
- (void)viewDidLoad
{
[super viewDidLoad];
-
+
+ // setup the map view
+ //
+ MKMapView *mapView = [[MKMapView alloc] initWithFrame:self.view.bounds];
+
+ mapView.delegate = self;
+
+ [self.view addSubview:mapView];
+
// grab the example KML file (which we know will have no errors, but you should ordinarily check)
//
SimpleKML *kml = [SimpleKML KMLWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"example" ofType:@"kml"] error:NULL];
@@ -1,13 +0,0 @@
-//
-// Simple_KML_ExampleAppDelegate.h
-// Simple KML Example
-//
-// Created by Justin R. Miller on 9/22/10.
-// Copyright Development Seed 2010-2012. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface Simple_KML_ExampleAppDelegate : NSObject <UIApplicationDelegate>
-
-@end
@@ -1,25 +0,0 @@
-//
-// Simple_KML_ExampleAppDelegate.m
-// Simple KML Example
-//
-// Created by Justin R. Miller on 9/22/10.
-// Copyright Development Seed 2010-2012. All rights reserved.
-//
-
-#import "Simple_KML_ExampleAppDelegate.h"
-#import "Simple_KML_ExampleViewController.h"
-
-@implementation Simple_KML_ExampleAppDelegate
-{
- IBOutlet Simple_KML_ExampleViewController *viewController;
-}
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
- [[[[UIApplication sharedApplication] windows] objectAtIndex:0] addSubview:viewController.view];
- [[[[UIApplication sharedApplication] windows] objectAtIndex:0] makeKeyAndVisible];
-
- return YES;
-}
-
-@end
@@ -1,13 +0,0 @@
-//
-// Simple_KML_ExampleViewController.h
-// Simple KML Example
-//
-// Created by Justin R. Miller on 9/22/10.
-// Copyright Development Seed 2010-2012. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface Simple_KML_ExampleViewController : UIViewController
-
-@end
View
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
- <data>
- <int key="IBDocument.SystemTarget">1296</int>
- <string key="IBDocument.SystemVersion">12A269</string>
- <string key="IBDocument.InterfaceBuilderVersion">2549</string>
- <string key="IBDocument.AppKitVersion">1187</string>
- <string key="IBDocument.HIToolboxVersion">624.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">1498</string>
- </object>
- <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>IBProxyObject</string>
- <string>IBUICustomObject</string>
- <string>IBUIViewController</string>
- <string>IBUIWindow</string>
- </object>
- <object class="NSArray" key="IBDocument.PluginDependencies">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBProxyObject" id="841351856">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="427554174">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUICustomObject" id="664661524">
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIViewController" id="943309135">
- <string key="IBUINibName">Simple_KML_ExampleViewController</string>
- <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
- <object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
- <int key="IBUIInterfaceOrientation">1</int>
- <int key="interfaceOrientation">1</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <bool key="IBUIHorizontal">NO</bool>
- </object>
- <object class="IBUIWindow" id="117978783">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrameSize">{320, 480}</string>
- <reference key="NSSuperview"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAxIDEAA</bytes>
- </object>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <bool key="IBUIResizesToFullScreen">YES</bool>
- </object>
- </object>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <object class="NSMutableArray" key="connectionRecords">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="841351856"/>
- <reference key="destination" ref="664661524"/>
- </object>
- <int key="connectionID">4</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">viewController</string>
- <reference key="source" ref="664661524"/>
- <reference key="destination" ref="943309135"/>
- </object>
- <int key="connectionID">11</int>
- </object>
- </object>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <object class="NSArray" key="orderedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <object class="NSArray" key="object" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="841351856"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3</int>
- <reference key="object" ref="664661524"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">Simple_KML_Example App Delegate</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="427554174"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">10</int>
- <reference key="object" ref="943309135"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">12</int>
- <reference key="object" ref="117978783"/>
- <reference key="parent" ref="0"/>
- </object>
- </object>
- </object>
- <object class="NSMutableDictionary" key="flattenedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.CustomClassName</string>
- <string>-1.IBPluginDependency</string>
- <string>-2.CustomClassName</string>
- <string>-2.IBPluginDependency</string>
- <string>10.CustomClassName</string>
- <string>10.IBPluginDependency</string>
- <string>12.IBPluginDependency</string>
- <string>3.CustomClassName</string>
- <string>3.IBPluginDependency</string>
- </object>
- <object class="NSArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>UIApplication</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>UIResponder</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>Simple_KML_ExampleViewController</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>Simple_KML_ExampleAppDelegate</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </object>
- </object>
- <object class="NSMutableDictionary" key="unlocalizedProperties">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <reference key="dict.values" ref="0"/>
- </object>
- <nil key="activeLocalization"/>
- <object class="NSMutableDictionary" key="localizations">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
- <reference key="dict.values" ref="0"/>
- </object>
- <nil key="sourceID"/>
- <int key="maxID">15</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">Simple_KML_ExampleAppDelegate</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/Simple_KML_ExampleAppDelegate.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">Simple_KML_ExampleViewController</string>
- <string key="superclassName">UIViewController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/Simple_KML_ExampleViewController.h</string>
- </object>
- </object>
- </object>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <real value="1296" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="3100" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <string key="IBCocoaTouchPluginVersion">1498</string>
- </data>
-</archive>
Oops, something went wrong.

0 comments on commit a9314cc

Please sign in to comment.