Bug fix in XML write

wrote TLE line 1 twice

bin/.gitignore

 /satellite/
+/predict4java/
+/XML/

src/satellite/SatelliteDB.java

@@ -204,7 +204,7 @@ public class SatelliteDB {
 				satellite.appendChild(tle1);
 				
 				Element tle2 = doc.createElement("TLE2");
-				tle2.appendChild(doc.createTextNode(satelliteDB.get(i).getTLE1()));
+				tle2.appendChild(doc.createTextNode(satelliteDB.get(i).getTLE2()));
 				satellite.appendChild(tle2);
 				
 				//Uplink Frequency used
@@ -269,12 +269,32 @@ public class SatelliteDB {
 				if (nNode.getNodeType() == Node.ELEMENT_NODE) {
 
 					Element eElement = (Element) nNode;
-
-					System.out.println("Satellite name : " + eElement.getElementsByTagName("name").item(0).getTextContent());
-					System.out.println("TLE1 : " + eElement.getElementsByTagName("TLE1").item(0).getTextContent());
-					System.out.println("TLE2 : " + eElement.getElementsByTagName("TLE2").item(0).getTextContent());
-					System.out.println("Uplink Frequency : " + eElement.getElementsByTagName("UplinkFreq").item(0).getTextContent());
-					System.out.println("Downlink Frequency : " + eElement.getElementsByTagName("DownlinkFreq").item(0).getTextContent());
+					
+					//Read in elements
+					String name = eElement.getElementsByTagName("name").item(0).getTextContent();
+					String TLE1 = eElement.getElementsByTagName("TLE1").item(0).getTextContent();
+					String TLE2 = eElement.getElementsByTagName("TLE2").item(0).getTextContent();
+					String uFreq = eElement.getElementsByTagName("UplinkFreq").item(0).getTextContent();
+					String dFreq = eElement.getElementsByTagName("DownlinkFreq").item(0).getTextContent();
+					
+					System.out.println(name);
+					System.out.println(TLE1);
+					System.out.println(TLE2);
+					
+					//Build Satellite
+					String[] tle = {name,TLE1,TLE2};
+					
+					SatelliteTrack sat = new SatelliteTrack(tle);
+					sat.setDownlinkFreq(Long.parseLong(dFreq));
+					sat.setUplinkFreq(Long.parseLong(uFreq));
+					satelliteDB.add(sat);
+					
+					//Debug print out
+					System.out.println("Satellite name : " + sat.getTLE().getName());
+					System.out.println("TLE1 : " + sat.getTLE1());
+					System.out.println("TLE2 : " + sat.getTLE2());
+					System.out.println("Uplink Frequency : " + sat.getUplinkFreq());
+					System.out.println("Downlink Frequency : " + sat.getDownlinkFreq());
 
 				}
 			}

src/satellite/SatelliteTrack.java

@@ -118,6 +118,13 @@ public class SatelliteTrack {
 	public ArrayList<satPosition> getTripleOrbit() {
 		return tripleOrbit;
 	}
+	
+	public void updateOrbits(){
+		dayOrbit = getDayOrbit(this.satellite);
+		singleOrbit = getSingleOrbit(this.satellite);
+		doubleOrbit = getDoubleOrbit(this.satellite);
+		tripleOrbit = getTripleOrbit(this.satellite);
+	}
 
 	public List<SatPassTime> get24hrPasses(GroundStationPosition gpos) {
 

src/satellite/tracker.java

@@ -8,11 +8,17 @@ public class tracker {
 		
 		satellites.readXML();
 		
-		//satellites.getSatellites_GPS();
-		//satellites.getSatellites_NOAA();
-		//satellites.getSatellites_Stations();
+		if(satellites.satExist("PROGRESS-M 29M")){
+			System.out.println("Satellite Exitis!");
+		}
 		
-		//satellites.writeToXML();
+//		satellites.getSatellites_GPS();
+//		satellites.getSatellites_NOAA();
+//		satellites.getSatellites_Stations();
+//		
+//		satellites.writeToXML();
+		
+
 	}
 
 }