diff options
| -rw-r--r-- | default.cfg | 8 | ||||
| -rw-r--r-- | pom.xml | 38 | ||||
| -rw-r--r-- | src/org/traccar/Server.java | 98 | ||||
| -rw-r--r-- | src/org/traccar/http/WebServer.java | 6 | ||||
| -rw-r--r-- | src/org/traccar/protocol/MaxonProtocolDecoder.java | 154 |
5 files changed, 302 insertions, 2 deletions
diff --git a/default.cfg b/default.cfg index c9805e191..2568a2cc3 100644 --- a/default.cfg +++ b/default.cfg @@ -81,8 +81,9 @@ <!-- Web interface port --> <entry key="http.enable">true</entry> + <!--<entry key="http.address"></entry>--> <entry key="http.port">8082</entry> - + <entry key="geocoder.enable">true</entry> <!-- Logging options --> @@ -139,4 +140,9 @@ <entry key="meiligao.port">5009</entry> <entry key="meiligao.resetDelay">0</entry> + <!-- Maxon server configuration --> + <entry key="maxon.enable">true</entry> + <entry key="maxon.port">5010</entry> + <entry key="maxon.resetDelay">0</entry> + </properties> @@ -83,6 +83,41 @@ </resource> </resources> +<<<<<<< HEAD + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <excludeArtifactIds>junit</excludeArtifactIds> + <excludeTransitive>true</excludeTransitive> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <configuration> + <archive> + <manifest> + <mainClass>org.traccar.Main</mainClass> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> +======= <plugins> <plugin> <artifactId>maven-dependency-plugin</artifactId> @@ -117,6 +152,7 @@ </configuration> </plugin> </plugins> +>>>>>>> df91992080ee4db293e6f81882e95e72600d9bd8 </build> -</project>
\ No newline at end of file +</project> diff --git a/src/org/traccar/Server.java b/src/org/traccar/Server.java index 15514bffc..a36da81e4 100644 --- a/src/org/traccar/Server.java +++ b/src/org/traccar/Server.java @@ -49,6 +49,81 @@ import org.traccar.protocol.*; */ public class Server { +<<<<<<< HEAD + /** + * Server list + */ + private List<TrackerServer> serverList; + + private boolean loggerEnabled; + + public Server() { + serverList = new LinkedList<TrackerServer>(); + loggerEnabled = false; + } + + public boolean isLoggerEnabled() { + return loggerEnabled; + } + + private DataManager dataManager; + + private WebServer webServer; + + private ReverseGeocoder geocoder; + + /** + * Initialize + */ + public void init(String[] arguments) + throws IOException, ClassNotFoundException, SQLException { + + // Load properties + Properties properties = new Properties(); + if (arguments.length > 0) { + properties.loadFromXML(new FileInputStream(arguments[0])); + } + + dataManager = new DatabaseDataManager(properties); + + initLogger(properties); + initGeocoder(properties); + + initXexunServer(properties); + initGps103Server(properties); + initTk103Server(properties); + initGl100Server(properties); + initGl200Server(properties); + initT55Server(properties); + initXexun2Server(properties); + initAvl08Server(properties); + initEnforaServer(properties); + initMeiligaoServer(properties); + initMaxonServer(properties); + + // Initialize web server + if (Boolean.valueOf(properties.getProperty("http.enable"))) { + Integer port = Integer.valueOf(properties.getProperty("http.port", "8082")); + String address = properties.getProperty("http.address"); + if (address != null) { + webServer = new WebServer(address, port, dataManager); + } else { + webServer = new WebServer(port, dataManager); + } + } + } + + /** + * Start + */ + public void start() { + if (webServer != null) { + webServer.start(); + } + for (Object server: serverList) { + ((TrackerServer) server).start(); + } +======= /** * Server list */ @@ -87,6 +162,7 @@ public class Server { // System.out.println(type.getPort()); } +>>>>>>> df91992080ee4db293e6f81882e95e72600d9bd8 } /** @@ -566,4 +642,26 @@ public class Server { } } + private void initMaxonServer(Properties properties) throws SQLException { + String protocol = "maxon"; + if (isProtocolEnabled(properties, protocol)) { + + TrackerServer server = new TrackerServer(getProtocolPort(properties, protocol)); + final Integer resetDelay = getProtocolResetDelay(properties, protocol); + + server.setPipelineFactory(new GenericPipelineFactory(server, dataManager, isLoggerEnabled(), geocoder) { + protected void addSpecificHandlers(ChannelPipeline pipeline) { + byte delimiter[] = { (byte) '\r', (byte) '\n' }; + pipeline.addLast("frameDecoder", + new DelimiterBasedFrameDecoder(1024, ChannelBuffers.wrappedBuffer(delimiter))); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("objectDecoder", new MaxonProtocolDecoder(getDataManager(), resetDelay)); + } + }); + + serverList.add(server); + } + } + } diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java index 5fac8ff65..853bff3de 100644 --- a/src/org/traccar/http/WebServer.java +++ b/src/org/traccar/http/WebServer.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PrintWriter; +import java.net.InetSocketAddress; import java.util.Iterator; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -195,6 +196,11 @@ public class WebServer { server.setHandler(new WebHandler(dataManager)); } + public WebServer(String address, Integer port, DataManager dataManager) { + server = new Server(new InetSocketAddress(address, port)); + server.setHandler(new WebHandler(dataManager)); + } + public void start() { try { server.start(); diff --git a/src/org/traccar/protocol/MaxonProtocolDecoder.java b/src/org/traccar/protocol/MaxonProtocolDecoder.java new file mode 100644 index 000000000..7e26c9c19 --- /dev/null +++ b/src/org/traccar/protocol/MaxonProtocolDecoder.java @@ -0,0 +1,154 @@ +/* + * Copyright 2012 Alex Wilson <alex@uq.edu.au> + * + * 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.protocol; + +import java.util.Calendar; +import java.util.TimeZone; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.traccar.GenericProtocolDecoder; +import org.traccar.model.DataManager; +import org.traccar.model.Position; + +/** + * Maxon Datamax GPS send protocol (NMEA + GPFID) + * As seen in the MA100-1010 router + * + * It sends its identity after the GPRMC sentence, and with the type + * GPFID. + */ +public class MaxonProtocolDecoder extends GenericProtocolDecoder { + + /** + * Device ID + */ + private Position position = null; + + /** + * Initialize + */ + public MaxonProtocolDecoder(DataManager dataManager, Integer resetDelay) { + super(dataManager, resetDelay); + } + + /** + * Regular expressions pattern + */ + static private Pattern pattern = Pattern.compile( + "\\$GPRMC," + + "(\\d{2})(\\d{2})(\\d{2}).(\\d{2})," + // Time (HHMMSS.SSS) + "([AV])," + // Validity + "(\\d{2})(\\d{2}.\\d{5})," + // Latitude (DDMM.MMMMM) + "([NS])," + + "(\\d{3})(\\d{2}.\\d{5})," + // Longitude (DDDMM.MMMMM) + "([EW])," + + "(\\d+.\\d{3})?," + // Speed + "(\\d+.\\d{2})?," + // Course + "(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY) + ".+"); // Other (Checksumm) + + static private Pattern gpfidPattern = Pattern.compile( + "\\$GPFID,(\\d+)$" + ); + + /** + * Decode message" + */ + protected Object decode( + ChannelHandlerContext ctx, Channel channel, Object msg) + throws Exception { + + String sentence = (String) msg; + + // Detect device ID + // Parse message + if (sentence.contains("$GPRMC")) { + + // Parse message + Matcher parser = pattern.matcher(sentence); + if (!parser.matches()) { + return null; + } + + // Create new position + position = new Position(); + + Integer index = 1; + + // Time + Calendar time = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + time.clear(); + time.set(Calendar.HOUR, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++))); + time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++))); + index += 1; // Skip milliseconds + + // Validity + position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false); + + // Latitude + Double latitude = Double.valueOf(parser.group(index++)); + latitude += Double.valueOf(parser.group(index++)) / 60; + if (parser.group(index++).compareTo("S") == 0) latitude = -latitude; + position.setLatitude(latitude); + + // Longitude + Double lonlitude = Double.valueOf(parser.group(index++)); + lonlitude += Double.valueOf(parser.group(index++)) / 60; + if (parser.group(index++).compareTo("W") == 0) lonlitude = -lonlitude; + position.setLongitude(lonlitude); + + // Speed + String speed = parser.group(index++); + if (speed != null) { + position.setSpeed(Double.valueOf(speed)); + } else { + position.setSpeed(0.0); + } + + // Course + String course = parser.group(index++); + if (course != null) { + position.setCourse(Double.valueOf(course)); + } else { + position.setCourse(0.0); + } + + // Date + time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++))); + time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1); + time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++))); + position.setTime(time.getTime()); + + // Altitude + position.setAltitude(0.0); + + } else if (sentence.contains("$GPFID") && position != null) { + Matcher parser = gpfidPattern.matcher(sentence); + + if (parser.matches()) { + String imei = parser.group(1); + position.setDeviceId(getDataManager().getDeviceByImei(imei).getId()); + return position; + } + } + + return null; + } + +} |