FIX: TIMESTAMPの’Z'

diff --git a/build.xml b/build.xml
index 77bf02d..53f420e 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -88,17 +88,8 @@
            <fileset dir="${src}" includes="ConvBusstop.bat"/>\r
            <fileset dir="${src}" includes="ConvBusstop.sh"/>\r
            <fileset dir="${src}" includes="database.properties"/>\r
            <fileset dir="${src}" includes="ConvBusstop.bat"/>\r
            <fileset dir="${src}" includes="ConvBusstop.sh"/>\r
            <fileset dir="${src}" includes="database.properties"/>\r

+           <fileset dir="${src}" includes="osmTag.xml"/>\r

        </zip>\r
        </zip>\r

-               <copy preservelastmodified="true" todir="${dest}">\r
-                       <fileset file="${basedir}/${appname}.jar"/>\r
-                       <fileset dir="${javalib}">\r
-                               <include name="${hayashilib}"/>\r
-                               <include name="${dblib}"/>\r
-                       </fileset>\r
-                       <fileset file="${src}/ConvBusstop.bat"/>\r
-           <fileset file="${src}/ConvBusstop.sh"/>\r
-                       <fileset file="${src}/database.properties" />\r
-               </copy>\r

     </target>\r
 \r
        <target name="all" depends="deploy"></target>\r
     </target>\r
 \r
        <target name="all" depends="deploy"></target>\r

diff --git a/src/osm/jp/ConvBusstop.java b/src/osm/jp/ConvBusstop.java
index 6f85a36..9af5f23 100644 (file)
--- a/src/osm/jp/ConvBusstop.java
+++ b/src/osm/jp/ConvBusstop.java
@@ -35,6 +35,8 @@ public class ConvBusstop {
        // 近くのバス停を探す範囲（バス停を中心としたNEER×２ｍ四方の領域\r
        static final int NEER = 150;\r
        static boolean nocheck = false;\r
        // 近くのバス停を探す範囲（バス停を中心としたNEER×２ｍ四方の領域\r
        static final int NEER = 150;\r
        static boolean nocheck = false;\r

+       \r
+       public static SimpleDateFormat timeStampFmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");\r

 \r
        /**\r
         * メイン\r
 \r
        /**\r
         * メイン\r


@@ -379,7 +381,6 @@ public class ConvBusstop {
         * @throws SAXException \r
         */\r
        public static void outputDb(Connection con, String iCode) throws IOException, SQLException, SAXException, ParserConfigurationException, TransformerException {\r
         * @throws SAXException \r
         */\r
        public static void outputDb(Connection con, String iCode) throws IOException, SQLException, SAXException, ParserConfigurationException, TransformerException {\r

-               SimpleDateFormat timeStampFmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");\r

                String timeStampStr = timeStampFmt.format(new Date(Calendar.getInstance().getTimeInMillis()));\r
                File dir = new File(iCode);\r
                dir.mkdir();\r
                String timeStampStr = timeStampFmt.format(new Date(Calendar.getInstance().getTimeInMillis()));\r
                File dir = new File(iCode);\r
                dir.mkdir();\r


@@ -564,7 +565,7 @@ public class ConvBusstop {
 \r
                                                // GPX waypoint\r
                                                gw.write("<wpt lat=\""+ lat +"\" lon=\""+ lon +"\">\n");\r
 \r
                                                // GPX waypoint\r
                                                gw.write("<wpt lat=\""+ lat +"\" lon=\""+ lon +"\">\n");\r

-                                               gw.write(" <time>"+ timeStampStr +"Z</time>\n");\r
+                                               gw.write(" <time>"+ timeStampStr +"</time>\n");\r

                                                gw.write(" <name><![CDATA["+ name +"]]></name>\n");\r
                                                //gw.write(" <link href=\""+ txtFile.getName() +"\"><text>"+ idref +"</text></link>\n");\r
                                                gw.write("</wpt>\n");\r
                                                gw.write(" <name><![CDATA["+ name +"]]></name>\n");\r
                                                //gw.write(" <link href=\""+ txtFile.getName() +"\"><text>"+ idref +"</text></link>\n");\r
                                                gw.write("</wpt>\n");\r


@@ -620,7 +621,6 @@ public class ConvBusstop {
                File osmFile = new File(dir, "busstop.osm");\r
                int counter = 0;\r
 \r
                File osmFile = new File(dir, "busstop.osm");\r
                int counter = 0;\r
 \r

-               SimpleDateFormat timeStampFmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");\r

                String timeStampStr = timeStampFmt.format(new Date(Calendar.getInstance().getTimeInMillis()));\r
                BufferedWriter ow = null;\r
                \r
                String timeStampStr = timeStampFmt.format(new Date(Calendar.getInstance().getTimeInMillis()));\r
                BufferedWriter ow = null;\r
                \r


@@ -677,7 +677,7 @@ public class ConvBusstop {
         document.appendChild(node);\r
         \r
         node.setAttribute("id", String.valueOf(code));\r
         document.appendChild(node);\r
         \r
         node.setAttribute("id", String.valueOf(code));\r

-        node.setAttribute("timestamp", timeStampStr + "Z");\r
+        node.setAttribute("timestamp", timeStampStr);\r

         node.setAttribute("lat", String.valueOf(lat));\r
         node.setAttribute("lon", String.valueOf(lon));\r
         \r
         node.setAttribute("lat", String.valueOf(lat));\r
         node.setAttribute("lon", String.valueOf(lon));\r
         \r