3 files changed, 97 insertions, 3 deletions

diff --git a/src/org/traccar/database/DataCache.java b/src/org/traccar/database/DataCache.java
index f5aa3b1e9..f28f1b838 100644
--- a/src/org/traccar/database/DataCache.java
+++ b/src/org/traccar/database/DataCache.java
@@ -18,6 +18,8 @@ package org.traccar.database;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.traccar.model.Position;
@@ -31,7 +33,7 @@ public class DataCache {
         // TODO: load latest data from datavase
     }
     
-    public void update(Position position) {
+    public synchronized void update(Position position) {
         long device = position.getDeviceId();
         positions.put(device, position);
         if (listeners.containsKey(device)) {
@@ -41,6 +43,19 @@ public class DataCache {
         }
     }
     
+    public synchronized Collection<Position> getInitialState(Collection<Long> devices) {
+        
+        List<Position> result = new LinkedList<Position>();
+        
+        for (long device : devices) {
+            if (positions.containsKey(device)) {
+                result.add(positions.get(device));
+            }
+        }
+        
+        return result;
+    }
+    
     public static interface DataCacheListener {
         public void onUpdate(Position position);
     }
@@ -51,7 +66,7 @@ public class DataCache {
         }
     }
     
-    public void addListener(long device, DataCacheListener listener) {
+    public synchronized void addListener(long device, DataCacheListener listener) {
         if (!listeners.containsKey(device)) {
             listeners.put(device, new HashSet<DataCacheListener>());
         }
@@ -64,7 +79,7 @@ public class DataCache {
         }
     }
     
-    public void removeListener(long device, DataCacheListener listener) {
+    public synchronized void removeListener(long device, DataCacheListener listener) {
         if (!listeners.containsKey(device)) {
             listeners.put(device, new HashSet<DataCacheListener>());
         }
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 2f029e74c..faded815b 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -362,6 +362,31 @@ public class DataManager {
         }
     }
     
+    public List<Long> getDeviceList(long userId) throws SQLException {
+
+        Connection connection = dataSource.getConnection();
+        try {
+            PreparedStatement statement = connection.prepareStatement(
+                    "SELECT id FROM device WHERE id IN (" +
+                    "SELECT device_id FROM user_device WHERE user_id = ?);");
+            try {
+                statement.setLong(1, userId);
+
+                ResultSet resultSet = statement.executeQuery();
+                
+                List<Long> result = new LinkedList<Long>();
+                while (resultSet.next()) {
+                    result.add(resultSet.getLong(1));
+                }
+                return result;
+            } finally {
+                statement.close();
+            }
+        } finally {
+            connection.close();
+        }
+    }
+    
     public JsonArray getDevices(long userId) throws SQLException {
 
         Connection connection = dataSource.getConnection();
diff --git a/src/org/traccar/database/ObjectConverter.java b/src/org/traccar/database/ObjectConverter.java
new file mode 100644
index 000000000..072ab7a7d
--- /dev/null
+++ b/src/org/traccar/database/ObjectConverter.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.database;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObjectBuilder;
+import org.traccar.model.Position;
+
+public class ObjectConverter {
+    
+    private static final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ssZ");
+    
+    public static JsonArray convert(Collection<Position> positions) {
+        
+        JsonArrayBuilder array = Json.createArrayBuilder();
+        
+        for (Position position : positions) {
+            JsonObjectBuilder object = Json.createObjectBuilder();
+            
+            //object.add("id", position.getId());
+            object.add("time", dateFormat.format(position.getTime()));
+            object.add("valid", position.getValid());
+            object.add("latitude", position.getLatitude());
+            object.add("longitude", position.getLongitude());
+            object.add("altitude", position.getAltitude());
+            object.add("speed", position.getSpeed());
+            object.add("course", position.getCourse());
+            //object.add("other", position.getExtendedInfo());
+            
+            array.add(object.build());
+        }
+        
+        return array.build();
+    }
+    
+}