diff --git a/dist/README.TXT b/dist/README.TXT new file mode 100644 index 0000000..0e5fdfb --- /dev/null +++ b/dist/README.TXT @@ -0,0 +1,32 @@ +======================== +BUILD OUTPUT DESCRIPTION +======================== + +When you build an Java application project that has a main class, the IDE +automatically copies all of the JAR +files on the projects classpath to your projects dist/lib folder. The IDE +also adds each of the JAR files to the Class-Path element in the application +JAR files manifest file (MANIFEST.MF). + +To run the project from the command line, go to the dist folder and +type the following: + +java -jar "osmCoverage.jar" + +To distribute this project, zip up the dist folder (including the lib folder) +and distribute the ZIP file. + +Notes: + +* If two JAR files on the project classpath have the same name, only the first +JAR file is copied to the lib folder. +* Only JAR files are copied to the lib folder. +If the classpath contains other types of files or folders, these files (folders) +are not copied. +* If a library on the projects classpath also has a Class-Path element +specified in the manifest,the content of the Class-Path element has to be on +the projects runtime path. +* To set a main class in a standard Java project, right-click the project node +in the Projects window and choose Properties. Then click Run and enter the +class name in the Main Class field. Alternatively, you can manually type the +class name in the manifest Main-Class element. diff --git a/dist/lib/hayashi.jar b/dist/lib/hayashi.jar index 64b6c8a..83c4671 100644 --- a/dist/lib/hayashi.jar +++ b/dist/lib/hayashi.jar Binary files differ diff --git a/src/osm/jp/coverage/busstop/ToPostgis.java b/src/osm/jp/coverage/busstop/ToPostgis.java index 12e16b6..84218ed 100644 --- a/src/osm/jp/coverage/busstop/ToPostgis.java +++ b/src/osm/jp/coverage/busstop/ToPostgis.java @@ -17,6 +17,7 @@ * テーブル名: t_busstop * インデックス: ix_busstop_geom * gid PostGISの識別ID + * gmlid 国土数値情報のID(areaと合わせてKEYとなる) * name バス停名称 * fixed OSMのバス停が周辺に存在するかどうか、存在しない場合は0,存在する場合はその数。 * geom PostGIS形式の位置情報(4612:) @@ -61,7 +62,7 @@ public static void transportNew (Connection conHsql, Connection conPost) throws FileNotFoundException, ClassNotFoundException, SQLException, IOException, ParserConfigurationException, SAXException { HttpPOST httpPOST = new HttpPOST(conPost, null); httpPOST.sql("DROP TABLE IF EXISTS t_busstop CASCADE;"); - httpPOST.sql("CREATE TABLE t_busstop (gid SERIAL PRIMARY KEY,gmlid text,name text,fixed integer,area integer,geom GEOMETRY(POINT, 4612));"); + httpPOST.sql("CREATE TABLE t_busstop (gid SERIAL PRIMARY KEY, gmlid text, idref text, name text, fixed integer, area integer, geom GEOMETRY(POINT, 4612));"); httpPOST.sql("CREATE INDEX ix_busstop_geom ON t_busstop USING GiST (geom);"); toInsert(conHsql, conPost); } diff --git a/src/osmdb.properties b/src/osmdb.properties new file mode 100644 index 0000000..bdedd56 --- /dev/null +++ b/src/osmdb.properties @@ -0,0 +1,7 @@ +# for Docker +# +db_driver=org.postgresql.Driver +db_url=jdbc:postgresql://172.17.0.1:5432/osmdb +db_user=postgres +db_passwd=yuu8844 +