Merge pull request #2012 from Abyss777/master

Implement Geofences on server side

1 files changed, 20 insertions, 1 deletions

diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 1aba24b8c..f40db72e5 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@ import com.ning.http.client.AsyncHttpClient;
 import org.traccar.database.ConnectionManager;
 import org.traccar.database.DataManager;
 import org.traccar.database.IdentityManager;
+import org.traccar.database.NotificationManager;
 import org.traccar.database.PermissionsManager;
+import org.traccar.database.GeofenceManager;
 import org.traccar.geocode.BingMapsReverseGeocoder;
 import org.traccar.geocode.FactualReverseGeocoder;
 import org.traccar.geocode.GisgraphyReverseGeocoder;
@@ -99,6 +101,18 @@ public final class Context {
         return serverManager;
     }
 
+    private static GeofenceManager geofenceManager;
+
+    public static GeofenceManager getGeofenceManager() {
+        return geofenceManager;
+    }
+
+    private static NotificationManager notificationManager;
+
+    public static NotificationManager getNotificationManager() {
+        return notificationManager;
+    }
+
     private static final AsyncHttpClient ASYNC_HTTP_CLIENT = new AsyncHttpClient();
 
     public static AsyncHttpClient getAsyncHttpClient() {
@@ -179,7 +193,12 @@ public final class Context {
 
         connectionManager = new ConnectionManager(dataManager);
 
+        geofenceManager = new GeofenceManager(dataManager);
+
+        notificationManager = new NotificationManager(dataManager);
+
         serverManager = new ServerManager();
+
     }
 
     public static void init(IdentityManager testIdentityManager) {