poi-service: migration of the whole build to cmake

author: <philippe colliot> 2014-09-21 15:51:28 +0200
committer: <philippe colliot> 2014-09-21 15:51:28 +0200
commit: da542b8a90974a88af7df37963eeaa695a942a23 (patch)
tree: f63ed2e573eeff6d8039a005d9708809b9fe5a9a
parent: f8902ca7689f9c4b2ddebee943a2e5a91b385a8a (diff)
download: poi-service-da542b8a90974a88af7df37963eeaa695a942a23.tar.gz
44 files changed, 7162 insertions, 5057 deletions
diff --git a/src/poi-service/.gitignore b/src/poi-service/.gitignore
index 6e9d54c..04b5943 100644
--- a/src/poi-service/.gitignore
+++ b/src/poi-service/.gitignore
@@ -4,7 +4,7 @@
 *_adaptor.h
 *_proxy.h
 genivi-*.h
-
+*.user
 
 
 
diff --git a/src/poi-service/README b/src/poi-service/README
index f477f59..0135f2b 100644
--- a/src/poi-service/README
+++ b/src/poi-service/README
@@ -1,4 +1,4 @@
-Release date of the file: 4-06-2014 
+Release date of the file: 18-09-2014 
 Status: OK
 
 Project:
@@ -34,9 +34,10 @@ Dependencies:
 libqt4-dev libdbus-c++-dev libsqlite3-dev sqlite3 libglib2.0-dev libglibmm-2.4-dev libdbus-1-dev xsltproc
  
 Build:
+# Build is based on cmake
 # Enter into the directory
 cd $WORKING-DIR/navigation-service/src/poi-service/script
-make all
+./build.sh
 
 To launch:
 ./run
diff --git a/src/poi-service/poi-server/CMakeLists.txt b/src/poi-service/poi-server/CMakeLists.txt
index a9b3357..e48d782 100644
--- a/src/poi-service/poi-server/CMakeLists.txt
+++ b/src/poi-service/poi-server/CMakeLists.txt
@@ -21,6 +21,8 @@ cmake_minimum_required(VERSION 2.8)
 message(STATUS "poi-server")
 
 find_package(PkgConfig REQUIRED)
+find_program(XSLTPROC xsltproc REQUIRED)
+find_program(DBUSXML2CPP dbusxx-xml2cpp REQUIRED)
 
 pkg_check_modules(DBUS_CPP dbus-c++-1)
 pkg_check_modules(GLIB REQUIRED glib-2.0)
@@ -39,14 +41,11 @@ include_directories(${GOBJECT_INCLUDE_DIRS})
 include_directories(${DBUS_INCLUDE_DIRS})
 include_directories(${DBUS_CPP_GLIB_INCLUDE_DIRS})
 
-set(API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../api)
-set(TARGET_GENERATED_API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../poi-common)
 set (git_get_src_version git rev-parse HEAD)
 set (git_executable git)
 
 # Check if positioning stuff with the right version has been cloned and make it if necessary
 set(positioning_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../positioning)
-set(positioning_API_DIR ${positioning_SRC}/enhanced-position-service/api)
 set(positioning_URL http://git.projects.genivi.org/lbs/positioning.git)
 set(positioning_VERSION 09698f63ea27a24c533b4c015155ee9ebd7a3026)
 
@@ -90,35 +89,92 @@ else()
 endif()
 
 # Generate the DBus adaptors and proxy before building the client
-add_custom_command(
-  OUTPUT  genivi-poiservice-poisearch_adaptor.h 
-  COMMAND dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml 
-  --adaptor=${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_adaptor.h
-  OUTPUT  genivi-poiservice-poicontentaccess_adaptor.h 
-  COMMAND dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml 
-  --adaptor=${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_adaptor.h
-  OUTPUT  genivi-poiservice-contentaccessmodule_proxy.h 
-  COMMAND dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml
-  --proxy=${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_proxy.h
-  OUTPUT genivi-poiservice-constants.h 
-  COMMAND xsltproc ${API_DIR}/poi-service/enum.xsl ${API_DIR}/poi-service/genivi-poiservice-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h
-
-  OUTPUT genivi-positioning-constants.h 
-  COMMAND xsltproc ${positioning_SRC_DIR}/enhanced-position-service/api/enum.xsl ${positioning_SRC_DIR}/enhanced-position-service/api/genivi-positioning-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h
-  OUTPUT  genivi-positioning-enhancedposition_proxy.h 
-  COMMAND dbusxx-xml2cpp ${positioning_SRC_DIR}/enhanced-position-service/api/genivi-positioning-enhancedposition.xml
-  --proxy=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h
-
-  OUTPUT genivi-mapviewer-constants.h 
-  COMMAND xsltproc ${API_DIR}/map-viewer/enum.xsl ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h
-
-  OUTPUT genivi-navigationcore-constants.h 
-  COMMAND xsltproc ${API_DIR}/navigation-core/enum.xsl ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h
-  OUTPUT  genivi-navigationcore-routing_proxy.h 
-  COMMAND dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml
-  --proxy=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h
+set(API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../api)
+set(TARGET_GENERATED_API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../poi-common)
+set(positioning_API_DIR ${positioning_SRC}/enhanced-position-service/api)
 
+file (GLOB XML_TO_DBUS_PROXY 
+	${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml
+	${positioning_SRC_DIR}/enhanced-position-service/api/genivi-positioning-enhancedposition.xml
+	${API_DIR}/navigation-core/genivi-navigationcore-routing.xml
 )
+foreach (RAW_FILE ${XML_TO_DBUS_PROXY})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
+		execute_process(
+			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
+			execute_process(
+				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
+			)
+		endif()
+	endif()
+endforeach()
+
+file (GLOB XML_TO_DBUS_ADAPTOR
+	${API_DIR}/poi-service/genivi-poiservice-poisearch.xml
+	${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml
+)
+foreach (RAW_FILE ${XML_TO_DBUS_ADAPTOR})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
+		execute_process(
+			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
+			execute_process(
+				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
+			)
+		endif()
+	endif()
+endforeach()
+
+file (GLOB XML_TO_DBUS_CONSTANT
+	${API_DIR}/poi-service/genivi-poiservice-constants.xml
+	${API_DIR}/map-viewer/genivi-mapviewer-constants.xml
+	${API_DIR}/navigation-core/genivi-navigationcore-constants.xml
+)
+foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+		execute_process(
+			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+			COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}        
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+			execute_process(
+				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+				COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}        
+			)
+		endif()
+	endif()
+endforeach()
+
+file (GLOB XML_TO_DBUS_CONSTANT_FROM_POSITIONING
+	${positioning_SRC_DIR}/enhanced-position-service/api/genivi-positioning-constants.xml
+)
+foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT_FROM_POSITIONING})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+		execute_process(
+			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+			COMMAND ${XSLTPROC} ${positioning_SRC_DIR}/enhanced-position-service/api/enum.xsl ${RAW_FILE}   
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+			execute_process(
+				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+				COMMAND ${XSLTPROC} ${positioning_SRC_DIR}/enhanced-position-service/api/enum.xsl ${RAW_FILE}   
+			)
+		endif()
+	endif()
+endforeach()
+
+file(GLOB DBUS_DEF_INCLUDE ${DBUS_DEF_DIR}/*_proxy.h ${DBUS_DEF_DIR}/*_adaptor.h ${DBUS_DEF_DIR}/*-constants.h)
 
 link_directories(
     ${DBUS_CPP_LIBRARY_DIRS}
@@ -131,15 +187,7 @@ link_directories(
 )
 
 add_executable(poi-server
-	genivi-poiservice-poisearch_adaptor.h
-	genivi-poiservice-poicontentaccess_adaptor.h
-	genivi-poiservice-contentaccessmodule_proxy.h
-	genivi-poiservice-constants.h
-	genivi-positioning-constants.h
-	genivi-mapviewer-constants.h
-	genivi-navigationcore-constants.h
-	genivi-navigationcore-routing_proxy.h
-	genivi-positioning-enhancedposition_proxy.h
+	${DBUS_DEF_INCLUDE}
     main.cpp
     database.cpp
 	database.h
diff --git a/src/poi-service/poi-server/poi-server.pro b/src/poi-service/poi-server/poi-server.pro
deleted file mode 100644
index 1d02b16..0000000
--- a/src/poi-service/poi-server/poi-server.pro
+++ /dev/null
@@ -1,31 +0,0 @@
-TEMPLATE = app
-CONFIG += console
-CONFIG -= qt
-
-SOURCES += main.cpp \
-    database.cpp
-
-HEADERS += \
-    database.h \
-    genivi-positioning-enhancedposition_proxy.h \
-    genivi-poiservice-poisearch_adaptor.h \
-    genivi-poiservice-poicontentaccess_adaptor.h \
-    genivi-poiservice-contentaccessmodule_proxy.h \
-    poi-server-class.h \
-    poi-datamodel.h
-
-INCLUDEPATH += /usr/include/glibmm-2.4 \
-    /usr/lib/i386-linux-gnu/glibmm-2.4/include \
-    /usr/include/glib-2.0 \
-    /usr/lib/i386-linux-gnu/glib-2.0/include \
-    /usr/include/dbus-c++-1 \
-    /usr/include/dbus-1.0 \
-    /usr/lib/i386-linux-gnu/dbus-1.0/include
-
-LIBS += -lglibmm-2.4 \
-        -lglib-2.0 \
-        -lgobject-2.0 \
-        -lsqlite3 \
-        -ldbus-c++-glib-1 \
-        -ldbus-c++-1 \
-        -ldbus-1
diff --git a/src/poi-service/script/build.sh b/src/poi-service/script/build.sh
index f73fc42..0918fe7 100755
--- a/src/poi-service/script/build.sh
+++ b/src/poi-service/script/build.sh
@@ -16,9 +16,16 @@
 #
 # @licence end@
 ###########################################################################
-POI_SERVER_SRC_DIR=$PWD/../poi-server
-POI_SERVER_BIN_DIR=$PWD/../bin
-POSITIONING_SRC_DIR=$PWD/../positioning
+TOP_DIR=$PWD/..
+TOP_BIN_DIR=$PWD/../bin
+
+POI_SERVER=poi-server
+POI_SERVER_SRC_DIR=$TOP_DIR/$POI_SERVER
+POI_SERVER_BIN_DIR=$TOP_BIN_DIR
+POSITIONING_SRC_DIR=$TOP_DIR/positioning
+
+POI_COMMON=poi-common
+POI_COMMON_SRC_DIR=$TOP_DIR/$POI_COMMON
 
 usage() {
     echo "Usage: ./build.sh Build poi-server"
@@ -27,7 +34,7 @@ usage() {
     echo "command:"
     echo "  make            Build"
     echo "  clean           Clean"
-    echo "  src-clean       Clean the cloned sources of positioning"
+    echo "  src-clean       Clean the cloned sources"
     echo "  help            Print Help"
     echo
     echo
@@ -42,13 +49,20 @@ build() {
 }
 
 clean() {
+	echo 'delete' $POI_SERVER_BIN_DIR 
     rm -rf $POI_SERVER_BIN_DIR
+	echo 'delete dbus generated files'
+	rm -f $POI_COMMON_SRC_DIR/*_adaptor.h $POI_COMMON_SRC_DIR/*_proxy.h $POI_COMMON_SRC_DIR/*-constants.h
 }
 
 src-clean() {
+	echo 'delete' $POSITIONING_SRC_DIR 
     rm -rf $POSITIONING_SRC_DIR
+    clean
 }
 
+set -e
+
 if [ $# -ge 1 ]; then
     if [ $1 = help ]; then
         usage
diff --git a/src/poi-service/script/generate-api-for-navigation.sh b/src/poi-service/script/generate-api-for-navigation.sh
deleted file mode 100755
index 3feca41..0000000
--- a/src/poi-service/script/generate-api-for-navigation.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-API_DIR=${1-../../../api}
-TARGET_DIR=${2-../poi-common}
-POSITIONING_API_DIR=${3-../../../api/enhanced-position-service}
-echo 'clean up'
-
-echo "generate the adaptors and the proxys for the POI APIs from $API_DIR to $TARGET_DIR"
-dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml --adaptor=${TARGET_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h
-dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml --proxy=${TARGET_DIR}/genivi-poiservice-contentaccessmodule_proxy.h
-dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml --adaptor=${TARGET_DIR}/genivi-poiservice-poicontentaccess_adaptor.h
-dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml --proxy=${TARGET_DIR}/genivi-poiservice-poicontentaccess_proxy.h
-dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml --adaptor=${TARGET_DIR}/genivi-poiservice-poisearch_adaptor.h
-dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml --proxy=${TARGET_DIR}/genivi-poiservice-poisearch_proxy.h
-
-echo 'generate the constants for the POI APIs'
-xsltproc ${API_DIR}/poi-service/enum.xsl ${API_DIR}/poi-service/genivi-poiservice-constants.xml > ${TARGET_DIR}/genivi-poiservice-constants.h
-
-echo 'generate the adaptors and the proxys for the other APIs'
-dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml --adaptor=${TARGET_DIR}/genivi-navigationcore-guidance_adaptor.h
-dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml --proxy=${TARGET_DIR}/genivi-navigationcore-guidance_proxy.h
-dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml --adaptor=${TARGET_DIR}/genivi-navigationcore-routing_adaptor.h
-dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml --proxy=${TARGET_DIR}/genivi-navigationcore-routing_proxy.h
-dbusxx-xml2cpp ${POSITIONING_API_DIR}/genivi-positioning-enhancedposition.xml --adaptor=${TARGET_DIR}/genivi-positioning-enhancedposition_adaptor.h
-dbusxx-xml2cpp ${POSITIONING_API_DIR}/genivi-positioning-enhancedposition.xml --proxy=${TARGET_DIR}/genivi-positioning-enhancedposition_proxy.h
-
-echo 'generate the constants for the other APIs'
-xsltproc ${API_DIR}/navigation-core/enum.xsl ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml > ${TARGET_DIR}/genivi-navigationcore-constants.h
-xsltproc ${API_DIR}/poi-service/enum.xsl ${POSITIONING_API_DIR}/genivi-positioning-constants.xml > ${TARGET_DIR}/genivi-positioning-constants.h
-xsltproc ${API_DIR}/map-viewer/enum.xsl ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml > ${TARGET_DIR}/genivi-mapviewer-constants.h
-
-
diff --git a/src/poi-service/script/generate-api.mk b/src/poi-service/script/generate-api.mk
deleted file mode 100644
index 85eadab..0000000
--- a/src/poi-service/script/generate-api.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
-#
-# \file generate-api.mk
-#
-# \brief This file is part of the Build System.
-#
-# \author Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# \version 1.0
-#
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License (MPL), v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# For further information see http://www.genivi.org/.
-#
-# List of changes:
-# 
-# <date>, <name>, <description of change>
-#
-# @licence end@
-COMMON_DIR=$(ROOT_DIR)/poi-common
-TARGET_GENERATED_API_DIR=$(COMMON_DIR)
-GENERATE_API_DEPS=libdbus-c++-dev xsltproc
-
-ALL+=generate-api
-CLEAN+=clean-generate-api
-DEPS+=$(GENERATE_API_DEPS)
-
-help::
-	@echo "generate-api: Generate the proxies and adaptors"
-
-generate-api: generate-api-poi generate-api-other
-
-clean-generate-api:: 
-	rm -rf ${TARGET_GENERATED_API_DIR}/*_adaptor.h
-	rm -rf ${TARGET_GENERATED_API_DIR}/*_proxy.h
-	rm -rf ${TARGET_GENERATED_API_DIR}/*_constants.h
-
-generate-api-poi:: ${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h: ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml 
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_proxy.h: ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml 	
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_adaptor.h: ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml 
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_proxy.h: ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml 
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_adaptor.h: ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_proxy.h: ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h: ${API_DIR}/poi-service/genivi-poiservice-constants.xml 
-	xsltproc ${API_DIR}/poi-service/enum.xsl ${API_DIR}/poi-service/genivi-poiservice-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h
-
-generate-api-other:: ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h
-
-${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_adaptor.h: ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml
-	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_proxy.h: ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml
-	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_adaptor.h: ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml
-	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h: ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml
-	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h: ${positioning_API}/genivi-positioning-enhancedposition.xml
-	dbusxx-xml2cpp ${positioning_API}/genivi-positioning-enhancedposition.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h: ${positioning_API}/genivi-positioning-enhancedposition.xml
-	dbusxx-xml2cpp ${positioning_API}/genivi-positioning-enhancedposition.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h: ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml
-	xsltproc ${API_DIR}/navigation-core/enum.xsl ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h
-
-#use the enum.xsl of navigation-core to generate the positioning constants
-${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h: ${positioning_API}/genivi-positioning-constants.xml
-	xsltproc ${API_DIR}/navigation-core/enum.xsl ${positioning_API}/genivi-positioning-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h
-
-${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h: ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml
-	xsltproc ${API_DIR}/map-viewer/enum.xsl ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h
-
diff --git a/src/poi-service/script/get-positioning.mk b/src/poi-service/script/get-positioning.mk
deleted file mode 100644
index 963b35c..0000000
--- a/src/poi-service/script/get-positioning.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
-#
-# \file get-positioning.mk
-#
-# \brief This file is part of the Build System.
-#
-# \author Martin Schaller <martin.schaller@it-schaller.de>
-# \author Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# \version 1.0
-#
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License (MPL), v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# For further information see http://www.genivi.org/.
-#
-# List of changes:
-# 
-# 28-04-2014, Philippe Colliot, link to the public repos of positioning, add clean feature
-# 4/6/2014, Philippe Colliot, complete src-clean option
-# 
-# @licence end@
-positioning_SRC=$(ROOT_DIR)/positioning
-positioning_API=$(positioning_SRC)/enhanced-position-service/api
-positioning_URL=http://git.projects.genivi.org/lbs/positioning.git
-positioning_VERSION=09698f63ea27a24c533b4c015155ee9ebd7a3026
-
-ALL+=positioning
-SRC_CLEAN+=clean-positioning_SRC
-
-help::
-	@echo "positioning: Get positioning"
-
-positioning: $(positioning_API)/genivi-positioning-enhancedposition.xml
-
-clean-positioning_SRC:: 
-	rm -rf $(positioning_SRC)
-
-$(positioning_API)/genivi-positioning-enhancedposition.xml:
-	cd $(positioning_SRC)/.. && git clone $(positioning_URL)
-	cd $(positioning_SRC) && git checkout $(positioning_VERSION)
diff --git a/test/poi-service/.gitignore b/test/poi-service/.gitignore
index 4a4824a..eb4ee2a 100644
--- a/test/poi-service/.gitignore
+++ b/test/poi-service/.gitignore
@@ -4,7 +4,7 @@
 *_adaptor.h
 *_proxy.h
 genivi-*.h
-
+*.user
 
 
 
diff --git a/test/poi-service/README b/test/poi-service/README
index 08ae83d..524bb6a 100644
--- a/test/poi-service/README
+++ b/test/poi-service/README
@@ -1,4 +1,4 @@
-Release date of the file: 4-06-2014 
+Release date of the file: 21-09-2014 
 Status: OK
 
 Project:
@@ -47,13 +47,29 @@ LC_NUMERIC="en_US.UTF-8"
 Build:
 # Enter into the directory
 cd $WORKING-DIR/navigation-service/test/poi-service/script
-make all
+./build.sh make 
 
 Prepare databases, configure and run:
 As examples, three databases can be generated for Paris, Tokyo and San-Diego
+The input stuff is taken from the OSM, by using this site:
+http://www.overpass-api.de
+
+For instance, in Paris area, the bounding box used for the demo is
+bbox=2.246304,48.814551,2.430325,48.901289
+In case we want to get the hotels and the museums located inside the area defined, request is:
+http://www.overpass-api.de/api/xapi?*[bbox=2.246304,48.814551,2.430325,48.901289][tourism=museum|hotel]
+for the stations:
+http://www.overpass-api.de/api/xapi?*[bbox=2.246304,48.814551,2.430325,48.901289][railway=station]
+for the bicycle
+http://www.overpass-api.de/api/xapi?*[bbox=2.246304,48.814551,2.430325,48.901289][shop=bicycle]
+for the fuel stations
+http://www.overpass-api.de/api/xapi?*[bbox=2.246304,48.814551,2.430325,48.901289][amenity=fuel]
+
+For Tokyo, the bounding box is 139.691048,35.631628,139.832497,35.738153
+
 
 To launch the stuff for Paris:
-./prepare paris
+./prepare -c paris
 ./run
 
 Clean up:
diff --git a/test/poi-service/poi-client/CMakeLists.txt b/test/poi-service/poi-client/CMakeLists.txt
new file mode 100644
index 0000000..aafee36
--- /dev/null
+++ b/test/poi-service/poi-client/CMakeLists.txt
@@ -0,0 +1,242 @@
+###########################################################################
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# Component Name: poi-client
+#
+# Author: Philippe Colliot
+#
+# Copyright (C) 2014, PCA Peugeot Citroën
+# 
+# License:
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# @licence end@
+###########################################################################
+project(poi-client)
+cmake_minimum_required(VERSION 2.8)
+
+message(STATUS "poi-client")
+
+find_package(PkgConfig REQUIRED)
+find_program(XSLTPROC xsltproc REQUIRED)
+find_program(QTUIC uic REQUIRED)
+find_program(QTMOC moc REQUIRED)
+find_program(QTLRELEASE lrelease REQUIRED)
+find_program(QTRCC rcc REQUIRED)
+
+pkg_check_modules(QT5_CORE REQUIRED Qt5Core)
+pkg_check_modules(QT5_DBUS REQUIRED Qt5DBus)
+pkg_check_modules(QT5_WIDGETS REQUIRED Qt5Widgets)
+pkg_check_modules(QT5_GUI REQUIRED Qt5Gui)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${QT5_CORE_INCLUDE_DIRS})
+include_directories(${QT5_DBUS_INCLUDE_DIRS})
+include_directories(${QT5_WIDGETS_INCLUDE_DIRS})
+include_directories(${QT5_GUI_INCLUDE_DIRS})
+
+set(cmake_create_dir cmake -E make_directory)
+
+#settings for Qt
+set(CMAKE_XXX_FLAGS "${CMAKE_XXX_FLAGS} ${QT5_EXECUTABLE_COMPILE_FLAGS}")
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+add_definitions(${QT5_CORE_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_NO_DEBUG)
+set(qt_moc ${QTMOC} -o)
+set(MOC moc)
+set(MOC_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MOC})
+set(qt_uic ${QTUIC} -o)
+set(qt_release ${QTLRELEASE})
+set(qt_rcc ${QTRCC} -binary)
+
+set(positioning_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/poi-service/positioning)
+if (NOT IS_DIRECTORY ${positioning_SRC_DIR})
+  message(FATAL_ERROR "positioning has not been cloned before")
+endif()
+
+# Generate the DBus adaptors and proxy before building the client
+set(API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../api)
+set(TARGET_GENERATED_API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../poi-common)
+set(positioning_API_DIR ${positioning_SRC}/enhanced-position-service/api)
+
+file (GLOB XML_TO_DBUS_CONSTANT
+	${API_DIR}/poi-service/genivi-poiservice-constants.xml
+	${API_DIR}/map-viewer/genivi-mapviewer-constants.xml
+	${API_DIR}/navigation-core/genivi-navigationcore-constants.xml
+)
+foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+		execute_process(
+			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+			COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}        
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+			execute_process(
+				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+				COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}        
+			)
+		endif()
+	endif()
+endforeach()
+
+file (GLOB XML_TO_DBUS_CONSTANT_FROM_POSITIONING
+	${positioning_SRC_DIR}/enhanced-position-service/api/genivi-positioning-constants.xml
+)
+foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT_FROM_POSITIONING})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+		execute_process(
+			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+			COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}   
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+			execute_process(
+				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+				COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}   
+			)
+		endif()
+	endif()
+endforeach()
+
+file(GLOB DBUS_DEF_INCLUDE ${DBUS_DEF_DIR}/*-constants.h)
+
+link_directories(
+	${QT5_CORE_LIBRARY_DIRS}
+	${QT5_DBUS_LIBRARY_DIRS}
+	${QT5_WIDGETS_LIBRARY_DIRS}
+	${QT5_GUI_LIBRARY_DIRS}
+)
+
+set(LIBRARIES 
+    ${QT5_CORE_LIBRARIES}
+    ${QT5_DBUS_LIBRARIES}
+    ${QT5_WIDGETS_LIBRARIES}
+    ${QT5_GUI_LIBRARIES}
+)
+
+# for some reason, automoc doesn't run, so moc is made manually
+file (GLOB SRC_TO_MOC ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.h
+	${CMAKE_CURRENT_SOURCE_DIR}/about-dialog.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/poi-client-DBusSearchInterface.h 
+    ${CMAKE_CURRENT_SOURCE_DIR}/poi-client-DBusRoutingInterface.h 
+    ${CMAKE_CURRENT_SOURCE_DIR}/poi-client-DBusGuidanceInterface.h 
+    ${CMAKE_CURRENT_SOURCE_DIR}/poi-client-DBusEnhancedPositionInterface.h 
+    ${CMAKE_CURRENT_SOURCE_DIR}/poi-client-DBusNavigationCoreSessionInterface.h 
+    ${CMAKE_CURRENT_SOURCE_DIR}/poi-client-DBusContentAccessInterface.h 
+)
+execute_process(
+	COMMAND ${cmake_create_dir} ${MOC}
+)
+foreach (RAW_FILE ${SRC_TO_MOC})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${MOC_DIR}/moc_${FILE}.cpp)
+		execute_process(
+			COMMAND ${qt_moc} "${MOC_DIR}/moc_${FILE}.cpp" ${RAW_FILE} 
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${MOC_DIR}/moc_${FILE}.cpp)
+			execute_process(
+				COMMAND ${qt_moc} "${MOC_DIR}/moc_${FILE}.cpp" ${RAW_FILE} 
+			)
+		endif()
+	endif()
+endforeach()
+file(GLOB MOC_SOURCES ${MOC_DIR}/moc_*.cpp)
+
+#generate ui files
+file (GLOB DEF_TO_UIC ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.ui
+					  ${CMAKE_CURRENT_SOURCE_DIR}/about-dialog.ui
+)
+
+foreach (RAW_FILE ${DEF_TO_UIC})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/ui_${FILE}.h)
+		execute_process(
+			COMMAND ${qt_uic} "${CMAKE_CURRENT_BINARY_DIR}/ui_${FILE}.h" ${RAW_FILE} 
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/ui_${FILE}.h)
+			execute_process(
+				COMMAND ${qt_uic} "${CMAKE_CURRENT_BINARY_DIR}/ui_${FILE}.h" ${RAW_FILE} 
+			)
+		endif()
+	endif()
+endforeach()
+file(GLOB UI_FILES ${CMAKE_CURRENT_BINARY_DIR}/ui_*.h)
+
+#generate qm files
+set(COMMON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../poi-common)
+file (GLOB TS_TO_RELEASE ${COMMON_DIR}/poi-client_en.ts
+	${COMMON_DIR}/poi-client_jp.ts
+)
+
+foreach (RAW_FILE ${TS_TO_RELEASE})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${COMMON_DIR}/${FILE}.qm)
+		execute_process(
+			OUTPUT_FILE ${COMMON_DIR}/${FILE}.qm
+			COMMAND ${qt_release} ${RAW_FILE}  
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${COMMON_DIR}/${FILE}.qm)
+			execute_process(
+				OUTPUT_FILE ${COMMON_DIR}/${FILE}.qm
+				COMMAND ${qt_release} ${RAW_FILE} 
+			)
+		endif()
+	endif()
+endforeach()
+
+#generate resource file
+get_filename_component(FILE ${COMMON_DIR}/poi-resource.qrc NAME_WE)
+if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../${FILE}.rcc)
+    execute_process(
+        OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/../${FILE}.rcc
+        COMMAND ${qt_rcc} ${COMMON_DIR}/poi-resource.qrc
+    )
+else()
+    if(${COMMON_DIR}/poi-resource.qrc IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/../${FILE}.rcc)
+        execute_process(
+            OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/../${FILE}.rcc
+            COMMAND ${qt_rcc} ${COMMON_DIR}/poi-resource.qrc
+        )
+    endif()
+endif()
+
+add_executable(poi-client
+    ${MOC_SOURCES}
+    ${DBUS_DEF_INCLUDE}
+    ${UI_FILES}
+    main.cpp
+    mainwindow.cpp
+    about-dialog.cpp
+    poi-client-DBusSearchInterface.cpp
+    poi-client-DBusRoutingInterface.cpp
+    poi-client-DBusGuidanceInterface.cpp
+    poi-client-DBusEnhancedPositionInterface.cpp
+    poi-client-DBusNavigationCoreSessionInterface.cpp
+    poi-client-DBusContentAccessInterface.cpp
+    ../poi-common/poi-marshal-handler.cpp
+    mainwindow.h
+    poi-client-config.h
+    about-dialog.h
+    poi-client-DBusSearchInterface.h
+    poi-client-DBusRoutingInterface.h
+    poi-client-DBusGuidanceInterface.h
+    poi-client-DBusEnhancedPositionInterface.h
+    poi-client-DBusNavigationCoreSessionInterface.h
+    poi-client-DBusContentAccessInterface.h
+    ../poi-common/poi-marshal-handler.h
+)
+
+target_link_libraries(poi-client ${LIBRARIES})
+
+
diff --git a/test/poi-service/poi-client/deployment.pri b/test/poi-service/poi-client/deployment.pri
deleted file mode 100644
index cc21b2b..0000000
--- a/test/poi-service/poi-client/deployment.pri
+++ /dev/null
@@ -1,126 +0,0 @@
-# checksum 0x838c version 0x70002
-# This file was generated by an application wizard of Qt Creator.
-# The code below handles deployment to Symbian and Maemo, aswell as copying
-# of the application data to shadow build directories on desktop.
-# It is recommended not to modify this file, since newer versions of Qt Creator
-# may offer an updated version of it.
-
-defineTest(qtcAddDeployment) {
-for(deploymentfolder, DEPLOYMENTFOLDERS) {
-    item = item$${deploymentfolder}
-    itemsources = $${item}.sources
-    $$itemsources = $$eval($${deploymentfolder}.source)
-    itempath = $${item}.path
-    $$itempath= $$eval($${deploymentfolder}.target)
-    export($$itemsources)
-    export($$itempath)
-    DEPLOYMENT += $$item
-}
-
-MAINPROFILEPWD = $$PWD
-
-symbian {
-    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
-    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-} else:win32 {
-    copyCommand =
-    for(deploymentfolder, DEPLOYMENTFOLDERS) {
-        source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
-        source = $$replace(source, /, \\)
-        sourcePathSegments = $$split(source, \\)
-        target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
-        target = $$replace(target, /, \\)
-        target ~= s,\\\\\\.?\\\\,\\,
-        !isEqual(source,$$target) {
-            !isEmpty(copyCommand):copyCommand += &&
-            isEqual(QMAKE_DIR_SEP, \\) {
-                copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
-            } else {
-                source = $$replace(source, \\\\, /)
-                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
-                target = $$replace(target, \\\\, /)
-                copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
-            }
-        }
-    }
-    !isEmpty(copyCommand) {
-        copyCommand = @echo Copying application data... && $$copyCommand
-        copydeploymentfolders.commands = $$copyCommand
-        first.depends = $(first) copydeploymentfolders
-        export(first.depends)
-        export(copydeploymentfolders.commands)
-        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
-    }
-} else:unix {
-    maemo5 {
-        desktopfile.files = $${TARGET}.desktop
-        desktopfile.path = /usr/share/applications/hildon
-        icon.files = $${TARGET}64.png
-        icon.path = /usr/share/icons/hicolor/64x64/apps
-    } else:!isEmpty(MEEGO_VERSION_MAJOR) {
-        desktopfile.files = $${TARGET}_harmattan.desktop
-        desktopfile.path = /usr/share/applications
-        icon.files = $${TARGET}80.png
-        icon.path = /usr/share/icons/hicolor/80x80/apps
-    } else { # Assumed to be a Desktop Unix
-        copyCommand =
-        for(deploymentfolder, DEPLOYMENTFOLDERS) {
-            source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
-            source = $$replace(source, \\\\, /)
-            macx {
-                target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
-            } else {
-                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
-            }
-            target = $$replace(target, \\\\, /)
-            sourcePathSegments = $$split(source, /)
-            targetFullPath = $$target/$$last(sourcePathSegments)
-            targetFullPath ~= s,/\\.?/,/,
-            !isEqual(source,$$targetFullPath) {
-                !isEmpty(copyCommand):copyCommand += &&
-                copyCommand += $(MKDIR) \"$$target\"
-                copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
-            }
-        }
-        !isEmpty(copyCommand) {
-            copyCommand = @echo Copying application data... && $$copyCommand
-            copydeploymentfolders.commands = $$copyCommand
-            first.depends = $(first) copydeploymentfolders
-            export(first.depends)
-            export(copydeploymentfolders.commands)
-            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
-        }
-    }
-    installPrefix = /opt/$${TARGET}
-    for(deploymentfolder, DEPLOYMENTFOLDERS) {
-        item = item$${deploymentfolder}
-        itemfiles = $${item}.files
-        $$itemfiles = $$eval($${deploymentfolder}.source)
-        itempath = $${item}.path
-        $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
-        export($$itemfiles)
-        export($$itempath)
-        INSTALLS += $$item
-    }
-
-    !isEmpty(desktopfile.path) {
-        export(icon.files)
-        export(icon.path)
-        export(desktopfile.files)
-        export(desktopfile.path)
-        INSTALLS += icon desktopfile
-    }
-
-    target.path = $${installPrefix}/bin
-    export(target.path)
-    INSTALLS += target
-}
-
-export (ICON)
-export (INSTALLS)
-export (DEPLOYMENT)
-export (TARGET.EPOCHEAPSIZE)
-export (TARGET.CAPABILITY)
-export (LIBS)
-export (QMAKE_EXTRA_TARGETS)
-}
diff --git a/test/poi-service/poi-client/main.cpp b/test/poi-service/poi-client/main.cpp
index 9dd691b..2ecd913 100644
--- a/test/poi-service/poi-client/main.cpp
+++ b/test/poi-service/poi-client/main.cpp
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
     mainWindow.settingsMapHeightInMeter = settings.value("MapHeightInMeter").toUInt();
     mainWindow.settingsTimerPeriodForPosition = settings.value("TimerPeriodForPosition").toInt();
 
-    if (translator.load("poi-client_"+ mainWindow.settingsHMIlanguage,"../poi-common/"))
+    if (QResource::registerResource("../poi-resource.rcc") && translator.load("poi-client_"+ mainWindow.settingsHMIlanguage,"../../poi-common/"))
     {
         app.installTranslator(&translator);
 
diff --git a/test/poi-service/poi-client/poi-client.desktop.desktop b/test/poi-service/poi-client/poi-client.desktop.desktop
deleted file mode 100644
index 1d7faf5..0000000
--- a/test/poi-service/poi-client/poi-client.desktop.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=POIPOCClient
-Exec=/opt/POIPOCClient/bin/POIPOCClient
-Icon=POIPOCClient64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
-Name[en_US]=poi-client.desktop
diff --git a/test/poi-service/poi-client/poi-client.pro b/test/poi-service/poi-client/poi-client.pro
deleted file mode 100644
index 65dc109..0000000
--- a/test/poi-service/poi-client/poi-client.pro
+++ /dev/null
@@ -1,34 +0,0 @@
-
-QT += dbus widgets
-
-SOURCES += main.cpp mainwindow.cpp \
-    about-dialog.cpp \
-    poi-client-DBusSearchInterface.cpp \
-    poi-client-DBusRoutingInterface.cpp \
-    poi-client-DBusGuidanceInterface.cpp \
-    poi-client-DBusEnhancedPositionInterface.cpp \
-    poi-client-DBusNavigationCoreSessionInterface.cpp \
-    poi-client-DBusContentAccessInterface.cpp \
-    ../poi-common/poi-marshal-handler.cpp
-HEADERS += mainwindow.h \
-    poi-client-config.h \
-    about-dialog.h \
-    poi-client-DBusSearchInterface.h \
-    poi-client-DBusRoutingInterface.h \
-    poi-client-DBusGuidanceInterface.h \
-    poi-client-DBusEnhancedPositionInterface.h \
-    poi-client-DBusNavigationCoreSessionInterface.h \
-    poi-client-DBusContentAccessInterface.h \
-    ../poi-common/poi-marshal-handler.h
-FORMS += mainwindow.ui \
-    about-dialog.ui
-
-
-OTHER_FILES += \
-    about.txt
-
-RESOURCES += \
-    ../poi-common/poi-resource.qrc
-
-TRANSLATIONS    = ../poi-common/poi-client_en.ts \
-                  ../poi-common/poi-client_jp.ts
diff --git a/test/poi-service/poi-client/poi-client.svg b/test/poi-service/poi-client/poi-client.svg
deleted file mode 100644
index 566acfa..0000000
--- a/test/poi-service/poi-client/poi-client.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="44px"
-   version="1.1"
-   viewBox="0 0 44 44"
-   width="44px"
-   x="0px"
-   y="0px"
-   id="svg2"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="qt.svg">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs16">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 22 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="44 : 22 : 1"
-       inkscape:persp3d-origin="22 : 14.666667 : 1"
-       id="perspective2836" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1020"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="21.454545"
-     inkscape:cx="49.412871"
-     inkscape:cy="21.894358"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3" />
-  <g
-     transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
-     id="g3">
-    <path
-       d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
-       style="fill:#006225"
-       id="path5"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
-       style="fill:#80c342"
-       id="path7" />
-    <path
-       d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
-       style="fill:#006225"
-       id="path11" />
-    <path
-       d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
-       style="fill:#006225"
-       id="path13" />
-    <path
-       id="path17"
-       style="fill:#ffffff"
-       d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
-    <path
-       d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
-       style="fill:#006225"
-       id="path19" />
-    <path
-       id="path21"
-       style="fill:#006225"
-       d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
-  </g>
-</svg>
diff --git a/test/poi-service/poi-client/poi-client64.png b/test/poi-service/poi-client/poi-client64.png
deleted file mode 100644
index d011758..0000000
--- a/test/poi-service/poi-client/poi-client64.png
+++ /dev/null
diff --git a/test/poi-service/poi-client/poi-client80.png b/test/poi-service/poi-client/poi-client80.png
deleted file mode 100644
index 2b44c03..0000000
--- a/test/poi-service/poi-client/poi-client80.png
+++ /dev/null
diff --git a/test/poi-service/poi-client/ui_about-dialog.h b/test/poi-service/poi-client/ui_about-dialog.h
deleted file mode 100644
index 12b0d17..0000000
--- a/test/poi-service/poi-client/ui_about-dialog.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/********************************************************************************
-** Form generated from reading UI file 'about-dialog.ui'
-**
-** Created: Fri Feb 7 10:48:21 2014
-**      by: Qt User Interface Compiler version 4.8.1
-**
-** WARNING! All changes made in this file will be lost when recompiling UI file!
-********************************************************************************/
-
-#ifndef UI_ABOUT_2D_DIALOG_H
-#define UI_ABOUT_2D_DIALOG_H
-
-#include <QtCore/QVariant>
-#include <QAction>
-#include <QApplication>
-#include <QButtonGroup>
-#include <QDialog>
-#include <QHeaderView>
-#include <QPushButton>
-#include <QTextBrowser>
-#include <QWidget>
-
-QT_BEGIN_NAMESPACE
-
-class Ui_aboutDialog
-{
-public:
-    QTextBrowser *textBrowser;
-    QPushButton *pushButton;
-    QWidget *widget;
-
-    void setupUi(QDialog *aboutDialog)
-    {
-        if (aboutDialog->objectName().isEmpty())
-            aboutDialog->setObjectName(QString::fromUtf8("aboutDialog"));
-        aboutDialog->setEnabled(true);
-        aboutDialog->resize(400, 276);
-        aboutDialog->setStyleSheet(QString::fromUtf8("background-color: rgb(176, 196, 222);"));
-        textBrowser = new QTextBrowser(aboutDialog);
-        textBrowser->setObjectName(QString::fromUtf8("textBrowser"));
-        textBrowser->setEnabled(true);
-        textBrowser->setGeometry(QRect(20, 10, 361, 192));
-        textBrowser->setSource(QUrl(QString::fromUtf8("qrc:/new/text/about.txt")));
-        pushButton = new QPushButton(aboutDialog);
-        pushButton->setObjectName(QString::fromUtf8("pushButton"));
-        pushButton->setGeometry(QRect(280, 220, 98, 27));
-        pushButton->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-        widget = new QWidget(aboutDialog);
-        widget->setObjectName(QString::fromUtf8("widget"));
-        widget->setGeometry(QRect(30, 210, 231, 51));
-        widget->setStyleSheet(QString::fromUtf8("image: url(:/new/image/psa.jpg);"));
-
-        retranslateUi(aboutDialog);
-        QObject::connect(pushButton, SIGNAL(clicked()), aboutDialog, SLOT(accept()));
-
-        QMetaObject::connectSlotsByName(aboutDialog);
-    } // setupUi
-
-    void retranslateUi(QDialog *aboutDialog)
-    {
-        aboutDialog->setWindowTitle(QApplication::translate("aboutDialog", "About", 0));
-        pushButton->setText(QApplication::translate("aboutDialog", "OK", 0));
-    } // retranslateUi
-
-};
-
-namespace Ui {
-    class aboutDialog: public Ui_aboutDialog {};
-} // namespace Ui
-
-QT_END_NAMESPACE
-
-#endif // UI_ABOUT_2D_DIALOG_H
diff --git a/test/poi-service/poi-client/ui_mainwindow.h b/test/poi-service/poi-client/ui_mainwindow.h
deleted file mode 100644
index 05a09ac..0000000
--- a/test/poi-service/poi-client/ui_mainwindow.h
+++ /dev/null
@@ -1,1188 +0,0 @@
-/********************************************************************************
-** Form generated from reading UI file 'mainwindow.ui'
-**
-** Created: Fri Feb 7 10:47:41 2014
-**      by: Qt User Interface Compiler version 4.8.1
-**
-** WARNING! All changes made in this file will be lost when recompiling UI file!
-********************************************************************************/
-
-#ifndef UI_MAINWINDOW_H
-#define UI_MAINWINDOW_H
-
-#include <QtCore/QVariant>
-#include <QAction>
-#include <QApplication>
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QFrame>
-#include <QGraphicsView>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QHeaderView>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMainWindow>
-#include <QMenuBar>
-#include <QPushButton>
-#include <QSpacerItem>
-#include <QTabWidget>
-#include <QTableView>
-#include <QVBoxLayout>
-#include <QWidget>
-
-QT_BEGIN_NAMESPACE
-
-class Ui_MainWindow
-{
-public:
-    QWidget *centralWidget;
-    QWidget *verticalLayoutWidget;
-    QVBoxLayout *verticalLayout;
-    QLabel *label_2;
-    QSpacerItem *verticalSpacer_2;
-    QLabel *searchMode;
-    QWidget *verticalLayoutWidget_2;
-    QVBoxLayout *verticalLayout_2;
-    QHBoxLayout *horizontalLayout;
-    QLabel *label;
-    QVBoxLayout *verticalLayout_8;
-    QCheckBox *checkLocation;
-    QHBoxLayout *horizontalLayout_9;
-    QLabel *label_16;
-    QLabel *currentLocationLatitude;
-    QHBoxLayout *horizontalLayout_10;
-    QLabel *label_17;
-    QLabel *currentLocationLongitude;
-    QHBoxLayout *latitude_layout;
-    QComboBox *latitude_direction;
-    QSpacerItem *horizontalSpacer;
-    QLineEdit *latitude_degree;
-    QSpacerItem *horizontalSpacer_2;
-    QLineEdit *latitude_minute;
-    QLineEdit *latitude_second;
-    QSpacerItem *horizontalSpacer_3;
-    QHBoxLayout *longitude_layout;
-    QSpacerItem *horizontalSpacer_4;
-    QComboBox *longitude_direction;
-    QLineEdit *longitude_degree;
-    QSpacerItem *horizontalSpacer_5;
-    QLineEdit *longitude_minute;
-    QLineEdit *longitude_second;
-    QSpacerItem *horizontalSpacer_6;
-    QVBoxLayout *verticalLayout_17;
-    QLineEdit *stringToSearch;
-    QVBoxLayout *verticalLayout_16;
-    QHBoxLayout *horizontalLayout_4;
-    QSpacerItem *horizontalSpacer_13;
-    QPushButton *startSearch;
-    QSpacerItem *horizontalSpacer_14;
-    QHBoxLayout *horizontalLayout_6;
-    QSpacerItem *horizontalSpacer_16;
-    QPushButton *cancelSearch;
-    QSpacerItem *horizontalSpacer_25;
-    QWidget *verticalLayoutWidget_4;
-    QVBoxLayout *verticalLayout_4;
-    QLabel *label_4;
-    QHBoxLayout *horizontalLayout_11;
-    QPushButton *setProximity;
-    QHBoxLayout *horizontalLayout_12;
-    QPushButton *cancelProximity;
-    QWidget *verticalLayoutWidget_5;
-    QVBoxLayout *verticalLayout_5;
-    QLabel *label_5;
-    QSpacerItem *verticalSpacer_8;
-    QLabel *poiHandle;
-    QPushButton *createpoiHandle;
-    QPushButton *deletepoiHandle;
-    QWidget *verticalLayoutWidget_3;
-    QVBoxLayout *verticalLayout_3;
-    QLabel *label_8;
-    QSpacerItem *verticalSpacer_9;
-    QLabel *search_status;
-    QLabel *totalSize;
-    QFrame *line;
-    QFrame *line_3;
-    QFrame *line_4;
-    QFrame *line_10;
-    QWidget *widget;
-    QTabWidget *tabWidget;
-    QWidget *searchSettings;
-    QWidget *verticalLayoutWidget_7;
-    QVBoxLayout *verticalLayout_6;
-    QHBoxLayout *CategoryDetailsLayout;
-    QVBoxLayout *CategoryLayout;
-    QLabel *label_9;
-    QVBoxLayout *RadiusLayout;
-    QLabel *label_10;
-    QVBoxLayout *SourceLayout;
-    QLabel *label_3;
-    QVBoxLayout *WebSiteLayout;
-    QLabel *label_7;
-    QVBoxLayout *PhoneLayout;
-    QLabel *label_11;
-    QVBoxLayout *StarsLayout;
-    QLabel *label_12;
-    QVBoxLayout *OpeningHoursLayout;
-    QLabel *label_6;
-    QVBoxLayout *AddrHouseNumberLayout;
-    QLabel *label_18;
-    QVBoxLayout *AddrStreetLayout;
-    QLabel *label_21;
-    QVBoxLayout *AddrPostCodeLayout;
-    QLabel *label_22;
-    QVBoxLayout *AddrCityLayout;
-    QLabel *label_30;
-    QVBoxLayout *BrandLayout;
-    QLabel *label_31;
-    QVBoxLayout *OperateurLayout;
-    QLabel *label_32;
-    QWidget *verticalLayoutWidget_14;
-    QVBoxLayout *verticalLayout_15;
-    QHBoxLayout *CategoryDetailsLayoutAdditional;
-    QVBoxLayout *CategoryLayoutAdditional;
-    QLabel *label_23;
-    QVBoxLayout *RadiusLayoutAdditional;
-    QLabel *label_28;
-    QVBoxLayout *SourceLayoutAdditional;
-    QLabel *label_24;
-    QVBoxLayout *WebSiteLayoutAdditional;
-    QLabel *label_25;
-    QVBoxLayout *PhoneLayoutAdditional;
-    QLabel *label_26;
-    QVBoxLayout *StarsLayoutAdditional;
-    QLabel *label_27;
-    QVBoxLayout *OpeningHoursLayoutAdditional;
-    QLabel *label_29;
-    QVBoxLayout *AddrHouseNumberLayoutAdditional;
-    QLabel *label_34;
-    QVBoxLayout *AddrStreetLayoutAdditional;
-    QLabel *label_37;
-    QVBoxLayout *AddrPostCodeLayoutAdditional;
-    QLabel *label_36;
-    QVBoxLayout *AddrCityLayoutAdditional;
-    QLabel *label_35;
-    QVBoxLayout *BrandLayoutAdditional;
-    QLabel *label_39;
-    QVBoxLayout *OperateurLayoutAdditional;
-    QLabel *label_38;
-    QWidget *resultList;
-    QTableView *table_view_poi;
-    QWidget *verticalLayoutWidget_11;
-    QVBoxLayout *verticalLayout_12;
-    QPushButton *getTopList;
-    QPushButton *getPrevList;
-    QPushButton *getNextList;
-    QLabel *recordFrom;
-    QLabel *label_14;
-    QLabel *recordTo;
-    QLabel *label_15;
-    QWidget *verticalLayoutWidget_6;
-    QVBoxLayout *verticalLayout_7;
-    QLabel *label_13;
-    QHBoxLayout *AttributeToGetLayout;
-    QWidget *resultView;
-    QGraphicsView *graphicsView;
-    QWidget *verticalLayoutWidget_10;
-    QVBoxLayout *verticalLayout_11;
-    QLabel *label_20;
-    QLabel *routeHandle;
-    QWidget *verticalLayoutWidget_9;
-    QVBoxLayout *verticalLayout_9;
-    QLabel *label_19;
-    QLabel *routeTotalSegments;
-    QWidget *settings;
-    QGroupBox *groupBox_2;
-    QLabel *VersionSearch;
-    QGroupBox *groupBox;
-    QLabel *languageCode;
-    QLabel *countryCode;
-    QPushButton *About;
-    QMenuBar *menuBar;
-
-    void setupUi(QMainWindow *MainWindow)
-    {
-        if (MainWindow->objectName().isEmpty())
-            MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
-        MainWindow->setEnabled(true);
-        MainWindow->resize(910, 768);
-        QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-        sizePolicy.setHorizontalStretch(0);
-        sizePolicy.setVerticalStretch(0);
-        sizePolicy.setHeightForWidth(MainWindow->sizePolicy().hasHeightForWidth());
-        MainWindow->setSizePolicy(sizePolicy);
-        MainWindow->setMinimumSize(QSize(910, 768));
-        MainWindow->setMaximumSize(QSize(910, 768));
-        QIcon icon;
-        icon.addFile(QString::fromUtf8(":/new/image/POIPOCClient.png"), QSize(), QIcon::Normal, QIcon::Off);
-        MainWindow->setWindowIcon(icon);
-        MainWindow->setStyleSheet(QString::fromUtf8("background-color: rgb(176, 196, 222);"));
-        centralWidget = new QWidget(MainWindow);
-        centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
-        verticalLayoutWidget = new QWidget(centralWidget);
-        verticalLayoutWidget->setObjectName(QString::fromUtf8("verticalLayoutWidget"));
-        verticalLayoutWidget->setGeometry(QRect(460, 10, 141, 51));
-        verticalLayout = new QVBoxLayout(verticalLayoutWidget);
-        verticalLayout->setSpacing(6);
-        verticalLayout->setContentsMargins(11, 11, 11, 11);
-        verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
-        verticalLayout->setContentsMargins(0, 0, 0, 0);
-        label_2 = new QLabel(verticalLayoutWidget);
-        label_2->setObjectName(QString::fromUtf8("label_2"));
-        QFont font;
-        font.setPointSize(9);
-        label_2->setFont(font);
-
-        verticalLayout->addWidget(label_2);
-
-        verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-        verticalLayout->addItem(verticalSpacer_2);
-
-        searchMode = new QLabel(verticalLayoutWidget);
-        searchMode->setObjectName(QString::fromUtf8("searchMode"));
-        searchMode->setFont(font);
-
-        verticalLayout->addWidget(searchMode);
-
-        verticalLayoutWidget_2 = new QWidget(centralWidget);
-        verticalLayoutWidget_2->setObjectName(QString::fromUtf8("verticalLayoutWidget_2"));
-        verticalLayoutWidget_2->setGeometry(QRect(150, 10, 281, 220));
-        verticalLayout_2 = new QVBoxLayout(verticalLayoutWidget_2);
-        verticalLayout_2->setSpacing(6);
-        verticalLayout_2->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
-        verticalLayout_2->setContentsMargins(0, 0, 0, 0);
-        horizontalLayout = new QHBoxLayout();
-        horizontalLayout->setSpacing(6);
-        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
-        label = new QLabel(verticalLayoutWidget_2);
-        label->setObjectName(QString::fromUtf8("label"));
-        label->setFont(font);
-        label->setAlignment(Qt::AlignCenter);
-
-        horizontalLayout->addWidget(label);
-
-        verticalLayout_8 = new QVBoxLayout();
-        verticalLayout_8->setSpacing(6);
-        verticalLayout_8->setObjectName(QString::fromUtf8("verticalLayout_8"));
-        checkLocation = new QCheckBox(verticalLayoutWidget_2);
-        checkLocation->setObjectName(QString::fromUtf8("checkLocation"));
-
-        verticalLayout_8->addWidget(checkLocation);
-
-        horizontalLayout_9 = new QHBoxLayout();
-        horizontalLayout_9->setSpacing(6);
-        horizontalLayout_9->setObjectName(QString::fromUtf8("horizontalLayout_9"));
-        label_16 = new QLabel(verticalLayoutWidget_2);
-        label_16->setObjectName(QString::fromUtf8("label_16"));
-
-        horizontalLayout_9->addWidget(label_16);
-
-        currentLocationLatitude = new QLabel(verticalLayoutWidget_2);
-        currentLocationLatitude->setObjectName(QString::fromUtf8("currentLocationLatitude"));
-
-        horizontalLayout_9->addWidget(currentLocationLatitude);
-
-
-        verticalLayout_8->addLayout(horizontalLayout_9);
-
-        horizontalLayout_10 = new QHBoxLayout();
-        horizontalLayout_10->setSpacing(6);
-        horizontalLayout_10->setObjectName(QString::fromUtf8("horizontalLayout_10"));
-        label_17 = new QLabel(verticalLayoutWidget_2);
-        label_17->setObjectName(QString::fromUtf8("label_17"));
-
-        horizontalLayout_10->addWidget(label_17);
-
-        currentLocationLongitude = new QLabel(verticalLayoutWidget_2);
-        currentLocationLongitude->setObjectName(QString::fromUtf8("currentLocationLongitude"));
-
-        horizontalLayout_10->addWidget(currentLocationLongitude);
-
-
-        verticalLayout_8->addLayout(horizontalLayout_10);
-
-
-        horizontalLayout->addLayout(verticalLayout_8);
-
-
-        verticalLayout_2->addLayout(horizontalLayout);
-
-        latitude_layout = new QHBoxLayout();
-        latitude_layout->setSpacing(6);
-        latitude_layout->setObjectName(QString::fromUtf8("latitude_layout"));
-        latitude_direction = new QComboBox(verticalLayoutWidget_2);
-        latitude_direction->setObjectName(QString::fromUtf8("latitude_direction"));
-        QFont font1;
-        font1.setPointSize(7);
-        latitude_direction->setFont(font1);
-        latitude_direction->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        latitude_layout->addWidget(latitude_direction);
-
-        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        latitude_layout->addItem(horizontalSpacer);
-
-        latitude_degree = new QLineEdit(verticalLayoutWidget_2);
-        latitude_degree->setObjectName(QString::fromUtf8("latitude_degree"));
-
-        latitude_layout->addWidget(latitude_degree);
-
-        horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        latitude_layout->addItem(horizontalSpacer_2);
-
-        latitude_minute = new QLineEdit(verticalLayoutWidget_2);
-        latitude_minute->setObjectName(QString::fromUtf8("latitude_minute"));
-
-        latitude_layout->addWidget(latitude_minute);
-
-        latitude_second = new QLineEdit(verticalLayoutWidget_2);
-        latitude_second->setObjectName(QString::fromUtf8("latitude_second"));
-
-        latitude_layout->addWidget(latitude_second);
-
-        horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        latitude_layout->addItem(horizontalSpacer_3);
-
-
-        verticalLayout_2->addLayout(latitude_layout);
-
-        longitude_layout = new QHBoxLayout();
-        longitude_layout->setSpacing(6);
-        longitude_layout->setObjectName(QString::fromUtf8("longitude_layout"));
-        horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        longitude_layout->addItem(horizontalSpacer_4);
-
-        longitude_direction = new QComboBox(verticalLayoutWidget_2);
-        longitude_direction->setObjectName(QString::fromUtf8("longitude_direction"));
-        longitude_direction->setFont(font1);
-        longitude_direction->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        longitude_layout->addWidget(longitude_direction);
-
-        longitude_degree = new QLineEdit(verticalLayoutWidget_2);
-        longitude_degree->setObjectName(QString::fromUtf8("longitude_degree"));
-
-        longitude_layout->addWidget(longitude_degree);
-
-        horizontalSpacer_5 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        longitude_layout->addItem(horizontalSpacer_5);
-
-        longitude_minute = new QLineEdit(verticalLayoutWidget_2);
-        longitude_minute->setObjectName(QString::fromUtf8("longitude_minute"));
-
-        longitude_layout->addWidget(longitude_minute);
-
-        longitude_second = new QLineEdit(verticalLayoutWidget_2);
-        longitude_second->setObjectName(QString::fromUtf8("longitude_second"));
-
-        longitude_layout->addWidget(longitude_second);
-
-        horizontalSpacer_6 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        longitude_layout->addItem(horizontalSpacer_6);
-
-
-        verticalLayout_2->addLayout(longitude_layout);
-
-        verticalLayout_17 = new QVBoxLayout();
-        verticalLayout_17->setSpacing(6);
-        verticalLayout_17->setObjectName(QString::fromUtf8("verticalLayout_17"));
-        stringToSearch = new QLineEdit(verticalLayoutWidget_2);
-        stringToSearch->setObjectName(QString::fromUtf8("stringToSearch"));
-        stringToSearch->setFont(font);
-
-        verticalLayout_17->addWidget(stringToSearch);
-
-
-        verticalLayout_2->addLayout(verticalLayout_17);
-
-        verticalLayout_16 = new QVBoxLayout();
-        verticalLayout_16->setSpacing(6);
-        verticalLayout_16->setObjectName(QString::fromUtf8("verticalLayout_16"));
-        horizontalLayout_4 = new QHBoxLayout();
-        horizontalLayout_4->setSpacing(6);
-        horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4"));
-        horizontalSpacer_13 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        horizontalLayout_4->addItem(horizontalSpacer_13);
-
-        startSearch = new QPushButton(verticalLayoutWidget_2);
-        startSearch->setObjectName(QString::fromUtf8("startSearch"));
-        startSearch->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        horizontalLayout_4->addWidget(startSearch);
-
-        horizontalSpacer_14 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        horizontalLayout_4->addItem(horizontalSpacer_14);
-
-        horizontalLayout_6 = new QHBoxLayout();
-        horizontalLayout_6->setSpacing(6);
-        horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6"));
-        horizontalSpacer_16 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        horizontalLayout_6->addItem(horizontalSpacer_16);
-
-        cancelSearch = new QPushButton(verticalLayoutWidget_2);
-        cancelSearch->setObjectName(QString::fromUtf8("cancelSearch"));
-        cancelSearch->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        horizontalLayout_6->addWidget(cancelSearch);
-
-        horizontalSpacer_25 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        horizontalLayout_6->addItem(horizontalSpacer_25);
-
-
-        horizontalLayout_4->addLayout(horizontalLayout_6);
-
-
-        verticalLayout_16->addLayout(horizontalLayout_4);
-
-
-        verticalLayout_2->addLayout(verticalLayout_16);
-
-        verticalLayoutWidget_4 = new QWidget(centralWidget);
-        verticalLayoutWidget_4->setObjectName(QString::fromUtf8("verticalLayoutWidget_4"));
-        verticalLayoutWidget_4->setGeometry(QRect(10, 133, 111, 101));
-        verticalLayout_4 = new QVBoxLayout(verticalLayoutWidget_4);
-        verticalLayout_4->setSpacing(6);
-        verticalLayout_4->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
-        verticalLayout_4->setContentsMargins(0, 0, 0, 0);
-        label_4 = new QLabel(verticalLayoutWidget_4);
-        label_4->setObjectName(QString::fromUtf8("label_4"));
-        QFont font2;
-        font2.setPointSize(8);
-        label_4->setFont(font2);
-        label_4->setAlignment(Qt::AlignCenter);
-
-        verticalLayout_4->addWidget(label_4);
-
-        horizontalLayout_11 = new QHBoxLayout();
-        horizontalLayout_11->setSpacing(6);
-        horizontalLayout_11->setObjectName(QString::fromUtf8("horizontalLayout_11"));
-        setProximity = new QPushButton(verticalLayoutWidget_4);
-        setProximity->setObjectName(QString::fromUtf8("setProximity"));
-        setProximity->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        horizontalLayout_11->addWidget(setProximity);
-
-
-        verticalLayout_4->addLayout(horizontalLayout_11);
-
-        horizontalLayout_12 = new QHBoxLayout();
-        horizontalLayout_12->setSpacing(6);
-        horizontalLayout_12->setObjectName(QString::fromUtf8("horizontalLayout_12"));
-        cancelProximity = new QPushButton(verticalLayoutWidget_4);
-        cancelProximity->setObjectName(QString::fromUtf8("cancelProximity"));
-        cancelProximity->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        horizontalLayout_12->addWidget(cancelProximity);
-
-
-        verticalLayout_4->addLayout(horizontalLayout_12);
-
-        verticalLayoutWidget_5 = new QWidget(centralWidget);
-        verticalLayoutWidget_5->setObjectName(QString::fromUtf8("verticalLayoutWidget_5"));
-        verticalLayoutWidget_5->setGeometry(QRect(10, 10, 111, 111));
-        verticalLayout_5 = new QVBoxLayout(verticalLayoutWidget_5);
-        verticalLayout_5->setSpacing(6);
-        verticalLayout_5->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5"));
-        verticalLayout_5->setContentsMargins(0, 0, 0, 0);
-        label_5 = new QLabel(verticalLayoutWidget_5);
-        label_5->setObjectName(QString::fromUtf8("label_5"));
-        QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Preferred);
-        sizePolicy1.setHorizontalStretch(0);
-        sizePolicy1.setVerticalStretch(0);
-        sizePolicy1.setHeightForWidth(label_5->sizePolicy().hasHeightForWidth());
-        label_5->setSizePolicy(sizePolicy1);
-        label_5->setFont(font2);
-
-        verticalLayout_5->addWidget(label_5);
-
-        verticalSpacer_8 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-        verticalLayout_5->addItem(verticalSpacer_8);
-
-        poiHandle = new QLabel(verticalLayoutWidget_5);
-        poiHandle->setObjectName(QString::fromUtf8("poiHandle"));
-        poiHandle->setFont(font);
-
-        verticalLayout_5->addWidget(poiHandle);
-
-        createpoiHandle = new QPushButton(verticalLayoutWidget_5);
-        createpoiHandle->setObjectName(QString::fromUtf8("createpoiHandle"));
-        createpoiHandle->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        verticalLayout_5->addWidget(createpoiHandle);
-
-        deletepoiHandle = new QPushButton(verticalLayoutWidget_5);
-        deletepoiHandle->setObjectName(QString::fromUtf8("deletepoiHandle"));
-        deletepoiHandle->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        verticalLayout_5->addWidget(deletepoiHandle);
-
-        verticalLayoutWidget_3 = new QWidget(centralWidget);
-        verticalLayoutWidget_3->setObjectName(QString::fromUtf8("verticalLayoutWidget_3"));
-        verticalLayoutWidget_3->setGeometry(QRect(460, 80, 141, 81));
-        verticalLayout_3 = new QVBoxLayout(verticalLayoutWidget_3);
-        verticalLayout_3->setSpacing(6);
-        verticalLayout_3->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
-        verticalLayout_3->setContentsMargins(0, 0, 0, 0);
-        label_8 = new QLabel(verticalLayoutWidget_3);
-        label_8->setObjectName(QString::fromUtf8("label_8"));
-        label_8->setFont(font);
-        label_8->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
-
-        verticalLayout_3->addWidget(label_8);
-
-        verticalSpacer_9 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-
-        verticalLayout_3->addItem(verticalSpacer_9);
-
-        search_status = new QLabel(verticalLayoutWidget_3);
-        search_status->setObjectName(QString::fromUtf8("search_status"));
-        search_status->setFont(font);
-
-        verticalLayout_3->addWidget(search_status);
-
-        totalSize = new QLabel(verticalLayoutWidget_3);
-        totalSize->setObjectName(QString::fromUtf8("totalSize"));
-        totalSize->setFont(font);
-
-        verticalLayout_3->addWidget(totalSize);
-
-        line = new QFrame(centralWidget);
-        line->setObjectName(QString::fromUtf8("line"));
-        line->setGeometry(QRect(130, 10, 20, 231));
-        line->setFrameShape(QFrame::VLine);
-        line->setFrameShadow(QFrame::Sunken);
-        line_3 = new QFrame(centralWidget);
-        line_3->setObjectName(QString::fromUtf8("line_3"));
-        line_3->setGeometry(QRect(10, 240, 891, 21));
-        line_3->setFrameShape(QFrame::HLine);
-        line_3->setFrameShadow(QFrame::Sunken);
-        line_4 = new QFrame(centralWidget);
-        line_4->setObjectName(QString::fromUtf8("line_4"));
-        line_4->setGeometry(QRect(430, 10, 20, 231));
-        line_4->setFrameShape(QFrame::VLine);
-        line_4->setFrameShadow(QFrame::Sunken);
-        line_10 = new QFrame(centralWidget);
-        line_10->setObjectName(QString::fromUtf8("line_10"));
-        line_10->setGeometry(QRect(630, 10, 20, 231));
-        line_10->setFrameShape(QFrame::VLine);
-        line_10->setFrameShadow(QFrame::Sunken);
-        widget = new QWidget(centralWidget);
-        widget->setObjectName(QString::fromUtf8("widget"));
-        widget->setGeometry(QRect(670, 40, 121, 91));
-        widget->setStyleSheet(QString::fromUtf8("image: url(:/new/image/GENIVI_Black_Logo-no_background.png);"));
-        tabWidget = new QTabWidget(centralWidget);
-        tabWidget->setObjectName(QString::fromUtf8("tabWidget"));
-        tabWidget->setGeometry(QRect(10, 260, 891, 471));
-        searchSettings = new QWidget();
-        searchSettings->setObjectName(QString::fromUtf8("searchSettings"));
-        verticalLayoutWidget_7 = new QWidget(searchSettings);
-        verticalLayoutWidget_7->setObjectName(QString::fromUtf8("verticalLayoutWidget_7"));
-        verticalLayoutWidget_7->setGeometry(QRect(10, 120, 861, 171));
-        verticalLayout_6 = new QVBoxLayout(verticalLayoutWidget_7);
-        verticalLayout_6->setSpacing(6);
-        verticalLayout_6->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_6->setObjectName(QString::fromUtf8("verticalLayout_6"));
-        verticalLayout_6->setContentsMargins(0, 0, 0, 0);
-        CategoryDetailsLayout = new QHBoxLayout();
-        CategoryDetailsLayout->setSpacing(6);
-        CategoryDetailsLayout->setObjectName(QString::fromUtf8("CategoryDetailsLayout"));
-        CategoryLayout = new QVBoxLayout();
-        CategoryLayout->setSpacing(6);
-        CategoryLayout->setObjectName(QString::fromUtf8("CategoryLayout"));
-        label_9 = new QLabel(verticalLayoutWidget_7);
-        label_9->setObjectName(QString::fromUtf8("label_9"));
-        label_9->setFont(font);
-
-        CategoryLayout->addWidget(label_9);
-
-
-        CategoryDetailsLayout->addLayout(CategoryLayout);
-
-        RadiusLayout = new QVBoxLayout();
-        RadiusLayout->setSpacing(6);
-        RadiusLayout->setObjectName(QString::fromUtf8("RadiusLayout"));
-        label_10 = new QLabel(verticalLayoutWidget_7);
-        label_10->setObjectName(QString::fromUtf8("label_10"));
-        label_10->setFont(font);
-
-        RadiusLayout->addWidget(label_10);
-
-
-        CategoryDetailsLayout->addLayout(RadiusLayout);
-
-        SourceLayout = new QVBoxLayout();
-        SourceLayout->setSpacing(6);
-        SourceLayout->setObjectName(QString::fromUtf8("SourceLayout"));
-        label_3 = new QLabel(verticalLayoutWidget_7);
-        label_3->setObjectName(QString::fromUtf8("label_3"));
-        label_3->setFont(font);
-
-        SourceLayout->addWidget(label_3);
-
-
-        CategoryDetailsLayout->addLayout(SourceLayout);
-
-        WebSiteLayout = new QVBoxLayout();
-        WebSiteLayout->setSpacing(6);
-        WebSiteLayout->setObjectName(QString::fromUtf8("WebSiteLayout"));
-        label_7 = new QLabel(verticalLayoutWidget_7);
-        label_7->setObjectName(QString::fromUtf8("label_7"));
-        label_7->setFont(font);
-
-        WebSiteLayout->addWidget(label_7);
-
-
-        CategoryDetailsLayout->addLayout(WebSiteLayout);
-
-        PhoneLayout = new QVBoxLayout();
-        PhoneLayout->setSpacing(6);
-        PhoneLayout->setObjectName(QString::fromUtf8("PhoneLayout"));
-        label_11 = new QLabel(verticalLayoutWidget_7);
-        label_11->setObjectName(QString::fromUtf8("label_11"));
-        label_11->setFont(font);
-
-        PhoneLayout->addWidget(label_11);
-
-
-        CategoryDetailsLayout->addLayout(PhoneLayout);
-
-        StarsLayout = new QVBoxLayout();
-        StarsLayout->setSpacing(6);
-        StarsLayout->setObjectName(QString::fromUtf8("StarsLayout"));
-        label_12 = new QLabel(verticalLayoutWidget_7);
-        label_12->setObjectName(QString::fromUtf8("label_12"));
-        label_12->setFont(font);
-
-        StarsLayout->addWidget(label_12);
-
-
-        CategoryDetailsLayout->addLayout(StarsLayout);
-
-        OpeningHoursLayout = new QVBoxLayout();
-        OpeningHoursLayout->setSpacing(6);
-        OpeningHoursLayout->setObjectName(QString::fromUtf8("OpeningHoursLayout"));
-        label_6 = new QLabel(verticalLayoutWidget_7);
-        label_6->setObjectName(QString::fromUtf8("label_6"));
-        label_6->setFont(font);
-
-        OpeningHoursLayout->addWidget(label_6);
-
-
-        CategoryDetailsLayout->addLayout(OpeningHoursLayout);
-
-        AddrHouseNumberLayout = new QVBoxLayout();
-        AddrHouseNumberLayout->setSpacing(6);
-        AddrHouseNumberLayout->setObjectName(QString::fromUtf8("AddrHouseNumberLayout"));
-        label_18 = new QLabel(verticalLayoutWidget_7);
-        label_18->setObjectName(QString::fromUtf8("label_18"));
-        label_18->setFont(font);
-
-        AddrHouseNumberLayout->addWidget(label_18);
-
-
-        CategoryDetailsLayout->addLayout(AddrHouseNumberLayout);
-
-        AddrStreetLayout = new QVBoxLayout();
-        AddrStreetLayout->setSpacing(6);
-        AddrStreetLayout->setObjectName(QString::fromUtf8("AddrStreetLayout"));
-        label_21 = new QLabel(verticalLayoutWidget_7);
-        label_21->setObjectName(QString::fromUtf8("label_21"));
-        label_21->setFont(font);
-
-        AddrStreetLayout->addWidget(label_21);
-
-
-        CategoryDetailsLayout->addLayout(AddrStreetLayout);
-
-        AddrPostCodeLayout = new QVBoxLayout();
-        AddrPostCodeLayout->setSpacing(6);
-        AddrPostCodeLayout->setObjectName(QString::fromUtf8("AddrPostCodeLayout"));
-        label_22 = new QLabel(verticalLayoutWidget_7);
-        label_22->setObjectName(QString::fromUtf8("label_22"));
-        label_22->setFont(font);
-
-        AddrPostCodeLayout->addWidget(label_22);
-
-
-        CategoryDetailsLayout->addLayout(AddrPostCodeLayout);
-
-        AddrCityLayout = new QVBoxLayout();
-        AddrCityLayout->setSpacing(6);
-        AddrCityLayout->setObjectName(QString::fromUtf8("AddrCityLayout"));
-        label_30 = new QLabel(verticalLayoutWidget_7);
-        label_30->setObjectName(QString::fromUtf8("label_30"));
-        label_30->setFont(font);
-
-        AddrCityLayout->addWidget(label_30);
-
-
-        CategoryDetailsLayout->addLayout(AddrCityLayout);
-
-        BrandLayout = new QVBoxLayout();
-        BrandLayout->setSpacing(6);
-        BrandLayout->setObjectName(QString::fromUtf8("BrandLayout"));
-        label_31 = new QLabel(verticalLayoutWidget_7);
-        label_31->setObjectName(QString::fromUtf8("label_31"));
-        label_31->setFont(font);
-
-        BrandLayout->addWidget(label_31);
-
-
-        CategoryDetailsLayout->addLayout(BrandLayout);
-
-        OperateurLayout = new QVBoxLayout();
-        OperateurLayout->setSpacing(6);
-        OperateurLayout->setObjectName(QString::fromUtf8("OperateurLayout"));
-        label_32 = new QLabel(verticalLayoutWidget_7);
-        label_32->setObjectName(QString::fromUtf8("label_32"));
-        label_32->setFont(font);
-
-        OperateurLayout->addWidget(label_32);
-
-
-        CategoryDetailsLayout->addLayout(OperateurLayout);
-
-
-        verticalLayout_6->addLayout(CategoryDetailsLayout);
-
-        verticalLayoutWidget_14 = new QWidget(searchSettings);
-        verticalLayoutWidget_14->setObjectName(QString::fromUtf8("verticalLayoutWidget_14"));
-        verticalLayoutWidget_14->setGeometry(QRect(10, 340, 861, 91));
-        verticalLayout_15 = new QVBoxLayout(verticalLayoutWidget_14);
-        verticalLayout_15->setSpacing(6);
-        verticalLayout_15->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_15->setObjectName(QString::fromUtf8("verticalLayout_15"));
-        verticalLayout_15->setContentsMargins(0, 0, 0, 0);
-        CategoryDetailsLayoutAdditional = new QHBoxLayout();
-        CategoryDetailsLayoutAdditional->setSpacing(6);
-        CategoryDetailsLayoutAdditional->setObjectName(QString::fromUtf8("CategoryDetailsLayoutAdditional"));
-        CategoryLayoutAdditional = new QVBoxLayout();
-        CategoryLayoutAdditional->setSpacing(6);
-        CategoryLayoutAdditional->setObjectName(QString::fromUtf8("CategoryLayoutAdditional"));
-        label_23 = new QLabel(verticalLayoutWidget_14);
-        label_23->setObjectName(QString::fromUtf8("label_23"));
-        label_23->setFont(font);
-
-        CategoryLayoutAdditional->addWidget(label_23);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(CategoryLayoutAdditional);
-
-        RadiusLayoutAdditional = new QVBoxLayout();
-        RadiusLayoutAdditional->setSpacing(6);
-        RadiusLayoutAdditional->setObjectName(QString::fromUtf8("RadiusLayoutAdditional"));
-        label_28 = new QLabel(verticalLayoutWidget_14);
-        label_28->setObjectName(QString::fromUtf8("label_28"));
-        label_28->setFont(font);
-
-        RadiusLayoutAdditional->addWidget(label_28);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(RadiusLayoutAdditional);
-
-        SourceLayoutAdditional = new QVBoxLayout();
-        SourceLayoutAdditional->setSpacing(6);
-        SourceLayoutAdditional->setObjectName(QString::fromUtf8("SourceLayoutAdditional"));
-        label_24 = new QLabel(verticalLayoutWidget_14);
-        label_24->setObjectName(QString::fromUtf8("label_24"));
-        label_24->setFont(font);
-
-        SourceLayoutAdditional->addWidget(label_24);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(SourceLayoutAdditional);
-
-        WebSiteLayoutAdditional = new QVBoxLayout();
-        WebSiteLayoutAdditional->setSpacing(6);
-        WebSiteLayoutAdditional->setObjectName(QString::fromUtf8("WebSiteLayoutAdditional"));
-        label_25 = new QLabel(verticalLayoutWidget_14);
-        label_25->setObjectName(QString::fromUtf8("label_25"));
-        label_25->setFont(font);
-
-        WebSiteLayoutAdditional->addWidget(label_25);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(WebSiteLayoutAdditional);
-
-        PhoneLayoutAdditional = new QVBoxLayout();
-        PhoneLayoutAdditional->setSpacing(6);
-        PhoneLayoutAdditional->setObjectName(QString::fromUtf8("PhoneLayoutAdditional"));
-        label_26 = new QLabel(verticalLayoutWidget_14);
-        label_26->setObjectName(QString::fromUtf8("label_26"));
-        label_26->setFont(font);
-
-        PhoneLayoutAdditional->addWidget(label_26);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(PhoneLayoutAdditional);
-
-        StarsLayoutAdditional = new QVBoxLayout();
-        StarsLayoutAdditional->setSpacing(6);
-        StarsLayoutAdditional->setObjectName(QString::fromUtf8("StarsLayoutAdditional"));
-        label_27 = new QLabel(verticalLayoutWidget_14);
-        label_27->setObjectName(QString::fromUtf8("label_27"));
-        label_27->setFont(font);
-
-        StarsLayoutAdditional->addWidget(label_27);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(StarsLayoutAdditional);
-
-        OpeningHoursLayoutAdditional = new QVBoxLayout();
-        OpeningHoursLayoutAdditional->setSpacing(6);
-        OpeningHoursLayoutAdditional->setObjectName(QString::fromUtf8("OpeningHoursLayoutAdditional"));
-        label_29 = new QLabel(verticalLayoutWidget_14);
-        label_29->setObjectName(QString::fromUtf8("label_29"));
-        label_29->setFont(font);
-
-        OpeningHoursLayoutAdditional->addWidget(label_29);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(OpeningHoursLayoutAdditional);
-
-        AddrHouseNumberLayoutAdditional = new QVBoxLayout();
-        AddrHouseNumberLayoutAdditional->setSpacing(6);
-        AddrHouseNumberLayoutAdditional->setObjectName(QString::fromUtf8("AddrHouseNumberLayoutAdditional"));
-        label_34 = new QLabel(verticalLayoutWidget_14);
-        label_34->setObjectName(QString::fromUtf8("label_34"));
-        label_34->setFont(font);
-
-        AddrHouseNumberLayoutAdditional->addWidget(label_34);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(AddrHouseNumberLayoutAdditional);
-
-        AddrStreetLayoutAdditional = new QVBoxLayout();
-        AddrStreetLayoutAdditional->setSpacing(6);
-        AddrStreetLayoutAdditional->setObjectName(QString::fromUtf8("AddrStreetLayoutAdditional"));
-        label_37 = new QLabel(verticalLayoutWidget_14);
-        label_37->setObjectName(QString::fromUtf8("label_37"));
-        label_37->setFont(font);
-
-        AddrStreetLayoutAdditional->addWidget(label_37);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(AddrStreetLayoutAdditional);
-
-        AddrPostCodeLayoutAdditional = new QVBoxLayout();
-        AddrPostCodeLayoutAdditional->setSpacing(6);
-        AddrPostCodeLayoutAdditional->setObjectName(QString::fromUtf8("AddrPostCodeLayoutAdditional"));
-        label_36 = new QLabel(verticalLayoutWidget_14);
-        label_36->setObjectName(QString::fromUtf8("label_36"));
-        label_36->setFont(font);
-
-        AddrPostCodeLayoutAdditional->addWidget(label_36);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(AddrPostCodeLayoutAdditional);
-
-        AddrCityLayoutAdditional = new QVBoxLayout();
-        AddrCityLayoutAdditional->setSpacing(6);
-        AddrCityLayoutAdditional->setObjectName(QString::fromUtf8("AddrCityLayoutAdditional"));
-        label_35 = new QLabel(verticalLayoutWidget_14);
-        label_35->setObjectName(QString::fromUtf8("label_35"));
-        label_35->setFont(font);
-
-        AddrCityLayoutAdditional->addWidget(label_35);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(AddrCityLayoutAdditional);
-
-        BrandLayoutAdditional = new QVBoxLayout();
-        BrandLayoutAdditional->setSpacing(6);
-        BrandLayoutAdditional->setObjectName(QString::fromUtf8("BrandLayoutAdditional"));
-        label_39 = new QLabel(verticalLayoutWidget_14);
-        label_39->setObjectName(QString::fromUtf8("label_39"));
-        label_39->setFont(font);
-
-        BrandLayoutAdditional->addWidget(label_39);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(BrandLayoutAdditional);
-
-        OperateurLayoutAdditional = new QVBoxLayout();
-        OperateurLayoutAdditional->setSpacing(6);
-        OperateurLayoutAdditional->setObjectName(QString::fromUtf8("OperateurLayoutAdditional"));
-        label_38 = new QLabel(verticalLayoutWidget_14);
-        label_38->setObjectName(QString::fromUtf8("label_38"));
-        label_38->setFont(font);
-
-        OperateurLayoutAdditional->addWidget(label_38);
-
-
-        CategoryDetailsLayoutAdditional->addLayout(OperateurLayoutAdditional);
-
-
-        verticalLayout_15->addLayout(CategoryDetailsLayoutAdditional);
-
-        tabWidget->addTab(searchSettings, QString());
-        resultList = new QWidget();
-        resultList->setObjectName(QString::fromUtf8("resultList"));
-        table_view_poi = new QTableView(resultList);
-        table_view_poi->setObjectName(QString::fromUtf8("table_view_poi"));
-        table_view_poi->setGeometry(QRect(100, 90, 881, 341));
-        QFont font3;
-        font3.setFamily(QString::fromUtf8("Monospace"));
-        font3.setPointSize(8);
-        table_view_poi->setFont(font3);
-        table_view_poi->setAutoFillBackground(true);
-        table_view_poi->setSortingEnabled(true);
-        verticalLayoutWidget_11 = new QWidget(resultList);
-        verticalLayoutWidget_11->setObjectName(QString::fromUtf8("verticalLayoutWidget_11"));
-        verticalLayoutWidget_11->setGeometry(QRect(0, 90, 91, 95));
-        verticalLayout_12 = new QVBoxLayout(verticalLayoutWidget_11);
-        verticalLayout_12->setSpacing(6);
-        verticalLayout_12->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_12->setObjectName(QString::fromUtf8("verticalLayout_12"));
-        verticalLayout_12->setContentsMargins(0, 0, 0, 0);
-        getTopList = new QPushButton(verticalLayoutWidget_11);
-        getTopList->setObjectName(QString::fromUtf8("getTopList"));
-        getTopList->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        verticalLayout_12->addWidget(getTopList);
-
-        getPrevList = new QPushButton(verticalLayoutWidget_11);
-        getPrevList->setObjectName(QString::fromUtf8("getPrevList"));
-        getPrevList->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        verticalLayout_12->addWidget(getPrevList);
-
-        getNextList = new QPushButton(verticalLayoutWidget_11);
-        getNextList->setObjectName(QString::fromUtf8("getNextList"));
-        getNextList->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-
-        verticalLayout_12->addWidget(getNextList);
-
-        recordFrom = new QLabel(resultList);
-        recordFrom->setObjectName(QString::fromUtf8("recordFrom"));
-        recordFrom->setGeometry(QRect(50, 260, 41, 29));
-        recordFrom->setFont(font);
-        label_14 = new QLabel(resultList);
-        label_14->setObjectName(QString::fromUtf8("label_14"));
-        label_14->setGeometry(QRect(6, 260, 38, 29));
-        label_14->setFont(font);
-        recordTo = new QLabel(resultList);
-        recordTo->setObjectName(QString::fromUtf8("recordTo"));
-        recordTo->setGeometry(QRect(50, 290, 41, 29));
-        recordTo->setFont(font);
-        label_15 = new QLabel(resultList);
-        label_15->setObjectName(QString::fromUtf8("label_15"));
-        label_15->setGeometry(QRect(10, 290, 41, 29));
-        label_15->setFont(font);
-        verticalLayoutWidget_6 = new QWidget(resultList);
-        verticalLayoutWidget_6->setObjectName(QString::fromUtf8("verticalLayoutWidget_6"));
-        verticalLayoutWidget_6->setGeometry(QRect(30, 10, 831, 61));
-        verticalLayout_7 = new QVBoxLayout(verticalLayoutWidget_6);
-        verticalLayout_7->setSpacing(6);
-        verticalLayout_7->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_7->setObjectName(QString::fromUtf8("verticalLayout_7"));
-        verticalLayout_7->setContentsMargins(0, 0, 0, 0);
-        label_13 = new QLabel(verticalLayoutWidget_6);
-        label_13->setObjectName(QString::fromUtf8("label_13"));
-        label_13->setFont(font2);
-
-        verticalLayout_7->addWidget(label_13);
-
-        AttributeToGetLayout = new QHBoxLayout();
-        AttributeToGetLayout->setSpacing(6);
-        AttributeToGetLayout->setObjectName(QString::fromUtf8("AttributeToGetLayout"));
-
-        verticalLayout_7->addLayout(AttributeToGetLayout);
-
-        tabWidget->addTab(resultList, QString());
-        resultView = new QWidget();
-        resultView->setObjectName(QString::fromUtf8("resultView"));
-        graphicsView = new QGraphicsView(resultView);
-        graphicsView->setObjectName(QString::fromUtf8("graphicsView"));
-        graphicsView->setGeometry(QRect(10, 70, 360, 360));
-        sizePolicy.setHeightForWidth(graphicsView->sizePolicy().hasHeightForWidth());
-        graphicsView->setSizePolicy(sizePolicy);
-        verticalLayoutWidget_10 = new QWidget(resultView);
-        verticalLayoutWidget_10->setObjectName(QString::fromUtf8("verticalLayoutWidget_10"));
-        verticalLayoutWidget_10->setGeometry(QRect(10, 10, 121, 41));
-        verticalLayout_11 = new QVBoxLayout(verticalLayoutWidget_10);
-        verticalLayout_11->setSpacing(6);
-        verticalLayout_11->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_11->setObjectName(QString::fromUtf8("verticalLayout_11"));
-        verticalLayout_11->setContentsMargins(0, 0, 0, 0);
-        label_20 = new QLabel(verticalLayoutWidget_10);
-        label_20->setObjectName(QString::fromUtf8("label_20"));
-        label_20->setFont(font);
-
-        verticalLayout_11->addWidget(label_20);
-
-        routeHandle = new QLabel(verticalLayoutWidget_10);
-        routeHandle->setObjectName(QString::fromUtf8("routeHandle"));
-        routeHandle->setFont(font);
-
-        verticalLayout_11->addWidget(routeHandle);
-
-        verticalLayoutWidget_9 = new QWidget(resultView);
-        verticalLayoutWidget_9->setObjectName(QString::fromUtf8("verticalLayoutWidget_9"));
-        verticalLayoutWidget_9->setGeometry(QRect(170, 10, 121, 41));
-        verticalLayout_9 = new QVBoxLayout(verticalLayoutWidget_9);
-        verticalLayout_9->setSpacing(6);
-        verticalLayout_9->setContentsMargins(11, 11, 11, 11);
-        verticalLayout_9->setObjectName(QString::fromUtf8("verticalLayout_9"));
-        verticalLayout_9->setContentsMargins(0, 0, 0, 0);
-        label_19 = new QLabel(verticalLayoutWidget_9);
-        label_19->setObjectName(QString::fromUtf8("label_19"));
-        label_19->setFont(font);
-
-        verticalLayout_9->addWidget(label_19);
-
-        routeTotalSegments = new QLabel(verticalLayoutWidget_9);
-        routeTotalSegments->setObjectName(QString::fromUtf8("routeTotalSegments"));
-        routeTotalSegments->setFont(font);
-
-        verticalLayout_9->addWidget(routeTotalSegments);
-
-        tabWidget->addTab(resultView, QString());
-        settings = new QWidget();
-        settings->setObjectName(QString::fromUtf8("settings"));
-        groupBox_2 = new QGroupBox(settings);
-        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
-        groupBox_2->setGeometry(QRect(10, 30, 191, 61));
-        VersionSearch = new QLabel(groupBox_2);
-        VersionSearch->setObjectName(QString::fromUtf8("VersionSearch"));
-        VersionSearch->setGeometry(QRect(0, 30, 197, 21));
-        groupBox = new QGroupBox(settings);
-        groupBox->setObjectName(QString::fromUtf8("groupBox"));
-        groupBox->setGeometry(QRect(10, 120, 121, 81));
-        languageCode = new QLabel(groupBox);
-        languageCode->setObjectName(QString::fromUtf8("languageCode"));
-        languageCode->setGeometry(QRect(0, 30, 101, 17));
-        countryCode = new QLabel(groupBox);
-        countryCode->setObjectName(QString::fromUtf8("countryCode"));
-        countryCode->setGeometry(QRect(0, 60, 91, 17));
-        About = new QPushButton(settings);
-        About->setObjectName(QString::fromUtf8("About"));
-        About->setGeometry(QRect(360, 390, 98, 27));
-        About->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-        tabWidget->addTab(settings, QString());
-        MainWindow->setCentralWidget(centralWidget);
-        menuBar = new QMenuBar(MainWindow);
-        menuBar->setObjectName(QString::fromUtf8("menuBar"));
-        menuBar->setGeometry(QRect(0, 0, 910, 25));
-        MainWindow->setMenuBar(menuBar);
-
-        retranslateUi(MainWindow);
-
-        tabWidget->setCurrentIndex(1);
-
-
-        QMetaObject::connectSlotsByName(MainWindow);
-    } // setupUi
-
-    void retranslateUi(QMainWindow *MainWindow)
-    {
-        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "POI Search Proof Of Concept", 0));
-        label_2->setText(QApplication::translate("MainWindow", "Search mode", 0));
-        searchMode->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        label->setText(QApplication::translate("MainWindow", "<html><head/><body><p>Search around </p><p>     a location</p></body></html>", 0));
-        checkLocation->setText(QApplication::translate("MainWindow", "Current", 0));
-        label_16->setText(QApplication::translate("MainWindow", "Lat:", 0));
-        currentLocationLatitude->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        label_17->setText(QApplication::translate("MainWindow", "Lon:", 0));
-        currentLocationLongitude->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        latitude_direction->clear();
-        latitude_direction->insertItems(0, QStringList()
-         << QApplication::translate("MainWindow", "NORTH", 0)
-         << QApplication::translate("MainWindow", "SOUTH", 0)
-        );
-        longitude_direction->clear();
-        longitude_direction->insertItems(0, QStringList()
-         << QApplication::translate("MainWindow", "EAST", 0)
-         << QApplication::translate("MainWindow", "WEST", 0)
-        );
-        startSearch->setText(QApplication::translate("MainWindow", "SEARCH", 0));
-        cancelSearch->setText(QApplication::translate("MainWindow", "CANCEL", 0));
-        label_4->setText(QApplication::translate("MainWindow", "Set proximity alert", 0));
-        setProximity->setText(QApplication::translate("MainWindow", "SET", 0));
-        cancelProximity->setText(QApplication::translate("MainWindow", "UNSET", 0));
-        label_5->setText(QApplication::translate("MainWindow", "Manage poi handle", 0));
-        poiHandle->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        createpoiHandle->setText(QApplication::translate("MainWindow", "CREATE", 0));
-        deletepoiHandle->setText(QApplication::translate("MainWindow", "DELETE", 0));
-        label_8->setText(QApplication::translate("MainWindow", "Search status", 0));
-        search_status->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        totalSize->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-#ifndef QT_NO_ACCESSIBILITY
-        searchSettings->setAccessibleName(QString());
-#endif // QT_NO_ACCESSIBILITY
-        label_9->setText(QApplication::translate("MainWindow", "Category", 0));
-        label_10->setText(QApplication::translate("MainWindow", "Radius", 0));
-        label_3->setText(QApplication::translate("MainWindow", "Source", 0));
-        label_7->setText(QApplication::translate("MainWindow", "WebSite", 0));
-        label_11->setText(QApplication::translate("MainWindow", "Phone", 0));
-        label_12->setText(QApplication::translate("MainWindow", "Stars", 0));
-        label_6->setText(QApplication::translate("MainWindow", "Open hours", 0));
-        label_18->setText(QApplication::translate("MainWindow", "Number", 0));
-        label_21->setText(QApplication::translate("MainWindow", "Street", 0));
-        label_22->setText(QApplication::translate("MainWindow", "Post code", 0));
-        label_30->setText(QApplication::translate("MainWindow", "City", 0));
-        label_31->setText(QApplication::translate("MainWindow", "Brand", 0));
-        label_32->setText(QApplication::translate("MainWindow", "Operator", 0));
-        label_23->setText(QApplication::translate("MainWindow", "Category", 0));
-        label_28->setText(QApplication::translate("MainWindow", "Radius", 0));
-        label_24->setText(QApplication::translate("MainWindow", "Source", 0));
-        label_25->setText(QApplication::translate("MainWindow", "WebSite", 0));
-        label_26->setText(QApplication::translate("MainWindow", "Phone", 0));
-        label_27->setText(QApplication::translate("MainWindow", "Stars", 0));
-        label_29->setText(QApplication::translate("MainWindow", "Open hours", 0));
-        label_34->setText(QApplication::translate("MainWindow", "Number", 0));
-        label_37->setText(QApplication::translate("MainWindow", "Street", 0));
-        label_36->setText(QApplication::translate("MainWindow", "Post code", 0));
-        label_35->setText(QApplication::translate("MainWindow", "City", 0));
-        label_39->setText(QApplication::translate("MainWindow", "Brand", 0));
-        label_38->setText(QApplication::translate("MainWindow", "Operator", 0));
-        tabWidget->setTabText(tabWidget->indexOf(searchSettings), QApplication::translate("MainWindow", "Categories", 0));
-        getTopList->setText(QApplication::translate("MainWindow", "TOP", 0));
-        getPrevList->setText(QApplication::translate("MainWindow", "PREV", 0));
-        getNextList->setText(QApplication::translate("MainWindow", "NEXT", 0));
-        recordFrom->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        label_14->setText(QApplication::translate("MainWindow", "FROM:", 0));
-        recordTo->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        label_15->setText(QApplication::translate("MainWindow", "TO:", 0));
-        label_13->setText(QApplication::translate("MainWindow", "Attributes to get", 0));
-        tabWidget->setTabText(tabWidget->indexOf(resultList), QApplication::translate("MainWindow", "Result list", 0));
-        label_20->setText(QApplication::translate("MainWindow", "Route handle", 0));
-        routeHandle->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        label_19->setText(QApplication::translate("MainWindow", "Route segments", 0));
-        routeTotalSegments->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        tabWidget->setTabText(tabWidget->indexOf(resultView), QApplication::translate("MainWindow", "Result view", 0));
-        groupBox_2->setTitle(QApplication::translate("MainWindow", "Version", 0));
-        VersionSearch->setText(QApplication::translate("MainWindow", "to be initialized", 0));
-        groupBox->setTitle(QApplication::translate("MainWindow", "Language", 0));
-        languageCode->setText(QApplication::translate("MainWindow", "languageCode", 0));
-        countryCode->setText(QApplication::translate("MainWindow", "countryCode", 0));
-        About->setText(QApplication::translate("MainWindow", "About", 0));
-        tabWidget->setTabText(tabWidget->indexOf(settings), QApplication::translate("MainWindow", "Settings", 0));
-    } // retranslateUi
-
-};
-
-namespace Ui {
-    class MainWindow: public Ui_MainWindow {};
-} // namespace Ui
-
-QT_END_NAMESPACE
-
-#endif // UI_MAINWINDOW_H
diff --git a/test/poi-service/poi-common/poi-client_en.ts b/test/poi-service/poi-common/poi-client_en.ts
index 74e3625..964964e 100644
--- a/test/poi-service/poi-common/poi-client_en.ts
+++ b/test/poi-service/poi-common/poi-client_en.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
+<TS version="2.1" language="en_US">
 <context>
     <name>MainWindow</name>
     <message>
@@ -49,27 +49,27 @@
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="184"/>
-        <location filename="../poi-client/mainwindow.cpp" line="217"/>
+        <location filename="../poi-client/mainwindow.cpp" line="225"/>
         <source>NORTH</source>
         <translation>NORTH</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="189"/>
-        <location filename="../poi-client/mainwindow.cpp" line="213"/>
-        <location filename="../poi-client/mainwindow.cpp" line="677"/>
+        <location filename="../poi-client/mainwindow.cpp" line="221"/>
+        <location filename="../poi-client/mainwindow.cpp" line="685"/>
         <source>SOUTH</source>
         <translation>SOUTH</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="271"/>
-        <location filename="../poi-client/mainwindow.cpp" line="225"/>
+        <location filename="../poi-client/mainwindow.cpp" line="233"/>
         <source>EAST</source>
         <translation>EAST</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="276"/>
-        <location filename="../poi-client/mainwindow.cpp" line="221"/>
-        <location filename="../poi-client/mainwindow.cpp" line="680"/>
+        <location filename="../poi-client/mainwindow.cpp" line="229"/>
+        <location filename="../poi-client/mainwindow.cpp" line="688"/>
         <source>WEST</source>
         <translation>WEST</translation>
     </message>
@@ -125,32 +125,32 @@
     <message>
         <location filename="../poi-client/mainwindow.ui" line="893"/>
         <location filename="../poi-client/mainwindow.ui" line="1117"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="155"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="163"/>
         <source>Brand</source>
         <translation>Brand</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="861"/>
         <location filename="../poi-client/mainwindow.ui" line="1085"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="139"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="147"/>
         <source>Post code</source>
         <translation>Post code</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="877"/>
         <location filename="../poi-client/mainwindow.ui" line="1101"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="147"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="155"/>
         <source>City</source>
         <translation>City</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="845"/>
         <location filename="../poi-client/mainwindow.ui" line="1069"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="131"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="139"/>
         <source>Street</source>
         <translation>Street</translation>
     </message>
@@ -162,16 +162,16 @@
     <message>
         <location filename="../poi-client/mainwindow.ui" line="829"/>
         <location filename="../poi-client/mainwindow.ui" line="1053"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="123"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="131"/>
         <source>Number</source>
         <translation>Number</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="909"/>
         <location filename="../poi-client/mainwindow.ui" line="1133"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="163"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="171"/>
         <source>Operator</source>
         <translation>Operator</translation>
     </message>
@@ -198,39 +198,39 @@
     <message>
         <location filename="../poi-client/mainwindow.ui" line="717"/>
         <location filename="../poi-client/mainwindow.ui" line="941"/>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>Category</source>
         <translation>Category</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="749"/>
         <location filename="../poi-client/mainwindow.ui" line="973"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="83"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="91"/>
         <source>Source</source>
         <translation>Source</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="765"/>
         <location filename="../poi-client/mainwindow.ui" line="989"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="91"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="99"/>
         <source>WebSite</source>
         <translation>WebSite</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="781"/>
         <location filename="../poi-client/mainwindow.ui" line="1005"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="99"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="107"/>
         <source>Phone</source>
         <translation>Phone</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="797"/>
         <location filename="../poi-client/mainwindow.ui" line="1021"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="107"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="115"/>
         <source>Stars</source>
         <translation>Stars</translation>
     </message>
@@ -243,8 +243,8 @@
     <message>
         <location filename="../poi-client/mainwindow.ui" line="813"/>
         <location filename="../poi-client/mainwindow.ui" line="1037"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="115"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="123"/>
         <source>Open hours</source>
         <translation>Open hours</translation>
     </message>
@@ -314,27 +314,27 @@
         <translation>Enter the string to search</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>Distance</source>
         <translation>Distance</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>Latitude</source>
         <translation>Latitude</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>Longitude</source>
         <translation>Longitude</translation>
     </message>
@@ -343,45 +343,45 @@
         <translation type="obsolete">Operator</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="67"/>
+        <location filename="../poi-client/mainwindow.cpp" line="75"/>
         <source>Icon</source>
         <translation>Icon</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="199"/>
-        <location filename="../poi-client/mainwindow.cpp" line="715"/>
-        <location filename="../poi-client/mainwindow.cpp" line="1310"/>
+        <location filename="../poi-client/mainwindow.cpp" line="207"/>
+        <location filename="../poi-client/mainwindow.cpp" line="723"/>
+        <location filename="../poi-client/mainwindow.cpp" line="1318"/>
         <source>EMPTY</source>
         <translation>EMPTY</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="656"/>
+        <location filename="../poi-client/mainwindow.cpp" line="664"/>
         <source>Around the default location</source>
         <translation>Around the default location</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="663"/>
+        <location filename="../poi-client/mainwindow.cpp" line="671"/>
         <source>Around the vehicle</source>
         <translation>Around the vehicle</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="673"/>
+        <location filename="../poi-client/mainwindow.cpp" line="681"/>
         <source>Around a location</source>
         <translation>Around a location</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="1242"/>
+        <location filename="../poi-client/mainwindow.cpp" line="1250"/>
         <source>Proximity search</source>
         <translation>Proximity search</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="1677"/>
+        <location filename="../poi-client/mainwindow.cpp" line="1685"/>
         <source>Along a route</source>
         <translation>Along a route</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="745"/>
-        <location filename="../poi-client/mainwindow.cpp" line="1678"/>
+        <location filename="../poi-client/mainwindow.cpp" line="753"/>
+        <location filename="../poi-client/mainwindow.cpp" line="1686"/>
         <source>NUMBER</source>
         <translation>NUMBER</translation>
     </message>
diff --git a/test/poi-service/poi-common/poi-client_jp.ts b/test/poi-service/poi-common/poi-client_jp.ts
index 5d0f2a3..f01be0b 100644
--- a/test/poi-service/poi-common/poi-client_jp.ts
+++ b/test/poi-service/poi-common/poi-client_jp.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ja_JP" sourcelanguage="en_US">
+<TS version="2.1" language="ja_JP" sourcelanguage="en_US">
 <context>
     <name>MainWindow</name>
     <message>
@@ -55,30 +55,30 @@
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="184"/>
-        <location filename="../poi-client/mainwindow.cpp" line="217"/>
+        <location filename="../poi-client/mainwindow.cpp" line="225"/>
         <source>NORTH</source>
         <translatorcomment>ほくい</translatorcomment>
         <translation>北緯</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="189"/>
-        <location filename="../poi-client/mainwindow.cpp" line="213"/>
-        <location filename="../poi-client/mainwindow.cpp" line="677"/>
+        <location filename="../poi-client/mainwindow.cpp" line="221"/>
+        <location filename="../poi-client/mainwindow.cpp" line="685"/>
         <source>SOUTH</source>
         <translatorcomment>なんい</translatorcomment>
         <translation>南緯</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="271"/>
-        <location filename="../poi-client/mainwindow.cpp" line="225"/>
+        <location filename="../poi-client/mainwindow.cpp" line="233"/>
         <source>EAST</source>
         <translatorcomment>とうけい</translatorcomment>
         <translation>東経</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="276"/>
-        <location filename="../poi-client/mainwindow.cpp" line="221"/>
-        <location filename="../poi-client/mainwindow.cpp" line="680"/>
+        <location filename="../poi-client/mainwindow.cpp" line="229"/>
+        <location filename="../poi-client/mainwindow.cpp" line="688"/>
         <source>WEST</source>
         <translatorcomment>せいけい</translatorcomment>
         <translation>西経</translation>
@@ -139,32 +139,32 @@
     <message>
         <location filename="../poi-client/mainwindow.ui" line="893"/>
         <location filename="../poi-client/mainwindow.ui" line="1117"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="155"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="163"/>
         <source>Brand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="861"/>
         <location filename="../poi-client/mainwindow.ui" line="1085"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="139"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="147"/>
         <source>Post code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="877"/>
         <location filename="../poi-client/mainwindow.ui" line="1101"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="147"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="155"/>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="845"/>
         <location filename="../poi-client/mainwindow.ui" line="1069"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="131"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="139"/>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
@@ -176,16 +176,16 @@
     <message>
         <location filename="../poi-client/mainwindow.ui" line="829"/>
         <location filename="../poi-client/mainwindow.ui" line="1053"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="123"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="131"/>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="909"/>
         <location filename="../poi-client/mainwindow.ui" line="1133"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="163"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="171"/>
         <source>Operator</source>
         <translation type="unfinished"></translation>
     </message>
@@ -216,7 +216,7 @@
     <message>
         <location filename="../poi-client/mainwindow.ui" line="717"/>
         <location filename="../poi-client/mainwindow.ui" line="941"/>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>Category</source>
         <translatorcomment>しゅるい</translatorcomment>
         <translation>種類</translation>
@@ -224,8 +224,8 @@
     <message>
         <location filename="../poi-client/mainwindow.ui" line="749"/>
         <location filename="../poi-client/mainwindow.ui" line="973"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="83"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="91"/>
         <source>Source</source>
         <translatorcomment>てんきょ</translatorcomment>
         <translation>典拠</translation>
@@ -233,24 +233,24 @@
     <message>
         <location filename="../poi-client/mainwindow.ui" line="765"/>
         <location filename="../poi-client/mainwindow.ui" line="989"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="91"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="99"/>
         <source>WebSite</source>
         <translation>ウエブサイト</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="781"/>
         <location filename="../poi-client/mainwindow.ui" line="1005"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="99"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="107"/>
         <source>Phone</source>
         <translation>電話番号</translation>
     </message>
     <message>
         <location filename="../poi-client/mainwindow.ui" line="797"/>
         <location filename="../poi-client/mainwindow.ui" line="1021"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="107"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="115"/>
         <source>Stars</source>
         <translatorcomment>ほしじるし</translatorcomment>
         <translation>星印</translation>
@@ -265,8 +265,8 @@
     <message>
         <location filename="../poi-client/mainwindow.ui" line="813"/>
         <location filename="../poi-client/mainwindow.ui" line="1037"/>
-        <location filename="../poi-client/mainwindow.cpp" line="66"/>
-        <location filename="../poi-client/mainwindow.cpp" line="115"/>
+        <location filename="../poi-client/mainwindow.cpp" line="74"/>
+        <location filename="../poi-client/mainwindow.cpp" line="123"/>
         <source>Open hours</source>
         <translatorcomment>えいぎょうじかん</translatorcomment>
         <translation>営業時間</translation>
@@ -343,77 +343,77 @@
         <translation>文字を入力してください</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>Name</source>
         <translatorcomment>なまえ</translatorcomment>
         <translation>名前</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>Distance</source>
         <translatorcomment>きょり</translatorcomment>
         <translation>距離</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>Latitude</source>
         <translatorcomment>いど</translatorcomment>
         <translation>緯度</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="64"/>
+        <location filename="../poi-client/mainwindow.cpp" line="72"/>
         <source>Longitude</source>
         <translatorcomment>けいど</translatorcomment>
         <translation>軽度</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="67"/>
+        <location filename="../poi-client/mainwindow.cpp" line="75"/>
         <source>Icon</source>
         <translation>アイコン</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="199"/>
-        <location filename="../poi-client/mainwindow.cpp" line="715"/>
-        <location filename="../poi-client/mainwindow.cpp" line="1310"/>
+        <location filename="../poi-client/mainwindow.cpp" line="207"/>
+        <location filename="../poi-client/mainwindow.cpp" line="723"/>
+        <location filename="../poi-client/mainwindow.cpp" line="1318"/>
         <source>EMPTY</source>
         <translatorcomment>あき</translatorcomment>
         <translation>空き</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="656"/>
+        <location filename="../poi-client/mainwindow.cpp" line="664"/>
         <source>Around the default location</source>
         <translation>ディフォルト地で検索</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="663"/>
+        <location filename="../poi-client/mainwindow.cpp" line="671"/>
         <source>Around the vehicle</source>
         <translation>現在地で検索</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="673"/>
+        <location filename="../poi-client/mainwindow.cpp" line="681"/>
         <source>Around a location</source>
         <translatorcomment>ちでけんさく</translatorcomment>
         <translation>地で検索</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="1242"/>
+        <location filename="../poi-client/mainwindow.cpp" line="1250"/>
         <source>Proximity search</source>
         <translation>周辺で検索</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="1677"/>
+        <location filename="../poi-client/mainwindow.cpp" line="1685"/>
         <source>Along a route</source>
         <translatorcomment>ルートぞい</translatorcomment>
         <translation>ルート沿い</translation>
     </message>
     <message>
-        <location filename="../poi-client/mainwindow.cpp" line="745"/>
-        <location filename="../poi-client/mainwindow.cpp" line="1678"/>
+        <location filename="../poi-client/mainwindow.cpp" line="753"/>
+        <location filename="../poi-client/mainwindow.cpp" line="1686"/>
         <source>NUMBER</source>
         <translatorcomment>ばんごう</translatorcomment>
         <translation>番号</translation>
diff --git a/test/poi-service/poi-common/poi-content-access-module_en.ts b/test/poi-service/poi-common/poi-contentaccess-module_en.ts
index 0d0bc07..cf74abe 100644
--- a/test/poi-service/poi-common/poi-content-access-module_en.ts
+++ b/test/poi-service/poi-common/poi-contentaccess-module_en.ts
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
+<TS version="2.1" language="en_US">
 <context>
     <name>MainWindow</name>
     <message>
         <location filename="../poi-contentaccess-module/mainwindow.ui" line="222"/>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="82"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="89"/>
         <source>REGISTER</source>
         <translation>REGISTER</translation>
     </message>
     <message>
         <location filename="../poi-contentaccess-module/mainwindow.ui" line="203"/>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="83"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="90"/>
         <source>UNREGISTER</source>
         <translation>UNREGISTER</translation>
     </message>
@@ -37,13 +37,13 @@
     </message>
     <message>
         <location filename="../poi-contentaccess-module/mainwindow.ui" line="171"/>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="84"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="91"/>
         <source>ADDandREG</source>
         <translation>ADDandREG</translation>
     </message>
     <message>
         <location filename="../poi-contentaccess-module/mainwindow.ui" line="187"/>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="85"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="92"/>
         <source>REMOVE</source>
         <translation>REMOVE</translation>
     </message>
@@ -57,12 +57,12 @@
         <translation type="obsolete">NUMBER: </translation>
     </message>
     <message>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="109"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="116"/>
         <source>NUMBER</source>
         <translation>NUMBER</translation>
     </message>
     <message>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="143"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="150"/>
         <source>Categories added</source>
         <translation>Added</translation>
     </message>
diff --git a/test/poi-service/poi-common/poi-content-access-module_jp.ts b/test/poi-service/poi-common/poi-contentaccess-module_jp.ts
index 81b3d5a..aa464e8 100644
--- a/test/poi-service/poi-common/poi-content-access-module_jp.ts
+++ b/test/poi-service/poi-common/poi-contentaccess-module_jp.ts
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ja_JP" sourcelanguage="ja_JP">
+<TS version="2.1" language="ja_JP" sourcelanguage="ja_JP">
 <context>
     <name>MainWindow</name>
     <message>
         <location filename="../poi-contentaccess-module/mainwindow.ui" line="222"/>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="82"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="89"/>
         <source>REGISTER</source>
         <translatorcomment>とうき</translatorcomment>
         <translation>登記</translation>
     </message>
     <message>
         <location filename="../poi-contentaccess-module/mainwindow.ui" line="203"/>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="83"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="90"/>
         <source>UNREGISTER</source>
         <translatorcomment>ちょうし</translatorcomment>
         <translation>中止</translation>
@@ -40,14 +40,14 @@
     </message>
     <message>
         <location filename="../poi-contentaccess-module/mainwindow.ui" line="171"/>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="84"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="91"/>
         <source>ADDandREG</source>
         <translatorcomment>たす</translatorcomment>
         <translation>足す</translation>
     </message>
     <message>
         <location filename="../poi-contentaccess-module/mainwindow.ui" line="187"/>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="85"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="92"/>
         <source>REMOVE</source>
         <translatorcomment>とる</translatorcomment>
         <translation>取る</translation>
@@ -63,12 +63,12 @@
         <translation type="obsolete">番号： </translation>
     </message>
     <message>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="109"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="116"/>
         <source>NUMBER</source>
         <translation>番号</translation>
     </message>
     <message>
-        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="143"/>
+        <location filename="../poi-contentaccess-module/mainwindow.cpp" line="150"/>
         <source>Categories added</source>
         <translatorcomment>たした</translatorcomment>
         <translation>足した</translation>
diff --git a/test/poi-service/poi-contentaccess-module/CMakeLists.txt b/test/poi-service/poi-contentaccess-module/CMakeLists.txt
new file mode 100644
index 0000000..d5fa743
--- /dev/null
+++ b/test/poi-service/poi-contentaccess-module/CMakeLists.txt
@@ -0,0 +1,296 @@
+###########################################################################
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# Component Name: poi-contentaccess-module
+#
+# Author: Philippe Colliot
+#
+# Copyright (C) 2014, PCA Peugeot Citroën
+# 
+# License:
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# @licence end@
+###########################################################################
+project(poi-contentaccess-module)
+cmake_minimum_required(VERSION 2.8)
+
+message(STATUS "poi-contentaccess-module")
+
+find_package(PkgConfig REQUIRED)
+find_program(XSLTPROC xsltproc REQUIRED)
+find_program(DBUSXML2CPP dbusxx-xml2cpp REQUIRED)
+find_program(QTUIC uic REQUIRED)
+find_program(QTMOC moc REQUIRED)
+find_program(QTLRELEASE lrelease REQUIRED)
+find_program(QTRCC rcc REQUIRED)
+
+pkg_check_modules(DBUS_CPP dbus-c++-1)
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+pkg_check_modules(SQLITE3 REQUIRED sqlite3)
+pkg_check_modules(GLIBMM glibmm-2.4)
+pkg_check_modules(GOBJECT gobject-2.0)
+pkg_check_modules(DBUS dbus-1)
+pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
+pkg_check_modules(QT5_CORE REQUIRED Qt5Core)
+pkg_check_modules(QT5_QUICK REQUIRED Qt5Quick)
+pkg_check_modules(QT5_DBUS REQUIRED Qt5DBus)
+pkg_check_modules(QT5_WIDGETS REQUIRED Qt5Widgets)
+pkg_check_modules(QT5_GUI REQUIRED Qt5Gui)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${DBUS_CPP_INCLUDE_DIRS})
+include_directories(${GLIB_INCLUDE_DIRS})
+include_directories(${SQLITE3_INCLUDE_DIRS})
+include_directories(${GLIBMM_INCLUDE_DIRS})
+include_directories(${GOBJECT_INCLUDE_DIRS})
+include_directories(${DBUS_INCLUDE_DIRS})
+include_directories(${DBUS_CPP_GLIB_INCLUDE_DIRS})
+include_directories(${QT5_CORE_INCLUDE_DIRS})
+include_directories(${QT5_QUICK_INCLUDE_DIRS})
+include_directories(${QT5_DBUS_INCLUDE_DIRS})
+include_directories(${QT5_WIDGETS_INCLUDE_DIRS})
+include_directories(${QT5_GUI_INCLUDE_DIRS})
+
+set(cmake_create_dir cmake -E make_directory)
+
+#settings for Qt
+set(CMAKE_XXX_FLAGS "${CMAKE_XXX_FLAGS} ${QT5_EXECUTABLE_COMPILE_FLAGS}")
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+add_definitions(${QT5_CORE_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_NO_DEBUG)
+set(qt_moc ${QTMOC} -o)
+set(MOC moc)
+set(MOC_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MOC})
+set(qt_uic ${QTUIC} -o)
+set(qt_release ${QTLRELEASE})
+set(qt_rcc ${QTRCC})
+
+set(positioning_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/poi-service/positioning)
+if (NOT IS_DIRECTORY ${positioning_SRC_DIR})
+  message(FATAL_ERROR "positioning has not been cloned before")
+endif()
+
+# Generate the DBus adaptors and proxy before building the client
+set(API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../api)
+set(TARGET_GENERATED_API_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../poi-common)
+set(positioning_API_DIR ${positioning_SRC}/enhanced-position-service/api)
+
+file (GLOB XML_TO_DBUS_PROXY 
+	${API_DIR}/poi-service/genivi-poiservice-poisearch.xml
+	${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml
+	${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml
+	${positioning_SRC_DIR}/enhanced-position-service/api/genivi-positioning-enhancedposition.xml
+	${API_DIR}/navigation-core/genivi-navigationcore-routing.xml
+	${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml
+)
+foreach (RAW_FILE ${XML_TO_DBUS_PROXY})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
+		execute_process(
+			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h)
+			execute_process(
+				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --proxy=${TARGET_GENERATED_API_DIR}/${FILE}_proxy.h  
+			)
+		endif()
+	endif()
+endforeach()
+
+file (GLOB XML_TO_DBUS_ADAPTOR
+	${API_DIR}/poi-service/genivi-poiservice-poisearch.xml
+	${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml
+	${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml
+	${positioning_SRC_DIR}/enhanced-position-service/api/genivi-positioning-enhancedposition.xml
+	${API_DIR}/navigation-core/genivi-navigationcore-routing.xml
+	${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml
+)
+foreach (RAW_FILE ${XML_TO_DBUS_ADAPTOR})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
+		execute_process(
+			COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h)
+			execute_process(
+				COMMAND ${DBUSXML2CPP} ${RAW_FILE} --adaptor=${TARGET_GENERATED_API_DIR}/${FILE}_adaptor.h  
+			)
+		endif()
+	endif()
+endforeach()
+
+file (GLOB XML_TO_DBUS_CONSTANT
+	${API_DIR}/poi-service/genivi-poiservice-constants.xml
+	${API_DIR}/map-viewer/genivi-mapviewer-constants.xml
+	${API_DIR}/navigation-core/genivi-navigationcore-constants.xml
+)
+foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+		execute_process(
+			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+			COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}        
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+			execute_process(
+				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+				COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}        
+			)
+		endif()
+	endif()
+endforeach()
+
+file (GLOB XML_TO_DBUS_CONSTANT_FROM_POSITIONING
+	${positioning_SRC_DIR}/enhanced-position-service/api/genivi-positioning-constants.xml
+)
+foreach (RAW_FILE ${XML_TO_DBUS_CONSTANT_FROM_POSITIONING})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+		execute_process(
+			OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+			COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}   
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${TARGET_GENERATED_API_DIR}/${FILE}.h)
+			execute_process(
+				OUTPUT_FILE ${TARGET_GENERATED_API_DIR}/${FILE}.h
+				COMMAND ${XSLTPROC} ${API_DIR}/poi-service/enum.xsl ${RAW_FILE}   
+			)
+		endif()
+	endif()
+endforeach()
+
+file(GLOB DBUS_DEF_INCLUDE ${DBUS_DEF_DIR}/*_proxy.h ${DBUS_DEF_DIR}/*_adaptor.h ${DBUS_DEF_DIR}/*-constants.h)
+
+link_directories(
+    ${DBUS_CPP_LIBRARY_DIRS}
+    ${GLIB_LIBRARY_DIRS}
+	${SQLITE3_LIBRARY_DIRS}
+	${GLIBMM_LIBRARY_DIRS}
+	${GOBJECT_LIBRARY_DIRS}
+	${DBUS_LIBRARY_DIRS}
+	${DBUS_CPP_GLIB_DIRS}
+	${QT5_CORE_LIBRARY_DIRS}
+	${QT5_QUICK_LIBRARY_DIRS}
+	${QT5_DBUS_LIBRARY_DIRS}
+	${QT5_WIDGETS_LIBRARY_DIRS}
+	${QT5_GUI_LIBRARY_DIRS}
+)
+
+set(LIBRARIES 
+    ${DBUS_CPP_LIBRARIES}
+    ${GLIB_LIBRARIES}
+	${SQLITE3_LIBRARIES}
+	${GLIBMM_LIBRARIES}
+	${GOBJECT_LIBRARIES}
+	${DBUS_LIBRARIES}
+	${DBUS_CPP_GLIB_LIBRARIES}
+    ${QT5_CORE_LIBRARIES}
+    ${QT5_QUICK_LIBRARIES}
+    ${QT5_DBUS_LIBRARIES}
+    ${QT5_WIDGETS_LIBRARIES}
+    ${QT5_GUI_LIBRARIES}
+)
+
+# for some reason, automoc doesn't run, so moc is made manually
+file (GLOB SRC_TO_MOC ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.h
+)
+execute_process(
+	COMMAND ${cmake_create_dir} ${MOC}
+)
+foreach (RAW_FILE ${SRC_TO_MOC})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${MOC_DIR}/moc_${FILE}.cpp)
+		execute_process(
+			COMMAND ${qt_moc} "${MOC_DIR}/moc_${FILE}.cpp" ${RAW_FILE} 
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${MOC_DIR}/moc_${FILE}.cpp)
+			execute_process(
+				COMMAND ${qt_moc} "${MOC_DIR}/moc_${FILE}.cpp" ${RAW_FILE} 
+			)
+		endif()
+	endif()
+endforeach()
+file(GLOB MOC_SOURCES ${MOC_DIR}/moc_*.cpp)
+
+#generate ui files
+file (GLOB DEF_TO_UIC ${CMAKE_CURRENT_SOURCE_DIR}/mainwindow.ui
+)
+
+foreach (RAW_FILE ${DEF_TO_UIC})
+	get_filename_component(FILE ${RAW_FILE} NAME_WE)
+	if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/ui_${FILE}.h)
+		execute_process(
+			COMMAND ${qt_uic} "${CMAKE_CURRENT_BINARY_DIR}/ui_${FILE}.h" ${RAW_FILE} 
+		)
+	else()
+		if(${RAW_FILE} IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/ui_${FILE}.h)
+			execute_process(
+				COMMAND ${qt_uic} "${CMAKE_CURRENT_BINARY_DIR}/ui_${FILE}.h" ${RAW_FILE} 
+			)
+		endif()
+	endif()
+endforeach()
+file(GLOB UI_FILES ${CMAKE_CURRENT_BINARY_DIR}/ui_*.h)
+
+#generate qm files
+set(COMMON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../poi-common)
+file (GLOB TS_TO_RELEASE ${COMMON_DIR}/poi-contentaccess-module_en.ts
+        ${COMMON_DIR}/poi-contentaccess-module_jp.ts
+)
+
+foreach (RAW_FILE ${TS_TO_RELEASE})
+    get_filename_component(FILE ${RAW_FILE} NAME_WE)
+    if(NOT EXISTS ${COMMON_DIR}/${FILE}.qm)
+        execute_process(
+                OUTPUT_FILE ${COMMON_DIR}/${FILE}.qm
+                COMMAND ${qt_release} ${RAW_FILE}
+        )
+    else()
+        if(${RAW_FILE} IS_NEWER_THAN ${COMMON_DIR}/${FILE}.qm)
+            execute_process(
+                    OUTPUT_FILE ${COMMON_DIR}/${FILE}.qm
+                    COMMAND ${qt_release} ${RAW_FILE}
+            )
+        endif()
+    endif()
+endforeach()
+
+#generate resource file
+get_filename_component(FILE ${COMMON_DIR}/poi-resource.qrc NAME_WE)
+if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../${FILE}.rcc)
+    execute_process(
+        OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/../${FILE}.rcc
+        COMMAND ${qt_rcc} ${COMMON_DIR}/poi-resource.qrc
+    )
+else()
+    if(${COMMON_DIR}/poi-resource.qrc IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/../${FILE}.rcc)
+        execute_process(
+            OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/../${FILE}.rcc
+            COMMAND ${qt_rcc} ${COMMON_DIR}/poi-resource.qrc
+        )
+    endif()
+endif()
+
+add_executable(poi-contentaccess-module
+    ${MOC_SOURCES}
+    ${DBUS_DEF_INCLUDE}
+    ${UI_FILES}
+    main.cpp
+    database.cpp
+    mainwindow.cpp
+)
+
+target_link_libraries(poi-contentaccess-module ${LIBRARIES})
+
+
diff --git a/test/poi-service/poi-contentaccess-module/main.cpp b/test/poi-service/poi-contentaccess-module/main.cpp
index 58c343b..239b51b 100644
--- a/test/poi-service/poi-contentaccess-module/main.cpp
+++ b/test/poi-service/poi-contentaccess-module/main.cpp
@@ -41,6 +41,7 @@
 
 #include <QApplication>
 #include <QTranslator>
+#include <QResource>
 #include "mainwindow.h"
 
 #include <QSettings>
@@ -773,8 +774,9 @@ void print_usage (FILE* stream, int exit_code)
   fprintf (stream, "Use: %s options [database]\n",program_name);
   fprintf (stream,
            " -h --help               Display this message.\n"
-           " -f --file database      Open the database.\n"
-           " -i --internationalisation database language(en,jp)    Open the database, international version.\n");
+           " -f --file database      Open the database (by default language is english).\n"
+           " -f --file database -i --internationalisation language(en,jp)    Open the database and set the language.\n");
+  fprintf (stream, "Error code %d\n",exit_code);
   exit (exit_code);
 }
 
@@ -800,7 +802,7 @@ int main(int  argc , char**  argv )
     int next_option;
 
     /* Valid letters for short options. */
-    const char* const short_options = "hfi:";
+    const char* const short_options = "hf:i:";
     /* Valid string for long options. */
     const struct option long_options[] = {
         { "help",     0, NULL, 'h' },
@@ -808,8 +810,8 @@ int main(int  argc , char**  argv )
         { "internationalisation", 2, NULL, 'i' },
         { NULL,       0, NULL, 0   }   /* Always at the end of the table.  */
     };
-    char* database_filename = NULL; //database filename passed as first argument
-
+    char* database_filename = NULL; //database filename
+    QString language = "en"; //english by default
 
     program_name = argv[0];
 
@@ -825,123 +827,77 @@ int main(int  argc , char**  argv )
             database_filename = argv[2];
             if (!is_readable(database_filename))
                 print_usage (stderr, 1);
-            else
-            {
-                QApplication a(argc, argv);
-                QTranslator translator;
-                translator.load("POIPOC_en.ts","../POIPOCCommon/"); // english by default
-                a.installTranslator(&translator);
-                MainWindow mainWindow;
-
-                // creating the dispatcher
-                dispatcher = new DBus::Glib::BusDispatcher();
-                DBus::default_dispatcher = dispatcher;
-                dispatcher->attach(NULL);
-
-                // create a connection on the session bus
-                dbusConnection = new DBus::Connection(DBus::Connection::SessionBus());
-                dbusConnection->setup(dispatcher);
-
-                // create the server for contentAccessModule
-                dbusConnection->request_name(contentAccessModule_SERVICE_NAME);
-                servercontentAccessModule=new contentAccessModuleServer(*dbusConnection,database_filename);
-
-                // connect it to the HMI panel
-                mainWindow.ConnectTocontentAccessModuleServer(servercontentAccessModule);
-
-                // connect the HMI panel to it
-                servercontentAccessModule->connectToHMI(&mainWindow);
-
-                // create a client for poiContentAccess
-                clientpoiContentAccess = new poiContentAccess(*dbusConnection);
-
-                // connect it to the HMI panel
-                mainWindow.ConnectTopoiContentAccessClient(clientpoiContentAccess);
-
-                // Create a new GMainLoop with default context and initial state of "not running "
-                mainloop = g_main_loop_new (g_main_context_default() , FALSE );
-
-               // loop listening
-                mainWindow.InitUi();
-                mainWindow.show();
-
-                return a.exec();
-
-                // clean memory
-                delete servercontentAccessModule;
-                delete dbusConnection;
-                delete dispatcher;
-            }
             break;
-        case 'i':   /* -i --internationalisation database language */
-            database_filename = argv[2];
-            if (!is_readable(database_filename))
-                print_usage (stderr, 1);
-            else
-            {
-                QApplication a(argc, argv);
-                QTranslator translator;
-                QString language(argv[3]);
-                if (translator.load("poi-contentaccess-module_"+ language,"../poi-common/"))
-                {
-                    a.installTranslator(&translator);
-                    MainWindow mainWindow;
+        case 'i':   /* -i --internationalisation language */
+            language = argv[4];
+            break;
+        case '?':   /* Invalid option. */
+            print_usage (stderr, 1);
+        case -1:    /* End of options.  */
+            break;
+        default:    /* Error  */
+            print_usage (stderr, 1);
+        }
+    }
+    while (next_option != -1);
 
-                    // creating the dispatcher
-                    dispatcher = new DBus::Glib::BusDispatcher();
-                    DBus::default_dispatcher = dispatcher;
-                    dispatcher->attach(NULL);
+    QApplication a(argc, argv);
+    QTranslator translator;
+    if (QResource::registerResource("../poi-resource.rcc"))
+    {
+        if (translator.load("poi-contentaccess-module_"+ language,"../../poi-common/"))
+        {
+            a.installTranslator(&translator);
+            MainWindow mainWindow;
 
-                    // create a connection on the session bus
-                    dbusConnection = new DBus::Connection(DBus::Connection::SessionBus());
-                    dbusConnection->setup(dispatcher);
+            // creating the dispatcher
+            dispatcher = new DBus::Glib::BusDispatcher();
+            DBus::default_dispatcher = dispatcher;
+            dispatcher->attach(NULL);
 
-                    // create the server for contentAccessModule
-                    dbusConnection->request_name(contentAccessModule_SERVICE_NAME);
-                    servercontentAccessModule=new contentAccessModuleServer(*dbusConnection,database_filename);
+            // create a connection on the session bus
+            dbusConnection = new DBus::Connection(DBus::Connection::SessionBus());
+            dbusConnection->setup(dispatcher);
 
-                    // connect it to the HMI panel
-                    mainWindow.ConnectTocontentAccessModuleServer(servercontentAccessModule);
+            // create the server for contentAccessModule
+            dbusConnection->request_name(contentAccessModule_SERVICE_NAME);
+            servercontentAccessModule=new contentAccessModuleServer(*dbusConnection,database_filename);
 
-                    // connect the HMI panel to it
-                    servercontentAccessModule->connectToHMI(&mainWindow);
+            // connect it to the HMI panel
+            mainWindow.ConnectTocontentAccessModuleServer(servercontentAccessModule);
 
-                    // create a client for poiContentAccess
-                    clientpoiContentAccess = new poiContentAccess(*dbusConnection);
+            // connect the HMI panel to it
+            servercontentAccessModule->connectToHMI(&mainWindow);
 
-                    // connect it to the HMI panel
-                    mainWindow.ConnectTopoiContentAccessClient(clientpoiContentAccess);
+            // create a client for poiContentAccess
+            clientpoiContentAccess = new poiContentAccess(*dbusConnection);
 
-                    // Create a new GMainLoop with default context and initial state of "not running "
-                    mainloop = g_main_loop_new (g_main_context_default() , FALSE );
+            // connect it to the HMI panel
+            mainWindow.ConnectTopoiContentAccessClient(clientpoiContentAccess);
 
-                   // loop listening
-                    mainWindow.InitUi();
-                    mainWindow.show();
+            // Create a new GMainLoop with default context and initial state of "not running "
+            mainloop = g_main_loop_new (g_main_context_default() , FALSE );
 
-                    int ret = a.exec();
+           // loop listening
+            mainWindow.InitUi();
+            mainWindow.show();
 
-                    // clean memory
-                    delete servercontentAccessModule;
-                    delete dbusConnection;
-                    delete dispatcher;
-                }
-                else
-                {
-                     print_usage (stderr, 1);
-                }
-            }
-            break;
-        case '?':   /* Invalid option. */
-            print_usage (stderr, 1);
-        case -1:    /* End of options.  */
-            break;
-        default:    /* Error  */
-            print_usage (stderr, 1);
+            int ret = a.exec();
+
+            // clean memory
+            delete servercontentAccessModule;
+            delete dbusConnection;
+            delete dispatcher;
+        }
+        else
+        {
+            print_usage (stderr, 2);
         }
     }
-    while (next_option != -1);
-
+    else
+    {
+        print_usage (stderr, 3);
+    }
     return EXIT_SUCCESS;
 }
 
diff --git a/test/poi-service/poi-contentaccess-module/poi-contentaccess-module.pro b/test/poi-service/poi-contentaccess-module/poi-contentaccess-module.pro
deleted file mode 100644
index 43f4ad4..0000000
--- a/test/poi-service/poi-contentaccess-module/poi-contentaccess-module.pro
+++ /dev/null
@@ -1,43 +0,0 @@
-TEMPLATE = app
-CONFIG += console
-QT       += core gui widgets
-
-RESOURCES += \
-    ../poi-common/poi-resource.qrc
-
-SOURCES += main.cpp \
-    database.cpp \
-    mainwindow.cpp
-
-INCLUDEPATH += /usr/include/glibmm-2.4 \
-    /usr/lib/i386-linux-gnu/glibmm-2.4/include \
-    /usr/include/glib-2.0 \
-    /usr/lib/i386-linux-gnu/glib-2.0/include \
-    /usr/include/dbus-c++-1 \
-    /usr/include/dbus-1.0 \
-    /usr/lib/i386-linux-gnu/dbus-1.0/include
-
-LIBS += -lglibmm-2.4 \
-        -lglib-2.0 \
-        -lgobject-2.0 \
-        -lsqlite3 \
-        -ldbus-c++-glib-1 \
-        -ldbus-c++-1 \
-        -ldbus-1
-
-HEADERS += \
-    database.h \
-    mainwindow.h \
-    poi-datamodel.h \
-    poi-contentaccess-module-class.h \
-    ../poi-common/poi-common-data-model.h
-
-FORMS += \
-    mainwindow.ui
-
-TRANSLATIONS    = ../poi-common/poi-content-access-module_en.ts \
-                  ../poi-common/poi-content-access-module_jp.ts
-
-OTHER_FILES +=
-
-
diff --git a/test/poi-service/poi-contentaccess-module/ui_mainwindow.h b/test/poi-service/poi-contentaccess-module/ui_mainwindow.h
deleted file mode 100644
index bb13104..0000000
--- a/test/poi-service/poi-contentaccess-module/ui_mainwindow.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/********************************************************************************
-** Form generated from reading UI file 'mainwindow.ui'
-**
-** Created: Thu Mar 14 14:16:40 2013
-**      by: Qt User Interface Compiler version 4.8.1
-**
-** WARNING! All changes made in this file will be lost when recompiling UI file!
-********************************************************************************/
-
-#ifndef UI_MAINWINDOW_H
-#define UI_MAINWINDOW_H
-
-#include <QtCore/QLocale>
-#include <QtCore/QVariant>
-#include <QAction>
-#include <QApplication>
-#include <QButtonGroup>
-#include <QFrame>
-#include <QGroupBox>
-#include <QHeaderView>
-#include <QLabel>
-#include <QMainWindow>
-#include <QMenuBar>
-#include <QPushButton>
-#include <QStatusBar>
-#include <QToolBar>
-#include <QWidget>
-
-QT_BEGIN_NAMESPACE
-
-class Ui_MainWindow
-{
-public:
-    QWidget *centralWidget;
-    QLabel *camID;
-    QLabel *poiCategoryName;
-    QLabel *poiCategoryID;
-    QGroupBox *groupBox_2;
-    QLabel *VersionCAM;
-    QWidget *background;
-    QPushButton *addCAMCategory;
-    QPushButton *removeCAMCategory;
-    QPushButton *unregisterCAM;
-    QPushButton *registerCAM;
-    QGroupBox *groupBox;
-    QLabel *languageCode;
-    QLabel *countryCode;
-    QFrame *line;
-    QFrame *line_2;
-    QMenuBar *menuBar;
-    QToolBar *mainToolBar;
-    QStatusBar *statusBar;
-
-    void setupUi(QMainWindow *MainWindow)
-    {
-        if (MainWindow->objectName().isEmpty())
-            MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
-        MainWindow->resize(350, 443);
-        MainWindow->setMinimumSize(QSize(350, 443));
-        MainWindow->setMaximumSize(QSize(350, 443));
-        QIcon icon;
-        icon.addFile(QString::fromUtf8(":/new/image/POIPOCContentAccessModule.png"), QSize(), QIcon::Normal, QIcon::Off);
-        MainWindow->setWindowIcon(icon);
-        MainWindow->setStyleSheet(QString::fromUtf8("background-color: rgb(207, 245, 255);"));
-        centralWidget = new QWidget(MainWindow);
-        centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
-        camID = new QLabel(centralWidget);
-        camID->setObjectName(QString::fromUtf8("camID"));
-        camID->setGeometry(QRect(280, 200, 71, 20));
-        QFont font;
-        font.setPointSize(9);
-        camID->setFont(font);
-        camID->setStyleSheet(QString::fromUtf8("color: rgb(0, 85, 255);"));
-        poiCategoryName = new QLabel(centralWidget);
-        poiCategoryName->setObjectName(QString::fromUtf8("poiCategoryName"));
-        poiCategoryName->setGeometry(QRect(280, 310, 101, 17));
-        poiCategoryName->setFont(font);
-        poiCategoryName->setStyleSheet(QString::fromUtf8("color: rgb(0, 85, 255);"));
-        poiCategoryID = new QLabel(centralWidget);
-        poiCategoryID->setObjectName(QString::fromUtf8("poiCategoryID"));
-        poiCategoryID->setGeometry(QRect(280, 340, 101, 17));
-        poiCategoryID->setFont(font);
-        poiCategoryID->setStyleSheet(QString::fromUtf8("color: rgb(0, 85, 255);"));
-        groupBox_2 = new QGroupBox(centralWidget);
-        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
-        groupBox_2->setGeometry(QRect(10, 300, 141, 61));
-        QFont font1;
-        font1.setBold(true);
-        font1.setWeight(75);
-        groupBox_2->setFont(font1);
-        groupBox_2->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 170, 255);"));
-        VersionCAM = new QLabel(groupBox_2);
-        VersionCAM->setObjectName(QString::fromUtf8("VersionCAM"));
-        VersionCAM->setGeometry(QRect(0, 30, 131, 17));
-        VersionCAM->setFont(font);
-        background = new QWidget(centralWidget);
-        background->setObjectName(QString::fromUtf8("background"));
-        background->setGeometry(QRect(0, 0, 401, 181));
-        background->setAutoFillBackground(false);
-        background->setStyleSheet(QString::fromUtf8("image: url(:/new/image/magasin.jpg);"));
-        addCAMCategory = new QPushButton(centralWidget);
-        addCAMCategory->setObjectName(QString::fromUtf8("addCAMCategory"));
-        addCAMCategory->setGeometry(QRect(170, 300, 98, 27));
-        addCAMCategory->setAutoFillBackground(false);
-        addCAMCategory->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-        removeCAMCategory = new QPushButton(centralWidget);
-        removeCAMCategory->setObjectName(QString::fromUtf8("removeCAMCategory"));
-        removeCAMCategory->setGeometry(QRect(170, 340, 98, 27));
-        removeCAMCategory->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-        unregisterCAM = new QPushButton(centralWidget);
-        unregisterCAM->setObjectName(QString::fromUtf8("unregisterCAM"));
-        unregisterCAM->setGeometry(QRect(170, 240, 98, 27));
-        unregisterCAM->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-        registerCAM = new QPushButton(centralWidget);
-        registerCAM->setObjectName(QString::fromUtf8("registerCAM"));
-        registerCAM->setGeometry(QRect(170, 200, 98, 27));
-        registerCAM->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 255, 255);"));
-        registerCAM->setLocale(QLocale(QLocale::English, QLocale::UnitedStates));
-        groupBox = new QGroupBox(centralWidget);
-        groupBox->setObjectName(QString::fromUtf8("groupBox"));
-        groupBox->setGeometry(QRect(10, 200, 120, 80));
-        groupBox->setFont(font1);
-        groupBox->setStyleSheet(QString::fromUtf8("background-color: rgb(170, 170, 255);"));
-        languageCode = new QLabel(groupBox);
-        languageCode->setObjectName(QString::fromUtf8("languageCode"));
-        languageCode->setGeometry(QRect(0, 30, 66, 17));
-        languageCode->setFont(font);
-        countryCode = new QLabel(groupBox);
-        countryCode->setObjectName(QString::fromUtf8("countryCode"));
-        countryCode->setGeometry(QRect(0, 60, 66, 17));
-        countryCode->setFont(font);
-        line = new QFrame(centralWidget);
-        line->setObjectName(QString::fromUtf8("line"));
-        line->setGeometry(QRect(150, 280, 241, 16));
-        line->setFrameShape(QFrame::HLine);
-        line->setFrameShadow(QFrame::Sunken);
-        line_2 = new QFrame(centralWidget);
-        line_2->setObjectName(QString::fromUtf8("line_2"));
-        line_2->setGeometry(QRect(143, 200, 20, 191));
-        line_2->setFrameShape(QFrame::VLine);
-        line_2->setFrameShadow(QFrame::Sunken);
-        MainWindow->setCentralWidget(centralWidget);
-        background->raise();
-        camID->raise();
-        poiCategoryName->raise();
-        poiCategoryID->raise();
-        groupBox_2->raise();
-        addCAMCategory->raise();
-        removeCAMCategory->raise();
-        unregisterCAM->raise();
-        registerCAM->raise();
-        groupBox->raise();
-        line->raise();
-        line_2->raise();
-        menuBar = new QMenuBar(MainWindow);
-        menuBar->setObjectName(QString::fromUtf8("menuBar"));
-        menuBar->setGeometry(QRect(0, 0, 350, 25));
-        MainWindow->setMenuBar(menuBar);
-        mainToolBar = new QToolBar(MainWindow);
-        mainToolBar->setObjectName(QString::fromUtf8("mainToolBar"));
-        MainWindow->addToolBar(Qt::TopToolBarArea, mainToolBar);
-        statusBar = new QStatusBar(MainWindow);
-        statusBar->setObjectName(QString::fromUtf8("statusBar"));
-        MainWindow->setStatusBar(statusBar);
-
-        retranslateUi(MainWindow);
-
-        QMetaObject::connectSlotsByName(MainWindow);
-    } // setupUi
-
-    void retranslateUi(QMainWindow *MainWindow)
-    {
-        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Bicycle shop", 0));
-        camID->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        poiCategoryName->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        poiCategoryID->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        groupBox_2->setTitle(QApplication::translate("MainWindow", "Version", 0));
-        VersionCAM->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        addCAMCategory->setText(QApplication::translate("MainWindow", "ADDandREG", 0));
-        removeCAMCategory->setText(QApplication::translate("MainWindow", "REMOVE", 0));
-        unregisterCAM->setText(QApplication::translate("MainWindow", "UNREGISTER", 0));
-        registerCAM->setText(QApplication::translate("MainWindow", "REGISTER", 0));
-        groupBox->setTitle(QApplication::translate("MainWindow", "Language", 0));
-        languageCode->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-        countryCode->setText(QApplication::translate("MainWindow", "TextLabel", 0));
-    } // retranslateUi
-
-};
-
-namespace Ui {
-    class MainWindow: public Ui_MainWindow {};
-} // namespace Ui
-
-QT_END_NAMESPACE
-
-#endif // UI_MAINWINDOW_H
diff --git a/test/poi-service/poi-supplier/CMakeLists.txt b/test/poi-service/poi-supplier/CMakeLists.txt
new file mode 100644
index 0000000..3ea9f23
--- /dev/null
+++ b/test/poi-service/poi-supplier/CMakeLists.txt
@@ -0,0 +1,69 @@
+###########################################################################
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# Component Name: poi-supplier
+#
+# Author: Philippe Colliot
+#
+# Copyright (C) 2014, PCA Peugeot Citroën
+# 
+# License:
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# @licence end@
+###########################################################################
+project(poi-supplier)
+cmake_minimum_required(VERSION 2.8)
+
+message(STATUS "poi-supplier")
+
+find_package(PkgConfig REQUIRED)
+
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+pkg_check_modules(SQLITE3 REQUIRED sqlite3)
+pkg_check_modules(GLIBMM glibmm-2.4)
+pkg_check_modules(GOBJECT gobject-2.0)
+pkg_check_modules(XML2 libxml-2.0)
+pkg_check_modules(XMLCPP libxml++-2.6)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${GLIB_INCLUDE_DIRS})
+include_directories(${SQLITE3_INCLUDE_DIRS})
+include_directories(${GLIBMM_INCLUDE_DIRS})
+include_directories(${GOBJECT_INCLUDE_DIRS})
+include_directories(${XML2_INCLUDE_DIRS})
+include_directories(${XMLCPP_INCLUDE_DIRS})
+
+link_directories(
+    ${GLIB_LIBRARY_DIRS}
+	${SQLITE3_LIBRARY_DIRS}
+	${GLIBMM_LIBRARY_DIRS}
+	${GOBJECT_LIBRARY_DIRS}
+	${XML2_LIBRARY_DIRS}
+	${XMLCPP_LIBRARY_DIRS}
+)
+
+add_executable(poi-supplier
+	main.cpp 
+    database.cpp 
+    raw-file-sort.cpp
+	database.h 
+    raw-file-sort.h 
+    poi-datamodel.h
+)
+
+set(LIBRARIES 
+    ${GLIB_LIBRARIES}
+	${SQLITE3_LIBRARIES}
+	${GLIBMM_LIBRARIES}
+	${GOBJECT_LIBRARIES}
+	${XML2_LIBRARIES}
+	${XMLCPP_LIBRARIES}
+)
+
+target_link_libraries(poi-supplier ${LIBRARIES})
+
+
diff --git a/test/poi-service/poi-supplier/poi-supplier.pro b/test/poi-service/poi-supplier/poi-supplier.pro
deleted file mode 100644
index 8b2bd78..0000000
--- a/test/poi-service/poi-supplier/poi-supplier.pro
+++ /dev/null
@@ -1,27 +0,0 @@
-TEMPLATE = app
-CONFIG += console
-CONFIG -= qt
-
-SOURCES += main.cpp \
-    database.cpp \
-    raw-file-sort.cpp
-
-HEADERS += \
-    database.h \
-    raw-file-sort.h \
-    poi-datamodel.h
-INCLUDEPATH += /usr/include/libxml++-2.6 \
-    /usr/lib/libxml++-2.6/include \
-    /usr/include/libxml2 \
-    /usr/include/glibmm-2.4 \
-    /usr/lib/i386-linux-gnu/glibmm-2.4/include \
-    /usr/include/glib-2.0 \
-    /usr/lib/i386-linux-gnu/glib-2.0/include
-
-LIBS += -lxml++-2.6 \
-        -lxml2 \
-        -lglibmm-2.4 \
-        -lglib-2.0 \
-        -lgobject-2.0 \
-        -lsqlite3
-
diff --git a/test/poi-service/script/Makefile b/test/poi-service/script/Makefile
deleted file mode 100644
index 0abc30c..0000000
--- a/test/poi-service/script/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
-#
-# \file Makefile
-#
-# \brief This file is part of the Build System.
-#
-# \author Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# \version 1.0
-#
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License (MPL), v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# For further information see http://www.genivi.org/.
-#
-# List of changes:
-# 
-# 4/6/2014, Philippe Colliot, complete src-clean option
-# 18/6/2014, Philippe Colliot, APT_GET option for Fedora
-#
-# @licence end@
-
-ROOT_DIR=$(CURDIR)/..
-API_DIR=$(CURDIR)/../../../api
-BIN_DIR=$(ROOT_DIR)/bin
-COMMON_DIR=$(ROOT_DIR)/poi-common
-EXE_DIR=$(BIN_DIR)
-SERVER_DIR=$(CURDIR)/../../../src/poi-service/script/
-QMAKE=qmake
-CXX=g++
-CXXFLAGS=-pipe -O2 -Wall
-CHK_DIR_EXISTS=test -d
-MKDIR=mkdir -p
-
-ifndef $(APT_GET) 
-	APT_GET=apt-get
-endif
-
-default: help
-
-help::
-	@echo "The following targets exist"
-	@echo "all: Build $(ALL)"
-	@echo "clean: Clean up build dir"
-	@echo "src-clean: Clean up all checked out sources"
-	@echo "all2: Get $(DEPS) and build $(ALL)"
-	@echo "make APT_GET=yum for Fedora, by default APT_GET is set to apt-get"
-
-#Clone the positioning repository for getting the API, generate the proxies and adaptors for the DBus APIs firstly
-include get-positioning.mk
-include generate-api.mk
-
-include poi-supplier.mk
-include poi-client.mk
-include poi-contentaccess-module.mk
-
-all: $(ALL)
-	
-deps::
-	sudo $(APT_GET) install $(DEPS)
-
-all2: deps all
-
-src-clean: $(SRC_CLEAN)
-
-clean: $(CLEAN)
-
diff --git a/test/poi-service/script/build.sh b/test/poi-service/script/build.sh
new file mode 100755
index 0000000..152e0f6
--- /dev/null
+++ b/test/poi-service/script/build.sh
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+###########################################################################
+# @licence app begin@
+# SPDX-License-Identifier: MPL-2.0
+#
+# Component Name: poi-service
+# Author: Philippe Colliot <philippe.colliot@mpsa.com>
+#
+# Copyright (C) 2013-2014, PCA Peugeot Citroen
+# 
+# License:
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
+# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# @licence end@
+###########################################################################
+TOP_DIR=$PWD/..
+TOP_BIN_DIR=$PWD/../bin
+
+POI_COMMON=poi-common
+POI_COMMON_SRC_DIR=$TOP_DIR/$POI_COMMON
+
+POI_CLIENT=poi-client
+POI_CLIENT_SRC_DIR=$TOP_DIR/$POI_CLIENT
+POI_CLIENT_BIN_DIR=$TOP_BIN_DIR/$POI_CLIENT
+
+POI_CONTENTACCESS_MODULE=poi-contentaccess-module
+POI_CONTENTACCESS_MODULE_SRC_DIR=$TOP_DIR/$POI_CONTENTACCESS_MODULE
+POI_CONTENTACCESS_MODULE_BIN_DIR=$TOP_BIN_DIR/$POI_CONTENTACCESS_MODULE
+
+POI_SUPPLIER=poi-supplier
+POI_SUPPLIER_SRC_DIR=$TOP_DIR/$POI_SUPPLIER
+POI_SUPPLIER_BIN_DIR=$TOP_BIN_DIR/$POI_SUPPLIER
+
+NAVIGATION_SERVICE_API_DIR=$TOP_DIR/../../api
+
+POI_SERVER_TOP_DIR=$TOP_DIR/../../src/poi-service
+POI_SERVER_SRC_DIR=$POI_SERVER_TOP_DIR/poi-server
+POI_SERVER_BIN_DIR=$POI_SERVER_TOP_DIR/bin
+POI_SERVER_SCRIPT_DIR=$POI_SERVER_TOP_DIR/script
+POI_SERVER_BUILD_SCRIPT=./build.sh
+
+GENIVI_NAVIGATION_ROUTING_API=$NAVIGATION_SERVICE_API_DIR/navigation-core/genivi-navigationcore-routing.xml
+GENIVI_NAVIGATION_CONSTANTS_API=$NAVIGATION_SERVICE_API_DIR/navigation-core/genivi-navigationcore-constants.xml
+
+#--------------------------------------------------------------------------
+# Compiler Flags
+#--------------------------------------------------------------------------
+# modify the following flags as needed:
+
+#--------------------------------------------------------------------------
+
+usage() {
+    echo "Usage: ./build.sh Build poi-service"
+    echo "   or: ./build.sh [command]"
+    echo
+    echo "command:"
+    echo "  make            Build"
+    echo "  clean           Clean"
+    echo "  src-clean       Clean the cloned sources"
+    echo "  help            Print Help"
+    echo
+    echo
+}
+
+build() {
+    echo ''
+    echo 'Building poi-service'
+
+    echo 'Check and build poi-server if needed'
+    cd $POI_SERVER_SCRIPT_DIR && bash $POI_SERVER_BUILD_SCRIPT make
+
+    cd $TOP_DIR 
+    mkdir -p bin
+
+    cd $TOP_BIN_DIR
+    mkdir -p $POI_CLIENT
+    cd $POI_CLIENT_BIN_DIR 
+    cmake $POI_CLIENT_SRC_DIR && make
+
+    cd $TOP_BIN_DIR
+    mkdir -p $POI_SUPPLIER
+    cd $POI_SUPPLIER_BIN_DIR 
+    cmake $POI_SUPPLIER_SRC_DIR && make
+
+    cd $TOP_BIN_DIR
+    mkdir -p $POI_CONTENTACCESS_MODULE
+    cd $POI_CONTENTACCESS_MODULE_BIN_DIR 
+    cmake $POI_CONTENTACCESS_MODULE_SRC_DIR && make
+
+}
+
+clean() {
+    cd $POI_SERVER_SCRIPT_DIR && bash $POI_SERVER_BUILD_SCRIPT clean
+	echo 'delete' $TOP_BIN_DIR 
+	rm -rf $TOP_BIN_DIR
+	echo 'delete dbus generated files'
+	rm -f $POI_COMMON_SRC_DIR/*_adaptor.h $POI_COMMON_SRC_DIR/*_proxy.h $POI_COMMON_SRC_DIR/*-constants.h
+	echo 'delete qm generated files'
+	rm -f $POI_COMMON_SRC_DIR/*.qm 
+}
+
+src-clean() {
+    cd $POI_SERVER_SCRIPT_DIR && bash $POI_SERVER_BUILD_SCRIPT src-clean
+	echo 'delete' $TOP_BIN_DIR 
+	rm -rf $TOP_BIN_DIR
+	echo 'delete dbus generated files'
+	rm -f $POI_COMMON_SRC_DIR/*_adaptor.h $POI_COMMON_SRC_DIR/*_proxy.h $POI_COMMON_SRC_DIR/*-constants.h
+	echo 'delete qm generated files'
+	rm -f $POI_COMMON_SRC_DIR/*.qm 
+}
+
+
+set -e
+
+if [ $# -ge 1 ]; then
+    if [ $1 = help ]; then
+        usage
+    elif [ $1 = make ]; then
+        build
+    elif [ $1 = clean ]; then
+        clean
+    elif [ $1 = src-clean ]; then
+        src-clean
+    else
+        usage
+    fi
+elif [ $# -eq 0 ]; then
+    build
+else
+    usage
+fi
+
diff --git a/test/poi-service/script/generate-api.mk b/test/poi-service/script/generate-api.mk
deleted file mode 100644
index 8b60942..0000000
--- a/test/poi-service/script/generate-api.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
-#
-# \file generate-api.mk
-#
-# \brief This file is part of the Build System.
-#
-# \author Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# \version 1.0
-#
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License (MPL), v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# For further information see http://www.genivi.org/.
-#
-# List of changes:
-# 
-# <date>, <name>, <description of change>
-#
-# @licence end@
-COMMON_DIR=$(ROOT_DIR)/poi-common
-TARGET_GENERATED_API_DIR=$(COMMON_DIR)
-GENERATE_API_DEPS=libdbus-c++-dev xsltproc
-DEPS+=$(GENERATE_API_DEPS)
-
-ALL+=generate-api
-CLEAN+=clean-generate-api
-
-help::
-	@echo "generate-api: Generate the proxies and adaptors"
-
-generate-api: generate-api-poi generate-api-other
-
-clean-generate-api:: 
-	rm -rf ${TARGET_GENERATED_API_DIR}/*_adaptor.h
-	rm -rf ${TARGET_GENERATED_API_DIR}/*_proxy.h
-	rm -rf ${TARGET_GENERATED_API_DIR}/*_constants.h
-
-generate-api-poi:: ${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h: ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml 
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_proxy.h: ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml 	
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-contentaccessmodule.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-poiservice-contentaccessmodule_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_adaptor.h: ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml 
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_proxy.h: ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml 
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poicontentaccess.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-poiservice-poicontentaccess_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_adaptor.h: ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_proxy.h: ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml
-	dbusxx-xml2cpp ${API_DIR}/poi-service/genivi-poiservice-poisearch.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-poiservice-poisearch_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h: ${API_DIR}/poi-service/genivi-poiservice-constants.xml 
-	xsltproc ${API_DIR}/poi-service/enum.xsl ${API_DIR}/poi-service/genivi-poiservice-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-poiservice-constants.h
-
-generate-api-other:: ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h
-
-${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_adaptor.h: ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml
-	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_proxy.h: ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml
-	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-guidance.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-guidance_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_adaptor.h: ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml
-	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h: ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml
-	dbusxx-xml2cpp ${API_DIR}/navigation-core/genivi-navigationcore-routing.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-navigationcore-routing_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h: ${positioning_API}/genivi-positioning-enhancedposition.xml
-	dbusxx-xml2cpp ${positioning_API}/genivi-positioning-enhancedposition.xml --adaptor=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_adaptor.h
-
-${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h: ${positioning_API}/genivi-positioning-enhancedposition.xml
-	dbusxx-xml2cpp ${positioning_API}/genivi-positioning-enhancedposition.xml --proxy=${TARGET_GENERATED_API_DIR}/genivi-positioning-enhancedposition_proxy.h
-
-${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h: ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml
-	xsltproc ${API_DIR}/navigation-core/enum.xsl ${API_DIR}/navigation-core/genivi-navigationcore-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-navigationcore-constants.h
-
-#use the enum.xsl of navigation-core to generate the positioning constants
-${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h: ${positioning_API}/genivi-positioning-constants.xml
-	xsltproc ${API_DIR}/navigation-core/enum.xsl ${positioning_API}/genivi-positioning-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-positioning-constants.h
-
-${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h: ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml
-	xsltproc ${API_DIR}/map-viewer/enum.xsl ${API_DIR}/map-viewer/genivi-mapviewer-constants.xml > ${TARGET_GENERATED_API_DIR}/genivi-mapviewer-constants.h
-
diff --git a/test/poi-service/script/get-positioning.mk b/test/poi-service/script/get-positioning.mk
deleted file mode 100644
index 6b56e04..0000000
--- a/test/poi-service/script/get-positioning.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
-#
-# \file get-positioning.mk
-#
-# \brief This file is part of the Build System.
-#
-# \author Martin Schaller <martin.schaller@it-schaller.de>
-# \author Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# \version 1.0
-#
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License (MPL), v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# For further information see http://www.genivi.org/.
-#
-# List of changes:
-# 
-# 28-04-2014, Philippe Colliot, link to the public repos of positioning, add clean feature
-# 4/6/2014, Philippe Colliot, complete src-clean option
-# 15/7/2014, Philippe Colliot, align with the new version of positioning dbus path
-# 
-# @licence end@
-positioning_SRC=$(ROOT_DIR)/positioning
-positioning_API=$(positioning_SRC)/enhanced-position-service/api
-positioning_URL=http://git.projects.genivi.org/lbs/positioning.git
-positioning_VERSION=09698f63ea27a24c533b4c015155ee9ebd7a3026
-
-ALL+=positioning
-SRC_CLEAN+=clean-positioning_SRC
-
-help::
-	@echo "positioning: Get positioning"
-
-positioning: $(positioning_API)/genivi-positioning-enhancedposition.xml
-
-clean-positioning_SRC:: 
-	rm -rf $(positioning_SRC)
-
-$(positioning_API)/genivi-positioning-enhancedposition.xml:
-	cd $(positioning_SRC)/.. && git clone $(positioning_URL)
-	cd $(positioning_SRC) && git checkout $(positioning_VERSION)
diff --git a/test/poi-service/script/make-database b/test/poi-service/script/make-database
index 223aec9..1d45be8 100755
--- a/test/poi-service/script/make-database
+++ b/test/poi-service/script/make-database
@@ -29,7 +29,7 @@
 CURDIR=$PWD
 ROOT_DIR=$CURDIR/..
 BIN_DIR=$ROOT_DIR/bin
-EXE_DIR=$BIN_DIR
+EXE_DIR=$BIN_DIR/poi-supplier
 CHK_DIR_EXISTS='test -d'
 MKDIR='mkdir -p'
 
@@ -46,8 +46,8 @@ FUEL_FILE=$POI_FILES_DIR/'fuel-station.xml'
 MUSEUM_AND_HOTEL_FILE=$POI_FILES_DIR/'museum-and-hotel.xml'
 STATION_FILE=$POI_FILES_DIR/'station.xml'
 BICYCLE_FILE=$POI_FILES_DIR/'bicycle.xml'
-MAIN_DATABASE=$EXE_DIR/'poi-database.db'
-ADDITIONAL_DATABASE=$EXE_DIR/'poi-database-additional.db'
+MAIN_DATABASE=$BIN_DIR/'poi-database.db'
+ADDITIONAL_DATABASE=$BIN_DIR/'poi-database-additional.db'
 
 if [ ! -f $FUEL_FILE ]
 then
@@ -71,7 +71,7 @@ then
 fi
 
 echo 'clean up'
-rm $EXE_DIR/*.db
+rm -f $BIN_DIR/*.db
 echo 'create empty databases'
 cp poi-database-empty $MAIN_DATABASE
 cp poi-database-empty $ADDITIONAL_DATABASE
diff --git a/test/poi-service/script/poi-client.mk b/test/poi-service/script/poi-client.mk
deleted file mode 100644
index ed3e580..0000000
--- a/test/poi-service/script/poi-client.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
-#
-# \file poi-client.mk
-#
-# \brief This file is part of the Build System.
-#
-# \author Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# \version 1.1
-#
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License (MPL), v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# For further information see http://www.genivi.org/.
-#
-# List of changes:
-# 
-# 04/06/2014, Philippe Colliot, Migration to Qt5.2
-#
-# @licence end@
-POI_CLIENT_SRC_DIR=$(ROOT_DIR)/poi-client
-POI_CLIENT_DEPS=qt4-qmlviewer libqt5widgets5 libqt5dbus5 libqt5core5a libqt5gui5 qtbase5-dev-tools qttools5-dev-tools
-POI_CLIENT_BIN_DIR=$(BIN_DIR)/poi-client-bin
-
-DEPS+=$(POI_CLIENT_DEPS)
-ALL+=poi-client
-CLEAN+=clean-poi-client
-
-help::
-	@echo "poi-client: Build the poi client"
-
-clean-poi-client::
-	rm -rf $(POI_CLIENT_BIN_DIR)
-	rm -rf poi-client
-
-poi-client: $(POI_CLIENT_BIN_DIR)/Makefile-poi-client
-	$(MAKE) -C $(POI_CLIENT_BIN_DIR)
-	mv $(POI_CLIENT_BIN_DIR)/poi-client $(EXE_DIR)
-
-$(POI_CLIENT_BIN_DIR)/Makefile-poi-client: $(POI_CLIENT_SRC_DIR)/poi-client.pro 
-	@$(CHK_DIR_EXISTS) $(POI_CLIENT_BIN_DIR) || $(MKDIR) $(POI_CLIENT_BIN_DIR)
-	cd $(POI_CLIENT_BIN_DIR) && $(QMAKE) $(POI_CLIENT_SRC_DIR)/poi-client.pro
-
diff --git a/test/poi-service/script/poi-contentaccess-module.mk b/test/poi-service/script/poi-contentaccess-module.mk
deleted file mode 100644
index 3f622ff..0000000
--- a/test/poi-service/script/poi-contentaccess-module.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
-#
-# \file poi-contentaccess-module.mk
-#
-# \brief This file is part of the Build System.
-#
-# \author Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# \version 1.1
-#
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License (MPL), v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# For further information see http://www.genivi.org/.
-#
-# List of changes:
-# 
-# 04/06/2014, Philippe Colliot, Migration to Qt5.2
-#
-# @licence end@
-POI_CONTENTACCESS_MODULE_SRC_DIR=$(ROOT_DIR)/poi-contentaccess-module
-POI_CONTENTACCESS_MODULE_DEPS=qt4-qmlviewer libqt5widgets5 libqt5dbus5 libqt5core5a libqt5gui5 libsqlite3-dev sqlite3 qtbase5-dev-tools
-POI_CONTENTACCESS_MODULE_BIN_DIR=$(BIN_DIR)/poi-contentaccess-module-bin
-
-DEPS+=$(POI_CONTENTACCESS_MODULE_DEPS)
-ALL+=poi-contentaccess-module
-CLEAN+=clean-poi-contentaccess-module
-
-help::
-	@echo "poi-contentaccess-module: Build the poi content access module"
-
-clean-poi-contentaccess-module::
-	rm -rf $(POI_CONTENTACCESS_MODULE_BIN_DIR)
-	rm -rf poi-contentaccess-module
-
-poi-contentaccess-module: $(POI_CONTENTACCESS_MODULE_BIN_DIR)/Makefile-poi-contentaccess-module
-	$(MAKE) -C $(POI_CONTENTACCESS_MODULE_BIN_DIR)
-	mv $(POI_CONTENTACCESS_MODULE_BIN_DIR)/poi-contentaccess-module $(EXE_DIR)
-
-$(POI_CONTENTACCESS_MODULE_BIN_DIR)/Makefile-poi-contentaccess-module: $(POI_CONTENTACCESS_MODULE_SRC_DIR)/poi-contentaccess-module.pro 
-	@$(CHK_DIR_EXISTS) $(POI_CONTENTACCESS_MODULE_BIN_DIR) || $(MKDIR) $(POI_CONTENTACCESS_MODULE_BIN_DIR)
-	cd $(POI_CONTENTACCESS_MODULE_BIN_DIR) && $(QMAKE) $(POI_CONTENTACCESS_MODULE_SRC_DIR)/poi-contentaccess-module.pro
-
diff --git a/test/poi-service/script/poi-supplier.mk b/test/poi-service/script/poi-supplier.mk
deleted file mode 100644
index d0f3a86..0000000
--- a/test/poi-service/script/poi-supplier.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# @licence app begin@
-# SPDX-License-Identifier: MPL-2.0
-#
-# \copyright Copyright (C) 2013-2014, PCA Peugeot Citroen
-#
-# \file poi-supplier.mk
-#
-# \brief This file is part of the Build System.
-#
-# \author Philippe Colliot <philippe.colliot@mpsa.com>
-#
-# \version 1.0
-#
-# This Source Code Form is subject to the terms of the
-# Mozilla Public License (MPL), v. 2.0.
-# If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# For further information see http://www.genivi.org/.
-#
-# List of changes:
-# 
-# <date>, <name>, <description of change>
-#
-# @licence end@
-POI_SUPPLIER_SRC_DIR=$(ROOT_DIR)/poi-supplier
-POI_SUPPLIER_COMMON_DIR=$(ROOT_DIR)/poi-common
-POI_SUPPLIER_BIN_DIR=$(BIN_DIR)/poi-supplier-bin
-POI_SUPPLIER_DEPS=libxml2-dev libsqlite3-dev sqlite3 libxml++2.6-dev
-POI_SUPPLIER_INCPATH=-I$(POI_SUPPLIER_COMMON_DIR) -I$(POI_SUPPLIER_SRC_DIR) -I/usr/include/libxml++-2.6 -I/usr/lib/libxml++-2.6/include -I/usr/include/libxml2 -I/usr/include/glibmm-2.4 -I/usr/lib/i386-linux-gnu/glibmm-2.4/include -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include 
-POI_SUPPLIER_LIBS=-lxml++-2.6 -lxml2 -lglibmm-2.4 -lglib-2.0 -lgobject-2.0 -lsqlite3
-POI_SUPPLIER_LINK=g++
-POI_SUPPLIER_LFLAGS=-Wl,-O1
-
-DEPS+=$(POI_SUPPLIER_DEPS)
-ALL+=poi-supplier
-CLEAN+=clean-poi-supplier
-
-help::
-	@echo "poi-supplier: Build the poi supplier"
-
-clean-poi-supplier::
-	rm -rf $(POI_SUPPLIER_BIN_DIR)
-	rm -rf poi-supplier
-
-poi-supplier: $(POI_SUPPLIER_BIN_DIR)/main.o $(POI_SUPPLIER_BIN_DIR)/database.o $(POI_SUPPLIER_BIN_DIR)/raw-file-sort.o
-	$(POI_SUPPLIER_LINK) $(POI_SUPPLIER_LFLAGS) $(POI_SUPPLIER_BIN_DIR)/main.o $(POI_SUPPLIER_BIN_DIR)/database.o $(POI_SUPPLIER_BIN_DIR)/raw-file-sort.o $(POI_SUPPLIER_LIBS) -o $(EXE_DIR)/poi-supplier
-	
-$(POI_SUPPLIER_BIN_DIR)/main.o: $(POI_SUPPLIER_SRC_DIR)/main.cpp $(POI_SUPPLIER_SRC_DIR)/poi-datamodel.h \
-		$(POI_SUPPLIER_SRC_DIR)/raw-file-sort.h \
-		$(POI_SUPPLIER_SRC_DIR)/database.h
-	@$(CHK_DIR_EXISTS) $(POI_SUPPLIER_BIN_DIR) || $(MKDIR) $(POI_SUPPLIER_BIN_DIR)
-	$(CXX) -c $(CXXFLAGS) $(POI_SUPPLIER_INCPATH) -o $(POI_SUPPLIER_BIN_DIR)/main.o $(POI_SUPPLIER_SRC_DIR)/main.cpp
-
-$(POI_SUPPLIER_BIN_DIR)/database.o: $(POI_SUPPLIER_SRC_DIR)/database.cpp $(POI_SUPPLIER_SRC_DIR)/database.h
-	@$(CHK_DIR_EXISTS) $(POI_SUPPLIER_BIN_DIR) || $(MKDIR) $(POI_SUPPLIER_BIN_DIR)
-	$(CXX) -c $(CXXFLAGS) $(POI_SUPPLIER_INCPATH) -o $(POI_SUPPLIER_BIN_DIR)/database.o $(POI_SUPPLIER_SRC_DIR)/database.cpp
-
-$(POI_SUPPLIER_BIN_DIR)/raw-file-sort.o: $(POI_SUPPLIER_SRC_DIR)/raw-file-sort.cpp $(POI_SUPPLIER_SRC_DIR)/poi-datamodel.h \
-		$(POI_SUPPLIER_SRC_DIR)/raw-file-sort.h
-	$(CXX) -c $(CXXFLAGS) $(POI_SUPPLIER_INCPATH) -o $(POI_SUPPLIER_BIN_DIR)/raw-file-sort.o $(POI_SUPPLIER_SRC_DIR)/raw-file-sort.cpp
-
diff --git a/test/poi-service/script/prepare b/test/poi-service/script/prepare
index 896f409..221019c 100755
--- a/test/poi-service/script/prepare
+++ b/test/poi-service/script/prepare
@@ -70,12 +70,6 @@ do
 	esac
 done
 
-echo 'generate the translation files for the APIs'
-lupdate $ROOT_DIR/poi-client/poi-client.pro
-lupdate $ROOT_DIR/poi-contentaccess-module/poi-contentaccess-module.pro
-lrelease $ROOT_DIR/poi-client/poi-client.pro
-lrelease $ROOT_DIR/poi-contentaccess-module/poi-contentaccess-module.pro 
-
 echo 'generate the databases'
 ./make-database $city
 
diff --git a/test/poi-service/script/run b/test/poi-service/script/run
index ce8eb20..0cce19e 100755
--- a/test/poi-service/script/run
+++ b/test/poi-service/script/run
@@ -40,13 +40,11 @@ echo 'kill orphan process if necessary'
 $CURDIR/kill-all
 
 echo 'run'
-#check is poi-server exists, if not make it 
+
 if [ ! -f $COMPONENT_EXE_DIR/poi-server ]
 then
-    echo $COMPONENT_EXE_DIR/poi-server does not exist, so make it first
-	cd 	$COMPONENT_SCRIPT_DIR
-	./build.sh make
-	cd $CURDIR
+	echo 'no poi-server, do ./build.sh first'
+	exit
 fi
 
 if [ ! -f $MAIN_DATABASE ]
@@ -57,8 +55,10 @@ fi
 
 read language <$EXE_DIR/language.txt
 echo $language
-$EXE_DIR/poi-contentaccess-module -f $ADDITIONAL_DATABASE -i $language &
-$COMPONENT_EXE_DIR/poi-server -f $MAIN_DATABASE &
-
-$EXE_DIR/poi-client &
+cd $EXE_DIR/poi-contentaccess-module/
+./poi-contentaccess-module -f $ADDITIONAL_DATABASE -i $language &
+cd $COMPONENT_EXE_DIR/
+./poi-server -f $MAIN_DATABASE &
+cd $EXE_DIR/poi-client/
+./poi-client &
 
diff --git a/test/poi-service/script/tokyo/bicycle.xml b/test/poi-service/script/tokyo/bicycle.xml
index 2c81bf4..e2ac5e3 100644..100755
--- a/test/poi-service/script/tokyo/bicycle.xml
+++ b/test/poi-service/script/tokyo/bicycle.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <osm version="0.6" generator="Overpass API">
 <note>The data included in this document is from www.openstreetmap.org. The data is made available under ODbL.</note>
-<meta osm_base="2013-02-04T12:13:01Z"/>
+<meta osm_base="2014-09-21T11:39:02Z"/>
 
-  <node id="822683026" lat="35.6975631" lon="139.6787833"/>
-  <node id="822683167" lat="35.6975483" lon="139.6789087"/>
-  <node id="822683192" lat="35.6977571" lon="139.6789500"/>
-  <node id="822683233" lat="35.6977757" lon="139.6788222"/>
   <node id="1050803357" lat="35.6720652" lon="139.7122126"/>
   <node id="1050803359" lat="35.6721908" lon="139.7124713"/>
   <node id="1050803363" lat="35.6721954" lon="139.7122238"/>
@@ -22,6 +18,11 @@
     <tag k="name" v="17Bicycle"/>
     <tag k="shop" v="bicycle"/>
   </node>
+  <node id="1508619711" lat="35.6518928" lon="139.7452317">
+    <tag k="name" v="ヤマモトサイクル"/>
+    <tag k="service:bicycle:retail" v="yes"/>
+    <tag k="shop" v="bicycle"/>
+  </node>
   <node id="1580614679" lat="35.6709901" lon="139.7414690">
     <tag k="name" v="Y'sROAD赤坂店"/>
     <tag k="name:en" v="Y'sRoad Akasaka"/>
@@ -33,6 +34,10 @@
     <tag k="service:bicycle:retail" v="yes"/>
     <tag k="shop" v="bicycle"/>
   </node>
+  <node id="1759744919" lat="35.6492293" lon="139.7002215">
+    <tag k="shop" v="bicycle"/>
+    <tag k="source" v="survey"/>
+  </node>
   <node id="1763146176" lat="35.6591576" lon="139.7279059">
     <tag k="name" v="Trekストア六本木"/>
     <tag k="shop" v="bicycle"/>
@@ -48,6 +53,18 @@
     <tag k="shop" v="bicycle"/>
     <tag k="website" v="http://www.lipit-ischtar.jp/"/>
   </node>
+  <node id="1990602001" lat="35.7352927" lon="139.8022728">
+    <tag k="branch" v="南千住店"/>
+    <tag k="name" v="サイクルスポット (CycleSpot)"/>
+    <tag k="name:en" v="CycleSpot"/>
+    <tag k="name:ja" v="サイクルスポット"/>
+    <tag k="shop" v="bicycle"/>
+  </node>
+  <node id="2017887369" lat="35.6489147" lon="139.7459568">
+    <tag k="name" v="石黒サイクル"/>
+    <tag k="shop" v="bicycle"/>
+    <tag k="source" v="image;Bing"/>
+  </node>
   <node id="2037964080" lat="35.6720467" lon="139.7124643">
     <tag k="name" v="なるしまフレンド神宮店"/>
     <tag k="name:en" v="Nalsima Frend"/>
@@ -59,6 +76,20 @@
     <tag k="shop" v="bicycle"/>
     <tag k="source" v="bing"/>
   </node>
+  <node id="2041267345" lat="35.7329414" lon="139.7134610">
+    <tag k="addr:housename" v="D-BOXビル"/>
+    <tag k="addr:housenumber" v="2F"/>
+    <tag k="name" v="Y's Road 池袋チャーリー店"/>
+    <tag k="name:en" v="Y's Road Ikebukuro charie"/>
+    <tag k="shop" v="bicycle"/>
+    <tag k="source" v="bing,web"/>
+    <tag k="website" v="http://www.jitensya.co.jp/shop/#ikebukuro01"/>
+  </node>
+  <node id="2041267346" lat="35.7292601" lon="139.7166702">
+    <tag k="name" v="Y'sロード 池袋店"/>
+    <tag k="name:en" v="Y's Road Ikebukuro"/>
+    <tag k="shop" v="bicycle"/>
+  </node>
   <node id="2041460009" lat="35.6583389" lon="139.7034843">
     <tag k="name" v="Y'sロード 渋谷レディース館"/>
     <tag k="name:en" v="Y's Road Shibuya Ladies"/>
@@ -99,15 +130,32 @@
     <tag k="name" v="MapSports"/>
     <tag k="shop" v="bicycle"/>
   </node>
-  <way id="68327931">
-    <nd ref="822683192"/>
-    <nd ref="822683167"/>
-    <nd ref="822683026"/>
-    <nd ref="822683233"/>
-    <nd ref="822683192"/>
-    <tag k="name" v="東都サイクル"/>
+  <node id="2345209653" lat="35.6366627" lon="139.7332452">
+    <tag k="name" v="小倉自転車店"/>
     <tag k="shop" v="bicycle"/>
-  </way>
+    <tag k="source" v="image,2013-05;Bing"/>
+  </node>
+  <node id="2852903947" lat="35.6568131" lon="139.7445664">
+    <tag k="name" v="ParkSIDER"/>
+    <tag k="shop" v="bicycle"/>
+    <tag k="source" v="image,2014-05;Bing;GSI/KIBAN"/>
+  </node>
+  <node id="2876217567" lat="35.6700084" lon="139.7141969">
+    <tag k="name" v="Bike Forum Aoyama"/>
+    <tag k="shop" v="bicycle"/>
+    <tag k="source" v="survey"/>
+    <tag k="website" v="http://www.bikeforum-aoyama.jp/"/>
+  </node>
+  <node id="2902854125" lat="35.6617724" lon="139.7808300">
+    <tag k="name" v="小川サイクル"/>
+    <tag k="shop" v="bicycle"/>
+    <tag k="source" v="image,2014-06;Bing;GSI/KIBAN 2500"/>
+  </node>
+  <node id="2985876084" lat="35.6667643" lon="139.7199555">
+    <tag k="name" v="Bianchi Community Aoyama"/>
+    <tag k="shop" v="bicycle"/>
+    <tag k="source" v="survey"/>
+  </node>
   <way id="90555954">
     <nd ref="1050803363"/>
     <nd ref="1050803359"/>
diff --git a/test/poi-service/script/tokyo/fuel-station.xml b/test/poi-service/script/tokyo/fuel-station.xml
new file mode 100755
index 0000000..3c01910
--- /dev/null
+++ b/test/poi-service/script/tokyo/fuel-station.xml
@@ -0,0 +1,1221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<osm version="0.6" generator="Overpass API">
+<note>The data included in this document is from www.openstreetmap.org. The data is made available under ODbL.</note>
+<meta osm_base="2014-09-21T11:37:02Z"/>
+
+  <node id="241821674" lat="35.6795668" lon="139.7946657">
+    <tag k="amenity" v="fuel"/>
+    <tag k="created_by" v="JOSM"/>
+    <tag k="name" v="Kygnus"/>
+  </node>
+  <node id="344363780" lat="35.6685173" lon="139.8028667">
+    <tag k="amenity" v="fuel"/>
+    <tag k="created_by" v="Potlatch 0.10f"/>
+  </node>
+  <node id="439115832" lat="35.6657087" lon="139.7363677">
+    <tag k="addr:full" v="東京都港区六本木2-4-10"/>
+    <tag k="addr:postcode" v="106-0032"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="六本木SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="wd 07:30-20:30; Sa 07:30-19:30; Su,PH 09:00-18:30"/>
+    <tag k="operator" v="イシイ・オイル"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-35846778"/>
+    <tag k="smoking" v="separated"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="552677711" lat="35.7213395" lon="139.8259725">
+    <tag k="amenity" v="fuel"/>
+  </node>
+  <node id="581969911" lat="35.7009830" lon="139.8091510">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+  </node>
+  <node id="599547919" lat="35.7002245" lon="139.7532905">
+    <tag k="amenity" v="fuel"/>
+    <tag k="operator" v="ENEOS"/>
+  </node>
+  <node id="631497261" lat="35.6356840" lon="139.7095419">
+    <tag k="amenity" v="fuel"/>
+    <tag k="operator" v="ENEOS"/>
+  </node>
+  <node id="679199038" lat="35.6555033" lon="139.7453619"/>
+  <node id="679199039" lat="35.6556503" lon="139.7456578"/>
+  <node id="679199040" lat="35.6556477" lon="139.7453218"/>
+  <node id="679199041" lat="35.6554228" lon="139.7454947"/>
+  <node id="679199043" lat="35.6554291" lon="139.7454122"/>
+  <node id="679199045" lat="35.6556730" lon="139.7455383"/>
+  <node id="705190040" lat="35.6490938" lon="139.7187416">
+    <tag k="amenity" v="fuel"/>
+    <tag k="operator" v="ENEOS"/>
+  </node>
+  <node id="748883693" lat="35.6518360" lon="139.7044825">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="JOMO"/>
+  </node>
+  <node id="885679761" lat="35.6715765" lon="139.7129274">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+  </node>
+  <node id="888472994" lat="35.7048185" lon="139.7696712">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Eneos"/>
+  </node>
+  <node id="990964403" lat="35.6502200" lon="139.7362140">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Eneos"/>
+  </node>
+  <node id="1094677978" lat="35.7067085" lon="139.7165787"/>
+  <node id="1094677981" lat="35.7069481" lon="139.7164715"/>
+  <node id="1094678110" lat="35.7067433" lon="139.7164715"/>
+  <node id="1094679695" lat="35.7068784" lon="139.7162301"/>
+  <node id="1114992524" lat="35.7046447" lon="139.7089291">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+  </node>
+  <node id="1148542963" lat="35.7175847" lon="139.7908759">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Jomo"/>
+  </node>
+  <node id="1177105253" lat="35.7102592" lon="139.7239906">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ゼネラル"/>
+    <tag k="name" v="ゼネラル"/>
+    <tag k="name:en" v="General"/>
+    <tag k="name:ja" v="ゼネラル"/>
+    <tag k="name:ja_rm" v="Zeneraru"/>
+  </node>
+  <node id="1226770515" lat="35.7364282" lon="139.7794385">
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="三河島ＳＳ"/>
+    <tag k="brand" v="Shell"/>
+    <tag k="fuel:biodiesel" v="no"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:ethanol" v="no"/>
+    <tag k="fuel:lpg" v="no"/>
+    <tag k="fuel:octane_100" v="yes"/>
+    <tag k="fuel:octane_95" v="no"/>
+    <tag k="fuel:octane_98" v="no"/>
+    <tag k="name" v="昭和シェル"/>
+    <tag k="name:en" v="Showa-shell"/>
+    <tag k="name:ja" v="昭和シェル"/>
+    <tag k="name:ja_rm" v="Showa Sheru"/>
+    <tag k="operator" v="新光自動車興業"/>
+  </node>
+  <node id="1231861292" lat="35.6961040" lon="139.7673700">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Eneos"/>
+  </node>
+  <node id="1352041874" lat="35.7003570" lon="139.8011190">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Eneos"/>
+  </node>
+  <node id="1352143854" lat="35.7026820" lon="139.8024830">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Eneos"/>
+  </node>
+  <node id="1417894903" lat="35.6944620" lon="139.7961630">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Eneos"/>
+  </node>
+  <node id="1417894930" lat="35.6971372" lon="139.8043221">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Kygnus"/>
+  </node>
+  <node id="1417894970" lat="35.6973770" lon="139.7999650">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Cosmo"/>
+  </node>
+  <node id="1484755097" lat="35.6673392" lon="139.7725820">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+  </node>
+  <node id="1515172690" lat="35.6554930" lon="139.7393090">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ゼネラル"/>
+    <tag k="name" v="ゼネラル"/>
+    <tag k="name:en" v="General"/>
+    <tag k="name:ja" v="ゼネラル"/>
+    <tag k="name:ja_rm" v="Zeneraru"/>
+  </node>
+  <node id="1515172693" lat="35.6553440" lon="139.7412420">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Idemitsu"/>
+  </node>
+  <node id="1559944778" lat="35.6509844" lon="139.7071591">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="Mobil"/>
+    <tag k="fuel:diesel" v="no"/>
+    <tag k="shop" v="yes"/>
+  </node>
+  <node id="1565011773" lat="35.6966083" lon="139.7705210">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="Shell"/>
+    <tag k="name" v="昭和シェル"/>
+    <tag k="name:en" v="Showa-shell"/>
+    <tag k="name:ja" v="昭和シェル"/>
+    <tag k="name:ja_rm" v="Showa Sheru"/>
+    <tag k="source" v="survey"/>
+  </node>
+  <node id="1590215985" lat="35.6989375" lon="139.7845387">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="ENEOS 浅草橋"/>
+    <tag k="source" v="survey, bing"/>
+  </node>
+  <node id="1590371254" lat="35.7242857" lon="139.7972014"/>
+  <node id="1590371275" lat="35.7243595" lon="139.7973132"/>
+  <node id="1590371280" lat="35.7243813" lon="139.7971115"/>
+  <node id="1590371311" lat="35.7244506" lon="139.7972367"/>
+  <node id="1590371314" lat="35.7244585" lon="139.7972105"/>
+  <node id="1655440013" lat="35.6588065" lon="139.7239093">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+    <tag k="source" v="survey; bing"/>
+  </node>
+  <node id="1674565313" lat="35.6423471" lon="139.7506673"/>
+  <node id="1674565315" lat="35.6423498" lon="139.7508465"/>
+  <node id="1674565317" lat="35.6423502" lon="139.7509004"/>
+  <node id="1674565326" lat="35.6423752" lon="139.7509648"/>
+  <node id="1674565327" lat="35.6423837" lon="139.7507124"/>
+  <node id="1674565328" lat="35.6425334" lon="139.7508438"/>
+  <node id="1674565329" lat="35.6425343" lon="139.7509626"/>
+  <node id="1674565350" lat="35.6426339" lon="139.7504807"/>
+  <node id="1674565352" lat="35.6426390" lon="139.7506953"/>
+  <node id="1674565375" lat="35.6426858" lon="139.7506067"/>
+  <node id="1674804802" lat="35.6939244" lon="139.8154406"/>
+  <node id="1674804803" lat="35.6939301" lon="139.8155586"/>
+  <node id="1674804809" lat="35.6939443" lon="139.8154100"/>
+  <node id="1674804834" lat="35.6941338" lon="139.8153960"/>
+  <node id="1674804840" lat="35.6941416" lon="139.8155420"/>
+  <node id="1724848562" lat="35.7027149" lon="139.7686554"/>
+  <node id="1724848564" lat="35.7027193" lon="139.7687218"/>
+  <node id="1724848573" lat="35.7027880" lon="139.7686480"/>
+  <node id="1724848575" lat="35.7027925" lon="139.7687144"/>
+  <node id="1748438458" lat="35.6395276" lon="139.8017145"/>
+  <node id="1748438459" lat="35.6395628" lon="139.8016909"/>
+  <node id="1748438461" lat="35.6396156" lon="139.8026431"/>
+  <node id="1748438470" lat="35.6399290" lon="139.8025920"/>
+  <node id="1748438471" lat="35.6399705" lon="139.8024955"/>
+  <node id="1755998486" lat="35.6333597" lon="139.7313729"/>
+  <node id="1755998490" lat="35.6333798" lon="139.7312008"/>
+  <node id="1755998493" lat="35.6335588" lon="139.7314116"/>
+  <node id="1755998496" lat="35.6335820" lon="139.7312314"/>
+  <node id="1829793170" lat="35.7036717" lon="139.7620784"/>
+  <node id="1829793178" lat="35.7036828" lon="139.7619269"/>
+  <node id="1829793181" lat="35.7036907" lon="139.7620470"/>
+  <node id="1829793192" lat="35.7037823" lon="139.7622033"/>
+  <node id="1829793193" lat="35.7038681" lon="139.7619067"/>
+  <node id="1829793195" lat="35.7039132" lon="139.7620155"/>
+  <node id="1832730931" lat="35.6823078" lon="139.8007895">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+  </node>
+  <node id="1832730932" lat="35.6815801" lon="139.7937835">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+  </node>
+  <node id="1869526226" lat="35.7319461" lon="139.7407115"/>
+  <node id="1869526247" lat="35.7320357" lon="139.7405949"/>
+  <node id="1869526266" lat="35.7321094" lon="139.7408899"/>
+  <node id="1869526319" lat="35.7322046" lon="139.7407742"/>
+  <node id="1886283112" lat="35.6598787" lon="139.7053135">
+    <tag k="amenity" v="fuel"/>
+  </node>
+  <node id="1891003112" lat="35.6377949" lon="139.7231641">
+    <tag k="amenity" v="fuel"/>
+  </node>
+  <node id="1892464886" lat="35.6840317" lon="139.7880708">
+    <tag k="amenity" v="fuel"/>
+  </node>
+  <node id="1930084069" lat="35.7271060" lon="139.7982800">
+    <tag k="amenity" v="fuel"/>
+    <tag k="created_by" v="iLOE 1.9"/>
+    <tag k="name" v="bison"/>
+  </node>
+  <node id="1949172509" lat="35.6375984" lon="139.7230271">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1949172512" lat="35.6376121" lon="139.7231133">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1949172530" lat="35.6376258" lon="139.7231039">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1949172548" lat="35.6376642" lon="139.7232417">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1949172588" lat="35.6377600" lon="139.7231796">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1949172624" lat="35.6378241" lon="139.7233437">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1949172626" lat="35.6378318" lon="139.7230376">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1949172632" lat="35.6378403" lon="139.7228872">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1949172648" lat="35.6378651" lon="139.7228935">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1949172664" lat="35.6379087" lon="139.7229913">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1949172676" lat="35.6379267" lon="139.7232795">
+    <tag k="source_ref" v="bing"/>
+  </node>
+  <node id="1962488006" lat="35.6348452" lon="139.7137628">
+    <tag k="addr:full" v="東京都目黒区目黒1-3-14"/>
+    <tag k="addr:postcode" v="153-0063"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="目黒駅前SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="Mo-Sa 06:30-21:00; Su,PH 08:00-20:00"/>
+    <tag k="operator" v="新出光東京支店"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-34908715"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1966501634" lat="35.7378321" lon="139.7120502">
+    <tag k="addr:full" v="東京都豊島区池袋1-16-28"/>
+    <tag k="addr:postcode" v="171-0014"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="セルフ池袋SS"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+    <tag k="opening_hours" v="24/7"/>
+    <tag k="operator" v="幸伸興業"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-39715559"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.noe.jx-group.co.jp/"/>
+  </node>
+  <node id="1966514496" lat="35.7170518" lon="139.6941524">
+    <tag k="addr:full" v="東京都新宿区中落合2-8-15"/>
+    <tag k="addr:postcode" v="161-0032"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="下落合駅前SS"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+    <tag k="opening_hours" v="wd 07:30-21:00; Sa 07:30-20:00; Su,PH 08:00-20:00"/>
+    <tag k="operator" v="東新エナジー"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-39535858"/>
+    <tag k="website" v="http://www.noe.jx-group.co.jp/"/>
+  </node>
+  <node id="1967407110" lat="35.6321893" lon="139.7209700">
+    <tag k="addr:full" v="東京都品川区東五反田5-1-1"/>
+    <tag k="addr:postcode" v="141-0022"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="クレール池田山"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="wd 07:00-20:00; Sa 08:00-18:00; PH 08:00-17:00; Su off"/>
+    <tag k="operator" v="小浦石油東京支店"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-34431475"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1967476199" lat="35.6532444" lon="139.7460691">
+    <tag k="addr:full" v="東京都港区芝3-12-1"/>
+    <tag k="addr:postcode" v="105-0014"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="芝園橋SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="Mo-Fr 08:00-20:00; Sa 08:00-19:00; PH,Su 08:30-18:00"/>
+    <tag k="operator" v="東京コスモ石油協同組合"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-34512866"/>
+    <tag k="source" v="(URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1967481604" lat="35.6513787" lon="139.7542179">
+    <tag k="addr:full" v="東京都港区芝1-10-11"/>
+    <tag k="addr:postcode" v="105-0014"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="KEIHIN芝SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="23/7"/>
+    <tag k="operator" v="京浜商事"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-34510808"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1967495812" lat="35.6661850" lon="139.7514231">
+    <tag k="addr:full" v="東京都港区西新橋2-18-4"/>
+    <tag k="addr:postcode" v="105-0003"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="西新橋SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="wd 07:30-19:00; Sa 07:30-16:00; Su,PH off"/>
+    <tag k="operator" v="千歳商会"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-34344847"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1967505192" lat="35.6647621" lon="139.7689117">
+    <tag k="addr:full" v="東京都中央区築地5-2-1"/>
+    <tag k="addr:postcode" v="104-0045"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="築地SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="Mo-Sa 04:30-19:00; PH 07:00-18:00; Su off"/>
+    <tag k="operator" v="アサヒ石油販売"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-35412255"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1968127324" lat="35.7119675" lon="139.6976282">
+    <tag k="addr:full" v="東京都新宿区高田馬場3-23-7"/>
+    <tag k="addr:postcode" v="169-0075"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="高田馬場SS"/>
+    <tag k="brand" v="IDEMITSU"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="出光"/>
+    <tag k="name:en" v="IDEMITSU"/>
+    <tag k="name:ja" v="出光"/>
+    <tag k="name:ja_rm" v="Idemitsu"/>
+    <tag k="opening_hours" v="Mo-Su 07:00-21:00"/>
+    <tag k="operator" v="大家商店"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-33718124"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.idemitsu.co.jp/"/>
+  </node>
+  <node id="1968203509" lat="35.7221822" lon="139.6983968">
+    <tag k="addr:full" v="東京都新宿区下落合4-27-2"/>
+    <tag k="addr:postcode" v="161-0033"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="コプローサめじろSS"/>
+    <tag k="brand" v="IDEMITSU"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="出光"/>
+    <tag k="name:en" v="IDEMITSU"/>
+    <tag k="name:ja" v="出光"/>
+    <tag k="name:ja_rm" v="Idemitsu"/>
+    <tag k="opening_hours" v="24/7"/>
+    <tag k="operator" v="コプローサいのうえ"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-39542168"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.idemitsu.co.jp/"/>
+  </node>
+  <node id="1970493735" lat="35.6668649" lon="139.8056769">
+    <tag k="addr:full" v="東京都江東区木場6-4-7"/>
+    <tag k="addr:postcode" v="135-0042"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="木場SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="wd 07:00-20:00; Sa 08:30-18:00; Su,PH 08:00-18:00"/>
+    <tag k="operator" v="江東鉱産"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-36479572"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1970519444" lat="35.6758894" lon="139.8228048">
+    <tag k="addr:full" v="東京都江東区南砂町2-31-13"/>
+    <tag k="addr:postcode" v="136-0076"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="セルフNEW江東SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="24/7"/>
+    <tag k="operator" v="新出光東京支店"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-36443241"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1970535104" lat="35.6388585" lon="139.8234997">
+    <tag k="addr:full" v="東京都江東区新木場2-3-6"/>
+    <tag k="addr:postcode" v="136-0082"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="新木場SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="wd 07:00-21:00; Sa 07:00-19:00; Sa 08:00-18:00; Su off"/>
+    <tag k="operator" v="コスモ石油販売東京カンパニー"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-35221236"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1970575621" lat="35.6923504" lon="139.7972548">
+    <tag k="addr:full" v="東京都墨田区両国4-1-10"/>
+    <tag k="addr:postcode" v="130-0026"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="二の橋SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="Mo-Sa 07:30-18:00; Su,PH off"/>
+    <tag k="operator" v="イシイ・オイル"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-36336901"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1970612090" lat="35.6977593" lon="139.8001873">
+    <tag k="addr:full" v="東京都墨田区亀沢2-18-1"/>
+    <tag k="addr:postcode" v="130-0014"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="墨田SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="Mo-Sa 08:00-19:00; PH 06:00-19:00; Su off"/>
+    <tag k="operator" v="越村商事"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-36235922"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1970654133" lat="35.7097830" lon="139.7898076">
+    <tag k="addr:full" v="東京都台東区寿2-9-9"/>
+    <tag k="addr:postcode" v="111-0042"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="寿町SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="Mo-Sa 08:00-19:00; Su,PH off"/>
+    <tag k="operator" v="北村商店"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-38442008"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1970678172" lat="35.7052537" lon="139.7624168">
+    <tag k="addr:full" v="東京都文京区本郷3-14-8"/>
+    <tag k="addr:postcode" v="113-0033"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="本郷SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="wd 08:00-20:00; Sa 08:00-19:00; Su,PH 09:00-18:00"/>
+    <tag k="operator" v="東罐商事"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-38117723"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1970724093" lat="35.7264996" lon="139.7891848">
+    <tag k="addr:full" v="東京都台東区竜泉2-17-10"/>
+    <tag k="addr:postcode" v="110-0012"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="サンフィールド竜泉"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="24/7"/>
+    <tag k="operator" v="鈴木商会"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-38720857"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1970750939" lat="35.7358208" lon="139.7747282">
+    <tag k="addr:full" v="東京都荒川区西日暮里1-35-5"/>
+    <tag k="addr:postcode" v="116-0013"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="西日暮里SS"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="opening_hours" v="Mo-Sa 08:00-19:00; Su,PH off"/>
+    <tag k="operator" v="太田砿油店"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-38917873"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.cosmo-oil.co.jp/"/>
+  </node>
+  <node id="1971958287" lat="35.6416410" lon="139.7220134">
+    <tag k="addr:full" v="東京都港区白金台5-4-8"/>
+    <tag k="addr:postcode" v="108-0071"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="白金プラチナ通りSS"/>
+    <tag k="brand" v="IDEMITSU"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="Bing 2010; (URL)"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="出光"/>
+    <tag k="name:en" v="IDEMITSU"/>
+    <tag k="name:ja" v="出光"/>
+    <tag k="name:ja_rm" v="Idemitsu"/>
+    <tag k="opening_hours" v="wd 08:00-20:00; Sa,Su,PH 09:00-20:00"/>
+    <tag k="operator" v="丸新石油"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-34414652"/>
+    <tag k="website" v="http://www.idemitsu.co.jp/"/>
+  </node>
+  <node id="1973600294" lat="35.7351222" lon="139.6940262">
+    <tag k="addr:full" v="東京都豊島区要町2:17:1"/>
+    <tag k="addr:postcode" v="171-0043"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="セルフ西池袋SS"/>
+    <tag k="brand" v="Shell"/>
+    <tag k="fax" v="+81-3-39571515"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="昭和シェル"/>
+    <tag k="name:en" v="Showa-shell"/>
+    <tag k="name:ja" v="昭和シェル"/>
+    <tag k="name:ja_rm" v="Showa Sheru"/>
+    <tag k="opening_hours" v="24/7"/>
+    <tag k="operator" v="三栄石油"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-39571411"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.showa-shell.co.jp/"/>
+    <tag k="wifi" v="yes"/>
+  </node>
+  <node id="1973615548" lat="35.6819399" lon="139.6991983">
+    <tag k="addr:full" v="東京都渋谷区代々木1-11-2"/>
+    <tag k="addr:postcode" v="151-0053"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="セルフ代々木SS"/>
+    <tag k="brand" v="Shell"/>
+    <tag k="fax" v="+81-3-63005781"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="昭和シェル"/>
+    <tag k="name:en" v="Showa-shell"/>
+    <tag k="name:ja" v="昭和シェル"/>
+    <tag k="name:ja_rm" v="Showa Sheru"/>
+    <tag k="operator" v="ヤマヒロ"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-63005780"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.showa-shell.co.jp/"/>
+  </node>
+  <node id="1973619896" lat="35.6848723" lon="139.7040368">
+    <tag k="addr:full" v="東京都渋谷区千駄ヶ谷5-28"/>
+    <tag k="addr:postcode" v="151-0051"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="セルフ高島屋前SS"/>
+    <tag k="brand" v="Shell"/>
+    <tag k="fax" v="+81-3-33542473"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="昭和シェル"/>
+    <tag k="name:en" v="Showa-shell"/>
+    <tag k="name:ja" v="昭和シェル"/>
+    <tag k="name:ja_rm" v="Showa Sheru"/>
+    <tag k="opening_hours" v="24/7"/>
+    <tag k="operator" v="ヤマヒロ"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-33541951"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.showa-shell.co.jp/"/>
+  </node>
+  <node id="1973626287" lat="35.7088510" lon="139.6981355">
+    <tag k="addr:full" v="東京都新宿区高田馬場4-32-3"/>
+    <tag k="addr:postcode" v="169-0075"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="セルフ高田馬場SS"/>
+    <tag k="brand" v="Shell"/>
+    <tag k="fax" v="+81-3-33641388"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="昭和シェル"/>
+    <tag k="name:en" v="Showa-shell"/>
+    <tag k="name:ja" v="昭和シェル"/>
+    <tag k="name:ja_rm" v="Showa Sheru"/>
+    <tag k="operator" v="ヤマヒロ"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-33641336"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.showa-shell.co.jp/"/>
+  </node>
+  <node id="1973639170" lat="35.7041704" lon="139.6945956">
+    <tag k="addr:full" v="東京都新宿区北新宿4-1-1"/>
+    <tag k="addr:postcode" v="169-0074"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="大久保SS"/>
+    <tag k="brand" v="Shell"/>
+    <tag k="fax" v="+81-3-32277671"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="昭和シェル"/>
+    <tag k="name:en" v="Showa-shell"/>
+    <tag k="name:ja" v="昭和シェル"/>
+    <tag k="name:ja_rm" v="Showa Sheru"/>
+    <tag k="operator" v="ヤマヒロ"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-33676160"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.showa-shell.co.jp/"/>
+    <tag k="wifi" v="yes"/>
+  </node>
+  <node id="1975174933" lat="35.6422327" lon="139.7007447">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="ENEOS 中目黒SS"/>
+  </node>
+  <node id="1994969485" lat="35.7343588" lon="139.7945586">
+    <tag k="addr:full" v="東京都荒川区南千住5-11-1"/>
+    <tag k="addr:postcode" v="116-0003"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="プレステージミノワSS"/>
+    <tag k="brand" v="IDEMITSU"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="出光"/>
+    <tag k="name:en" v="IDEMITSU"/>
+    <tag k="name:ja" v="出光"/>
+    <tag k="name:ja_rm" v="Idemitsu"/>
+    <tag k="opening_hours" v="24/7"/>
+    <tag k="operator" v="東和興産"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-38079151"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.idemitsu.co.jp/"/>
+  </node>
+  <node id="1994976786" lat="35.7357357" lon="139.7817858">
+    <tag k="addr:full" v="東京都荒川区荒川4-1-3"/>
+    <tag k="addr:postcode" v="116-0002"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="三河島SS"/>
+    <tag k="brand" v="IDEMITSU"/>
+    <tag k="fuel:diesel" v="yes"/>
+    <tag k="fuel:octane_91" v="yes"/>
+    <tag k="fuel:octane_98" v="yes"/>
+    <tag k="kerosene" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="出光"/>
+    <tag k="name:en" v="IDEMITSU"/>
+    <tag k="name:ja" v="出光"/>
+    <tag k="name:ja_rm" v="Idemitsu"/>
+    <tag k="opening_hours" v="Mo-Su 07:00-19:00; Su,PH off"/>
+    <tag k="operator" v="門倉油店"/>
+    <tag k="payment:cash" v="yes"/>
+    <tag k="phone" v="+81-3-38071522"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="website" v="http://www.idemitsu.co.jp/"/>
+  </node>
+  <node id="2004496812" lat="35.7311710" lon="139.8149101">
+    <tag k="amenity" v="fuel"/>
+  </node>
+  <node id="2184622657" lat="35.6815426" lon="139.7855066">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="Eneos"/>
+    <tag k="name" v="Eneos"/>
+    <tag k="operator" v="Eneos"/>
+  </node>
+  <node id="2184622662" lat="35.6820776" lon="139.7812814"/>
+  <node id="2184622667" lat="35.6823017" lon="139.7814243"/>
+  <node id="2184622668" lat="35.6823227" lon="139.7811016"/>
+  <node id="2184622669" lat="35.6823537" lon="139.7813750"/>
+  <node id="2209622492" lat="35.6587380" lon="139.7151600">
+    <tag k="amenity" v="fuel"/>
+    <tag k="atm" v="no"/>
+    <tag k="car_wash" v="yes"/>
+    <tag k="name" v="ENEOS高樹町SS"/>
+  </node>
+  <node id="2270731355" lat="35.6398604" lon="139.7404007">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="source" v="image,2013-04;Bing"/>
+  </node>
+  <node id="2282509700" lat="35.6656854" lon="139.7289175">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="出光"/>
+    <tag k="source" v="image,2013-04;Bing"/>
+  </node>
+  <node id="2285608910" lat="35.6752520" lon="139.7901464">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="Shell"/>
+  </node>
+  <node id="2292251707" lat="35.6973510" lon="139.7762540">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+  </node>
+  <node id="2350665847" lat="35.6635670" lon="139.7381740">
+    <tag k="amenity" v="fuel"/>
+    <tag k="atm" v="no"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="car_wash" v="no"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+    <tag k="opening_hours" v="Mo-Fr 07:30-22:00; Sa-Su 09:00-19:00"/>
+  </node>
+  <node id="2371741850" lat="35.6869030" lon="139.6917780">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+  </node>
+  <node id="2430718100" lat="35.6939653" lon="139.8154644">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="昭和シェル"/>
+    <tag k="name" v="昭和シェル石油・錦糸町"/>
+  </node>
+  <node id="2476235567" lat="35.6650580" lon="139.7853070">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+  </node>
+  <node id="2577057307" lat="35.6846757" lon="139.7413421">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="source" v="Bing,survey"/>
+  </node>
+  <node id="2606133438" lat="35.7287673" lon="139.7766129">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS 日暮里SS"/>
+  </node>
+  <node id="2628346256" lat="35.6564839" lon="139.7352602">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+  </node>
+  <node id="2636085062" lat="35.6479720" lon="139.7573680">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+  </node>
+  <node id="2637894172" lat="35.6670100" lon="139.6922142">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+    <tag k="source" v="image,2014-01;Bing"/>
+  </node>
+  <node id="2779523194" lat="35.6678023" lon="139.7187688">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="IDEMITSU"/>
+    <tag k="name" v="出光"/>
+    <tag k="name:en" v="IDEMITSU"/>
+    <tag k="name:ja" v="出光"/>
+    <tag k="name:ja_rm" v="Idemitsu"/>
+    <tag k="source" v="survey"/>
+  </node>
+  <node id="2786935722" lat="35.7322215" lon="139.7408845"/>
+  <node id="2786935723" lat="35.7321651" lon="139.7408263"/>
+  <node id="2786935724" lat="35.7321769" lon="139.7409422"/>
+  <node id="2786935725" lat="35.7321578" lon="139.7409382"/>
+  <node id="2795666669" lat="35.6829480" lon="139.7418870">
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="car_wash" v="no"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+    <tag k="source" v="survey"/>
+  </node>
+  <node id="2977915666" lat="35.6470714" lon="139.7237268">
+    <tag k="amenity" v="fuel"/>
+  </node>
+  <node id="3058656210" lat="35.6724833" lon="139.7223909">
+    <tag k="amenity" v="fuel"/>
+    <tag k="name" v="出光"/>
+    <tag k="source" v="survey"/>
+  </node>
+  <way id="53804491">
+    <nd ref="679199038"/>
+    <nd ref="679199043"/>
+    <nd ref="679199041"/>
+    <nd ref="679199039"/>
+    <nd ref="679199045"/>
+    <nd ref="679199040"/>
+    <nd ref="679199038"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="Dr. Drive セルフ芝公園SS"/>
+    <tag k="opening_hours" v="24/7"/>
+    <tag k="operator" v="ENEOS"/>
+    <tag k="shop" v="yes"/>
+    <tag k="source" v="image;Bing"/>
+  </way>
+  <way id="94177755">
+    <nd ref="1094677978"/>
+    <nd ref="1094677981"/>
+    <nd ref="1094679695"/>
+    <nd ref="1094678110"/>
+    <nd ref="1094677978"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="building" v="yes"/>
+    <tag k="source" v="Bing, 2007-04"/>
+  </way>
+  <way id="145667027">
+    <nd ref="1590371280"/>
+    <nd ref="1590371314"/>
+    <nd ref="1590371311"/>
+    <nd ref="1590371275"/>
+    <nd ref="1590371254"/>
+    <nd ref="1590371280"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="branch" v="セルフ千束ＳＳ"/>
+    <tag k="brand" v="Shell"/>
+    <tag k="building" v="yes"/>
+    <tag k="diesel" v="yes"/>
+    <tag k="ethanol" v="no"/>
+    <tag k="fuel:biodiesel" v="no"/>
+    <tag k="fuel:lpg" v="no"/>
+    <tag k="fuel:octane_100" v="yes"/>
+    <tag k="fuel:octane_95" v="no"/>
+    <tag k="fuel:octane_98" v="no"/>
+    <tag k="name" v="昭和シェル"/>
+    <tag k="name:en" v="Showa-shell"/>
+    <tag k="name:ja" v="昭和シェル"/>
+    <tag k="name:ja_rm" v="Showa Sheru"/>
+    <tag k="source" v="Bing,2007-04"/>
+  </way>
+  <way id="155010023">
+    <nd ref="1674565328"/>
+    <nd ref="1674565329"/>
+    <nd ref="1674565326"/>
+    <nd ref="1674565317"/>
+    <nd ref="1674565315"/>
+    <nd ref="1674565328"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="building" v="roof"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="source" v="Bing, 2007-03"/>
+  </way>
+  <way id="155010024">
+    <nd ref="1674565350"/>
+    <nd ref="1674565313"/>
+    <nd ref="1674565327"/>
+    <nd ref="1674565352"/>
+    <nd ref="1674565375"/>
+    <nd ref="1674565350"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="COSMO"/>
+    <tag k="name" v="コスモ石油"/>
+    <tag k="name:en" v="COSMO"/>
+    <tag k="name:ja" v="コスモ石油"/>
+    <tag k="name:ja_rm" v="Kosumo Sekiyu"/>
+    <tag k="source" v="Bing, 2007-03"/>
+  </way>
+  <way id="155035355">
+    <nd ref="1674804834"/>
+    <nd ref="1674804840"/>
+    <nd ref="1674804803"/>
+    <nd ref="1674804802"/>
+    <nd ref="1674804809"/>
+    <nd ref="1674804834"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="building" v="yes"/>
+    <tag k="source" v="bing"/>
+  </way>
+  <way id="160438998">
+    <nd ref="1724848573"/>
+    <nd ref="1724848575"/>
+    <nd ref="1724848564"/>
+    <nd ref="1724848562"/>
+    <nd ref="1724848573"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="Eneos"/>
+    <tag k="building" v="roof"/>
+    <tag k="name" v="Eneos"/>
+    <tag k="operator" v="Eneos"/>
+    <tag k="source" v="survey"/>
+    <tag k="survey:date" v="2012-11-01"/>
+  </way>
+  <way id="163069395">
+    <nd ref="1748438458"/>
+    <nd ref="1748438461"/>
+    <nd ref="1748438470"/>
+    <nd ref="1748438471"/>
+    <nd ref="1748438459"/>
+    <nd ref="1748438458"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="source" v="image;Bing,2007-03"/>
+  </way>
+  <way id="163936428">
+    <nd ref="1755998496"/>
+    <nd ref="1755998493"/>
+    <nd ref="1755998486"/>
+    <nd ref="1755998490"/>
+    <nd ref="1755998496"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="building" v="yes"/>
+    <tag k="source" v="image;Bing,2007-03"/>
+  </way>
+  <way id="172028964">
+    <nd ref="1829793193"/>
+    <nd ref="1829793195"/>
+    <nd ref="1829793192"/>
+    <nd ref="1829793170"/>
+    <nd ref="1829793181"/>
+    <nd ref="1829793178"/>
+    <nd ref="1829793193"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="Shell"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="Shell"/>
+    <tag k="operator" v="Shell"/>
+    <tag k="source" v="survey"/>
+    <tag k="survey:date" v="2012-11-01"/>
+  </way>
+  <way id="176418638">
+    <nd ref="1869526319"/>
+    <nd ref="1869526247"/>
+    <nd ref="1869526226"/>
+    <nd ref="1869526266"/>
+    <nd ref="2786935725"/>
+    <nd ref="2786935724"/>
+    <nd ref="2786935722"/>
+    <nd ref="2786935723"/>
+    <nd ref="1869526319"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="building" v="yes"/>
+    <tag k="source" v="Bing, 1980/1-2007/4"/>
+  </way>
+  <way id="184438477">
+    <nd ref="1949172664"/>
+    <nd ref="1949172648"/>
+    <nd ref="1949172632"/>
+    <nd ref="1949172509"/>
+    <nd ref="1949172530"/>
+    <nd ref="1949172512"/>
+    <nd ref="1949172548"/>
+    <nd ref="1949172588"/>
+    <nd ref="1949172624"/>
+    <nd ref="1949172676"/>
+    <nd ref="1949172626"/>
+    <nd ref="1949172664"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="ENEOS"/>
+    <tag k="name" v="ENEOS"/>
+    <tag k="name:en" v="ENEOS"/>
+    <tag k="name:ja" v="エネオス"/>
+    <tag k="name:ja_rm" v="Eneosu"/>
+    <tag k="shop" v="no"/>
+    <tag k="source_ref" v="bing"/>
+  </way>
+  <way id="208140813">
+    <nd ref="2184622662"/>
+    <nd ref="2184622667"/>
+    <nd ref="2184622669"/>
+    <nd ref="2184622668"/>
+    <nd ref="2184622662"/>
+    <tag k="amenity" v="fuel"/>
+    <tag k="brand" v="Idemitsu"/>
+    <tag k="name" v="Idemitsu"/>
+    <tag k="operator" v="Idemitsu"/>
+    <tag k="source" v="survey"/>
+    <tag k="survey:date" v="2013-01-05"/>
+  </way>
+
+</osm>
diff --git a/test/poi-service/script/tokyo/museum-and-hotel.xml b/test/poi-service/script/tokyo/museum-and-hotel.xml
index 956b540..2f5b593 100644..100755
--- a/test/poi-service/script/tokyo/museum-and-hotel.xml
+++ b/test/poi-service/script/tokyo/museum-and-hotel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <osm version="0.6" generator="Overpass API">
 <note>The data included in this document is from www.openstreetmap.org. The data is made available under ODbL.</note>
-<meta osm_base="2013-02-04T12:10:01Z"/>
+<meta osm_base="2014-09-21T11:38:01Z"/>
 
   <node id="250668601" lat="35.7174181" lon="139.7737638">
     <tag k="created_by" v="JOSM"/>
@@ -23,13 +23,17 @@
     <tag k="name" v="Bridgestone Museum of Art"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="250668627" lat="35.6415452" lon="139.7132842">
+    <tag k="name" v="Tokyo Metro Museum of Photography"/>
+    <tag k="name:ja" v="東京都写真美術館"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="251055427" lat="35.6707003" lon="139.7133708">
     <tag k="name" v="Watari-um Museum of Contemporary Art"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="251055429" lat="35.6614129" lon="139.6928144">
-    <tag k="created_by" v="JOSM"/>
-    <tag k="name" v="Toguri Museum of Art"/>
+  <node id="251055430" lat="35.7288374" lon="139.7093019">
+    <tag k="name" v="Japan Traditional Crafts Centre"/>
     <tag k="tourism" v="museum"/>
   </node>
   <node id="251055437" lat="35.6855878" lon="139.7792244">
@@ -52,10 +56,6 @@
     <tag k="name" v="帝国ホテルプラザ"/>
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="260426067" lat="35.6685856" lon="139.7575258">
-    <tag k="name" v="第一ホテル"/>
-    <tag k="tourism" v="hotel"/>
-  </node>
   <node id="301584380" lat="35.7125281" lon="139.7820268">
     <tag k="name" v="Chisun Hotel Ueno"/>
     <tag k="tourism" v="hotel"/>
@@ -65,38 +65,6 @@
     <tag k="name" v="銀座日航ホテル"/>
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="309040735" lat="35.6680742" lon="139.6796751"/>
-  <node id="309040736" lat="35.6676370" lon="139.6795225"/>
-  <node id="309040739" lat="35.6675122" lon="139.6801214"/>
-  <node id="309040740" lat="35.6680320" lon="139.6805090"/>
-  <node id="309129365" lat="35.6624327" lon="139.6799370"/>
-  <node id="309129366" lat="35.6622723" lon="139.6799370"/>
-  <node id="309129367" lat="35.6622723" lon="139.6798855"/>
-  <node id="309129368" lat="35.6621747" lon="139.6798855">
-    <tag k="ele" v="48.1915283"/>
-    <tag k="name" v="037"/>
-    <tag k="wpt_description" v="2008-11-01 12:06:03PM"/>
-  </node>
-  <node id="309129369" lat="35.6621747" lon="139.6799456"/>
-  <node id="309129370" lat="35.6620492" lon="139.6799456">
-    <tag k="ele" v="57.8045654"/>
-    <tag k="name" v="021"/>
-    <tag k="wpt_description" v="2008-11-01 11:36:54AM"/>
-  </node>
-  <node id="309129371" lat="35.6620492" lon="139.6802546"/>
-  <node id="309129372" lat="35.6624327" lon="139.6802546">
-    <tag k="ele" v="56.6029053"/>
-    <tag k="name" v="024"/>
-    <tag k="wpt_description" v="2008-11-01 11:38:51AM"/>
-  </node>
-  <node id="309130630" lat="35.6629703" lon="139.6807370"/>
-  <node id="309130632" lat="35.6626155" lon="139.6807575"/>
-  <node id="309130633" lat="35.6626303" lon="139.6811029"/>
-  <node id="309130634" lat="35.6629853" lon="139.6810861"/>
-  <node id="309133105" lat="35.6624118" lon="139.6806237"/>
-  <node id="309133108" lat="35.6622584" lon="139.6806237"/>
-  <node id="309133109" lat="35.6622584" lon="139.6809326"/>
-  <node id="309133111" lat="35.6624118" lon="139.6809326"/>
   <node id="336994074" lat="35.6595403" lon="139.7477720"/>
   <node id="336994076" lat="35.6587872" lon="139.7476089"/>
   <node id="336994079" lat="35.6588221" lon="139.7473256"/>
@@ -108,6 +76,10 @@
   <node id="336995312" lat="35.6596868" lon="139.7483299"/>
   <node id="336995314" lat="35.6597217" lon="139.7480638"/>
   <node id="336995316" lat="35.6595194" lon="139.7480209"/>
+  <node id="340381652" lat="35.6469994" lon="139.7083863">
+    <tag k="name" v="Hotel Excellent"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <node id="380527398" lat="35.7169442" lon="139.7767843"/>
   <node id="380527399" lat="35.7175259" lon="139.7756090"/>
   <node id="380527400" lat="35.7177489" lon="139.7751541"/>
@@ -122,10 +94,16 @@
   <node id="380538736" lat="35.7169159" lon="139.7723482"/>
   <node id="380538737" lat="35.7178867" lon="139.7726649"/>
   <node id="380538738" lat="35.7172961" lon="139.7740059"/>
-  <node id="389635163" lat="35.6651396" lon="139.7373146">
-    <tag k="name" v="Hotel Villa Fontaine"/>
-    <tag k="tourism" v="hotel"/>
-  </node>
+  <node id="390376337" lat="35.6355933" lon="139.7210043"/>
+  <node id="390376339" lat="35.6354471" lon="139.7206874"/>
+  <node id="390376342" lat="35.6354372" lon="139.7191485"/>
+  <node id="390376344" lat="35.6360962" lon="139.7184100"/>
+  <node id="390376347" lat="35.6367864" lon="139.7177299"/>
+  <node id="390376348" lat="35.6372023" lon="139.7186147"/>
+  <node id="390376349" lat="35.6371227" lon="139.7194371"/>
+  <node id="390376350" lat="35.6367832" lon="139.7198888"/>
+  <node id="390376351" lat="35.6364269" lon="139.7207021"/>
+  <node id="390376352" lat="35.6357571" lon="139.7212955"/>
   <node id="410166105" lat="35.7042958" lon="139.7640475">
     <tag k="name" v="Japan Football Museum"/>
     <tag k="tourism" v="museum"/>
@@ -141,12 +119,11 @@
     <tag k="tourism" v="museum"/>
     <tag k="wheelchair" v="yes"/>
   </node>
-  <node id="475090861" lat="35.6972950" lon="139.7020790">
-    <tag k="name" v="Vintage Shinjuku Hotel"/>
+  <node id="441692586" lat="35.7302491" lon="139.7992658">
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="475090874" lat="35.6886160" lon="139.6883990">
-    <tag k="name" v="Shinjuku New City Hotel"/>
+  <node id="475090861" lat="35.6972950" lon="139.7020790">
+    <tag k="name" v="Vintage Shinjuku Hotel"/>
     <tag k="tourism" v="hotel"/>
   </node>
   <node id="475090893" lat="35.6880000" lon="139.7183990">
@@ -161,10 +138,6 @@
     <tag k="name" v="Listel Shinjuku Hotel"/>
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="475090901" lat="35.6943820" lon="139.6897740">
-    <tag k="name" v="Ascent Shinjuku Hotel"/>
-    <tag k="tourism" v="hotel"/>
-  </node>
   <node id="475090903" lat="35.6864420" lon="139.7003670">
     <tag k="name" v="Century Southern Tower Hotel"/>
     <tag k="tourism" v="hotel"/>
@@ -174,8 +147,8 @@
     <tag k="name" v="Shinjuku Prince Hotel"/>
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="475090905" lat="35.6993220" lon="139.7079320">
-    <tag k="name" v="Sunroute Higashi Shinjuku Hotel"/>
+  <node id="475090905" lat="35.6985649" lon="139.7079263">
+    <tag k="name" v="ホテルサンルート東新宿"/>
     <tag k="tourism" v="hotel"/>
   </node>
   <node id="475090913" lat="35.6953050" lon="139.7010650">
@@ -204,7 +177,8 @@
     <tag k="tourism" v="hotel"/>
   </node>
   <node id="475090943" lat="35.6944200" lon="139.6937410">
-    <tag k="name" v="Rose Garden Hotel"/>
+    <tag k="name" v="ホテルローズガーデン新宿"/>
+    <tag k="source" v="image,2013-07;Bing"/>
     <tag k="tourism" v="hotel"/>
   </node>
   <node id="475090954" lat="35.6949810" lon="139.6973420">
@@ -221,6 +195,11 @@
     <tag k="note" v="very famous japanese traditional ryokan, where many foreigner stayed"/>
     <tag k="stars" v="4"/>
     <tag k="tourism" v="hotel"/>
+    <tag k="website" v="www.sawanoya.com"/>
+  </node>
+  <node id="506214982" lat="35.7266437" lon="139.7646765">
+    <tag k="name" v="アネックス勝太郎旅館"/>
+    <tag k="tourism" v="hotel"/>
   </node>
   <node id="559359753" lat="35.6681697" lon="139.7650004"/>
   <node id="559359754" lat="35.6683669" lon="139.7652552"/>
@@ -244,10 +223,20 @@
     <tag k="name:ja" v="渋谷東武ホテル"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="599892717" lat="35.6498692" lon="139.7555898">
+    <tag k="name" v="チサンホテル"/>
+    <tag k="name:ja" v="チサンホテル"/>
+    <tag k="source" v="Bing 2010"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <node id="618102602" lat="35.6713329" lon="139.7331437">
     <tag k="name" v="The b' Akasaka"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="631345241" lat="35.6320301" lon="139.7352902">
+    <tag k="name" v="プリンスホテル高輪"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <node id="654591533" lat="35.6855250" lon="139.7804440">
     <tag k="name" v="Hotel Saibo"/>
     <tag k="tourism" v="hotel"/>
@@ -256,6 +245,10 @@
   <node id="696656255" lat="35.6560011" lon="139.6988620"/>
   <node id="696656257" lat="35.6563029" lon="139.6987199"/>
   <node id="696656260" lat="35.6567109" lon="139.6998100"/>
+  <node id="728435757" lat="35.6480830" lon="139.7101310">
+    <tag k="name" v="ホテルシエスタ"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <node id="739064479" lat="35.6715601" lon="139.7378726">
     <tag k="name" v="Avanshell Akasaka"/>
     <tag k="tourism" v="hotel"/>
@@ -265,6 +258,10 @@
     <tag k="name" v="ホテルメッツ渋谷"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="752870692" lat="35.6469980" lon="139.7081807"/>
+  <node id="752870704" lat="35.6471557" lon="139.7083460"/>
+  <node id="752870726" lat="35.6468881" lon="139.7083429"/>
+  <node id="752870746" lat="35.6470571" lon="139.7085009"/>
   <node id="760552145" lat="35.7109893" lon="139.7778475">
     <tag k="name" v="Touganeya Hotel"/>
     <tag k="tourism" v="hotel"/>
@@ -283,7 +280,7 @@
     <tag k="tourism" v="hotel"/>
     <tag k="wheelchair" v="yes"/>
   </node>
-  <node id="820849494" lat="35.6661292" lon="139.7613463">
+  <node id="820849494" lat="35.6659438" lon="139.7616309">
     <tag k="name" v="旧新橋停車場鉄道歴史展示室"/>
     <tag k="name:en" v="Old Shimbashi Station Railway History Exhibition Hall"/>
     <tag k="name:ja_rm" v="Kyū Shinbashi Teishajō Tetsudō Rekishi Tenjishitsu"/>
@@ -296,10 +293,24 @@
   <node id="824067474" lat="35.6829363" lon="139.7437872"/>
   <node id="824067475" lat="35.6829983" lon="139.7438275"/>
   <node id="824067476" lat="35.6831099" lon="139.7438944"/>
+  <node id="825084540" lat="35.6530574" lon="139.7622180">
+    <tag k="ele" v="124.3753662109375"/>
+    <tag k="name" v="Inter-Continental Tokyo Bay"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="wpt_description" v="14-JUL-10 10:17:56"/>
+    <tag k="wpt_symbol" v="Lodging"/>
+  </node>
   <node id="898968882" lat="35.6965668" lon="139.7970381"/>
   <node id="898968884" lat="35.6959758" lon="139.7968679"/>
   <node id="898968885" lat="35.6963163" lon="139.7951152"/>
   <node id="898968886" lat="35.6969131" lon="139.7952853"/>
+  <node id="919280876" lat="35.7336241" lon="139.7088041">
+    <tag k="name" v="サクラホテル池袋 (Sakura Hotel Ikebukuro)"/>
+    <tag k="name:en" v="Sakura Hotel Ikebukuro"/>
+    <tag k="name:ja" v="サクラホテル池袋"/>
+    <tag k="operator" v="Sakura Group"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <node id="919282036" lat="35.7114008" lon="139.7846196">
     <tag k="name" v="Oak Hotel"/>
     <tag k="operator" v="Oak Hotel"/>
@@ -313,8 +324,9 @@
     <tag k="name" v="Hotel Wing International Korakuen"/>
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="988763541" lat="35.6953485" lon="139.7512933">
+  <node id="988763541" lat="35.6951109" lon="139.7509066">
     <tag k="name" v="昭和館"/>
+    <tag k="name:ja_rm" v="Shōwakan"/>
     <tag k="opening_hours" v="火-日 10:00-17:30"/>
     <tag k="tourism" v="museum"/>
   </node>
@@ -338,20 +350,16 @@
     <tag k="name" v="Ueno First City Hotel"/>
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="1014529009" lat="35.6632693" lon="139.7008215"/>
-  <node id="1014529123" lat="35.6633497" lon="139.7010736"/>
-  <node id="1014529179" lat="35.6635545" lon="139.7007809"/>
-  <node id="1014529289" lat="35.6634594" lon="139.7011276"/>
-  <node id="1014529570" lat="35.6633168" lon="139.7007404"/>
-  <node id="1014529701" lat="35.6632802" lon="139.7009295"/>
-  <node id="1014529860" lat="35.6633973" lon="139.7010961"/>
-  <node id="1014529979" lat="35.6635253" lon="139.7011456"/>
   <node id="1016728315" lat="35.6552293" lon="139.7469554"/>
   <node id="1016728556" lat="35.6556471" lon="139.7469041"/>
   <node id="1016728789" lat="35.6552017" lon="139.7471326"/>
   <node id="1016729179" lat="35.6554601" lon="139.7473907"/>
   <node id="1016729374" lat="35.6555279" lon="139.7468094"/>
   <node id="1016729549" lat="35.6555936" lon="139.7473255"/>
+  <node id="1028199574" lat="35.7317121" lon="139.7111086">
+    <tag k="tourism" v="hotel"/>
+    <tag k="wheelchair" v="no"/>
+  </node>
   <node id="1033221771" lat="35.7183533" lon="139.7772327"/>
   <node id="1033221787" lat="35.7182256" lon="139.7773644"/>
   <node id="1033221789" lat="35.7181997" lon="139.7768785"/>
@@ -362,8 +370,20 @@
   <node id="1033221818" lat="35.7182380" lon="139.7767999"/>
   <node id="1033221830" lat="35.7183954" lon="139.7770230"/>
   <node id="1033221837" lat="35.7182400" lon="139.7773348"/>
+  <node id="1059532102" lat="35.6838124" lon="139.7689954"/>
+  <node id="1059532176" lat="35.6835799" lon="139.7682384"/>
+  <node id="1059532213" lat="35.6834299" lon="139.7688541"/>
+  <node id="1059532270" lat="35.6839624" lon="139.7683797"/>
   <node id="1065897459" lat="35.7199148" lon="139.7746352"/>
   <node id="1065943671" lat="35.7176744" lon="139.7773055"/>
+  <node id="1080556891" lat="35.6387915" lon="139.7300593"/>
+  <node id="1080556951" lat="35.6398071" lon="139.7301505"/>
+  <node id="1080556955" lat="35.6396465" lon="139.7302974"/>
+  <node id="1080556961" lat="35.6387392" lon="139.7303115"/>
+  <node id="1080556985" lat="35.6397025" lon="139.7299574"/>
+  <node id="1080557001" lat="35.6394932" lon="139.7301184"/>
+  <node id="1080557020" lat="35.6391662" lon="139.7301899"/>
+  <node id="1080557022" lat="35.6391621" lon="139.7304349"/>
   <node id="1083607983" lat="35.6949709" lon="139.7564675">
     <tag k="name" v="サクラホテル神保町 (Sakura Hotel Jimbocho)"/>
     <tag k="name:en" v="Sakura Hotel Jimbocho"/>
@@ -404,6 +424,9 @@
   <node id="1094104956" lat="35.7101387" lon="139.7219672"/>
   <node id="1094104961" lat="35.7104000" lon="139.7230133"/>
   <node id="1094104987" lat="35.7101496" lon="139.7218465"/>
+  <node id="1105125353" lat="35.6780535" lon="139.7673347"/>
+  <node id="1105125595" lat="35.6776393" lon="139.7670722"/>
+  <node id="1105125729" lat="35.6782616" lon="139.7668370"/>
   <node id="1116808041" lat="35.6619556" lon="139.7076631"/>
   <node id="1116808048" lat="35.6620493" lon="139.7071937"/>
   <node id="1116808050" lat="35.6619708" lon="139.7076416"/>
@@ -465,17 +488,17 @@
     <tag k="tourism" v="hotel"/>
   </node>
   <node id="1177156749" lat="35.6664205" lon="139.6974467">
-    <tag k="name" v="NHK hall"/>
+    <tag k="name" v="NHK Hall"/>
     <tag k="tourism" v="museum"/>
     <tag k="wheelchair" v="yes"/>
   </node>
-  <node id="1177156758" lat="35.6647731" lon="139.6968566">
+  <node id="1177156758" lat="35.6651850" lon="139.6968140">
     <tag k="name" v="NHK Studio Park"/>
     <tag k="tourism" v="museum"/>
     <tag k="wheelchair" v="yes"/>
   </node>
   <node id="1177160380" lat="35.6659065" lon="139.6977256">
-    <tag k="name" v="NHK fureai hall"/>
+    <tag k="name" v="NHK Fureai Hall"/>
     <tag k="tourism" v="museum"/>
     <tag k="wheelchair" v="yes"/>
   </node>
@@ -489,11 +512,20 @@
     <tag k="source" v="bing"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="1192559456" lat="35.6416305" lon="139.7491256"/>
+  <node id="1192559457" lat="35.6419174" lon="139.7489549"/>
+  <node id="1192559458" lat="35.6420363" lon="139.7492276"/>
+  <node id="1192559460" lat="35.6417612" lon="139.7494347"/>
   <node id="1194227215" lat="35.6647393" lon="139.7277635"/>
   <node id="1194227222" lat="35.6645299" lon="139.7259148"/>
   <node id="1194227225" lat="35.6659787" lon="139.7271584"/>
   <node id="1194227284" lat="35.6659868" lon="139.7257019"/>
   <node id="1194227305" lat="35.6649032" lon="139.7252193"/>
+  <node id="1237995842" lat="35.6514773" lon="139.7912782"/>
+  <node id="1237995847" lat="35.6511826" lon="139.7915552"/>
+  <node id="1237995866" lat="35.6509373" lon="139.7921145"/>
+  <node id="1237995884" lat="35.6522229" lon="139.7930992"/>
+  <node id="1237995891" lat="35.6524922" lon="139.7927902"/>
   <node id="1248297444" lat="35.6937575" lon="139.7716325">
     <tag k="layer" v="0"/>
     <tag k="tourism" v="museum"/>
@@ -502,32 +534,39 @@
     <tag k="name" v="ANA Intercontinental Tokyo"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="1253627750" lat="35.6666713" lon="139.7436368"/>
+  <node id="1253627753" lat="35.6668282" lon="139.7449966"/>
   <node id="1253627755" lat="35.6678262" lon="139.7441491">
     <tag k="name" v="Hotel Okura North Wing"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="1253627756" lat="35.6671538" lon="139.7442387"/>
+  <node id="1253627757" lat="35.6666364" lon="139.7448894"/>
+  <node id="1253627758" lat="35.6677804" lon="139.7444039"/>
+  <node id="1253627759" lat="35.6672117" lon="139.7439801"/>
   <node id="1253627992" lat="35.6661219" lon="139.7429607">
     <tag k="name" v="Hotel Okura South Wing"/>
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="1253630889" lat="35.6675953" lon="139.7302099">
-    <tag k="name" v="21/21 Art Museum"/>
-    <tag k="tourism" v="museum"/>
-  </node>
-  <node id="1314077026" lat="35.6892968" lon="139.6941595"/>
-  <node id="1314077028" lat="35.6893334" lon="139.6940529"/>
-  <node id="1314077029" lat="35.6893507" lon="139.6941476"/>
-  <node id="1314077032" lat="35.6894373" lon="139.6949579"/>
-  <node id="1314077036" lat="35.6896451" lon="139.6939723"/>
-  <node id="1314077037" lat="35.6896567" lon="139.6940339"/>
+  <node id="1253630884" lat="35.6674689" lon="139.7305318"/>
+  <node id="1253630886" lat="35.6673033" lon="139.7299846"/>
+  <node id="1253630887" lat="35.6675692" lon="139.7308483"/>
+  <node id="1253630888" lat="35.6674733" lon="139.7308000"/>
+  <node id="1253630889" lat="35.6675953" lon="139.7302099"/>
+  <node id="1314077026" lat="35.6893014" lon="139.6941591"/>
+  <node id="1314077028" lat="35.6893340" lon="139.6940513"/>
+  <node id="1314077029" lat="35.6893497" lon="139.6941471"/>
+  <node id="1314077032" lat="35.6894316" lon="139.6949517"/>
+  <node id="1314077036" lat="35.6896460" lon="139.6939736"/>
+  <node id="1314077037" lat="35.6896561" lon="139.6940350"/>
   <node id="1314077038" lat="35.6896641" lon="139.6960780"/>
   <node id="1314077039" lat="35.6896756" lon="139.6962709"/>
-  <node id="1314077040" lat="35.6897029" lon="139.6940244"/>
-  <node id="1314077042" lat="35.6897048" lon="139.6939936"/>
+  <node id="1314077040" lat="35.6897061" lon="139.6940226"/>
+  <node id="1314077042" lat="35.6897030" lon="139.6940039"/>
   <node id="1314077045" lat="35.6898199" lon="139.6960649"/>
   <node id="1314077046" lat="35.6898332" lon="139.6962579"/>
-  <node id="1314077053" lat="35.6904687" lon="139.6938231"/>
-  <node id="1314077056" lat="35.6906034" lon="139.6946523"/>
+  <node id="1314077053" lat="35.6904664" lon="139.6938138"/>
+  <node id="1314077056" lat="35.6906053" lon="139.6946594"/>
   <node id="1326424640" lat="35.6684322" lon="139.7651786"/>
   <node id="1326424644" lat="35.6684411" lon="139.7651902"/>
   <node id="1326424652" lat="35.6685458" lon="139.7650675"/>
@@ -542,6 +581,10 @@
   <node id="1327962118" lat="35.6764380" lon="139.7668197"/>
   <node id="1327962126" lat="35.6764609" lon="139.7675715"/>
   <node id="1327962127" lat="35.6767152" lon="139.7669915"/>
+  <node id="1344331849" lat="35.6416692" lon="139.7489190"/>
+  <node id="1344331850" lat="35.6417280" lon="139.7490589"/>
+  <node id="1344331851" lat="35.6417980" lon="139.7488355"/>
+  <node id="1344331854" lat="35.6418638" lon="139.7489890"/>
   <node id="1350269516" lat="35.6854395" lon="139.7716029">
     <tag k="name" v="貨幣博物館"/>
     <tag k="name:en" v="Currency Museum"/>
@@ -579,16 +622,24 @@
     <tag k="name" v="オリエンタル"/>
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="1420764123" lat="35.6633140" lon="139.6995260">
-    <tag k="KSJ2:ADS" v="神南1-16-8"/>
-    <tag k="KSJ2:AdminArea" v="東京都渋谷区"/>
-    <tag k="KSJ2:PubFacAdmin" v="民間"/>
-    <tag k="name" v="たばこと塩の博物館"/>
+  <node id="1420764091" lat="35.7139151" lon="139.8059164">
+    <tag k="KSJ2:ADS" v="向島2-3-5"/>
+    <tag k="KSJ2:AdminArea" v="東京都墨田区"/>
+    <tag k="KSJ2:PubFacAdmin" v="市区町村"/>
+    <tag k="addr:postcode" v="131-0033"/>
+    <tag k="fax" v="+81-3-36253431"/>
+    <tag k="fee" v="yes"/>
+    <tag k="name" v="すみだ郷土文化資料館"/>
+    <tag k="name:ja" v="すみだ郷土文化資料館"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
-    <tag k="source" v="KSJ2"/>
+    <tag k="opening_hours" v="Tu-Su 09:00-17:00; Mo,Tu[4] off"/>
+    <tag k="operator" v="墨田区役所"/>
+    <tag k="phone" v="+81-3-56197034"/>
+    <tag k="source" v="KSJ2; (URL)"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://www.city.sumida.lg.jp/"/>
   </node>
   <node id="1420765070" lat="35.7080560" lon="139.7953150">
     <tag k="KSJ2:ADS" v="駒形1-8-10"/>
@@ -601,6 +652,14 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1420765079" lat="35.6504301" lon="139.7914747">
+    <tag k="name" v="ガスの科学館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="1420765132" lat="35.6781630" lon="139.7353010">
     <tag k="KSJ2:ADS" v="元赤坂1-2-3"/>
     <tag k="KSJ2:AdminArea" v="東京都港区"/>
@@ -612,6 +671,25 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1420765210" lat="35.7267260" lon="139.8132560">
+    <tag k="KSJ2:ADS" v="東向島3-9-7"/>
+    <tag k="KSJ2:AdminArea" v="東京都墨田区"/>
+    <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="addr:postcode" v="131-0032"/>
+    <tag k="fee" v="no"/>
+    <tag k="name" v="セイコーミュージアム (SEIKO Museum)"/>
+    <tag k="name:en" v="SEIKO Museum"/>
+    <tag k="name:ja" v="セイコーミュージアム"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="opening_hours" v="Tu-Su 10:00-16:00; Mo,PH off"/>
+    <tag k="operator" v="セイコーホールディングス"/>
+    <tag k="phone" v="+81-3-36106248"/>
+    <tag k="source" v="KSJ2; (URL)"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://museum.seiko.co.jp/"/>
+  </node>
   <node id="1420765213" lat="35.7025130" lon="139.7597660">
     <tag k="KSJ2:ADS" v="本郷2-2-9"/>
     <tag k="KSJ2:AdminArea" v="東京都文京区"/>
@@ -645,6 +723,17 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1420765316" lat="35.6941380" lon="139.8094190">
+    <tag k="KSJ2:ADS" v="江東橋1-5-5"/>
+    <tag k="KSJ2:AdminArea" v="東京都墨田区"/>
+    <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="name" v="ブレーキ博物館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="1420765367" lat="35.6768730" lon="139.7704970">
     <tag k="KSJ2:ADS" v="京橋2-6-21"/>
     <tag k="KSJ2:AdminArea" v="東京都中央区"/>
@@ -657,15 +746,14 @@
     <tag k="tourism" v="museum"/>
   </node>
   <node id="1420765422" lat="35.6706980" lon="139.7133710">
-    <tag k="KSJ2:ADS" v="神宮前3-7-6"/>
-    <tag k="KSJ2:AdminArea" v="東京都渋谷区"/>
-    <tag k="KSJ2:PubFacAdmin" v="民間"/>
     <tag k="name" v="ワタリウム美術館"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://www.watarium.co.jp/"/>
+    <tag k="wikipedia" v="ja:ワタリウム美術館"/>
   </node>
   <node id="1420765471" lat="35.6869380" lon="139.7730550">
     <tag k="KSJ2:ADS" v="日本橋室町2-1-1"/>
@@ -700,6 +788,17 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1420766554" lat="35.6345450" lon="139.7147590">
+    <tag k="KSJ2:ADS" v="上大崎2-25-5"/>
+    <tag k="KSJ2:AdminArea" v="東京都品川区"/>
+    <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="name" v="久米美術館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="1420766948" lat="35.6816820" lon="139.7149760">
     <tag k="KSJ2:ADS" v="大京町31-10"/>
     <tag k="KSJ2:AdminArea" v="東京都新宿区"/>
@@ -722,17 +821,6 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1420767888" lat="35.6814885" lon="139.6906746">
-    <tag k="KSJ2:ADS" v="代々木4-25-10"/>
-    <tag k="KSJ2:AdminArea" v="東京都渋谷区"/>
-    <tag k="KSJ2:PubFacAdmin" v="民間"/>
-    <tag k="name" v="刀剣博物館"/>
-    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
-    <tag k="tourism" v="museum"/>
-  </node>
   <node id="1420767889" lat="35.7182320" lon="139.7059370">
     <tag k="KSJ2:ADS" v="目白1-4-23"/>
     <tag k="KSJ2:AdminArea" v="東京都豊島区"/>
@@ -777,11 +865,22 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1420771079" lat="35.6676979" lon="139.6800138">
-    <tag k="KSJ2:ADS" v="上原3-6-12"/>
-    <tag k="KSJ2:AdminArea" v="東京都渋谷区"/>
+  <node id="1420770981" lat="35.6454910" lon="139.7455750">
+    <tag k="KSJ2:ADS" v="芝5-35-1"/>
+    <tag k="KSJ2:AdminArea" v="東京都港区"/>
+    <tag k="KSJ2:PubFacAdmin" v="国"/>
+    <tag k="name" v="厚生労働省産業安全技術館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="1420771074" lat="35.7287322" lon="139.7209684">
+    <tag k="KSJ2:ADS" v="東池袋3-1-4"/>
+    <tag k="KSJ2:AdminArea" v="東京都豊島区"/>
     <tag k="KSJ2:PubFacAdmin" v="民間"/>
-    <tag k="name" v="古賀政男音楽博物館"/>
+    <tag k="name" v="古代オリエント博物館"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
@@ -810,6 +909,27 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1420771103" lat="35.7247630" lon="139.7764530">
+    <tag k="name" v="台東区立書道博物館"/>
+    <tag k="name:fr" v="Musée de la Calligraphie"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://www.taitocity.net/taito/shodou/"/>
+  </node>
+  <node id="1420771104" lat="35.7268470" lon="139.7685630">
+    <tag k="KSJ2:ADS" v="谷中7-18-10"/>
+    <tag k="KSJ2:AdminArea" v="東京都台東区"/>
+    <tag k="KSJ2:PubFacAdmin" v="市区町村"/>
+    <tag k="name" v="台東区立朝倉彫塑館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="1420771165" lat="35.6623440" lon="139.7403780">
     <tag k="KSJ2:ADS" v="麻布台1-1-12"/>
     <tag k="KSJ2:AdminArea" v="東京都港区"/>
@@ -960,12 +1080,7 @@
     <tag k="tourism" v="museum"/>
   </node>
   <node id="1420779754" lat="35.6912618" lon="139.6925118">
-    <tag k="KSJ2:ADS" v="西新宿2-6-1"/>
-    <tag k="KSJ2:AdminArea" v="東京都新宿区"/>
-    <tag k="KSJ2:PubFacAdmin" v="その他"/>
     <tag k="name" v="平和祈念展示資料館"/>
-    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
@@ -981,6 +1096,17 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1420780290" lat="35.6430880" lon="139.7145410">
+    <tag k="KSJ2:ADS" v="恵比寿4-20-1"/>
+    <tag k="KSJ2:AdminArea" v="東京都渋谷区"/>
+    <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="name" v="恵比寿麦酒記念館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="1420780390" lat="35.6783980" lon="139.7470120">
     <tag k="KSJ2:ADS" v="永田町1-1-1"/>
     <tag k="KSJ2:AdminArea" v="東京都千代田区"/>
@@ -992,22 +1118,13 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1420780494" lat="35.6613210" lon="139.6927730">
+  <node id="1420780494" lat="35.6614398" lon="139.6927998">
     <tag k="KSJ2:ADS" v="松濤1-11-3"/>
     <tag k="KSJ2:AdminArea" v="東京都渋谷区"/>
     <tag k="KSJ2:PubFacAdmin" v="民間"/>
-    <tag k="name" v="戸栗美術館"/>
-    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
-    <tag k="tourism" v="museum"/>
-  </node>
-  <node id="1420780611" lat="35.6927620" lon="139.6961610">
-    <tag k="KSJ2:ADS" v="西新宿1-26-1"/>
-    <tag k="KSJ2:AdminArea" v="東京都新宿区"/>
-    <tag k="KSJ2:PubFacAdmin" v="民間"/>
-    <tag k="name" v="損保ジャパン東郷青児美術館"/>
+    <tag k="name" v="戸栗美術館 (Toguri Museum of Art)"/>
+    <tag k="name:en" v="Toguri Museum of Art"/>
+    <tag k="name:ja" v="戸栗美術館"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
@@ -1026,12 +1143,7 @@
     <tag k="tourism" v="museum"/>
   </node>
   <node id="1420780738" lat="35.6863220" lon="139.6950100">
-    <tag k="KSJ2:ADS" v="代々木3-22-7"/>
-    <tag k="KSJ2:AdminArea" v="東京都渋谷区"/>
-    <tag k="KSJ2:PubFacAdmin" v="民間"/>
     <tag k="name" v="文化学園服飾博物館"/>
-    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
@@ -1058,7 +1170,7 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1420780980" lat="35.6858970" lon="139.7423940">
+  <node id="1420780980" lat="35.6860582" lon="139.7428472">
     <tag k="KSJ2:ADS" v="一番町25"/>
     <tag k="KSJ2:AdminArea" v="東京都千代田区"/>
     <tag k="KSJ2:PubFacAdmin" v="民間"/>
@@ -1080,28 +1192,6 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1420781094" lat="35.6608490" lon="139.6792190">
-    <tag k="KSJ2:ADS" v="駒場4-3-33"/>
-    <tag k="KSJ2:AdminArea" v="東京都目黒区"/>
-    <tag k="KSJ2:PubFacAdmin" v="民間"/>
-    <tag k="name" v="日本民藝館"/>
-    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
-    <tag k="tourism" v="museum"/>
-  </node>
-  <node id="1420781152" lat="35.6853720" lon="139.7718250">
-    <tag k="KSJ2:ADS" v="日本橋本石町1-3-1"/>
-    <tag k="KSJ2:AdminArea" v="東京都中央区"/>
-    <tag k="KSJ2:PubFacAdmin" v="その他"/>
-    <tag k="name" v="日本銀行金融研究所貨幣博物館"/>
-    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
-    <tag k="tourism" v="museum"/>
-  </node>
   <node id="1420781297" lat="35.7099831" lon="139.7195469">
     <tag k="KSJ2:ADS" v="戸塚町1-104"/>
     <tag k="KSJ2:AdminArea" v="東京都新宿区"/>
@@ -1159,6 +1249,7 @@
     <tag k="name:en" v="Meiji Memorial Picture Gallery"/>
     <tag k="name:ja" v="明治神宮聖徳記念絵画館"/>
     <tag k="name:ja_kana" v="めいじじんぐうせいとくきねんかいがかん"/>
+    <tag k="name:ru" v="Мемориальная художественная галерея Мэйдзи"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
@@ -1166,28 +1257,6 @@
     <tag k="tourism" v="museum"/>
     <tag k="wikipedia" v="ja:聖徳記念絵画館"/>
   </node>
-  <node id="1420781432" lat="35.6949880" lon="139.7507500">
-    <tag k="KSJ2:ADS" v="九段南1-6-1"/>
-    <tag k="KSJ2:AdminArea" v="東京都千代田区"/>
-    <tag k="KSJ2:PubFacAdmin" v="国"/>
-    <tag k="name" v="昭和館"/>
-    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
-    <tag k="tourism" v="museum"/>
-  </node>
-  <node id="1420782618" lat="35.6830030" lon="139.6867560">
-    <tag k="KSJ2:ADS" v="西新宿3-20-2"/>
-    <tag k="KSJ2:AdminArea" v="東京都新宿区"/>
-    <tag k="KSJ2:PubFacAdmin" v="民間"/>
-    <tag k="name" v="東京オペラシティアートギャラリー"/>
-    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
-    <tag k="tourism" v="museum"/>
-  </node>
   <node id="1420783223" lat="35.7188170" lon="139.7764030">
     <tag k="KSJ2:ADS" v="上野公園13-9"/>
     <tag k="KSJ2:AdminArea" v="東京都台東区"/>
@@ -1207,33 +1276,22 @@
     <tag k="tourism" v="museum"/>
     <tag k="wikipedia" v="ja:東京国立博物館"/>
   </node>
-  <node id="1420783571" lat="35.6598250" lon="139.6848360">
-    <tag k="KSJ2:ADS" v="駒場3-8-1"/>
-    <tag k="KSJ2:AdminArea" v="東京都目黒区"/>
-    <tag k="KSJ2:PubFacAdmin" v="その他"/>
-    <tag k="name" v="東京大学大学院総合文化研究科教養学部美術博物館"/>
-    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
-    <tag k="tourism" v="museum"/>
-  </node>
-  <node id="1420783585" lat="35.7117690" lon="139.7654830">
-    <tag k="KSJ2:ADS" v="本郷7-3-1"/>
+  <node id="1420783591" lat="35.7213300" lon="139.7410080">
+    <tag k="KSJ2:ADS" v="白山3-7-1"/>
     <tag k="KSJ2:AdminArea" v="東京都文京区"/>
     <tag k="KSJ2:PubFacAdmin" v="その他"/>
-    <tag k="name" v="東京大学総合研究博物館"/>
+    <tag k="name" v="東京大学総合研究博物館・小石川分館"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1420783591" lat="35.7213300" lon="139.7410080">
-    <tag k="KSJ2:ADS" v="白山3-7-1"/>
-    <tag k="KSJ2:AdminArea" v="東京都文京区"/>
-    <tag k="KSJ2:PubFacAdmin" v="その他"/>
-    <tag k="name" v="東京大学総合研究博物館・小石川分館"/>
+  <node id="1420783697" lat="35.6817440" lon="139.8222640">
+    <tag k="KSJ2:ADS" v="北砂1-5-4"/>
+    <tag k="KSJ2:AdminArea" v="東京都江東区"/>
+    <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="name" v="東京大空襲・戦災資料センター"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
@@ -1291,6 +1349,28 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1420785320" lat="35.6418720" lon="139.7145330">
+    <tag k="KSJ2:ADS" v="三田1-13-1"/>
+    <tag k="KSJ2:AdminArea" v="東京都目黒区"/>
+    <tag k="KSJ2:PubFacAdmin" v="都道府県"/>
+    <tag k="name" v="東京都写真美術館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="1420785354" lat="35.6368800" lon="139.7190220">
+    <tag k="KSJ2:ADS" v="白金台5-21-9"/>
+    <tag k="KSJ2:AdminArea" v="東京都港区"/>
+    <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="name" v="東京都庭園美術館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="1420785371" lat="35.6997950" lon="139.7969030">
     <tag k="KSJ2:ADS" v="横網2-3-25"/>
     <tag k="KSJ2:AdminArea" v="東京都墨田区"/>
@@ -1307,22 +1387,33 @@
     <tag k="KSJ2:AdminArea" v="東京都文京区"/>
     <tag k="KSJ2:PubFacAdmin" v="都道府県"/>
     <tag k="name" v="東京都水道歴史館"/>
+    <tag k="name:en" v="Tokyo Waterworks Histrical Museum"/>
+    <tag k="name:ja_rm" v="Tōkyōto Suidō Rekishikan"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1420785523" lat="35.6545090" lon="139.6846150">
-    <tag k="KSJ2:ADS" v="大橋2-18-58"/>
-    <tag k="KSJ2:AdminArea" v="東京都目黒区"/>
+  <node id="1420785406" lat="35.6797390" lon="139.8082360">
+    <tag k="KSJ2:ADS" v="三好4-1-1"/>
+    <tag k="KSJ2:AdminArea" v="東京都江東区"/>
     <tag k="KSJ2:PubFacAdmin" v="都道府県"/>
-    <tag k="name" v="東京都立芸術高等学校美術館"/>
+    <tag k="addr:postcode" v="135-0022"/>
+    <tag k="fee" v="yes"/>
+    <tag k="name" v="東京都現代美術館 (Museum Contemporary Tokyo of Art)"/>
+    <tag k="name:en" v="Museum Contemporary Tokyo of Art"/>
+    <tag k="name:ja" v="東京都現代美術館"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
-    <tag k="source" v="KSJ2"/>
+    <tag k="opening_hours" v="Tu-Su 10:00-18:00; Mo off"/>
+    <tag k="operator" v="東京都歴史文化財団"/>
+    <tag k="phone" v="+81-3-52454111"/>
+    <tag k="source" v="KSJ2; (URL)"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://www.mot-art-museum.jp/"/>
+    <tag k="wikipedia" v="ja:東京都現代美術館"/>
   </node>
   <node id="1420785567" lat="35.7174010" lon="139.7728200">
     <tag k="KSJ2:ADS" v="上野公園8-36"/>
@@ -1342,6 +1433,17 @@
     <tag k="wheelchair" v="yes"/>
     <tag k="wikipedia" v="ja:東京都美術館"/>
   </node>
+  <node id="1420785912" lat="35.7234640" lon="139.8189850">
+    <tag k="KSJ2:ADS" v="東向島4-28-16"/>
+    <tag k="KSJ2:AdminArea" v="東京都墨田区"/>
+    <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="name" v="東武博物館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="1420786016" lat="35.6658280" lon="139.7618820">
     <tag k="KSJ2:ADS" v="東新橋1-5-1"/>
     <tag k="KSJ2:AdminArea" v="東京都港区"/>
@@ -1353,16 +1455,26 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1420786226" lat="35.6622100" lon="139.7170210">
-    <tag k="KSJ2:ADS" v="南青山6-5-1"/>
+  <node id="1420786033" lat="35.6400210" lon="139.7218060">
+    <tag k="KSJ2:ADS" v="白金台5-12-6"/>
     <tag k="KSJ2:AdminArea" v="東京都港区"/>
     <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="name" v="松岡美術館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="1420786226" lat="35.6622100" lon="139.7170210">
     <tag k="name" v="根津美術館"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://www.nezu-muse.or.jp/"/>
+    <tag k="wikipedia" v="ja:根津美術館"/>
   </node>
   <node id="1420786660" lat="35.6604320" lon="139.7292610">
     <tag k="KSJ2:ADS" v="六本木6-10-1"/>
@@ -1464,6 +1576,17 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1420789248" lat="35.6470900" lon="139.7452230">
+    <tag k="KSJ2:ADS" v="芝5-28-4"/>
+    <tag k="KSJ2:AdminArea" v="東京都港区"/>
+    <tag k="KSJ2:PubFacAdmin" v="市区町村"/>
+    <tag k="name" v="港区立港郷土資料館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="1420789600" lat="35.6905370" lon="139.7546180">
     <tag k="KSJ2:ADS" v="北の丸公園3-1"/>
     <tag k="KSJ2:AdminArea" v="東京都千代田区"/>
@@ -1500,6 +1623,52 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1420790339" lat="35.6322420" lon="139.7269380">
+    <tag k="KSJ2:ADS" v="白金台2-20-12"/>
+    <tag k="KSJ2:AdminArea" v="東京都港区"/>
+    <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="name" v="畠山記念館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="1420790403" lat="35.7240410" lon="139.8082340">
+    <tag k="KSJ2:ADS" v="橋場1-36-2"/>
+    <tag k="KSJ2:AdminArea" v="東京都台東区"/>
+    <tag k="KSJ2:PubFacAdmin" v="その他"/>
+    <tag k="name" v="皮革産業資料館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="1420790477" lat="35.6355120" lon="139.7084690">
+    <tag k="KSJ2:ADS" v="目黒2-4-36"/>
+    <tag k="KSJ2:AdminArea" v="東京都目黒区"/>
+    <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="name" v="目黒区美術館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="1420790484" lat="35.6317000" lon="139.7066660">
+    <tag k="KSJ2:ADS" v="下目黒4-1-1"/>
+    <tag k="KSJ2:AdminArea" v="東京都目黒区"/>
+    <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="name" v="目黒寄生虫館 (Meguro Parasitological Museum)"/>
+    <tag k="name:ja_rm" v="Meguro Kiseichū-kan"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="wheelchair" v="no"/>
+  </node>
   <node id="1420790652" lat="35.6972706" lon="139.7932372">
     <tag k="KSJ2:ADS" v="横網1-3-28"/>
     <tag k="KSJ2:AdminArea" v="東京都墨田区"/>
@@ -1551,6 +1720,17 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1420795772" lat="35.6509581" lon="139.8263521">
+    <tag k="KSJ2:ADS" v="夢の島3-2"/>
+    <tag k="KSJ2:AdminArea" v="東京都江東区"/>
+    <tag k="KSJ2:PubFacAdmin" v="都道府県"/>
+    <tag k="name" v="第五福竜丸展示館"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="1420796437" lat="35.6916418" lon="139.7530944">
     <tag k="KSJ2:ADS" v="北の丸公園2-1"/>
     <tag k="KSJ2:AdminArea" v="東京都千代田区"/>
@@ -1559,6 +1739,7 @@
     <tag k="name:en" v="Bicycle culture center"/>
     <tag k="name:ja" v="自転車文化センター"/>
     <tag k="name:ja_kana" v="じてんしゃぶんかセンター"/>
+    <tag k="name:ja_rm" v="Jitensha Bunka Centre"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
@@ -1569,7 +1750,24 @@
     <tag k="KSJ2:ADS" v="赤坂7-2-21"/>
     <tag k="KSJ2:AdminArea" v="東京都港区"/>
     <tag k="KSJ2:PubFacAdmin" v="民間"/>
+    <tag k="addr:city" v="港区"/>
+    <tag k="addr:country" v="JP"/>
+    <tag k="addr:region" v="東京都"/>
     <tag k="name" v="草月美術館"/>
+    <tag k="name:ja" v="草月美術館"/>
+    <tag k="name:ja_kana" v="そうげつびじゅつかん"/>
+    <tag k="name:ja_rm" v="Sogetsu Bijutsukan"/>
+    <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="1420796626" lat="35.7374610" lon="139.7954180">
+    <tag k="KSJ2:ADS" v="南千住6-63-1"/>
+    <tag k="KSJ2:AdminArea" v="東京都荒川区"/>
+    <tag k="KSJ2:PubFacAdmin" v="市区町村"/>
+    <tag k="name" v="荒川区立荒川ふるさと文化館"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
@@ -1609,13 +1807,11 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1420798594" lat="35.6869870" lon="139.7667940">
-    <tag k="KSJ2:ADS" v="大手町2-3-1"/>
-    <tag k="KSJ2:AdminArea" v="東京都千代田区"/>
-    <tag k="KSJ2:PubFacAdmin" v="国"/>
-    <tag k="name" v="逓信総合博物館"/>
-    <tag k="name:en" v="Communications Museum"/>
-    <tag k="name:ja_rm" v="Teishin Sōgō Hakubutsukan"/>
+  <node id="1420798090" lat="35.7276750" lon="139.7067210">
+    <tag k="KSJ2:ADS" v="西池袋2-37-4"/>
+    <tag k="KSJ2:AdminArea" v="東京都豊島区"/>
+    <tag k="KSJ2:PubFacAdmin" v="市区町村"/>
+    <tag k="name" v="豊島区立郷土資料館"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
@@ -1644,12 +1840,11 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1420799807" lat="35.6634387" lon="139.7010350">
-    <tag k="KSJ2:ADS" v="神南1-12-10"/>
-    <tag k="KSJ2:AdminArea" v="東京都渋谷区"/>
+  <node id="1420799454" lat="35.6359080" lon="139.7030510">
+    <tag k="KSJ2:ADS" v="中目黒4-12-18"/>
+    <tag k="KSJ2:AdminArea" v="東京都目黒区"/>
     <tag k="KSJ2:PubFacAdmin" v="民間"/>
-    <tag k="disused" v="yes"/>
-    <tag k="name" v="電力館"/>
+    <tag k="name" v="長泉院附属現代彫刻美術館"/>
     <tag k="note" v="National-Land Numerical Information (Public Facility) 2006, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（公共施設データ）平成19年　国土交通省"/>
     <tag k="source" v="KSJ2"/>
@@ -1689,24 +1884,6 @@
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
     <tag k="tourism" v="museum"/>
   </node>
-  <node id="1467794586" lat="35.6608465" lon="139.6788868"/>
-  <node id="1467794587" lat="35.6608483" lon="139.6789615"/>
-  <node id="1467794588" lat="35.6609355" lon="139.6787316"/>
-  <node id="1467794589" lat="35.6609393" lon="139.6788832"/>
-  <node id="1467794590" lat="35.6610195" lon="139.6788855"/>
-  <node id="1467794591" lat="35.6610213" lon="139.6789549"/>
-  <node id="1467794592" lat="35.6610370" lon="139.6787277"/>
-  <node id="1467794593" lat="35.6610410" lon="139.6788847"/>
-  <node id="1467808141" lat="35.6607181" lon="139.6791155"/>
-  <node id="1467808142" lat="35.6607267" lon="139.6794537"/>
-  <node id="1467808147" lat="35.6607854" lon="139.6791128"/>
-  <node id="1467808148" lat="35.6607867" lon="139.6791615"/>
-  <node id="1467808150" lat="35.6607941" lon="139.6794511"/>
-  <node id="1467808169" lat="35.6608605" lon="139.6791115"/>
-  <node id="1467808173" lat="35.6608617" lon="139.6791586"/>
-  <node id="1467808201" lat="35.6609328" lon="139.6791087"/>
-  <node id="1467808203" lat="35.6609340" lon="139.6791558"/>
-  <node id="1467808205" lat="35.6609414" lon="139.6794454"/>
   <node id="1475722975" lat="35.6567729" lon="139.7526240">
     <tag k="name" v="芝大門ホテル"/>
     <tag k="tourism" v="hotel"/>
@@ -1832,6 +2009,12 @@
   <node id="1498427672" lat="35.6576605" lon="139.6960109"/>
   <node id="1498427678" lat="35.6576837" lon="139.6961513"/>
   <node id="1498427687" lat="35.6577303" lon="139.6960814"/>
+  <node id="1508619593" lat="35.6507820" lon="139.7453120"/>
+  <node id="1508619595" lat="35.6508033" lon="139.7450979"/>
+  <node id="1508619596" lat="35.6508321" lon="139.7451518"/>
+  <node id="1508619597" lat="35.6508377" lon="139.7451002"/>
+  <node id="1508619598" lat="35.6509316" lon="139.7453289"/>
+  <node id="1508619601" lat="35.6509416" lon="139.7451641"/>
   <node id="1509430752" lat="35.7106647" lon="139.7630534"/>
   <node id="1509430758" lat="35.7107056" lon="139.7635748"/>
   <node id="1509430782" lat="35.7108967" lon="139.7630258"/>
@@ -1840,29 +2023,58 @@
     <tag k="name" v="IBIS"/>
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="1511455452" lat="35.6980889" lon="139.7612366">
-    <tag k="name" v="山の上ホテル"/>
-    <tag k="tourism" v="hotel"/>
-  </node>
   <node id="1539225928" lat="35.6562370" lon="139.6999017"/>
   <node id="1539225939" lat="35.6564314" lon="139.6998006"/>
   <node id="1539225940" lat="35.6564742" lon="139.6999207"/>
   <node id="1540357115" lat="35.6559998" lon="139.6991337"/>
   <node id="1540357116" lat="35.6560059" lon="139.6992174"/>
   <node id="1540357117" lat="35.6560742" lon="139.6990991"/>
+  <node id="1541779183" lat="35.6522272" lon="139.6946528"/>
+  <node id="1541779242" lat="35.6523199" lon="139.6945548"/>
+  <node id="1541779256" lat="35.6523326" lon="139.6948039"/>
+  <node id="1541779319" lat="35.6524254" lon="139.6947060"/>
   <node id="1555877197" lat="35.6585267" lon="139.7520568"/>
   <node id="1555877202" lat="35.6585735" lon="139.7517293"/>
   <node id="1555877252" lat="35.6591516" lon="139.7521922"/>
   <node id="1555877253" lat="35.6591985" lon="139.7518646"/>
   <node id="1555877277" lat="35.6558335" lon="139.7513102">
+    <tag k="addr:city" v="港区"/>
+    <tag k="addr:country" v="JP"/>
+    <tag k="addr:full" v="〒105-8582 東京都港区芝公園2-5-20"/>
+    <tag k="addr:postcode" v="105-8582"/>
+    <tag k="addr:province" v="東京都"/>
     <tag k="name" v="メルパルク"/>
+    <tag k="name:ja" v="メルパルク"/>
+    <tag k="name:ja_kana" v="メルパルク"/>
+    <tag k="phone" v="+81 03-3433-7211"/>
     <tag k="source" v="survey; bing"/>
     <tag k="tourism" v="hotel"/>
-  </node>
+    <tag k="website" v="http://www.mielparque.jp/tokyo/"/>
+  </node>
+  <node id="1580357757" lat="35.7004300" lon="139.7492307"/>
+  <node id="1580357843" lat="35.7005624" lon="139.7497202"/>
+  <node id="1580357892" lat="35.7006396" lon="139.7499189"/>
+  <node id="1580357908" lat="35.7006598" lon="139.7495937"/>
+  <node id="1580357965" lat="35.7007069" lon="139.7495485"/>
+  <node id="1580357975" lat="35.7007116" lon="139.7495560"/>
+  <node id="1580358182" lat="35.7009425" lon="139.7494962"/>
+  <node id="1580358210" lat="35.7009871" lon="139.7486960"/>
+  <node id="1580358240" lat="35.7010197" lon="139.7496949"/>
+  <node id="1580358301" lat="35.7011088" lon="139.7488884"/>
+  <node id="1580358350" lat="35.7011810" lon="139.7488191"/>
+  <node id="1580358355" lat="35.7011882" lon="139.7488305"/>
+  <node id="1580358403" lat="35.7012501" lon="139.7487710"/>
+  <node id="1580358411" lat="35.7012723" lon="139.7489634"/>
+  <node id="1580358422" lat="35.7012938" lon="139.7489973"/>
+  <node id="1580358483" lat="35.7013343" lon="139.7489040"/>
   <node id="1584472133" lat="35.6827911" lon="139.7433796"/>
   <node id="1584472135" lat="35.6828025" lon="139.7434647"/>
   <node id="1584472141" lat="35.6828540" lon="139.7436568"/>
   <node id="1584472149" lat="35.6830522" lon="139.7438638"/>
+  <node id="1584484765" lat="35.6791350" lon="139.7408184"/>
+  <node id="1584484770" lat="35.6792024" lon="139.7411904"/>
+  <node id="1584484781" lat="35.6793668" lon="139.7407547"/>
+  <node id="1584484791" lat="35.6794342" lon="139.7411267"/>
   <node id="1586832840" lat="35.6796250" lon="139.7350485"/>
   <node id="1586832868" lat="35.6796709" lon="139.7351224"/>
   <node id="1586832879" lat="35.6796833" lon="139.7353522"/>
@@ -1884,6 +2096,18 @@
   <node id="1586834663" lat="35.6811803" lon="139.7343131"/>
   <node id="1586834666" lat="35.6811926" lon="139.7339092"/>
   <node id="1586834739" lat="35.6812090" lon="139.7342750"/>
+  <node id="1586835394" lat="35.6816503" lon="139.7384121"/>
+  <node id="1586835406" lat="35.6816682" lon="139.7390787"/>
+  <node id="1586835690" lat="35.6818638" lon="139.7384035"/>
+  <node id="1586835692" lat="35.6818688" lon="139.7385883"/>
+  <node id="1586835699" lat="35.6818776" lon="139.7389162"/>
+  <node id="1586835701" lat="35.6818817" lon="139.7390701"/>
+  <node id="1586835737" lat="35.6819109" lon="139.7385862"/>
+  <node id="1586835752" lat="35.6819215" lon="139.7389140"/>
+  <node id="1586835774" lat="35.6819378" lon="139.7385795"/>
+  <node id="1586835804" lat="35.6819448" lon="139.7383363"/>
+  <node id="1586835876" lat="35.6820371" lon="139.7385839"/>
+  <node id="1586835878" lat="35.6820441" lon="139.7383406"/>
   <node id="1587598199" lat="35.7182905" lon="139.7750216">
     <tag k="building" v="entrance"/>
   </node>
@@ -1903,7 +2127,7 @@
   <node id="1587598329" lat="35.7184986" lon="139.7753384"/>
   <node id="1587598349" lat="35.7185232" lon="139.7752569"/>
   <node id="1587598354" lat="35.7185275" lon="139.7752784"/>
-  <node id="1587598361" lat="35.7185429" lon="139.7753691">
+  <node id="1587598361" lat="35.7185423" lon="139.7753687">
     <tag k="building" v="entrance"/>
   </node>
   <node id="1587598365" lat="35.7185777" lon="139.7751424"/>
@@ -1949,6 +2173,10 @@
   <node id="1588142370" lat="35.6747818" lon="139.7602312"/>
   <node id="1588142372" lat="35.6747944" lon="139.7609561"/>
   <node id="1588142388" lat="35.6749257" lon="139.7603307"/>
+  <node id="1588226127" lat="35.6685203" lon="139.7577208"/>
+  <node id="1588226129" lat="35.6687108" lon="139.7578133"/>
+  <node id="1588226132" lat="35.6687599" lon="139.7569735"/>
+  <node id="1588226135" lat="35.6689503" lon="139.7570660"/>
   <node id="1589723018" lat="35.7068085" lon="139.7945162">
     <tag k="name" v="Chisun Inn Asakusa"/>
     <tag k="operator" v="Solare Hotels"/>
@@ -2001,6 +2229,18 @@
   <node id="1599621869" lat="35.6649497" lon="139.7271746"/>
   <node id="1599621874" lat="35.6650083" lon="139.7254000"/>
   <node id="1599622202" lat="35.6658354" lon="139.7254266"/>
+  <node id="1618484762" lat="35.6664022" lon="139.7441702"/>
+  <node id="1618484777" lat="35.6664716" lon="139.7442125"/>
+  <node id="1618484779" lat="35.6664837" lon="139.7441825"/>
+  <node id="1618484808" lat="35.6665914" lon="139.7437013"/>
+  <node id="1618484814" lat="35.6666356" lon="139.7437283"/>
+  <node id="1618484845" lat="35.6668429" lon="139.7444021"/>
+  <node id="1618600643" lat="35.6639661" lon="139.7398098"/>
+  <node id="1618600646" lat="35.6639887" lon="139.7396752"/>
+  <node id="1618600659" lat="35.6641727" lon="139.7393408"/>
+  <node id="1618600668" lat="35.6642063" lon="139.7398688"/>
+  <node id="1618600684" lat="35.6642790" lon="139.7393641"/>
+  <node id="1623624129" lat="35.6778475" lon="139.7665745"/>
   <node id="1628058654" lat="35.6550467" lon="139.7632261"/>
   <node id="1628058671" lat="35.6551984" lon="139.7629727"/>
   <node id="1628058705" lat="35.6554559" lon="139.7635990"/>
@@ -2022,6 +2262,12 @@
   <node id="1654277681" lat="35.7037776" lon="139.7530761"/>
   <node id="1654277682" lat="35.7037905" lon="139.7531239"/>
   <node id="1657015145" lat="35.7176094" lon="139.7725173"/>
+  <node id="1661350597" lat="35.7266605" lon="139.8007614">
+    <tag k="contact:phone" v="+81 (0)3-3875-5362"/>
+    <tag k="contact:website" v="http://www.juyoh.co.jp/"/>
+    <tag k="name" v="JUYOH HOTEL"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <node id="1661350663" lat="35.6933919" lon="139.7104827">
     <tag k="contact:phone" v="+81 (0)3-3356-4605"/>
     <tag k="contact:website" v="http://tbh.co.jp/"/>
@@ -2031,13 +2277,43 @@
     <tag k="tourism" v="hotel"/>
   </node>
   <node id="1666008174" lat="35.7185760" lon="139.7743562"/>
-  <node id="1666008177" lat="35.7186113" lon="139.7743819"/>
-  <node id="1666008180" lat="35.7186778" lon="139.7744303"/>
-  <node id="1676618277" lat="35.6622584" lon="139.6807297"/>
-  <node id="1676618278" lat="35.6622584" lon="139.6806734"/>
-  <node id="1676618279" lat="35.6622584" lon="139.6808451"/>
+  <node id="1666008177" lat="35.7186101" lon="139.7743817"/>
+  <node id="1666008180" lat="35.7186800" lon="139.7744313"/>
+  <node id="1674563042" lat="35.6949365" lon="139.7065549"/>
+  <node id="1674563051" lat="35.6949444" lon="139.7064760"/>
+  <node id="1674563066" lat="35.6949774" lon="139.7067088"/>
+  <node id="1674563135" lat="35.6952270" lon="139.7067615"/>
+  <node id="1674563151" lat="35.6953089" lon="139.7066317"/>
+  <node id="1674563154" lat="35.6953198" lon="139.7065459"/>
+  <node id="1676822332" lat="35.6997136" lon="139.7000279"/>
+  <node id="1676822336" lat="35.6997245" lon="139.6999594"/>
+  <node id="1676822398" lat="35.6998217" lon="139.7000321"/>
+  <node id="1676822402" lat="35.6998239" lon="139.6999642"/>
+  <node id="1676830779" lat="35.7140439" lon="139.7029479"/>
+  <node id="1676830789" lat="35.7140433" lon="139.7030787"/>
+  <node id="1676830855" lat="35.7141837" lon="139.7029126"/>
+  <node id="1676830862" lat="35.7142066" lon="139.7030337"/>
+  <node id="1676900286" lat="35.7279750" lon="139.7082348"/>
+  <node id="1676900310" lat="35.7280383" lon="139.7079824"/>
+  <node id="1676900315" lat="35.7280534" lon="139.7079900"/>
+  <node id="1676900326" lat="35.7280977" lon="139.7078044"/>
+  <node id="1676900328" lat="35.7281025" lon="139.7077620"/>
+  <node id="1676900340" lat="35.7281518" lon="139.7076048"/>
+  <node id="1676900346" lat="35.7281714" lon="139.7078417"/>
+  <node id="1676900349" lat="35.7281855" lon="139.7078015"/>
+  <node id="1676900365" lat="35.7282508" lon="139.7076519"/>
+  <node id="1676900376" lat="35.7282821" lon="139.7075599"/>
+  <node id="1676900403" lat="35.7283968" lon="139.7084398"/>
+  <node id="1676900428" lat="35.7284718" lon="139.7082058"/>
+  <node id="1676900487" lat="35.7286365" lon="139.7082901"/>
+  <node id="1676900500" lat="35.7286604" lon="139.7082194"/>
+  <node id="1676900521" lat="35.7286852" lon="139.7082326"/>
+  <node id="1676900555" lat="35.7287148" lon="139.7080425"/>
+  <node id="1676900563" lat="35.7287461" lon="139.7080592"/>
+  <node id="1676900576" lat="35.7287898" lon="139.7078218"/>
   <node id="1681422026" lat="35.6601130" lon="139.7021214">
-    <tag k="name" v="Tokyu inn"/>
+    <tag k="name" v="Tokyu Inn"/>
+    <tag k="name:en" v="Tokyu Inn"/>
     <tag k="source" v="survey　2012/03/18"/>
     <tag k="tourism" v="hotel"/>
   </node>
@@ -2071,6 +2347,10 @@
     <tag k="source" v="survey"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="1693666396" lat="35.7227763" lon="139.7946596">
+    <tag k="name" v="Soho　Asakusa 浅草 Hotel"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <node id="1717451039" lat="35.6550812" lon="139.7632574"/>
   <node id="1717451048" lat="35.6551885" lon="139.7633547"/>
   <node id="1717451057" lat="35.6553594" lon="139.7635097"/>
@@ -2087,27 +2367,71 @@
     <tag k="source" v="survey"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="1730076576" lat="35.6367404" lon="139.7191495"/>
+  <node id="1730076582" lat="35.6366532" lon="139.7191925"/>
+  <node id="1730076584" lat="35.6367469" lon="139.7190610"/>
+  <node id="1730076602" lat="35.6367840" lon="139.7185031"/>
+  <node id="1730076605" lat="35.6367295" lon="139.7194714"/>
+  <node id="1730076607" lat="35.6366576" lon="139.7194660"/>
+  <node id="1730076615" lat="35.6367251" lon="139.7195465"/>
+  <node id="1730076642" lat="35.6368886" lon="139.7188411"/>
+  <node id="1730076655" lat="35.6370173" lon="139.7192971"/>
+  <node id="1730076659" lat="35.6366554" lon="139.7191629"/>
+  <node id="1730076666" lat="35.6366837" lon="139.7191495"/>
+  <node id="1730076668" lat="35.6370957" lon="139.7193078"/>
+  <node id="1730076679" lat="35.6370761" lon="139.7195143"/>
+  <node id="1730076687" lat="35.6366816" lon="139.7192246"/>
+  <node id="1730076690" lat="35.6370718" lon="139.7185487"/>
+  <node id="1730076713" lat="35.6367469" lon="139.7188250"/>
+  <node id="1730076727" lat="35.6368756" lon="139.7190718"/>
+  <node id="1730076730" lat="35.6367971" lon="139.7195572"/>
+  <node id="1730076735" lat="35.6368102" lon="139.7194821"/>
+  <node id="1730076747" lat="35.6366685" lon="139.7192112"/>
+  <node id="1733357504" lat="35.6348591" lon="139.7077409">
+    <tag k="name" v="目黒区美術館"/>
+    <tag k="source" v="Bing 2007"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://www.mmat.jp/"/>
+  </node>
   <node id="1734716412" lat="35.6894907" lon="139.7705650">
-    <tag k="designation" v="Hotel"/>
     <tag k="name" v="神田ステーションホテル (Kanda Station Hotel)"/>
     <tag k="name:en" v="Kanda Station Hotel"/>
     <tag k="name:ja" v="神田ステーションホテル"/>
     <tag k="source" v="http://www.kandasth.com/"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="1742885207" lat="35.7313702" lon="139.7486551">
+    <tag k="name" v="東洋文庫ミュージアム"/>
+    <tag k="source" v="survey;image,Bing,2007-03"/>
+    <tag k="tourism" v="museum"/>
+  </node>
   <node id="1752050674" lat="35.6596278" lon="139.7543337">
+    <tag k="addr:city" v="Tokyo"/>
+    <tag k="addr:housenumber" v="1-2-7"/>
+    <tag k="addr:street" v="Shibadaimon"/>
     <tag k="contact:phone" v="03-5472-2031"/>
     <tag k="name" v="相鉄フレッサイン 浜松町大門"/>
-    <tag k="source" v="survey"/>
+    <tag k="name:en" v="Sotetsu Fresa Inn Hamamatsucho Daimon"/>
+    <tag k="source" v="official hotel page"/>
     <tag k="tourism" v="hotel"/>
-    <tag k="website" v="http://fresa-inn.jp"/>
   </node>
-  <node id="1760401130" lat="35.6818721" lon="139.6849020"/>
-  <node id="1760401138" lat="35.6819291" lon="139.6850103"/>
-  <node id="1760401145" lat="35.6819629" lon="139.6848332"/>
-  <node id="1760401151" lat="35.6819705" lon="139.6849771"/>
-  <node id="1760401152" lat="35.6819749" lon="139.6849855"/>
-  <node id="1760401166" lat="35.6820230" lon="139.6849469"/>
+  <node id="1752138919" lat="35.6392556" lon="139.7301245"/>
+  <node id="1752138921" lat="35.6396563" lon="139.7307598"/>
+  <node id="1752138922" lat="35.6394168" lon="139.7301409"/>
+  <node id="1752138924" lat="35.6397524" lon="139.7313968"/>
+  <node id="1752138925" lat="35.6394090" lon="139.7309210"/>
+  <node id="1752138927" lat="35.6397157" lon="139.7307444"/>
+  <node id="1752138934" lat="35.6393219" lon="139.7309454"/>
+  <node id="1752138936" lat="35.6393230" lon="139.7304066"/>
+  <node id="1752138937" lat="35.6392574" lon="139.7301763"/>
+  <node id="1752138938" lat="35.6393907" lon="139.7314619"/>
+  <node id="1752138940" lat="35.6394097" lon="139.7300869"/>
+  <node id="1752138942" lat="35.6389680" lon="139.7301371"/>
+  <node id="1752138943" lat="35.6395836" lon="139.7308101"/>
+  <node id="1752138944" lat="35.6397233" lon="139.7311914"/>
+  <node id="1752138945" lat="35.6396644" lon="139.7307983"/>
+  <node id="1752138946" lat="35.6389685" lon="139.7301080"/>
+  <node id="1752138947" lat="35.6396390" lon="139.7312068"/>
   <node id="1797919399" lat="35.6737858" lon="139.7692365">
     <tag k="name" v="Moterey Lasoeur Ginza"/>
     <tag k="tourism" v="hotel"/>
@@ -2121,14 +2445,66 @@
   <node id="1815494175" lat="35.7073033" lon="139.7685804"/>
   <node id="1815494234" lat="35.7074202" lon="139.7688425"/>
   <node id="1815494246" lat="35.7074375" lon="139.7685946"/>
+  <node id="1815597928" lat="35.7083018" lon="139.7715817"/>
+  <node id="1815597960" lat="35.7083233" lon="139.7719075"/>
+  <node id="1815598165" lat="35.7084387" lon="139.7715680"/>
+  <node id="1815598209" lat="35.7084603" lon="139.7718937"/>
   <node id="1823741994" lat="35.6751910" lon="139.7698904">
     <tag k="name" v="警察博物馆"/>
     <tag k="tourism" v="museum"/>
   </node>
+  <node id="1828202693" lat="35.6806244" lon="139.7803728"/>
+  <node id="1828202703" lat="35.6806688" lon="139.7800603"/>
+  <node id="1828202704" lat="35.6806703" lon="139.7802944"/>
+  <node id="1828202717" lat="35.6807457" lon="139.7801663"/>
+  <node id="1828202730" lat="35.6807775" lon="139.7799348"/>
+  <node id="1828202732" lat="35.6807836" lon="139.7804500"/>
+  <node id="1828202733" lat="35.6807873" lon="139.7801329"/>
+  <node id="1828202739" lat="35.6808119" lon="139.7802937"/>
+  <node id="1828202744" lat="35.6808437" lon="139.7802079"/>
+  <node id="1828202757" lat="35.6809278" lon="139.7801321"/>
+  <node id="1828202758" lat="35.6809477" lon="139.7801513"/>
+  <node id="1828202764" lat="35.6809981" lon="139.7802264"/>
+  <node id="1828274059" lat="35.6510465" lon="139.7488488">
+    <tag k="name" v="Celestine Hotel"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <node id="1832671045" lat="35.6821979" lon="139.7994187">
     <tag k="name" v="コンフォートホテル東京清澄白河"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="1837996012" lat="35.6695134" lon="139.8200761">
+    <tag k="name" v="R&amp;B Hotel 東陽町"/>
+    <tag k="source" v="survey; bing"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="1840743403" lat="35.6470752" lon="139.7012678"/>
+  <node id="1840743404" lat="35.6470877" lon="139.7011257"/>
+  <node id="1840743405" lat="35.6471579" lon="139.7007994"/>
+  <node id="1840743406" lat="35.6471748" lon="139.7015226"/>
+  <node id="1840743407" lat="35.6472000" lon="139.7013119"/>
+  <node id="1840743409" lat="35.6472375" lon="139.7005671"/>
+  <node id="1840743412" lat="35.6472554" lon="139.7015876">
+    <tag k="access" v="destination"/>
+    <tag k="barrier" v="gate"/>
+    <tag k="source" v="survey; Bing"/>
+  </node>
+  <node id="1840743420" lat="35.6473481" lon="139.7016625"/>
+  <node id="1840743423" lat="35.6473840" lon="139.7015184"/>
+  <node id="1840743425" lat="35.6473888" lon="139.7001333"/>
+  <node id="1840743427" lat="35.6474126" lon="139.7015415"/>
+  <node id="1840743431" lat="35.6474587" lon="139.7013138"/>
+  <node id="1840743432" lat="35.6474668" lon="139.7001679"/>
+  <node id="1840743434" lat="35.6474828" lon="139.7013332"/>
+  <node id="1840743440" lat="35.6476009" lon="139.7002312"/>
+  <node id="1840743441" lat="35.6476412" lon="139.7007610"/>
+  <node id="1840743442" lat="35.6477197" lon="139.7008244"/>
+  <node id="1840743443" lat="35.6477242" lon="139.7003329"/>
+  <node id="1840743444" lat="35.6478068" lon="139.7004506"/>
+  <node id="1859968330" lat="35.7026279" lon="139.7734134"/>
+  <node id="1859968335" lat="35.7026329" lon="139.7733446"/>
+  <node id="1859968341" lat="35.7027243" lon="139.7734240"/>
+  <node id="1859968343" lat="35.7027293" lon="139.7733552"/>
   <node id="1861953842" lat="35.7123260" lon="139.7960882"/>
   <node id="1861953846" lat="35.7123443" lon="139.7959380"/>
   <node id="1861953869" lat="35.7124392" lon="139.7961091"/>
@@ -2149,8 +2525,17 @@
   <node id="1866082080" lat="35.6897776" lon="139.7503060"/>
   <node id="1866082086" lat="35.6898012" lon="139.7503548"/>
   <node id="1866082097" lat="35.6898782" lon="139.7506214"/>
+  <node id="1870080710" lat="35.7331651" lon="139.7274365"/>
+  <node id="1870080715" lat="35.7331920" lon="139.7281998"/>
+  <node id="1870080723" lat="35.7332026" lon="139.7273946"/>
+  <node id="1870080734" lat="35.7332387" lon="139.7282719"/>
+  <node id="1870080740" lat="35.7332614" lon="139.7275677"/>
+  <node id="1870080744" lat="35.7332989" lon="139.7275258"/>
+  <node id="1870080769" lat="35.7333720" lon="139.7280234"/>
+  <node id="1870080781" lat="35.7334186" lon="139.7280955"/>
   <node id="1880419757" lat="35.7050077" lon="139.7678215">
-    <tag k="name" v="Edoya"/>
+    <tag k="name" v="江戸屋"/>
+    <tag k="name:ja_rm" v="Edoya"/>
     <tag k="source" v="survey"/>
     <tag k="tourism" v="hotel"/>
   </node>
@@ -2159,6 +2544,11 @@
     <tag k="tourism" v="hotel"/>
   </node>
   <node id="1909755972" lat="35.6809392" lon="139.7390221"/>
+  <node id="1916548178" lat="35.7278019" lon="139.7156026">
+    <tag k="name" v="京王プレッソイン池袋"/>
+    <tag k="source" v="Bing 2010"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <node id="1918061886" lat="35.6959811" lon="139.7968407"/>
   <node id="1918061897" lat="35.6961251" lon="139.7969059"/>
   <node id="1918061898" lat="35.6961326" lon="139.7968593"/>
@@ -2177,16 +2567,34 @@
     <tag k="name" v="ホテルニューオータニ　ガーデンタワー"/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="1928162130" lat="35.6468849" lon="139.7254192"/>
+  <node id="1928162131" lat="35.6470462" lon="139.7254219"/>
+  <node id="1928162132" lat="35.6477057" lon="139.7250799"/>
+  <node id="1928162133" lat="35.6472938" lon="139.7242256"/>
+  <node id="1928162134" lat="35.6469156" lon="139.7254366"/>
+  <node id="1928162135" lat="35.6469601" lon="139.7244335"/>
+  <node id="1928162136" lat="35.6470189" lon="139.7254353"/>
+  <node id="1928162137" lat="35.6468042" lon="139.7252288"/>
+  <node id="1928162138" lat="35.6468620" lon="139.7254018"/>
+  <node id="1928162139" lat="35.6468151" lon="139.7253039"/>
+  <node id="1928162140" lat="35.6470037" lon="139.7243799"/>
+  <node id="1928162141" lat="35.6469505" lon="139.7254460"/>
+  <node id="1928162142" lat="35.6469862" lon="139.7254460"/>
+  <node id="1928162144" lat="35.6468260" lon="139.7253455"/>
+  <node id="1928162145" lat="35.6468315" lon="139.7248157"/>
+  <node id="1928162146" lat="35.6468467" lon="139.7253803"/>
+  <node id="1928162148" lat="35.6468053" lon="139.7252529"/>
+  <node id="1928481625" lat="35.6396852" lon="139.7305475">
+    <tag k="int_name" v="Sheraton Miyako Hotel Tokyo"/>
+    <tag k="name" v="シェラトン 都ホテル東京"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <node id="1931795600" lat="35.7184520" lon="139.7924830">
     <tag k="created_by" v="iLOE 1.9"/>
     <tag k="name" v="Toyoko Inn"/>
     <tag k="name:ja" v="東横イン"/>
     <tag k="tourism" v="hotel"/>
   </node>
-  <node id="1934478632" lat="35.6910402" lon="139.6867366">
-    <tag k="name" v="東急ステイ"/>
-    <tag k="tourism" v="hotel"/>
-  </node>
   <node id="1956551782" lat="35.7089395" lon="139.7910022">
     <tag k="name" v="Agora Place Asakusa"/>
     <tag k="tourism" v="hotel"/>
@@ -2206,12 +2614,66 @@
     <tag k="addr:full" v="東京都港区南青山６丁目１−１９  107-0062, Japan"/>
     <tag k="name" v="Taro Okamoto Memorial Museum"/>
     <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://www.taro-okamoto.or.jp/"/>
+    <tag k="wikipedia" v="ja:岡本太郎記念館"/>
   </node>
   <node id="1968636429" lat="35.7101985" lon="139.7792091">
     <tag k="name" v=""/>
     <tag k="stars" v=""/>
     <tag k="tourism" v="hotel"/>
   </node>
+  <node id="1975522153" lat="35.6413172" lon="139.7022628">
+    <tag k="name" v="東京都目黒区立 川の資料館"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="1980085108" lat="35.6412986" lon="139.7156149"/>
+  <node id="1980085109" lat="35.6413007" lon="139.7151287"/>
+  <node id="1980085110" lat="35.6414171" lon="139.7151287"/>
+  <node id="1980085111" lat="35.6414184" lon="139.7150995"/>
+  <node id="1980085112" lat="35.6415014" lon="139.7156362"/>
+  <node id="1980085113" lat="35.6415015" lon="139.7156163"/>
+  <node id="1980085114" lat="35.6415316" lon="139.7156614"/>
+  <node id="1980085125" lat="35.6415317" lon="139.7156364"/>
+  <node id="1980085127" lat="35.6415695" lon="139.7156616"/>
+  <node id="1980085129" lat="35.6415738" lon="139.7157092"/>
+  <node id="1980085131" lat="35.6415825" lon="139.7157345"/>
+  <node id="1980085133" lat="35.6416041" lon="139.7157863"/>
+  <node id="1980085135" lat="35.6416440" lon="139.7158142"/>
+  <node id="1980085136" lat="35.6416613" lon="139.7151022"/>
+  <node id="1980085137" lat="35.6416624" lon="139.7151327"/>
+  <node id="1980085138" lat="35.6416872" lon="139.7158301"/>
+  <node id="1980085139" lat="35.6417034" lon="139.7158474"/>
+  <node id="1980085140" lat="35.6417034" lon="139.7158646"/>
+  <node id="1980085141" lat="35.6417293" lon="139.7158646"/>
+  <node id="1980085142" lat="35.6417293" lon="139.7158952"/>
+  <node id="1980085143" lat="35.6417509" lon="139.7158952"/>
+  <node id="1980085144" lat="35.6417509" lon="139.7159815"/>
+  <node id="1980085145" lat="35.6417638" lon="139.7151327"/>
+  <node id="1980085146" lat="35.6417660" lon="139.7151951"/>
+  <node id="1980085147" lat="35.6417822" lon="139.7151951"/>
+  <node id="1980085149" lat="35.6417930" lon="139.7152031"/>
+  <node id="1980085157" lat="35.6417995" lon="139.7152191"/>
+  <node id="1980085161" lat="35.6418210" lon="139.7153592"/>
+  <node id="1980085163" lat="35.6418223" lon="139.7152205"/>
+  <node id="1980085165" lat="35.6419123" lon="139.7153605"/>
+  <node id="1980085167" lat="35.6419549" lon="139.7155392"/>
+  <node id="1980085169" lat="35.6419561" lon="139.7154158"/>
+  <node id="1980085170" lat="35.6420467" lon="139.7155405"/>
+  <node id="1980085172" lat="35.6420650" lon="139.7155684"/>
+  <node id="1980085175" lat="35.6420661" lon="139.7155870"/>
+  <node id="1980085177" lat="35.6420974" lon="139.7158872"/>
+  <node id="1980085178" lat="35.6420974" lon="139.7159815"/>
+  <node id="1980085180" lat="35.6421050" lon="139.7155883"/>
+  <node id="1980085181" lat="35.6421071" lon="139.7156760"/>
+  <node id="1980085182" lat="35.6421244" lon="139.7158779"/>
+  <node id="1980085183" lat="35.6421255" lon="139.7156840"/>
+  <node id="1980085184" lat="35.6421406" lon="139.7156946"/>
+  <node id="1980085185" lat="35.6421428" lon="139.7158620"/>
+  <node id="1980085186" lat="35.6421514" lon="139.7157106"/>
+  <node id="1980085187" lat="35.6421611" lon="139.7158314"/>
+  <node id="1980085188" lat="35.6421622" lon="139.7157291"/>
+  <node id="1980085197" lat="35.6421676" lon="139.7157637"/>
+  <node id="1980085199" lat="35.6421708" lon="139.7157982"/>
   <node id="1986281360" lat="35.6972457" lon="139.7738270">
     <tag k="internet_access" v="yes"/>
     <tag k="name" v="秋葉原ワシントンホテル"/>
@@ -2219,6 +2681,21 @@
     <tag k="tourism" v="hotel"/>
     <tag k="wheelchair" v="yes"/>
   </node>
+  <node id="2004025297" lat="35.7249154" lon="139.8193162">
+    <tag k="addr:full" v="東京都墨田区東向島4-28-16"/>
+    <tag k="addr:postcode" v="131-0032"/>
+    <tag k="fee" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="東武博物館 (Tobu Museum)"/>
+    <tag k="name:en" v="Tobu Museum"/>
+    <tag k="name:ja" v="東武博物館"/>
+    <tag k="opening_hours" v="Tu-Su 10:00-16:30; Mo off"/>
+    <tag k="phone" v="+81-3-36148811"/>
+    <tag k="source" v="Bing 2010; (URL)"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://www.tobu.co.jp/museum/"/>
+    <tag k="wikipedia" v="ja:東武博物館"/>
+  </node>
   <node id="2012214872" lat="35.6940109" lon="139.7830177">
     <tag k="name" v="Comfort Hotel Tokyo Higashi Nihombashi"/>
     <tag k="tourism" v="hotel"/>
@@ -2228,7 +2705,8 @@
   <node id="2017978543" lat="35.6681470" lon="139.7599512"/>
   <node id="2017978545" lat="35.6681558" lon="139.7603240"/>
   <node id="2017978547" lat="35.6681675" lon="139.7599422"/>
-  <node id="2021389287" lat="35.6976785" lon="139.7738098">
+  <node id="2021389287" lat="35.6978576" lon="139.7736719">
+    <tag k="name" v="レム秋葉原 (remm AKIHABARA)"/>
     <tag k="name:en" v="Remm Akihabara"/>
     <tag k="tourism" v="hotel"/>
   </node>
@@ -2238,7 +2716,7 @@
   </node>
   <node id="2047918992" lat="35.6608988" lon="139.7393731">
     <tag k="name" v="外務省外交資料館"/>
-    <tag k="name:en" v="Dipromatic Archives Ministry of Foreign Affairs"/>
+    <tag k="name:en" v="Diplomatic Archives Ministry of Foreign Affairs"/>
     <tag k="opening_hours" v="10:00-17:30"/>
     <tag k="source" v="image,2012-11;Bing"/>
     <tag k="tourism" v="museum"/>
@@ -2262,6 +2740,478 @@
   <node id="2139723246" lat="35.7160957" lon="139.7758672"/>
   <node id="2139723247" lat="35.7163057" lon="139.7777189"/>
   <node id="2139723248" lat="35.7169030" lon="139.7764632"/>
+  <node id="2150891056" lat="35.7209070" lon="139.7647913"/>
+  <node id="2150891057" lat="35.7209617" lon="139.7647520"/>
+  <node id="2150891058" lat="35.7210346" lon="139.7649791"/>
+  <node id="2150891059" lat="35.7210795" lon="139.7649378"/>
+  <node id="2163858918" lat="35.6483799" lon="139.7501671">
+    <tag k="name" v="APA HOTEL"/>
+    <tag k="source" v="image,2013-02;Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2167481504" lat="35.6625920" lon="139.6983370">
+    <tag k="name" v="Hotel UNIZO"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2174196123" lat="35.6857870" lon="139.6925540">
+    <tag k="name" v="京王プレッソイン新宿"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2177881157" lat="35.6468098" lon="139.7250403"/>
+  <node id="2179771374" lat="35.7208799" lon="139.6936411">
+    <tag k="name" v="佐伯祐三アトリエ記念館"/>
+    <tag k="name:ja" v="佐伯祐三アトリエ記念館"/>
+    <tag k="name:ja_kana" v="さえきゆうぞうアトリエきねんかん"/>
+    <tag k="phone" v="+81 03-5988-0091"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://www.regasu-shinjuku.or.jp/?p=1667"/>
+    <tag k="wikipedia" v="ja:佐伯祐三アトリエ記念館"/>
+  </node>
+  <node id="2188157258" lat="35.6438484" lon="139.7510102"/>
+  <node id="2188157295" lat="35.6438498" lon="139.7508667"/>
+  <node id="2188157384" lat="35.6434369" lon="139.7508604"/>
+  <node id="2188157387" lat="35.6434355" lon="139.7510040"/>
+  <node id="2193817915" lat="35.6592250" lon="139.7382604"/>
+  <node id="2193817927" lat="35.6592969" lon="139.7387284"/>
+  <node id="2193817932" lat="35.6593263" lon="139.7386318"/>
+  <node id="2193817937" lat="35.6590637" lon="139.7383127"/>
+  <node id="2193817938" lat="35.6591785" lon="139.7388708"/>
+  <node id="2193817946" lat="35.6593753" lon="139.7388075"/>
+  <node id="2193817947" lat="35.6592794" lon="139.7386466"/>
+  <node id="2193817948" lat="35.6592374" lon="139.7383155"/>
+  <node id="2193817949" lat="35.6593503" lon="139.7387110"/>
+  <node id="2193817951" lat="35.6592609" lon="139.7383113"/>
+  <node id="2195628339" lat="35.7371732" lon="139.7954933"/>
+  <node id="2195628340" lat="35.7371794" lon="139.7954560"/>
+  <node id="2195628341" lat="35.7371926" lon="139.7954170"/>
+  <node id="2195628342" lat="35.7372014" lon="139.7954947"/>
+  <node id="2195628343" lat="35.7372014" lon="139.7955329"/>
+  <node id="2195628344" lat="35.7372047" lon="139.7953862"/>
+  <node id="2195628345" lat="35.7372203" lon="139.7953596"/>
+  <node id="2195628346" lat="35.7372404" lon="139.7953328"/>
+  <node id="2195628347" lat="35.7372495" lon="139.7953201"/>
+  <node id="2195628348" lat="35.7372702" lon="139.7953027"/>
+  <node id="2195628349" lat="35.7372714" lon="139.7955510"/>
+  <node id="2195628350" lat="35.7372722" lon="139.7955343"/>
+  <node id="2195628351" lat="35.7372881" lon="139.7952906"/>
+  <node id="2195628352" lat="35.7373129" lon="139.7955525"/>
+  <node id="2195628353" lat="35.7373130" lon="139.7955873"/>
+  <node id="2195628354" lat="35.7373167" lon="139.7952744"/>
+  <node id="2195628355" lat="35.7373541" lon="139.7952638"/>
+  <node id="2195628356" lat="35.7374007" lon="139.7952609"/>
+  <node id="2195628361" lat="35.7375497" lon="139.7955954"/>
+  <node id="2195628362" lat="35.7375505" lon="139.7955606"/>
+  <node id="2195628364" lat="35.7375999" lon="139.7955406"/>
+  <node id="2195628365" lat="35.7376000" lon="139.7955623"/>
+  <node id="2195628369" lat="35.7376808" lon="139.7955421"/>
+  <node id="2195628371" lat="35.7377375" lon="139.7952710"/>
+  <node id="2204492085" lat="35.6891455" lon="139.7857167"/>
+  <node id="2204492086" lat="35.6891897" lon="139.7858263"/>
+  <node id="2204492087" lat="35.6893032" lon="139.7856204"/>
+  <node id="2204492088" lat="35.6893474" lon="139.7857300"/>
+  <node id="2212615112" lat="35.6584870" lon="139.7131560">
+    <tag k="name" v="島根イン 青山"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2237321678" lat="35.7362264" lon="139.7471812">
+    <tag k="name" v="HOTEL METS"/>
+    <tag k="source" v="suevey"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2258202676" lat="35.6852915" lon="139.7796750">
+    <tag k="name" v="西鉄イン日本橋 (Nishitetsu Inn Nihombashi)"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2258202679" lat="35.6862937" lon="139.7773576">
+    <tag k="name" v="Hotel Villa Fontaine"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2271379722" lat="35.6979699" lon="139.7708130">
+    <tag k="name:en" v="Capsule Hotel Anshin Oyado"/>
+    <tag k="name:ja" v="豪華 カプセルホテル安心お宿"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2280500583" lat="35.6906507" lon="139.7063971">
+    <tag k="name" v="AIM"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2283943982" lat="35.6911909" lon="139.7878718">
+    <tag k="name" v="Button Museum"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="2283943990" lat="35.6939444" lon="139.7853398">
+    <tag k="name" v="R&amp;B"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2287895117" lat="35.6593247" lon="139.7285043">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895120" lat="35.6593486" lon="139.7284050">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895151" lat="35.6594988" lon="139.7283026">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895158" lat="35.6595240" lon="139.7280451">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895165" lat="35.6595706" lon="139.7286663">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895175" lat="35.6596296" lon="139.7286985">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895179" lat="35.6596477" lon="139.7284769">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895198" lat="35.6597105" lon="139.7285045">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895252" lat="35.6598236" lon="139.7285944">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895272" lat="35.6598786" lon="139.7285650">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895294" lat="35.6599412" lon="139.7285313">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895305" lat="35.6599982" lon="139.7285008">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895321" lat="35.6600758" lon="139.7284592">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895391" lat="35.6601649" lon="139.7281098">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895398" lat="35.6601734" lon="139.7284068">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895408" lat="35.6601847" lon="139.7281550">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895418" lat="35.6601903" lon="139.7281677">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895424" lat="35.6601959" lon="139.7281804">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895430" lat="35.6602016" lon="139.7281933">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895434" lat="35.6602068" lon="139.7282053">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895459" lat="35.6602121" lon="139.7282172">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895474" lat="35.6602170" lon="139.7282285">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895510" lat="35.6602219" lon="139.7282396">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2287895656" lat="35.6602720" lon="139.7283538">
+    <tag k="level" v="1"/>
+    <tag k="source" v="港区法務局"/>
+  </node>
+  <node id="2298236532" lat="35.6326539" lon="139.7929743">
+    <tag k="name" v="ワシントンホテル"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2327919965" lat="35.7087314" lon="139.7761683">
+    <tag k="name" v="Hotel Sardonyx Ueno"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2331421946" lat="35.6636782" lon="139.7336473">
+    <tag k="addr:city" v="港区"/>
+    <tag k="addr:postcode" v="106-0032"/>
+    <tag k="addr:street" v="六本木3-9-8"/>
+    <tag k="name" v="the b roppongi"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.theb-hotels.com/the-b-roppongi/jp/"/>
+    <tag k="website:en" v="http://www.theb-hotels.com/the-b-roppongi/en/"/>
+    <tag k="website:jp" v="http://www.theb-hotels.com/the-b-roppongi/jp/"/>
+  </node>
+  <node id="2367952179" lat="35.6909718" lon="139.7806381"/>
+  <node id="2367952188" lat="35.6910273" lon="139.7807260"/>
+  <node id="2367952202" lat="35.6911910" lon="139.7809482"/>
+  <node id="2367952206" lat="35.6912232" lon="139.7803977"/>
+  <node id="2367952212" lat="35.6912786" lon="139.7804856"/>
+  <node id="2367952214" lat="35.6912885" lon="139.7811028"/>
+  <node id="2367952219" lat="35.6914162" lon="139.7807327"/>
+  <node id="2367952221" lat="35.6915138" lon="139.7808873"/>
+  <node id="2373479944" lat="35.7143255" lon="139.7028828"/>
+  <node id="2373479946" lat="35.7141905" lon="139.7029164"/>
+  <node id="2373479948" lat="35.7142259" lon="139.7031142"/>
+  <node id="2373479950" lat="35.7142994" lon="139.7030932"/>
+  <node id="2373479951" lat="35.7142860" lon="139.7030114"/>
+  <node id="2373479953" lat="35.7143241" lon="139.7030026"/>
+  <node id="2373479955" lat="35.7143268" lon="139.7029976"/>
+  <node id="2373479956" lat="35.7143232" lon="139.7029783"/>
+  <node id="2373479958" lat="35.7143420" lon="139.7029728"/>
+  <node id="2375772187" lat="35.6868499" lon="139.7111310"/>
+  <node id="2375772188" lat="35.6868502" lon="139.7109976"/>
+  <node id="2375772191" lat="35.6868659" lon="139.7109207"/>
+  <node id="2375772193" lat="35.6868777" lon="139.7110098"/>
+  <node id="2375772196" lat="35.6868933" lon="139.7109282"/>
+  <node id="2375772199" lat="35.6869153" lon="139.7108151"/>
+  <node id="2375772200" lat="35.6869545" lon="139.7111962"/>
+  <node id="2375772201" lat="35.6869567" lon="139.7111656"/>
+  <node id="2375772202" lat="35.6869631" lon="139.7108312"/>
+  <node id="2375772203" lat="35.6869669" lon="139.7108151"/>
+  <node id="2375772204" lat="35.6870058" lon="139.7109541"/>
+  <node id="2375772205" lat="35.6870099" lon="139.7109340"/>
+  <node id="2375772206" lat="35.6870106" lon="139.7112126"/>
+  <node id="2375772207" lat="35.6870211" lon="139.7109941"/>
+  <node id="2375772208" lat="35.6870220" lon="139.7110125"/>
+  <node id="2375772209" lat="35.6870255" lon="139.7109972"/>
+  <node id="2375772210" lat="35.6870265" lon="139.7109607"/>
+  <node id="2375772211" lat="35.6870316" lon="139.7108536"/>
+  <node id="2375772212" lat="35.6870329" lon="139.7108352"/>
+  <node id="2375772213" lat="35.6870510" lon="139.7110247"/>
+  <node id="2375772214" lat="35.6870600" lon="139.7109501"/>
+  <node id="2375772215" lat="35.6870768" lon="139.7108677"/>
+  <node id="2388140056" lat="35.6992153" lon="139.7581642"/>
+  <node id="2388140064" lat="35.6992239" lon="139.7582351"/>
+  <node id="2388140065" lat="35.6992026" lon="139.7582016"/>
+  <node id="2388140068" lat="35.6992451" lon="139.7582116"/>
+  <node id="2388140088" lat="35.6992057" lon="139.7581746"/>
+  <node id="2389061843" lat="35.6927620" lon="139.6961610">
+    <tag k="name" v="損保ジャパン東郷青児美術館"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-P02-v2_0.html"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="2390973891" lat="35.6941394" lon="139.6942864">
+    <tag k="name" v="西鉄イン新宿"/>
+    <tag k="source" v="image,2013-07;Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2394614691" lat="35.7140286" lon="139.7029727"/>
+  <node id="2394614692" lat="35.7140330" lon="139.7029580"/>
+  <node id="2400543033" lat="35.6905910" lon="139.7684515"/>
+  <node id="2400543039" lat="35.6906010" lon="139.7683408"/>
+  <node id="2400543150" lat="35.6907869" lon="139.7685695"/>
+  <node id="2400543158" lat="35.6907950" lon="139.7684794"/>
+  <node id="2400543188" lat="35.6908449" lon="139.7685774"/>
+  <node id="2400543203" lat="35.6908630" lon="139.7683766"/>
+  <node id="2428670913" lat="35.7166250" lon="139.7956229">
+    <tag k="name" v="Wasou"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2457988864" lat="35.7249704" lon="139.7606275">
+    <tag k="name" v="森鴎外記念館"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="2512414734" lat="35.6531123" lon="139.7136910">
+    <tag k="name" v="山種美術館"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="2528816507" lat="35.7088736" lon="139.8021508">
+    <tag k="name" v="小さなガラスの本の博物館"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="2571001911" lat="35.7284156" lon="139.7712927">
+    <tag k="name" v="hotel sunny"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2604082855" lat="35.7212932" lon="139.7801311"/>
+  <node id="2604082857" lat="35.7213040" lon="139.7799599"/>
+  <node id="2604082861" lat="35.7213641" lon="139.7800670"/>
+  <node id="2604082862" lat="35.7213659" lon="139.7799068"/>
+  <node id="2604082864" lat="35.7213910" lon="139.7802692"/>
+  <node id="2604082865" lat="35.7214439" lon="139.7802184"/>
+  <node id="2604082866" lat="35.7214529" lon="139.7802106"/>
+  <node id="2604082867" lat="35.7215031" lon="139.7801720"/>
+  <node id="2617001145" lat="35.6944088" lon="139.7043162">
+    <tag k="internet_access" v="yes"/>
+    <tag k="internet_access:fee" v="no"/>
+    <tag k="name" v="ベストウェスタン新宿 アスティナホテル東京"/>
+    <tag k="smoking" v="separated"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.bw-shinjuku.com/"/>
+  </node>
+  <node id="2626692397" lat="35.7111037" lon="139.7731249">
+    <tag k="name" v="Kinuya Hotel"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="wifi" v="yes"/>
+  </node>
+  <node id="2672664859" lat="35.6980461" lon="139.7609210"/>
+  <node id="2672664862" lat="35.6981703" lon="139.7612952"/>
+  <node id="2672664863" lat="35.6981943" lon="139.7612976"/>
+  <node id="2672664865" lat="35.6981964" lon="139.7612107"/>
+  <node id="2672664866" lat="35.6980592" lon="139.7611488"/>
+  <node id="2672664867" lat="35.6982411" lon="139.7611702"/>
+  <node id="2672664868" lat="35.6980439" lon="139.7610122"/>
+  <node id="2672664871" lat="35.6982509" lon="139.7611209"/>
+  <node id="2672664874" lat="35.6982400" lon="139.7611209"/>
+  <node id="2672664876" lat="35.6979524" lon="139.7613488"/>
+  <node id="2672664878" lat="35.6980603" lon="139.7610122"/>
+  <node id="2672664879" lat="35.6982509" lon="139.7610404"/>
+  <node id="2672664881" lat="35.6982280" lon="139.7612104"/>
+  <node id="2672664883" lat="35.6982313" lon="139.7611705"/>
+  <node id="2672664885" lat="35.6982618" lon="139.7609438"/>
+  <node id="2672664886" lat="35.6981714" lon="139.7613529"/>
+  <node id="2672664887" lat="35.6982607" lon="139.7610415"/>
+  <node id="2672664888" lat="35.6979553" lon="139.7611565"/>
+  <node id="2700747338" lat="35.6643617" lon="139.7605693">
+    <tag k="addr:city" v="港区"/>
+    <tag k="addr:housenumber" v="1-6-3"/>
+    <tag k="addr:postcode" v="105-8333"/>
+    <tag k="addr:street" v="東新橋"/>
+    <tag k="name" v="ロイヤルパークホテル ザ 汐留"/>
+    <tag k="phone" v="03-6253-1111"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.rph-the.co.jp/shiodome/index.php"/>
+    <tag k="wheelchair" v="yes"/>
+  </node>
+  <node id="2702638390" lat="35.6693406" lon="139.8019679">
+    <tag k="name" v="デイナイスホテル東京"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2703934983" lat="35.6997148" lon="139.6999973"/>
+  <node id="2703934986" lat="35.6997238" lon="139.6999991"/>
+  <node id="2704014391" lat="35.6994035" lon="139.7020900">
+    <tag k="name" v="GREEN HOTEL"/>
+    <tag k="source" v="image,2014-03;Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2714679867" lat="35.7334449" lon="139.7075650">
+    <tag k="name" v="貴美旅館 (Kimi Ryokan)"/>
+    <tag k="name:en" v="Kimi Ryokan"/>
+    <tag k="name:fr" v="Kimi Ryokan"/>
+    <tag k="name:ja" v="貴美旅館"/>
+    <tag k="name:ja_kana" v="きみりょかん"/>
+    <tag k="name:ja_rm" v="kimi ryokan"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.kimi-ryokan.jp/"/>
+  </node>
+  <node id="2749724506" lat="35.6652428" lon="139.7163372">
+    <tag k="name" v="ホテルフロラシオン青山"/>
+    <tag k="source" v="survey"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.floracion-aoyama.com/"/>
+  </node>
+  <node id="2789436036" lat="35.6831750" lon="139.7825686">
+    <tag k="addr:city" v="Tokyo"/>
+    <tag k="addr:housenumber" v="1-15-4"/>
+    <tag k="addr:street" v="Nihonbashi-kakigara-cho"/>
+    <tag k="name" v="Sotetsu Fresa Inn Nihombashi-Ningyocho"/>
+    <tag k="phone" v="03-5695-0203"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://fresa-inn.jp/eng/ningyocho/"/>
+  </node>
+  <node id="2789764098" lat="35.7079549" lon="139.7597906">
+    <tag k="name" v="ホテル機山館"/>
+    <tag k="name:en" v="Hotel Kizankan"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://kizankan.co.jp/"/>
+  </node>
+  <node id="2794707535" lat="35.6427286" lon="139.7478507">
+    <tag k="addr:city" v="Tokyo"/>
+    <tag k="addr:housenumber" v="3-14-21"/>
+    <tag k="addr:postcode" v="108-0023"/>
+    <tag k="addr:street" v="Shibaura"/>
+    <tag k="name" v="Sotetsu Fresa Inn Tokyo-Tamachi"/>
+    <tag k="name:ja" v="相鉄フレッサイン 東京田町"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2838965135" lat="35.7326144" lon="139.7272707">
+    <tag k="addr:postcode" v="170-0004"/>
+    <tag k="fax" v="+81-(0)3-5394-1044"/>
+    <tag k="internet_access" v="yes"/>
+    <tag k="internet_access:fee" v="no"/>
+    <tag k="name" v="東横INN山手線大塚駅北口2"/>
+    <tag k="name:en" v="Toyoko Inn Tokyo Yamanote-sen Otsuka-eki Kita-guchi No.2"/>
+    <tag k="name:ja" v="東横INN山手線大塚駅北口2"/>
+    <tag k="operator" v="Toyoko Inn"/>
+    <tag k="phone" v="+81-(0)3-5394-1045"/>
+    <tag k="ref" v="139"/>
+    <tag k="smoking" v="separated"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="www.toyoko-inn.com"/>
+  </node>
+  <node id="2883449853" lat="35.6728412" lon="139.7689387">
+    <tag k="name" v="ホテルモントレ銀座"/>
+    <tag k="name:en" v="Hotel Monterrey GINZA"/>
+    <tag k="source" v="image,2014-05;Bing;GSI/KIBAN 2500,NARO"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2885338395" lat="35.7125875" lon="139.7048803">
+    <tag k="addr" v="東京都新宿区高田馬場1-27-7"/>
+    <tag k="addr:city" v="Tokyo"/>
+    <tag k="addr:street" v="東京都新宿区高田馬場1-27-7"/>
+    <tag k="name" v="ホテルサンルート高田馬場"/>
+    <tag k="name:en" v="Sunroute Takadanobaba"/>
+    <tag k="name:ja" v="ホテルサンルート高田馬場"/>
+    <tag k="phone" v="+81 (0)3-3232-0101"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.sunroutehotel.jp/takadanobaba/"/>
+  </node>
+  <node id="2930640182" lat="35.6706980" lon="139.7133710">
+    <tag k="name" v="ワタリウム美術館"/>
+    <tag k="name:en" v="WATARI-UM, watrium, the museum of contemporary art"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="2930640183" lat="35.6706980" lon="139.7133710">
+    <tag k="addr:city" v="渋谷区 (Shibuya)"/>
+    <tag k="addr:housenumber" v="3-7-6"/>
+    <tag k="addr:postcode" v="150-0001"/>
+    <tag k="addr:street" v="外苑西通り (Gaien nishi dori)"/>
+    <tag k="name" v="watari-um, watrium, the museum of watari contemporary art"/>
+    <tag k="tourism" v="museum"/>
+  </node>
+  <node id="2952666854" lat="35.7087707" lon="139.7727773">
+    <tag k="name" v="サウナ＆カプセルホテル ダンディ"/>
+    <tag k="note" v="通称ペーサウナ"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2974353325" lat="35.6687953" lon="139.7167864">
+    <tag k="name" v="Tokyu Stay"/>
+    <tag k="source" v="survey"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.tokyustay.co.jp/hotel/AO/"/>
+  </node>
+  <node id="2976603433" lat="35.6876100" lon="139.6983880">
+    <tag k="name" v="ブラッサム新宿"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
+  <node id="2999882990" lat="35.6633995" lon="139.7176082">
+    <tag k="name" v="秋山庄太郎写真美術館"/>
+    <tag k="source" v="survey"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="website" v="http://akiyama-shotaro.com/"/>
+  </node>
+  <node id="3040270683" lat="35.6866738" lon="139.7419860">
+    <tag k="name" v="ホテルモントレ半蔵門"/>
+    <tag k="name:en" v="Hotel Monterey Hanzomon"/>
+    <tag k="tourism" v="hotel"/>
+  </node>
   <way id="23974980">
     <nd ref="259964039"/>
     <nd ref="259964048"/>
@@ -2276,56 +3226,6 @@
     <tag k="note" v="estimated"/>
     <tag k="tourism" v="hotel"/>
   </way>
-  <way id="28137295">
-    <nd ref="309040735"/>
-    <nd ref="309040736"/>
-    <nd ref="309040739"/>
-    <nd ref="309040740"/>
-    <nd ref="309040735"/>
-    <tag k="area" v="yes"/>
-    <tag k="name" v="古賀政男音楽博物館"/>
-    <tag k="source" v="Bing,2007-04"/>
-    <tag k="tourism" v="museum"/>
-  </way>
-  <way id="28144706">
-    <nd ref="309129365"/>
-    <nd ref="309129366"/>
-    <nd ref="309129367"/>
-    <nd ref="309129368"/>
-    <nd ref="309129369"/>
-    <nd ref="309129370"/>
-    <nd ref="309129371"/>
-    <nd ref="309129372"/>
-    <nd ref="309129365"/>
-    <tag k="building" v="yes"/>
-    <tag k="created_by" v="Potlatch 0.10f"/>
-    <tag k="name" v="旧前田侯爵邸洋館"/>
-    <tag k="tourism" v="museum"/>
-  </way>
-  <way id="28144849">
-    <nd ref="309130630"/>
-    <nd ref="309130632"/>
-    <nd ref="309130633"/>
-    <nd ref="309130634"/>
-    <nd ref="309130630"/>
-    <tag k="building" v="yes"/>
-    <tag k="created_by" v="Potlatch 0.10f"/>
-    <tag k="name" v="日本近代文学館"/>
-    <tag k="tourism" v="museum"/>
-  </way>
-  <way id="28145214">
-    <nd ref="309133105"/>
-    <nd ref="309133108"/>
-    <nd ref="1676618278"/>
-    <nd ref="1676618277"/>
-    <nd ref="1676618279"/>
-    <nd ref="309133109"/>
-    <nd ref="309133111"/>
-    <nd ref="309133105"/>
-    <tag k="building" v="yes"/>
-    <tag k="name" v="旧前田侯爵邸和館"/>
-    <tag k="tourism" v="museum"/>
-  </way>
   <way id="30519438">
     <nd ref="336994074"/>
     <nd ref="336994076"/>
@@ -2385,6 +3285,22 @@
     <tag k="name:ja_rm" v="Tōkyōto Bijutsukan"/>
     <tag k="tourism" v="museum"/>
   </way>
+  <way id="34067475">
+    <nd ref="390376337"/>
+    <nd ref="390376339"/>
+    <nd ref="390376342"/>
+    <nd ref="390376344"/>
+    <nd ref="390376347"/>
+    <nd ref="390376348"/>
+    <nd ref="390376349"/>
+    <nd ref="390376350"/>
+    <nd ref="390376351"/>
+    <nd ref="390376352"/>
+    <nd ref="390376337"/>
+    <tag k="name" v="東京都庭園美術館"/>
+    <tag k="note" v="estimated"/>
+    <tag k="tourism" v="museum"/>
+  </way>
   <way id="43988826">
     <nd ref="559359753"/>
     <nd ref="559359754"/>
@@ -2406,6 +3322,7 @@
     <nd ref="567845216"/>
     <nd ref="567845217"/>
     <nd ref="567845214"/>
+    <tag k="building" v="yes"/>
     <tag k="name" v="浅草ビュー ホテル (Asakusa View Hotel)"/>
     <tag k="name:ja" v="浅草ビューホテル"/>
     <tag k="tourism" v="hotel"/>
@@ -2450,6 +3367,17 @@
     <tag k="name:en" v="Cerulean Tower Tokyo Hotel"/>
     <tag k="tourism" v="hotel"/>
   </way>
+  <way id="60442261">
+    <nd ref="752870704"/>
+    <nd ref="752870746"/>
+    <nd ref="752870726"/>
+    <nd ref="752870692"/>
+    <nd ref="752870704"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="Hotel Excellent"/>
+    <tag k="source" v="Bing,2007-04"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
   <way id="68523635">
     <nd ref="824067470"/>
     <nd ref="824067471"/>
@@ -2484,33 +3412,20 @@
     <nd ref="1918062025"/>
     <nd ref="898968886"/>
     <nd ref="898968882"/>
+    <tag k="addr:city" v="Sumida"/>
+    <tag k="addr:housenumber" v="1-4-1"/>
+    <tag k="addr:postcode" v="130-0015"/>
+    <tag k="addr:street" v="Yokoami"/>
     <tag k="building" v="yes"/>
     <tag k="layer" v="3"/>
     <tag k="name" v="江戸東京博物館 (Edo Tokyo Museum)"/>
     <tag k="name:en" v="Edo Tokyo Museum"/>
     <tag k="name:ja" v="江戸東京博物館"/>
     <tag k="name:ja_rm" v="Edo Tokyo Hakubutsukan"/>
-    <tag k="phone" v="+81 03-3626-9974"/>
+    <tag k="phone" v="+81 3-3626-9974"/>
     <tag k="tourism" v="museum"/>
     <tag k="website" v="http://www.edo-tokyo-museum.or.jp/"/>
   </way>
-  <way id="87250237">
-    <nd ref="1014529179"/>
-    <nd ref="1014529570"/>
-    <nd ref="1014529009"/>
-    <nd ref="1014529701"/>
-    <nd ref="1014529123"/>
-    <nd ref="1014529860"/>
-    <nd ref="1014529289"/>
-    <nd ref="1014529979"/>
-    <nd ref="1014529179"/>
-    <tag k="disused" v="yes"/>
-    <tag k="name" v="電力館"/>
-    <tag k="source" v="bing"/>
-    <tag k="tourism" v="museum"/>
-    <tag k="wheelchair" v="yes"/>
-    <tag k="wikipedia" v="http://ja.wikipedia.org/wiki/%E9%9B%BB%E5%8A%9B%E9%A4%A8"/>
-  </way>
   <way id="87439168">
     <nd ref="1016728556"/>
     <nd ref="1016729374"/>
@@ -2522,6 +3437,7 @@
     <tag k="building" v="yes"/>
     <tag k="name" v="The Prince Park Tower Tokyo"/>
     <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.princehotels.com/en/parktower/"/>
   </way>
   <way id="89041321">
     <nd ref="1033221795"/>
@@ -2544,6 +3460,64 @@
     <tag k="name:ja_rm" v="tōyōkan"/>
     <tag k="tourism" v="museum"/>
   </way>
+  <way id="91264848">
+    <nd ref="1059532270"/>
+    <nd ref="1059532102"/>
+    <nd ref="1059532213"/>
+    <nd ref="1059532176"/>
+    <nd ref="1059532270"/>
+    <tag k="addr:block_number" v="7"/>
+    <tag k="addr:city" v="千代田区"/>
+    <tag k="addr:country" v="JP"/>
+    <tag k="addr:full" v="東京都千代田区丸の内1-7-12"/>
+    <tag k="addr:housenumber" v="12"/>
+    <tag k="addr:neighbourhood" v="1丁目"/>
+    <tag k="addr:postcode" v="100-0005"/>
+    <tag k="addr:province" v="東京都"/>
+    <tag k="addr:quarter" v="丸の内"/>
+    <tag k="building" v="yes"/>
+    <tag k="height" v="169"/>
+    <tag k="name" v="ホテルメトロポリタン丸の内"/>
+    <tag k="name:en" v="Hotel Metropolitan Marunouchi"/>
+    <tag k="name:ja" v="ホテルメトロポリタン丸の内"/>
+    <tag k="name:ru" v="Отель Метрополитан Маруноути"/>
+    <tag k="phone" v="+81332112233"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.hotelmetropolitanmarunouchi.jp"/>
+  </way>
+  <way id="93212943">
+    <nd ref="1080556891"/>
+    <nd ref="1080556961"/>
+    <nd ref="1080557022"/>
+    <nd ref="1752138936"/>
+    <nd ref="1752138925"/>
+    <nd ref="1752138934"/>
+    <nd ref="1752138938"/>
+    <nd ref="1752138924"/>
+    <nd ref="1752138944"/>
+    <nd ref="1752138947"/>
+    <nd ref="1752138943"/>
+    <nd ref="1752138945"/>
+    <nd ref="1752138921"/>
+    <nd ref="1752138927"/>
+    <nd ref="1928481625"/>
+    <nd ref="1080556955"/>
+    <nd ref="1080556951"/>
+    <nd ref="1080556985"/>
+    <nd ref="1080557001"/>
+    <nd ref="1752138922"/>
+    <nd ref="1752138940"/>
+    <nd ref="1752138919"/>
+    <nd ref="1752138937"/>
+    <nd ref="1080557020"/>
+    <nd ref="1752138942"/>
+    <nd ref="1752138946"/>
+    <nd ref="1080556891"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="Sheraton Hotel Tokyo"/>
+    <tag k="source" v="Bing, 2007-04"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
   <way id="94123727">
     <nd ref="1094104625"/>
     <nd ref="1094104961"/>
@@ -2585,6 +3559,29 @@
     <tag k="source" v="survey; Bing, 2007-04"/>
     <tag k="tourism" v="hotel"/>
   </way>
+  <way id="95274368">
+    <nd ref="1105125729"/>
+    <nd ref="1105125353"/>
+    <nd ref="1105125595"/>
+    <nd ref="1623624129"/>
+    <nd ref="1105125729"/>
+    <tag k="addr:block_number" v="11"/>
+    <tag k="addr:city" v="千代田区"/>
+    <tag k="addr:full" v="東京都千代田区丸の内1-11-1"/>
+    <tag k="addr:housenumber" v="1"/>
+    <tag k="addr:neighbourhood" v="1丁目"/>
+    <tag k="addr:province" v="東京都"/>
+    <tag k="addr:quarter" v="丸の内"/>
+    <tag k="building" v="yes"/>
+    <tag k="building:material" v="glass"/>
+    <tag k="height" v="153"/>
+    <tag k="name" v="パシフィックセンチュリープレイス丸の内"/>
+    <tag k="name:en" v="Pacific Century Place Marunouchi"/>
+    <tag k="name:ja" v="パシフィックセンチュリープレイス丸の内"/>
+    <tag k="name:ru" v="Пасифик Сенчери Плейс Маруноути"/>
+    <tag k="source" v="Bing,2007"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
   <way id="96368966">
     <nd ref="1116809007"/>
     <nd ref="1116808725"/>
@@ -2635,6 +3632,20 @@
     <tag k="source" v="Bing, 2007-04"/>
     <tag k="tourism" v="museum"/>
   </way>
+  <way id="103272499">
+    <nd ref="1192559456"/>
+    <nd ref="1344331850"/>
+    <nd ref="1344331849"/>
+    <nd ref="1344331851"/>
+    <nd ref="1344331854"/>
+    <nd ref="1192559457"/>
+    <nd ref="1192559458"/>
+    <nd ref="1192559460"/>
+    <nd ref="1192559456"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="JAL City Hotel"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
   <way id="103425086">
     <nd ref="1194227215"/>
     <nd ref="1599621808"/>
@@ -2658,6 +3669,51 @@
     <tag k="source" v="Bing,2007-04"/>
     <tag k="tourism" v="museum"/>
   </way>
+  <way id="107771604">
+    <nd ref="1237995866"/>
+    <nd ref="1237995847"/>
+    <nd ref="1237995842"/>
+    <nd ref="1237995891"/>
+    <nd ref="1237995884"/>
+    <nd ref="1237995866"/>
+    <tag k="name" v="東京ガス「がすてなーに ガスの科学館」"/>
+    <tag k="opening_hours" v="火-日9:30～17:00"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="wikipedia" v="http://ja.wikipedia.org/wiki/%E3%82%AC%E3%82%B9%E3%81%AE%E7%A7%91%E5%AD%A6%E9%A4%A8"/>
+  </way>
+  <way id="109502705">
+    <nd ref="1618484814"/>
+    <nd ref="1253627750"/>
+    <nd ref="1253627759"/>
+    <nd ref="1253627755"/>
+    <nd ref="1253627758"/>
+    <nd ref="1253627756"/>
+    <nd ref="1253627753"/>
+    <nd ref="1253627757"/>
+    <nd ref="1618484845"/>
+    <nd ref="1618484779"/>
+    <nd ref="1618484777"/>
+    <nd ref="1618484762"/>
+    <nd ref="1618484808"/>
+    <nd ref="1618484814"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="ホテルオークラ"/>
+    <tag k="source" v="Bing,2007"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="109503139">
+    <nd ref="1253630889"/>
+    <nd ref="1253630887"/>
+    <nd ref="1253630888"/>
+    <nd ref="1253630884"/>
+    <nd ref="1253630886"/>
+    <nd ref="1253630889"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="21_21"/>
+    <tag k="source" v="image,2012-10-12;Bing"/>
+    <tag k="tourism" v="museum"/>
+  </way>
   <way id="116596172">
     <nd ref="1314077045"/>
     <nd ref="1314077046"/>
@@ -2684,7 +3740,7 @@
     <nd ref="1314077040"/>
     <nd ref="1314077042"/>
     <nd ref="1314077053"/>
-    <tag k="building" v="yes"/>
+    <tag k="building" v="hotel"/>
     <tag k="name" v="京王プラザホテル (Keio Plaza Hotel)"/>
     <tag k="name:en" v="Keio Plaza Hotel"/>
     <tag k="source" v="Bing,2007-04"/>
@@ -2701,8 +3757,10 @@
     <nd ref="1327332417"/>
     <tag k="building" v="yes"/>
     <tag k="name" v="警察博物館"/>
+    <tag k="name:ja" v="警察博物館"/>
+    <tag k="name:ja_kana" v="けいさつはくぶつかん"/>
     <tag k="tourism" v="museum"/>
-    <tag k="wikipedia" v="http://ja.wikipedia.org/wiki/%E8%AD%A6%E5%AF%9F%E5%8D%9A%E7%89%A9%E9%A4%A8"/>
+    <tag k="wikipedia" v="ja:警察博物館"/>
   </way>
   <way id="117980980">
     <nd ref="1327962126"/>
@@ -2751,39 +3809,6 @@
     <tag k="source" v="Bing, 2007-03"/>
     <tag k="tourism" v="hotel"/>
   </way>
-  <way id="133339481">
-    <nd ref="1467794589"/>
-    <nd ref="1467794588"/>
-    <nd ref="1467794592"/>
-    <nd ref="1467794593"/>
-    <nd ref="1467794590"/>
-    <nd ref="1467794591"/>
-    <nd ref="1467794587"/>
-    <nd ref="1467794586"/>
-    <nd ref="1467794589"/>
-    <tag k="building" v="yes"/>
-    <tag k="name" v="日本民芸館"/>
-    <tag k="source" v="Bing"/>
-    <tag k="tourism" v="museum"/>
-  </way>
-  <way id="133340564">
-    <nd ref="1467808173"/>
-    <nd ref="1467808169"/>
-    <nd ref="1467808201"/>
-    <nd ref="1467808203"/>
-    <nd ref="1467808205"/>
-    <nd ref="1467808150"/>
-    <nd ref="1467808142"/>
-    <nd ref="1467808141"/>
-    <nd ref="1467808147"/>
-    <nd ref="1467808148"/>
-    <nd ref="1467808173"/>
-    <tag k="building" v="yes"/>
-    <tag k="name" v="日本民芸館"/>
-    <tag k="name:en" v="Japan Folk Crafts Museum"/>
-    <tag k="source" v="Bing"/>
-    <tag k="tourism" v="museum"/>
-  </way>
   <way id="135733581">
     <nd ref="1490205492"/>
     <nd ref="1490205493"/>
@@ -2878,7 +3903,11 @@
     <nd ref="1492967190"/>
     <nd ref="1492967170"/>
     <tag k="building" v="yes"/>
-    <tag k="name" v="国立新美術館 (The National Art Center, Tokyo)"/>
+    <tag k="building:levels" v="7"/>
+    <tag k="name" v="国立新美術館"/>
+    <tag k="name:en" v="The National Art Center, Tokyo"/>
+    <tag k="name:ja" v="国立新美術館"/>
+    <tag k="name:ja_kana" v="しんこくりつびじゅつかん"/>
     <tag k="source" v="Bing"/>
     <tag k="tourism" v="museum"/>
     <tag k="website" v="http://www.nact.jp/"/>
@@ -2959,7 +3988,7 @@
     <nd ref="1496232779"/>
     <tag k="building" v="yes"/>
     <tag k="name" v="東急ステイ"/>
-    <tag k="name:en" v="Tokyo Stay Shibuya"/>
+    <tag k="name:en" v="Tokyu Stay Shibuya"/>
     <tag k="source" v="Bing,2007-04"/>
     <tag k="tourism" v="hotel"/>
   </way>
@@ -2981,9 +4010,23 @@
     <nd ref="1498427666"/>
     <nd ref="1498427672"/>
     <tag k="building" v="yes"/>
+    <tag k="name" v="ストークビル道玄坂"/>
     <tag k="source" v="Bing,2007-04"/>
     <tag k="tourism" v="museum"/>
   </way>
+  <way id="137539232">
+    <nd ref="1508619595"/>
+    <nd ref="1508619593"/>
+    <nd ref="1508619598"/>
+    <nd ref="1508619601"/>
+    <nd ref="1508619596"/>
+    <nd ref="1508619597"/>
+    <nd ref="1508619595"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="春日旅館"/>
+    <tag k="source" v="Bing, 2007-03"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
   <way id="137625439">
     <nd ref="1509430782"/>
     <nd ref="1509430783"/>
@@ -2995,6 +4038,17 @@
     <tag k="opening_hours" v="10:00-17:00; Dec 24-Jan 4 off"/>
     <tag k="tourism" v="museum"/>
   </way>
+  <way id="140795399">
+    <nd ref="1541779183"/>
+    <nd ref="1541779242"/>
+    <nd ref="1541779319"/>
+    <nd ref="1541779256"/>
+    <nd ref="1541779183"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="凰鳴館"/>
+    <tag k="source" v="Bing,2007-04"/>
+    <tag k="tourism" v="museum"/>
+  </way>
   <way id="142156957">
     <nd ref="1555877252"/>
     <nd ref="1555877197"/>
@@ -3009,6 +4063,73 @@
     <tag k="source" v="Bing"/>
     <tag k="tourism" v="hotel"/>
   </way>
+  <way id="144480545">
+    <nd ref="1580358422"/>
+    <nd ref="1580357975"/>
+    <nd ref="1580357965"/>
+    <nd ref="1580357908"/>
+    <nd ref="1580357757"/>
+    <nd ref="1580358210"/>
+    <nd ref="1580358301"/>
+    <nd ref="1580358350"/>
+    <nd ref="1580358355"/>
+    <nd ref="1580358403"/>
+    <nd ref="1580358483"/>
+    <nd ref="1580358411"/>
+    <nd ref="1580358422"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="ホテルメトロポリタンエドモント"/>
+    <tag k="source" v="Bing,2007-04"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="144480590">
+    <nd ref="1580358240"/>
+    <nd ref="1580357892"/>
+    <nd ref="1580357843"/>
+    <nd ref="1580358182"/>
+    <nd ref="1580358240"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="ホテルメトロポリタン エドモント EAST WING"/>
+    <tag k="source" v="Bing,2007-04"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="144974361">
+    <nd ref="1584484781"/>
+    <nd ref="1584484791"/>
+    <nd ref="1584484770"/>
+    <nd ref="1584484765"/>
+    <nd ref="1584484781"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="北野アームス"/>
+    <tag k="source" v="Bing,2007-04, survey"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="145247076">
+    <nd ref="1586835878"/>
+    <nd ref="1586835876"/>
+    <nd ref="1586835774"/>
+    <nd ref="1586835804"/>
+    <nd ref="1586835878"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="ビューロー紀尾井町"/>
+    <tag k="source" v="Bing,2007-04"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="145247148">
+    <nd ref="1586835737"/>
+    <nd ref="1586835752"/>
+    <nd ref="1586835699"/>
+    <nd ref="1586835701"/>
+    <nd ref="1586835406"/>
+    <nd ref="1586835394"/>
+    <nd ref="1586835690"/>
+    <nd ref="1586835692"/>
+    <nd ref="1586835737"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="ルポール麹町"/>
+    <tag k="source" v="Bing,2007-04, survey"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
   <way id="145344062">
     <nd ref="1587598290"/>
     <nd ref="1587598414"/>
@@ -3099,6 +4220,17 @@
     <tag k="source" v="Bing,2007-04"/>
     <tag k="tourism" v="hotel"/>
   </way>
+  <way id="145403158">
+    <nd ref="1588226135"/>
+    <nd ref="1588226129"/>
+    <nd ref="1588226127"/>
+    <nd ref="1588226132"/>
+    <nd ref="1588226135"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="第一ホテル東京"/>
+    <tag k="source" v="image,2013-05;Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
   <way id="146277353">
     <nd ref="1595509846"/>
     <nd ref="1595509966"/>
@@ -3115,6 +4247,17 @@
     <tag k="tourism" v="hotel"/>
     <tag k="website" v="http://fresa-inn.jp/akasaka/"/>
   </way>
+  <way id="148788607">
+    <nd ref="1618600684"/>
+    <nd ref="1618600668"/>
+    <nd ref="1618600643"/>
+    <nd ref="1618600646"/>
+    <nd ref="1618600659"/>
+    <nd ref="1618600684"/>
+    <tag k="name" v="Hotel Villa Fontaine Roppongi"/>
+    <tag k="source" v="Bing,2007"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
   <way id="149860751">
     <nd ref="1628058671"/>
     <nd ref="1628058710"/>
@@ -3152,6 +4295,70 @@
     <tag k="source" v="Bing, 2007-04"/>
     <tag k="tourism" v="hotel"/>
   </way>
+  <way id="155009819">
+    <nd ref="1674563154"/>
+    <nd ref="1674563051"/>
+    <nd ref="1674563042"/>
+    <nd ref="1674563066"/>
+    <nd ref="1674563135"/>
+    <nd ref="1674563151"/>
+    <nd ref="1674563154"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="Bali-an"/>
+    <tag k="source" v="bing"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="155278617">
+    <nd ref="1676830855"/>
+    <nd ref="1676830862"/>
+    <nd ref="1676830789"/>
+    <nd ref="2394614691"/>
+    <nd ref="2394614692"/>
+    <nd ref="1676830779"/>
+    <nd ref="1676830855"/>
+    <tag k="amenity" v="love_hotel"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="ホテルニュー高田"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="155279198">
+    <nd ref="1676822402"/>
+    <nd ref="1676822398"/>
+    <nd ref="1676822332"/>
+    <nd ref="2703934983"/>
+    <nd ref="2703934986"/>
+    <nd ref="1676822336"/>
+    <nd ref="1676822402"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="新宿ノースホテル"/>
+    <tag k="source" v="image,2014-03;Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="155288972">
+    <nd ref="1676900376"/>
+    <nd ref="1676900576"/>
+    <nd ref="1676900555"/>
+    <nd ref="1676900563"/>
+    <nd ref="1676900521"/>
+    <nd ref="1676900500"/>
+    <nd ref="1676900487"/>
+    <nd ref="1676900428"/>
+    <nd ref="1676900403"/>
+    <nd ref="1676900286"/>
+    <nd ref="1676900315"/>
+    <nd ref="1676900310"/>
+    <nd ref="1676900326"/>
+    <nd ref="1676900346"/>
+    <nd ref="1676900349"/>
+    <nd ref="1676900328"/>
+    <nd ref="1676900340"/>
+    <nd ref="1676900365"/>
+    <nd ref="1676900376"/>
+    <tag k="name" v="Hotel Metropolitan"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
   <way id="156471338">
     <nd ref="1687215357"/>
     <nd ref="1687215356"/>
@@ -3164,9 +4371,9 @@
     <nd ref="1687215355"/>
     <nd ref="1687215358"/>
     <nd ref="1687215357"/>
-    <tag k="building" v="yes"/>
+    <tag k="building" v="hotel"/>
     <tag k="name" v="GRANDBEL HOTEL"/>
-    <tag k="source" v="BIng"/>
+    <tag k="source" v="Bing"/>
     <tag k="tourism" v="hotel"/>
   </way>
   <way id="159801887">
@@ -3185,22 +4392,39 @@
     <nd ref="1719041512"/>
     <nd ref="1719041749"/>
     <tag k="building" v="yes"/>
-    <tag k="name" v="hotel com's"/>
+    <tag k="name" v="ホテルコムズ銀座"/>
+    <tag k="name:en" v="hotel com's Ginza"/>
     <tag k="source" v="Bing, 2007"/>
     <tag k="tourism" v="hotel"/>
   </way>
-  <way id="164400382">
-    <nd ref="1760401145"/>
-    <nd ref="1760401166"/>
-    <nd ref="1760401152"/>
-    <nd ref="1760401151"/>
-    <nd ref="1760401138"/>
-    <nd ref="1760401130"/>
-    <nd ref="1760401145"/>
+  <way id="161011785">
+    <nd ref="1730076602"/>
+    <nd ref="1730076690"/>
+    <nd ref="1730076655"/>
+    <nd ref="1730076668"/>
+    <nd ref="1730076679"/>
+    <nd ref="1730076735"/>
+    <nd ref="1730076730"/>
+    <nd ref="1730076615"/>
+    <nd ref="1730076605"/>
+    <nd ref="1730076607"/>
+    <nd ref="1730076687"/>
+    <nd ref="1730076747"/>
+    <nd ref="1730076582"/>
+    <nd ref="1730076659"/>
+    <nd ref="1730076666"/>
+    <nd ref="1730076576"/>
+    <nd ref="1730076584"/>
+    <nd ref="1730076727"/>
+    <nd ref="1730076642"/>
+    <nd ref="1730076713"/>
+    <nd ref="1730076602"/>
     <tag k="building" v="yes"/>
-    <tag k="name" v="旅館 山楽"/>
-    <tag k="source" v="image;Bing,2007-03"/>
-    <tag k="tourism" v="hotel"/>
+    <tag k="int_name" v="Tokyo Metropolitan Teien Art Museum"/>
+    <tag k="name" v="東京都庭園美術館"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="url" v="http://www.teien-art-museum.ne.jp/index.html"/>
+    <tag k="wikipedia" v="http://ja.wikipedia.org/wiki/%E6%9D%B1%E4%BA%AC%E9%83%BD%E5%BA%AD%E5%9C%92%E7%BE%8E%E8%A1%93%E9%A4%A8"/>
   </way>
   <way id="170407884">
     <nd ref="1815494246"/>
@@ -3213,12 +4437,93 @@
     <nd ref="1815494175"/>
     <nd ref="1815494246"/>
     <tag k="building" v="yes"/>
+    <tag k="building:levels" v="5"/>
+    <tag k="building:use" v="hotel"/>
     <tag k="internet_access" v="yes"/>
     <tag k="internet_access:fee" v="no"/>
     <tag k="name" v="Elite-Inn Yushima"/>
     <tag k="source" v="Bing"/>
     <tag k="tourism" v="hotel"/>
   </way>
+  <way id="170419797">
+    <nd ref="1815597928"/>
+    <nd ref="1815598165"/>
+    <nd ref="1815598209"/>
+    <nd ref="1815597960"/>
+    <nd ref="1815597928"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="センチュリオンホテル上野"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="171848772">
+    <nd ref="1828202730"/>
+    <nd ref="1828202757"/>
+    <nd ref="1828202744"/>
+    <nd ref="1828202733"/>
+    <nd ref="1828202717"/>
+    <nd ref="1828202703"/>
+    <nd ref="1828202730"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="相鉄フレッサイン 日本橋茅場町 (Sotetsu Fresa Inn Nihombashi Kayabacho)"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="171848774">
+    <nd ref="1828202758"/>
+    <nd ref="1828202739"/>
+    <nd ref="1828202704"/>
+    <nd ref="1828202693"/>
+    <nd ref="1828202732"/>
+    <nd ref="1828202764"/>
+    <nd ref="1828202758"/>
+    <tag k="building" v="commercial"/>
+    <tag k="name" v="Keyo Presso In"/>
+    <tag k="source" v="survey"/>
+    <tag k="survey:date" v="2013-01-05"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="173226201">
+    <nd ref="1840743444"/>
+    <nd ref="1840743441"/>
+    <nd ref="1840743442"/>
+    <nd ref="1840743431"/>
+    <nd ref="1840743434"/>
+    <nd ref="1840743423"/>
+    <nd ref="1840743427"/>
+    <nd ref="1840743420"/>
+    <nd ref="1840743412"/>
+    <nd ref="1840743406"/>
+    <nd ref="1840743407"/>
+    <nd ref="1840743403"/>
+    <nd ref="1840743404"/>
+    <nd ref="1840743405"/>
+    <nd ref="1840743409"/>
+    <nd ref="1840743425"/>
+    <nd ref="1840743432"/>
+    <nd ref="1840743440"/>
+    <nd ref="1840743443"/>
+    <nd ref="1840743444"/>
+    <tag k="fee" v="yes"/>
+    <tag k="fixme" v="3/1-10/31 10-6  11/1-2/end 10-4:30"/>
+    <tag k="name" v="旧朝倉家住宅"/>
+    <tag k="name:en" v="Kyu Asakura tei"/>
+    <tag k="opening_hours" v="10-6"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="wheelchair" v="unknown"/>
+  </way>
+  <way id="175405062">
+    <nd ref="1859968343"/>
+    <nd ref="1859968341"/>
+    <nd ref="1859968330"/>
+    <nd ref="1859968335"/>
+    <nd ref="1859968343"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="ホテル ドーミーイン"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
   <way id="175632178">
     <nd ref="1861953870"/>
     <nd ref="1861953846"/>
@@ -3229,6 +4534,129 @@
     <tag k="name" v="Ryokan Asakusa Shigetsu"/>
     <tag k="tourism" v="hotel"/>
   </way>
+  <way id="176491577">
+    <nd ref="1870080723"/>
+    <nd ref="1870080744"/>
+    <nd ref="1870080740"/>
+    <nd ref="1870080710"/>
+    <nd ref="1870080723"/>
+    <tag k="addr:postcode" v="170-0004"/>
+    <tag k="building" v="yes"/>
+    <tag k="fax" v="+81-(0)3-5394-1046"/>
+    <tag k="internet_access" v="yes"/>
+    <tag k="internet_access:fee" v="no"/>
+    <tag k="name" v="東横INN大塚駅北口１"/>
+    <tag k="name:en" v="Toyoko Inn Tokyo Otsuka-eki Kita-guchi No.1"/>
+    <tag k="name:ja" v="東横INN大塚駅北口１"/>
+    <tag k="operator" v="Toyoko Inn"/>
+    <tag k="phone" v="+81-(0)3-5394-1045"/>
+    <tag k="ref" v="26"/>
+    <tag k="smoking" v="separated"/>
+    <tag k="source" v="Bing, 1980-2007"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="www.toyoko-inn.com"/>
+  </way>
+  <way id="176491604">
+    <nd ref="1870080781"/>
+    <nd ref="1870080734"/>
+    <nd ref="1870080715"/>
+    <nd ref="1870080769"/>
+    <nd ref="1870080781"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="ホテルサンターガス大塚店 (Hotel Suntargas Otsuka)"/>
+    <tag k="name:en" v="Hotel Suntargas Otsuka"/>
+    <tag k="name:ja" v="ホテルサンターガス大塚店"/>
+    <tag k="source" v="Bing, 1980-2007"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="182462868">
+    <nd ref="1928162145"/>
+    <nd ref="1928162135"/>
+    <nd ref="1928162140"/>
+    <nd ref="1928162133"/>
+    <nd ref="1928162132"/>
+    <nd ref="1928162131"/>
+    <nd ref="1928162136"/>
+    <nd ref="1928162142"/>
+    <nd ref="1928162141"/>
+    <nd ref="1928162134"/>
+    <nd ref="1928162130"/>
+    <nd ref="1928162138"/>
+    <nd ref="1928162146"/>
+    <nd ref="1928162144"/>
+    <nd ref="1928162139"/>
+    <nd ref="1928162148"/>
+    <nd ref="1928162137"/>
+    <nd ref="2177881157"/>
+    <nd ref="1928162145"/>
+    <tag k="addr:city" v="Tokyo"/>
+    <tag k="addr:country" v="JP"/>
+    <tag k="addr:housenumber" v="4-12-20"/>
+    <tag k="addr:place" v="Minami-Azabu, Minato-ku"/>
+    <tag k="addr:postcode" v="106-0047"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="New Sanno Hotel"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="187289869">
+    <nd ref="1980085109"/>
+    <nd ref="1980085108"/>
+    <nd ref="1980085113"/>
+    <nd ref="1980085112"/>
+    <nd ref="1980085125"/>
+    <nd ref="1980085114"/>
+    <nd ref="1980085127"/>
+    <nd ref="1980085129"/>
+    <nd ref="1980085131"/>
+    <nd ref="1980085133"/>
+    <nd ref="1980085135"/>
+    <nd ref="1980085138"/>
+    <nd ref="1980085139"/>
+    <nd ref="1980085140"/>
+    <nd ref="1980085141"/>
+    <nd ref="1980085142"/>
+    <nd ref="1980085143"/>
+    <nd ref="1980085144"/>
+    <nd ref="1980085178"/>
+    <nd ref="1980085177"/>
+    <nd ref="1980085182"/>
+    <nd ref="1980085185"/>
+    <nd ref="1980085187"/>
+    <nd ref="1980085199"/>
+    <nd ref="1980085197"/>
+    <nd ref="1980085188"/>
+    <nd ref="1980085186"/>
+    <nd ref="1980085184"/>
+    <nd ref="1980085183"/>
+    <nd ref="1980085181"/>
+    <nd ref="1980085180"/>
+    <nd ref="1980085175"/>
+    <nd ref="1980085172"/>
+    <nd ref="1980085170"/>
+    <nd ref="1980085167"/>
+    <nd ref="1980085169"/>
+    <nd ref="1980085165"/>
+    <nd ref="1980085161"/>
+    <nd ref="1980085163"/>
+    <nd ref="1980085157"/>
+    <nd ref="1980085149"/>
+    <nd ref="1980085147"/>
+    <nd ref="1980085146"/>
+    <nd ref="1980085145"/>
+    <nd ref="1980085137"/>
+    <nd ref="1980085136"/>
+    <nd ref="1980085111"/>
+    <nd ref="1980085110"/>
+    <nd ref="1980085109"/>
+    <tag k="building" v="yes"/>
+    <tag k="internet_access" v="yes"/>
+    <tag k="internet_access:fee" v="1500 JPY"/>
+    <tag k="name" v="ウェスティンホテル東京"/>
+    <tag k="source" v="image;Bing"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.westin-tokyo.co.jp/"/>
+  </way>
   <way id="203960902">
     <nd ref="2139723248"/>
     <nd ref="2139723246"/>
@@ -3280,5 +4708,274 @@
     <tag k="wheelchair" v="yes"/>
     <tag k="wikipedia" v="ja:国立西洋美術館"/>
   </way>
+  <way id="205118794">
+    <nd ref="2150891056"/>
+    <nd ref="2150891057"/>
+    <nd ref="2150891059"/>
+    <nd ref="2150891058"/>
+    <nd ref="2150891056"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="208525531">
+    <nd ref="2188157295"/>
+    <nd ref="2188157384"/>
+    <nd ref="2188157387"/>
+    <nd ref="2188157258"/>
+    <nd ref="2188157295"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="Hotel Gracery"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="209147930">
+    <nd ref="2193817937"/>
+    <nd ref="2193817938"/>
+    <nd ref="2193817946"/>
+    <nd ref="2193817949"/>
+    <nd ref="2193817927"/>
+    <nd ref="2193817947"/>
+    <nd ref="2193817932"/>
+    <nd ref="2193817951"/>
+    <nd ref="2193817948"/>
+    <nd ref="2193817915"/>
+    <nd ref="2193817937"/>
+    <tag k="name" v="ブリヂストン美術館永坂分室"/>
+    <tag k="tourism" v="museum"/>
+  </way>
+  <way id="209340435">
+    <nd ref="2195628371"/>
+    <nd ref="2195628369"/>
+    <nd ref="2195628364"/>
+    <nd ref="2195628365"/>
+    <nd ref="2195628362"/>
+    <nd ref="2195628361"/>
+    <nd ref="2195628353"/>
+    <nd ref="2195628352"/>
+    <nd ref="2195628349"/>
+    <nd ref="2195628350"/>
+    <nd ref="2195628343"/>
+    <nd ref="2195628342"/>
+    <nd ref="2195628339"/>
+    <nd ref="2195628340"/>
+    <nd ref="2195628341"/>
+    <nd ref="2195628344"/>
+    <nd ref="2195628345"/>
+    <nd ref="2195628346"/>
+    <nd ref="2195628347"/>
+    <nd ref="2195628348"/>
+    <nd ref="2195628351"/>
+    <nd ref="2195628354"/>
+    <nd ref="2195628355"/>
+    <nd ref="2195628356"/>
+    <nd ref="2195628371"/>
+    <tag k="amenity" v="public_building"/>
+    <tag k="building" v="yes"/>
+    <tag k="level" v="0"/>
+    <tag k="name" v="荒川ふるさと文化館"/>
+    <tag k="opening_hours" v="Tuesday-Sunday 9:30-17:00"/>
+    <tag k="tourism" v="museum"/>
+  </way>
+  <way id="210370337">
+    <nd ref="2204492087"/>
+    <nd ref="2204492088"/>
+    <nd ref="2204492086"/>
+    <nd ref="2204492085"/>
+    <nd ref="2204492087"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="東横INN日本橋浜町明治座前"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="219645624">
+    <nd ref="2287895398"/>
+    <nd ref="2287895321"/>
+    <nd ref="2287895305"/>
+    <nd ref="2287895294"/>
+    <nd ref="2287895272"/>
+    <nd ref="2287895252"/>
+    <nd ref="2287895175"/>
+    <nd ref="2287895198"/>
+    <nd ref="2287895179"/>
+    <nd ref="2287895165"/>
+    <nd ref="2287895117"/>
+    <nd ref="2287895120"/>
+    <nd ref="2287895151"/>
+    <nd ref="2287895158"/>
+    <nd ref="2287895391"/>
+    <nd ref="2287895408"/>
+    <nd ref="2287895418"/>
+    <nd ref="2287895424"/>
+    <nd ref="2287895430"/>
+    <nd ref="2287895434"/>
+    <nd ref="2287895459"/>
+    <nd ref="2287895474"/>
+    <nd ref="2287895510"/>
+    <nd ref="2287895656"/>
+    <nd ref="2287895398"/>
+    <tag k="building" v="yes"/>
+    <tag k="indoor" v="yes"/>
+    <tag k="level" v="1"/>
+    <tag k="name" v="グランド ハイアット 東京"/>
+    <tag k="name:en" v="Grand Hyatt Tokyo"/>
+    <tag k="operator" v="Grand Hyatt Tokyo"/>
+    <tag k="phone" v="+81 3 4333 1234"/>
+    <tag k="source" v="港区法務局"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="228162155">
+    <nd ref="2367952202"/>
+    <nd ref="2367952219"/>
+    <nd ref="2367952221"/>
+    <nd ref="2367952214"/>
+    <nd ref="2367952202"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="Tokyo Inn"/>
+    <tag k="source" v="Bing;GSI/KIBAN 25000; NARO"/>
+    <tag k="source_ref" v="http://wiki.osm.org/wiki/GSI_KIBAN"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="228162190">
+    <nd ref="2367952212"/>
+    <nd ref="2367952188"/>
+    <nd ref="2367952179"/>
+    <nd ref="2367952206"/>
+    <nd ref="2367952212"/>
+    <tag k="fax" v="03-5642-2112"/>
+    <tag k="internet_access" v="yes"/>
+    <tag k="name" v="Kodenmacho Ekimae"/>
+    <tag k="operator" v="APA Hotel"/>
+    <tag k="phone" v="03-5642-2111"/>
+    <tag k="smoking" v="separated"/>
+    <tag k="source" v="Bing;GSI/KIBAN 25000; NARO"/>
+    <tag k="source_ref" v="http://wiki.osm.org/wiki/GSI_KIBAN"/>
+    <tag k="tourism" v="hotel"/>
+    <tag k="website" v="http://www.apahotel.com.e.ju.hp.transer.com/language/shutoken/22_kodenma-cho-ekimae/"/>
+  </way>
+  <way id="228685269">
+    <nd ref="2373479944"/>
+    <nd ref="2373479946"/>
+    <nd ref="2373479948"/>
+    <nd ref="2373479950"/>
+    <nd ref="2373479951"/>
+    <nd ref="2373479953"/>
+    <nd ref="2373479955"/>
+    <nd ref="2373479956"/>
+    <nd ref="2373479958"/>
+    <nd ref="2373479944"/>
+    <tag k="amenity" v="love_hotel"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="ホテルエクセルシオ"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="228926584">
+    <nd ref="2375772191"/>
+    <nd ref="2375772188"/>
+    <nd ref="2375772193"/>
+    <nd ref="2375772187"/>
+    <nd ref="2375772201"/>
+    <nd ref="2375772200"/>
+    <nd ref="2375772206"/>
+    <nd ref="2375772213"/>
+    <nd ref="2375772208"/>
+    <nd ref="2375772209"/>
+    <nd ref="2375772207"/>
+    <nd ref="2375772210"/>
+    <nd ref="2375772204"/>
+    <nd ref="2375772205"/>
+    <nd ref="2375772214"/>
+    <nd ref="2375772215"/>
+    <nd ref="2375772211"/>
+    <nd ref="2375772212"/>
+    <nd ref="2375772203"/>
+    <nd ref="2375772202"/>
+    <nd ref="2375772199"/>
+    <nd ref="2375772196"/>
+    <nd ref="2375772191"/>
+    <tag k="building" v="yes"/>
+    <tag k="historic" v="manor"/>
+    <tag k="name" v="重要文化財指定 旧洋館後休所"/>
+    <tag k="tourism" v="museum"/>
+  </way>
+  <way id="230292042">
+    <nd ref="2388140068"/>
+    <nd ref="2388140056"/>
+    <nd ref="2388140088"/>
+    <nd ref="2388140065"/>
+    <nd ref="2388140064"/>
+    <nd ref="2388140068"/>
+    <tag k="building" v="yes"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="museum"/>
+  </way>
+  <way id="231716243">
+    <nd ref="2400543039"/>
+    <nd ref="2400543203"/>
+    <nd ref="2400543188"/>
+    <nd ref="2400543150"/>
+    <nd ref="2400543158"/>
+    <nd ref="2400543033"/>
+    <nd ref="2400543039"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="ホテル ユニゾ 神田 (Hotel Unizo Kanda)"/>
+    <tag k="name:en" v="Hotel Unizo Kanda"/>
+    <tag k="name:ja" v="ホテル ユニゾ 神田"/>
+    <tag k="source" v="GSI/KIBAN 25000; NARO"/>
+    <tag k="source_ref" v="http://wiki.osm.org/wiki/GSI_KIBAN"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="254602418">
+    <nd ref="2604082864"/>
+    <nd ref="2604082855"/>
+    <nd ref="2604082861"/>
+    <nd ref="2604082865"/>
+    <nd ref="2604082864"/>
+    <tag k="name" v="プリンセスⅡ"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="254602420">
+    <nd ref="2604082866"/>
+    <nd ref="2604082857"/>
+    <nd ref="2604082862"/>
+    <nd ref="2604082867"/>
+    <nd ref="2604082866"/>
+    <tag k="branch" v="鶯谷駅前"/>
+    <tag k="name" v="東横イン"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <way id="261667349">
+    <nd ref="2672664888"/>
+    <nd ref="2672664866"/>
+    <nd ref="2672664878"/>
+    <nd ref="2672664868"/>
+    <nd ref="2672664859"/>
+    <nd ref="2672664885"/>
+    <nd ref="2672664887"/>
+    <nd ref="2672664879"/>
+    <nd ref="2672664871"/>
+    <nd ref="2672664874"/>
+    <nd ref="2672664867"/>
+    <nd ref="2672664883"/>
+    <nd ref="2672664881"/>
+    <nd ref="2672664865"/>
+    <nd ref="2672664863"/>
+    <nd ref="2672664862"/>
+    <nd ref="2672664886"/>
+    <nd ref="2672664876"/>
+    <nd ref="2672664888"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="山の上ホテル"/>
+    <tag k="name:en" v="Yamanoue Hotel"/>
+    <tag k="tourism" v="hotel"/>
+  </way>
+  <relation id="2982309">
+    <member type="way" ref="137625432" role="outer"/>
+    <member type="way" ref="224468775" role="outer"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="東京大学総合研究博物館"/>
+    <tag k="name:en" v="the University Museum, the University of Tokyo"/>
+    <tag k="name:ja" v="東京大学総合研究博物館"/>
+    <tag k="source" v="Bing"/>
+    <tag k="tourism" v="museum"/>
+    <tag k="type" v="multipolygon"/>
+  </relation>
 
 </osm>
diff --git a/test/poi-service/script/tokyo/station.xml b/test/poi-service/script/tokyo/station.xml
index 2986193..eff5253 100644..100755
--- a/test/poi-service/script/tokyo/station.xml
+++ b/test/poi-service/script/tokyo/station.xml
@@ -1,70 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <osm version="0.6" generator="Overpass API">
 <note>The data included in this document is from www.openstreetmap.org. The data is made available under ODbL.</note>
-<meta osm_base="2013-02-04T12:12:01Z"/>
+<meta osm_base="2014-09-21T11:39:02Z"/>
 
-  <node id="31253693" lat="35.6625750" lon="139.7595728">
-    <tag k="name" v="汐留 (Shiodome)"/>
-    <tag k="name:en" v="Shiodome"/>
-    <tag k="name:ja" v="汐留"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:汐留駅"/>
-  </node>
-  <node id="31253872" lat="35.6551037" lon="139.7570353">
-    <tag k="name" v="浜松町 (Hamamatsuchō)"/>
-    <tag k="name:en" v="Hamamatsuchō"/>
-    <tag k="name:fr" v="Hamamatsuchō"/>
-    <tag k="name:ja" v="浜松町"/>
-    <tag k="name:ja_kana" v="はままつちょう"/>
-    <tag k="name:ja_rm" v="Hamamatsuchō"/>
-    <tag k="name:ru" v="Хамамацутё"/>
+  <node id="31252846" lat="35.6417507" lon="139.7577473">
+    <tag k="name" v="芝浦ふ頭"/>
+    <tag k="name:en" v="Shibaura-futo"/>
+    <tag k="name:ja" v="芝浦ふ頭"/>
+    <tag k="name:ja_kana" v="しばうらふとう"/>
+    <tag k="name:ja_rm" v="Shibaura futō"/>
+    <tag k="operator" v="ゆりかもめ"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:浜松町駅"/>
+    <tag k="ref" v="U05"/>
+    <tag k="wikipedia" v="ja:芝浦ふ頭駅"/>
   </node>
-  <node id="31253877" lat="35.6660605" lon="139.7579729">
-    <tag k="name" v="新橋 (Shimbashi)"/>
-    <tag k="name:en" v="Shimbashi"/>
-    <tag k="name:fr" v="Shimbashi"/>
-    <tag k="name:ja" v="新橋"/>
-    <tag k="name:ja_kana" v="しんばし"/>
-    <tag k="name:ja_rm" v="Shimbashi"/>
-    <tag k="name:ru" v="Симбаси"/>
+  <node id="31252951" lat="35.6491624" lon="139.7590475">
+    <tag k="name" v="日の出"/>
+    <tag k="name:en" v="Hinode"/>
+    <tag k="name:ja" v="日の出"/>
+    <tag k="name:ja_kana" v="ひので"/>
+    <tag k="name:ja_rm" v="Hinode"/>
+    <tag k="operator" v="ゆりかもめ"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:新橋駅"/>
+    <tag k="ref" v="U04"/>
+    <tag k="wikipedia" v="ja:日の出駅"/>
   </node>
-  <node id="31253879" lat="35.6661494" lon="139.7584923">
-    <tag k="name" v="新橋 (Shimbashi)"/>
-    <tag k="name:en" v="Shimbashi"/>
-    <tag k="name:fr" v="Shimbashi"/>
-    <tag k="name:ja" v="新橋"/>
-    <tag k="name:ja_kana" v="しんばし"/>
-    <tag k="name:ja_rm" v="Shimbashi"/>
-    <tag k="name:ru" v="Симбаси"/>
+  <node id="31253693" lat="35.6629413" lon="139.7599385">
+    <tag k="name" v="汐留"/>
+    <tag k="name:en" v="Shiodome"/>
+    <tag k="name:ja" v="汐留"/>
+    <tag k="name:ja_kana" v="しおどめ"/>
+    <tag k="name:ja_rm" v="Shiodome"/>
+    <tag k="operator" v="ゆりかもめ"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:新橋駅"/>
+    <tag k="ref" v="U02"/>
+    <tag k="wikipedia" v="ja:汐留駅"/>
   </node>
-  <node id="31253959" lat="35.6540074" lon="139.7619342">
-    <tag k="name" v="竹芝 (Takeshiba)"/>
+  <node id="31253959" lat="35.6540238" lon="139.7619160">
+    <tag k="name" v="竹芝"/>
     <tag k="name:en" v="Takeshiba"/>
     <tag k="name:fr" v="Takeshiba"/>
     <tag k="name:ja" v="竹芝"/>
     <tag k="name:ja_kana" v="たけしば"/>
     <tag k="name:ja_rm" v="Takeshiba"/>
+    <tag k="operator" v="ゆりかもめ"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="U03"/>
     <tag k="wikipedia" v="ja:竹芝駅"/>
   </node>
-  <node id="31254011" lat="35.6556226" lon="139.7567054">
-    <tag k="name" v="浜松町 (Hamamatsuchō)"/>
-    <tag k="name:en" v="Hamamatsuchō"/>
-    <tag k="name:fr" v="Hamamatsuchō"/>
-    <tag k="name:ja" v="浜松町"/>
-    <tag k="name:ja_kana" v="はままつちょう"/>
-    <tag k="name:ja_rm" v="Hamamatsuchō"/>
-    <tag k="name:ru" v="Хамамацутё"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:浜松町駅"/>
-  </node>
-  <node id="31254032" lat="35.6660731" lon="139.7581042">
+  <node id="31254200" lat="35.6653472" lon="139.7597645">
     <tag k="name" v="新橋 (Shimbashi)"/>
     <tag k="name:en" v="Shimbashi"/>
     <tag k="name:fr" v="Shimbashi"/>
@@ -72,124 +60,159 @@
     <tag k="name:ja_kana" v="しんばし"/>
     <tag k="name:ja_rm" v="Shimbashi"/>
     <tag k="name:ru" v="Симбаси"/>
+    <tag k="operator" v="ゆりかもめ"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="U01"/>
+    <tag k="website" v="http://www.yurikamome.co.jp/"/>
+    <tag k="wheelchair" v="yes"/>
     <tag k="wikipedia" v="ja:新橋駅"/>
   </node>
-  <node id="31254107" lat="35.6551117" lon="139.7569004">
-    <tag k="name" v="浜松町 (Hamamatsuchō)"/>
-    <tag k="name:en" v="Hamamatsuchō"/>
-    <tag k="name:fr" v="Hamamatsuchō"/>
-    <tag k="name:ja" v="浜松町"/>
-    <tag k="name:ja_kana" v="はままつちょう"/>
-    <tag k="name:ja_rm" v="Hamamatsuchō"/>
-    <tag k="name:ru" v="Хамамацутё"/>
+  <node id="31297598" lat="35.6346732" lon="139.7930732">
+    <tag k="name" v="有明"/>
+    <tag k="name:en" v="Ariake"/>
+    <tag k="name:ja" v="有明"/>
+    <tag k="name:ja_kana" v="ありあけ"/>
+    <tag k="name:ja_rm" v="Ariake"/>
+    <tag k="operator" v="ゆりかもめ"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="wheelchair" v="yes"/>
-    <tag k="wikipedia" v="ja:浜松町駅"/>
+    <tag k="ref" v="U12"/>
+    <tag k="wikipedia" v="ja:有明駅 (東京都)"/>
   </node>
-  <node id="31254200" lat="35.6656840" lon="139.7593075">
-    <tag k="name" v="新橋 (Shimbashi)"/>
-    <tag k="name:en" v="Shimbashi"/>
-    <tag k="name:fr" v="Shimbashi"/>
-    <tag k="name:ja" v="新橋"/>
-    <tag k="name:ja_kana" v="しんばし"/>
-    <tag k="name:ja_rm" v="Shimbashi"/>
-    <tag k="name:ru" v="Симбаси"/>
+  <node id="31297719" lat="35.6400460" lon="139.7887850">
+    <tag k="name" v="有明テニスの森"/>
+    <tag k="name:en" v="Ariake-tennis-no-mori"/>
+    <tag k="name:ja" v="有明テニスの森"/>
+    <tag k="name:ja_kana" v="ありあけてにすのもり"/>
+    <tag k="name:ja_rm" v="Ariake tenisu no mori"/>
     <tag k="operator" v="ゆりかもめ"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="website" v="http://www.yurikamome.co.jp/"/>
-    <tag k="wheelchair" v="yes"/>
-    <tag k="wikipedia" v="ja:新橋駅"/>
+    <tag k="ref" v="U13"/>
+    <tag k="wikipedia" v="ja:有明テニスの森駅"/>
+  </node>
+  <node id="31297728" lat="35.6457989" lon="139.7857302">
+    <tag k="name" v="市場前"/>
+    <tag k="name:en" v="Shijo-mae"/>
+    <tag k="name:ja" v="市場前"/>
+    <tag k="name:ja_kana" v="しじょうまえ"/>
+    <tag k="name:ja_rm" v="Shijō mae"/>
+    <tag k="operator" v="ゆりかもめ"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="U14"/>
+    <tag k="wikipedia" v="ja:市場前駅"/>
   </node>
-  <node id="31297737" lat="35.6538657" lon="139.7955812">
-    <tag k="name" v="豊洲 (Toyosu)"/>
+  <node id="31297730" lat="35.6487072" lon="139.7900547">
+    <tag k="name" v="新豊洲"/>
+    <tag k="name:en" v="Shin-Toyosu"/>
+    <tag k="name:ja" v="新豊洲"/>
+    <tag k="name:ja_kana" v="しんとよす"/>
+    <tag k="name:ja_rm" v="Shin Toyosu"/>
+    <tag k="operator" v="ゆりかもめ"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="U15"/>
+    <tag k="wikipedia" v="ja:新豊洲駅"/>
+  </node>
+  <node id="31297737" lat="35.6537553" lon="139.7953122">
+    <tag k="name" v="豊洲"/>
     <tag k="name:en" v="Toyosu"/>
     <tag k="name:ja" v="豊洲"/>
+    <tag k="name:ja_kana" v="とよす"/>
+    <tag k="name:ja_rm" v="Toyosu"/>
+    <tag k="operator" v="ゆりかもめ"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="U16"/>
     <tag k="wikipedia" v="ja:豊洲駅"/>
   </node>
-  <node id="132108993" lat="35.6713425" lon="139.7027109">
-    <tag k="name" v="原宿 (Harajuku)"/>
-    <tag k="name:en" v="Harajuku"/>
-    <tag k="name:fr" v="Harajuku"/>
-    <tag k="name:ja" v="原宿"/>
-    <tag k="name:ja_rm" v="Harajuku"/>
-    <tag k="name:ru" v="Харадзюку"/>
+  <node id="31300436" lat="35.6407437" lon="139.8036145">
+    <tag k="name" v="東雲"/>
+    <tag k="name:en" v="Shinonome"/>
+    <tag k="name:ja" v="東雲"/>
+    <tag k="name:ja_kana" v="しののめ"/>
+    <tag k="name:ja_rm" v="Shinonome"/>
+    <tag k="operator" v="東京臨海高速鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:東雲駅 (東京都)"/>
+  </node>
+  <node id="31330021" lat="35.6461686" lon="139.8273839">
+    <tag k="name" v="新木場"/>
+    <tag k="name:en" v="Shin-Kiba"/>
+    <tag k="name:ja" v="新木場"/>
+    <tag k="name:ja_kana" v="しんきば"/>
+    <tag k="name:ja_rm" v="Shin-kiba"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="train" v="yes"/>
+    <tag k="wikipedia" v="ja:新木場駅"/>
+  </node>
+  <node id="31330037" lat="35.6455560" lon="139.8105560">
+    <tag k="name" v="辰巳"/>
+    <tag k="name:en" v="Tatsumi"/>
+    <tag k="name:ja" v="辰巳"/>
+    <tag k="name:ja_kana" v="たつみ"/>
+    <tag k="name:ja_rm" v="Tatsumi"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:原宿駅"/>
+    <tag k="ref" v="Y23"/>
+    <tag k="wikipedia" v="ja:辰巳駅"/>
   </node>
-  <node id="132109147" lat="35.6895108" lon="139.7002757">
-    <tag k="name" v="新宿 (Shinjuku)"/>
-    <tag k="name:en" v="Shinjuku"/>
-    <tag k="name:fr" v="Shinjuku"/>
-    <tag k="name:ja" v="新宿"/>
-    <tag k="name:ja_kana" v="しんじゅく"/>
-    <tag k="name:ja_rm" v="Shinjuku"/>
-    <tag k="name:ru" v="Синдзюку"/>
-    <tag k="operator" v="JR東日本"/>
-    <tag k="platforms" v="7"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="Bing 2010"/>
-    <tag k="wheelchair" v="yes"/>
-    <tag k="wikipedia" v="ja:新宿駅"/>
-  </node>
-  <node id="196838866" lat="35.7007869" lon="139.6973096">
-    <tag k="name" v="大久保 (Okubo)"/>
+  <node id="31330041" lat="35.6459403" lon="139.8267824">
+    <tag k="name" v="新木場"/>
+    <tag k="name:en" v="Shin-kiba"/>
+    <tag k="name:ja" v="新木場"/>
+    <tag k="name:ja_kana" v="しんきば"/>
+    <tag k="name:ja_rm" v="Shin-kiba"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="Y24"/>
+    <tag k="train" v="yes"/>
+    <tag k="wikipedia" v="ja:新木場駅"/>
+  </node>
+  <node id="172670767" lat="35.7280787" lon="139.7712593">
+    <tag k="name" v="日暮里"/>
+    <tag k="name:en" v="Nippori"/>
+    <tag k="name:ja" v="日暮里"/>
+    <tag k="name:ja_kana" v="にっぽり"/>
+    <tag k="name:ja_rm" v="Nippori"/>
+    <tag k="operator" v="京成電鉄 (Keisei Electric Railway)"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="KS02"/>
+    <tag k="wikipedia" v="ja:日暮里駅"/>
+  </node>
+  <node id="196838866" lat="35.7007911" lon="139.6973187">
+    <tag k="name" v="大久保"/>
     <tag k="name:en" v="Okubo"/>
     <tag k="name:ja" v="大久保"/>
+    <tag k="name:ja_kana" v="おおくぼ"/>
     <tag k="name:ja_rm" v="Ōkubo"/>
     <tag k="name:ru" v="Окубо"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:大久保駅 (東京都)"/>
   </node>
-  <node id="196838894" lat="35.7063777" lon="139.6851946">
-    <tag k="name" v="東中野 (Higashi-nakano)"/>
-    <tag k="name:en" v="Higashi-nakano"/>
-    <tag k="name:ja" v="東中野"/>
-    <tag k="name:ja_rm" v="Higashi-nakano"/>
-    <tag k="name:ru" v="Хигаси-Накано"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:東中野駅"/>
-  </node>
-  <node id="196845925" lat="35.6813055" lon="139.7114164">
-    <tag k="name" v="千駄ケ谷 (Sendagaya)"/>
-    <tag k="name:en" v="Sendagaya"/>
-    <tag k="name:fr" v="Sendagaya"/>
-    <tag k="name:ja" v="千駄ヶ谷"/>
-    <tag k="name:ru" v="Сэндагая"/>
-    <tag k="railway" v="station"/>
-  </node>
-  <node id="196845979" lat="35.6836899" lon="139.7023216">
-    <tag k="name:en" v="Yoyogi"/>
-    <tag k="name:fr" v="Yoyogi"/>
-    <tag k="name:ja_rm" v="Yoyogi"/>
-    <tag k="name:ru" v="Ёёги"/>
-    <tag k="railway" v="station"/>
-  </node>
-  <node id="199835839" lat="35.6540851" lon="139.7364641">
-    <tag k="name" v="麻布十番 (Azabu-Juban)"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:麻布十番駅"/>
-  </node>
-  <node id="236578265" lat="35.6907641" lon="139.7705532">
-    <tag k="name" v="神田 (Kanda)"/>
-    <tag k="name:en" v="Kanda"/>
-    <tag k="name:ja" v="神田"/>
-    <tag k="name:ja_rm" v="Kanda"/>
-    <tag k="name:ru" v="Канда"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:神田駅 (東京都)"/>
-  </node>
-  <node id="236578383" lat="35.7070022" lon="139.7747137">
-    <tag k="name" v="御徒町 (Okachimachi)"/>
+  <node id="236578383" lat="35.7070116" lon="139.7746554">
+    <tag k="name" v="御徒町"/>
     <tag k="name:en" v="Okachimachi"/>
     <tag k="name:ja" v="御徒町"/>
+    <tag k="name:ja_kana" v="おかちまち"/>
     <tag k="name:ja_rm" v="Okachimachi"/>
     <tag k="name:ru" v="Окатимати"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:御徒町駅"/>
   </node>
-  <node id="236578444" lat="35.7125859" lon="139.7754452">
+  <node id="236578444" lat="35.7131731" lon="139.7760066">
     <tag k="name" v="上野 (Ueno)"/>
     <tag k="name:en" v="Ueno"/>
     <tag k="name:fr" v="Ueno"/>
@@ -200,47 +223,122 @@
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:上野駅"/>
   </node>
-  <node id="236578577" lat="35.7206495" lon="139.7787494">
-    <tag k="name" v="鶯谷 (Uguisudani)"/>
+  <node id="236578577" lat="35.7203248" lon="139.7790397">
+    <tag k="name" v="鶯谷"/>
     <tag k="name:en" v="Uguisudani"/>
+    <tag k="name:fr" v="Uguisudani"/>
     <tag k="name:ja" v="鶯谷"/>
+    <tag k="name:ja_kana" v="うぐいすだに"/>
     <tag k="name:ja_rm" v="Uguisudani"/>
     <tag k="name:ru" v="Угуисудани"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:鶯谷駅"/>
   </node>
-  <node id="236579598" lat="35.7131681" lon="139.7038922">
-    <tag k="name" v="高田馬場 (Takadanobaba)"/>
-    <tag k="name:ja_rm" v="Takadanobaba"/>
-    <tag k="name:ru" v="Такаданобаба"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:高田馬場駅"/>
+  <node id="236578667" lat="35.7280753" lon="139.7705663">
+    <tag k="name" v="日暮里"/>
+    <tag k="name:en" v="Nippori"/>
+    <tag k="name:ja" v="日暮里"/>
+    <tag k="name:ja_kana" v="にっぽり"/>
+    <tag k="name:ja_rm" v="Nippori"/>
+    <tag k="name:ru" v="Ниппори"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:日暮里駅"/>
+  </node>
+  <node id="236578741" lat="35.7321666" lon="139.7666804">
+    <tag k="name" v="西日暮里"/>
+    <tag k="name:en" v="Nishi-Nippori"/>
+    <tag k="name:ja" v="西日暮里"/>
+    <tag k="name:ja_kana" v="にしにっぽり"/>
+    <tag k="name:ja_rm" v="Nishi Nippori"/>
+    <tag k="name:ru" v="Ниси-Ниппори"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:西日暮里駅"/>
+  </node>
+  <node id="236578838" lat="35.7373316" lon="139.7617671">
+    <tag k="name" v="田端"/>
+    <tag k="name:en" v="Tabata"/>
+    <tag k="name:ja" v="田端"/>
+    <tag k="name:ja_kana" v="たばた"/>
+    <tag k="name:ja_rm" v="Tabata"/>
+    <tag k="name:ru" v="Табата"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:田端駅"/>
+  </node>
+  <node id="236579053" lat="35.7365757" lon="139.7472427">
+    <tag k="name" v="駒込"/>
+    <tag k="name:en" v="Komagome"/>
+    <tag k="name:ja" v="駒込"/>
+    <tag k="name:ja_kana" v="こまごめ"/>
+    <tag k="name:ja_rm" v="Komagome"/>
+    <tag k="name:ru" v="Комагомэ"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:駒込駅"/>
+  </node>
+  <node id="236579126" lat="35.7334282" lon="139.7394273">
+    <tag k="name" v="巣鴨"/>
+    <tag k="name:en" v="Sugamo"/>
+    <tag k="name:ja" v="巣鴨"/>
+    <tag k="name:ja_kana" v="すがも"/>
+    <tag k="name:ja_rm" v="Sugamo"/>
+    <tag k="name:ru" v="Сугамо"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:巣鴨駅"/>
+  </node>
+  <node id="236579274" lat="35.7317401" lon="139.7283438">
+    <tag k="name" v="大塚"/>
+    <tag k="name:en" v="Otsuka"/>
+    <tag k="name:ja" v="大塚"/>
+    <tag k="name:ja_rm" v="Ōtsuka"/>
+    <tag k="name:ru" v="Оцука"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:大塚駅 (東京都)"/>
   </node>
   <node id="236579696" lat="35.7013007" lon="139.7002421">
+    <tag k="name" v="新大久保"/>
+    <tag k="name:en" v="Shin-Okubo"/>
+    <tag k="name:ja_kana" v="しんおおくぼ"/>
     <tag k="name:ja_rm" v="Shin-Ōkubo"/>
     <tag k="name:ru" v="Син-Окубо"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
     <tag k="railway" v="station"/>
   </node>
-  <node id="237409677" lat="35.6800570" lon="139.7205743">
-    <tag k="name" v="信濃町 (Shinanomachi)"/>
-    <tag k="name:en" v="Shinanomachi"/>
-    <tag k="name:fr" v="Shinanomachi"/>
-    <tag k="name:ja" v="信濃町"/>
-    <tag k="name:ru" v="Синаномати"/>
+  <node id="240510683" lat="35.7332563" lon="139.7778333">
+    <tag k="name" v="三河島"/>
+    <tag k="name:en" v="Mikawashima"/>
+    <tag k="name:ja" v="三河島"/>
+    <tag k="name:ja_kana" v="みかわしま"/>
+    <tag k="name:ja_rm" v="Mikawashima"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:信濃町駅"/>
+    <tag k="wikipedia" v="ja:三河島駅"/>
   </node>
-  <node id="237410362" lat="35.7021473" lon="139.7542337">
-    <tag k="name" v="水道橋 (Suidobashi)"/>
-    <tag k="name:en" v="Suidobashi"/>
-    <tag k="name:ja" v="水道橋"/>
-    <tag k="name:ja_rm" v="Suidōbashi"/>
-    <tag k="name:ru" v="Суйдобаси"/>
+  <node id="241817928" lat="35.7315141" lon="139.7113393">
+    <tag k="name" v="池袋"/>
+    <tag k="name:en" v="Ikebukuro"/>
+    <tag k="name:ja" v="池袋"/>
+    <tag k="name:ja_rm" v="Ikebukuro"/>
+    <tag k="name:kana" v="いけぶくろ"/>
     <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:水道橋駅"/>
+    <tag k="ref" v="TJ01"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:池袋駅"/>
   </node>
-  <node id="241896099" lat="35.6584620" lon="139.7013294">
-    <tag k="name" v="渋谷 (Shibuya)"/>
+  <node id="241896099" lat="35.6583642" lon="139.7015526">
+    <tag k="name" v="渋谷"/>
     <tag k="name:en" v="Shibuya"/>
     <tag k="name:fr" v="Shibuya"/>
     <tag k="name:ja" v="渋谷"/>
@@ -250,8 +348,33 @@
     <tag k="wheelchair" v="yes"/>
     <tag k="wikipedia" v="ja:渋谷駅"/>
   </node>
+  <node id="243887388" lat="35.6482388" lon="139.7034032">
+    <tag k="name" v="代官山"/>
+    <tag k="name:en" v="Daikan-yama"/>
+    <tag k="name:fr" v="Daikanyama"/>
+    <tag k="name:ja" v="代官山"/>
+    <tag k="name:ja_kana" v="だいかんやま"/>
+    <tag k="name:ja_rm" v="Daikan yama"/>
+    <tag k="operator" v="東京急行電鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="TY02"/>
+    <tag k="wikipedia" v="ja:代官山駅"/>
+  </node>
+  <node id="243887391" lat="35.6443845" lon="139.6991246">
+    <tag k="name" v="中目黒"/>
+    <tag k="name:en" v="Naka-meguro"/>
+    <tag k="name:fr" v="Nakameguro"/>
+    <tag k="name:ja" v="中目黒"/>
+    <tag k="name:ja_rm" v="Naka Meguro"/>
+    <tag k="operator" v="東京急行電鉄;東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="TY03;H01"/>
+    <tag k="wikipedia" v="ja:中目黒駅"/>
+  </node>
   <node id="246961290" lat="35.6575609" lon="139.7021323">
-    <tag k="name" v="渋谷 (Shibuya)"/>
+    <tag k="name" v="渋谷"/>
     <tag k="name:en" v="Shibuya"/>
     <tag k="name:fr" v="Shibuya"/>
     <tag k="name:ja" v="渋谷"/>
@@ -260,47 +383,76 @@
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:渋谷駅"/>
   </node>
-  <node id="264440831" lat="35.7219770" lon="139.7524680">
-    <tag k="name" v="白山 (Hakusan)"/>
+  <node id="251465504" lat="35.6722994" lon="139.7950850">
+    <tag k="name" v="門前仲町"/>
+    <tag k="name:en" v="Monzen-nakacho"/>
+    <tag k="name:ja" v="門前仲町"/>
+    <tag k="name:ja_kana" v="もんぜんなかちょう"/>
+    <tag k="name:ja_rm" v="Monzen Nakachō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="T12"/>
+    <tag k="wikipedia" v="ja:門前仲町駅"/>
+  </node>
+  <node id="262449251" lat="35.6470083" lon="139.7086688">
+    <tag k="name" v="恵比寿"/>
+    <tag k="name:en" v="Ebisu"/>
+    <tag k="name:fr" v="Ebisu"/>
+    <tag k="name:ja" v="恵比寿"/>
+    <tag k="name:ja_kana" v="えびす"/>
+    <tag k="name:ja_rm" v="Ebisu"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="H02"/>
+    <tag k="wikipedia" v="ja:恵比寿駅"/>
+  </node>
+  <node id="264440323" lat="35.7279793" lon="139.7447698">
+    <tag k="name" v="千石"/>
+    <tag k="name:en" v="Sengoku"/>
+    <tag k="name:ja" v="千石"/>
+    <tag k="name:ja_kana" v="せんごく"/>
+    <tag k="name:ja_rm" v="Sengoku"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="I14"/>
+    <tag k="wikipedia" v="ja:千石駅"/>
+  </node>
+  <node id="264440562" lat="35.6483635" lon="139.7487997">
+    <tag k="name" v="三田"/>
+    <tag k="name:en" v="Mita"/>
+    <tag k="name:fr" v="Mita"/>
+    <tag k="name:ja" v="三田"/>
+    <tag k="name:ja_kana" v="みた"/>
+    <tag k="name:ja_rm" v="Mita"/>
+    <tag k="name:ru" v="Мита"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="I04"/>
+    <tag k="wheelchair" v="no"/>
+    <tag k="wikipedia" v="ja:三田駅 (東京都)"/>
+  </node>
+  <node id="264440831" lat="35.7219725" lon="139.7523437">
+    <tag k="name" v="白山"/>
     <tag k="name:en" v="Hakusan"/>
     <tag k="name:ja" v="白山"/>
+    <tag k="name:ja_kana" v="はくさん"/>
     <tag k="name:ja_rm" v="Hakusan"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="ref" v="I-13"/>
-  </node>
-  <node id="265036742" lat="35.6809712" lon="139.7674389">
-    <tag k="KSJ2:INT" v="1"/>
-    <tag k="KSJ2:INT_label" v="新幹線"/>
-    <tag k="KSJ2:LIN" v="東北新幹線"/>
-    <tag k="KSJ2:OPC" v="東日本旅客鉄道"/>
-    <tag k="KSJ2:RAC" v="11"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道JR"/>
-    <tag k="KSJ2:STN" v="東京"/>
-    <tag k="KSJ2:coordinate" v="35.680986 139.768109"/>
-    <tag k="KSJ2:lat" v="35.680986"/>
-    <tag k="KSJ2:long" v="139.768109"/>
-    <tag k="name" v="東京 (Tōkyō)"/>
-    <tag k="name:en" v="Tōkyō"/>
-    <tag k="name:ja" v="東京"/>
-    <tag k="name:ru" v="Токио"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:東京駅"/>
+    <tag k="ref" v="I13"/>
+    <tag k="wikipedia" v="ja:白山駅 (東京都)"/>
   </node>
-  <node id="265036785" lat="35.7143299" lon="139.7780117">
-    <tag k="KSJ2:INT" v="1"/>
-    <tag k="KSJ2:INT_label" v="新幹線"/>
+  <node id="265036785" lat="35.7139686" lon="139.7778935">
     <tag k="KSJ2:LIN" v="東北新幹線"/>
-    <tag k="KSJ2:OPC" v="東日本旅客鉄道"/>
-    <tag k="KSJ2:RAC" v="11"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道JR"/>
     <tag k="KSJ2:STN" v="上野"/>
-    <tag k="KSJ2:coordinate" v="35.714321 139.778017"/>
-    <tag k="KSJ2:lat" v="35.714321"/>
-    <tag k="KSJ2:long" v="139.778017"/>
     <tag k="name" v="上野 (Ueno)"/>
     <tag k="name:en" v="Ueno"/>
     <tag k="name:fr" v="Ueno"/>
@@ -316,918 +468,558 @@
     <tag k="wikipedia" v="ja:上野駅"/>
   </node>
   <node id="265554028" lat="35.6727780" lon="139.7240280">
-    <tag k="name" v="青山一丁目 (Aoyama-itchōme)"/>
-    <tag k="name:en" v="Aoyama-itchōme"/>
+    <tag k="name" v="青山一丁目"/>
+    <tag k="name:en" v="Aoyama-itchome"/>
     <tag k="name:ja" v="青山一丁目"/>
+    <tag k="name:ja_kana" v="あおやまいっちょうめ"/>
+    <tag k="name:ja_rm" v="Aoyama itchōme"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京地下鉄;東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G04;Z03;E24"/>
     <tag k="wikipedia" v="ja:青山一丁目駅"/>
   </node>
-  <node id="265554228" lat="35.6652044" lon="139.7124350">
-    <tag k="name" v="表参道 (Omote-sando)"/>
+  <node id="265554228" lat="35.6651380" lon="139.7125249">
+    <tag k="name" v="表参道"/>
     <tag k="name:en" v="Omote-sando"/>
     <tag k="name:ja" v="表参道"/>
+    <tag k="name:ja_kana" v="おもてさんどう"/>
+    <tag k="name:ja_rm" v="Omote Sandō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G02;C04;Z02"/>
     <tag k="wikipedia" v="ja:表参道駅"/>
   </node>
-  <node id="266083652" lat="35.6594510" lon="139.7021040">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="田園都市線;11号線半蔵門線"/>
-    <tag k="KSJ2:LOC" v="cv12426_rr"/>
-    <tag k="KSJ2:OPC" v="東京急行電鉄;東京地下鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_6456"/>
-    <tag k="KSJ2:STN" v="渋谷"/>
-    <tag k="KSJ2:coordinate" v="35.659451 139.702104"/>
-    <tag k="KSJ2:lat" v="35.659451"/>
-    <tag k="KSJ2:long" v="139.702104"/>
-    <tag k="KSJ2:segment" v="eb02_13485"/>
-    <tag k="name" v="渋谷 (Shibuya)"/>
+  <node id="266083652" lat="35.6594941" lon="139.7021109">
+    <tag k="name" v="渋谷"/>
     <tag k="name:en" v="Shibuya"/>
     <tag k="name:fr" v="Shibuya"/>
     <tag k="name:ja" v="渋谷"/>
+    <tag k="name:ja_kana" v="しぶや"/>
     <tag k="name:ja_rm" v="Shibuya"/>
     <tag k="name:ru" v="Сибуя"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="DT01;Z01"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="wikipedia" v="ja:渋谷駅"/>
+  </node>
+  <node id="266085875" lat="35.6332102" lon="139.7155231">
+    <tag k="name" v="目黒"/>
+    <tag k="name:en" v="Meguro"/>
+    <tag k="name:ja" v="目黒"/>
+    <tag k="name:ja_kana" v="めぐろ"/>
+    <tag k="name:ja_rm" v="Meguro"/>
+    <tag k="name:ru" v="Мэгуро"/>
     <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
     <tag k="railway" v="station"/>
-    <tag k="ref" v="Z-01"/>
+    <tag k="ref" v="I01;N01;MG01"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:渋谷駅"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:目黒駅"/>
   </node>
   <node id="270339450" lat="35.7113289" lon="139.7826636">
-    <tag k="name" v="稲荷町 (Inaricho)"/>
+    <tag k="name" v="稲荷町"/>
     <tag k="name:en" v="Inaricho"/>
     <tag k="name:ja" v="稲荷町"/>
+    <tag k="name:ja_kana" v="いなりちょう"/>
+    <tag k="name:ja_rm" v="Inarichō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G17"/>
     <tag k="wikipedia" v="ja:稲荷町駅 (東京都)"/>
   </node>
   <node id="281366079" lat="35.6787369" lon="139.6936743">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="小田原線"/>
-    <tag k="KSJ2:LOC" v="cv6070_rr"/>
-    <tag k="KSJ2:OPC" v="小田急電鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_3143"/>
-    <tag k="KSJ2:STN" v="参宮橋"/>
-    <tag k="KSJ2:coordinate" v="35.678126 139.693293"/>
-    <tag k="KSJ2:lat" v="35.678126"/>
-    <tag k="KSJ2:long" v="139.693293"/>
-    <tag k="KSJ2:segment" v="eb02_6378"/>
-    <tag k="name" v="参宮橋 (Sangubashi)"/>
+    <tag k="name" v="参宮橋"/>
     <tag k="name:en" v="Sangubashi"/>
     <tag k="name:fr" v="Sangūbashi"/>
     <tag k="name:ja" v="参宮橋"/>
+    <tag k="name:ja_kana" v="さんぐうばし"/>
+    <tag k="name:ja_rm" v="Sangūbashi"/>
     <tag k="name:ru" v="Сангубаси"/>
     <tag k="name:zh" v="參宮橋站"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="小田急電鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="OH03"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
     <tag k="wikipedia" v="ja:参宮橋駅"/>
   </node>
-  <node id="281366423" lat="35.6837150" lon="139.6988460">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="小田原線"/>
-    <tag k="KSJ2:LOC" v="cv6062_rr"/>
-    <tag k="KSJ2:OPC" v="小田急電鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_3141"/>
-    <tag k="KSJ2:STN" v="南新宿"/>
-    <tag k="KSJ2:coordinate" v="35.683715 139.698846"/>
-    <tag k="KSJ2:lat" v="35.683715"/>
-    <tag k="KSJ2:long" v="139.698846"/>
-    <tag k="KSJ2:segment" v="eb02_6370"/>
-    <tag k="name" v="南新宿 (Minami Shinjuku)"/>
-    <tag k="name:ar" v="مينامي-شينجوكو"/>
-    <tag k="name:en" v="Minami Shinjuku"/>
-    <tag k="name:fr" v="Minami Shinjuku"/>
-    <tag k="name:ja" v="南新宿"/>
-    <tag k="name:ko" v="미나미신주쿠 역"/>
-    <tag k="name:ru" v="Минами-Синдзюку"/>
-    <tag k="name:zh" v="南新宿站"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ru:Минами-Синдзюку (станция)"/>
-  </node>
-  <node id="281366434" lat="35.6915552" lon="139.6996818">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="小田原線"/>
-    <tag k="KSJ2:LOC" v="cv6071_rr"/>
-    <tag k="KSJ2:OPC" v="小田急電鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_3146"/>
-    <tag k="KSJ2:STN" v="新宿"/>
-    <tag k="KSJ2:coordinate" v="35.691359 139.699645"/>
-    <tag k="KSJ2:lat" v="35.691359"/>
-    <tag k="KSJ2:long" v="139.699645"/>
-    <tag k="KSJ2:segment" v="eb02_6379"/>
-    <tag k="name" v="新宿 (Shinjuku)"/>
-    <tag k="name:en" v="Shinjuku"/>
-    <tag k="name:fr" v="Shinjuku"/>
-    <tag k="name:ja" v="新宿"/>
-    <tag k="name:ja_kana" v="しんじゅく"/>
-    <tag k="name:ja_rm" v="Shinjuku"/>
-    <tag k="name:ru" v="Синдзюку"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:新宿駅"/>
-  </node>
-  <node id="281366568" lat="35.6697010" lon="139.6890770">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="小田原線"/>
-    <tag k="KSJ2:LOC" v="cv6066_rr"/>
-    <tag k="KSJ2:OPC" v="小田急電鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_3137"/>
-    <tag k="KSJ2:STN" v="代々木八幡"/>
-    <tag k="KSJ2:coordinate" v="35.669701 139.689077"/>
-    <tag k="KSJ2:lat" v="35.669701"/>
-    <tag k="KSJ2:long" v="139.689077"/>
-    <tag k="KSJ2:segment" v="eb02_6374"/>
-    <tag k="name" v="代々木八幡 (Yoyogi Hachiman)"/>
-    <tag k="name:en" v="Yoyogi Hachiman"/>
-    <tag k="name:ja" v="代々木八幡"/>
-    <tag k="name:ru" v="Ёёги-Хатиман"/>
-    <tag k="name:zh" v="代代木八幡站"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:代々木八幡駅"/>
-  </node>
-  <node id="281366963" lat="35.6690611" lon="139.6799711">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="小田原線"/>
-    <tag k="KSJ2:LOC" v="cv12856_rr"/>
-    <tag k="KSJ2:OPC" v="小田急電鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_3151"/>
-    <tag k="KSJ2:STN" v="代々木上原"/>
-    <tag k="KSJ2:coordinate" v="35.668703 139.679219"/>
-    <tag k="KSJ2:lat" v="35.668703"/>
-    <tag k="KSJ2:long" v="139.679219"/>
-    <tag k="KSJ2:segment" v="eb02_6383"/>
-    <tag k="name" v="代々木上原 (Yoyogi-Uehara)"/>
-    <tag k="name:ar" v="يويوغي-أويهارا"/>
-    <tag k="name:en" v="Yoyogi-Uehara"/>
-    <tag k="name:ja" v="代々木上原"/>
-    <tag k="name:ko" v="요요기우에하라 역"/>
-    <tag k="name:ru" v="Ёёги-Уэхара"/>
-    <tag k="name:zh" v="代代木上原站"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:代々木上原駅"/>
-  </node>
-  <node id="281417661" lat="35.6887050" lon="139.6993170">
-    <tag k="KSJ2:INT" v="3"/>
-    <tag k="KSJ2:INT_label" v="公営鉄道"/>
-    <tag k="KSJ2:LIN" v="10号線新宿線"/>
-    <tag k="KSJ2:LOC" v="cv1138_rr"/>
-    <tag k="KSJ2:OPC" v="東京都"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_648"/>
-    <tag k="KSJ2:STN" v="新宿"/>
-    <tag k="KSJ2:coordinate" v="35.688705 139.699317"/>
-    <tag k="KSJ2:lat" v="35.688705"/>
-    <tag k="KSJ2:long" v="139.699317"/>
-    <tag k="KSJ2:segment" v="eb02_1183"/>
-    <tag k="name" v="新宿 (Shinjuku)"/>
+  <node id="281417661" lat="35.6889062" lon="139.6999118">
+    <tag k="name" v="新宿"/>
     <tag k="name:en" v="Shinjuku"/>
     <tag k="name:fr" v="Shinjuku"/>
     <tag k="name:ja" v="新宿"/>
     <tag k="name:ja_kana" v="しんじゅく"/>
     <tag k="name:ja_rm" v="Shinjuku"/>
     <tag k="name:ru" v="Синдзюку"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="S-01"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://w3land.mlit.go.jp/ksj2/datalist/N02.html"/>
     <tag k="wikipedia" v="ja:新宿駅"/>
   </node>
-  <node id="281417682" lat="35.6816950" lon="139.6886240">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="京王線"/>
-    <tag k="KSJ2:LOC" v="cv1140_rr"/>
-    <tag k="KSJ2:OPC" v="京王電鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_646"/>
-    <tag k="KSJ2:STN" v="初台"/>
-    <tag k="KSJ2:coordinate" v="35.681695 139.688624"/>
-    <tag k="KSJ2:lat" v="35.681695"/>
-    <tag k="KSJ2:long" v="139.688624"/>
-    <tag k="KSJ2:segment" v="eb02_1185"/>
-    <tag k="name" v="初台 (Hatsudai)"/>
-    <tag k="name:en" v="Hatsudai"/>
-    <tag k="name:ja" v="初台"/>
-    <tag k="name:ru" v="Хацудай"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:初台駅"/>
-  </node>
-  <node id="281418439" lat="35.6903547" lon="139.6990892">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="京王線"/>
-    <tag k="KSJ2:LOC" v="cv1144_rr"/>
-    <tag k="KSJ2:OPC" v="京王電鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_642"/>
-    <tag k="KSJ2:STN" v="新宿"/>
-    <tag k="KSJ2:coordinate" v="35.690467 139.699166"/>
-    <tag k="KSJ2:lat" v="35.690467"/>
-    <tag k="KSJ2:long" v="139.699166"/>
-    <tag k="KSJ2:segment" v="eb02_1189"/>
-    <tag k="name" v="新宿 (Shinjuku)"/>
-    <tag k="name:en" v="Shinjuku"/>
-    <tag k="name:fr" v="Shinjuku"/>
-    <tag k="name:ja" v="新宿"/>
-    <tag k="name:ja_kana" v="しんじゅく"/>
-    <tag k="name:ja_rm" v="Shinjuku"/>
-    <tag k="name:ru" v="Синдзюку"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:新宿駅"/>
-  </node>
-  <node id="286932375" lat="35.6589024" lon="139.6833626">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="井の頭線"/>
-    <tag k="KSJ2:LOC" v="cv1124_rr"/>
-    <tag k="KSJ2:OPC" v="京王電鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_621"/>
-    <tag k="KSJ2:STN" v="駒場東大前"/>
-    <tag k="KSJ2:coordinate" v="35.658861 139.683169"/>
-    <tag k="KSJ2:lat" v="35.658861"/>
-    <tag k="KSJ2:long" v="139.683169"/>
-    <tag k="KSJ2:segment" v="eb02_1169"/>
-    <tag k="name" v="駒場東大前 (Komaba-todaimae)"/>
-    <tag k="name:en" v="Komaba-todaimae"/>
-    <tag k="name:ja" v="駒場東大前"/>
-    <tag k="name:ru" v="Комаба-Тодаймаэ"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:駒場東大前駅"/>
-  </node>
   <node id="286932377" lat="35.6572037" lon="139.6935163">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
     <tag k="KSJ2:LIN" v="井の頭線"/>
-    <tag k="KSJ2:LOC" v="cv1125_rr"/>
-    <tag k="KSJ2:OPC" v="京王電鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_622"/>
-    <tag k="KSJ2:STN" v="神泉"/>
-    <tag k="KSJ2:coordinate" v="35.657183 139.693410"/>
-    <tag k="KSJ2:lat" v="35.657183"/>
-    <tag k="KSJ2:long" v="139.693410"/>
-    <tag k="KSJ2:segment" v="eb02_1170"/>
-    <tag k="name" v="神泉 (Shinsen)"/>
+    <tag k="name" v="神泉"/>
     <tag k="name:en" v="Shinsen"/>
     <tag k="name:ja" v="神泉"/>
+    <tag k="name:ja_kana" v="しんせん"/>
+    <tag k="name:ja_rm" v="Shinsen"/>
     <tag k="name:ru" v="Синсэн"/>
     <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="京王電鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="IN02"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
     <tag k="wikipedia" v="ja:神泉駅"/>
   </node>
   <node id="286932730" lat="35.6587938" lon="139.6996161">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
     <tag k="KSJ2:LIN" v="井の頭線"/>
-    <tag k="KSJ2:LOC" v="cv1123_rr"/>
-    <tag k="KSJ2:OPC" v="京王電鉄"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_624"/>
-    <tag k="KSJ2:STN" v="渋谷"/>
-    <tag k="KSJ2:coordinate" v="35.658716 139.699881"/>
-    <tag k="KSJ2:lat" v="35.658716"/>
-    <tag k="KSJ2:long" v="139.699881"/>
-    <tag k="KSJ2:segment" v="eb02_1168"/>
-    <tag k="name" v="渋谷 (Shibuya)"/>
+    <tag k="name" v="渋谷"/>
     <tag k="name:en" v="Shibuya"/>
     <tag k="name:fr" v="Shibuya"/>
     <tag k="name:ja" v="渋谷"/>
+    <tag k="name:ja_kana" v="しぶや"/>
+    <tag k="name:ja_rm" v="Shibuya"/>
     <tag k="name:ru" v="Сибуя"/>
     <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="IN01"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
     <tag k="wheelchair" v="yes"/>
     <tag k="wikipedia" v="ja:渋谷駅"/>
   </node>
-  <node id="308841984" lat="35.7117791" lon="139.7982434">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
+  <node id="308839581" lat="35.7333722" lon="139.8201376">
     <tag k="KSJ2:LIN" v="伊勢崎線"/>
-    <tag k="KSJ2:LOC" v="cv17398_rr"/>
-    <tag k="KSJ2:OPC" v="東武鉄道"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_8518"/>
-    <tag k="KSJ2:STN" v="浅草"/>
-    <tag k="KSJ2:coordinate" v="35.711571 139.797929"/>
-    <tag k="KSJ2:lat" v="35.711571"/>
-    <tag k="KSJ2:long" v="139.797929"/>
-    <tag k="KSJ2:segment" v="eb02_18217"/>
-    <tag k="name" v="浅草"/>
-    <tag k="name:ja" v="浅草"/>
+    <tag k="name" v="鐘ヶ淵"/>
+    <tag k="name:en" v="Kanegafuchi"/>
+    <tag k="name:ja" v="鐘ヶ淵"/>
+    <tag k="name:ja_kana" v="かねがふち"/>
+    <tag k="name:ja_rm" v="Kanegafuchi"/>
     <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="東武鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
+    <tag k="ref" v="TS06"/>
+    <tag k="source" v="KSJ2; (URL)"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:浅草駅"/>
+    <tag k="wikipedia" v="ja:鐘ヶ淵駅"/>
   </node>
-  <node id="308842577" lat="35.7115024" lon="139.7981273">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
+  <node id="308839944" lat="35.7242790" lon="139.8193204">
     <tag k="KSJ2:LIN" v="伊勢崎線"/>
-    <tag k="KSJ2:LOC" v="cv17378_rr"/>
-    <tag k="KSJ2:OPC" v="東武鉄道"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_8533"/>
-    <tag k="KSJ2:STN" v="浅草"/>
-    <tag k="KSJ2:coordinate" v="35.711389 139.797965"/>
-    <tag k="KSJ2:lat" v="35.711389"/>
-    <tag k="KSJ2:long" v="139.797965"/>
-    <tag k="KSJ2:segment" v="eb02_18196"/>
-    <tag k="name" v="浅草 (Asakusa)"/>
-    <tag k="name:en" v="Asakusa"/>
-    <tag k="name:ja" v="浅草"/>
-    <tag k="name:ru" v="Асакуса"/>
+    <tag k="name" v="東向島"/>
+    <tag k="name:en" v="Higashi-mukojima"/>
+    <tag k="name:ja" v="東向島"/>
+    <tag k="name:ja_kana" v="ひがしむこうじま"/>
+    <tag k="name:ja_rm" v="Higashi Mukōjima"/>
     <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="東武鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
+    <tag k="ref" v="TS05"/>
+    <tag k="source" v="KSJ2; (URL)"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:浅草駅"/>
-  </node>
-  <node id="315862983" lat="35.6908178" lon="139.7703707">
-    <tag k="name" v="神田 (Kanda)"/>
-    <tag k="name:en" v="Kanda"/>
-    <tag k="name:ja" v="神田"/>
-    <tag k="name:ja_rm" v="Kanda"/>
-    <tag k="name:ru" v="Канда"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:神田駅 (東京都)"/>
-  </node>
-  <node id="315863181" lat="35.7018684" lon="139.7542272">
-    <tag k="name" v="水道橋 (Suidobashi)"/>
-    <tag k="name:en" v="Suidobashi"/>
-    <tag k="name:ja" v="水道橋"/>
-    <tag k="name:ja_rm" v="Suidōbashi"/>
-    <tag k="name:ru" v="Суйдобаси"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:水道橋駅"/>
-  </node>
-  <node id="315863463" lat="35.6813544" lon="139.7113609">
-    <tag k="name" v="千駄ケ谷 (Sendagaya)"/>
-    <tag k="name:en" v="Sendagaya"/>
-    <tag k="name:fr" v="Sendagaya"/>
-    <tag k="name:ja" v="千駄ケ谷"/>
-    <tag k="name:ja_rm" v="Sendagaya"/>
-    <tag k="name:ru" v="Сэндагая"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:千駄ケ谷駅"/>
-  </node>
-  <node id="315863473" lat="35.6834113" lon="139.7022873">
-    <tag k="name" v="代々木 (Yoyogi)"/>
-    <tag k="name:en" v="Yoyogi"/>
-    <tag k="name:fr" v="Yoyogi"/>
-    <tag k="name:ja" v="代々木"/>
-    <tag k="name:ja_rm" v="Yoyogi"/>
-    <tag k="name:ru" v="Ёёги"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:代々木駅"/>
-  </node>
-  <node id="315863497" lat="35.6800999" lon="139.7205435">
-    <tag k="name" v="信濃町 (Shinanomachi)"/>
-    <tag k="name:en" v="Shinanomachi"/>
-    <tag k="name:fr" v="Shinanomachi"/>
-    <tag k="name:ja" v="信濃町"/>
-    <tag k="name:ru" v="Синаномати"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:信濃町駅"/>
-  </node>
-  <node id="393101097" lat="35.6746521" lon="139.7624592">
-    <tag k="name" v="有楽町 (Yūrakuchō)"/>
-    <tag k="name:en" v="Yūrakuchō"/>
-    <tag k="name:fr" v="Yūrakuchō"/>
-    <tag k="name:ja" v="有楽町"/>
-    <tag k="name:ja_kana" v="ゆうらくちょう"/>
-    <tag k="name:ja_rm" v="Yūrakuchō"/>
-    <tag k="name:ru" v="Юракутё"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:有楽町駅"/>
+    <tag k="url" v="http://www.tobu.co.jp/station/info/1106.html"/>
+    <tag k="wheelchair" v="limited"/>
+    <tag k="wikipedia" v="ja:東向島駅"/>
   </node>
-  <node id="393101119" lat="35.6744897" lon="139.7626287">
-    <tag k="name" v="有楽町 (Yūrakuchō)"/>
-    <tag k="name:en" v="Yūrakuchō"/>
-    <tag k="name:fr" v="Yūrakuchō"/>
-    <tag k="name:ja" v="有楽町"/>
-    <tag k="name:ja_kana" v="ゆうらくちょう"/>
-    <tag k="name:ja_rm" v="Yūrakuchō"/>
-    <tag k="name:ru" v="Юракутё"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:有楽町駅"/>
-  </node>
-  <node id="393101126" lat="35.6745821" lon="139.7625897">
-    <tag k="name" v="有楽町 (Yūrakuchō)"/>
-    <tag k="name:en" v="Yūrakuchō"/>
-    <tag k="name:fr" v="Yūrakuchō"/>
-    <tag k="name:ja" v="有楽町"/>
-    <tag k="name:ja_kana" v="ゆうらくちょう"/>
-    <tag k="name:ja_rm" v="Yūrakuchō"/>
-    <tag k="name:ru" v="Юракутё"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:有楽町駅"/>
+  <node id="308840631" lat="35.7102800" lon="139.8088961">
+    <tag k="KSJ2:LIN" v="伊勢崎線"/>
+    <tag k="name" v="とうきょうスカイツリー"/>
+    <tag k="name:en" v="TOKYO SKYTREE"/>
+    <tag k="name:ja" v="とうきょうスカイツリー"/>
+    <tag k="name:ja_kana" v="とうきょうすかいつりー"/>
+    <tag k="name:ja_rm" v="Tōkyō Sukaitsurī"/>
+    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="old_name" v="業平橋"/>
+    <tag k="old_name:en" v="Narihirabashi"/>
+    <tag k="old_name:ja" v="業平橋"/>
+    <tag k="old_name:ja_kana" v="なりひらばし"/>
+    <tag k="old_name:ja_rm" v="Narihirabashi"/>
+    <tag k="operator" v="東武鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="TS02"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wikipedia" v="ja:とうきょうスカイツリー駅"/>
   </node>
-  <node id="393105021" lat="35.6551278" lon="139.7570787">
-    <tag k="name" v="浜松町 (Hamamatsuchō)"/>
-    <tag k="name:en" v="Hamamatsuchō"/>
-    <tag k="name:fr" v="Hamamatsuchō"/>
-    <tag k="name:ja" v="浜松町"/>
-    <tag k="name:ja_kana" v="はままつちょう"/>
-    <tag k="name:ja_rm" v="Hamamatsuchō"/>
-    <tag k="name:ru" v="Хамамацутё"/>
+  <node id="308841810" lat="35.7183044" lon="139.8168120">
+    <tag k="KSJ2:LIN" v="伊勢崎線"/>
+    <tag k="name" v="曳舟"/>
+    <tag k="name:en" v="Hikifune"/>
+    <tag k="name:ja" v="曳舟"/>
+    <tag k="name:ja_kana" v="ひきふね"/>
+    <tag k="name:ja_rm" v="Hikifune"/>
+    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="東武鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:浜松町駅"/>
-  </node>
-  <node id="410589395" lat="35.7151478" lon="139.6873411">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="新宿線"/>
-    <tag k="KSJ2:LOC" v="cv9719_rr"/>
-    <tag k="KSJ2:OPC" v="西武鉄道"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_4917"/>
-    <tag k="KSJ2:STN" v="中井"/>
-    <tag k="KSJ2:coordinate" v="35.715129 139.687348"/>
-    <tag k="KSJ2:lat" v="35.715129"/>
-    <tag k="KSJ2:long" v="139.687348"/>
-    <tag k="KSJ2:segment" v="eb02_10226"/>
-    <tag k="name" v="中井 (Nakai)"/>
-    <tag k="name:en" v="Nakai"/>
-    <tag k="name:ja" v="中井"/>
-    <tag k="name:ja_kana" v="なかい"/>
-    <tag k="name:ja_rm" v="Nakai"/>
+    <tag k="ref" v="TS04"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="url" v="http://www.tobu.co.jp/station/info/1104.html"/>
+    <tag k="wikipedia" v="ja:曳舟駅"/>
+  </node>
+  <node id="308842028" lat="35.7094505" lon="139.8135414">
+    <tag k="alt_name:en" v="Oshiage;SKYTREE"/>
+    <tag k="alt_name:ja" v="押上;スカイツリー前"/>
+    <tag k="alt_name:ja_kana" v="おしあげ;すかいつりーまえ"/>
+    <tag k="name" v="押上〈スカイツリー前〉"/>
+    <tag k="name:en" v="Oshiage 'SKYTREE'"/>
+    <tag k="name:ja" v="押上〈スカイツリー前〉"/>
+    <tag k="name:ja_kana" v="おしあげ〈すかいつりーまえ〉"/>
+    <tag k="name:ja_rm" v="Oshiage 'Sukaitsurī'"/>
+    <tag k="name:ru" v="Осиагэ"/>
     <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="東京地下鉄;東武鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Z14;TS03"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:中井駅"/>
-  </node>
-  <node id="410589623" lat="35.7126540" lon="139.7038129">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="新宿線"/>
-    <tag k="KSJ2:LOC" v="cv9716_rr"/>
-    <tag k="KSJ2:OPC" v="西武鉄道"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_4913"/>
-    <tag k="KSJ2:STN" v="高田馬場"/>
-    <tag k="KSJ2:coordinate" v="35.712576 139.704012"/>
-    <tag k="KSJ2:lat" v="35.712576"/>
-    <tag k="KSJ2:long" v="139.704012"/>
-    <tag k="KSJ2:segment" v="eb02_10223"/>
-    <tag k="name" v="高田馬場 (Takadanobaba)"/>
-    <tag k="name:en" v="Takadanobaba"/>
-    <tag k="name:ja" v="高田馬場"/>
-    <tag k="name:ru" v="Такаданобаба"/>
+    <tag k="wikipedia" v="ja:押上駅"/>
+  </node>
+  <node id="339081985" lat="35.7104047" lon="139.8127233">
+    <tag k="alt_name" v="スカイツリー前"/>
+    <tag k="alt_name:en" v="SKYTREE"/>
+    <tag k="alt_name:ja" v="スカイツリー前"/>
+    <tag k="name" v="押上"/>
+    <tag k="name:en" v="Oshiage"/>
+    <tag k="name:ja" v="押上"/>
+    <tag k="name:ja_kana" v="おしあげ"/>
+    <tag k="name:ja_rm" v="Oshiage"/>
+    <tag k="name:ru" v="Осиагэ"/>
     <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="京成電鉄;東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="KS45;A20"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:高田馬場駅"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:押上駅"/>
   </node>
   <node id="410589674" lat="35.6960912" lon="139.7000455">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
     <tag k="KSJ2:LIN" v="新宿線"/>
-    <tag k="KSJ2:LOC" v="cv9722_rr"/>
-    <tag k="KSJ2:OPC" v="西武鉄道"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_4923"/>
-    <tag k="KSJ2:STN" v="西武新宿"/>
-    <tag k="KSJ2:coordinate" v="35.696051 139.700044"/>
-    <tag k="KSJ2:lat" v="35.696051"/>
-    <tag k="KSJ2:long" v="139.700044"/>
-    <tag k="KSJ2:segment" v="eb02_10229"/>
-    <tag k="name" v="西武新宿 (Seibu Shinjuku)"/>
-    <tag k="name:en" v="Seibu Shinjuku"/>
+    <tag k="name" v="西武新宿"/>
+    <tag k="name:en" v="Seibu-Shinjuku"/>
     <tag k="name:ja" v="西武新宿"/>
     <tag k="name:ja_kana" v="せいぶしんじゅく"/>
     <tag k="name:ja_rm" v="Seibu Shinjuku"/>
     <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="西武鉄道"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="SS01"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
     <tag k="wikipedia" v="ja:西武新宿駅"/>
   </node>
   <node id="410590121" lat="35.7157440" lon="139.6955027">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
     <tag k="KSJ2:LIN" v="新宿線"/>
-    <tag k="KSJ2:LOC" v="cv9718_rr"/>
-    <tag k="KSJ2:OPC" v="西武鉄道"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_4912"/>
-    <tag k="KSJ2:STN" v="下落合"/>
-    <tag k="KSJ2:coordinate" v="35.715698 139.695497"/>
-    <tag k="KSJ2:lat" v="35.715698"/>
-    <tag k="KSJ2:long" v="139.695497"/>
-    <tag k="KSJ2:segment" v="eb02_10225"/>
-    <tag k="name" v="下落合 (Shimo-Ochiai)"/>
+    <tag k="name" v="下落合"/>
     <tag k="name:en" v="Shimo-Ochiai"/>
     <tag k="name:ja" v="下落合"/>
     <tag k="name:ja_kana" v="しもおちあい"/>
     <tag k="name:ja_rm" v="Shimo-Ochiai"/>
     <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="西武鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="SS03"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
     <tag k="wikipedia" v="ja:下落合駅"/>
   </node>
-  <node id="661104587" lat="35.7061910" lon="139.6837019"/>
-  <node id="661104588" lat="35.7061898" lon="139.6838812"/>
-  <node id="661104589" lat="35.7062314" lon="139.6838815"/>
-  <node id="661104590" lat="35.7062276" lon="139.6837022"/>
-  <node id="661104591" lat="35.7064236" lon="139.6838422"/>
-  <node id="661104592" lat="35.7064231" lon="139.6836249"/>
-  <node id="661104593" lat="35.7063609" lon="139.6836304"/>
-  <node id="661104594" lat="35.7062276" lon="139.6835422"/>
-  <node id="661104595" lat="35.7063590" lon="139.6835392"/>
-  <node id="661104596" lat="35.7063513" lon="139.6838440"/>
-  <node id="661104598" lat="35.7062464" lon="139.6859507"/>
-  <node id="661104599" lat="35.7062221" lon="139.6865474"/>
-  <node id="661104600" lat="35.7062209" lon="139.6861622"/>
-  <node id="661104601" lat="35.7061619" lon="139.6861625"/>
-  <node id="661104602" lat="35.7061648" lon="139.6859553"/>
-  <node id="661104603" lat="35.7064172" lon="139.6859858"/>
-  <node id="661104604" lat="35.7064178" lon="139.6860515"/>
-  <node id="661104605" lat="35.7063717" lon="139.6859886"/>
-  <node id="661104606" lat="35.7063682" lon="139.6860502"/>
-  <node id="661104607" lat="35.7063730" lon="139.6865423"/>
-  <node id="712804323" lat="35.7089720" lon="139.7965830">
-    <tag k="name" v="浅草 (Asakusa)"/>
+  <node id="475369200" lat="35.6993001" lon="139.7184399">
+    <tag k="name" v="若松河田"/>
+    <tag k="name:en" v="Wakamatsu-kawada"/>
+    <tag k="name:ja" v="若松河田"/>
+    <tag k="name:ja_kana" v="わかまつかわだ"/>
+    <tag k="name:ja_rm" v="Wakamatsu Kawada"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E03"/>
+  </node>
+  <node id="652432152" lat="35.6317387" lon="139.7304131">
+    <tag k="name" v="高輪台"/>
+    <tag k="name:en" v="Takanawadai"/>
+    <tag k="name:ja" v="高輪台"/>
+    <tag k="name:ja_kana" v="たかなわだい"/>
+    <tag k="name:ja_rm" v="Takanawadai"/>
+    <tag k="name:ru" v="Таканавадай"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="A06"/>
+    <tag k="wikipedia" v="ja:高輪台駅"/>
+  </node>
+  <node id="664579553" lat="35.7264476" lon="139.6948922">
+    <tag k="KSJ2:LIN" v="池袋線"/>
+    <tag k="name" v="椎名町"/>
+    <tag k="name:en" v="Shiinamachi"/>
+    <tag k="name:ja" v="椎名町"/>
+    <tag k="name:ja_kana" v="しいなまち"/>
+    <tag k="name:ja_rm" v="Shiinamachi"/>
+    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="西武鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="SI02"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wikipedia" v="ja:椎名町駅"/>
+  </node>
+  <node id="664579562" lat="35.7274419" lon="139.7106772">
+    <tag k="KSJ2:LIN" v="池袋線"/>
+    <tag k="name" v="池袋"/>
+    <tag k="name:en" v="Ikebukuro"/>
+    <tag k="name:ja" v="池袋"/>
+    <tag k="name:ja_kana" v="いけぶくろ"/>
+    <tag k="name:ja_rm" v="Ikebukuro"/>
+    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="西武鉄道"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="SI01"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wikipedia" v="ja:池袋駅"/>
+  </node>
+  <node id="701666147" lat="35.7070709" lon="139.8318226">
+    <tag k="name" v="東あずま"/>
+    <tag k="name:en" v="Higashi-azuma"/>
+    <tag k="name:ja" v="東あずま"/>
+    <tag k="name:ja_kana" v="ひがしあずま"/>
+    <tag k="name:ja_rm" v="Higashi Azuma"/>
+    <tag k="operator" v="東武鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="TS42"/>
+    <tag k="wikipedia" v="ja:東あずま駅"/>
+  </node>
+  <node id="701666174" lat="35.6976624" lon="139.8274024">
+    <tag k="name" v="亀戸"/>
+    <tag k="name:en" v="Kameido"/>
+    <tag k="name:ja" v="亀戸"/>
+    <tag k="name:ja_kana" v="かめいど"/>
+    <tag k="name:ja_rm" v="Kameido"/>
+    <tag k="operator" v="東武鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="TS44"/>
+    <tag k="wikipedia" v="ja:亀戸駅"/>
+  </node>
+  <node id="712804323" lat="35.7089846" lon="139.7965207">
+    <tag k="name" v="浅草"/>
     <tag k="name:en" v="Asakusa"/>
     <tag k="name:ja" v="浅草"/>
+    <tag k="name:ja_kana" v="あさくさ"/>
+    <tag k="name:ja_rm" v="Asakusa"/>
     <tag k="name:ru" v="Асакуса"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="note" v="浅草線"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="A18"/>
     <tag k="wheelchair" v="yes"/>
     <tag k="wikipedia" v="ja:浅草駅"/>
   </node>
-  <node id="748883630" lat="35.6571866" lon="139.6938485"/>
-  <node id="748883688" lat="35.6573150" lon="139.6938397"/>
-  <node id="748883708" lat="35.6571036" lon="139.6935027"/>
-  <node id="748883737" lat="35.6571790" lon="139.6937714">
-    <tag k="barrier" v="entrance"/>
-    <tag k="bicycle" v="no"/>
-    <tag k="foot" v="yes"/>
-    <tag k="name" v="南口"/>
-  </node>
-  <node id="748883763" lat="35.6572662" lon="139.6934403"/>
-  <node id="748883768" lat="35.6572266" lon="139.6934438">
-    <tag k="barrier" v="entrance"/>
-    <tag k="bicycle" v="no"/>
-    <tag k="foot" v="yes"/>
-    <tag k="name" v="西口"/>
+  <node id="772364943" lat="35.7337333" lon="139.7681087">
+    <tag k="layer" v="5"/>
+    <tag k="name" v="西日暮里"/>
+    <tag k="name:en" v="Nishi-nippori"/>
+    <tag k="name:ja" v="西日暮里"/>
+    <tag k="name:ja_kana" v="にしにっぽり"/>
+    <tag k="name:ja_rm" v="Nishi Nippori"/>
+    <tag k="name:ru" v="Ниси-Ниппори"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="02"/>
+    <tag k="wikipedia" v="ja:西日暮里駅"/>
+  </node>
+  <node id="772389775" lat="35.7289204" lon="139.7713635">
+    <tag k="layer" v="5"/>
+    <tag k="name" v="日暮里"/>
+    <tag k="name:en" v="Nippori"/>
+    <tag k="name:ja" v="日暮里"/>
+    <tag k="name:ja_kana" v="にっぽり"/>
+    <tag k="name:ja_rm" v="Nippori"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="01"/>
+    <tag k="wikipedia" v="ja:日暮里駅"/>
   </node>
   <node id="789405355" lat="35.7066179" lon="139.7602092">
-    <tag k="name" v="本郷三丁目 (Hongo-sanchome)"/>
+    <tag k="name" v="本郷三丁目"/>
     <tag k="name:en" v="Hongo-sanchome"/>
     <tag k="name:ja" v="本郷三丁目"/>
+    <tag k="name:ja_kana" v="ほんごうさんちょうめ"/>
+    <tag k="name:ja_rm" v="Hongō Sanchōme"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="M21"/>
     <tag k="wikipedia" v="ja:本郷三丁目駅"/>
   </node>
-  <node id="789412066" lat="35.7105675" lon="139.7530695">
-    <tag k="name" v="春日"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:春日駅 (東京都)"/>
-  </node>
-  <node id="790011743" lat="35.7065031" lon="139.6828723">
-    <tag k="fixme" v="position estimated"/>
-    <tag k="name" v="東中野 (都営大江戸線)"/>
-    <tag k="note" v="estimated"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:東中野駅"/>
-  </node>
-  <node id="832289046" lat="35.7213730" lon="139.7064491">
+  <node id="832289046" lat="35.7211861" lon="139.7064823">
     <tag k="int_name" v="Mejiro Station"/>
-    <tag k="name" v="目白 (Mejiro)"/>
+    <tag k="name" v="目白"/>
     <tag k="name:en" v="Mejiro"/>
     <tag k="name:ja" v="目白"/>
+    <tag k="name:ja_kana" v="めじろ"/>
     <tag k="name:ja_rm" v="Mejiro"/>
     <tag k="name:ru" v="Мэдзиро"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:目白駅"/>
   </node>
-  <node id="907673367" lat="35.6589786" lon="139.7771860">
-    <tag k="name" v="勝どき (Kachidoki)"/>
-    <tag k="name:en" v="Kachidoki"/>
-    <tag k="name:ja" v="勝どき"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:勝どき駅"/>
-  </node>
-  <node id="955519000" lat="35.6897495" lon="139.6842645">
-    <tag k="name" v="西新宿五丁目(Nishi-shinjuku-gochōme Station)"/>
+  <node id="1063379042" lat="35.6345353" lon="139.7916044">
+    <tag k="name" v="国際展示場"/>
+    <tag k="name:en" v="Kokusai-tenjijo"/>
+    <tag k="name:ja" v="国際展示場"/>
+    <tag k="name:ja_kana" v="こくさいてんじじょう"/>
+    <tag k="name:ja_rm" v="Kokusai Tenjijō"/>
+    <tag k="operator" v="東京臨海高速鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:西新宿五丁目駅"/>
-  </node>
-  <node id="1003337762" lat="35.7187678" lon="139.7513601">
-    <tag k="name" v="白山駅"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:白山駅 (東京都)"/>
+    <tag k="wikipedia" v="ja:国際展示場駅"/>
   </node>
   <node id="1074739698" lat="35.7038890" lon="139.7342220">
-    <tag k="name" v="神楽坂 (Kagurazaka)"/>
+    <tag k="name" v="神楽坂"/>
     <tag k="name:en" v="Kagurazaka"/>
     <tag k="name:ja" v="神楽坂"/>
-    <tag k="operator" v="東京メトロ"/>
+    <tag k="name:ja_kana" v="かぐらざか"/>
+    <tag k="name:ja_rm" v="Kagurazaka"/>
+    <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="ref" v="T07"/>
+    <tag k="ref" v="T05"/>
     <tag k="wikipedia" v="ja:神楽坂駅"/>
   </node>
-  <node id="1093541223" lat="35.7131834" lon="139.7040743"/>
-  <node id="1093541232" lat="35.7121880" lon="139.7034925"/>
-  <node id="1093541235" lat="35.7141620" lon="139.7041715"/>
-  <node id="1093541238" lat="35.7141686" lon="139.7041351"/>
-  <node id="1093541240" lat="35.7124756" lon="139.7037417"/>
-  <node id="1093541242" lat="35.7116203" lon="139.7032946"/>
-  <node id="1093541244" lat="35.7126539" lon="139.7036544"/>
-  <node id="1093541247" lat="35.7140644" lon="139.7041528"/>
-  <node id="1093541250" lat="35.7126804" lon="139.7038132"/>
-  <node id="1093541253" lat="35.7117917" lon="139.7033099"/>
-  <node id="1093541256" lat="35.7129678" lon="139.7041816"/>
-  <node id="1093541259" lat="35.7136886" lon="139.7038865"/>
-  <node id="1093541262" lat="35.7127430" lon="139.7037045"/>
-  <node id="1093541264" lat="35.7131267" lon="139.7042647"/>
-  <node id="1093541270" lat="35.7131311" lon="139.7036934"/>
-  <node id="1093541282" lat="35.7135664" lon="139.7040072"/>
-  <node id="1093541284" lat="35.7124536" lon="139.7035946"/>
-  <node id="1093541287" lat="35.7139260" lon="139.7039912"/>
-  <node id="1093541289" lat="35.7130309" lon="139.7038651"/>
-  <node id="1093541294" lat="35.7127139" lon="139.7036712"/>
-  <node id="1093541299" lat="35.7119877" lon="139.7036103"/>
-  <node id="1093541312" lat="35.7127609" lon="139.7038517"/>
-  <node id="1093541316" lat="35.7120901" lon="139.7033984"/>
-  <node id="1093541318" lat="35.7116285" lon="139.7032625"/>
-  <node id="1093541321" lat="35.7140825" lon="139.7040988"/>
-  <node id="1093541324" lat="35.7139248" lon="139.7040146"/>
-  <node id="1093541326" lat="35.7124734" lon="139.7035164"/>
-  <node id="1093541329" lat="35.7118723" lon="139.7037498"/>
-  <node id="1093541339" lat="35.7133924" lon="139.7037793"/>
-  <node id="1093541341" lat="35.7120073" lon="139.7035888"/>
-  <node id="1093541343" lat="35.7121946" lon="139.7039161"/>
-  <node id="1093541345" lat="35.7127652" lon="139.7041199"/>
-  <node id="1093541347" lat="35.7136837" lon="139.7040329"/>
-  <node id="1093541349" lat="35.7115413" lon="139.7036049"/>
-  <node id="1093541352" lat="35.7112975" lon="139.7035057"/>
-  <node id="1093541364" lat="35.7113345" lon="139.7033877"/>
-  <node id="1093541365" lat="35.7126249" lon="139.7037880"/>
-  <node id="1093541366" lat="35.7118718" lon="139.7033884"/>
-  <node id="1093541367" lat="35.7115369" lon="139.7034574"/>
-  <node id="1093541368" lat="35.7123580" lon="139.7039697"/>
-  <node id="1093541369" lat="35.7140763" lon="139.7040797"/>
-  <node id="1093541371" lat="35.7127287" lon="139.7037571"/>
-  <node id="1116460130" lat="35.7131714" lon="139.7040019"/>
-  <node id="1116460133" lat="35.7131920" lon="139.7040743"/>
-  <node id="1116460134" lat="35.7133271" lon="139.7040354"/>
-  <node id="1116460135" lat="35.7134871" lon="139.7040971"/>
-  <node id="1116460137" lat="35.7136385" lon="139.7041454"/>
-  <node id="1116460140" lat="35.7134959" lon="139.7040756"/>
-  <node id="1116460141" lat="35.7131616" lon="139.7040394"/>
-  <node id="1116460142" lat="35.7131322" lon="139.7042714"/>
-  <node id="1116460143" lat="35.7134980" lon="139.7045114"/>
-  <node id="1116460146" lat="35.7135612" lon="139.7043787"/>
-  <node id="1116460149" lat="35.7135111" lon="139.7044833"/>
-  <node id="1125926432" lat="35.6803864" lon="139.7198540"/>
-  <node id="1125926437" lat="35.6801174" lon="139.7210445"/>
-  <node id="1125926438" lat="35.6803004" lon="139.7195103"/>
-  <node id="1125926440" lat="35.6804638" lon="139.7198134"/>
-  <node id="1125926446" lat="35.6799126" lon="139.7202667"/>
-  <node id="1125926452" lat="35.6798690" lon="139.7205591"/>
-  <node id="1125926455" lat="35.6798232" lon="139.7209775"/>
-  <node id="1125926456" lat="35.6800041" lon="139.7196820"/>
-  <node id="1125926458" lat="35.6803047" lon="139.7198402"/>
-  <node id="1125926459" lat="35.6804943" lon="139.7195559"/>
-  <node id="1127216265" lat="35.6582756" lon="139.7012882"/>
-  <node id="1127216276" lat="35.6584077" lon="139.7012454"/>
-  <node id="1127216277" lat="35.6584711" lon="139.7016206"/>
-  <node id="1127216283" lat="35.6588853" lon="139.7005884"/>
-  <node id="1127216290" lat="35.6579766" lon="139.7012618"/>
-  <node id="1127216297" lat="35.6580248" lon="139.7014140"/>
-  <node id="1127216299" lat="35.6586815" lon="139.7012020"/>
-  <node id="1139431605" lat="35.6912979" lon="139.7356275"/>
-  <node id="1139431606" lat="35.6911428" lon="139.7357292"/>
-  <node id="1139431609" lat="35.6912294" lon="139.7356820"/>
-  <node id="1139431610" lat="35.6910776" lon="139.7356050"/>
-  <node id="1139431612" lat="35.6912213" lon="139.7356667"/>
-  <node id="1139431614" lat="35.6912246" lon="139.7354879"/>
-  <node id="1314077022" lat="35.6892079" lon="139.7000486"/>
-  <node id="1314077031" lat="35.6893781" lon="139.7010637"/>
-  <node id="1314077044" lat="35.6897551" lon="139.6999108"/>
-  <node id="1314077047" lat="35.6899305" lon="139.7009189"/>
-  <node id="1316050986" lat="35.6574840" lon="139.7018709"/>
-  <node id="1316051005" lat="35.6575334" lon="139.7020229"/>
-  <node id="1316051049" lat="35.6578774" lon="139.7014441"/>
-  <node id="1316051068" lat="35.6577100" lon="139.7016426"/>
-  <node id="1316051070" lat="35.6577673" lon="139.7016052"/>
-  <node id="1316051071" lat="35.6578922" lon="139.7017858"/>
-  <node id="1316051077" lat="35.6581978" lon="139.7013217"/>
-  <node id="1316051094" lat="35.6582711" lon="139.7015985"/>
-  <node id="1316051096" lat="35.6583003" lon="139.7017018"/>
-  <node id="1316051099" lat="35.6585235" lon="139.7014875"/>
-  <node id="1316051100" lat="35.6585466" lon="139.7015963"/>
-  <node id="1316051102" lat="35.6588272" lon="139.7013849"/>
-  <node id="1316051103" lat="35.6589282" lon="139.7010623"/>
-  <node id="1316051107" lat="35.6588345" lon="139.7000276"/>
-  <node id="1316051108" lat="35.6590402" lon="139.7012988"/>
-  <node id="1316051109" lat="35.6590442" lon="139.7013295"/>
-  <node id="1316051110" lat="35.6591249" lon="139.7012013"/>
-  <node id="1316051111" lat="35.6591356" lon="139.7012786"/>
-  <node id="1316051112" lat="35.6593273" lon="139.7010186"/>
-  <node id="1316051113" lat="35.6593381" lon="139.7011764"/>
-  <node id="1354438501" lat="35.6572699" lon="139.6934852"/>
-  <node id="1354438502" lat="35.6573638" lon="139.6934801"/>
-  <node id="1354438503" lat="35.6574208" lon="139.6936501"/>
-  <node id="1354438504" lat="35.6573745" lon="139.6937638"/>
-  <node id="1417172219" lat="35.6556008" lon="139.7569995"/>
-  <node id="1417172251" lat="35.6547368" lon="139.7570588"/>
-  <node id="1417172263" lat="35.6555496" lon="139.7572971"/>
-  <node id="1417172290" lat="35.6548772" lon="139.7568306"/>
-  <node id="1456006005" lat="35.7167239" lon="139.7586106">
+  <node id="1152742616" lat="35.6973542" lon="139.8271809">
+    <tag k="KSJ2:LIN" v="総武線"/>
+    <tag k="name" v="亀戸"/>
+    <tag k="name:en" v="Kameido"/>
+    <tag k="name:ja" v="亀戸"/>
+    <tag k="name:ja_kana" v="かめいど"/>
+    <tag k="name:ja_rm" v="Kameido"/>
+    <tag k="name:ru" v="Камэйдо"/>
+    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://w3land.mlit.go.jp/ksj2/datalist/N02.html"/>
+    <tag k="wikipedia" v="ja:亀戸駅"/>
+  </node>
+  <node id="1180276047" lat="35.6884236" lon="139.8061202">
+    <tag k="name" v="菊川"/>
+    <tag k="name:en" v="Kikukawa"/>
+    <tag k="name:ja" v="菊川"/>
+    <tag k="name:ja_kana" v="きくかわ"/>
+    <tag k="name:ja_rm" v="Kikukawa"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="S12"/>
+    <tag k="wikipedia" v="ja:菊川駅 (東京都)"/>
+  </node>
+  <node id="1313835205" lat="35.7172428" lon="139.8187441"/>
+  <node id="1313835209" lat="35.7172177" lon="139.8187763"/>
+  <node id="1313835234" lat="35.7174322" lon="139.8188890"/>
+  <node id="1313835237" lat="35.7174039" lon="139.8189211"/>
+  <node id="1313835239" lat="35.7173756" lon="139.8188916"/>
+  <node id="1313835242" lat="35.7175564" lon="139.8193060"/>
+  <node id="1313835291" lat="35.7172123" lon="139.8188031"/>
+  <node id="1313835293" lat="35.7173364" lon="139.8189507"/>
+  <node id="1313835298" lat="35.7173146" lon="139.8189989"/>
+  <node id="1313835309" lat="35.7172243" lon="139.8187884"/>
+  <node id="1313835311" lat="35.7176641" lon="139.8191773"/>
+  <node id="1354370217" lat="35.7332554" lon="139.7990037">
+    <tag k="name" v="南千住"/>
+    <tag k="name:en" v="Minami-Senju"/>
+    <tag k="name:fr" v="Minami-Senju"/>
+    <tag k="name:ja" v="南千住"/>
+    <tag k="name:ja_kana" v="みなみせんじゅ"/>
+    <tag k="name:ja_rm" v="Minami Senju"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:南千住駅"/>
+  </node>
+  <node id="1456006005" lat="35.7172543" lon="139.7582015">
     <tag k="name" v="東大前"/>
+    <tag k="name:en" v="Todaimae"/>
+    <tag k="name:ja" v="東大前"/>
+    <tag k="name:ja_kana" v="とうだいまえ"/>
+    <tag k="name:ja_rm" v="Tōdai Mae"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="N12"/>
     <tag k="wikipedia" v="ja:東大前駅"/>
   </node>
-  <node id="1496842209" lat="35.6571102" lon="139.6935630"/>
-  <node id="1496842212" lat="35.6571302" lon="139.6935937"/>
-  <node id="1496842222" lat="35.6571684" lon="139.6935919"/>
-  <node id="1496842224" lat="35.6571698" lon="139.6934993"/>
-  <node id="1496842229" lat="35.6571855" lon="139.6934439"/>
-  <node id="1496842244" lat="35.6573715" lon="139.6935994"/>
-  <node id="1496842246" lat="35.6573736" lon="139.6937224"/>
-  <node id="1496842254" lat="35.6574057" lon="139.6937207"/>
-  <node id="1496842255" lat="35.6574122" lon="139.6936178"/>
-  <node id="1566526411" lat="35.7002621" lon="139.7437172"/>
-  <node id="1566526414" lat="35.7002924" lon="139.7436546"/>
-  <node id="1566526464" lat="35.7009848" lon="139.7442005"/>
-  <node id="1566526465" lat="35.7009947" lon="139.7441233"/>
-  <node id="1566526467" lat="35.7010027" lon="139.7441167"/>
-  <node id="1566526468" lat="35.7010484" lon="139.7442391"/>
-  <node id="1566526469" lat="35.7011075" lon="139.7442818"/>
-  <node id="1566526470" lat="35.7011109" lon="139.7441877"/>
-  <node id="1566526471" lat="35.7011725" lon="139.7443278"/>
-  <node id="1566526472" lat="35.7012297" lon="139.7443751"/>
-  <node id="1566526473" lat="35.7012515" lon="139.7442905"/>
-  <node id="1566526477" lat="35.7013466" lon="139.7444751"/>
-  <node id="1566526479" lat="35.7013569" lon="139.7443800"/>
-  <node id="1566526482" lat="35.7014592" lon="139.7445857"/>
-  <node id="1566526485" lat="35.7014899" lon="139.7445043"/>
-  <node id="1566526489" lat="35.7015740" lon="139.7447062"/>
-  <node id="1566526490" lat="35.7016225" lon="139.7446432"/>
-  <node id="1566526495" lat="35.7016769" lon="139.7448274"/>
-  <node id="1566526498" lat="35.7017347" lon="139.7448935"/>
-  <node id="1566526499" lat="35.7017501" lon="139.7447900"/>
-  <node id="1566526501" lat="35.7017842" lon="139.7449588"/>
-  <node id="1566526504" lat="35.7018386" lon="139.7450364"/>
-  <node id="1566526507" lat="35.7018775" lon="139.7450965"/>
-  <node id="1566526513" lat="35.7018921" lon="139.7449758"/>
-  <node id="1566526516" lat="35.7019335" lon="139.7451951"/>
-  <node id="1566526517" lat="35.7019385" lon="139.7450725"/>
-  <node id="1566526524" lat="35.7020333" lon="139.7453716"/>
-  <node id="1566526526" lat="35.7020340" lon="139.7452407"/>
-  <node id="1566526535" lat="35.7020958" lon="139.7454951"/>
-  <node id="1566526538" lat="35.7021027" lon="139.7453677"/>
-  <node id="1566526541" lat="35.7021418" lon="139.7455993"/>
-  <node id="1566526550" lat="35.7021702" lon="139.7455084"/>
-  <node id="1566526552" lat="35.7021955" lon="139.7457198"/>
-  <node id="1566526554" lat="35.7022340" lon="139.7456584"/>
-  <node id="1566526555" lat="35.7022428" lon="139.7458473"/>
-  <node id="1566526556" lat="35.7022908" lon="139.7458127"/>
-  <node id="1573806456" lat="35.6994098" lon="139.7651550"/>
-  <node id="1573806457" lat="35.6996364" lon="139.7651474"/>
-  <node id="1573806458" lat="35.6997060" lon="139.7636756"/>
-  <node id="1573806459" lat="35.6993183" lon="139.7651293"/>
-  <node id="1573806460" lat="35.6999107" lon="139.7639331"/>
-  <node id="1573806461" lat="35.6996907" lon="139.7637373"/>
-  <node id="1573806462" lat="35.6997060" lon="139.7638285"/>
-  <node id="1573806463" lat="35.6994250" lon="139.7650917"/>
-  <node id="1573806464" lat="35.6992856" lon="139.7652956"/>
-  <node id="1573806465" lat="35.6997253" lon="139.7637537"/>
-  <node id="1573806466" lat="35.6998562" lon="139.7636531"/>
-  <node id="1573806467" lat="35.6998890" lon="139.7635513"/>
-  <node id="1573806468" lat="35.6997775" lon="139.7637215"/>
-  <node id="1573806469" lat="35.6998171" lon="139.7636274"/>
-  <node id="1573806470" lat="35.6995848" lon="139.7653857"/>
-  <node id="1573806471" lat="35.6993401" lon="139.7653653"/>
-  <node id="1573806472" lat="35.7000131" lon="139.7636220"/>
-  <node id="1573951978" lat="35.7001047" lon="139.7437242"/>
-  <node id="1573952008" lat="35.7002112" lon="139.7438107"/>
-  <node id="1573952030" lat="35.7003167" lon="139.7436047"/>
-  <node id="1573952039" lat="35.7002055" lon="139.7435182"/>
-  <node id="1574055072" lat="35.6858863" lon="139.7309728"/>
-  <node id="1574055076" lat="35.6863198" lon="139.7299455"/>
-  <node id="1574055091" lat="35.6860889" lon="139.7308615"/>
-  <node id="1574055098" lat="35.6860094" lon="139.7303626"/>
-  <node id="1574055102" lat="35.6860769" lon="139.7309326"/>
-  <node id="1574055116" lat="35.6861532" lon="139.7307059"/>
-  <node id="1574055117" lat="35.6861085" lon="139.7308347"/>
-  <node id="1574055122" lat="35.6861172" lon="139.7307864"/>
-  <node id="1574055123" lat="35.6861085" lon="139.7308682"/>
-  <node id="1574055126" lat="35.6859081" lon="139.7308695"/>
-  <node id="1574055132" lat="35.6859687" lon="139.7308901"/>
-  <node id="1574055138" lat="35.6859774" lon="139.7308418"/>
-  <node id="1574055140" lat="35.6859135" lon="139.7308239"/>
-  <node id="1574055145" lat="35.6860399" lon="139.7310157"/>
-  <node id="1574055151" lat="35.6860591" lon="139.7309263"/>
-  <node id="1574055154" lat="35.6861680" lon="139.7307090"/>
-  <node id="1574055178" lat="35.6860933" lon="139.7308360"/>
-  <node id="1574055209" lat="35.6859796" lon="139.7301538"/>
-  <node id="1574055211" lat="35.6860072" lon="139.7301614"/>
-  <node id="1574055221" lat="35.6861375" lon="139.7307922"/>
-  <node id="1574055223" lat="35.6860362" lon="139.7298547"/>
-  <node id="1574055224" lat="35.6859687" lon="139.7303536"/>
-  <node id="1579679822" lat="35.7126494" lon="139.7036751"/>
-  <node id="1580297718" lat="35.7063709" lon="139.6863294"/>
-  <node id="1593485519" lat="35.6574975" lon="139.7019123"/>
-  <node id="1593485596" lat="35.6593374" lon="139.7011657"/>
-  <node id="1666008298" lat="35.7202384" lon="139.7790611"/>
-  <node id="1666008299" lat="35.7203169" lon="139.7791847"/>
-  <node id="1666008301" lat="35.7203675" lon="139.7789367"/>
-  <node id="1666008312" lat="35.7204460" lon="139.7790603"/>
-  <node id="1676538667" lat="35.7011872" lon="139.7000870"/>
-  <node id="1676538668" lat="35.7011918" lon="139.7000037"/>
-  <node id="1676538669" lat="35.7012156" lon="139.7000029"/>
-  <node id="1676538670" lat="35.7012169" lon="139.6999791"/>
-  <node id="1676538671" lat="35.7012175" lon="139.7003051"/>
+  <node id="1674898934" lat="35.6962671" lon="139.8133546"/>
+  <node id="1674898988" lat="35.6963095" lon="139.8133506"/>
+  <node id="1674898996" lat="35.6963367" lon="139.8132971"/>
+  <node id="1674899019" lat="35.6963388" lon="139.8146843"/>
+  <node id="1674899059" lat="35.6963790" lon="139.8131098"/>
+  <node id="1674899064" lat="35.6963839" lon="139.8132874"/>
+  <node id="1674899112" lat="35.6963975" lon="139.8146777"/>
+  <node id="1674899133" lat="35.6964051" lon="139.8148021"/>
+  <node id="1674899226" lat="35.6964790" lon="139.8131018"/>
+  <node id="1674899299" lat="35.6965670" lon="139.8146643"/>
+  <node id="1674899306" lat="35.6965702" lon="139.8147793"/>
+  <node id="1674899510" lat="35.6969189" lon="139.8129294"/>
+  <node id="1674899567" lat="35.6969544" lon="139.8140513"/>
+  <node id="1674899575" lat="35.6969569" lon="139.8139120"/>
+  <node id="1674899585" lat="35.6969736" lon="139.8147765"/>
+  <node id="1674899611" lat="35.6970547" lon="139.8129183"/>
+  <node id="1674899613" lat="35.6970612" lon="139.8130572"/>
+  <node id="1674899640" lat="35.6971014" lon="139.8130518"/>
+  <node id="1674899642" lat="35.6971042" lon="139.8130251"/>
+  <node id="1674899653" lat="35.6971248" lon="139.8130251"/>
+  <node id="1674899656" lat="35.6971400" lon="139.8130364"/>
+  <node id="1674899663" lat="35.6971759" lon="139.8130732"/>
+  <node id="1674899669" lat="35.6971835" lon="139.8132277"/>
+  <node id="1674899672" lat="35.6971878" lon="139.8134317"/>
+  <node id="1674899674" lat="35.6971943" lon="139.8137294"/>
+  <node id="1674899678" lat="35.6971960" lon="139.8131261"/>
+  <node id="1674899690" lat="35.6971981" lon="139.8132083"/>
+  <node id="1674899692" lat="35.6972003" lon="139.8139033"/>
+  <node id="1674899699" lat="35.6972033" lon="139.8140380"/>
+  <node id="1674899705" lat="35.6972041" lon="139.8131729"/>
+  <node id="1674899708" lat="35.6972256" lon="139.8147519"/>
   <node id="1676538673" lat="35.7014516" lon="139.6969104"/>
-  <node id="1676538675" lat="35.7012336" lon="139.7000926"/>
-  <node id="1676538676" lat="35.7012381" lon="139.6999815"/>
-  <node id="1676538677" lat="35.7012420" lon="139.6999395"/>
   <node id="1676538678" lat="35.7014113" lon="139.6968324"/>
-  <node id="1676538679" lat="35.7013715" lon="139.7003218"/>
-  <node id="1676538680" lat="35.7014004" lon="139.6999537"/>
   <node id="1676538684" lat="35.7016398" lon="139.6967480"/>
   <node id="1676538685" lat="35.7016522" lon="139.6965851"/>
   <node id="1676749651" lat="35.6733781" lon="139.7035869"/>
@@ -1260,127 +1052,46 @@
   <node id="1676750156" lat="35.7000875" lon="139.6978081"/>
   <node id="1676750165" lat="35.7015241" lon="139.6966884"/>
   <node id="1676750167" lat="35.7015425" lon="139.6967218"/>
-  <node id="1677072308" lat="35.7206473" lon="139.7063158"/>
-  <node id="1677072310" lat="35.7206662" lon="139.7062348"/>
-  <node id="1677072313" lat="35.7209084" lon="139.7064109"/>
-  <node id="1677072315" lat="35.7209244" lon="139.7066610"/>
-  <node id="1677072321" lat="35.7209754" lon="139.7064698"/>
-  <node id="1677072323" lat="35.7210122" lon="139.7063677"/>
-  <node id="1677072325" lat="35.7213283" lon="139.7067959"/>
-  <node id="1677072332" lat="35.7214014" lon="139.7065256"/>
-  <node id="1679318952" lat="35.6575873" lon="139.6974022"/>
-  <node id="1679318953" lat="35.6578864" lon="139.6972863"/>
-  <node id="1679318955" lat="35.6579847" lon="139.6987456"/>
-  <node id="1679318957" lat="35.6580128" lon="139.6987344"/>
-  <node id="1679318959" lat="35.6580236" lon="139.6987578"/>
-  <node id="1679318960" lat="35.6581237" lon="139.6987132"/>
-  <node id="1679318962" lat="35.6581370" lon="139.6987203"/>
-  <node id="1679318964" lat="35.6581593" lon="139.6987935"/>
-  <node id="1679318976" lat="35.6581593" lon="139.6988383"/>
-  <node id="1679318978" lat="35.6581659" lon="139.6988820"/>
-  <node id="1679318979" lat="35.6581832" lon="139.6990061"/>
-  <node id="1679318980" lat="35.6581981" lon="139.6989430"/>
-  <node id="1679318982" lat="35.6582163" lon="139.6989634"/>
-  <node id="1679318983" lat="35.6583896" lon="139.6985217"/>
-  <node id="1679318984" lat="35.6584073" lon="139.6985859"/>
-  <node id="1679318985" lat="35.6584399" lon="139.6986840"/>
-  <node id="1679318988" lat="35.6584771" lon="139.6987628"/>
-  <node id="1679318992" lat="35.6585418" lon="139.7000595"/>
-  <node id="1679319000" lat="35.6586942" lon="139.6992077"/>
-  <node id="1679319014" lat="35.6588355" lon="139.6996277"/>
-  <node id="1679319015" lat="35.6589150" lon="139.7000088"/>
-  <node id="1682293969" lat="35.7117981" lon="139.7982003">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
-    <tag k="KSJ2:LIN" v="伊勢崎線"/>
-    <tag k="KSJ2:LOC" v="cv17398_rr"/>
-    <tag k="KSJ2:OPC" v="東武鉄道"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_8518"/>
-    <tag k="KSJ2:STN" v="浅草"/>
-    <tag k="KSJ2:coordinate" v="35.711571 139.797929"/>
-    <tag k="KSJ2:lat" v="35.711571"/>
-    <tag k="KSJ2:long" v="139.797929"/>
-    <tag k="KSJ2:segment" v="eb02_18217"/>
-    <tag k="name" v="浅草"/>
-    <tag k="name:ja" v="浅草"/>
-    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
-    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="KSJ2"/>
-    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
-    <tag k="wikipedia" v="ja:浅草駅"/>
+  <node id="1680721134" lat="35.7103484" lon="139.8275461">
+    <tag k="name" v="小村井"/>
+    <tag k="name:en" v="Omurai"/>
+    <tag k="name:ja" v="小村井"/>
+    <tag k="name:ja_kana" v="おむらい"/>
+    <tag k="name:ja_rm" v="Omurai"/>
+    <tag k="operator" v="東武鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="TS41"/>
+    <tag k="wikipedia" v="ja:小村井駅"/>
   </node>
-  <node id="1682293990" lat="35.7118493" lon="139.7981095">
-    <tag k="KSJ2:INT" v="4"/>
-    <tag k="KSJ2:INT_label" v="民営鉄道"/>
+  <node id="1682293969" lat="35.7117981" lon="139.7982003">
     <tag k="KSJ2:LIN" v="伊勢崎線"/>
-    <tag k="KSJ2:LOC" v="cv17398_rr"/>
-    <tag k="KSJ2:OPC" v="東武鉄道"/>
-    <tag k="KSJ2:RAC" v="12"/>
-    <tag k="KSJ2:RAC_label" v="普通鉄道"/>
-    <tag k="KSJ2:RAS" v="eb03_8518"/>
-    <tag k="KSJ2:STN" v="浅草"/>
-    <tag k="KSJ2:coordinate" v="35.711571 139.797929"/>
-    <tag k="KSJ2:lat" v="35.711571"/>
-    <tag k="KSJ2:long" v="139.797929"/>
-    <tag k="KSJ2:segment" v="eb02_18217"/>
     <tag k="name" v="浅草"/>
+    <tag k="name:en" v="Asakusa"/>
     <tag k="name:ja" v="浅草"/>
+    <tag k="name:ja_kana" v="あさくさ"/>
+    <tag k="name:ja_rm" v="Asakusa"/>
+    <tag k="name:ru" v="Асакуса"/>
     <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
     <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="東武鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="TS01"/>
     <tag k="source" v="KSJ2"/>
     <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
     <tag k="wikipedia" v="ja:浅草駅"/>
   </node>
-  <node id="1692889003" lat="35.6956407" lon="139.7941749"/>
-  <node id="1692889007" lat="35.6956621" lon="139.7938942"/>
-  <node id="1692889009" lat="35.6956990" lon="139.7939022"/>
-  <node id="1692889012" lat="35.6957329" lon="139.7941792"/>
-  <node id="1692889018" lat="35.6957843" lon="139.7922448"/>
-  <node id="1692889033" lat="35.6958032" lon="139.7920114"/>
-  <node id="1692889038" lat="35.6958157" lon="139.7931805"/>
-  <node id="1692889043" lat="35.6958225" lon="139.7922506"/>
-  <node id="1692889058" lat="35.6959303" lon="139.7923857"/>
-  <node id="1692889060" lat="35.6959578" lon="139.7919982"/>
-  <node id="1692889063" lat="35.6959952" lon="139.7931978"/>
-  <node id="1692889064" lat="35.6960091" lon="139.7930333"/>
-  <node id="1692889080" lat="35.6963035" lon="139.7925008"/>
-  <node id="1692889081" lat="35.6963087" lon="139.7924318"/>
-  <node id="1692889082" lat="35.6963219" lon="139.7930637"/>
-  <node id="1692889083" lat="35.6963301" lon="139.7925492"/>
-  <node id="1692889084" lat="35.6963333" lon="139.7925047"/>
-  <node id="1692889085" lat="35.6963530" lon="139.7926395"/>
-  <node id="1692889086" lat="35.6963611" lon="139.7926396"/>
-  <node id="1692889087" lat="35.6963694" lon="139.7925546"/>
-  <node id="1698152597" lat="35.6701382" lon="139.7027699"/>
-  <node id="1698152598" lat="35.6701559" lon="139.7025996"/>
-  <node id="1698152604" lat="35.6702872" lon="139.7027927"/>
-  <node id="1698152606" lat="35.6704385" lon="139.7026416"/>
-  <node id="1698152609" lat="35.6704450" lon="139.7027944"/>
-  <node id="1698152611" lat="35.6705879" lon="139.7027647"/>
-  <node id="1698152612" lat="35.6705960" lon="139.7026812"/>
-  <node id="1730435560" lat="35.6786154" lon="139.6935469"/>
-  <node id="1730435562" lat="35.6786555" lon="139.6937684"/>
-  <node id="1730435564" lat="35.6786608" lon="139.6934752"/>
-  <node id="1730435566" lat="35.6786902" lon="139.6934965">
-    <tag k="amenity" v="vending_machine"/>
-    <tag k="vending" v="public_transport_tickets"/>
-  </node>
-  <node id="1730435569" lat="35.6786924" lon="139.6936946"/>
-  <node id="1730435575" lat="35.6787152" lon="139.6935148">
-    <tag k="access" v="yes"/>
-    <tag k="entrance" v="main"/>
-  </node>
-  <node id="1730435578" lat="35.6789656" lon="139.6938718"/>
-  <node id="1730435580" lat="35.6790020" lon="139.6937972"/>
-  <node id="1730435581" lat="35.6790121" lon="139.6939710"/>
-  <node id="1730435582" lat="35.6790933" lon="139.6937895"/>
-  <node id="1808422475" lat="35.6803914" lon="139.7198243"/>
-  <node id="1808422477" lat="35.6804376" lon="139.7198326"/>
-  <node id="1808422478" lat="35.6804425" lon="139.7198061"/>
+  <node id="1683186729" lat="35.7191971" lon="139.8210946"/>
+  <node id="1683186730" lat="35.7192123" lon="139.8210764"/>
+  <node id="1683186731" lat="35.7192202" lon="139.8211560"/>
+  <node id="1683186732" lat="35.7192223" lon="139.8211289"/>
+  <node id="1683186733" lat="35.7192685" lon="139.8212162"/>
+  <node id="1683186735" lat="35.7192814" lon="139.8209619"/>
+  <node id="1683186737" lat="35.7192974" lon="139.8211826"/>
+  <node id="1683186738" lat="35.7193124" lon="139.8209211"/>
+  <node id="1683186739" lat="35.7193692" lon="139.8210758"/>
+  <node id="1683186740" lat="35.7194070" lon="139.8210318"/>
   <node id="1817685075" lat="35.7070564" lon="139.7511990"/>
   <node id="1817685076" lat="35.7070603" lon="139.7516240"/>
   <node id="1817685077" lat="35.7070686" lon="139.7508990"/>
@@ -1397,147 +1108,169 @@
   <node id="1817685121" lat="35.7074838" lon="139.7514511"/>
   <node id="1817685126" lat="35.7075383" lon="139.7514559"/>
   <node id="1817685128" lat="35.7075438" lon="139.7517037"/>
-  <node id="1817716746" lat="35.7064391" lon="139.7598085"/>
-  <node id="1817716755" lat="35.7064569" lon="139.7599687"/>
-  <node id="1817716756" lat="35.7064584" lon="139.7599811"/>
-  <node id="1817716758" lat="35.7064627" lon="139.7600599"/>
-  <node id="1817716760" lat="35.7064682" lon="139.7599668"/>
-  <node id="1817716761" lat="35.7064683" lon="139.7600958"/>
-  <node id="1817716769" lat="35.7064994" lon="139.7600239"/>
-  <node id="1817716785" lat="35.7065592" lon="139.7600865"/>
-  <node id="1817716791" lat="35.7065718" lon="139.7603339"/>
-  <node id="1817716796" lat="35.7065782" lon="139.7597850"/>
-  <node id="1817716799" lat="35.7065847" lon="139.7598295"/>
-  <node id="1817716805" lat="35.7066287" lon="139.7603274"/>
-  <node id="1817716808" lat="35.7066358" lon="139.7604212"/>
-  <node id="1817716810" lat="35.7066386" lon="139.7598012"/>
-  <node id="1817716814" lat="35.7066770" lon="139.7602040"/>
-  <node id="1817716817" lat="35.7066871" lon="139.7604149"/>
-  <node id="1817716822" lat="35.7067129" lon="139.7600908"/>
-  <node id="1817716823" lat="35.7067160" lon="139.7597733"/>
-  <node id="1817716824" lat="35.7067358" lon="139.7600435"/>
-  <node id="1817716825" lat="35.7067370" lon="139.7601200"/>
-  <node id="1817716826" lat="35.7067402" lon="139.7601934"/>
-  <node id="1817716832" lat="35.7067610" lon="139.7598242"/>
-  <node id="1817716833" lat="35.7067623" lon="139.7599011"/>
-  <node id="1825133008" lat="35.6719440" lon="139.7638890">
-    <tag k="name" v="銀座 (Ginza)"/>
-    <tag k="name:en" v="Ginza"/>
-    <tag k="name:fr" v="Ginza"/>
-    <tag k="name:ja" v="銀座"/>
-    <tag k="name:ja_kana" v="ぎんざ"/>
-    <tag k="name:ja_rm" v="Ginza"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:銀座駅"/>
-  </node>
   <node id="1825133046" lat="35.7072930" lon="139.7506042"/>
   <node id="1825133049" lat="35.7073185" lon="139.7506049"/>
   <node id="1825133052" lat="35.7073305" lon="139.7517037"/>
   <node id="1825133056" lat="35.7073625" lon="139.7517037"/>
   <node id="1832344259" lat="35.6884720" lon="139.7881390">
-    <tag k="name" v="浜町 (Hamachō)"/>
-    <tag k="name:en" v="Hamachō"/>
+    <tag k="name" v="浜町"/>
+    <tag k="name:en" v="Hamacho"/>
     <tag k="name:ja" v="浜町"/>
+    <tag k="name:ja_kana" v="はまちょう"/>
+    <tag k="name:ja_rm" v="Hamachō"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="S10"/>
     <tag k="wikipedia" v="ja:浜町駅"/>
   </node>
-  <node id="1844517097" lat="35.6750764" lon="139.7596059">
-    <tag k="name" v="日比谷 (Hibiya)"/>
+  <node id="1844517097" lat="35.6751014" lon="139.7594785">
+    <tag k="name" v="日比谷"/>
     <tag k="name:en" v="Hibiya"/>
     <tag k="name:fr" v="Hibiya"/>
     <tag k="name:ja" v="日比谷"/>
     <tag k="name:ja_kana" v="ひびや"/>
-    <tag k="name:ja_rm" v="Hibiya Dōri"/>
+    <tag k="name:ja_rm" v="Hibiya"/>
+    <tag k="operator" v="東京地下鉄;東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="C09;H07;I08"/>
     <tag k="wikipedia" v="ja:日比谷駅"/>
   </node>
-  <node id="1894258026" lat="35.6954720" lon="139.7514170">
-    <tag k="name" v="九段下 (Kudanshita)"/>
+  <node id="1894258026" lat="35.6954462" lon="139.7513808">
+    <tag k="name" v="九段下"/>
     <tag k="name:en" v="Kudanshita"/>
     <tag k="name:ja" v="九段下"/>
+    <tag k="name:ja_kana" v="くだんした"/>
+    <tag k="name:ja_rm" v="Kudanshita"/>
+    <tag k="operator" v="東京地下鉄;東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="T07:Z06;S05"/>
     <tag k="wikipedia" v="ja:九段下駅"/>
   </node>
-  <node id="1894258028" lat="35.6950560" lon="139.7666670">
-    <tag k="name" v="小川町 (Ogawamachi)"/>
+  <node id="1894258028" lat="35.6948951" lon="139.7661916">
+    <tag k="name" v="小川町"/>
     <tag k="name:en" v="Ogawamachi"/>
     <tag k="name:ja" v="小川町"/>
+    <tag k="name:ja_kana" v="おがわまち"/>
+    <tag k="name:ja_rm" v="Ogawamachi"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="S07"/>
     <tag k="wikipedia" v="ja:小川町駅 (東京都)"/>
   </node>
-  <node id="1894258029" lat="35.6955560" lon="139.7758610">
-    <tag k="name" v="岩本町 (Iwamotochō)"/>
-    <tag k="name:en" v="Iwamotochō"/>
+  <node id="1894258029" lat="35.6955634" lon="139.7755631">
+    <tag k="name" v="岩本町"/>
+    <tag k="name:en" v="Iwamotocho"/>
     <tag k="name:ja" v="岩本町"/>
+    <tag k="name:ja_kana" v="いわもとちょう"/>
+    <tag k="name:ja_rm" v="Iwamotochō"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="S08"/>
     <tag k="wikipedia" v="ja:岩本町駅"/>
   </node>
   <node id="1894258031" lat="35.6915560" lon="139.7376390">
     <tag k="name" v="市ヶ谷 (Ichigaya)"/>
     <tag k="name:en" v="Ichigaya"/>
     <tag k="name:ja" v="市ヶ谷"/>
+    <tag k="name:ja_rm" v="Ichigaya"/>
     <tag k="railway" v="station"/>
   </node>
   <node id="1894258032" lat="35.6906390" lon="139.7062500">
-    <tag k="name" v="新宿三丁目 (Shinjuku-sanchome)"/>
+    <tag k="name" v="新宿三丁目"/>
     <tag k="name:en" v="Shinjuku-sanchome"/>
     <tag k="name:ja" v="新宿三丁目"/>
+    <tag k="name:ja_kana" v="しんじゅくさんちょうめ"/>
+    <tag k="name:ja_rm" v="Shinjuku sanchōme"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="S02"/>
     <tag k="wikipedia" v="ja:新宿三丁目駅"/>
   </node>
   <node id="1894258034" lat="35.7057738" lon="139.7212830">
-    <tag k="name" v="早稲田 (Waseda)"/>
+    <tag k="name" v="早稲田"/>
     <tag k="name:en" v="Waseda"/>
     <tag k="name:ja" v="早稲田"/>
+    <tag k="name:ja_kana" v="わせだ"/>
+    <tag k="name:ja_rm" v="Waseda"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="T04"/>
     <tag k="wikipedia" v="ja:早稲田駅 (東京地下鉄)"/>
   </node>
   <node id="1894258037" lat="35.6923890" lon="139.7228610">
-    <tag k="name" v="曙橋 (Akebonobashi)"/>
+    <tag k="name" v="曙橋"/>
     <tag k="name:en" v="Akebonobashi"/>
     <tag k="name:ja" v="曙橋"/>
+    <tag k="name:ja_kana" v="あけぼのばし"/>
+    <tag k="name:ja_rm" v="Akebonobashi"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="S03"/>
     <tag k="wikipedia" v="ja:曙橋駅"/>
   </node>
-  <node id="1894258038" lat="35.6959170" lon="139.7580560">
-    <tag k="name" v="神保町 (Jimbōchō)"/>
-    <tag k="name:en" v="Jimbōchō"/>
+  <node id="1894258038" lat="35.6959288" lon="139.7580523">
+    <tag k="name" v="神保町"/>
+    <tag k="name:en" v="Jimbocho"/>
     <tag k="name:ja" v="神保町"/>
+    <tag k="name:ja_kana" v="じんぼうちょう"/>
+    <tag k="name:ja_rm" v="Jimbōchō"/>
+    <tag k="operator" v="東京都交通局;東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="I10;S06;Z07"/>
     <tag k="wikipedia" v="ja:神保町駅"/>
   </node>
-  <node id="1894258040" lat="35.6904235" lon="139.7571391">
-    <tag k="name" v="竹橋 (Takebashi)"/>
+  <node id="1894258040" lat="35.6904578" lon="139.7572095">
+    <tag k="name" v="竹橋"/>
     <tag k="name:en" v="Takebashi"/>
     <tag k="name:ja" v="竹橋"/>
-    <tag k="operator" v="東京メトロ"/>
+    <tag k="name:ja_kana" v="たけばし"/>
+    <tag k="name:ja_rm" v="Takebashi"/>
+    <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="T08"/>
     <tag k="wikipedia" v="ja:竹橋駅"/>
   </node>
-  <node id="1894258041" lat="35.7016670" lon="139.7435560">
-    <tag k="name" v="飯田橋 (Iidabashi)"/>
+  <node id="1894258041" lat="35.7016731" lon="139.7435260">
+    <tag k="name" v="飯田橋"/>
     <tag k="name:en" v="Iidabashi"/>
     <tag k="name:ja" v="飯田橋"/>
+    <tag k="name:ja_kana" v="いいだばし"/>
+    <tag k="name:ja_rm" v="Iidabashi"/>
     <tag k="name:ru" v="Иидабаси"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:飯田橋駅"/>
   </node>
   <node id="1894258043" lat="35.6921110" lon="139.7827780">
-    <tag k="name" v="馬喰横山 (Bakuro-yokoyama)"/>
-    <tag k="name:en" v="Bauro-yokoyama"/>
+    <tag k="name" v="馬喰横山"/>
+    <tag k="name:en" v="Bakuroyokoyama"/>
     <tag k="name:ja" v="馬喰横山"/>
+    <tag k="name:ja_kana" v="ばくろよこやま"/>
+    <tag k="name:ja_rm" v="Bakuro Yokoyama"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="S09"/>
     <tag k="wikipedia" v="ja:馬喰横山駅"/>
   </node>
-  <node id="1894258044" lat="35.7137473" lon="139.7039816">
-    <tag k="name" v="高田馬場 (Takadanobaba)"/>
+  <node id="1894258044" lat="35.7137754" lon="139.7039963">
+    <tag k="name" v="高田馬場"/>
     <tag k="name:en" v="Takadanobaba"/>
     <tag k="name:ja" v="高田馬場"/>
+    <tag k="name:ja_kana" v="たかだのばば"/>
+    <tag k="name:ja_rm" v="Takadanobaba"/>
     <tag k="name:ru" v="Такаданобаба"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
@@ -1545,54 +1278,72 @@
     <tag k="ref" v="T03"/>
     <tag k="wikipedia" v="ja:高田馬場駅"/>
   </node>
-  <node id="1901881582" lat="35.6983685" lon="139.7730318">
-    <tag k="name" v="秋葉原 (Akihabara)"/>
+  <node id="1901881582" lat="35.6983747" lon="139.7730446">
+    <tag k="name" v="秋葉原"/>
     <tag k="name:en" v="Akihabara"/>
-    <tag k="name:ja" v="秋葉原駅"/>
+    <tag k="name:ja" v="秋葉原"/>
     <tag k="name:ja_kana" v="あきはばら"/>
     <tag k="name:ja_rm" v="Akihabara"/>
     <tag k="name:ru" v="Акихабара"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:秋葉原駅"/>
   </node>
-  <node id="1913640131" lat="35.6571490" lon="139.6935928">
-    <tag k="barrier" v="entrance"/>
-  </node>
   <node id="1918062080" lat="35.6973936" lon="139.7846863">
-    <tag k="name" v="浅草橋 (Asakusabashi)"/>
+    <tag k="name" v="浅草橋"/>
+    <tag k="name:en" v="Asakusabashi"/>
+    <tag k="name:ja" v="浅草橋"/>
+    <tag k="name:ja_kana" v="あさくさばし"/>
     <tag k="name:ja_rm" v="Asakusabashi"/>
     <tag k="name:ru" v="Асакусабаси"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:浅草橋駅"/>
   </node>
   <node id="1919930807" lat="35.7070921" lon="139.7516617"/>
-  <node id="1923761824" lat="35.6802677" lon="139.7793289">
-    <tag k="name" v="茅場町(Kayabacho)"/>
-    <tag k="operator" v="東京メトロ"/>
+  <node id="1923746850" lat="35.6683367" lon="139.8318957">
+    <tag k="name" v="南砂町"/>
+    <tag k="name:en" v="Minami-sunamachi"/>
+    <tag k="name:ja" v="南砂町"/>
+    <tag k="name:ja_kana" v="みなみすなまち"/>
+    <tag k="name:ja_rm" v="Minami Sunamachi"/>
+    <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="ref" v="T11"/>
-    <tag k="wikipedia" v="ja:茅場町駅"/>
+    <tag k="ref" v="T15"/>
+    <tag k="wikipedia" v="ja:南砂町駅"/>
   </node>
-  <node id="1923761825" lat="35.6824360" lon="139.7739734">
-    <tag k="name" v="日本橋 (Nihombashi)"/>
-    <tag k="name:ja" v="日本橋"/>
-    <tag k="operator" v="東京メトロ"/>
+  <node id="1923746858" lat="35.6695896" lon="139.8173420">
+    <tag k="name" v="東陽町"/>
+    <tag k="name:en" v="Toyocho"/>
+    <tag k="name:ja" v="東陽町"/>
+    <tag k="name:ja_kana" v="とうようちょう"/>
+    <tag k="name:ja_rm" v="Tōyōchō"/>
+    <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="ref" v="T10"/>
-    <tag k="wikipedia" v="ja:日本橋駅 (東京都)"/>
+    <tag k="ref" v="T14"/>
+    <tag k="wikipedia" v="ja:東陽町駅"/>
   </node>
-  <node id="1923761826" lat="35.6720759" lon="139.7955920">
-    <tag k="name" v="門前仲町(Monzen-nakacho)"/>
-    <tag k="operator" v="東京メトロ"/>
+  <node id="1923761823" lat="35.6694110" lon="139.8065300">
+    <tag k="name" v="木場"/>
+    <tag k="name:en" v="Kiba"/>
+    <tag k="name:ja" v="木場"/>
+    <tag k="name:ja_kana" v="きば"/>
+    <tag k="name:ja_rm" v="Kiba"/>
+    <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="ref" v="T12"/>
-    <tag k="wikipedia" v="ja:門前仲町駅"/>
+    <tag k="ref" v="T13"/>
+    <tag k="wikipedia" v="ja:木場駅"/>
   </node>
   <node id="1923768928" lat="35.6845755" lon="139.7664660">
-    <tag k="name" v="大手町 (Ōtemachi)"/>
+    <tag k="name" v="大手町"/>
     <tag k="name:en" v="Ōtemachi"/>
     <tag k="name:fr" v="Ōtemachi"/>
     <tag k="name:ja" v="大手町"/>
@@ -1604,37 +1355,17 @@
     <tag k="ref" v="T09"/>
     <tag k="wikipedia" v="ja:大手町駅 (東京都)"/>
   </node>
-  <node id="1923768929" lat="35.6902897" lon="139.7583415">
-    <tag k="name" v="竹橋 (Takebashi)"/>
-    <tag k="name:en" v="Takebashi"/>
-    <tag k="name:ja" v="竹橋"/>
-    <tag k="operator" v="東京メトロ"/>
-    <tag k="platforms" v="2"/>
-    <tag k="railway" v="station"/>
-    <tag k="ref" v="T08"/>
-    <tag k="wikipedia" v="ja:竹橋駅"/>
-  </node>
-  <node id="1924752331" lat="35.7203979" lon="139.7789730"/>
-  <node id="1924752332" lat="35.7206823" lon="139.7786898"/>
-  <node id="1924752333" lat="35.7206910" lon="139.7786001"/>
-  <node id="1924752334" lat="35.7207034" lon="139.7786071"/>
-  <node id="1924752335" lat="35.7207332" lon="139.7786680"/>
-  <node id="1924752337" lat="35.7208248" lon="139.7788976"/>
-  <node id="1924752338" lat="35.7208577" lon="139.7788666"/>
-  <node id="1924752339" lat="35.7208889" lon="139.7784566"/>
-  <node id="1924752340" lat="35.7208889" lon="139.7785292"/>
-  <node id="1924752342" lat="35.7209318" lon="139.7785462"/>
-  <node id="1924752344" lat="35.7209725" lon="139.7784906"/>
-  <node id="1924752345" lat="35.7210300" lon="139.7786940"/>
-  <node id="1924752346" lat="35.7210816" lon="139.7786644"/>
-  <node id="1926189614" lat="35.6853330" lon="139.7743330">
-    <tag k="name" v="三越前 (Mitsukoshimae)"/>
+  <node id="1926189614" lat="35.6861584" lon="139.7740108">
+    <tag k="name" v="三越前"/>
     <tag k="name:en" v="Mitsukoshimae"/>
     <tag k="name:fr" v="Mitsukoshimae"/>
     <tag k="name:ja" v="三越前"/>
     <tag k="name:ja_kana" v="みつこしまえ"/>
-    <tag k="name:ja_rm" v="Mitsukoshimae"/>
+    <tag k="name:ja_rm" v="Mitsukoshi Mae"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G12"/>
     <tag k="wikipedia" v="ja:三越前駅"/>
   </node>
   <node id="1926189615" lat="35.7117500" lon="139.7759720">
@@ -1642,201 +1373,305 @@
     <tag k="name:en" v="Ueno"/>
     <tag k="name:fr" v="Ueno"/>
     <tag k="name:ja" v="上野"/>
-    <tag k="name:ja_kana" v="うえのおんしこうえん"/>
+    <tag k="name:ja_kana" v="うえの"/>
     <tag k="name:ja_rm" v="Ueno"/>
     <tag k="name:ru" v="Уэно"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:上野駅"/>
   </node>
-  <node id="1926189616" lat="35.7076390" lon="139.7729720">
-    <tag k="name" v="上野広小路 (Uenohirokoji)"/>
-    <tag k="name:en" v="Uenohirokoji"/>
+  <node id="1926189616" lat="35.7078264" lon="139.7730499">
+    <tag k="name" v="上野広小路"/>
+    <tag k="name:en" v="Ueno-hirokoji"/>
+    <tag k="name:ja" v="上野広小路"/>
+    <tag k="name:ja_kana" v="うえのひろこうじ"/>
+    <tag k="name:ja_rm" v="Ueno Hirokōji"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G15"/>
     <tag k="uic_ref" v="上野広小路"/>
     <tag k="wikipedia" v="ja:上野広小路駅"/>
   </node>
   <node id="1926189617" lat="35.6768330" lon="139.7701390">
-    <tag k="name" v="京橋 (Kyobashi)"/>
+    <tag k="name" v="京橋"/>
     <tag k="name:en" v="Kyobashi"/>
     <tag k="name:ja" v="京橋"/>
+    <tag k="name:ja_kana" v="きょうばし"/>
+    <tag k="name:ja_rm" v="Kyōbashi"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G10"/>
     <tag k="wikipedia" v="ja:京橋駅 (東京都)"/>
   </node>
-  <node id="1926189618" lat="35.6705560" lon="139.7178610">
-    <tag k="name" v="外苑前 (Gaiemmae)"/>
+  <node id="1926189618" lat="35.6704896" lon="139.7178719">
+    <tag k="name" v="外苑前"/>
     <tag k="name:en" v="Gaiemmae"/>
     <tag k="name:ja" v="外苑前"/>
+    <tag k="name:ja_kana" v="がいえんまえ"/>
+    <tag k="name:ja_rm" v="Gaien Mae"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G03"/>
     <tag k="wikipedia" v="ja:外苑前駅"/>
   </node>
   <node id="1926189619" lat="35.6674057" lon="139.7584668">
-    <tag k="name" v="新橋 (Shimbashi)"/>
+    <tag k="name" v="新橋"/>
     <tag k="name:en" v="Shimbashi"/>
     <tag k="name:fr" v="Shimbashi"/>
     <tag k="name:ja" v="新橋"/>
     <tag k="name:ja_kana" v="しんばし"/>
     <tag k="name:ja_rm" v="Shimbashi"/>
     <tag k="name:ru" v="Симбаси"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G08"/>
     <tag k="wikipedia" v="ja:新橋駅"/>
   </node>
-  <node id="1926189620" lat="35.6825280" lon="139.7736940">
-    <tag k="name" v="日本橋 (Nihombashi)"/>
+  <node id="1926189620" lat="35.6820616" lon="139.7733998">
+    <tag k="name" v="日本橋"/>
     <tag k="name:en" v="Nihombashi"/>
     <tag k="name:ja" v="日本橋"/>
+    <tag k="name:ja_kana" v="にほんばし"/>
+    <tag k="name:ja_rm" v="Nihombashi"/>
+    <tag k="note" v="銀座線"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G11"/>
     <tag k="wikipedia" v="ja:日本橋駅 (東京都)"/>
   </node>
-  <node id="1926189621" lat="35.7029440" lon="139.7716670">
-    <tag k="name" v="末広町 (Suehirocho)"/>
+  <node id="1926189621" lat="35.7029442" lon="139.7717397">
+    <tag k="name" v="末広町"/>
     <tag k="name:en" v="Suehirocho"/>
     <tag k="name:ja" v="末広町"/>
+    <tag k="name:ja_kana" v="すえひろちょう"/>
+    <tag k="name:ja_rm" v="Suehirochō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G14"/>
     <tag k="wikipedia" v="ja:末広町駅 (東京都)"/>
   </node>
   <node id="1926189622" lat="35.7108330" lon="139.7978330">
-    <tag k="name" v="浅草 (Asakusa)"/>
+    <tag k="name" v="浅草"/>
     <tag k="name:en" v="Asakusa"/>
     <tag k="name:fr" v="Asakusa"/>
     <tag k="name:ja" v="浅草"/>
     <tag k="name:ja_kana" v="あさくさ"/>
     <tag k="name:ja_rm" v="Asakusa"/>
     <tag k="name:ru" v="Асакуса"/>
+    <tag k="note" v="銀座線"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G19"/>
     <tag k="wikipedia" v="ja:浅草駅"/>
   </node>
   <node id="1926189623" lat="35.6719440" lon="139.7413890">
-    <tag k="name" v="溜池山王 (Tameike-sanno)"/>
+    <tag k="name" v="溜池山王"/>
     <tag k="name:en" v="Tameike-sanno"/>
     <tag k="name:ja" v="溜池山王"/>
+    <tag k="name:ja_kana" v="ためいけさんのう"/>
+    <tag k="name:ja_rm" v="Tameike San-nō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G06;N06"/>
     <tag k="wikipedia" v="ja:溜池山王駅"/>
   </node>
-  <node id="1926189624" lat="35.7098610" lon="139.7907780">
-    <tag k="name" v="田原町 (Tawaramachi)"/>
+  <node id="1926189624" lat="35.7098197" lon="139.7907780">
+    <tag k="name" v="田原町"/>
     <tag k="name:en" v="Tawaramachi"/>
     <tag k="name:ja" v="田原町"/>
+    <tag k="name:ja_kana" v="たわらまち"/>
+    <tag k="name:ja_rm" v="Tawaramachi"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G18"/>
     <tag k="wikipedia" v="ja:田原町駅 (東京都)"/>
   </node>
   <node id="1926189625" lat="35.6937500" lon="139.7708890">
-    <tag k="name" v="神田 (Kanda)"/>
+    <tag k="name" v="神田"/>
     <tag k="name:en" v="Kanda"/>
     <tag k="name:ja" v="神田"/>
+    <tag k="name:ja_kana" v="かんだ"/>
+    <tag k="name:ja_rm" v="Kanda"/>
     <tag k="name:ru" v="Канда"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G13"/>
     <tag k="wikipedia" v="ja:神田駅 (東京都)"/>
   </node>
-  <node id="1926189626" lat="35.6701390" lon="139.7500000">
-    <tag k="name" v="虎ノ門 (Toranomon)"/>
+  <node id="1926189626" lat="35.6701700" lon="139.7500490">
+    <tag k="name" v="虎ノ門"/>
     <tag k="name:en" v="Toranomon"/>
     <tag k="name:ja" v="虎ノ門"/>
+    <tag k="name:ja_kana" v="とらのもん"/>
+    <tag k="name:ja_rm" v="Toranomon"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="G07"/>
     <tag k="wikipedia" v="ja:虎ノ門駅"/>
   </node>
   <node id="1926239435" lat="35.6666558" lon="139.7264061">
-    <tag k="name" v="乃木坂 (Nogizaka)"/>
+    <tag k="name" v="乃木坂"/>
     <tag k="name:en" v="Nogizaka"/>
     <tag k="name:ja" v="乃木坂"/>
+    <tag k="name:ja_kana" v="のぎざか"/>
+    <tag k="name:ja_rm" v="Nogizaka"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="C05"/>
     <tag k="wikipedia" v="ja:乃木坂駅"/>
   </node>
   <node id="1926239440" lat="35.6689440" lon="139.6913060">
-    <tag k="name" v="代々木公園 (Yoyogi-kōen)"/>
-    <tag k="name:en" v="Yoyogi-kōen"/>
+    <tag k="name" v="代々木公園"/>
+    <tag k="name:en" v="Yoyogi-koen"/>
     <tag k="name:fr" v="Yoyogi-kōen"/>
     <tag k="name:ja" v="代々木公園"/>
     <tag k="name:ja_kana" v="よよぎこうえん"/>
-    <tag k="name:ja_rm" v="Yoyogi-kōen"/>
+    <tag k="name:ja_rm" v="Yoyogi kōen"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="C02"/>
     <tag k="wikipedia" v="ja:代々木公園駅"/>
   </node>
-  <node id="1926239456" lat="35.6741670" lon="139.7452780">
-    <tag k="name" v="国会議事堂前 (Kokkai-gijidomae)"/>
+  <node id="1926239451" lat="35.7255455" lon="139.7633148">
+    <tag k="name" v="千駄木"/>
+    <tag k="name:en" v="Sendagi"/>
+    <tag k="name:ja" v="千駄木"/>
+    <tag k="name:ja_kana" v="せんだぎ"/>
+    <tag k="name:ja_rm" v="Sendagi"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="C15"/>
+    <tag k="wikipedia" v="ja:千駄木駅"/>
+  </node>
+  <node id="1926239456" lat="35.6742577" lon="139.7453028">
+    <tag k="name" v="国会議事堂前"/>
     <tag k="name:en" v="Kokkai-gijidomae"/>
     <tag k="name:ja" v="国会議事堂前"/>
+    <tag k="name:ja_kana" v="こっかいぎじどうまえ"/>
+    <tag k="name:ja_rm" v="Kokkai gijidō mae"/>
+    <tag k="note" v="丸ノ内線"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="M14"/>
     <tag k="wikipedia" v="ja:国会議事堂前駅"/>
   </node>
-  <node id="1926239458" lat="35.6980560" lon="139.7660000">
-    <tag k="name" v="新御茶ノ水 (Shin-ochanomizu)"/>
+  <node id="1926239458" lat="35.6979116" lon="139.7659437">
+    <tag k="name" v="新御茶ノ水"/>
     <tag k="name:en" v="Shin-ochanomizu"/>
     <tag k="name:ja" v="新御茶ノ水"/>
+    <tag k="name:ja_kana" v="しんおちゃのみず"/>
+    <tag k="name:ja_rm" v="Shin Ochanomizu"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="C12"/>
     <tag k="wikipedia" v="ja:新御茶ノ水駅"/>
   </node>
-  <node id="1926239461" lat="35.6684720" lon="139.7054170">
-    <tag k="name" v="明治神宮前〈原宿〉 (Meiji-jingumae ‘Harajuku’)"/>
-    <tag k="name:en" v="Meiji-jingumae ‘Harajuku’"/>
+  <node id="1926239461" lat="35.6684808" lon="139.7053958">
+    <tag k="alt_name:en" v="Meiji-jingumae;Harajuku"/>
+    <tag k="alt_name:ja" v="明治神宮前;原宿"/>
+    <tag k="alt_name:ja_kana" v="めいじじんぐうまえ;はらじゅく"/>
+    <tag k="name" v="明治神宮前〈原宿〉"/>
+    <tag k="name:en" v="Meiji-jingumae 'Harajuku'"/>
     <tag k="name:ja" v="明治神宮前〈原宿〉"/>
+    <tag k="name:ja_kana" v="めいじじんぐうまえ〈はらじゅく〉"/>
+    <tag k="name:ja_rm" v="Meiji jingūmae Harajuku"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
   </node>
-  <node id="1926239464" lat="35.7173991" lon="139.7658160">
-    <tag k="name" v="根津 (Nezu)"/>
+  <node id="1926239464" lat="35.7173532" lon="139.7657220">
+    <tag k="name" v="根津"/>
     <tag k="name:en" v="Nezu"/>
     <tag k="name:fr" v="Nezu"/>
     <tag k="name:ja" v="根津"/>
     <tag k="name:ja_kana" v="ねづ"/>
     <tag k="name:ja_rm" v="Nezu"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="C14"/>
     <tag k="wikipedia" v="ja:根津駅"/>
   </node>
   <node id="1926239465" lat="35.7082217" lon="139.7699302">
-    <tag k="name" v="湯島 (Yushima)"/>
+    <tag k="name" v="湯島"/>
     <tag k="name:en" v="Yushima"/>
     <tag k="name:ja" v="湯島"/>
+    <tag k="name:ja_kana" v="ゆしま"/>
+    <tag k="name:ja_rm" v="Yushima"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="C13"/>
     <tag k="wikipedia" v="ja:湯島駅"/>
   </node>
+  <node id="1926239471" lat="35.7322969" lon="139.7668282">
+    <tag k="name" v="西日暮里"/>
+    <tag k="name:en" v="Nishi-nippori"/>
+    <tag k="name:ja" v="西日暮里"/>
+    <tag k="name:ja_kana" v="にしにっぽり"/>
+    <tag k="name:ja_rm" v="Nishi Nippori"/>
+    <tag k="name:ru" v="Ниси-Ниппори"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="C16"/>
+    <tag k="wikipedia" v="ja:西日暮里駅"/>
+  </node>
   <node id="1926239474" lat="35.6723483" lon="139.7365722">
-    <tag k="name" v="赤坂 (Akasaka)"/>
+    <tag k="level" v="-1"/>
+    <tag k="name" v="赤坂"/>
     <tag k="name:en" v="Akasaka"/>
     <tag k="name:ja" v="赤坂"/>
+    <tag k="name:ja_kana" v="あかさか"/>
+    <tag k="name:ja_rm" v="Akasaka"/>
+    <tag k="operator" v="東京メトロ"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="C06"/>
     <tag k="wikipedia" v="ja:赤坂駅 (東京都)"/>
   </node>
-  <node id="1926239476" lat="35.6730542" lon="139.7504280">
-    <tag k="name" v="霞ケ関 (Kasumigaseki)"/>
+  <node id="1926239476" lat="35.6741725" lon="139.7512008">
+    <tag k="name" v="霞ケ関"/>
     <tag k="name:en" v="Kasumigaseki"/>
     <tag k="name:ja" v="霞ケ関"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:霞ケ関駅 (東京都)"/>
-  </node>
-  <node id="1926277321" lat="35.6970232" lon="139.6825923">
-    <tag k="name" v="中野坂上 (Nakano-sakaue)"/>
-    <tag k="name:en" v="Nakano-sakaue"/>
-    <tag k="name:ja" v="中野坂上"/>
-    <tag k="operator" v="東京地下鉄"/>
-    <tag k="platforms" v="4"/>
-    <tag k="railway" v="station"/>
-    <tag k="ref" v="M06"/>
-    <tag k="wikipedia" v="ja:中野坂上駅"/>
-  </node>
-  <node id="1926277322" lat="35.6879440" lon="139.7200830">
-    <tag k="name" v="四谷三丁目 (Yotsuya-sanchome)"/>
-    <tag k="name:en" v="Yotsuya-sanchome"/>
-    <tag k="name:ja" v="四谷三丁目"/>
+    <tag k="name:ja_kana" v="かすみがせき"/>
+    <tag k="name:ja_rm" v="Kasumigaseki"/>
+    <tag k="note" v="日比谷線"/>
     <tag k="operator" v="東京地下鉄"/>
-    <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="ref" v="M11"/>
-    <tag k="wikipedia" v="ja:四谷三丁目駅"/>
+    <tag k="ref" v="H06"/>
+    <tag k="wikipedia" v="ja:霞ケ関駅 (東京都)"/>
   </node>
-  <node id="1926277330" lat="35.6867764" lon="139.7650360">
-    <tag k="name" v="大手町 (Ōtemachi)"/>
+  <node id="1926277330" lat="35.6867760" lon="139.7650360">
+    <tag k="name" v="大手町"/>
     <tag k="name:en" v="Ōtemachi"/>
     <tag k="name:fr" v="Ōtemachi"/>
     <tag k="name:ja" v="大手町"/>
     <tag k="name:ja_kana" v="おおてまち"/>
     <tag k="name:ja_rm" v="Ōtemachi"/>
     <tag k="railway" v="station"/>
+    <tag k="source" v="survey"/>
     <tag k="wikipedia" v="ja:大手町駅 (東京都)"/>
   </node>
   <node id="1926277334" lat="35.6867945" lon="139.7662001">
-    <tag k="name" v="大手町 (Ōtemachi)"/>
+    <tag k="name" v="大手町"/>
     <tag k="name:en" v="Ōtemachi"/>
     <tag k="name:fr" v="Ōtemachi"/>
     <tag k="name:ja" v="大手町"/>
@@ -1846,7 +1681,7 @@
     <tag k="wikipedia" v="ja:大手町駅 (東京都)"/>
   </node>
   <node id="1926277338" lat="35.6869804" lon="139.7636796">
-    <tag k="name" v="大手町 (Ōtemachi)"/>
+    <tag k="name" v="大手町"/>
     <tag k="name:en" v="Ōtemachi"/>
     <tag k="name:fr" v="Ōtemachi"/>
     <tag k="name:ja" v="大手町"/>
@@ -1856,7 +1691,7 @@
     <tag k="wikipedia" v="ja:大手町駅 (東京都)"/>
   </node>
   <node id="1926277342" lat="35.7005448" lon="139.7640222">
-    <tag k="name" v="御茶ノ水 (Ochanomizu)"/>
+    <tag k="name" v="御茶ノ水"/>
     <tag k="name:en" v="Ochanomizu"/>
     <tag k="name:fr" v="Ochanomizu"/>
     <tag k="name:ja" v="御茶ノ水"/>
@@ -1865,12 +1700,13 @@
     <tag k="name:ru" v="Отяномидзу"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="M20"/>
     <tag k="wikipedia" v="ja:御茶ノ水駅"/>
   </node>
-  <node id="1926277346" lat="35.6921561" lon="139.7008287">
-    <tag k="name" v="新宿 (Shinjuku)"/>
+  <node id="1926277346" lat="35.6921774" lon="139.7008290">
+    <tag k="name" v="新宿"/>
     <tag k="name:en" v="Shinjuku"/>
     <tag k="name:fr" v="Shinjuku"/>
     <tag k="name:ja" v="新宿"/>
@@ -1881,471 +1717,681 @@
     <tag k="platforms" v="2"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="M08"/>
+    <tag k="wheelchair" v="yes"/>
     <tag k="wikipedia" v="ja:新宿駅"/>
   </node>
-  <node id="1926277347" lat="35.6908519" lon="139.7048772">
-    <tag k="name" v="新宿三丁目 (Shinjuku-sanchome)"/>
-    <tag k="name:en" v="Shinjuku-sanchome"/>
-    <tag k="name:ja" v="新宿三丁目"/>
-    <tag k="operator" v="東京地下鉄"/>
-    <tag k="platforms" v="4"/>
-    <tag k="railway" v="station"/>
-    <tag k="ref" v="M09,F13"/>
-    <tag k="wikipedia" v="ja:新宿三丁目駅"/>
-  </node>
-  <node id="1926277351" lat="35.6886146" lon="139.7107019">
-    <tag k="name" v="新宿御苑前 (Shinjuku-gyoemmae)"/>
-    <tag k="name:en" v="Shinjuku-gyoemmae"/>
-    <tag k="name:ja" v="新宿御苑前"/>
-    <tag k="operator" v="東京地下鉄"/>
-    <tag k="platforms" v="2"/>
-    <tag k="railway" v="station"/>
-    <tag k="ref" v="M10"/>
-    <tag k="wikipedia" v="ja:新宿御苑前駅"/>
-  </node>
-  <node id="1926277363" lat="35.6954440" lon="139.7674440">
-    <tag k="name" v="淡路町 (Awajicho)"/>
+  <node id="1926277363" lat="35.6951289" lon="139.7674570">
+    <tag k="name" v="淡路町"/>
     <tag k="name:en" v="Awajicho"/>
     <tag k="name:ja" v="淡路町"/>
+    <tag k="name:ja_kana" v="あわじちょう"/>
+    <tag k="name:ja_rm" v="Awajichō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="M19"/>
     <tag k="wikipedia" v="ja:淡路町駅"/>
   </node>
   <node id="1926277366" lat="35.6944228" lon="139.6927786">
-    <tag k="name" v="西新宿 (Nishi-shinjuku)"/>
+    <tag k="name" v="西新宿"/>
     <tag k="name:en" v="Nishi-shinjuku"/>
     <tag k="name:ja" v="西新宿"/>
+    <tag k="name:ja_kana" v="にししんじゅく"/>
+    <tag k="name:ja_rm" v="Nishi Shinjuku"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="M07"/>
     <tag k="wikipedia" v="ja:西新宿駅"/>
   </node>
-  <node id="1926355395" lat="35.7113890" lon="139.7771670">
+  <node id="1926355394" lat="35.7295284" lon="139.7913323">
+    <tag k="name" v="三ノ輪"/>
+    <tag k="name:en" v="Minowa"/>
+    <tag k="name:fr" v="Minowa"/>
+    <tag k="name:ja" v="三ノ輪"/>
+    <tag k="name:ja_kana" v="みのわ"/>
+    <tag k="name:ja_rm" v="Minowa"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="H19"/>
+    <tag k="wikipedia" v="ja:三ノ輪駅"/>
+  </node>
+  <node id="1926355395" lat="35.7118717" lon="139.7774252">
     <tag k="name" v="上野 (Ueno)"/>
     <tag k="name:en" v="Ueno"/>
     <tag k="name:fr" v="Ueno"/>
     <tag k="name:ja" v="上野"/>
-    <tag k="name:ja_kana" v="うえのおんしこうえん"/>
+    <tag k="name:ja_kana" v="うえの"/>
     <tag k="name:ja_rm" v="Ueno"/>
     <tag k="name:ru" v="Уэно"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:上野駅"/>
   </node>
-  <node id="1926355396" lat="35.6862683" lon="139.7822757">
-    <tag k="name" v="人形町 (Ningyocho)"/>
+  <node id="1926355396" lat="35.6863027" lon="139.7822687">
+    <tag k="name" v="人形町"/>
     <tag k="name:en" v="Ningyocho"/>
     <tag k="name:ja" v="人形町"/>
+    <tag k="name:ja_kana" v="にんぎょうちょう"/>
+    <tag k="name:ja_rm" v="Ningyōchō"/>
     <tag k="name:ru" v="Нингётё"/>
+    <tag k="operator" v="東京地下鉄;東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="H13;A14"/>
     <tag k="wikipedia" v="ja:人形町駅"/>
   </node>
-  <node id="1926355397" lat="35.7065560" lon="139.7761940">
-    <tag k="name" v="仲御徒町 (Naka-okachimachi)"/>
+  <node id="1926355397" lat="35.7065590" lon="139.7761742">
+    <tag k="name" v="仲御徒町"/>
     <tag k="name:en" v="Naka-okachimachi"/>
     <tag k="name:ja" v="仲御徒町"/>
+    <tag k="name:ja_kana" v="なかおかちまち"/>
+    <tag k="name:ja_rm" v="Naka Okachimachi"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="H16"/>
     <tag k="wikipedia" v="ja:仲御徒町駅"/>
   </node>
-  <node id="1926355398" lat="35.7207220" lon="139.7845830">
-    <tag k="name" v="入谷 (Iriya)"/>
+  <node id="1926355398" lat="35.7207249" lon="139.7845632">
+    <tag k="name" v="入谷"/>
     <tag k="name:en" v="Iriya"/>
     <tag k="name:ja" v="入谷"/>
+    <tag k="name:ja_kana" v="いりや"/>
+    <tag k="name:ja_rm" v="Iriya"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="H18"/>
     <tag k="wikipedia" v="ja:入谷駅 (東京都)"/>
   </node>
-  <node id="1926355399" lat="35.6750000" lon="139.7770830">
-    <tag k="name" v="八丁堀 (Hatchobori)"/>
+  <node id="1926355399" lat="35.6750032" lon="139.7770632">
+    <tag k="name" v="八丁堀"/>
     <tag k="name:en" v="Hatchobori"/>
     <tag k="name:fr" v="Hatchobori"/>
     <tag k="name:ja" v="八丁堀"/>
     <tag k="name:ja_kana" v="はっちょうぼり"/>
-    <tag k="name:ja_rm" v="Hatchobori"/>
+    <tag k="name:ja_rm" v="Hatchōbori"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="H11"/>
     <tag k="wikipedia" v="ja:八丁堀駅 (東京都)"/>
   </node>
-  <node id="1926355400" lat="35.6627780" lon="139.7313890">
-    <tag k="name" v="六本木 (Roppongi)"/>
+  <node id="1926355400" lat="35.6628190" lon="139.7313383">
+    <tag k="name" v="六本木"/>
     <tag k="name:en" v="Roppongi"/>
     <tag k="name:fr" v="Roppongi"/>
     <tag k="name:ja" v="六本木"/>
     <tag k="name:ja_kana" v="ろっぽんぎ"/>
     <tag k="name:ja_rm" v="Roppongi"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="ref" v="H-04"/>
+    <tag k="ref" v="H04"/>
     <tag k="wikipedia" v="ja:六本木駅"/>
   </node>
-  <node id="1926355401" lat="35.6907500" lon="139.7784720">
-    <tag k="name" v="小伝馬町 (Kodenmacho)"/>
-    <tag k="name:en" v="Kodenmacho"/>
+  <node id="1926355401" lat="35.6907531" lon="139.7784522">
+    <tag k="name" v="小伝馬町"/>
+    <tag k="name:en" v="Kodemmacho"/>
     <tag k="name:ja" v="小伝馬町"/>
+    <tag k="name:ja_kana" v="こでんまちょう"/>
+    <tag k="name:ja_rm" v="Kodemmachō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="H14"/>
     <tag k="wikipedia" v="ja:小伝馬町駅"/>
   </node>
-  <node id="1926355402" lat="35.6696175" lon="139.7670622">
-    <tag k="name" v="東銀座 (Higashi-ginza)"/>
+  <node id="1926355402" lat="35.6696102" lon="139.7670420">
+    <tag k="name" v="東銀座"/>
     <tag k="name:en" v="Higashi-ginza"/>
     <tag k="name:ja" v="東銀座"/>
+    <tag k="name:ja_kana" v="ひがしぎんざ"/>
+    <tag k="name:ja_rm" v="Higashi Ginza"/>
     <tag k="name:ru" v="Хигаси-Гиндза"/>
+    <tag k="operator" v="東京都交通局;東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="A11;H09"/>
     <tag k="wikipedia" v="ja:東銀座駅"/>
   </node>
-  <node id="1926355403" lat="35.6629720" lon="139.7450560">
-    <tag k="name" v="神谷町 (Kamiyacho)"/>
+  <node id="1926355403" lat="35.6629753" lon="139.7450362">
+    <tag k="name" v="神谷町"/>
     <tag k="name:en" v="Kamiyacho"/>
     <tag k="name:ja" v="神谷町"/>
+    <tag k="name:ja_kana" v="かみやちょう"/>
+    <tag k="name:ja_rm" v="Kamiyachō"/>
+    <tag k="name:ru" v="Камиятё"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="H05"/>
     <tag k="wikipedia" v="ja:神谷町駅"/>
   </node>
-  <node id="1926355404" lat="35.6986110" lon="139.7755000">
-    <tag k="name" v="秋葉原 (Akihabara)"/>
+  <node id="1926355404" lat="35.6986132" lon="139.7755126">
+    <tag k="name" v="秋葉原"/>
     <tag k="name:en" v="Akihabara"/>
     <tag k="name:ja" v="秋葉原"/>
+    <tag k="name:ja_kana" v="あきはばら"/>
+    <tag k="name:ja_rm" v="Akihabara"/>
     <tag k="name:ru" v="Акихабара"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="H15"/>
     <tag k="wikipedia" v="ja:秋葉原駅"/>
   </node>
-  <node id="1926355405" lat="35.6681110" lon="139.7725830">
-    <tag k="name" v="築地 (Tsukiji)"/>
+  <node id="1926355405" lat="35.6681142" lon="139.7725632">
+    <tag k="name" v="築地"/>
     <tag k="name:en" v="Tsukiji"/>
     <tag k="name:ja" v="築地"/>
+    <tag k="name:ja_kana" v="つきじ"/>
+    <tag k="name:ja_rm" v="Tsukiji"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="H10"/>
     <tag k="wikipedia" v="ja:築地駅"/>
   </node>
-  <node id="1926355406" lat="35.6799440" lon="139.7801390">
-    <tag k="name" v="茅場町 (Kayabacho)"/>
-    <tag k="name:en" v="Kayabacho"/>
-    <tag k="name:ja" v="茅場町"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:茅場町駅"/>
-  </node>
-  <node id="1926376077" lat="35.6913890" lon="139.7362500">
-    <tag k="name" v="市ケ谷 (Ichigaya)"/>
+  <node id="1926376077" lat="35.6914148" lon="139.7361439">
+    <tag k="name" v="市ケ谷"/>
     <tag k="name:en" v="Ichigaya"/>
     <tag k="name:ja" v="市ケ谷"/>
+    <tag k="name:ja_rm" v="Ichigaya"/>
     <tag k="name:ru" v="Итигая"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:市ケ谷駅"/>
   </node>
   <node id="1926376078" lat="35.6756940" lon="139.7633330">
-    <tag k="name" v="有楽町 (Yūrakuchō)"/>
-    <tag k="name:en" v="Yūrakuchō"/>
+    <tag k="name" v="有楽町"/>
+    <tag k="name:en" v="Yurakucho"/>
     <tag k="name:fr" v="Yūrakuchō"/>
     <tag k="name:ja" v="有楽町"/>
     <tag k="name:ja_kana" v="ゆうらくちょう"/>
     <tag k="name:ja_rm" v="Yūrakuchō"/>
     <tag k="name:ru" v="Юракутё"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Y18"/>
     <tag k="wikipedia" v="ja:有楽町駅"/>
   </node>
+  <node id="1926376079" lat="35.7255809" lon="139.7194470">
+    <tag k="name" v="東池袋"/>
+    <tag k="name:en" v="Higashi-ikebukuro"/>
+    <tag k="name:ja" v="東池袋"/>
+    <tag k="name:ja_rm" v="Higashi Ikebukuro"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="Y10"/>
+    <tag k="wikipedia" v="ja:東池袋駅"/>
+  </node>
   <node id="1926376080" lat="35.6773610" lon="139.7517500">
-    <tag k="name" v="桜田門 (Sakuradamon)"/>
+    <tag k="name" v="桜田門"/>
     <tag k="name:en" v="Sakuradamon"/>
     <tag k="name:ja" v="桜田門"/>
+    <tag k="name:ja_kana" v="さくらだもん"/>
+    <tag k="name:ja_rm" v="Sakudaramon"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Y17"/>
     <tag k="wikipedia" v="ja:桜田門駅"/>
   </node>
-  <node id="1926376081" lat="35.6786110" lon="139.7402780">
-    <tag k="name" v="永田町駅 (Nagatacho)"/>
+  <node id="1926376081" lat="35.6785807" lon="139.7402873">
+    <tag k="name" v="永田町"/>
     <tag k="name:en" v="Nagatacho"/>
-    <tag k="name:ja" v="永田町駅"/>
+    <tag k="name:ja" v="永田町"/>
+    <tag k="name:ja_kana" v="ながたちょう"/>
+    <tag k="name:ja_rm" v="Nagatachō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Y16;Z04;N07"/>
     <tag k="wikipedia" v="ja:永田町駅"/>
   </node>
-  <node id="1926376082" lat="35.7094440" lon="139.7335280">
-    <tag k="name" v="江戸川橋 (Edogawabashi)"/>
+  <node id="1926376082" lat="35.7095215" lon="139.7335810">
+    <tag k="name" v="江戸川橋"/>
     <tag k="name:en" v="Edogawabashi"/>
     <tag k="name:ja" v="江戸川橋"/>
+    <tag k="name:ja_kana" v="えどがわばし"/>
+    <tag k="name:ja_rm" v="Edogawabashi"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Y12"/>
     <tag k="wikipedia" v="ja:江戸川橋駅"/>
   </node>
+  <node id="1926376083" lat="35.7296950" lon="139.7098336">
+    <tag k="aerialway" v="station"/>
+    <tag k="name" v="池袋"/>
+    <tag k="name:en" v="Ikebukuro"/>
+    <tag k="name:ja" v="池袋"/>
+    <tag k="name:ja_kana" v="いけぶくろ"/>
+    <tag k="name:ja_rm" v="Ikebukuro"/>
+    <tag k="name:ru" v="Икэбукуро"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="Y09"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:池袋駅"/>
+  </node>
+  <node id="1926376084" lat="35.7332439" lon="139.6986958">
+    <tag k="name" v="要町"/>
+    <tag k="name:en" v="Kanamecho"/>
+    <tag k="name:ja" v="要町"/>
+    <tag k="name:ja_kana" v="かなめちょう"/>
+    <tag k="name:ja_rm" v="Kanamechō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="Y08;F08"/>
+    <tag k="wikipedia" v="ja:要町駅"/>
+  </node>
   <node id="1926376085" lat="35.7190280" lon="139.7275000">
-    <tag k="name" v="護国寺 (Gokokuji)"/>
+    <tag k="name" v="護国寺"/>
     <tag k="name:en" v="Gokokuji"/>
     <tag k="name:ja" v="護国寺"/>
+    <tag k="name:ja_kana" v="ごこくじ"/>
+    <tag k="name:ja_rm" v="Gokokuji"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Y11"/>
     <tag k="wikipedia" v="ja:護国寺駅"/>
   </node>
   <node id="1926376086" lat="35.6743610" lon="139.7670280">
-    <tag k="name" v="銀座一丁目 (Ginza-itchome)"/>
+    <tag k="name" v="銀座一丁目"/>
     <tag k="name:en" v="Ginza-itchome"/>
     <tag k="name:ja" v="銀座一丁目"/>
+    <tag k="name:ja_kana" v="ぎんざいっちょうめ"/>
+    <tag k="name:ja_rm" v="Ginza Itchōme"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Y19"/>
     <tag k="wikipedia" v="ja:銀座一丁目駅"/>
   </node>
   <node id="1926376087" lat="35.7019440" lon="139.7456110">
-    <tag k="name" v="飯田橋 (Iidabashi)"/>
+    <tag k="name" v="飯田橋"/>
     <tag k="name:en" v="Iidabashi"/>
     <tag k="name:ja" v="飯田橋"/>
+    <tag k="name:ja_kana" v="いいだばし"/>
+    <tag k="name:ja_rm" v="Iidabashi"/>
     <tag k="name:ru" v="Иидабаси"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:飯田橋駅"/>
   </node>
   <node id="1926376088" lat="35.6840280" lon="139.7376670">
-    <tag k="name" v="麹町 (Kojimachi)"/>
+    <tag k="name" v="麹町"/>
     <tag k="name:en" v="Kojimachi"/>
     <tag k="name:ja" v="麹町"/>
+    <tag k="name:ja_kana" v="こうじまち"/>
+    <tag k="name:ja_rm" v="Kōjimachi"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Y15"/>
     <tag k="wikipedia" v="ja:麹町駅"/>
   </node>
   <node id="1926417053" lat="35.6705000" lon="139.7737220">
-    <tag k="name" v="新富町 (Shintomicho)"/>
+    <tag k="name" v="新富町"/>
     <tag k="name:en" v="Shintomicho"/>
-    <tag k="name:ja" v="新富町"/>
+    <tag k="name:ja_kana" v="しんとみちょう"/>
+    <tag k="name:ja_rm" v="Shintomichō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Y20"/>
     <tag k="wikipedia" v="ja:新富町駅 (東京都)"/>
   </node>
-  <node id="1926417056" lat="35.6648890" lon="139.7842500">
-    <tag k="name" v="月島 (Tsukishima)"/>
+  <node id="1926417056" lat="35.6643694" lon="139.7847070">
+    <tag k="name" v="月島"/>
     <tag k="name:en" v="Tsukishima"/>
     <tag k="name:fr" v="Tsukishima"/>
     <tag k="name:ja" v="月島"/>
     <tag k="name:ja_kana" v="つきしま"/>
     <tag k="name:ja_rm" v="Tsukishima"/>
+    <tag k="operator" v="東京地下鉄;東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Y21;E16"/>
     <tag k="wikipedia" v="ja:月島駅"/>
   </node>
   <node id="1926417058" lat="35.6550000" lon="139.7961110">
-    <tag k="name" v="豊洲 (Toyosu)"/>
+    <tag k="name" v="豊洲"/>
     <tag k="name:en" v="Toyosu"/>
     <tag k="name:ja" v="豊洲"/>
+    <tag k="name:ja_kana" v="とよす"/>
+    <tag k="name:ja_rm" v="Toyosu"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Y22"/>
     <tag k="wikipedia" v="ja:豊洲駅"/>
   </node>
+  <node id="1926700039" lat="35.7257780" lon="139.7299170">
+    <tag k="name" v="新大塚"/>
+    <tag k="name:en" v="Shin-otsuka"/>
+    <tag k="name:ja" v="新大塚"/>
+    <tag k="name:ja_rm" v="Shin-ōtsuka"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="M24"/>
+    <tag k="wikipedia" v="ja:新大塚駅"/>
+  </node>
+  <node id="1926700040" lat="35.7300573" lon="139.7119638">
+    <tag k="name" v="池袋"/>
+    <tag k="name:en" v="Ikebukuro"/>
+    <tag k="name:ja" v="池袋"/>
+    <tag k="name:ja_kana" v="いけぶくろ"/>
+    <tag k="name:ja_rm" v="Ikebukuro"/>
+    <tag k="name:ru" v="Икэбукуро"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="M25"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:池袋駅"/>
+  </node>
   <node id="1926700041" lat="35.7173620" lon="139.7368105">
-    <tag k="name" v="茗荷谷 (Myogadani)"/>
+    <tag k="name" v="茗荷谷"/>
     <tag k="name:en" v="Myogadani"/>
     <tag k="name:ja" v="茗荷谷"/>
+    <tag k="name:ja_kana" v="みょうがだに"/>
+    <tag k="name:ja_rm" v="Myōgatani"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="M23"/>
+    <tag k="wheelchair" v="yes"/>
     <tag k="wikipedia" v="ja:茗荷谷駅"/>
   </node>
-  <node id="1926703932" lat="35.6848890" lon="139.7731670">
-    <tag k="name" v="三越前 (Mitsukoshimae)"/>
+  <node id="1926703932" lat="35.6849413" lon="139.7730529">
+    <tag k="name" v="三越前"/>
     <tag k="name:en" v="Mitsukoshimae"/>
     <tag k="name:fr" v="Mitsukoshimae"/>
     <tag k="name:ja" v="三越前"/>
     <tag k="name:ja_kana" v="みつこしまえ"/>
-    <tag k="name:ja_rm" v="Mitsukoshimae"/>
+    <tag k="name:ja_rm" v="Mitsukoshi Mae"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Z09"/>
     <tag k="wikipedia" v="ja:三越前駅"/>
   </node>
-  <node id="1926703933" lat="35.6856940" lon="139.7416670">
-    <tag k="name" v="半蔵門 (Hanzomon)"/>
+  <node id="1926703933" lat="35.6856785" lon="139.7416288">
+    <tag k="name" v="半蔵門"/>
     <tag k="name:en" v="Hanzomon"/>
     <tag k="name:ja" v="半蔵門"/>
+    <tag k="name:ja_kana" v="はんぞうもん"/>
+    <tag k="name:ja_rm" v="Hanzōmon"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="Z05"/>
     <tag k="wikipedia" v="ja:半蔵門駅"/>
   </node>
-  <node id="1926709957" lat="35.6698060" lon="139.7555560">
-    <tag k="name" v="内幸町 (Uchisaiwaichō)"/>
-    <tag k="name:en" v="Uchisaiwaichō"/>
+  <node id="1926709957" lat="35.6697669" lon="139.7554246">
+    <tag k="alt_name" v="西新橋"/>
+    <tag k="name" v="内幸町"/>
+    <tag k="name:en" v="Uchisaiwaicho"/>
     <tag k="name:ja" v="内幸町"/>
+    <tag k="name:ja_kana" v="うちさいわいちょう"/>
+    <tag k="name:ja_rm" v="Uchisaiwaichō"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="I07"/>
     <tag k="wikipedia" v="ja:内幸町駅"/>
   </node>
-  <node id="1926709961" lat="35.6851113" lon="139.7629149">
-    <tag k="name" v="大手町 (Ōtemachi)"/>
-    <tag k="name:en" v="Ōtemachi"/>
+  <node id="1926709961" lat="35.6851068" lon="139.7627906">
+    <tag k="name" v="大手町"/>
+    <tag k="name:en" v="Otemachi"/>
     <tag k="name:fr" v="Ōtemachi"/>
     <tag k="name:ja" v="大手町"/>
     <tag k="name:ja_kana" v="おおてまち"/>
     <tag k="name:ja_rm" v="Ōtemachi"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="I09"/>
     <tag k="wikipedia" v="ja:大手町駅 (東京都)"/>
   </node>
-  <node id="1926709965" lat="35.6611940" lon="139.7515560">
-    <tag k="name" v="御成門 (Onarimon)"/>
+  <node id="1926709965" lat="35.6611895" lon="139.7514317">
+    <tag k="alt_name" v="東京タワー前"/>
+    <tag k="name" v="御成門"/>
     <tag k="name:en" v="Onarimon"/>
     <tag k="name:ja" v="御成門"/>
+    <tag k="name:ja_kana" v="おなりもん"/>
+    <tag k="name:ja_rm" v="Onarimon"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="I06"/>
     <tag k="wikipedia" v="ja:御成門駅"/>
   </node>
-  <node id="1926709967" lat="35.7096390" lon="139.7532500">
-    <tag k="name" v="春日 (Kasuga)"/>
+  <node id="1926709967" lat="35.7096421" lon="139.7532533">
+    <tag k="name" v="春日"/>
     <tag k="name:en" v="Kasuga"/>
     <tag k="name:ja" v="春日"/>
+    <tag k="name:ja_kana" v="かすが"/>
+    <tag k="name:ja_rm" v="Kasuga"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="I12"/>
     <tag k="wikipedia" v="ja:春日駅 (東京都)"/>
   </node>
-  <node id="1926709968" lat="35.7036110" lon="139.7550830">
-    <tag k="name" v="水道橋 (Suidōbashi)"/>
-    <tag k="name:en" v="Suidōbashi"/>
+  <node id="1926709968" lat="35.7034404" lon="139.7550466">
+    <tag k="name" v="水道橋"/>
+    <tag k="name:en" v="Suidobashi"/>
     <tag k="name:ja" v="水道橋"/>
+    <tag k="name:ja_kana" v="すいどうばし"/>
+    <tag k="name:ja_rm" v="Suidōbashi"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="I11"/>
     <tag k="wikipedia" v="ja:水道橋駅"/>
   </node>
-  <node id="1926709982" lat="35.6540830" lon="139.7498330">
-    <tag k="name" v="芝公園 (Shibakōen)"/>
-    <tag k="name:en" v="Shibakōen"/>
+  <node id="1926709982" lat="35.6540785" lon="139.7497165">
+    <tag k="name" v="芝公園"/>
+    <tag k="name:en" v="Shibakoen"/>
     <tag k="name:ja" v="芝公園"/>
+    <tag k="name:ja_kana" v="しばこうえん"/>
+    <tag k="name:ja_rm" v="Shiba kōen"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="I05"/>
     <tag k="wikipedia" v="ja:芝公園駅"/>
   </node>
-  <node id="1926726026" lat="35.6567715" lon="139.7546837">
-    <tag k="name" v="大門 (Daimon)"/>
+  <node id="1926726025" lat="35.6471082" lon="139.7477283">
+    <tag k="name" v="三田"/>
+    <tag k="name:en" v="Mita"/>
+    <tag k="name:fr" v="Mita"/>
+    <tag k="name:ja" v="三田"/>
+    <tag k="name:ja_kana" v="みた"/>
+    <tag k="name:ja_rm" v="Mita"/>
+    <tag k="name:ru" v="Мита"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="A08"/>
+    <tag k="wheelchair" v="no"/>
+    <tag k="wikipedia" v="ja:三田駅 (東京都)"/>
+  </node>
+  <node id="1926726026" lat="35.6567938" lon="139.7546916">
+    <tag k="alt_name" v="浜松町"/>
+    <tag k="name" v="大門"/>
     <tag k="name:en" v="Daimon"/>
     <tag k="name:ja" v="大門"/>
+    <tag k="name:ja_kana" v="だいもん"/>
+    <tag k="name:ja_rm" v="Daimon"/>
     <tag k="name:ru" v="Даймон"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="A09;E20"/>
     <tag k="wikipedia" v="ja:大門駅 (東京都)"/>
   </node>
   <node id="1926726027" lat="35.6754302" lon="139.7718803">
-    <tag k="name" v="宝町 (Takarachō)"/>
-    <tag k="name:en" v="Takarachō"/>
+    <tag k="name" v="宝町"/>
+    <tag k="name:en" v="Takaracho"/>
     <tag k="name:ja" v="宝町"/>
+    <tag k="name:ja_kana" v="たからちょう"/>
+    <tag k="name:ja_rm" v="Takarachō"/>
     <tag k="name:ru" v="Такаратё"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="A12"/>
     <tag k="wikipedia" v="ja:宝町駅 (東京都)"/>
   </node>
   <node id="1926726028" lat="35.6652981" lon="139.7592947">
-    <tag k="name" v="新橋 (Shimbashi)"/>
+    <tag k="name" v="新橋"/>
     <tag k="name:en" v="Shimbashi"/>
     <tag k="name:fr" v="Shimbashi"/>
     <tag k="name:ja" v="新橋"/>
     <tag k="name:ja_kana" v="しんばし"/>
     <tag k="name:ja_rm" v="Shimbashi"/>
     <tag k="name:ru" v="Симбаси"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="A10"/>
     <tag k="wikipedia" v="ja:新橋駅"/>
   </node>
   <node id="1926726029" lat="35.6816768" lon="139.7757451">
-    <tag k="name" v="日本橋 (Nihombashi)"/>
+    <tag k="name" v="日本橋"/>
+    <tag k="name:en" v="Nihombashi"/>
     <tag k="name:ja" v="日本橋"/>
+    <tag k="name:ja_kana" v="にほんばし"/>
+    <tag k="name:ja_rm" v="Nihombashi"/>
     <tag k="name:ru" v="Нихонбаси"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="note" v="浅草線"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="A13"/>
     <tag k="wikipedia" v="ja:日本橋駅 (東京都)"/>
   </node>
   <node id="1926726030" lat="35.6921110" lon="139.7848890">
-    <tag k="name" v="東日本橋 (Higashi-nihombashi)"/>
+    <tag k="name" v="東日本橋"/>
     <tag k="name:en" v="Higashi-nihombashi"/>
     <tag k="name:ja" v="東日本橋"/>
+    <tag k="name:ja_kana" v="ひがしにほんばし"/>
+    <tag k="name:ja_rm" v="Higashi Nihombashi"/>
     <tag k="name:ru" v="Хигаси-Нихонбаси"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="A15"/>
     <tag k="wikipedia" v="ja:東日本橋駅"/>
   </node>
   <node id="1926726032" lat="35.6973783" lon="139.7863178">
-    <tag k="name" v="浅草橋 (Asakusabashi)"/>
+    <tag k="name" v="浅草橋"/>
     <tag k="name:en" v="Asakusabashi"/>
     <tag k="name:ja" v="浅草橋"/>
+    <tag k="name:ja_kana" v="あさくさばし"/>
+    <tag k="name:ja_rm" v="Asakusabashi"/>
     <tag k="name:ru" v="Асакусабаси"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="A16"/>
     <tag k="wikipedia" v="ja:浅草橋駅"/>
   </node>
   <node id="1926726033" lat="35.7032220" lon="139.7909440">
-    <tag k="name" v="蔵前 (Kuramae)"/>
+    <tag k="name" v="蔵前"/>
     <tag k="name:en" v="Kuramae"/>
     <tag k="name:ja" v="蔵前"/>
+    <tag k="name:ja_kana" v="くらまえ"/>
+    <tag k="name:ja_rm" v="Kuramae"/>
     <tag k="name:ru" v="Курамаэ"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="A17"/>
     <tag k="wikipedia" v="ja:蔵前駅"/>
   </node>
-  <node id="1931878068" lat="35.7164891" lon="139.7125546">
-    <tag k="name" v="学習院下 (Gakushūinshita)"/>
-    <tag k="name:ja" v="学習院下"/>
-    <tag k="name:ja_kana" v="がくしゅういんした"/>
-    <tag k="name:ja_rm" v="Gakushūinshita"/>
-    <tag k="railway" v="station"/>
-    <tag k="start_date" v="1914-12-25"/>
-    <tag k="wikipedia" v="ja:学習院下駅"/>
-  </node>
-  <node id="1931878074" lat="35.7203132" lon="139.7148934">
-    <tag k="name" v="鬼子母神前 (Kishibojimmae)"/>
-    <tag k="name:ja" v="鬼子母神前"/>
-    <tag k="name:ja_kana" v="きしぼじんまえ"/>
-    <tag k="name:ja_rm" v="Kishibojinmae"/>
-    <tag k="railway" v="station"/>
-    <tag k="start_date" v="1914-12-25"/>
-    <tag k="wikipedia" v="ja:鬼子母神前駅"/>
-  </node>
-  <node id="1931879415" lat="35.7119270" lon="139.7186293">
-    <tag k="name" v="早稲田 (Waseda)"/>
-    <tag k="name:ja" v="早稲田"/>
-    <tag k="name:ja_kana" v="わせだ"/>
-    <tag k="name:ja_rm" v="Waseda"/>
-    <tag k="railway" v="station"/>
-    <tag k="start_date" v="1930-03-30"/>
-    <tag k="wikipedia" v="ja:早稲田駅_(東京都交通局)"/>
-  </node>
-  <node id="1931879420" lat="35.7129212" lon="139.7144478">
-    <tag k="name" v="面影橋 (Omokagebashi)"/>
-    <tag k="name:ja" v="面影橋"/>
-    <tag k="name:ja_kana" v="おもかげばし"/>
-    <tag k="name:ja_rm" v="Omokagebashi"/>
-    <tag k="railway" v="station"/>
-    <tag k="start_date" v="1930-03-30"/>
-    <tag k="wikipedia" v="ja:面影橋駅"/>
-  </node>
-  <node id="1931880080" lat="35.6694118" lon="139.6883809"/>
-  <node id="1931880081" lat="35.6694369" lon="139.6885154"/>
-  <node id="1931880084" lat="35.6694669" lon="139.6887826"/>
-  <node id="1931880086" lat="35.6695036" lon="139.6887561"/>
-  <node id="1931880087" lat="35.6695394" lon="139.6889964"/>
-  <node id="1931880089" lat="35.6695757" lon="139.6888922"/>
-  <node id="1931880090" lat="35.6695784" lon="139.6890950"/>
-  <node id="1931880092" lat="35.6695918" lon="139.6883385"/>
-  <node id="1931880094" lat="35.6696383" lon="139.6884906"/>
-  <node id="1931880095" lat="35.6696437" lon="139.6890597"/>
-  <node id="1931880096" lat="35.6696549" lon="139.6884807"/>
-  <node id="1931880098" lat="35.6696826" lon="139.6888355"/>
-  <node id="1931880099" lat="35.6697032" lon="139.6886421"/>
-  <node id="1931880100" lat="35.6697578" lon="139.6890311"/>
-  <node id="1931880101" lat="35.6697834" lon="139.6889997"/>
-  <node id="1931880102" lat="35.6698120" lon="139.6891451"/>
-  <node id="1931880103" lat="35.6698409" lon="139.6891233"/>
   <node id="1947633318" lat="35.6968610" lon="139.7974440">
-    <tag k="name" v="両国 (Ryōgoku)"/>
-    <tag k="name:en" v="Ryōgoku"/>
+    <tag k="name" v="両国"/>
+    <tag k="name:en" v="Ryogoku"/>
     <tag k="name:ja" v="両国"/>
     <tag k="name:ja_kana" v="りょうごく"/>
-    <tag k="name:ja_rm" v="Ryogoku"/>
+    <tag k="name:ja_rm" v="Ryōgoku"/>
     <tag k="name:ru" v="Рёгоку"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="E12"/>
     <tag k="wikipedia" v="ja:両国駅"/>
   </node>
-  <node id="1947633320" lat="35.6879720" lon="139.7970280">
-    <tag k="name" v="森下 (Morishita)"/>
-    <tag k="name:en" v="Morishita"/>
-    <tag k="name:ja" v="森下"/>
+  <node id="1947633319" lat="35.6890000" lon="139.8157220">
+    <tag k="name" v="住吉"/>
+    <tag k="name:en" v="Sumiyoshi"/>
+    <tag k="name:ja" v="住吉"/>
+    <tag k="name:ja_kana" v="すみよし"/>
+    <tag k="name:ja_rm" v="Sumiyoshi"/>
+    <tag k="operator" v="東京都交通局;東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:森下駅 (東京都)"/>
+    <tag k="ref" v="S13;Z12"/>
+    <tag k="wikipedia" v="ja:住吉駅 (東京都)"/>
   </node>
-  <node id="1947633321" lat="35.6880560" lon="139.7982500">
-    <tag k="name" v="森下 (Morishita)"/>
+  <node id="1947633320" lat="35.6879720" lon="139.7970280">
+    <tag k="name" v="森下"/>
     <tag k="name:en" v="Morishita"/>
     <tag k="name:ja" v="森下"/>
+    <tag k="name:ja_kana" v="もりした"/>
+    <tag k="name:ja_rm" v="Morishita"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="S11"/>
     <tag k="wikipedia" v="ja:森下駅 (東京都)"/>
   </node>
   <node id="1947633322" lat="35.6820560" lon="139.7860280">
-    <tag k="name" v="水天宮前 (Suitengumae)"/>
+    <tag k="name" v="水天宮前"/>
     <tag k="name:en" v="Suitengumae"/>
     <tag k="name:ja" v="水天宮前"/>
+    <tag k="name:ja_kana" v="すいてんぐうまえ"/>
+    <tag k="name:ja_rm" v="Suitengū Mae"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="wikipedia" v="ja:水天宮前駅"/>
   </node>
-  <node id="1947633323" lat="35.6820560" lon="139.7988060">
-    <tag k="name" v="清澄白河 (Kiyosumi-shirakawa)"/>
-    <tag k="name:en" v="Kiyosumi-shirakawa"/>
-    <tag k="name:ja" v="清澄白河"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:清澄白河駅"/>
-  </node>
-  <node id="1947633324" lat="35.6649170" lon="139.7669440">
-    <tag k="name" v="築地市場 (Tsukijishijō)"/>
-    <tag k="name:en" v="Tsukijishijō"/>
+  <node id="1947633324" lat="35.6648891" lon="139.7669096">
+    <tag k="name" v="築地市場"/>
+    <tag k="name:en" v="Tsukijishijo"/>
     <tag k="name:ja" v="築地市場"/>
+    <tag k="name:ja_kana" v="つきじしじょう"/>
+    <tag k="name:ja_rm" v="Tsukiji Shijō"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="E18"/>
+    <tag k="wheelchair" v="limited"/>
     <tag k="wikipedia" v="ja:築地市場駅"/>
   </node>
-  <node id="1950328487" lat="35.7107261" lon="139.6865289">
-    <tag k="name" v="落合(Ochiai)"/>
+  <node id="1947633325" lat="35.6963890" lon="139.8150000">
+    <tag k="name" v="錦糸町"/>
+    <tag k="name:en" v="Kinshicho"/>
+    <tag k="name:ja" v="錦糸町"/>
+    <tag k="name:ja_kana" v="きんしちょう"/>
+    <tag k="name:ja_rm" v="Kinshichō"/>
+    <tag k="name:ru" v="Кинситё"/>
     <tag k="operator" v="東京地下鉄"/>
-    <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="ref" v="T02"/>
-    <tag k="wikipedia" v="ja:落合駅 (東京都)"/>
+    <tag k="ref" v="Z13"/>
+    <tag k="wikipedia" v="ja:錦糸町駅"/>
   </node>
   <node id="1951047949" lat="35.6849310" lon="139.7298931"/>
   <node id="1951047982" lat="35.6851047" lon="139.7297506"/>
@@ -2375,531 +2421,1334 @@
   <node id="1951048144" lat="35.6849212" lon="139.7298033"/>
   <node id="1951048148" lat="35.6852317" lon="139.7299750"/>
   <node id="1951048158" lat="35.6841130" lon="139.7298985"/>
-  <node id="1951066037" lat="35.6736544" lon="139.7422374">
-    <tag k="name" v="国会議事堂前(Kokkai-gijidomae)"/>
-    <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:国会議事堂前駅"/>
-  </node>
-  <node id="1951081094" lat="35.6744410" lon="139.7521346">
-    <tag k="name" v="霞ヶ関(Kasumigaseki)"/>
-    <tag k="operator" v="東京地下鉄"/>
-    <tag k="platforms" v="2"/>
-    <tag k="railway" v="station"/>
-    <tag k="ref" v="M15"/>
-  </node>
   <node id="1951952367" lat="35.6784894" lon="139.7054577">
-    <tag k="name" v="北参道(Kita-sando)"/>
+    <tag k="name" v="北参道"/>
+    <tag k="name:en" v="Kita-sando"/>
+    <tag k="name:ja" v="北参道"/>
+    <tag k="name:ja_kana" v="きたさんどう"/>
+    <tag k="name:ja_rm" v="Kita sandō"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="F14"/>
     <tag k="wikipedia" v="ja:北参道駅"/>
   </node>
-  <node id="1951953898" lat="35.6985139" lon="139.7075605">
-    <tag k="name" v="東新宿(Higashi-shinjuku)"/>
+  <node id="1951952370" lat="35.6584797" lon="139.7029209">
+    <tag k="name" v="渋谷"/>
+    <tag k="name:en" v="Shibuya"/>
+    <tag k="name:fr" v="Shibuya"/>
+    <tag k="name:ja" v="渋谷"/>
+    <tag k="name:ja_kana" v="しぶや"/>
+    <tag k="name:ja_rm" v="Shibuya"/>
+    <tag k="name:ru" v="Сибуя"/>
+    <tag k="operator" v="東急電鉄"/>
+    <tag k="platforms" v="4"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="TY01;F16"/>
+    <tag k="wikipedia" v="ja:渋谷駅"/>
+  </node>
+  <node id="1951953898" lat="35.6989266" lon="139.7076538">
+    <tag k="name" v="東新宿"/>
+    <tag k="name:en" v="Higashi-shinjuku"/>
+    <tag k="name:ja" v="東新宿"/>
+    <tag k="name:ja_kana" v="ひがししんじゅく"/>
+    <tag k="name:ja_rm" v="Higashi Shinjuku"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="F12"/>
     <tag k="wikipedia" v="ja:東新宿駅"/>
   </node>
   <node id="1951954570" lat="35.7079254" lon="139.7090596">
-    <tag k="name" v="西早稲田(Nishi-waseda)"/>
+    <tag k="name" v="西早稲田"/>
+    <tag k="name:en" v="Nishi-waseda"/>
+    <tag k="name:ja" v="西早稲田"/>
+    <tag k="name:ja_kana" v="にしわせだ"/>
+    <tag k="name:ja_rm" v="Nishi Waseda"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="F11"/>
     <tag k="wikipedia" v="ja:西早稲田駅"/>
   </node>
-  <node id="1951959623" lat="35.7200383" lon="139.7146574">
-    <tag k="name" v="雑司が谷(Zoshigaya)"/>
+  <node id="1951959623" lat="35.7202610" lon="139.7148159">
+    <tag k="name" v="雑司が谷"/>
+    <tag k="name:en" v="Zoshigaya"/>
+    <tag k="name:ja" v="雑司が谷"/>
+    <tag k="name:ja_kana" v="ぞうしがや"/>
+    <tag k="name:ja_rm" v="Zōshigaya"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="F10"/>
     <tag k="wikipedia" v="ja:雑司が谷駅"/>
   </node>
-  <node id="1952094220" lat="35.6772903" lon="139.7370733">
-    <tag k="name" v="赤坂見附 (Akasaka-mitsuke)"/>
+  <node id="1951959624" lat="35.7313416" lon="139.7085849">
+    <tag k="name" v="池袋"/>
+    <tag k="name:en" v="Ikebukuro"/>
+    <tag k="name:ja" v="池袋"/>
+    <tag k="name:ja_kana" v="いけぶくろ"/>
+    <tag k="name:ja_rm" v="Ikebukuro"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="F09"/>
+    <tag k="wikipedia" v="ja:池袋駅"/>
+  </node>
+  <node id="1952094220" lat="35.6772885" lon="139.7370672">
+    <tag k="name" v="赤坂見附"/>
+    <tag k="name:en" v="Akasaka-mitsuke"/>
+    <tag k="name:ja" v="赤坂見附"/>
+    <tag k="name:ja_kana" v="あかさかみつけ"/>
+    <tag k="name:ja_rm" v="Akasaka Mitsuke"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="4"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="G05,M13"/>
     <tag k="wikipedia" v="ja:赤坂見附駅"/>
   </node>
-  <node id="1976070764" lat="35.6537255" lon="139.7618051"/>
-  <node id="1976070765" lat="35.6537284" lon="139.7618338"/>
-  <node id="1976070766" lat="35.6537292" lon="139.7617731"/>
-  <node id="1976070767" lat="35.6537371" lon="139.7617488"/>
-  <node id="1976070769" lat="35.6537692" lon="139.7616890"/>
-  <node id="1976070770" lat="35.6537877" lon="139.7616746"/>
-  <node id="1976070771" lat="35.6538111" lon="139.7616591"/>
-  <node id="1976070772" lat="35.6538319" lon="139.7616482"/>
-  <node id="1976070776" lat="35.6541281" lon="139.7621714"/>
-  <node id="1976070777" lat="35.6541490" lon="139.7621653"/>
-  <node id="1976070778" lat="35.6541680" lon="139.7621527"/>
-  <node id="1976070779" lat="35.6541870" lon="139.7621336"/>
-  <node id="1976070781" lat="35.6542025" lon="139.7621114"/>
-  <node id="1976070782" lat="35.6542118" lon="139.7620953"/>
-  <node id="1976070783" lat="35.6542254" lon="139.7620659"/>
-  <node id="1976070784" lat="35.6542341" lon="139.7620235"/>
-  <node id="1976070785" lat="35.6542346" lon="139.7619983"/>
+  <node id="2011629184" lat="35.6893636" lon="139.8266054">
+    <tag k="name" v="西大島"/>
+    <tag k="name:en" v="Nishi-ojima"/>
+    <tag k="name:ja" v="西大島"/>
+    <tag k="name:ja_kana" v="にしおおじま"/>
+    <tag k="name:ja_rm" v="Nishi Ōjima"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="S14"/>
+  </node>
+  <node id="2011999937" lat="35.6515344" lon="139.7222001">
+    <tag k="name" v="広尾"/>
+    <tag k="name:en" v="Hiro-o"/>
+    <tag k="name:ja" v="広尾"/>
+    <tag k="name:ja_kana" v="ひろお"/>
+    <tag k="name:ja_rm" v="Hiroo"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="H03"/>
+  </node>
+  <node id="2012000223" lat="35.6381343" lon="139.7265719">
+    <tag k="name" v="白金台"/>
+    <tag k="name:en" v="Shirokanedai"/>
+    <tag k="name:ja" v="白金台"/>
+    <tag k="name:ja_kana" v="しろかねだい"/>
+    <tag k="name:ja_rm" v="Shirokanedai"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="I02;N02"/>
+  </node>
   <node id="2037665109" lat="35.7070361" lon="139.7820390">
-    <tag k="name" v="新御徒町 (Shin-Okachimachi)"/>
+    <tag k="name" v="新御徒町"/>
+    <tag k="name:en" v="Shin-Okachimachi"/>
+    <tag k="name:ja" v="新御徒町"/>
+    <tag k="name:ja_kana" v="しんおかちまち"/>
+    <tag k="name:ja_rm" v="Shin Okachimachi"/>
+    <tag k="operator" v="首都圏新都市鉄道"/>
     <tag k="platforms" v="1"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="02"/>
   </node>
   <node id="2037665123" lat="35.7129624" lon="139.7922688">
-    <tag k="name" v="浅草 (Asakusa)"/>
+    <tag k="name" v="浅草"/>
+    <tag k="name:en" v="Asakusa"/>
+    <tag k="name:ja" v="浅草"/>
+    <tag k="name:ja_kana" v="あさくさ"/>
+    <tag k="name:ja_rm" v="Asakusa"/>
     <tag k="operator" v="首都圏新都市鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="03"/>
   </node>
   <node id="2037665125" lat="35.6985927" lon="139.7742225">
-    <tag k="name" v="秋葉原 (Akihabara)"/>
+    <tag k="name" v="秋葉原"/>
+    <tag k="name:en" v="Akihabara"/>
+    <tag k="name:ja" v="秋葉原"/>
+    <tag k="name:ja_kana" v="あきはばら"/>
+    <tag k="name:ja_rm" v="Akihabara"/>
     <tag k="operator" v="首都圏新都市鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="01"/>
   </node>
-  <node id="2043532984" lat="35.7111493" lon="139.7738963">
-    <tag k="name" v="京成上野 (Keisei Ueno)"/>
+  <node id="2037827867" lat="35.7331336" lon="139.7990698">
+    <tag k="name" v="南千住"/>
+    <tag k="name:en" v="Minami-Senju"/>
+    <tag k="name:ja" v="南千住"/>
+    <tag k="name:ja_kana" v="みなみせんじゅ"/>
+    <tag k="name:ja_rm" v="Minami Senju"/>
+    <tag k="operator" v="首都圏新都市鉄道"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
+    <tag k="ref" v="04"/>
   </node>
-  <node id="2059586209" lat="35.6962729" lon="139.7924274"/>
-  <node id="2070961115" lat="35.6583905" lon="139.7016576"/>
-  <node id="2071017568" lat="35.6581467" lon="139.7020496">
-    <tag k="name" v="渋谷 (Shibuya)"/>
-    <tag k="name:en" v="Shibuya"/>
-    <tag k="name:fr" v="Shibuya"/>
-    <tag k="name:ja" v="渋谷(東横線)"/>
-    <tag k="name:ja_rm" v="Shibuya"/>
-    <tag k="name:ru" v="Сибуя"/>
+  <node id="2149761647" lat="35.6810785" lon="139.7671801">
+    <tag k="name" v="東京"/>
+    <tag k="name:en" v="Tokyo"/>
+    <tag k="name:fr" v="Tokio"/>
+    <tag k="name:ja" v="東京"/>
+    <tag k="name:ja_kana" v="とうきょう"/>
+    <tag k="name:ja_rm" v="Tōkyō"/>
+    <tag k="name:ru" v="Токио"/>
+    <tag k="note" v="&quot;JR&quot; is wrong. &quot;JR&quot; はダメです。National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="wikipedia" v="ja:渋谷駅"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:東京駅"/>
   </node>
-  <node id="2084165848" lat="35.6577424" lon="139.7015175"/>
-  <node id="2084165853" lat="35.6578422" lon="139.7013298"/>
-  <node id="2084165863" lat="35.6583439" lon="139.7012618"/>
-  <node id="2103660123" lat="35.6584363" lon="139.7016370"/>
-  <node id="2103660127" lat="35.6584411" lon="139.7016348"/>
-  <way id="51822834">
-    <nd ref="661104590"/>
-    <nd ref="661104587"/>
-    <nd ref="661104588"/>
-    <nd ref="661104589"/>
-    <nd ref="661104598"/>
-    <nd ref="661104602"/>
-    <nd ref="661104601"/>
-    <nd ref="661104600"/>
-    <nd ref="661104599"/>
-    <nd ref="661104607"/>
-    <nd ref="1580297718"/>
-    <nd ref="661104606"/>
-    <nd ref="661104604"/>
-    <nd ref="661104603"/>
-    <nd ref="661104605"/>
-    <nd ref="661104596"/>
-    <nd ref="661104591"/>
-    <nd ref="661104592"/>
-    <nd ref="661104593"/>
-    <nd ref="661104595"/>
-    <nd ref="661104594"/>
-    <nd ref="661104590"/>
-    <tag k="area" v="yes"/>
-    <tag k="name" v="JR東中野駅"/>
+  <node id="2179133140" lat="35.6429074" lon="139.7341332">
+    <tag k="name" v="白金高輪"/>
+    <tag k="name:en" v="Shirokane-takanawa"/>
+    <tag k="name:ja" v="白金高輪"/>
+    <tag k="name:ja_kana" v="しろかねたかなわ"/>
+    <tag k="name:ja_rm" v="Shirokane Takanawa"/>
+    <tag k="operator" v="東京地下鉄;東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="source" v="NRPB of MLIT Japan"/>
-    <tag k="source:ja" v="国土画像情報（オルソ化空中写真）国土計画局"/>
-  </way>
-  <way id="60264930">
-    <nd ref="748883763"/>
-    <nd ref="748883768"/>
-    <nd ref="1496842229"/>
-    <nd ref="1496842224"/>
-    <nd ref="748883708"/>
-    <nd ref="1496842209"/>
-    <nd ref="1496842212"/>
-    <nd ref="1913640131"/>
-    <nd ref="1496842222"/>
-    <nd ref="748883737"/>
-    <nd ref="748883630"/>
-    <nd ref="748883688"/>
-    <nd ref="1354438504"/>
-    <nd ref="1496842246"/>
-    <nd ref="1496842254"/>
-    <nd ref="1354438503"/>
-    <nd ref="1496842255"/>
-    <nd ref="1496842244"/>
-    <nd ref="1354438502"/>
-    <nd ref="1354438501"/>
-    <nd ref="748883763"/>
-    <tag k="building" v="yes"/>
-    <tag k="name" v="神泉駅"/>
+    <tag k="ref" v="I03;N03"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wikipedia" v="ja:白金高輪駅"/>
+  </node>
+  <node id="2180732990" lat="35.7323388" lon="139.7987663">
+    <tag k="name" v="南千住"/>
+    <tag k="name:en" v="Minami-senju"/>
+    <tag k="name:ja" v="南千住"/>
+    <tag k="name:ja_kana" v="みなみせんじゅ"/>
+    <tag k="name:ja_rm" v="Minami Senju"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="source" v="Bing,2007-04"/>
-  </way>
-  <way id="94061850">
-    <nd ref="1093541347"/>
-    <nd ref="1093541247"/>
-    <nd ref="1093541235"/>
-    <nd ref="1093541238"/>
-    <nd ref="1093541321"/>
-    <nd ref="1093541369"/>
-    <nd ref="1093541324"/>
-    <nd ref="1093541287"/>
-    <nd ref="1093541259"/>
-    <nd ref="1093541339"/>
-    <nd ref="1093541270"/>
-    <nd ref="1093541326"/>
-    <nd ref="1093541316"/>
-    <nd ref="1093541253"/>
-    <nd ref="1093541318"/>
-    <nd ref="1093541242"/>
-    <nd ref="1093541366"/>
-    <nd ref="1093541232"/>
-    <nd ref="1093541284"/>
-    <nd ref="1093541244"/>
-    <nd ref="1579679822"/>
-    <nd ref="1093541365"/>
-    <nd ref="1093541240"/>
-    <nd ref="1093541341"/>
-    <nd ref="1093541299"/>
-    <nd ref="1093541367"/>
-    <nd ref="1093541364"/>
-    <nd ref="1093541352"/>
-    <nd ref="1093541349"/>
-    <nd ref="1093541329"/>
-    <nd ref="1093541343"/>
-    <nd ref="1093541368"/>
-    <nd ref="1093541345"/>
-    <nd ref="1093541256"/>
-    <nd ref="1093541264"/>
-    <nd ref="1093541223"/>
-    <nd ref="1093541312"/>
-    <nd ref="1093541250"/>
-    <nd ref="1093541294"/>
-    <nd ref="1093541262"/>
-    <nd ref="1093541371"/>
-    <nd ref="1093541289"/>
-    <nd ref="1093541282"/>
-    <nd ref="1093541347"/>
-    <tag k="building" v="train_station"/>
-    <tag k="layer" v="2"/>
-    <tag k="name" v="高田馬場"/>
-    <tag k="name:en" v="Takadanobaba"/>
+    <tag k="ref" v="H20"/>
+    <tag k="subway" v="yes"/>
+    <tag k="wheelchair" v="yes"/>
+  </node>
+  <node id="2189509309" lat="35.7079461" lon="139.7735351">
+    <tag k="name" v="上野御徒町"/>
+    <tag k="name:en" v="Ueno-okachimachi"/>
+    <tag k="name:ja" v="上野御徒町"/>
+    <tag k="name:ja_kana" v="うえのおかちまち"/>
+    <tag k="name:ja_rm" v="Ueno Okachimachi"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E09"/>
+  </node>
+  <node id="2204524125" lat="35.6549992" lon="139.7565731"/>
+  <node id="2204524131" lat="35.6551125" lon="139.7565883"/>
+  <node id="2204524133" lat="35.6555571" lon="139.7566084"/>
+  <node id="2204524135" lat="35.6556805" lon="139.7566089"/>
+  <node id="2204524144" lat="35.6557718" lon="139.7569378"/>
+  <node id="2204524146" lat="35.6551441" lon="139.7566527"/>
+  <node id="2204524152" lat="35.6551376" lon="139.7567287"/>
+  <node id="2204524156" lat="35.6553598" lon="139.7565816"/>
+  <node id="2204524158" lat="35.6550199" lon="139.7567622"/>
+  <node id="2204524165" lat="35.6549675" lon="139.7565843"/>
+  <node id="2204524169" lat="35.6556762" lon="139.7566463"/>
+  <node id="2204524188" lat="35.6553566" lon="139.7565973"/>
+  <node id="2204524198" lat="35.6555604" lon="139.7565933"/>
+  <node id="2204524200" lat="35.6549970" lon="139.7566697"/>
+  <node id="2204524205" lat="35.6551157" lon="139.7565655"/>
+  <node id="2204524206" lat="35.6557903" lon="139.7566603"/>
+  <node id="2204524210" lat="35.6550123" lon="139.7567381"/>
+  <node id="2253640011" lat="35.6903852" lon="139.6914735">
+    <tag k="name" v="都庁前"/>
+    <tag k="name:en" v="Tochomae"/>
+    <tag k="name:ja" v="都庁前"/>
+    <tag k="name:ja_kana" v="とちょうまえ"/>
+    <tag k="name:ja_rm" v="Tochō mae"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E28"/>
+  </node>
+  <node id="2328213063" lat="35.6714557" lon="139.7653318">
+    <tag k="name" v="銀座"/>
+    <tag k="name:en" v="Ginza"/>
+    <tag k="name:fr" v="Ginza"/>
+    <tag k="name:ja" v="銀座"/>
+    <tag k="name:ja_kana" v="ぎんざ"/>
+    <tag k="name:ja_rm" v="Ginza"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="source" v="Bing, 2007-04"/>
-  </way>
-  <way id="96328422">
-    <nd ref="1116460146"/>
-    <nd ref="1116460149"/>
-    <nd ref="1116460143"/>
-    <nd ref="1116460142"/>
-    <nd ref="1116460133"/>
-    <nd ref="1116460141"/>
-    <nd ref="1116460130"/>
-    <nd ref="1116460134"/>
-    <nd ref="1116460140"/>
-    <nd ref="1116460135"/>
-    <nd ref="1116460137"/>
-    <nd ref="1116460146"/>
-    <tag k="building" v="train_station"/>
-    <tag k="layer" v="2"/>
-    <tag k="name" v="高田馬場"/>
-    <tag k="name:en" v="Takadanobaba"/>
+    <tag k="ref" v="G09"/>
+    <tag k="wikipedia" v="ja:銀座駅"/>
+  </node>
+  <node id="2329712566" lat="35.6551352" lon="139.7370323">
+    <tag k="name" v="麻布十番"/>
+    <tag k="name:en" v="Azabu-juban"/>
+    <tag k="name:ja" v="麻布十番"/>
+    <tag k="name:ja_kana" v="あざぶじゅうばん"/>
+    <tag k="name:ja_rm" v="Azabu jūban"/>
+    <tag k="note" v="南北線"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="source" v="Bing, 2007-04"/>
-  </way>
-  <way id="97194405">
-    <nd ref="1125926437"/>
-    <nd ref="1125926455"/>
-    <nd ref="1125926452"/>
-    <nd ref="1125926446"/>
-    <nd ref="1125926456"/>
-    <nd ref="1125926438"/>
-    <nd ref="1125926459"/>
-    <nd ref="1125926440"/>
-    <nd ref="1808422478"/>
-    <nd ref="1808422477"/>
-    <nd ref="1808422475"/>
-    <nd ref="1125926432"/>
-    <nd ref="1125926458"/>
-    <nd ref="1125926437"/>
-    <tag k="building" v="yes"/>
-    <tag k="layer" v="1"/>
-    <tag k="name:ru" v="Синаномати"/>
+    <tag k="ref" v="N04"/>
+    <tag k="wheelchair" v="limited"/>
+    <tag k="wikipedia" v="ja:麻布十番駅"/>
+  </node>
+  <node id="2329712992" lat="35.7360004" lon="139.7467954">
+    <tag k="name" v="駒込"/>
+    <tag k="name:en" v="Komagome"/>
+    <tag k="name:ja" v="駒込"/>
+    <tag k="name:ja_kana" v="こまごめ"/>
+    <tag k="name:ja_rm" v="Komagome"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="source" v="Bing, 2007-04"/>
-  </way>
-  <way id="98491742">
-    <nd ref="1139431612"/>
-    <nd ref="1139431606"/>
-    <nd ref="1139431610"/>
-    <nd ref="1139431614"/>
-    <nd ref="1139431605"/>
-    <nd ref="1139431609"/>
-    <nd ref="1139431612"/>
-    <tag k="building" v="train_station"/>
-    <tag k="layer" v="1"/>
-    <tag k="name" v="市ヶ谷 (Ichigaya)"/>
-    <tag k="name:en" v="Ichigaya"/>
-    <tag k="name:fr" v="Ichigaya"/>
-    <tag k="name:ja" v="市ヶ谷"/>
-    <tag k="name:ru" v="Итигая"/>
+    <tag k="ref" v="N14"/>
+    <tag k="wikipedia" v="ja:駒込駅"/>
+  </node>
+  <node id="2389061823" lat="35.6968610" lon="139.7974440">
+    <tag k="name" v="両国 (Ryōgoku)"/>
+    <tag k="name:en" v="Ryōgoku"/>
+    <tag k="name:ja" v="両国"/>
+    <tag k="name:ja_kana" v="りょうごく"/>
+    <tag k="name:ja_rm" v="Ryogoku"/>
+    <tag k="name:ru" v="Рёгоку"/>
     <tag k="railway" v="station"/>
-  </way>
-  <way id="116596178">
-    <nd ref="1314077044"/>
-    <nd ref="1314077022"/>
-    <nd ref="1314077031"/>
-    <nd ref="1314077047"/>
-    <nd ref="1314077044"/>
-    <tag k="building" v="train_station"/>
-    <tag k="building:levels" v="5"/>
-    <tag k="height" v="17.5"/>
-    <tag k="layer" v="2"/>
-    <tag k="name" v="新宿駅 (Shinjukueki)"/>
-    <tag k="name:en" v="Shinjuku Station"/>
-    <tag k="name:fr" v="Gare de Shinjuku"/>
+    <tag k="wikipedia" v="ja:両国駅"/>
+  </node>
+  <node id="2389061831" lat="35.6589432" lon="139.7772034">
+    <tag k="name" v="勝どき"/>
+    <tag k="name:en" v="Kachidoki"/>
+    <tag k="name:ja" v="勝どき"/>
+    <tag k="name:ja_kana" v="かちどき"/>
+    <tag k="name:ja_rm" v="Kachidoki"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-  </way>
-  <way id="116811932">
-    <nd ref="1316051112"/>
-    <nd ref="1593485596"/>
-    <nd ref="1316051113"/>
-    <nd ref="1316051110"/>
-    <nd ref="1316051111"/>
-    <nd ref="1316051108"/>
-    <nd ref="1316051109"/>
-    <nd ref="1316051102"/>
-    <nd ref="1316051099"/>
-    <nd ref="1316051100"/>
-    <nd ref="1127216277"/>
-    <nd ref="2103660127"/>
-    <nd ref="2103660123"/>
-    <nd ref="2070961115"/>
-    <nd ref="1316051096"/>
-    <nd ref="1316051094"/>
-    <nd ref="1316051071"/>
-    <nd ref="1316051005"/>
-    <nd ref="1593485519"/>
-    <nd ref="1316050986"/>
-    <nd ref="1316051068"/>
-    <nd ref="1316051070"/>
-    <nd ref="2084165848"/>
-    <nd ref="1316051049"/>
-    <nd ref="2084165853"/>
-    <nd ref="1127216290"/>
-    <nd ref="1127216297"/>
-    <nd ref="1316051077"/>
-    <nd ref="1127216265"/>
-    <nd ref="2084165863"/>
-    <nd ref="1127216276"/>
-    <nd ref="1127216299"/>
-    <nd ref="1679318992"/>
-    <nd ref="1679318979"/>
-    <nd ref="1679318982"/>
-    <nd ref="1679318980"/>
-    <nd ref="1679318978"/>
-    <nd ref="1679318976"/>
-    <nd ref="1679318964"/>
-    <nd ref="1679318962"/>
-    <nd ref="1679318960"/>
-    <nd ref="1679318959"/>
-    <nd ref="1679318957"/>
-    <nd ref="1679318955"/>
-    <nd ref="1679318952"/>
-    <nd ref="1679318953"/>
-    <nd ref="1679318983"/>
-    <nd ref="1679318984"/>
-    <nd ref="1679318985"/>
-    <nd ref="1679318988"/>
-    <nd ref="1679319000"/>
-    <nd ref="1679319014"/>
-    <nd ref="1679319015"/>
-    <nd ref="1316051107"/>
-    <nd ref="1127216283"/>
-    <nd ref="1316051103"/>
-    <nd ref="1316051112"/>
-    <tag k="building" v="train_station"/>
-    <tag k="name" v="JR渋谷駅"/>
+    <tag k="ref" v="E17"/>
+    <tag k="wikipedia" v="ja:勝どき駅"/>
+  </node>
+  <node id="2389061844" lat="35.6895635" lon="139.7005923">
+    <tag k="name" v="新宿 (Shinjuku)"/>
+    <tag k="name:en" v="Shinjuku"/>
+    <tag k="name:fr" v="Shinjuku"/>
+    <tag k="name:ja" v="新宿"/>
+    <tag k="name:ja_kana" v="しんじゅく"/>
+    <tag k="name:ja_rm" v="Shinjuku"/>
+    <tag k="name:ru" v="Синдзюку"/>
+    <tag k="operator" v="JR東日本"/>
+    <tag k="platforms" v="7"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="source" v="Bing, 2007-04"/>
-  </way>
-  <way id="128195825">
-    <nd ref="1417172219"/>
-    <nd ref="1417172263"/>
-    <nd ref="1417172251"/>
-    <nd ref="1417172290"/>
-    <nd ref="1417172219"/>
-    <tag k="building" v="train_station"/>
-    <tag k="name" v="浜松町 (Hamamatsuchō)"/>
-    <tag k="name:en" v="Hamamatsuchō"/>
+    <tag k="source" v="Bing 2010"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:新宿駅"/>
+  </node>
+  <node id="2389061846" lat="35.6900182" lon="139.6990438">
+    <tag k="name" v="新宿 (Shinjuku)"/>
+    <tag k="name:en" v="Shinjuku"/>
+    <tag k="name:fr" v="Shinjuku"/>
+    <tag k="name:ja" v="新宿"/>
+    <tag k="name:ja_kana" v="しんじゅく"/>
+    <tag k="name:ja_rm" v="Shinjuku"/>
+    <tag k="name:ru" v="Синдзюку"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wheelchair" v="limited"/>
+    <tag k="wikipedia" v="ja:新宿駅"/>
+  </node>
+  <node id="2389061847" lat="35.6915552" lon="139.6996818">
+    <tag k="name" v="新宿"/>
+    <tag k="name:en" v="Shinjuku"/>
+    <tag k="name:fr" v="Shinjuku"/>
+    <tag k="name:ja" v="新宿"/>
+    <tag k="name:ja_kana" v="しんじゅく"/>
+    <tag k="name:ja_rm" v="Shinjuku"/>
+    <tag k="name:ru" v="Синдзюку"/>
+    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wikipedia" v="ja:新宿駅"/>
+  </node>
+  <node id="2389061848" lat="35.6921774" lon="139.7008290">
+    <tag k="name" v="新宿 (Shinjuku)"/>
+    <tag k="name:en" v="Shinjuku"/>
+    <tag k="name:fr" v="Shinjuku"/>
+    <tag k="name:ja" v="新宿"/>
+    <tag k="name:ja_kana" v="しんじゅく"/>
+    <tag k="name:ja_rm" v="Shinjuku"/>
+    <tag k="name:ru" v="Синдзюку"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="platforms" v="2"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="M08"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:新宿駅"/>
+  </node>
+  <node id="2389061854" lat="35.6885742" lon="139.7107081">
+    <tag k="name" v="新宿御苑前"/>
+    <tag k="name:en" v="Shinjuku-gyoemmae"/>
+    <tag k="name:ja" v="新宿御苑前"/>
+    <tag k="name:ja_kana" v="しんじゅくぎょえんまえ"/>
+    <tag k="name:ja_rm" v="Shinjuku gyoen mae"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="M10"/>
+    <tag k="wikipedia" v="ja:新宿御苑前駅"/>
+  </node>
+  <node id="2389061878" lat="35.6880556" lon="139.7982500">
+    <tag k="name" v="森下"/>
+    <tag k="name:en" v="Morishita"/>
+    <tag k="name:ja" v="森下"/>
+    <tag k="name:ja_kana" v="もりした"/>
+    <tag k="name:ja_rm" v="Morishita"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E13"/>
+    <tag k="wikipedia" v="ja:森下駅 (東京都)"/>
+  </node>
+  <node id="2389668051" lat="35.6908649" lon="139.7048579">
+    <tag k="name" v="新宿三丁目"/>
+    <tag k="name:en" v="Shinjuku-sanchome"/>
+    <tag k="name:ja" v="新宿三丁目"/>
+    <tag k="name:ja_kana" v="しんじゅくさんちょうめ"/>
+    <tag k="name:ja_rm" v="Shinjuku sanchōme"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="platforms" v="4"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="M09;F13"/>
+    <tag k="wikipedia" v="ja:新宿三丁目駅"/>
+  </node>
+  <node id="2389668134" lat="35.6879305" lon="139.7200824">
+    <tag k="name" v="四谷三丁目"/>
+    <tag k="name:en" v="Yotsuya-sanchome"/>
+    <tag k="name:ja" v="四谷三丁目"/>
+    <tag k="name:ja_kana" v="よつやさんちょうめ"/>
+    <tag k="name:ja_rm" v="Yotsuya sanchōme"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="M11"/>
+    <tag k="wikipedia" v="ja:四谷三丁目駅"/>
+  </node>
+  <node id="2389825711" lat="35.6564959" lon="139.7361326">
+    <tag k="name" v="麻布十番"/>
+    <tag k="name:en" v="Azabu-juban"/>
+    <tag k="name:ja" v="麻布十番"/>
+    <tag k="name:ja_kana" v="あざぶじゅうばん"/>
+    <tag k="name:ja_rm" v="Azabu jūban"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="note" v="大江戸線"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E22"/>
+  </node>
+  <node id="2389825841" lat="35.6630661" lon="139.7596758">
+    <tag k="alt_name" v="シオサイト"/>
+    <tag k="name" v="汐留"/>
+    <tag k="name:en" v="Shiodome"/>
+    <tag k="name:ja" v="汐留"/>
+    <tag k="name:ja_kana" v="しおどめ"/>
+    <tag k="name:ja_rm" v="Shiodome"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E19"/>
+  </node>
+  <node id="2389825843" lat="35.6635507" lon="139.7319116">
+    <tag k="name" v="六本木"/>
+    <tag k="name:en" v="Roppongi"/>
+    <tag k="name:ja" v="六本木"/>
+    <tag k="name:ja_kana" v="ろっぽんぎ"/>
+    <tag k="name:ja_rm" v="Roppongi"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E23"/>
+  </node>
+  <node id="2389825933" lat="35.6799992" lon="139.7142056">
+    <tag k="alt_name" v="東京体育館前"/>
+    <tag k="name" v="国立競技場"/>
+    <tag k="name:en" v="Kokuritsu-kyogijo"/>
+    <tag k="name:ja" v="国立競技場"/>
+    <tag k="name:ja_kana" v="こくりつきょうぎじょう"/>
+    <tag k="name:ja_rm" v="Kokuritsu Kyōgijō"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E25"/>
+  </node>
+  <node id="2389825990" lat="35.6840299" lon="139.7014678">
+    <tag k="name" v="代々木"/>
+    <tag k="name:en" v="Yoyogi"/>
+    <tag k="name:ja" v="代々木"/>
+    <tag k="name:ja_kana" v="よよぎ"/>
+    <tag k="name:ja_rm" v="Yoyogi"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E26"/>
+  </node>
+  <node id="2389826024" lat="35.6886373" lon="139.6990058">
+    <tag k="name" v="新宿 (Shinjuku)"/>
+    <tag k="name:en" v="Shinjuku"/>
+    <tag k="name:ja" v="新宿"/>
+    <tag k="name:ja_rm" v="Shinjuku"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="railway" v="station"/>
+  </node>
+  <node id="2389826102" lat="35.6928337" lon="139.6992247">
+    <tag k="name" v="新宿西口"/>
+    <tag k="name:en" v="Shinjuku-nishiguchi"/>
+    <tag k="name:ja" v="新宿西口"/>
+    <tag k="name:ja_kana" v="しんじゅくにしぐち"/>
+    <tag k="name:ja_rm" v="Shinjuku nishiguchi"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E01"/>
+  </node>
+  <node id="2389826138" lat="35.6979339" lon="139.7075497">
+    <tag k="name" v="東新宿"/>
+    <tag k="name:en" v="Higashi-shinjuku"/>
+    <tag k="name:ja" v="東新宿"/>
+    <tag k="name:ja_kana" v="ひがししんじゅく"/>
+    <tag k="name:ja_rm" v="Higashi Shinjuku"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E02"/>
+  </node>
+  <node id="2389826186" lat="35.6994676" lon="139.7255875">
+    <tag k="name" v="牛込柳町"/>
+    <tag k="name:en" v="Ushigome-yanagicho"/>
+    <tag k="name:ja" v="牛込柳町"/>
+    <tag k="name:ja_kana" v="うしごめやなぎちょう"/>
+    <tag k="name:ja_rm" v="Ushigome Yanagichō"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E04"/>
+  </node>
+  <node id="2389826225" lat="35.7009139" lon="139.7359501">
+    <tag k="name" v="牛込神楽坂"/>
+    <tag k="name:en" v="Ushigome-kagurazaka"/>
+    <tag k="name:ja" v="牛込神楽坂"/>
+    <tag k="name:ja_kana" v="うしごめかぐらざか"/>
+    <tag k="name:ja_rm" v="Ushigome Kagurazaka"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E05"/>
+  </node>
+  <node id="2389826249" lat="35.7031147" lon="139.7457905">
+    <tag k="name" v="飯田橋"/>
+    <tag k="name:en" v="Iidabashi"/>
+    <tag k="name:ja" v="飯田橋"/>
+    <tag k="name:ja_kana" v="いいだばし"/>
+    <tag k="name:ja_rm" v="Iidabashi"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="railway" v="station"/>
+  </node>
+  <node id="2389826365" lat="35.7070079" lon="139.7820354">
+    <tag k="name" v="新御徒町"/>
+    <tag k="name:en" v="Shin-okachimachi"/>
+    <tag k="name:ja" v="新御徒町"/>
+    <tag k="name:ja_kana" v="しんおかちまち"/>
+    <tag k="name:ja_rm" v="Shin Okachimachi"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E10"/>
+  </node>
+  <node id="2390642241" lat="35.6904700" lon="139.6991700">
+    <tag k="name" v="新宿"/>
+    <tag k="name:en" v="Shinjuku"/>
+    <tag k="name:ja" v="新宿"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="KSJ2/N02"/>
+    <tag k="source_ref" v="http://wiki.openstreetmap.org/wiki/Import/Catalogue/Japan_KSJ2_Import"/>
+  </node>
+  <node id="2407466991" lat="35.7109406" lon="139.7735044">
+    <tag k="name" v="上野 (Ueno)"/>
+    <tag k="name:en" v="Ueno"/>
+    <tag k="name:ja" v="京成上野"/>
+    <tag k="operator" v="京成電鉄 (Keisei Electric Railway)"/>
+    <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="KS01"/>
+  </node>
+  <node id="2446821605" lat="35.7143100" lon="139.7697407">
+    <tag k="name" v="西園"/>
+    <tag k="name:en" v="Nishien"/>
+    <tag k="name:ja" v="西園"/>
+    <tag k="name:ja_kana" v="にしえん"/>
+    <tag k="name:ja_rm" v="Nishien"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+  </node>
+  <node id="2446821608" lat="35.7158583" lon="139.7701323">
+    <tag k="name" v="東園"/>
+    <tag k="name:en" v="Higashien"/>
+    <tag k="name:ja" v="東園"/>
+    <tag k="name:ja_kana" v="ひがしえん"/>
+    <tag k="name:ja_rm" v="Higashien"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+  </node>
+  <node id="2466136236" lat="35.6836904" lon="139.6988804">
+    <tag k="name" v="南新宿"/>
+    <tag k="name:ar" v="مينامي-شينجوكو"/>
+    <tag k="name:en" v="Minami-Shinjuku"/>
+    <tag k="name:fr" v="Minami-Shinjuku"/>
+    <tag k="name:ja" v="南新宿"/>
+    <tag k="name:ja_kana" v="みなみしんじゅく"/>
+    <tag k="name:ja_rm" v="Minami-shinjuku"/>
+    <tag k="name:ko" v="미나미신주쿠 역"/>
+    <tag k="name:ru" v="Минами-Синдзюку"/>
+    <tag k="name:zh" v="南新宿站"/>
+    <tag k="operator" v="小田急電鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="OH02"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wikipedia" v="ru:Минами-Синдзюку (станция)"/>
+  </node>
+  <node id="2540852494" lat="35.7084848" lon="139.7526511">
+    <tag k="name" v="春日"/>
+    <tag k="name:en" v="Kasuga"/>
+    <tag k="name:ja" v="春日"/>
+    <tag k="name:ja_kana" v="かすが"/>
+    <tag k="name:ja_rm" v="Kasuga"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E07"/>
+    <tag k="wikipedia" v="ja:春日駅 (東京都)"/>
+  </node>
+  <node id="2540852495" lat="35.7075186" lon="139.7605410">
+    <tag k="name" v="本郷三丁目"/>
+    <tag k="name:en" v="Hongo-sanchome"/>
+    <tag k="name:ja" v="本郷三丁目"/>
+    <tag k="name:ja_kana" v="ほんごうさんちょうめ"/>
+    <tag k="name:ja_rm" v="Hongō Sanchōme"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E08"/>
+    <tag k="wikipedia" v="ja:本郷三丁目駅"/>
+  </node>
+  <node id="2540852499" lat="35.7054789" lon="139.7924363">
+    <tag k="name" v="蔵前"/>
+    <tag k="name:en" v="Kuramae"/>
+    <tag k="name:ja" v="蔵前"/>
+    <tag k="name:ja_kana" v="くらまえ"/>
+    <tag k="name:ja_rm" v="Kuramae"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E11"/>
+  </node>
+  <node id="2540852501" lat="35.6549696" lon="139.7438925">
+    <tag k="name" v="赤羽橋"/>
+    <tag k="name:en" v="Akabanebashi"/>
+    <tag k="name:ja" v="赤羽橋"/>
+    <tag k="name:ja_kana" v="あかばねばし"/>
+    <tag k="name:ja_rm" v="Akabanebashi"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E21"/>
+  </node>
+  <node id="2540852502" lat="35.6725145" lon="139.7949361">
+    <tag k="name" v="門前仲町"/>
+    <tag k="name:en" v="Monzen-nakacho"/>
+    <tag k="name:ja" v="門前仲町"/>
+    <tag k="name:ja_kana" v="もんぜんなかちょう"/>
+    <tag k="name:ja_rm" v="Monzen Nakachō"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E15"/>
+    <tag k="wikipedia" v="ja:門前仲町駅"/>
+  </node>
+  <node id="2543426557" lat="35.7372232" lon="139.7739554">
+    <tag k="name" v="新三河島"/>
+    <tag k="name:en" v="Shim-Mikawashima"/>
+    <tag k="name:ja" v="新三河島"/>
+    <tag k="name:ja_kana" v="しんみかわしま"/>
+    <tag k="name:ja_rm" v="Shin Mikawashima"/>
+    <tag k="operator" v="京成電鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="KS03"/>
+    <tag k="source" v="Bing"/>
+    <tag k="wikipedia" v="ja:新三河島駅"/>
+  </node>
+  <node id="2545151221" lat="35.7187273" lon="139.8204120">
+    <tag k="KSJ2:LIN" v="押上線"/>
+    <tag k="name" v="京成曳舟"/>
+    <tag k="name:en" v="Keisei Hikifune"/>
+    <tag k="name:ja" v="京成曳舟"/>
+    <tag k="name:ja_kana" v="けいせいひきふね"/>
+    <tag k="name:ja_rm" v="Keisei Hikifune"/>
+    <tag k="operator" v="京成電鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="KS46"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wheelchair" v="limited"/>
+    <tag k="wikipedia" v="ja:京成曳舟駅"/>
+  </node>
+  <node id="2545151247" lat="35.7271367" lon="139.8283287">
+    <tag k="KSJ2:LIN" v="押上線"/>
+    <tag k="name" v="八広"/>
+    <tag k="name:en" v="Yahiro"/>
+    <tag k="name:ja" v="八広"/>
+    <tag k="name:ja_kana" v="やひろ"/>
+    <tag k="name:ja_rm" v="Yahiro"/>
+    <tag k="operator" v="京成電鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="KS47"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wikipedia" v="ja:八広駅"/>
+  </node>
+  <node id="2546879669" lat="35.7086163" lon="139.8043592">
+    <tag k="name" v="本所吾妻橋"/>
+    <tag k="name:en" v="Honjo-Azumabashi"/>
+    <tag k="name:ja" v="本所吾妻橋"/>
+    <tag k="name:ja_kana" v="ほんじょあずまばし"/>
+    <tag k="name:ja_rm" v="Honjo Azumabashi"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="A19"/>
+    <tag k="wikipedia" v="en:Honjo-azumabashi Station"/>
+  </node>
+  <node id="2546879672" lat="35.6388165" lon="139.7400879">
+    <tag k="name" v="泉岳寺"/>
+    <tag k="name:en" v="Sengakuji"/>
+    <tag k="name:ja" v="泉岳寺"/>
+    <tag k="name:ja_kana" v="せんがくじ"/>
+    <tag k="name:ja_rm" v="Sengakuji"/>
+    <tag k="operator" v="東京都交通局;京浜急行電鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="A07"/>
+    <tag k="source" v="Bing"/>
+  </node>
+  <node id="2558121904" lat="35.6467100" lon="139.7100642">
+    <tag k="name" v="恵比寿"/>
+    <tag k="name:en" v="Ebisu"/>
+    <tag k="name:fr" v="Gare d'Ebisu"/>
+    <tag k="name:ja" v="恵比寿"/>
+    <tag k="name:ja_kana" v="えびす"/>
+    <tag k="name:ja_rm" v="Ebisu"/>
+    <tag k="name:ru" v="Эбису"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="Bing,2007-04"/>
+  </node>
+  <node id="2558121907" lat="35.6551111" lon="139.7570622">
+    <tag k="name" v="浜松町"/>
+    <tag k="name:en" v="Hamamatsucho"/>
     <tag k="name:fr" v="Hamamatsuchō"/>
     <tag k="name:ja" v="浜松町"/>
     <tag k="name:ja_kana" v="はままつちょう"/>
     <tag k="name:ja_rm" v="Hamamatsuchō"/>
+    <tag k="name:ru" v="Хамамацутё"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
-    <tag k="source" v="Bing"/>
+    <tag k="wheelchair" v="yes"/>
     <tag k="wikipedia" v="ja:浜松町駅"/>
-  </way>
-  <way id="143166708">
-    <nd ref="1566526414"/>
-    <nd ref="1566526465"/>
-    <nd ref="1566526467"/>
-    <nd ref="1566526470"/>
-    <nd ref="1566526473"/>
-    <nd ref="1566526479"/>
-    <nd ref="1566526485"/>
-    <nd ref="1566526490"/>
-    <nd ref="1566526499"/>
-    <nd ref="1566526513"/>
-    <nd ref="1566526517"/>
-    <nd ref="1566526526"/>
-    <nd ref="1566526538"/>
-    <nd ref="1566526550"/>
-    <nd ref="1566526554"/>
-    <nd ref="1566526556"/>
-    <nd ref="1566526555"/>
-    <nd ref="1566526552"/>
-    <nd ref="1566526541"/>
-    <nd ref="1566526535"/>
-    <nd ref="1566526524"/>
-    <nd ref="1566526516"/>
-    <nd ref="1566526507"/>
-    <nd ref="1566526504"/>
-    <nd ref="1566526501"/>
-    <nd ref="1566526498"/>
-    <nd ref="1566526495"/>
-    <nd ref="1566526489"/>
-    <nd ref="1566526482"/>
-    <nd ref="1566526477"/>
-    <nd ref="1566526472"/>
-    <nd ref="1566526471"/>
-    <nd ref="1566526469"/>
-    <nd ref="1566526468"/>
-    <nd ref="1566526464"/>
-    <nd ref="1566526411"/>
-    <nd ref="1573952008"/>
-    <nd ref="1573951978"/>
-    <nd ref="1573952039"/>
-    <nd ref="1573952030"/>
-    <nd ref="1566526414"/>
-    <tag k="building" v="train_station"/>
-    <tag k="layer" v="1"/>
-    <tag k="name" v="飯田橋 (Iidabashi)駅"/>
+  </node>
+  <node id="2558121908" lat="35.6702926" lon="139.7027240">
+    <tag k="name" v="原宿"/>
+    <tag k="name:en" v="Harajuku"/>
+    <tag k="name:fr" v="Harajuku"/>
+    <tag k="name:ja" v="原宿"/>
+    <tag k="name:ja_kana" v="はらじゅく"/>
+    <tag k="name:ja_rm" v="Harajuku"/>
+    <tag k="name:ru" v="Харадзюку"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:原宿駅"/>
+  </node>
+  <node id="2558121912" lat="35.6913187" lon="139.7355040">
+    <tag k="name" v="市ケ谷"/>
+    <tag k="name:en" v="Ichigaya"/>
+    <tag k="name:ja" v="市ケ谷"/>
+    <tag k="name:ja_rm" v="Ichigaya"/>
+    <tag k="name:ru" v="Итигая"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:市ケ谷駅"/>
+  </node>
+  <node id="2558121914" lat="35.7013646" lon="139.7444438">
+    <tag k="name" v="飯田橋 (Iidabashi)"/>
+    <tag k="name:en" v="Iidabashi"/>
+    <tag k="name:ja" v="飯田橋"/>
     <tag k="name:ru" v="Иидабаси"/>
     <tag k="railway" v="station"/>
     <tag k="source" v="Bing,2007-04"/>
-  </way>
-  <way id="143820280">
-    <nd ref="1573806472"/>
-    <nd ref="1573806460"/>
-    <nd ref="1573806462"/>
-    <nd ref="1573806465"/>
-    <nd ref="1573806461"/>
-    <nd ref="1573806458"/>
-    <nd ref="1573806468"/>
-    <nd ref="1573806469"/>
-    <nd ref="1573806466"/>
-    <nd ref="1573806467"/>
-    <nd ref="1573806472"/>
-    <tag k="building" v="train_station"/>
-    <tag k="layer" v="2"/>
-    <tag k="name" v="御茶ノ水 (Ochanomizu)"/>
-    <tag k="name:en" v="Ochanomizu"/>
-    <tag k="name:fr" v="Ochanomizu"/>
-    <tag k="name:ja" v="御茶ノ水"/>
-    <tag k="name:ja_kana" v="おちゃのみず"/>
-    <tag k="name:ja_rm" v="Ochanomizu"/>
-    <tag k="name:ru" v="Отяномидзу"/>
+  </node>
+  <node id="2558121915" lat="35.7304093" lon="139.7112622">
+    <tag k="name" v="池袋"/>
+    <tag k="name:en" v="Ikebukuro"/>
+    <tag k="name:ja" v="池袋"/>
+    <tag k="name:ja_kana" v="いけぶくろ"/>
+    <tag k="name:ja_rm" v="Ikebukuro"/>
+    <tag k="name:ru" v="Икэбукуро"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="railway" v="station"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:池袋駅"/>
+  </node>
+  <node id="2558121917" lat="35.6917842" lon="139.7709170">
+    <tag k="name" v="神田"/>
+    <tag k="name:en" v="Kanda"/>
+    <tag k="name:ja" v="神田"/>
+    <tag k="name:ja_kana" v="かんだ"/>
+    <tag k="name:ja_rm" v="Kanda"/>
+    <tag k="name:ru" v="Канда"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:神田駅 (東京都)"/>
+  </node>
+  <node id="2558121925" lat="35.6327010" lon="139.7160372">
+    <tag k="name" v="目黒"/>
+    <tag k="name:en" v="Meguro"/>
+    <tag k="name:ja" v="目黒"/>
+    <tag k="name:ja_kana" v="めぐろ"/>
+    <tag k="name:ja_rm" v="Meguro"/>
+    <tag k="name:ru" v="Мэгуро"/>
+    <tag k="railway" v="station"/>
+    <tag k="wheelchair" v="yes"/>
+  </node>
+  <node id="2558121937" lat="35.6957996" lon="139.7929596">
+    <tag k="name" v="両国"/>
+    <tag k="name:en" v="Ryogoku"/>
+    <tag k="name:ja" v="両国"/>
+    <tag k="name:ja_kana" v="りょうごく"/>
+    <tag k="name:ja_rm" v="Ryōgoku"/>
+    <tag k="name:ru" v="Рёгоку"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+  </node>
+  <node id="2558121938" lat="35.6812658" lon="139.7113311">
+    <tag k="name" v="千駄ケ谷"/>
+    <tag k="name:en" v="Sendagaya"/>
+    <tag k="name:fr" v="Sendagaya"/>
+    <tag k="name:ja" v="千駄ケ谷"/>
+    <tag k="name:ja_kana" v="せんだがや"/>
+    <tag k="name:ja_rm" v="Sendagaya"/>
+    <tag k="name:ru" v="Сэндагая"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:千駄ケ谷駅"/>
+  </node>
+  <node id="2558121940" lat="35.6663022" lon="139.7583089">
+    <tag k="name" v="新橋"/>
+    <tag k="name:en" v="Shimbashi"/>
+    <tag k="name:fr" v="Shimbashi"/>
+    <tag k="name:ja" v="新橋"/>
+    <tag k="name:ja_kana" v="しんばし"/>
+    <tag k="name:ja_rm" v="Shimbashi"/>
+    <tag k="name:ru" v="Симбаси"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:新橋駅"/>
+  </node>
+  <node id="2558121945" lat="35.6800870" lon="139.7204512">
+    <tag k="name" v="信濃町"/>
+    <tag k="name:en" v="Shinanomachi"/>
+    <tag k="name:fr" v="Shinanomachi"/>
+    <tag k="name:ja" v="信濃町"/>
+    <tag k="name:ja_kana" v="しなのまち"/>
+    <tag k="name:ja_rm" v="Shinanomachi"/>
+    <tag k="name:ru" v="Синаномати"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:信濃町駅"/>
+  </node>
+  <node id="2558121946" lat="35.7020419" lon="139.7536358">
+    <tag k="name" v="水道橋"/>
+    <tag k="name:en" v="Suidobashi"/>
+    <tag k="name:ja" v="水道橋"/>
+    <tag k="name:ja_kana" v="すいどうばし"/>
+    <tag k="name:ja_rm" v="Suidōbashi"/>
+    <tag k="name:ru" v="Суйдобаси"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:水道橋駅"/>
+  </node>
+  <node id="2558121950" lat="35.6457389" lon="139.7475809">
+    <tag k="name" v="田町"/>
+    <tag k="name:en" v="Tamachi"/>
+    <tag k="name:fr" v="Tamachi"/>
+    <tag k="name:ja" v="田町"/>
+    <tag k="name:ja_kana" v="たまち"/>
+    <tag k="name:ja_rm" v="Tamachi"/>
+    <tag k="name:ru" v="Тамати"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="Bing 2010"/>
+    <tag k="wheelchair" v="yes"/>
+    <tag k="wikipedia" v="ja:田町駅 (東京都)"/>
+  </node>
+  <node id="2558121953" lat="35.6860666" lon="139.7306232">
+    <tag k="name" v="四ツ谷 (Yotsuya)"/>
+    <tag k="name:en" v="Yotsuya"/>
+    <tag k="name:fr" v="Yotsuya"/>
+    <tag k="name:ja_rm" v="Yotsuya"/>
+    <tag k="name:ru" v="Ёцуя"/>
     <tag k="railway" v="station"/>
     <tag k="source" v="Bing, 2007-04"/>
-    <tag k="wikipedia" v="ja:御茶ノ水駅"/>
-  </way>
-  <way id="143820281">
-    <nd ref="1573806464"/>
-    <nd ref="1573806471"/>
-    <nd ref="1573806470"/>
-    <nd ref="1573806457"/>
-    <nd ref="1573806463"/>
-    <nd ref="1573806456"/>
-    <nd ref="1573806459"/>
-    <nd ref="1573806464"/>
-    <tag k="building" v="train_station"/>
-    <tag k="layer" v="2"/>
-    <tag k="name" v="御茶ノ水 (Ochanomizu)"/>
+    <tag k="wheelchair" v="yes"/>
+  </node>
+  <node id="2558121954" lat="35.6839932" lon="139.7020732">
+    <tag k="name" v="代々木"/>
+    <tag k="name:en" v="Yoyogi"/>
+    <tag k="name:fr" v="Yoyogi"/>
+    <tag k="name:ja" v="代々木"/>
+    <tag k="name:ja_kana" v="よよぎ"/>
+    <tag k="name:ja_rm" v="Yoyogi"/>
+    <tag k="name:ru" v="Ёёги"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wheelchair" v="no"/>
+    <tag k="wikipedia" v="ja:代々木駅"/>
+  </node>
+  <node id="2558121955" lat="35.6749526" lon="139.7630578">
+    <tag k="name" v="有楽町"/>
+    <tag k="name:en" v="Yurakucho"/>
+    <tag k="name:fr" v="Yūrakuchō"/>
+    <tag k="name:ja" v="有楽町"/>
+    <tag k="name:ja_kana" v="ゆうらくちょう"/>
+    <tag k="name:ja_rm" v="Yūrakuchō"/>
+    <tag k="name:ru" v="Юракутё"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:有楽町駅"/>
+  </node>
+  <node id="2559434099" lat="35.6933502" lon="139.7824528">
+    <tag k="name" v="馬喰町"/>
+    <tag k="name:en" v="Bakurocho"/>
+    <tag k="name:ja" v="馬喰町駅"/>
+    <tag k="name:ja_kana" v="ばくろちょう"/>
+    <tag k="name:ja_rm" v="Bakurochō"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+  </node>
+  <node id="2559434111" lat="35.6913187" lon="139.7355040">
+    <tag k="name" v="市ケ谷 (Ichigaya)"/>
+    <tag k="name:en" v="Ichigaya"/>
+    <tag k="name:ja" v="市ケ谷"/>
+    <tag k="name:ja_rm" v="Ichigaya"/>
+    <tag k="name:ru" v="Итигая"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:市ケ谷駅"/>
+  </node>
+  <node id="2559434114" lat="35.7013646" lon="139.7444438">
+    <tag k="name" v="飯田橋 (Iidabashi)"/>
+    <tag k="name:en" v="Iidabashi"/>
+    <tag k="name:ja" v="飯田橋"/>
+    <tag k="name:ru" v="Иидабаси"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="Bing,2007-04"/>
+  </node>
+  <node id="2559434119" lat="35.6967524" lon="139.8141509">
+    <tag k="KSJ2:LIN" v="総武線"/>
+    <tag k="KSJ2:STN" v="錦糸町"/>
+    <tag k="name" v="錦糸町"/>
+    <tag k="name:en" v="Kinshicho"/>
+    <tag k="name:ja" v="錦糸町"/>
+    <tag k="name:ja_kana" v="きんしちょう"/>
+    <tag k="name:ja_rm" v="Kinshichō"/>
+    <tag k="name:ru" v="Кинситё"/>
+    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://w3land.mlit.go.jp/ksj2/datalist/N02.html"/>
+    <tag k="wikipedia" v="ja:錦糸町駅"/>
+  </node>
+  <node id="2559434143" lat="35.6995941" lon="139.7649185">
+    <tag k="name" v="御茶ノ水"/>
     <tag k="name:en" v="Ochanomizu"/>
     <tag k="name:fr" v="Ochanomizu"/>
     <tag k="name:ja" v="御茶ノ水"/>
     <tag k="name:ja_kana" v="おちゃのみず"/>
     <tag k="name:ja_rm" v="Ochanomizu"/>
     <tag k="name:ru" v="Отяномидзу"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="source" v="Bing, 2007-04"/>
+    <tag k="wheelchair" v="limited"/>
     <tag k="wikipedia" v="ja:御茶ノ水駅"/>
-  </way>
-  <way id="143839128">
-    <nd ref="1574055076"/>
-    <nd ref="1574055154"/>
-    <nd ref="1574055116"/>
-    <nd ref="1574055221"/>
-    <nd ref="1574055122"/>
-    <nd ref="1574055117"/>
-    <nd ref="1574055178"/>
-    <nd ref="1574055091"/>
-    <nd ref="1574055123"/>
-    <nd ref="1574055102"/>
-    <nd ref="1574055151"/>
-    <nd ref="1574055145"/>
-    <nd ref="1574055072"/>
-    <nd ref="1574055126"/>
-    <nd ref="1574055132"/>
-    <nd ref="1574055138"/>
-    <nd ref="1574055140"/>
-    <nd ref="1574055098"/>
-    <nd ref="1574055224"/>
-    <nd ref="1574055211"/>
-    <nd ref="1574055209"/>
-    <nd ref="1574055223"/>
-    <nd ref="1574055076"/>
-    <tag k="building" v="train_station"/>
-    <tag k="layer" v="1"/>
+  </node>
+  <node id="2559434159" lat="35.6886958" lon="139.7730478">
+    <tag k="name" v="新日本橋"/>
+    <tag k="name:en" v="Shin-Nihombashi"/>
+    <tag k="name:ja" v="新日本橋駅"/>
+    <tag k="name:ja_kana" v="しんにほんばし"/>
+    <tag k="name:ja_rm" v="Shin Nihombashi"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+  </node>
+  <node id="2559434165" lat="35.7126358" lon="139.7038872">
+    <tag k="KSJ2:LIN" v="新宿線"/>
+    <tag k="name" v="高田馬場"/>
+    <tag k="name:en" v="Takadanobaba"/>
+    <tag k="name:ja" v="高田馬場"/>
+    <tag k="name:ja_kana" v="たかだのばば"/>
+    <tag k="name:ja_rm" v="Takadanobaba"/>
+    <tag k="name:ru" v="Такаданобаба"/>
+    <tag k="operator" v="西武鉄道"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="SS02"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wikipedia" v="ja:高田馬場駅"/>
+  </node>
+  <node id="2559434166" lat="35.7126969" lon="139.7036457">
+    <tag k="name" v="高田馬場"/>
+    <tag k="name:en" v="Takadanobaba"/>
+    <tag k="name:ja" v="高田馬場"/>
+    <tag k="name:ja_kana" v="たかだのばば"/>
+    <tag k="name:ja_rm" v="Takadanobaba"/>
+    <tag k="name:ru" v="Такаданобаба"/>
+    <tag k="note" v="National-Land Numerical Information (Railway) 2007, MLIT Japan"/>
+    <tag k="note:ja" v="国土数値情報（鉄道データ）平成19年　国土交通省"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="KSJ2"/>
+    <tag k="source_ref" v="http://nlftp.mlit.go.jp/ksj/jpgis/datalist/KsjTmplt-N02-v1_1.html"/>
+    <tag k="wikipedia" v="ja:高田馬場駅"/>
+  </node>
+  <node id="2559434174" lat="35.6860666" lon="139.7306232">
     <tag k="name" v="四ツ谷 (Yotsuya)"/>
     <tag k="name:en" v="Yotsuya"/>
     <tag k="name:fr" v="Yotsuya"/>
+    <tag k="name:ja_rm" v="Yotsuya"/>
     <tag k="name:ru" v="Ёцуя"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="source" v="Bing, 2007-04"/>
+    <tag k="wheelchair" v="yes"/>
+  </node>
+  <node id="2593233094" lat="35.6720564" lon="139.7638809">
+    <tag k="name" v="銀座"/>
+    <tag k="name:en" v="Ginza"/>
+    <tag k="name:fr" v="Ginza"/>
+    <tag k="name:ja" v="銀座"/>
+    <tag k="name:ja_kana" v="ぎんざ"/>
+    <tag k="name:ja_rm" v="Ginza"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="H08"/>
+    <tag k="wikipedia" v="ja:銀座駅"/>
+  </node>
+  <node id="2593233097" lat="35.6730036" lon="139.7635990">
+    <tag k="name" v="銀座"/>
+    <tag k="name:en" v="Ginza"/>
+    <tag k="name:fr" v="Ginza"/>
+    <tag k="name:ja" v="銀座"/>
+    <tag k="name:ja_kana" v="ぎんざ"/>
+    <tag k="name:ja_rm" v="Ginza"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="M16"/>
+    <tag k="wikipedia" v="ja:銀座駅"/>
+  </node>
+  <node id="2714358960" lat="35.6460453" lon="139.8271174">
+    <tag k="name" v="新木場"/>
+    <tag k="name:en" v="Shin-kiba"/>
+    <tag k="name:ja" v="新木場"/>
+    <tag k="name:ja_kana" v="しんきば"/>
+    <tag k="name:ja_rm" v="Shin-kiba"/>
+    <tag k="operator" v="東京臨海高速鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="train" v="yes"/>
+  </node>
+  <node id="2727194420" lat="35.6820310" lon="139.7987830">
+    <tag k="name" v="清澄白河"/>
+    <tag k="name:en" v="Kiyosumi-shirakawa"/>
+    <tag k="name:ja" v="清澄白河"/>
+    <tag k="name:ja_kana" v="きよすみしらかわ"/>
+    <tag k="name:ja_rm" v="Kiyosumi Shirakawa"/>
+    <tag k="operator" v="東京都交通局;東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="E14;Z11"/>
+    <tag k="wikipedia" v="ja:清澄白河駅"/>
+  </node>
+  <node id="2729417311" lat="35.6746222" lon="139.7776586">
+    <tag k="name" v="八丁堀"/>
+    <tag k="name:en" v="Hatchobori"/>
+    <tag k="name:fr" v="Hatchobori"/>
+    <tag k="name:ja" v="八丁堀"/>
+    <tag k="name:ja_kana" v="はっちょうぼり"/>
+    <tag k="name:ja_rm" v="Hatchōbori"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:八丁堀駅 (東京都)"/>
+  </node>
+  <node id="2729417341" lat="35.6589290" lon="139.8171928">
+    <tag k="name" v="潮見"/>
+    <tag k="name:en" v="Shiomi"/>
+    <tag k="name:ja" v="潮見"/>
+    <tag k="name:ja_kana" v="しおみ"/>
+    <tag k="name:ja_rm" v="Shiomi"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:潮見駅"/>
+  </node>
+  <node id="2729417356" lat="35.6678861" lon="139.7925609">
+    <tag k="name" v="越中島"/>
+    <tag k="name:en" v="Etchujima"/>
+    <tag k="name:ja" v="越中島"/>
+    <tag k="name:ja_kana" v="えっちゅうじま"/>
+    <tag k="name:ja_rm" v="Etchūjima"/>
+    <tag k="operator" v="東日本旅客鉄道"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:越中島駅"/>
+  </node>
+  <node id="2730655229" lat="35.7082941" lon="139.7518057">
+    <tag k="name" v="後楽園"/>
+    <tag k="name:en" v="Korakuen"/>
+    <tag k="name:ja" v="後楽園"/>
+    <tag k="name:ja_kana" v="こうらくえん"/>
+    <tag k="name:ja_rm" v="Kōrakuen"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="N11"/>
+    <tag k="wikipedia" v="ja:後楽園駅"/>
+  </node>
+  <node id="2730655233" lat="35.7247646" lon="139.7537043">
+    <tag k="name" v="本駒込"/>
+    <tag k="name:en" v="Hon-komagome"/>
+    <tag k="name:ja" v="本駒込"/>
+    <tag k="name:ja_kana" v="ほんこまごめ"/>
+    <tag k="name:ja_rm" v="Hon Komagome"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+  </node>
+  <node id="2730655241" lat="35.6799474" lon="139.7801193">
+    <tag k="name" v="茅場町"/>
+    <tag k="name:en" v="Kayabacho"/>
+    <tag k="name:ja" v="茅場町"/>
+    <tag k="name:ja_kana" v="かやばちょう"/>
+    <tag k="name:ja_rm" v="Kayabachō"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="H12;T11"/>
+    <tag k="wikipedia" v="ja:茅場町駅"/>
+  </node>
+  <node id="2758163097" lat="35.6737401" lon="139.7434162">
+    <tag k="name" v="国会議事堂前"/>
+    <tag k="name:en" v="Kokkai-gijidomae"/>
+    <tag k="name:ja" v="国会議事堂前"/>
+    <tag k="name:ja_kana" v="こっかいぎじどうまえ"/>
+    <tag k="name:ja_rm" v="Kokkai gijidō mae"/>
+    <tag k="note" v="千代田線"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="C07"/>
+    <tag k="wikipedia" v="ja:国会議事堂前駅"/>
+  </node>
+  <node id="2758163103" lat="35.6824750" lon="139.7738611">
+    <tag k="name" v="日本橋"/>
+    <tag k="name:en" v="Nihombashi"/>
+    <tag k="name:ja" v="日本橋"/>
+    <tag k="name:ja_kana" v="にほんばし"/>
+    <tag k="name:ja_rm" v="Nihombashi"/>
+    <tag k="note" v="東西線"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="T10"/>
+    <tag k="wikipedia" v="ja:日本橋駅 (東京都)"/>
+  </node>
+  <node id="2758163108" lat="35.6725604" lon="139.7516747">
+    <tag k="name" v="霞ケ関"/>
+    <tag k="name:en" v="Kasumigaseki"/>
+    <tag k="name:ja" v="霞ケ関"/>
+    <tag k="name:ja_kana" v="かすみがせき"/>
+    <tag k="name:ja_rm" v="Kasumigaseki"/>
+    <tag k="note" v="千代田線"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="C08"/>
+    <tag k="wikipedia" v="ja:霞ケ関駅 (東京都)"/>
+  </node>
+  <node id="2758163113" lat="35.6741576" lon="139.7528673">
+    <tag k="name" v="霞ケ関"/>
+    <tag k="name:en" v="Kasumigaseki"/>
+    <tag k="name:ja" v="霞ケ関"/>
+    <tag k="name:ja_kana" v="かすみがせき"/>
+    <tag k="name:ja_rm" v="Kasumigaseki"/>
+    <tag k="note" v="丸ノ内線"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="M15"/>
+    <tag k="wikipedia" v="ja:霞ケ関駅 (東京都)"/>
+  </node>
+  <node id="2769291151" lat="35.6803518" lon="139.7615785">
+    <tag k="name" v="二重橋前"/>
+    <tag k="name:en" v="Nijubashimae"/>
+    <tag k="name:ja" v="二重橋前"/>
+    <tag k="name:ja_kana" v="にじゅうばしまえ"/>
+    <tag k="name:ja_rm" v="Nijūbashi mae"/>
+    <tag k="operator" v="東京地下鉄"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="C10"/>
+    <tag k="subway" v="yes"/>
+    <tag k="wikipedia" v="ja:二重橋前駅"/>
+  </node>
+  <node id="3010262703" lat="35.7336723" lon="139.7383209">
+    <tag k="name" v="巣鴨"/>
+    <tag k="name:en" v="Sugamo"/>
+    <tag k="name:ja" v="巣鴨"/>
+    <tag k="name:ja_kana" v="すがも"/>
+    <tag k="name:ja_rm" v="Sugamo"/>
+    <tag k="name:ru" v="Сугамо"/>
+    <tag k="network" v="都営地下鉄"/>
+    <tag k="operator" v="東京都交通局"/>
+    <tag k="public_transport" v="station"/>
+    <tag k="railway" v="station"/>
+    <tag k="ref" v="I15"/>
+    <tag k="wikipedia" v="ja:巣鴨駅"/>
+  </node>
+  <way id="116563170">
+    <nd ref="1313835311"/>
+    <nd ref="1313835242"/>
+    <nd ref="1313835298"/>
+    <nd ref="1313835293"/>
+    <nd ref="1313835291"/>
+    <nd ref="1313835309"/>
+    <nd ref="1313835209"/>
+    <nd ref="1313835205"/>
+    <nd ref="1313835239"/>
+    <nd ref="1313835237"/>
+    <nd ref="1313835234"/>
+    <nd ref="1313835311"/>
+    <tag k="railway" v="station"/>
   </way>
-  <way id="153990167">
-    <nd ref="1666008312"/>
-    <nd ref="1666008299"/>
-    <nd ref="1666008298"/>
-    <nd ref="1666008301"/>
-    <nd ref="1924752333"/>
-    <nd ref="1924752334"/>
-    <nd ref="1924752339"/>
-    <nd ref="1924752344"/>
-    <nd ref="1924752346"/>
-    <nd ref="1924752345"/>
-    <nd ref="1924752342"/>
-    <nd ref="1924752340"/>
-    <nd ref="1924752335"/>
-    <nd ref="1924752338"/>
-    <nd ref="1924752337"/>
-    <nd ref="1924752332"/>
-    <nd ref="1924752331"/>
-    <nd ref="1666008312"/>
-    <tag k="building" v="train_station"/>
-    <tag k="layer" v="3"/>
-    <tag k="name" v="鶯谷 (Uguisudani)"/>
-    <tag k="name:en" v="Uguisudani"/>
-    <tag k="name:ja" v="鶯谷"/>
-    <tag k="name:ja_rm" v="Uguisudani"/>
+  <way id="155046057">
+    <nd ref="1674899226"/>
+    <nd ref="1674899059"/>
+    <nd ref="1674899064"/>
+    <nd ref="1674898996"/>
+    <nd ref="1674898988"/>
+    <nd ref="1674898934"/>
+    <nd ref="1674899019"/>
+    <nd ref="1674899112"/>
+    <nd ref="1674899133"/>
+    <nd ref="1674899306"/>
+    <nd ref="1674899299"/>
+    <nd ref="1674899226"/>
+    <tag k="area" v="yes"/>
+    <tag k="building" v="yes"/>
+    <tag k="layer" v="2"/>
+    <tag k="name" v="TERMINA"/>
     <tag k="railway" v="station"/>
+    <tag k="source" v="bing"/>
+  </way>
+  <way id="155046072">
+    <nd ref="1674899611"/>
+    <nd ref="1674899613"/>
+    <nd ref="1674899640"/>
+    <nd ref="1674899642"/>
+    <nd ref="1674899653"/>
+    <nd ref="1674899656"/>
+    <nd ref="1674899663"/>
+    <nd ref="1674899678"/>
+    <nd ref="1674899705"/>
+    <nd ref="1674899690"/>
+    <nd ref="1674899669"/>
+    <nd ref="1674899672"/>
+    <nd ref="1674899674"/>
+    <nd ref="1674899692"/>
+    <nd ref="1674899575"/>
+    <nd ref="1674899510"/>
+    <nd ref="1674899611"/>
+    <tag k="area" v="yes"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="TERMINA2"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="bing"/>
+  </way>
+  <way id="155046125">
+    <nd ref="1674899699"/>
+    <nd ref="1674899567"/>
+    <nd ref="1674899585"/>
+    <nd ref="1674899708"/>
+    <nd ref="1674899699"/>
+    <tag k="area" v="yes"/>
+    <tag k="building" v="yes"/>
+    <tag k="name" v="TERMINA2"/>
+    <tag k="railway" v="station"/>
+    <tag k="source" v="bing"/>
   </way>
   <way id="155240583">
     <nd ref="1676538685"/>
@@ -2910,22 +3759,7 @@
     <nd ref="1676750165"/>
     <nd ref="1676538685"/>
     <tag k="name" v="大久保駅"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="bing"/>
-  </way>
-  <way id="155240584">
-    <nd ref="1676538680"/>
-    <nd ref="1676538679"/>
-    <nd ref="1676538671"/>
-    <nd ref="1676538675"/>
-    <nd ref="1676538667"/>
-    <nd ref="1676538668"/>
-    <nd ref="1676538669"/>
-    <nd ref="1676538670"/>
-    <nd ref="1676538676"/>
-    <nd ref="1676538677"/>
-    <nd ref="1676538680"/>
-    <tag k="name" v="新大久保駅"/>
+    <tag k="name:en" v="Okubo"/>
     <tag k="railway" v="station"/>
     <tag k="source" v="bing"/>
   </way>
@@ -2936,6 +3770,7 @@
     <nd ref="1676750153"/>
     <nd ref="1676750155"/>
     <tag k="name" v="大久保駅"/>
+    <tag k="name:en" v="Okubo"/>
     <tag k="railway" v="station"/>
     <tag k="source" v="bing"/>
   </way>
@@ -2976,81 +3811,25 @@
     <tag k="railway" v="station"/>
     <tag k="source" v="bing"/>
   </way>
-  <way id="155308888">
-    <nd ref="1677072310"/>
-    <nd ref="1677072323"/>
-    <nd ref="1677072332"/>
-    <nd ref="1677072325"/>
-    <nd ref="1677072315"/>
-    <nd ref="1677072321"/>
-    <nd ref="1677072313"/>
-    <nd ref="1677072308"/>
-    <nd ref="1677072310"/>
-    <tag k="area" v="yes"/>
-    <tag k="layer" v="2"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="bing"/>
-  </way>
-  <way id="157050778">
-    <nd ref="1692889081"/>
-    <nd ref="1692889080"/>
-    <nd ref="1692889084"/>
-    <nd ref="1692889083"/>
-    <nd ref="1692889087"/>
-    <nd ref="1692889086"/>
-    <nd ref="1692889085"/>
-    <nd ref="1692889082"/>
-    <nd ref="1692889064"/>
-    <nd ref="1692889063"/>
-    <nd ref="1692889038"/>
-    <nd ref="1692889012"/>
-    <nd ref="1692889003"/>
-    <nd ref="1692889007"/>
-    <nd ref="1692889009"/>
-    <nd ref="1692889043"/>
-    <nd ref="1692889018"/>
-    <nd ref="1692889033"/>
-    <nd ref="1692889060"/>
-    <nd ref="1692889058"/>
-    <nd ref="2059586209"/>
-    <nd ref="1692889081"/>
-    <tag k="building" v="yes"/>
-    <tag k="name" v="両国 (Ryōgoku)"/>
-    <tag k="name:en" v="Ryogoku"/>
-    <tag k="name:ja" v="両国"/>
-    <tag k="name:ja_kana" v="りょうごく"/>
-    <tag k="name:ja_rm" v="Ryōgoku"/>
-    <tag k="name:ru" v="Рёгоку"/>
-    <tag k="railway" v="station"/>
-  </way>
-  <way id="157576292">
-    <nd ref="1698152612"/>
-    <nd ref="1698152606"/>
-    <nd ref="1698152598"/>
-    <nd ref="1698152597"/>
-    <nd ref="1698152604"/>
-    <nd ref="1698152609"/>
-    <nd ref="1698152611"/>
-    <nd ref="1698152612"/>
-    <tag k="building" v="train_station"/>
-    <tag k="name" v="原宿 (Harajuku)"/>
+  <way id="155996264">
+    <nd ref="1683186740"/>
+    <nd ref="1683186738"/>
+    <nd ref="1683186735"/>
+    <nd ref="1683186739"/>
+    <nd ref="1683186740"/>
+    <tag k="description" v="仮設駅"/>
     <tag k="railway" v="station"/>
   </way>
-  <way id="161039682">
-    <nd ref="1730435564"/>
-    <nd ref="1730435566"/>
-    <nd ref="1730435575"/>
-    <nd ref="1730435582"/>
-    <nd ref="1730435581"/>
-    <nd ref="1730435562"/>
-    <nd ref="1730435569"/>
-    <nd ref="1730435578"/>
-    <nd ref="1730435580"/>
-    <nd ref="1730435560"/>
-    <nd ref="1730435564"/>
-    <tag k="building" v="yes"/>
+  <way id="155996292">
+    <nd ref="1683186737"/>
+    <nd ref="1683186730"/>
+    <nd ref="1683186729"/>
+    <nd ref="1683186732"/>
+    <nd ref="1683186731"/>
+    <nd ref="1683186733"/>
+    <nd ref="1683186737"/>
     <tag k="railway" v="station"/>
-    <tag k="source" v="survey+bing"/>
+    <tag k="source" v="bing"/>
   </way>
   <way id="170598711">
     <nd ref="1817685106"/>
@@ -3076,67 +3855,18 @@
     <nd ref="1825133049"/>
     <nd ref="1817685106"/>
     <tag k="building" v="train_station"/>
-    <tag k="name" v="後楽園 (Korakuen)"/>
+    <tag k="name" v="後楽園"/>
+    <tag k="name:en" v="Korakuen"/>
+    <tag k="name:ja" v="後楽園"/>
+    <tag k="name:ja_kana" v="こうらくえん"/>
+    <tag k="name:ja_rm" v="Kōrakuen"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
+    <tag k="public_transport" v="station"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="M22"/>
     <tag k="source" v="Bing"/>
-  </way>
-  <way id="170603406">
-    <nd ref="1817716760"/>
-    <nd ref="1817716755"/>
-    <nd ref="1817716746"/>
-    <nd ref="1817716796"/>
-    <nd ref="1817716799"/>
-    <nd ref="1817716810"/>
-    <nd ref="1817716823"/>
-    <nd ref="1817716832"/>
-    <nd ref="1817716833"/>
-    <nd ref="1817716824"/>
-    <nd ref="1817716822"/>
-    <nd ref="1817716825"/>
-    <nd ref="1817716826"/>
-    <nd ref="1817716814"/>
-    <nd ref="1817716817"/>
-    <nd ref="1817716808"/>
-    <nd ref="1817716805"/>
-    <nd ref="1817716791"/>
-    <nd ref="1817716785"/>
-    <nd ref="1817716761"/>
-    <nd ref="1817716758"/>
-    <nd ref="1817716769"/>
-    <nd ref="1817716756"/>
-    <nd ref="1817716760"/>
-    <tag k="building" v="train_station"/>
-    <tag k="layer" v="1"/>
-    <tag k="name" v="本郷三丁目"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="Bing"/>
-  </way>
-  <way id="182821136">
-    <nd ref="1931880103"/>
-    <nd ref="1931880102"/>
-    <nd ref="1931880100"/>
-    <nd ref="1931880098"/>
-    <nd ref="1931880089"/>
-    <nd ref="1931880095"/>
-    <nd ref="1931880090"/>
-    <nd ref="1931880087"/>
-    <nd ref="1931880084"/>
-    <nd ref="1931880086"/>
-    <nd ref="1931880081"/>
-    <nd ref="1931880080"/>
-    <nd ref="1931880092"/>
-    <nd ref="1931880094"/>
-    <nd ref="1931880096"/>
-    <nd ref="1931880099"/>
-    <nd ref="1931880101"/>
-    <nd ref="1931880103"/>
-    <tag k="building" v="train_station"/>
-    <tag k="name" v="代々木八幡 (Yoyogi Hachiman)"/>
-    <tag k="railway" v="station"/>
-    <tag k="source" v="Bing"/>
+    <tag k="wikipedia" v="ja:後楽園駅"/>
   </way>
   <way id="184607319">
     <nd ref="1951048004"/>
@@ -3170,35 +3900,42 @@
     <nd ref="1951048004"/>
     <tag k="building" v="train_station"/>
     <tag k="name" v="四ツ谷(Yotsuya)"/>
+    <tag k="name:en" v="Yotsuya"/>
     <tag k="name:ru" v="Ёцуя"/>
     <tag k="operator" v="東京地下鉄"/>
     <tag k="platforms" v="2"/>
     <tag k="railway" v="station"/>
     <tag k="ref" v="M12"/>
   </way>
-  <way id="186850860">
-    <nd ref="1976070776"/>
-    <nd ref="1976070765"/>
-    <nd ref="1976070764"/>
-    <nd ref="1976070766"/>
-    <nd ref="1976070767"/>
-    <nd ref="1976070769"/>
-    <nd ref="1976070770"/>
-    <nd ref="1976070771"/>
-    <nd ref="1976070772"/>
-    <nd ref="1976070785"/>
-    <nd ref="1976070784"/>
-    <nd ref="1976070783"/>
-    <nd ref="1976070782"/>
-    <nd ref="1976070781"/>
-    <nd ref="1976070779"/>
-    <nd ref="1976070778"/>
-    <nd ref="1976070777"/>
-    <nd ref="1976070776"/>
-    <tag k="building" v="yes"/>
-    <tag k="layer" v="2"/>
-    <tag k="name" v="竹芝 (Takeshiba)"/>
+  <way id="210374585">
+    <nd ref="2204524206"/>
+    <nd ref="2204524144"/>
+    <nd ref="2204524158"/>
+    <nd ref="2204524210"/>
+    <nd ref="2204524152"/>
+    <nd ref="2204524146"/>
+    <nd ref="2204524200"/>
+    <nd ref="2204524165"/>
+    <nd ref="2204524125"/>
+    <nd ref="2204524131"/>
+    <nd ref="2204524205"/>
+    <nd ref="2204524188"/>
+    <nd ref="2204524156"/>
+    <nd ref="2204524133"/>
+    <nd ref="2204524198"/>
+    <nd ref="2204524135"/>
+    <nd ref="2204524169"/>
+    <nd ref="2204524206"/>
+    <tag k="building" v="train_station"/>
+    <tag k="name" v="モノレール浜松町"/>
+    <tag k="name:en" v="Monorail Hamamatsucho"/>
+    <tag k="name:ja" v="モノレール浜松町"/>
+    <tag k="name:ja_kana" v="ものれーるはままつちょう"/>
+    <tag k="name:ja_rm" v="Monorēru Hamamatsuchō"/>
+    <tag k="operator" v="東京モノレール"/>
+    <tag k="platforms" v="2"/>
     <tag k="railway" v="station"/>
+    <tag k="wikipedia" v="ja:浜松町駅"/>
   </way>
 
 </osm>
author	<philippe colliot>	2014-09-21 15:51:28 +0200
committer	<philippe colliot>	2014-09-21 15:51:28 +0200
commit	da542b8a90974a88af7df37963eeaa695a942a23 (patch)
tree	f63ed2e573eeff6d8039a005d9708809b9fe5a9a
parent	f8902ca7689f9c4b2ddebee943a2e5a91b385a8a (diff)
download	poi-service-da542b8a90974a88af7df37963eeaa695a942a23.tar.gz