Merge branch 'V2' into V2_OSM

app/HomeView.swift

@@ -193,7 +193,7 @@ class HomeView: UIView {
 		
 		let defaults = UserDefaults.standard
 		if (defaults.value(forKey: "festivals") != nil){
-			let festivals = defaults.value(forKey: "festivals") as! Int
+			let festivals = Int(defaults.value(forKey: "festivals") as! String)
 			if festivals == 1{
 				
 				// Set tap recognizer

app/ScheduleViewController.swift

@@ -105,12 +105,14 @@ class ScheduleViewController: UIViewController, UIGestureRecognizerDelegate {
 	*/
 	public func loadSchedule(margolari: Bool){
 		
+		// TODO: if/else for margolari/city
+		
 		self.context = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
 		self.delegate = UIApplication.shared.delegate as? AppDelegate
 		self.delegate?.scheduleController = self
 		self.lang = getLanguage()
 		self.context?.persistentStoreCoordinator = self.delegate?.persistentStoreCoordinator
-
+		
 		// Get days
 		// TODO: Get current year
 		let year = 2017
@@ -121,20 +123,16 @@ class ScheduleViewController: UIViewController, UIGestureRecognizerDelegate {
 		let sDate = dateFormatter.date(from: dateString)
 		dateString = "\(year)-12-31"
 		let eDate = dateFormatter.date(from: dateString)
-		let dayFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "Festival_event")
+		let dayFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "Festival_event_gm")
 		dayFetchRequest.propertiesToFetch = ["day"]
-		if self.margolari == true{
-			dayFetchRequest.predicate = NSPredicate(format: "(gm = %i) AND (start >= %@) AND (start <= %@)", argumentArray: [1, sDate!, eDate!])
-		}
-		else{
-			dayFetchRequest.predicate = NSPredicate(format: "(gm = %i) AND (start >= %@) AND (start <= %@)", argumentArray: [0, sDate!, eDate!])
-		}
+		
+		dayFetchRequest.predicate = NSPredicate(format: "(start >= %@) AND (start <= %@)", argumentArray: [sDate!, eDate!])
 
 		dayFetchRequest.returnsDistinctResults = true
 		let sortDayDescriptor = NSSortDescriptor(key: "start", ascending: true)
 		let sortDayDescriptors = [sortDayDescriptor]
 		dayFetchRequest.sortDescriptors = sortDayDescriptors
-
+		
 		do {
 			let results = try self.context?.fetch(dayFetchRequest)
 			
@@ -161,7 +159,7 @@ class ScheduleViewController: UIViewController, UIGestureRecognizerDelegate {
 		let tapRecognizerNextDay = UITapGestureRecognizer(target: self, action: #selector(nextDay(_:)))
 		self.btNext.isUserInteractionEnabled = true
 		self.btNext.addGestureRecognizer(tapRecognizerNextDay)
-
+		
 		loadDay()
 	}
 

app/Sync.swift

@@ -245,7 +245,7 @@ class Sync{
 					}
 					
 					// Special case: "festivl_event_citiy" and "festival_event_gm" have a special column: "day"
-					if (table == "festival_event_city" || table == "festival_event_gm") && (column == "start" || (column == "end" && value != "ul")) {
+					if (table == "festival_event_city" || table == "festival_event_gm") && column == "start" {
 						
 						dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
 						dateFormatter.calendar = NSCalendar(calendarIdentifier: NSCalendar.Identifier.ISO8601)! as Calendar
@@ -265,7 +265,6 @@ class Sync{
 							day = Calendar.current.date(byAdding: .day, value: -1, to: day)!
 						}
 						query.setValue(day, forKey: "day")
-						
 					}
 				}
 				
@@ -318,8 +317,8 @@ class Sync{
 			row = "\(row),\""
 			
 			while (row.indexOf(target: ",\"") != nil){
-				tuple = row.subStr(start: 0, end: row.indexOf(target: ",\"")! - 1)
 				
+				tuple = row.subStr(start: 0, end: row.indexOf(target: ",\"")! - 1)
 				column = tuple.subStr(start: 1, end: tuple.indexOf(target: "\":")! - 1)
 				value = tuple.subStr(start: column.length + 4, end: tuple.length - 2)
 				
@@ -330,13 +329,14 @@ class Sync{
 					defaults.set(value, forKey: name)
 				}
 				
-				let start: Int = row.indexOf(target: ",\"")! + 2
-				let end: Int = row.length
+				let start: Int = row.indexOf(target: ",\"")! + 1
+				let end: Int = row.length - 1
+
 				if (start == end){
 					row = ""
 				}
 				else{
-					row = row.subStr(start: row.indexOf(target: ",\"")! + 2, end: row.length - 1)
+					row = row.subStr(start: start, end: end)
 				}
 				
 			}
@@ -401,6 +401,7 @@ class Sync{
 						}
 						
 						// Save the version
+
 						try context.save()
 					}
 					catch let error as NSError  {