6 files changed, 0 insertions, 558 deletions
diff --git a/src/org/traccar/reports/model/BaseReport.java b/src/org/traccar/reports/model/BaseReport.java
deleted file mode 100644
index 9f2d1188c..000000000
--- a/src/org/traccar/reports/model/BaseReport.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
- *
- * 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.reports.model;
-
-public class BaseReport {
-
-    private long deviceId;
-
-    public long getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(long deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    private String deviceName;
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    private double distance;
-
-    public double getDistance() {
-        return distance;
-    }
-
-    public void setDistance(double distance) {
-        this.distance = distance;
-    }
-
-    public void addDistance(double distance) {
-        this.distance += distance;
-    }
-
-    private double averageSpeed;
-
-    public double getAverageSpeed() {
-        return averageSpeed;
-    }
-
-    public void setAverageSpeed(Double averageSpeed) {
-        this.averageSpeed = averageSpeed;
-    }
-
-    private double maxSpeed;
-
-    public double getMaxSpeed() {
-        return maxSpeed;
-    }
-
-    public void setMaxSpeed(double maxSpeed) {
-        if (maxSpeed > this.maxSpeed) {
-            this.maxSpeed = maxSpeed;
-        }
-    }
-
-    private double spentFuel;
-
-    public double getSpentFuel() {
-        return spentFuel;
-    }
-
-    public void setSpentFuel(double spentFuel) {
-        this.spentFuel = spentFuel;
-    }
-
-    private double startOdometer;
-
-    public double getStartOdometer() {
-        return startOdometer;
-    }
-
-    public void setStartOdometer(double startOdometer) {
-        this.startOdometer = startOdometer;
-    }
-    private double endOdometer;
-
-    public double getEndOdometer() {
-        return endOdometer;
-    }
-
-    public void setEndOdometer(double endOdometer) {
-        this.endOdometer = endOdometer;
-    }
-
-}
diff --git a/src/org/traccar/reports/model/DeviceReport.java b/src/org/traccar/reports/model/DeviceReport.java
deleted file mode 100644
index 932753d15..000000000
--- a/src/org/traccar/reports/model/DeviceReport.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
- *
- * 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.reports.model;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class DeviceReport {
-
-    private String deviceName;
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    private String groupName = "";
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    private List<?> objects;
-
-    public Collection<?> getObjects() {
-        return objects;
-    }
-
-    public void setObjects(Collection<?> objects) {
-        this.objects = new ArrayList<>(objects);
-    }
-
-}
diff --git a/src/org/traccar/reports/model/StopReport.java b/src/org/traccar/reports/model/StopReport.java
deleted file mode 100644
index 245292b63..000000000
--- a/src/org/traccar/reports/model/StopReport.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * 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.reports.model;
-
-import java.util.Date;
-
-public class StopReport extends BaseReport  {
-
-    private long positionId;
-
-    public long getPositionId() {
-        return positionId;
-    }
-
-    public void setPositionId(long positionId) {
-        this.positionId = positionId;
-    }
-
-    private double latitude;
-
-    public double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(double latitude) {
-        this.latitude = latitude;
-    }
-
-    private double longitude;
-
-    public double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(double longitude) {
-        this.longitude = longitude;
-    }
-
-    private Date startTime;
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    private Date endTime;
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    private String address;
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    private long duration;
-
-    public long getDuration() {
-        return duration;
-    }
-
-    public void setDuration(long duration) {
-        this.duration = duration;
-    }
-
-    private long engineHours; // milliseconds
-
-    public long getEngineHours() {
-        return engineHours;
-    }
-
-    public void setEngineHours(long engineHours) {
-        this.engineHours = engineHours;
-    }
-
-    public void addEngineHours(long engineHours) {
-        this.engineHours += engineHours;
-    }
-}
diff --git a/src/org/traccar/reports/model/SummaryReport.java b/src/org/traccar/reports/model/SummaryReport.java
deleted file mode 100644
index 6f9e9459f..000000000
--- a/src/org/traccar/reports/model/SummaryReport.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * 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.reports.model;
-
-public class SummaryReport extends BaseReport {
-
-    private long engineHours; // milliseconds
-
-    public long getEngineHours() {
-        return engineHours;
-    }
-
-    public void setEngineHours(long engineHours) {
-        this.engineHours = engineHours;
-    }
-
-    public void addEngineHours(long engineHours) {
-        this.engineHours += engineHours;
-    }
-}
diff --git a/src/org/traccar/reports/model/TripReport.java b/src/org/traccar/reports/model/TripReport.java
deleted file mode 100644
index 3140f3019..000000000
--- a/src/org/traccar/reports/model/TripReport.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
- *
- * 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.reports.model;
-
-import java.util.Date;
-
-public class TripReport extends BaseReport {
-
-    private long startPositionId;
-
-    public long getStartPositionId() {
-        return startPositionId;
-    }
-
-    public void setStartPositionId(long startPositionId) {
-        this.startPositionId = startPositionId;
-    }
-
-    private long endPositionId;
-
-    public long getEndPositionId() {
-        return endPositionId;
-    }
-
-    public void setEndPositionId(long endPositionId) {
-        this.endPositionId = endPositionId;
-    }
-
-    private double startLat;
-
-    public double getStartLat() {
-        return startLat;
-    }
-
-    public void setStartLat(double startLat) {
-        this.startLat = startLat;
-    }
-
-    private double startLon;
-
-    public double getStartLon() {
-        return startLon;
-    }
-
-    public void setStartLon(double startLon) {
-        this.startLon = startLon;
-    }
-
-    private double endLat;
-
-    public double getEndLat() {
-        return endLat;
-    }
-
-    public void setEndLat(double endLat) {
-        this.endLat = endLat;
-    }
-
-    private double endLon;
-
-    public double getEndLon() {
-        return endLon;
-    }
-
-    public void setEndLon(double endLon) {
-        this.endLon = endLon;
-    }
-
-    private Date startTime;
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    private String startAddress;
-
-    public String getStartAddress() {
-        return startAddress;
-    }
-
-    public void setStartAddress(String address) {
-        this.startAddress = address;
-    }
-
-    private Date endTime;
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    private String endAddress;
-
-    public String getEndAddress() {
-        return endAddress;
-    }
-
-    public void setEndAddress(String address) {
-        this.endAddress = address;
-    }
-
-    private long duration;
-
-    public long getDuration() {
-        return duration;
-    }
-
-    public void setDuration(long duration) {
-        this.duration = duration;
-    }
-
-    private String driverUniqueId;
-
-    public String getDriverUniqueId() {
-        return driverUniqueId;
-    }
-
-    public void setDriverUniqueId(String driverUniqueId) {
-        this.driverUniqueId = driverUniqueId;
-    }
-
-    private String driverName;
-
-    public String getDriverName() {
-        return driverName;
-    }
-
-    public void setDriverName(String driverName) {
-        this.driverName = driverName;
-    }
-}
diff --git a/src/org/traccar/reports/model/TripsConfig.java b/src/org/traccar/reports/model/TripsConfig.java
deleted file mode 100644
index 0f0c615d3..000000000
--- a/src/org/traccar/reports/model/TripsConfig.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * 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.reports.model;
-
-public class TripsConfig {
-
-    public TripsConfig() {
-    }
-
-    public TripsConfig(double minimalTripDistance, long minimalTripDuration, long minimalParkingDuration,
-            long minimalNoDataDuration, boolean useIgnition, boolean processInvalidPositions, double speedThreshold) {
-        this.minimalTripDistance = minimalTripDistance;
-        this.minimalTripDuration = minimalTripDuration;
-        this.minimalParkingDuration = minimalParkingDuration;
-        this.minimalNoDataDuration = minimalNoDataDuration;
-        this.useIgnition = useIgnition;
-        this.processInvalidPositions = processInvalidPositions;
-        this.speedThreshold = speedThreshold;
-    }
-
-    private double minimalTripDistance;
-
-    public double getMinimalTripDistance() {
-        return minimalTripDistance;
-    }
-
-    public void setMinimalTripDistance(double minimalTripDistance) {
-        this.minimalTripDistance = minimalTripDistance;
-    }
-
-    private long minimalTripDuration;
-
-    public long getMinimalTripDuration() {
-        return minimalTripDuration;
-    }
-
-    public void setMinimalTripDuration(long minimalTripDuration) {
-        this.minimalTripDuration = minimalTripDuration;
-    }
-
-    private long minimalParkingDuration;
-
-    public long getMinimalParkingDuration() {
-        return minimalParkingDuration;
-    }
-
-    public void setMinimalParkingDuration(long minimalParkingDuration) {
-        this.minimalParkingDuration = minimalParkingDuration;
-    }
-
-    private long minimalNoDataDuration;
-
-    public long getMinimalNoDataDuration() {
-        return minimalNoDataDuration;
-    }
-
-    public void setMinimalNoDataDuration(long minimalNoDataDuration) {
-        this.minimalNoDataDuration = minimalNoDataDuration;
-    }
-
-    private boolean useIgnition;
-
-    public boolean getUseIgnition() {
-        return useIgnition;
-    }
-
-    public void setUseIgnition(boolean useIgnition) {
-        this.useIgnition = useIgnition;
-    }
-
-    private boolean processInvalidPositions;
-
-    public boolean getProcessInvalidPositions() {
-        return processInvalidPositions;
-    }
-
-    public void setProcessInvalidPositions(boolean processInvalidPositions) {
-        this.processInvalidPositions = processInvalidPositions;
-    }
-
-    private double speedThreshold;
-
-    public double getSpeedThreshold() {
-        return speedThreshold;
-    }
-
-    public void setSpeedThreshold(double speedThreshold) {
-        this.speedThreshold = speedThreshold;
-    }
-
-}