From 87d85e262c1ac0050e333c6ac6c82a9881b2ad1d Mon Sep 17 00:00:00 2001
From: moryakovdv <moryakovdv@gmail.com>
Date: Tue, 17 Jul 2018 15:34:41 +0300
Subject: [PATCH] Further sigmet development

---
 .classpath                                    | 42 +++++++++++++++++++
 .project                                      | 31 ++++++++++++++
 .settings/.jsdtscope                          |  5 +++
 .settings/org.eclipse.core.resources.prefs    |  7 ++++
 pom.xml                                       |  6 +--
 .../gamc/spmi/iwxxmConverter/common/Line.java | 33 +++++++++++++++
 .../sigmetconverter/SIGMETTacMessage.java     | 18 ++++----
 .../SigmetHorizontalPhenomenonLocation.java   |  4 ++
 8 files changed, 135 insertions(+), 11 deletions(-)
 create mode 100644 .classpath
 create mode 100644 .project
 create mode 100644 .settings/.jsdtscope
 create mode 100644 .settings/org.eclipse.core.resources.prefs
 create mode 100644 src/main/java/org/gamc/spmi/iwxxmConverter/common/Line.java

diff --git a/.classpath b/.classpath
new file mode 100644
index 00000000..23465d80
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/schemabindings">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.project b/.project
new file mode 100644
index 00000000..3ae305c4
--- /dev/null
+++ b/.project
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>iwxxmConverter</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
new file mode 100644
index 00000000..fd536059
--- /dev/null
+++ b/.settings/.jsdtscope
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="WebContent"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..6e3c1195
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/schemabindings=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/pom.xml b/pom.xml
index b99ab187..555e9edb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gamc.spmi</groupId>
 	<artifactId>iwxxmConverter</artifactId>
-	<packaging>pom</packaging>
+	<packaging>jar</packaging>
 	<version>0.0.9</version>
 
 	<properties>
@@ -212,7 +212,5 @@
 
 	</build>
 
-	<modules>
-		<module>IwxxmConverterRest</module>
-	</modules>
+
 </project>
\ No newline at end of file
diff --git a/src/main/java/org/gamc/spmi/iwxxmConverter/common/Line.java b/src/main/java/org/gamc/spmi/iwxxmConverter/common/Line.java
new file mode 100644
index 00000000..584fef1a
--- /dev/null
+++ b/src/main/java/org/gamc/spmi/iwxxmConverter/common/Line.java
@@ -0,0 +1,33 @@
+package org.gamc.spmi.iwxxmConverter.common;
+
+import java.io.Serializable;
+
+public final class Line implements Serializable {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -8275937527178470577L;
+	private CoordPoint startPoint;
+	private CoordPoint endPoint;
+	
+	public Line() {}
+	
+	public Line(CoordPoint start, CoordPoint end) {
+		this.startPoint=start;
+		this.endPoint=end;
+	}
+	
+	public CoordPoint getStartPoint() {
+		return startPoint;
+	}
+	public void setStartPoint(CoordPoint startPoint) {
+		this.startPoint = startPoint;
+	}
+	public CoordPoint getEndPoint() {
+		return endPoint;
+	}
+	public void setEndPoint(CoordPoint endPoint) {
+		this.endPoint = endPoint;
+	}
+	
+}
diff --git a/src/main/java/org/gamc/spmi/iwxxmConverter/sigmetconverter/SIGMETTacMessage.java b/src/main/java/org/gamc/spmi/iwxxmConverter/sigmetconverter/SIGMETTacMessage.java
index 275d2f0a..6d97a065 100644
--- a/src/main/java/org/gamc/spmi/iwxxmConverter/sigmetconverter/SIGMETTacMessage.java
+++ b/src/main/java/org/gamc/spmi/iwxxmConverter/sigmetconverter/SIGMETTacMessage.java
@@ -36,17 +36,21 @@ public enum Type {
 		METEO,VOLCANO,CYCLONE;
 	}
 	
-	private DateTime validFrom;
-	private DateTime validTo;
-	private String firName;
-	
-	
-	private String fl;
-	
+	private String sigmetNumber;
 	
+	private Type sigmetType = Type.METEO;
 	
+	private DateTime validFrom;
+	private DateTime validTo;
 	
+	private String watchOffice;
+	private String firCode;
+	private String firName;
 	
+	private SigmetPhenomenonDescription phenomenonDescription;
+	private SigmetHorizontalPhenomenonLocation horizontalLocation;
+	private SigmetVerticalPhenomenonLocation verticalLocation;
+		
 	
 	public SIGMETTacMessage(String initialTacMessage) {
 		super(initialTacMessage);
diff --git a/src/main/java/org/gamc/spmi/iwxxmConverter/sigmetconverter/SigmetHorizontalPhenomenonLocation.java b/src/main/java/org/gamc/spmi/iwxxmConverter/sigmetconverter/SigmetHorizontalPhenomenonLocation.java
index 80726ba6..40bef9e4 100644
--- a/src/main/java/org/gamc/spmi/iwxxmConverter/sigmetconverter/SigmetHorizontalPhenomenonLocation.java
+++ b/src/main/java/org/gamc/spmi/iwxxmConverter/sigmetconverter/SigmetHorizontalPhenomenonLocation.java
@@ -16,6 +16,10 @@ public class SigmetHorizontalPhenomenonLocation {
 	/**Describes direction from certain line, e.g 'NE OF LINE ...'*/	
 	public static final class DirectionFromLine implements Serializable {
 		
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1937563107841308842L;
 		private RUMB_UNITS direction;
 		private Line sigmetLine;