diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..f69380b --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,39 @@ + +The MIT License (MIT) + +Copyright (c) 2018 Yuu Hayashi + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +------------------------------------------------------------------- +`osmCoverage.jar` +Copyright (c) 2018 Yuu Hayashi +This software is released under the MIT License, see LICENSE.txt. + +------------------------------------------------------------------- + +* [hayashi.jar](https://osdn.net/projects/hayashilib/) +Copyright (c) 2013 Yuu Hayashi +This software is released under the MIT License. + +* [javax.json.jar](https://javaee.github.io/jsonp/) + +* [hsqldb_2.2.9.jar](http://hsqldb.org/) + +* [postgresql-42.2.4.jar](https://www.postgresql.org/) diff --git a/README.md b/README.md new file mode 100644 index 0000000..5acaf6d --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +# osmCoverage + +## Summary + +位置情報付きのデータとOpenStreetMap上のデータとを比較・評価して、各データの`score`を算出する。 + +算出されたデータは、PostGISデータベースに格納される。 + +* [osmCoverage](doc/osmCoverage.md) + + +## License + +* [MIT license](LICENSE.txt) + diff --git a/database.properties b/database.properties deleted file mode 100644 index e66e66c..0000000 --- a/database.properties +++ /dev/null @@ -1,4 +0,0 @@ -db_driver=org.hsqldb.jdbcDriver -db_url=jdbc:hsqldb:file:./database/db -db_user=sa -db_passwd= diff --git a/dist/lib/hayashi.jar b/dist/lib/hayashi.jar index f64abc8..601c927 100644 --- a/dist/lib/hayashi.jar +++ b/dist/lib/hayashi.jar Binary files differ diff --git a/doc/osmCoverage.md b/doc/osmCoverage.md new file mode 100644 index 0000000..fd47c70 --- /dev/null +++ b/doc/osmCoverage.md @@ -0,0 +1,30 @@ +# osmCoverage + + +## Summary + +1. 位置情報付きのデータとOpenStreetMap上のデータとを比較・評価して、各データの`score`を算出する。 + +2. 算出されたデータは、PostGISデータベースに格納される。 + + +## Development + +* Used by NetBeans 8.2 +* OpenJDK 8 + +### lib + +* [hayashi.jar](https://osdn.net/projects/hayashilib/) +* [javax.json.jar](https://javaee.github.io/jsonp/) +* [hsqldb_2.2.9.jar](http://hsqldb.org/) +* [postgresql-42.2.4.jar](https://www.postgresql.org/) + +### build + + + + +## 使い方 + + diff --git a/doc/overpass.xml b/doc/overpass.xml deleted file mode 100644 index f283cfa..0000000 --- a/doc/overpass.xml +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<osm version="0.6" generator="Overpass API 0.7.55 579b1eec"> -<note>The data included in this document is from www.openstreetmap.org. The data is made available under ODbL.</note> -<meta osm_base="2018-05-27T07:51:02Z"/> - - <node id="289445748" lat="35.5251815" lon="139.3256576"> - <tag k="amenity" v="fuel"/> - <tag k="name" v="Cosmo"/> - <tag k="opening_hours" v="24/7"/> - </node> - <node id="289445760" lat="35.5293592" lon="139.3294988"> - <tag k="amenity" v="fuel"/> - <tag k="name" v="Shell"/> - </node> - <node id="293573984" lat="35.4540551" lon="139.3522122"> - <tag k="amenity" v="fuel"/> - <tag k="brand" v="ESSO"/> - <tag k="name" v="ESSO"/> - <tag k="name:en" v="ESSO"/> - <tag k="name:ja" v="エッソ"/> - <tag k="name:ja_rm" v="Esso"/> - <tag k="opening_hours" v="06:00-24:00"/> - </node> - <node id="2619546333" lat="35.4943971" lon="139.3637325"> - <tag k="amenity" v="fuel"/> - </node> - <node id="3979120208" lat="35.8281931" lon="139.8622086"> - <tag k="amenity" v="fuel"/> - <tag k="brand" v="エネオス"/> - <tag k="name" v="三郷インター南TS"/> - <tag k="name:en" v="Eneos"/> - <tag k="operator" v="株式会社ENEOSウイング"/> - </node> - <node id="3984034163" lat="35.1501427" lon="139.6283673"> - <tag k="amenity" v="fuel"/> - <tag k="name" v="ENEOS"/> - </node> - <node id="5350107631" lat="35.3618318" lon="139.2254734"> - <tag k="amenity" v="fuel"/> - <tag k="brand" v="COSMO"/> - <tag k="opening_hours" v="24/7"/> - </node> - <node id="5538741529" lat="35.3134060" lon="139.1111831"> - <tag k="amenity" v="fuel"/> - <tag k="fuel:GTL_diesel" v="yes"/> - <tag k="operator" v="有限奥津太一商店"/> - <tag k="shop" v="no"/> - </node> - <node id="5631254624" lat="35.2960701" lon="139.1479198"> - <tag k="amenity" v="fuel"/> - <tag k="name" v="シェル"/> - </node> - <node id="5631254625" lat="35.2703179" lon="139.1490181"> - <tag k="brand" v="shell"/> - <tag k="disused:amenity" v="fuel"/> - </node> - <node id="5631271621" lat="35.4306082" lon="139.3662716"> - <tag k="amenity" v="fuel"/> - <tag k="name" v="シェル"/> - <tag k="opening_hours" v="Mo-Sa 07:00-20:00; Su 07:00-18:00"/> - </node> - <node id="5632653611" lat="35.7505800" lon="139.5925304"> - <tag k="amenity" v="fuel"/> - <tag k="name" v="コスモ石油"/> - </node> - <node id="5634969008" lat="35.7422683" lon="139.8475641"> - <tag k="amenity" v="fuel"/> - <tag k="name" v="モービル"/> - </node> - <node id="5634969009" lat="35.7424367" lon="139.8472271"> - <tag k="amenity" v="fuel"/> - <tag k="name" v="エネオス"/> - </node> - <node id="5635233600" lat="35.5471290" lon="139.5034065"> - <tag k="no:amenity" v="fuel"/> - </node> - <node id="5635242344" lat="35.5548034" lon="139.5552108"> - <tag k="removed:amenity" v="fuel"/> - </node> - <node id="5635251126" lat="35.5182052" lon="139.5785683"> - <tag k="amenity" v="fuel"/> - <tag k="brand" v="ENEOS"/> - </node> - <node id="5636371950" lat="35.7923858" lon="139.8104387"> - <tag k="amenity" v="fuel"/> - <tag k="name" v="エネオス"/> - </node> - <node id="5641519821" lat="35.4541735" lon="139.3298905"> - <tag k="amenity" v="fuel"/> - <tag k="name" v="selfix"/> - </node> - <way id="154784063"> - <nd ref="1672629448"/> - <nd ref="1672629385"/> - <nd ref="1672629392"/> - <nd ref="1672629438"/> - <nd ref="1672629448"/> - <tag k="amenity" v="fuel"/> - <tag k="brand" v="ENEOS"/> - <tag k="car_wash" v="yes"/> - <tag k="name" v="Eneos 新横浜SS"/> - <tag k="source" v="survey; bing"/> - </way> - -</osm> diff --git a/gisdb.properties b/gisdb.properties deleted file mode 100644 index dd39b0a..0000000 --- a/gisdb.properties +++ /dev/null @@ -1,4 +0,0 @@ -db_driver=org.postgresql.Driver -db_url=jdbc:postgresql://192.168.0.29:5432/gisdb -db_user=postgres -db_passwd= diff --git a/osmdb.properties b/osmdb.properties deleted file mode 100644 index 73f0f16..0000000 --- a/osmdb.properties +++ /dev/null @@ -1,4 +0,0 @@ -db_driver=org.postgresql.Driver -db_url=jdbc:postgresql://localhost:5432/sens -db_user=jenkins -db_passwd= diff --git a/output.xml b/output.xml deleted file mode 100644 index e69de29..0000000 --- a/output.xml +++ /dev/null diff --git a/src/coverage_FUEL.bat b/src/coverage_FUEL.bat deleted file mode 100644 index 2f1f6e9..0000000 --- a/src/coverage_FUEL.bat +++ /dev/null @@ -1,3 +0,0 @@ -RD /s database -java -cp .;osmCoverage.jar;hayashi_0225.jar;hsqldb_2.2.9.jar;postgresql-9.4.1212.jar osm.jp.coverage.fuel.DbFuel - diff --git a/src/gisdb.properties b/src/gisdb.properties new file mode 100644 index 0000000..dd39b0a --- /dev/null +++ b/src/gisdb.properties @@ -0,0 +1,4 @@ +db_driver=org.postgresql.Driver +db_url=jdbc:postgresql://192.168.0.29:5432/gisdb +db_user=postgres +db_passwd= diff --git a/src/osmdb.properties b/src/osmdb.properties index bdedd56..a705164 100644 --- a/src/osmdb.properties +++ b/src/osmdb.properties @@ -1,7 +1,5 @@ -# for Docker -# db_driver=org.postgresql.Driver -db_url=jdbc:postgresql://172.17.0.1:5432/osmdb +db_url=jdbc:postgresql://localhost:5432/osmdb db_user=postgres -db_passwd=yuu8844 +db_passwd= diff --git a/test/newfile.json b/test/newfile.json deleted file mode 100644 index e69de29..0000000 --- a/test/newfile.json +++ /dev/null diff --git a/test/overpass.xml b/test/overpass.xml new file mode 100644 index 0000000..f283cfa --- /dev/null +++ b/test/overpass.xml @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<osm version="0.6" generator="Overpass API 0.7.55 579b1eec"> +<note>The data included in this document is from www.openstreetmap.org. The data is made available under ODbL.</note> +<meta osm_base="2018-05-27T07:51:02Z"/> + + <node id="289445748" lat="35.5251815" lon="139.3256576"> + <tag k="amenity" v="fuel"/> + <tag k="name" v="Cosmo"/> + <tag k="opening_hours" v="24/7"/> + </node> + <node id="289445760" lat="35.5293592" lon="139.3294988"> + <tag k="amenity" v="fuel"/> + <tag k="name" v="Shell"/> + </node> + <node id="293573984" lat="35.4540551" lon="139.3522122"> + <tag k="amenity" v="fuel"/> + <tag k="brand" v="ESSO"/> + <tag k="name" v="ESSO"/> + <tag k="name:en" v="ESSO"/> + <tag k="name:ja" v="エッソ"/> + <tag k="name:ja_rm" v="Esso"/> + <tag k="opening_hours" v="06:00-24:00"/> + </node> + <node id="2619546333" lat="35.4943971" lon="139.3637325"> + <tag k="amenity" v="fuel"/> + </node> + <node id="3979120208" lat="35.8281931" lon="139.8622086"> + <tag k="amenity" v="fuel"/> + <tag k="brand" v="エネオス"/> + <tag k="name" v="三郷インター南TS"/> + <tag k="name:en" v="Eneos"/> + <tag k="operator" v="株式会社ENEOSウイング"/> + </node> + <node id="3984034163" lat="35.1501427" lon="139.6283673"> + <tag k="amenity" v="fuel"/> + <tag k="name" v="ENEOS"/> + </node> + <node id="5350107631" lat="35.3618318" lon="139.2254734"> + <tag k="amenity" v="fuel"/> + <tag k="brand" v="COSMO"/> + <tag k="opening_hours" v="24/7"/> + </node> + <node id="5538741529" lat="35.3134060" lon="139.1111831"> + <tag k="amenity" v="fuel"/> + <tag k="fuel:GTL_diesel" v="yes"/> + <tag k="operator" v="有限奥津太一商店"/> + <tag k="shop" v="no"/> + </node> + <node id="5631254624" lat="35.2960701" lon="139.1479198"> + <tag k="amenity" v="fuel"/> + <tag k="name" v="シェル"/> + </node> + <node id="5631254625" lat="35.2703179" lon="139.1490181"> + <tag k="brand" v="shell"/> + <tag k="disused:amenity" v="fuel"/> + </node> + <node id="5631271621" lat="35.4306082" lon="139.3662716"> + <tag k="amenity" v="fuel"/> + <tag k="name" v="シェル"/> + <tag k="opening_hours" v="Mo-Sa 07:00-20:00; Su 07:00-18:00"/> + </node> + <node id="5632653611" lat="35.7505800" lon="139.5925304"> + <tag k="amenity" v="fuel"/> + <tag k="name" v="コスモ石油"/> + </node> + <node id="5634969008" lat="35.7422683" lon="139.8475641"> + <tag k="amenity" v="fuel"/> + <tag k="name" v="モービル"/> + </node> + <node id="5634969009" lat="35.7424367" lon="139.8472271"> + <tag k="amenity" v="fuel"/> + <tag k="name" v="エネオス"/> + </node> + <node id="5635233600" lat="35.5471290" lon="139.5034065"> + <tag k="no:amenity" v="fuel"/> + </node> + <node id="5635242344" lat="35.5548034" lon="139.5552108"> + <tag k="removed:amenity" v="fuel"/> + </node> + <node id="5635251126" lat="35.5182052" lon="139.5785683"> + <tag k="amenity" v="fuel"/> + <tag k="brand" v="ENEOS"/> + </node> + <node id="5636371950" lat="35.7923858" lon="139.8104387"> + <tag k="amenity" v="fuel"/> + <tag k="name" v="エネオス"/> + </node> + <node id="5641519821" lat="35.4541735" lon="139.3298905"> + <tag k="amenity" v="fuel"/> + <tag k="name" v="selfix"/> + </node> + <way id="154784063"> + <nd ref="1672629448"/> + <nd ref="1672629385"/> + <nd ref="1672629392"/> + <nd ref="1672629438"/> + <nd ref="1672629448"/> + <tag k="amenity" v="fuel"/> + <tag k="brand" v="ENEOS"/> + <tag k="car_wash" v="yes"/> + <tag k="name" v="Eneos 新横浜SS"/> + <tag k="source" v="survey; bing"/> + </way> + +</osm>