diff --git a/pom.xml b/pom.xml
index 6ceeb93..f4d7718 100755
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,15 @@
       <scope>test</scope>
       <type>jar</type>
     </dependency>
+    
+	<!-- https://mvnrepository.com/artifact/commons-lang/commons-lang -->
+	<dependency>
+	    <groupId>commons-lang</groupId>
+	    <artifactId>commons-lang</artifactId>
+	    <version>2.1</version>
+		<scope>test</scope>
+	</dependency>
+    
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/preflist.geojson b/preflist.geojson
deleted file mode 100644
index 9692a6f..0000000
--- a/preflist.geojson
+++ /dev/null
@@ -1,48 +0,0 @@
-{"type":"FeatureCollection","crs":{"type":"name","properties":{"name":"urn:ogc:def:crs:OGC:1.3:CRS84"}},"features":[{"type":"Feature","properties":{"name":"北海道","id":"1"},"geometry":{"coordinates":[143.35,43.479],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"青森県","id":"2"},"geometry":{"coordinates":[140.609,40.907],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"岩手県","id":"3"},"geometry":{"coordinates":[141.559,39.65],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"宮城県","id":"4"},"geometry":{"coordinates":[141.29,38.387],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"秋田県","id":"5"},"geometry":{"coordinates":[140.125,39.591],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"山形県","id":"6"},"geometry":{"coordinates":[139.993,38.658],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"福島県","id":"7"},"geometry":{"coordinates":[140.246,37.359],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"茨城県","id":"8"},"geometry":{"coordinates":[140.405,36.335],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"栃木県","id":"9"},"geometry":{"coordinates":[139.796,36.657],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"群馬県","id":"10"},"geometry":{"coordinates":[138.917,36.521],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"埼玉県","id":"11"},"geometry":{"coordinates":[139.29,36.02],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"千葉県","id":"12"},"geometry":{"coordinates":[140.197,35.36],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"東京都","id":"13"},"geometry":{"coordinates":[139.757,35.664],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"神奈川県","id":"14"},"geometry":{"coordinates":[139.3588,35.3095],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"新潟県","id":"15"},"geometry":{"coordinates":[138.713,37.821],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"富山県","id":"16"},"geometry":{"coordinates":[137.3181,36.7642],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"石川県","id":"17"},"geometry":{"coordinates":[136.884,37.097],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"福井県","id":"18"},"geometry":{"coordinates":[136.236,35.8946],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"山梨県","id":"19"},"geometry":{"coordinates":[138.6942,35.5624],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"長野県","id":"20"},"geometry":{"coordinates":[138.115,36.1],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"岐阜県","id":"21"},"geometry":{"coordinates":[137.0627,35.7922],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"静岡県","id":"22"},"geometry":{"coordinates":[138.565,35.01],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"愛知県","id":"23"},"geometry":{"coordinates":[137.1616,34.8465],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"三重県","id":"24"},"geometry":{"coordinates":[136.6177,34.4284],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"滋賀県","id":"25"},"geometry":{"coordinates":[136.1179,35.2467],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"京都府","id":"26"},"geometry":{"coordinates":[135.2692,35.4282],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"大阪府","id":"27"},"geometry":{"coordinates":[135.5081,34.6569],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"兵庫県","id":"28"},"geometry":{"coordinates":[134.841,34.947],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"奈良県","id":"29"},"geometry":{"coordinates":[135.8981,34.3196],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"和歌山県","id":"30"},"geometry":{"coordinates":[135.4147,33.81],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"鳥取県","id":"31"},"geometry":{"coordinates":[133.8959,35.4282],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"島根県","id":"32"},"geometry":{"coordinates":[132.847,35.423],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"岡山県","id":"33"},"geometry":{"coordinates":[133.8464,34.7969],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"広島県","id":"34"},"geometry":{"coordinates":[132.7753,34.5552],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"山口県","id":"35"},"geometry":{"coordinates":[131.144,34.314],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"徳島県","id":"36"},"geometry":{"coordinates":[134.3436,33.851],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"香川県","id":"37"},"geometry":{"coordinates":[134.0524,34.3037],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"愛媛県","id":"38"},"geometry":{"coordinates":[132.5226,33.5517],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"高知県","id":"39"},"geometry":{"coordinates":[133.533,33.144],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"福岡県","id":"40"},"geometry":{"coordinates":[130.5862,33.7849],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"佐賀県","id":"41"},"geometry":{"coordinates":[130.1248,33.3064],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"長崎県","id":"42"},"geometry":{"coordinates":[129.238,33.071],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"熊本県","id":"43"},"geometry":{"coordinates":[130.7043,32.6012],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"大分県","id":"44"},"geometry":{"coordinates":[131.6904,33.1042],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"宮崎県","id":"45"},"geometry":{"coordinates":[131.2454,32.0442],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"鹿児島県","id":"46"},"geometry":{"coordinates":[130.32,31.443],"type":"Point"}}
-,{"type":"Feature","properties":{"name":"沖縄県","id":"47"},"geometry":{"coordinates":[127.557,26.571],"type":"Point"}}
-]}
\ No newline at end of file
diff --git a/src/main/java/osm/surveyor/task/util/JsonProperties.java b/src/main/java/osm/surveyor/task/util/JsonProperties.java
index 078c4ac..23a9b3f 100644
--- a/src/main/java/osm/surveyor/task/util/JsonProperties.java
+++ b/src/main/java/osm/surveyor/task/util/JsonProperties.java
@@ -35,8 +35,8 @@
 	private String version;
 	
 	private Long prefcode;
-	public long getPrefcode() {
-		return this.prefcode.longValue();
+	public Long getPrefcode() {
+		return this.prefcode;
 	}
 	public void setPrefcode(long code) {
 		this.prefcode = Long.valueOf(code);
@@ -59,8 +59,8 @@
 	}
 
 	private Long citycode;
-	public long getCitycode() {
-		return this.citycode.longValue();
+	public Long getCitycode() {
+		return this.citycode;
 	}
 	
 	private String cityname;
@@ -69,8 +69,8 @@
 	}
 	
 	private Long meshcode;
-	public long getMeshcode() {
-		return this.meshcode.longValue();
+	public Long getMeshcode() {
+		return this.meshcode;
 	}
 	
 	public String toString() {