Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

better image handling

  • Loading branch information...
commit fa21dca7220db3f01deaa9a79fa9040727daac65 1 parent 5b1a021
David Chiles authored
BIN  .DS_Store
Binary file not shown
40 OSM POI Editor.xcodeproj/project.pbxproj
@@ -46,7 +46,6 @@
46 46 63396ED514F5BFD3002BA2C5 /* hospital@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EBF14F5BFD3002BA2C5 /* hospital@2x.png */; };
47 47 63396ED614F5BFD3002BA2C5 /* parking@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EC014F5BFD3002BA2C5 /* parking@2x.png */; };
48 48 63396ED714F5BFD3002BA2C5 /* police@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EC114F5BFD3002BA2C5 /* police@2x.png */; };
49   - 63396ED814F5BFD3002BA2C5 /* restaurant@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EC214F5BFD3002BA2C5 /* restaurant@2x.png */; };
50 49 63396ED914F5BFD3002BA2C5 /* subway_entrance@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EC314F5BFD3002BA2C5 /* subway_entrance@2x.png */; };
51 50 63396EDA14F5BFD3002BA2C5 /* taxi@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EC414F5BFD3002BA2C5 /* taxi@2x.png */; };
52 51 63396EDB14F5BFD3002BA2C5 /* train@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EC514F5BFD3002BA2C5 /* train@2x.png */; };
@@ -68,7 +67,6 @@
68 67 63396F0214F5BFE7002BA2C5 /* hospital.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EEC14F5BFE6002BA2C5 /* hospital.png */; };
69 68 63396F0314F5BFE7002BA2C5 /* parking.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EED14F5BFE6002BA2C5 /* parking.png */; };
70 69 63396F0414F5BFE7002BA2C5 /* police.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EEE14F5BFE6002BA2C5 /* police.png */; };
71   - 63396F0514F5BFE7002BA2C5 /* restaurant.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EEF14F5BFE6002BA2C5 /* restaurant.png */; };
72 70 63396F0614F5BFE7002BA2C5 /* subway_entrance.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EF014F5BFE6002BA2C5 /* subway_entrance.png */; };
73 71 63396F0714F5BFE7002BA2C5 /* taxi.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EF114F5BFE6002BA2C5 /* taxi.png */; };
74 72 63396F0814F5BFE7002BA2C5 /* train.png in Resources */ = {isa = PBXBuildFile; fileRef = 63396EF214F5BFE6002BA2C5 /* train.png */; };
@@ -93,6 +91,14 @@
93 91 6383949714EC7DAC00C74A57 /* GTMHTTPFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 6383949214EC7DAC00C74A57 /* GTMHTTPFetcher.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
94 92 6383949814EC7DAC00C74A57 /* GTMOAuthViewTouch.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6383949314EC7DAC00C74A57 /* GTMOAuthViewTouch.xib */; };
95 93 6383949A14EC85C100C74A57 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6383949914EC85C100C74A57 /* Security.framework */; };
  94 + 63A2DB3D152257FA000C095D /* userLocation.png in Resources */ = {isa = PBXBuildFile; fileRef = 63A2DB3B152257FA000C095D /* userLocation.png */; };
  95 + 63A2DB3E152257FA000C095D /* userLocation@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63A2DB3C152257FA000C095D /* userLocation@2x.png */; };
  96 + 63A2DB4115225DCB000C095D /* newNodeMarker.png in Resources */ = {isa = PBXBuildFile; fileRef = 63A2DB3F15225DCB000C095D /* newNodeMarker.png */; };
  97 + 63A2DB4215225DCB000C095D /* newNodeMarker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63A2DB4015225DCB000C095D /* newNodeMarker@2x.png */; };
  98 + 63A2DB4515226CF6000C095D /* gear.png in Resources */ = {isa = PBXBuildFile; fileRef = 63A2DB4315226CF6000C095D /* gear.png */; };
  99 + 63A2DB4615226CF6000C095D /* gear@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63A2DB4415226CF6000C095D /* gear@2x.png */; };
  100 + 63A2DB4815228177000C095D /* restaurant@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 63A2DB4715228177000C095D /* restaurant@2x.png */; };
  101 + 63A2DB4A15228198000C095D /* restaurant.png in Resources */ = {isa = PBXBuildFile; fileRef = 63A2DB4915228198000C095D /* restaurant.png */; };
96 102 63CB49D314E9C5A0008C4551 /* OPETextEdit.m in Sources */ = {isa = PBXBuildFile; fileRef = 63CB49D114E9C5A0008C4551 /* OPETextEdit.m */; };
97 103 63CB49D414E9C5A0008C4551 /* OPETextEdit.xib in Resources */ = {isa = PBXBuildFile; fileRef = 63CB49D214E9C5A0008C4551 /* OPETextEdit.xib */; };
98 104 63CB49DD14E9DE7B008C4551 /* OPECategoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63CB49DB14E9DE7B008C4551 /* OPECategoryViewController.m */; };
@@ -218,7 +224,6 @@
218 224 63396EBF14F5BFD3002BA2C5 /* hospital@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "hospital@2x.png"; sourceTree = "<group>"; };
219 225 63396EC014F5BFD3002BA2C5 /* parking@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "parking@2x.png"; sourceTree = "<group>"; };
220 226 63396EC114F5BFD3002BA2C5 /* police@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "police@2x.png"; sourceTree = "<group>"; };
221   - 63396EC214F5BFD3002BA2C5 /* restaurant@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "restaurant@2x.png"; sourceTree = "<group>"; };
222 227 63396EC314F5BFD3002BA2C5 /* subway_entrance@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "subway_entrance@2x.png"; sourceTree = "<group>"; };
223 228 63396EC414F5BFD3002BA2C5 /* taxi@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "taxi@2x.png"; sourceTree = "<group>"; };
224 229 63396EC514F5BFD3002BA2C5 /* train@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "train@2x.png"; sourceTree = "<group>"; };
@@ -240,7 +245,6 @@
240 245 63396EEC14F5BFE6002BA2C5 /* hospital.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = hospital.png; sourceTree = "<group>"; };
241 246 63396EED14F5BFE6002BA2C5 /* parking.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = parking.png; sourceTree = "<group>"; };
242 247 63396EEE14F5BFE6002BA2C5 /* police.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = police.png; sourceTree = "<group>"; };
243   - 63396EEF14F5BFE6002BA2C5 /* restaurant.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = restaurant.png; sourceTree = "<group>"; };
244 248 63396EF014F5BFE6002BA2C5 /* subway_entrance.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = subway_entrance.png; sourceTree = "<group>"; };
245 249 63396EF114F5BFE6002BA2C5 /* taxi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = taxi.png; sourceTree = "<group>"; };
246 250 63396EF214F5BFE6002BA2C5 /* train.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = train.png; sourceTree = "<group>"; };
@@ -271,6 +275,14 @@
271 275 6383949214EC7DAC00C74A57 /* GTMHTTPFetcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMHTTPFetcher.m; sourceTree = "<group>"; };
272 276 6383949314EC7DAC00C74A57 /* GTMOAuthViewTouch.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GTMOAuthViewTouch.xib; sourceTree = "<group>"; };
273 277 6383949914EC85C100C74A57 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
  278 + 63A2DB3B152257FA000C095D /* userLocation.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = userLocation.png; sourceTree = "<group>"; };
  279 + 63A2DB3C152257FA000C095D /* userLocation@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "userLocation@2x.png"; sourceTree = "<group>"; };
  280 + 63A2DB3F15225DCB000C095D /* newNodeMarker.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = newNodeMarker.png; sourceTree = "<group>"; };
  281 + 63A2DB4015225DCB000C095D /* newNodeMarker@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "newNodeMarker@2x.png"; sourceTree = "<group>"; };
  282 + 63A2DB4315226CF6000C095D /* gear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gear.png; sourceTree = "<group>"; };
  283 + 63A2DB4415226CF6000C095D /* gear@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "gear@2x.png"; sourceTree = "<group>"; };
  284 + 63A2DB4715228177000C095D /* restaurant@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "restaurant@2x.png"; sourceTree = "<group>"; };
  285 + 63A2DB4915228198000C095D /* restaurant.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = restaurant.png; sourceTree = "<group>"; };
274 286 63CB49D014E9C5A0008C4551 /* OPETextEdit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPETextEdit.h; sourceTree = "<group>"; };
275 287 63CB49D114E9C5A0008C4551 /* OPETextEdit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPETextEdit.m; sourceTree = "<group>"; };
276 288 63CB49D214E9C5A0008C4551 /* OPETextEdit.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OPETextEdit.xib; sourceTree = "<group>"; };
@@ -423,11 +435,12 @@
423 435 63396EEC14F5BFE6002BA2C5 /* hospital.png */,
424 436 63396EED14F5BFE6002BA2C5 /* parking.png */,
425 437 63396EEE14F5BFE6002BA2C5 /* police.png */,
426   - 63396EEF14F5BFE6002BA2C5 /* restaurant.png */,
427 438 63396EF014F5BFE6002BA2C5 /* subway_entrance.png */,
428 439 63396EF114F5BFE6002BA2C5 /* taxi.png */,
429 440 63396EF214F5BFE6002BA2C5 /* train.png */,
430 441 63396EB014F5BFD2002BA2C5 /* alcohol@2x.png */,
  442 + 63A2DB4915228198000C095D /* restaurant.png */,
  443 + 63A2DB4715228177000C095D /* restaurant@2x.png */,
431 444 63396EB114F5BFD2002BA2C5 /* bicycle@2x.png */,
432 445 63396EB214F5BFD2002BA2C5 /* building@2x.png */,
433 446 63396EB314F5BFD3002BA2C5 /* bus_stop@2x.png */,
@@ -445,7 +458,6 @@
445 458 63396EBF14F5BFD3002BA2C5 /* hospital@2x.png */,
446 459 63396EC014F5BFD3002BA2C5 /* parking@2x.png */,
447 460 63396EC114F5BFD3002BA2C5 /* police@2x.png */,
448   - 63396EC214F5BFD3002BA2C5 /* restaurant@2x.png */,
449 461 63396EC314F5BFD3002BA2C5 /* subway_entrance@2x.png */,
450 462 63396EC414F5BFD3002BA2C5 /* taxi@2x.png */,
451 463 63396EC514F5BFD3002BA2C5 /* train@2x.png */,
@@ -580,6 +592,12 @@
580 592 63F9CCA414F32B2E00308DE1 /* iphone_delete_button.png */,
581 593 63E5B13514EDAF2E007E9BAF /* location.png */,
582 594 635E02BE151BE73B00B6BBCE /* location@2x.png */,
  595 + 63A2DB3F15225DCB000C095D /* newNodeMarker.png */,
  596 + 63A2DB4015225DCB000C095D /* newNodeMarker@2x.png */,
  597 + 63A2DB4315226CF6000C095D /* gear.png */,
  598 + 63A2DB4415226CF6000C095D /* gear@2x.png */,
  599 + 63A2DB3B152257FA000C095D /* userLocation.png */,
  600 + 63A2DB3C152257FA000C095D /* userLocation@2x.png */,
583 601 6345E57B14E2FD1200F55486 /* icon.png */,
584 602 63E279EF14E2073C009D02BD /* Blue_Marker.png */,
585 603 637A89FD14E1C340003F656F /* SPOI.bundle */,
@@ -870,7 +888,6 @@
870 888 63396ED514F5BFD3002BA2C5 /* hospital@2x.png in Resources */,
871 889 63396ED614F5BFD3002BA2C5 /* parking@2x.png in Resources */,
872 890 63396ED714F5BFD3002BA2C5 /* police@2x.png in Resources */,
873   - 63396ED814F5BFD3002BA2C5 /* restaurant@2x.png in Resources */,
874 891 63396ED914F5BFD3002BA2C5 /* subway_entrance@2x.png in Resources */,
875 892 63396EDA14F5BFD3002BA2C5 /* taxi@2x.png in Resources */,
876 893 63396EDB14F5BFD3002BA2C5 /* train@2x.png in Resources */,
@@ -892,7 +909,6 @@
892 909 63396F0214F5BFE7002BA2C5 /* hospital.png in Resources */,
893 910 63396F0314F5BFE7002BA2C5 /* parking.png in Resources */,
894 911 63396F0414F5BFE7002BA2C5 /* police.png in Resources */,
895   - 63396F0514F5BFE7002BA2C5 /* restaurant.png in Resources */,
896 912 63396F0614F5BFE7002BA2C5 /* subway_entrance.png in Resources */,
897 913 63396F0714F5BFE7002BA2C5 /* taxi.png in Resources */,
898 914 63396F0814F5BFE7002BA2C5 /* train.png in Resources */,
@@ -904,6 +920,14 @@
904 920 635E0296151BB94F00B6BBCE /* right@2x.png in Resources */,
905 921 635E02BF151BE73B00B6BBCE /* location@2x.png in Resources */,
906 922 632573B11520FFB200478B78 /* tileSource.plist in Resources */,
  923 + 63A2DB3D152257FA000C095D /* userLocation.png in Resources */,
  924 + 63A2DB3E152257FA000C095D /* userLocation@2x.png in Resources */,
  925 + 63A2DB4115225DCB000C095D /* newNodeMarker.png in Resources */,
  926 + 63A2DB4215225DCB000C095D /* newNodeMarker@2x.png in Resources */,
  927 + 63A2DB4515226CF6000C095D /* gear.png in Resources */,
  928 + 63A2DB4615226CF6000C095D /* gear@2x.png in Resources */,
  929 + 63A2DB4815228177000C095D /* restaurant@2x.png in Resources */,
  930 + 63A2DB4A15228198000C095D /* restaurant.png in Resources */,
907 931 );
908 932 runOnlyForDeploymentPostprocessing = 0;
909 933 };
BIN  OSM POI Editor.xcodeproj/project.xcworkspace/xcuserdata/David.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown
51 OSM POI Editor.xcodeproj/xcuserdata/David.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -9,11 +9,11 @@
9 9 continueAfterRunningActions = "No"
10 10 isPathRelative = "1"
11 11 filePath = "OSM POI Editor/OPEViewController.m"
12   - timestampString = "354492706.980219"
  12 + timestampString = "354576981.508291"
13 13 startingColumnNumber = "9223372036854775807"
14 14 endingColumnNumber = "9223372036854775807"
15   - startingLineNumber = "39"
16   - endingLineNumber = "39"
  15 + startingLineNumber = "41"
  16 + endingLineNumber = "41"
17 17 landmarkName = "-viewDidLoad"
18 18 landmarkType = "5">
19 19 </FileBreakpoint>
@@ -177,11 +177,11 @@
177 177 ignoreCount = "0"
178 178 continueAfterRunningActions = "No"
179 179 filePath = "OSM POI Editor/OPEViewController.m"
180   - timestampString = "354492706.980219"
  180 + timestampString = "354582822.054"
181 181 startingColumnNumber = "9223372036854775807"
182 182 endingColumnNumber = "9223372036854775807"
183   - startingLineNumber = "136"
184   - endingLineNumber = "136"
  183 + startingLineNumber = "142"
  184 + endingLineNumber = "142"
185 185 landmarkName = "-addMarkerAt:withNode:"
186 186 landmarkType = "5">
187 187 </FileBreakpoint>
@@ -211,6 +211,45 @@
211 211 landmarkName = "-setText:"
212 212 landmarkType = "5">
213 213 </FileBreakpoint>
  214 + <FileBreakpoint
  215 + shouldBeEnabled = "No"
  216 + ignoreCount = "0"
  217 + continueAfterRunningActions = "No"
  218 + filePath = "OSM POI Editor/OPEInfoViewController.m"
  219 + timestampString = "354576007.970996"
  220 + startingColumnNumber = "9223372036854775807"
  221 + endingColumnNumber = "9223372036854775807"
  222 + startingLineNumber = "347"
  223 + endingLineNumber = "347"
  224 + landmarkName = "-checkButtonStatus"
  225 + landmarkType = "5">
  226 + </FileBreakpoint>
  227 + <FileBreakpoint
  228 + shouldBeEnabled = "No"
  229 + ignoreCount = "0"
  230 + continueAfterRunningActions = "No"
  231 + filePath = "OSM POI Editor/OPENodeViewController.m"
  232 + timestampString = "354576164.559882"
  233 + startingColumnNumber = "9223372036854775807"
  234 + endingColumnNumber = "9223372036854775807"
  235 + startingLineNumber = "181"
  236 + endingLineNumber = "181"
  237 + landmarkName = "-tableView:didSelectRowAtIndexPath:"
  238 + landmarkType = "5">
  239 + </FileBreakpoint>
  240 + <FileBreakpoint
  241 + shouldBeEnabled = "No"
  242 + ignoreCount = "0"
  243 + continueAfterRunningActions = "No"
  244 + filePath = "OSM POI Editor/OPENodeViewController.m"
  245 + timestampString = "354576344.767086"
  246 + startingColumnNumber = "9223372036854775807"
  247 + endingColumnNumber = "9223372036854775807"
  248 + startingLineNumber = "203"
  249 + endingLineNumber = "203"
  250 + landmarkName = "-tableView:didSelectRowAtIndexPath:"
  251 + landmarkType = "5">
  252 + </FileBreakpoint>
214 253 </FileBreakpoints>
215 254 <ExceptionBreakpoints>
216 255 <ExceptionBreakpoint
49 OSM POI Editor/OPEInfoViewController.m
@@ -99,7 +99,8 @@ - (void)viewController:(GTMOAuthViewControllerTouch *)viewController
99 99 // Just to prove we're signed in, we'll attempt an authenticated fetch for the
100 100 // signed-in user
101 101 //[self doAnAuthenticatedAPIFetch];
102   - NSLog(@"succeeeeeeded");
  102 + [self.loginButton setTitle:@"Logout of OSM" forState:UIControlStateNormal];
  103 + self.loginButton.tag = 1;
103 104 }
104 105
105 106 //[self updateUI];
@@ -143,8 +144,7 @@ - (void)signInToOSM {
143 144 [auth setCallback:@"http://www.google.com/OAuthCallback"];
144 145
145 146 // Display the autentication view
146   - GTMOAuthViewControllerTouch *viewController;
147   - viewController = [[GTMOAuthViewControllerTouch alloc] initWithScope:scope
  147 + GTMOAuthViewControllerTouch * viewController = [[GTMOAuthViewControllerTouch alloc] initWithScope:scope
148 148 language:nil
149 149 requestTokenURL:requestURL
150 150 authorizeTokenURL:authorizeURL
@@ -154,7 +154,6 @@ - (void)signInToOSM {
154 154 delegate:self
155 155 finishedSelector:@selector(viewController:finishedWithAuth:error:)];
156 156
157   - textBox.text = [NSString stringWithFormat:@"User info: %@",auth.userData];
158 157 [[self navigationController] pushViewController:viewController
159 158 animated:YES];
160 159 }
@@ -162,6 +161,8 @@ - (void)signInToOSM {
162 161 - (void) signOutOfOSM
163 162 {
164 163 [GTMOAuthViewControllerTouch removeParamsFromKeychainForName:@"OSMPOIEditor"];
  164 + self.loginButton.tag = 0;
  165 + [self.loginButton setTitle:@"Login to OSM" forState:UIControlStateNormal];
165 166 }
166 167
167 168 - (void) setLoginButtons
@@ -244,7 +245,7 @@ -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NS
244 245 {
245 246 //cell = [tableView dequeueReusableCellWithIdentifier:buttonIdentifier];
246 247 if (cell == nil) {
247   - cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:tileIdentifier];
  248 + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:buttonIdentifier];
248 249 }
249 250 loginButton.frame = cell.contentView.bounds;
250 251 NSLog(@"bounds: %f",cell.contentView.bounds.size.width);
@@ -315,15 +316,49 @@ - (void)viewDidLoad
315 316 self.loginButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
316 317 [self.loginButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
317 318 self.loginButton.titleLabel.font = [UIFont boldSystemFontOfSize:17.0];
318   - [self.loginButton setTitle:@"Login to OSM" forState:UIControlStateNormal];
  319 +
  320 +
  321 + [self checkButtonStatus];
319 322
320 323 [self.loginButton addTarget:self action:@selector(osmButtonPressed:) forControlEvents:UIControlEventTouchUpInside];
321 324
322 325 }
323 326
324   --(void)osmButtonPressed:(id)sender
  327 +-(void)checkButtonStatus
325 328 {
  329 + GTMOAuthAuthentication *auth = [self osmAuth];
  330 + BOOL didAuth= NO;
  331 + BOOL canAuth= NO;
  332 + BOOL hasAuth= NO;
  333 + if (auth) {
  334 + didAuth = [GTMOAuthViewControllerTouch authorizeFromKeychainForName:@"OSMPOIEditor" authentication:auth];
  335 + canAuth = [auth canAuthorize];
  336 + hasAuth = [auth hasAccessToken];
  337 + }
326 338
  339 + if (didAuth && canAuth && hasAuth) {
  340 + NSLog(@"All three true");
  341 +
  342 + [self.loginButton setTitle:@"Logout of OSM" forState:UIControlStateNormal];
  343 + loginButton.tag = 1;
  344 + }
  345 + else
  346 + {
  347 + NSLog(@"did: %@ can: %@ has: %@",(didAuth ? @"YES" : @"NO"),(canAuth ? @"YES" : @"NO"),(hasAuth ? @"YES" : @"NO"));
  348 + [self.loginButton setTitle:@"Login to OSM" forState:UIControlStateNormal];
  349 + loginButton.tag = 0;
  350 + }
  351 +
  352 +}
  353 +
  354 +-(void)osmButtonPressed:(id)sender
  355 +{
  356 + if (loginButton.tag == 0) {
  357 + [self signInToOSM];
  358 + }
  359 + else {
  360 + [self signOutOfOSM];
  361 + }
327 362 }
328 363
329 364 - (void)viewDidAppear:(BOOL)animated
6 OSM POI Editor/OPENodeViewController.m
@@ -182,7 +182,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
182 182 {
183 183 if ([catAndType count]==2)
184 184 {
185   - OPETypeViewController * viewer = [[OPETypeViewController alloc] initWithNibName:@"OPETypeViewController" bundle:nil];
  185 + OPETypeViewController * viewer = [[OPETypeViewController alloc] initWithNibName:@"OPETypeViewController" bundle:[NSBundle mainBundle]];
186 186 viewer.title = @"Type";
187 187
188 188 viewer.category = [catAndType objectAtIndex:0];
@@ -192,7 +192,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
192 192 [self.navigationController pushViewController:viewer animated:YES];
193 193 }
194 194 else {
195   - OPECategoryViewController * viewer = [[OPECategoryViewController alloc] initWithNibName:@"OpeCategoryViewController" bundle:nil];
  195 + OPECategoryViewController * viewer = [[OPECategoryViewController alloc] initWithNibName:@"OPECategoryViewController" bundle:[NSBundle mainBundle]];
196 196 viewer.title = @"Category";
197 197
198 198 [self.navigationController pushViewController:viewer animated:YES];
@@ -202,7 +202,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
202 202 }
203 203 else
204 204 {
205   - OPECategoryViewController * viewer = [[OPECategoryViewController alloc] initWithNibName:@"OpeCategoryViewController" bundle:nil];
  205 + OPECategoryViewController * viewer = [[OPECategoryViewController alloc] initWithNibName:@"OPECategoryViewController" bundle:[NSBundle mainBundle]];
206 206 viewer.title = @"Category";
207 207
208 208 [self.navigationController pushViewController:viewer animated:YES];
3  OSM POI Editor/OPEViewController.h
@@ -24,7 +24,7 @@
24 24 @property (nonatomic,strong) CLLocationManager* locationManager;
25 25 @property (nonatomic,strong) OPETagInterpreter * interpreter;
26 26
27   -@property (nonatomic,strong) IBOutlet UIButton * infoButton;
  27 +@property (nonatomic,strong) IBOutlet UIBarButtonItem * infoButton;
28 28 @property (nonatomic,strong) IBOutlet UIBarButtonItem * location;
29 29 @property (nonatomic,strong) IBOutlet UIBarButtonItem * addOPEPoint;
30 30 @property (nonatomic,strong) RMMarker *openMarker;
@@ -33,6 +33,7 @@
33 33 @property (nonatomic,strong) UILabel * calloutLabel;
34 34 @property (nonatomic,strong) RMMarker * addedNode;
35 35 @property (nonatomic,strong) RMMarker * nodeInfo;
  36 +@property (nonatomic,strong) RMMarker * currentLocationMarker;
36 37 @property (nonatomic) int currentTile;
37 38
38 39
88 OSM POI Editor/OPEViewController.m
@@ -20,7 +20,7 @@ @implementation OPEViewController
20 20 @synthesize interpreter;
21 21 @synthesize infoButton,location, addOPEPoint;
22 22 @synthesize openMarker,theNewMarker, label, calloutLabel;
23   -@synthesize addedNode,nodeInfo;
  23 +@synthesize addedNode,nodeInfo,currentLocationMarker;
24 24 @synthesize currentTile;
25 25
26 26 - (void)didReceiveMemoryWarning
@@ -35,6 +35,8 @@ - (void)viewDidLoad
35 35 {
36 36 [super viewDidLoad];
37 37
  38 +
  39 + [self.navigationController setNavigationBarHidden:YES animated:NO];
38 40 //Check OAuth
39 41
40 42
@@ -47,7 +49,7 @@ - (void)viewDidLoad
47 49 interpreter = [[OPETagInterpreter alloc] init];
48 50 [interpreter readPlist];
49 51
50   - [self.navigationController setNavigationBarHidden:YES animated:YES];
  52 +
51 53
52 54 currentTile = 0;
53 55
@@ -58,6 +60,7 @@ - (void)viewDidLoad
58 60 locationManager.delegate = self;
59 61 locationManager.distanceFilter = kCLDistanceFilterNone;
60 62 locationManager.desiredAccuracy = kCLLocationAccuracyBest;
  63 +
61 64 [locationManager startUpdatingLocation];
62 65
63 66
@@ -103,31 +106,34 @@ - (void)viewDidLoad
103 106
104 107 - (UIImage*)imageWithBorderFromImage:(UIImage*)source //Draw box around centered image
105 108 {
106   - CGSize size = [source size];
107   - //size = CGSizeMake(size.width+6, size.width+6);
108   - double squareSize = 22;
109   - size = CGSizeMake(squareSize, squareSize);
110   - CGSize sourceSize = [source size];
111   - //NSLog(@"size: %f %f",sourceSize.height,sourceSize.width);
112   - UIGraphicsBeginImageContext(size);
  109 + CGSize imgSize = [source size];
113 110
114   - double x = squareSize-sourceSize.width;
115   - double y = squareSize-sourceSize.height;
  111 + //NSLog(@"Image Size: h-%f w-%f",size.height,size.width);
  112 + float rectSize;
  113 + if (imgSize.width > imgSize.height) {
  114 + rectSize = imgSize.width;
  115 + }
  116 + else {
  117 + rectSize = imgSize.height;
  118 + }
116 119
117   - CGRect rect = CGRectMake(x/2, y/2, sourceSize.width, sourceSize.height);
118   - CGContextRef context = UIGraphicsGetCurrentContext();
119   - [[UIColor whiteColor] setFill];
120   - CGRect wrect = CGRectMake(1, 1, size.width-2, size.height-2);
121   - CGContextFillRect(context, wrect);
122   - [source drawInRect:rect blendMode:kCGBlendModeNormal alpha:1.0];
  120 + UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, rectSize+2,rectSize+2)];
  121 + UIImageView * imageView = [[UIImageView alloc] initWithImage:source];
123 122
  123 + [view addSubview:imageView];
  124 + imageView.center = view.center; //Center the Image
124 125
125   - CGContextSetRGBStrokeColor(context, 0, 0, 0, 1.0);
  126 + [view.layer setBorderColor: [[UIColor blackColor] CGColor]];
  127 + [view.layer setBorderWidth: 1.0];
  128 + [view setBackgroundColor:[UIColor whiteColor]];
126 129
127   - CGContextStrokeRect(context, wrect);
128   - UIImage *testImg = UIGraphicsGetImageFromCurrentImageContext();
  130 + CGSize size = [view bounds].size;
  131 + UIGraphicsBeginImageContext(size);
  132 + [[view layer] renderInContext:UIGraphicsGetCurrentContext()];
  133 + UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
129 134 UIGraphicsEndImageContext();
130   - return testImg;
  135 +
  136 + return newImage;
131 137 }
132 138
133 139
@@ -135,7 +141,11 @@ -(RMMarker *) addMarkerAt:(CLLocationCoordinate2D) position withNode: (OPENode *
135 141 {
136 142 NSLog(@"start addMarkerAt %@",node.image);
137 143 UIImage *icon = [UIImage imageNamed:node.image]; //Get image from stored value in node
138   - icon = [self imageWithBorderFromImage:icon]; //center image inside box
  144 + //UIImage * icon = [UIImage imageNamed:@"restaurant"];
  145 + if (node.ident>0) {
  146 + icon = [self imageWithBorderFromImage:icon]; //center image inside box
  147 + }
  148 +
139 149 //RMMarker *newMarker = [[RMMarker alloc] initWithUIImage:icon anchorPoint:CGPointMake(0.5, 1.0)];
140 150 RMMarker *newMarker = [[RMMarker alloc] initWithUIImage:icon anchorPoint:CGPointMake(0.5, 0.5)];
141 151
@@ -161,15 +171,16 @@ -(void) tapOnMarker:(RMMarker *)marker onMap:(RMMapView *)map
161 171 [openMarker hideLabel];
162 172 OPENode * tempNode = (OPENode *)marker.data;
163 173
164   - if(tempNode.ident < 0)
  174 + if(tempNode.ident == -1)
165 175 {
166 176 ((OPENode *)marker.data).coordinate = [map.markerManager latitudeLongitudeForMarker:marker];
167 177 [self tapOnLabelForMarker:marker onMap:mapView onLayer:nil];
168 178 }
169 179 else if (marker.label) {
170 180 [marker showLabel];
  181 + openMarker = marker;
171 182 }
172   - else {
  183 + else if (tempNode.ident > 0){
173 184
174 185 //NSString * titulo = [((OPENode *)marker.data) getName];
175 186 NSString * titulo = [interpreter getName:tempNode];
@@ -228,8 +239,10 @@ -(void) tapOnMarker:(RMMarker *)marker onMap:(RMMapView *)map
228 239 [label bringSubviewToFront:buttongo];
229 240 [marker setDelegate:self];
230 241 [marker setLabel:label];
  242 +
  243 + openMarker = marker;
231 244 }
232   - openMarker = marker;
  245 +
233 246 }
234 247
235 248
@@ -356,6 +369,26 @@ - (CLLocationCoordinate2D) centerOfMap
356 369
357 370 }
358 371
  372 +#pragma - LocationManagerDelegate
  373 +
  374 +-(void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)error
  375 +{
  376 + NSLog(@"Denied Location: %@",error.userInfo);
  377 +}
  378 +
  379 +-(void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation
  380 +{
  381 + if (currentLocationMarker == nil) {
  382 + UIImage *icon = [UIImage imageNamed:@"userLocation.png"];
  383 + currentLocationMarker = [[RMMarker alloc] initWithUIImage:icon anchorPoint:CGPointMake(0.5, 0.5)];
  384 +
  385 + [mapView.markerManager addMarker:currentLocationMarker AtLatLong:newLocation.coordinate];
  386 + }
  387 + else {
  388 + [mapView.markerManager moveMarker:currentLocationMarker AtLatLon:newLocation.coordinate];
  389 + }
  390 +}
  391 +
359 392 #pragma - NodeViewDelegate
360 393
361 394 -(void) updatedNode:(OPENode *)newNode
@@ -408,7 +441,7 @@ - (IBAction)addPointButtonPressed:(id)sender
408 441 else
409 442 {
410 443 OPENode * node = [[OPENode alloc] initWithId:-1 latitude:center.latitude longitude:center.longitude version:1];
411   - node.image = @"icon.png";
  444 + node.image = @"newNodeMarker.png";
412 445 theNewMarker = [self addMarkerAt:center withNode:node];
413 446 }
414 447 }
@@ -445,7 +478,8 @@ - (void)viewDidUnload
445 478 - (void)viewWillAppear:(BOOL)animated
446 479 {
447 480 [super viewWillAppear:animated];
448   - [self.navigationController setNavigationBarHidden:YES animated:NO];
  481 + [self.navigationController setNavigationBarHidden:YES animated:YES];
  482 +
449 483 }
450 484
451 485 - (void)viewDidAppear:(BOOL)animated
178 OSM POI Editor/en.lproj/OPEViewController_iPhone.xib
... ... @@ -1,14 +1,14 @@
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
3 3 <data>
4   - <int key="IBDocument.SystemTarget">1280</int>
  4 + <int key="IBDocument.SystemTarget">1296</int>
5 5 <string key="IBDocument.SystemVersion">11D50</string>
6   - <string key="IBDocument.InterfaceBuilderVersion">1938</string>
  6 + <string key="IBDocument.InterfaceBuilderVersion">2182</string>
7 7 <string key="IBDocument.AppKitVersion">1138.32</string>
8 8 <string key="IBDocument.HIToolboxVersion">568.00</string>
9 9 <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
10 10 <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
11   - <string key="NS.object.0">933</string>
  11 + <string key="NS.object.0">1179</string>
12 12 </object>
13 13 <array key="IBDocument.IntegratedClassDependencies">
14 14 <string>IBProxyObject</string>
@@ -16,7 +16,6 @@
16 16 <string>IBUIViewController</string>
17 17 <string>IBUIToolbar</string>
18 18 <string>IBUIBarButtonItem</string>
19   - <string>IBUIButton</string>
20 19 <string>IBUINavigationBar</string>
21 20 <string>IBUINavigationItem</string>
22 21 <string>IBUIView</string>
@@ -69,47 +68,8 @@
69 68 <object class="IBUIToolbar" id="595202461">
70 69 <reference key="NSNextResponder" ref="817414081"/>
71 70 <int key="NSvFlags">266</int>
72   - <array class="NSMutableArray" key="NSSubviews">
73   - <object class="IBUIButton" id="852049806">
74   - <reference key="NSNextResponder" ref="595202461"/>
75   - <int key="NSvFlags">292</int>
76   - <string key="NSFrame">{{290, 13}, {18, 19}}</string>
77   - <reference key="NSSuperview" ref="595202461"/>
78   - <reference key="NSWindow"/>
79   - <string key="NSReuseIdentifierKey">_NS:225</string>
80   - <bool key="IBUIOpaque">NO</bool>
81   - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
82   - <int key="IBUIContentHorizontalAlignment">0</int>
83   - <int key="IBUIContentVerticalAlignment">0</int>
84   - <int key="IBUIButtonType">3</int>
85   - <bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
86   - <object class="NSColor" key="IBUIHighlightedTitleColor">
87   - <int key="NSColorSpace">3</int>
88   - <bytes key="NSWhite">MQA</bytes>
89   - </object>
90   - <object class="NSColor" key="IBUINormalTitleColor">
91   - <int key="NSColorSpace">1</int>
92   - <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
93   - </object>
94   - <object class="NSColor" key="IBUINormalTitleShadowColor">
95   - <int key="NSColorSpace">3</int>
96   - <bytes key="NSWhite">MC41AA</bytes>
97   - </object>
98   - <object class="IBUIFontDescription" key="IBUIFontDescription">
99   - <int key="type">2</int>
100   - <double key="pointSize">15</double>
101   - </object>
102   - <object class="NSFont" key="IBUIFont">
103   - <string key="NSName">Helvetica-Bold</string>
104   - <double key="NSSize">15</double>
105   - <int key="NSfFlags">16</int>
106   - </object>
107   - </object>
108   - </array>
109 71 <string key="NSFrame">{{0, 372}, {320, 44}}</string>
110 72 <reference key="NSSuperview" ref="817414081"/>
111   - <reference key="NSWindow"/>
112   - <reference key="NSNextKeyView" ref="852049806"/>
113 73 <string key="NSReuseIdentifierKey">_NS:371</string>
114 74 <bool key="IBUIOpaque">NO</bool>
115 75 <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -138,9 +98,12 @@
138 98 <reference key="IBUIToolbar" ref="595202461"/>
139 99 <int key="IBUISystemItemIdentifier">5</int>
140 100 </object>
141   - <object class="IBUIBarButtonItem" id="593892432">
  101 + <object class="IBUIBarButtonItem" id="156009182">
  102 + <object class="NSCustomResource" key="IBUIImage">
  103 + <string key="NSClassName">NSImage</string>
  104 + <string key="NSResourceName">gear.png</string>
  105 + </object>
142 106 <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
143   - <reference key="IBUICustomView" ref="852049806"/>
144 107 <reference key="IBUIToolbar" ref="595202461"/>
145 108 </object>
146 109 </array>
@@ -148,7 +111,6 @@
148 111 </array>
149 112 <string key="NSFrameSize">{320, 416}</string>
150 113 <reference key="NSSuperview" ref="774585933"/>
151   - <reference key="NSWindow"/>
152 114 <reference key="NSNextKeyView" ref="595202461"/>
153 115 <string key="NSReuseIdentifierKey">_NS:196</string>
154 116 <object class="NSColor" key="IBUIBackgroundColor">
@@ -163,7 +125,6 @@
163 125 </array>
164 126 <string key="NSFrame">{{0, 64}, {320, 416}}</string>
165 127 <reference key="NSSuperview"/>
166   - <reference key="NSWindow"/>
167 128 <reference key="NSNextKeyView" ref="817414081"/>
168 129 <object class="NSColor" key="IBUIBackgroundColor">
169 130 <int key="NSColorSpace">3</int>
@@ -175,7 +136,6 @@
175 136 <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
176 137 </object>
177 138 <object class="IBUINavigationItem" key="IBUINavigationItem" id="549989894">
178   - <reference key="IBUINavigationBar"/>
179 139 <string key="IBUITitle">Root View Controller</string>
180 140 <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
181 141 </object>
@@ -225,14 +185,6 @@
225 185 <int key="connectionID">57</int>
226 186 </object>
227 187 <object class="IBConnectionRecord">
228   - <object class="IBCocoaTouchOutletConnection" key="connection">
229   - <string key="label">infoButton</string>
230   - <reference key="source" ref="372490531"/>
231   - <reference key="destination" ref="852049806"/>
232   - </object>
233   - <int key="connectionID">58</int>
234   - </object>
235   - <object class="IBConnectionRecord">
236 188 <object class="IBCocoaTouchEventConnection" key="connection">
237 189 <string key="label">locationButtonPressed:</string>
238 190 <reference key="source" ref="135252546"/>
@@ -248,23 +200,6 @@
248 200 </object>
249 201 <int key="connectionID">60</int>
250 202 </object>
251   - <object class="IBConnectionRecord">
252   - <object class="IBCocoaTouchEventConnection" key="connection">
253   - <string key="label">infoButtonPressed:</string>
254   - <reference key="source" ref="852049806"/>
255   - <reference key="destination" ref="372490531"/>
256   - <int key="IBEventType">7</int>
257   - </object>
258   - <int key="connectionID">65</int>
259   - </object>
260   - <object class="IBConnectionRecord">
261   - <object class="IBCocoaTouchEventConnection" key="connection">
262   - <string key="label">infoButtonPressed:</string>
263   - <reference key="source" ref="593892432"/>
264   - <reference key="destination" ref="372490531"/>
265   - </object>
266   - <int key="connectionID">64</int>
267   - </object>
268 203 </array>
269 204 <object class="IBMutableOrderedSet" key="objectRecords">
270 205 <array key="orderedObjects">
@@ -337,7 +272,7 @@
337 272 <reference ref="135252546"/>
338 273 <reference ref="541402077"/>
339 274 <reference ref="80628738"/>
340   - <reference ref="593892432"/>
  275 + <reference ref="156009182"/>
341 276 </array>
342 277 <reference key="parent" ref="817414081"/>
343 278 </object>
@@ -362,18 +297,10 @@
362 297 <reference key="parent" ref="595202461"/>
363 298 </object>
364 299 <object class="IBObjectRecord">
365   - <int key="objectID">50</int>
366   - <reference key="object" ref="593892432"/>
367   - <array class="NSMutableArray" key="children">
368   - <reference ref="852049806"/>
369   - </array>
  300 + <int key="objectID">66</int>
  301 + <reference key="object" ref="156009182"/>
370 302 <reference key="parent" ref="595202461"/>
371 303 </object>
372   - <object class="IBObjectRecord">
373   - <int key="objectID">49</int>
374   - <reference key="object" ref="852049806"/>
375   - <reference key="parent" ref="593892432"/>
376   - </object>
377 304 </array>
378 305 </object>
379 306 <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -390,9 +317,8 @@
390 317 <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
391 318 <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
392 319 <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
393   - <string key="49.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
394   - <string key="50.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
395 320 <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
  321 + <string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
396 322 <string key="8.CustomClassName">RMMapView</string>
397 323 <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
398 324 </dictionary>
@@ -400,79 +326,21 @@
400 326 <nil key="activeLocalization"/>
401 327 <dictionary class="NSMutableDictionary" key="localizations"/>
402 328 <nil key="sourceID"/>
403   - <int key="maxID">65</int>
404   - </object>
405   - <object class="IBClassDescriber" key="IBDocument.Classes">
406   - <array class="NSMutableArray" key="referencedPartialClassDescriptions">
407   - <object class="IBPartialClassDescription">
408   - <string key="className">OPEViewController</string>
409   - <string key="superclassName">UIViewController</string>
410   - <dictionary class="NSMutableDictionary" key="actions">
411   - <string key="addPointButtonPressed:">id</string>
412   - <string key="infoButtonPressed:">id</string>
413   - <string key="locationButtonPressed:">id</string>
414   - </dictionary>
415   - <dictionary class="NSMutableDictionary" key="actionInfosByName">
416   - <object class="IBActionInfo" key="addPointButtonPressed:">
417   - <string key="name">addPointButtonPressed:</string>
418   - <string key="candidateClassName">id</string>
419   - </object>
420   - <object class="IBActionInfo" key="infoButtonPressed:">
421   - <string key="name">infoButtonPressed:</string>
422   - <string key="candidateClassName">id</string>
423   - </object>
424   - <object class="IBActionInfo" key="locationButtonPressed:">
425   - <string key="name">locationButtonPressed:</string>
426   - <string key="candidateClassName">id</string>
427   - </object>
428   - </dictionary>
429   - <dictionary class="NSMutableDictionary" key="outlets">
430   - <string key="addOPEPoint">UIBarButtonItem</string>
431   - <string key="infoButton">UIButton</string>
432   - <string key="location">UIBarButtonItem</string>
433   - <string key="mapView">RMMapView</string>
434   - </dictionary>
435   - <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
436   - <object class="IBToOneOutletInfo" key="addOPEPoint">
437   - <string key="name">addOPEPoint</string>
438   - <string key="candidateClassName">UIBarButtonItem</string>
439   - </object>
440   - <object class="IBToOneOutletInfo" key="infoButton">
441   - <string key="name">infoButton</string>
442   - <string key="candidateClassName">UIButton</string>
443   - </object>
444   - <object class="IBToOneOutletInfo" key="location">
445   - <string key="name">location</string>
446   - <string key="candidateClassName">UIBarButtonItem</string>
447   - </object>
448   - <object class="IBToOneOutletInfo" key="mapView">
449   - <string key="name">mapView</string>
450   - <string key="candidateClassName">RMMapView</string>
451   - </object>
452   - </dictionary>
453   - <object class="IBClassDescriptionSource" key="sourceIdentifier">
454   - <string key="majorKey">IBProjectSource</string>
455   - <string key="minorKey">./Classes/OPEViewController.h</string>
456   - </object>
457   - </object>
458   - <object class="IBPartialClassDescription">
459   - <string key="className">RMMapView</string>
460   - <string key="superclassName">UIView</string>
461   - <object class="IBClassDescriptionSource" key="sourceIdentifier">
462   - <string key="majorKey">IBProjectSource</string>
463   - <string key="minorKey">./Classes/RMMapView.h</string>
464   - </object>
465   - </object>
466   - </array>
  329 + <int key="maxID">66</int>
467 330 </object>
  331 + <object class="IBClassDescriber" key="IBDocument.Classes"/>
468 332 <int key="IBDocument.localizationMode">0</int>
469 333 <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
  334 + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
  335 + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
  336 + <real value="1296" key="NS.object.0"/>
  337 + </object>
470 338 <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
471 339 <int key="IBDocument.defaultPropertyAccessControl">3</int>
472   - <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
473   - <string key="NS.key.0">location.png</string>
474   - <string key="NS.object.0">{20, 20}</string>
475   - </object>
476   - <string key="IBCocoaTouchPluginVersion">933</string>
  340 + <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
  341 + <string key="gear.png">{26, 26}</string>
  342 + <string key="location.png">{20, 20}</string>
  343 + </dictionary>
  344 + <string key="IBCocoaTouchPluginVersion">1179</string>
477 345 </data>
478 346 </archive>
BIN  Untitled.pxm
Binary file not shown
BIN  gear.png
BIN  gear@2x.png
BIN  location.png
BIN  location@2x.png
BIN  newNodeMarker.png
BIN  newNodeMarker@2x.png
BIN  restaurant.png
BIN  restaurant@2x.png
BIN  userLocation.png
BIN  userLocation@2x.png

0 comments on commit fa21dca

Please sign in to comment.
Something went wrong with that request. Please try again.