xapi fix

Author: reubot

.classpath

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="GO_Sync/src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="GO_Sync/swingx-ws-1.0-bin/swingx-ws-1.0.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/swingx.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/AbsoluteLayout.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>go-sync-new</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

GO_Sync/src/edu/usf/cutr/go_sync/gui/MainForm.java

@@ -157,11 +157,11 @@ private void initComponents() {
         OperatorAbbLabel = new javax.swing.JLabel();
         operatorNameAbbField = new javax.swing.JTextField();
         compareButton = new javax.swing.JButton();
-        usernameLabel2 = new javax.swing.JLabel();
+        operatorNTDIDLabel = new javax.swing.JLabel();
         operatorNTDIDField = new javax.swing.JTextField();
-        usernameLabel3 = new javax.swing.JLabel();
+        gtfsIdDigitLabel = new javax.swing.JLabel();
         gtfsIdDigitField = new javax.swing.JTextField();
-        operatorNameLabel1 = new javax.swing.JLabel();
+        operatorAliasLabel = new javax.swing.JLabel();
         operatorAliasField = new javax.swing.JTextField();
         jPanel3 = new javax.swing.JPanel();
         rbURL = new javax.swing.JRadioButton();
@@ -209,21 +209,21 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         jPanel1.add(compareButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(277, 209, 74, -1));
 
-        usernameLabel2.setText("Operator NTD ID");
-        jPanel1.add(usernameLabel2, new org.netbeans.lib.awtextra.AbsoluteConstraints(300, 60, 111, -1));
+        operatorNTDIDLabel.setText("Operator NTD ID");
+        jPanel1.add(operatorNTDIDLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(300, 60, 111, -1));
 
         operatorNTDIDField.setName("usernameField"); // NOI18N
         jPanel1.add(operatorNTDIDField, new org.netbeans.lib.awtextra.AbsoluteConstraints(390, 60, 50, -1));
         operatorNTDIDField.getAccessibleContext().setAccessibleName("OperatorNTDIDField");
 
-        usernameLabel3.setText("Length of GTFS Stop IDs");
-        jPanel1.add(usernameLabel3, new org.netbeans.lib.awtextra.AbsoluteConstraints(450, 60, 120, -1));
+        gtfsIdDigitLabel.setText("Length of GTFS Stop IDs");
+        jPanel1.add(gtfsIdDigitLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(450, 60, 120, -1));
 
         gtfsIdDigitField.setName("usernameField"); // NOI18N
         jPanel1.add(gtfsIdDigitField, new org.netbeans.lib.awtextra.AbsoluteConstraints(580, 60, 20, -1));
 
-        operatorNameLabel1.setText("Operator Alias");
-        jPanel1.add(operatorNameLabel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 60, 111, -1));
+        operatorAliasLabel.setText("Operator Alias");
+        jPanel1.add(operatorAliasLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 60, 111, -1));
 
         operatorAliasField.setName("usernameField"); // NOI18N
         jPanel1.add(operatorAliasField, new org.netbeans.lib.awtextra.AbsoluteConstraints(100, 60, 180, -1));
@@ -648,13 +648,13 @@ public void propertyChange(PropertyChangeEvent evt) {
     private javax.swing.JTextField operatorNTDIDField;
     private javax.swing.JTextField operatorNameAbbField;
     private javax.swing.JLabel operatorNameLabel;
-    private javax.swing.JLabel operatorNameLabel1;
+    private javax.swing.JLabel operatorAliasLabel;
     private javax.swing.JRadioButton rbFileFolder;
     private javax.swing.JRadioButton rbURL;
     private javax.swing.JButton revertButton;
     private javax.swing.JTextField revertChangesetField;
     private javax.swing.JTextArea taskOutput;
-    private javax.swing.JLabel usernameLabel2;
-    private javax.swing.JLabel usernameLabel3;
+    private javax.swing.JLabel operatorNTDIDLabel;
+    private javax.swing.JLabel gtfsIdDigitLabel;
     // End of variables declaration//GEN-END:variables
 }

GO_Sync/src/edu/usf/cutr/go_sync/osm/HttpRequest.java

@@ -108,8 +108,10 @@ public void checkVersion() throws InterruptedException{
     public ArrayList<AttributesImpl> getExistingBusStops(String left, String bottom, String right, String top) throws InterruptedException{
         //http://open.mapquestapi.com/xapi/
         //"http://www.informationfreeway.org"
-        String urlSuffix = "/api/0.6/node[highway=bus_stop][bbox="+left+","+bottom+","+right+","+top+"]";
-        String[] hosts = {"http://open.mapquestapi.com/xapi","http://www.informationfreeway.org"};
+//        String urlSuffix = "/api/0.6/node[highway=bus_stop][bbox="+left+","+bottom+","+right+","+top+"]";
+//        String[] hosts = {"http://open.mapquestapi.com/xapi","http://www.informationfreeway.org"};
+    	String urlSuffix = "?node[highway=bus_stop][bbox="+left+","+bottom+","+right+","+top+"]";
+        String[] hosts = {"http://api.openstreetmap.fr/xapi","http://www.informationfreeway.org"};    	
         try {
             // get data from server
             String s = sendRequest(hosts, urlSuffix, "GET", "");
@@ -141,8 +143,10 @@ public ArrayList<Hashtable> getExistingBusStopsTags(){
     }
 
     public ArrayList<AttributesImpl> getExistingBusRelations(String left, String bottom, String right, String top) throws InterruptedException{
-        String urlSuffix = "/api/0.6/relation[route=bus][bbox="+left+","+bottom+","+right+","+top+"]";
-        String[] hosts = {"http://open.mapquestapi.com/xapi","http://www.informationfreeway.org"};
+//        String urlSuffix = "/api/0.6/relation[route=bus][bbox="+left+","+bottom+","+right+","+top+"]";
+//        String[] hosts = {"http://open.mapquestapi.com/xapi","http://www.informationfreeway.org"};
+    	String urlSuffix = "?relation[route=bus][bbox="+left+","+bottom+","+right+","+top+"]";
+        String[] hosts = {"http://api.openstreetmap.fr/xapi","http://www.informationfreeway.org"};    	        
         try {
             // get data from server
             String s = sendRequest(hosts, urlSuffix, "GET", "");