diff --git a/src/osm/jp/coverage/fuel/ToGeoJSON.java b/src/osm/jp/coverage/fuel/ToGeoJSON.java
index a3d1f67..f2d705f 100644
--- a/src/osm/jp/coverage/fuel/ToGeoJSON.java
+++ b/src/osm/jp/coverage/fuel/ToGeoJSON.java
@@ -9,6 +9,7 @@
 import java.sql.ResultSet;
 
 import jp.co.areaweb.tools.database.DatabaseTool;
+import static osm.jp.coverage.fuel.DbFuel.TABLE_NAME;
 
 /**
  * PostGISデータをGeoJSONファイルに出力する。
@@ -25,13 +26,20 @@
  */
 public class ToGeoJSON {
     public static void main (String[] argv) throws Exception {
+        boolean slim = false;
+        for (String arg : argv) {
+            if (arg.equals("-slim")) {
+                slim = true;
+            }
+        }
         Connection con = DatabaseTool.openDb("postgis");
-        outputDb(con, "WHERE fixed=0", new File("fuel0.json"));
-        outputDb(con, "WHERE fixed>0 and fixed<50", new File("fuel1.json"));
-        outputDb(con, "WHERE fixed>49", new File("fuel2.json"));
+        outputDb(con, "", new File("fuel.json"), false);
+        outputDb(con, "WHERE fixed=0", new File("fuel0.json"), slim);
+        outputDb(con, "WHERE fixed>0 and fixed<50", new File("fuel1.json"), slim);
+        outputDb(con, "WHERE fixed>49", new File("fuel2.json"), slim);
     }
 
-    public static void outputDb(Connection con, String whereStr, File outputFile) throws Exception {
+    public static void outputDb(Connection con, String whereStr, File outputFile, boolean slim) throws Exception {
         try (BufferedWriter ow = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"))) {
             String line = "{" +
                 "\"type\": \"FeatureCollection\"," +
@@ -40,8 +48,16 @@
             ow.write(line);
             ow.newLine();
 
-            PreparedStatement ps8 = con.prepareStatement("SELECT row_to_json(feature) FROM (" 
-                    + "select 'Feature' As type, ST_AsGeoJSON(ST_Transform(t_fuel.geom,4326))::json As geometry From t_fuel "+ whereStr +" order by area,idref) As feature");
+            String sql = "SELECT row_to_json(feature) FROM (" 
+                    + "select 'Feature' As type, "
+                    + "ST_AsGeoJSON(ST_Transform(t_fuel.geom,4326))::json As geometry, row_to_json((" 
+                    + "SELECT p FROM (SELECT t_fuel.idref, t_fuel.fixed) AS p"
+                    + ")) AS properties From t_fuel "+ whereStr +" order by area,idref) As feature";
+            if (slim) {
+                sql = "SELECT row_to_json(feature) FROM (" 
+                    + "select 'Feature' As type, ST_AsGeoJSON(ST_Transform(t_fuel.geom,4326))::json As geometry From t_fuel "+ whereStr +" order by area,idref) As feature";
+            }
+            PreparedStatement ps8 = con.prepareStatement(sql);
             try (ResultSet rset8 = ps8.executeQuery()) {
                 boolean top = true;
                 while (rset8.next()) {