Rename .geojson and .topojson to .json

l00mi · Dec 16, 2012 · 7138dbf · 7138dbf
1 parent 2d03b3f
commit 7138dbf
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 13 deletions.
diff --git a/Rakefile b/Rakefile
@@ -2,25 +2,27 @@ LILJSON_PRECISION = 3
 
 desc "Generate GeoJSON files"
 task :geojson do
-  rm Dir.glob("geojson/*.geojson")
+  rm Dir.glob("geojson/*.*json")
 
   %w{ swiss-cantons swiss-cantons-simplified }.each do |file_name|
-    system "ogr2ogr -f geoJSON 'geojson/#{file_name}.geojson' 'shp/#{file_name}/#{file_name}.shp' -sql \"SELECT NR AS no, ABKUERZUNG AS abbr, NAME AS name FROM '#{file_name}'\""
-    system "python lib/liljson.py -p #{LILJSON_PRECISION} 'geojson/#{file_name}.geojson' 'geojson/#{file_name}.geojson'"
+    system "ogr2ogr -f geoJSON 'geojson/#{file_name}.json' 'shp/#{file_name}/#{file_name}.shp' -sql \"SELECT NR AS no, ABKUERZUNG AS abbr, NAME AS name FROM '#{file_name}'\""
+    system "python lib/liljson.py -p #{LILJSON_PRECISION} 'geojson/#{file_name}.json' 'geojson/#{file_name}.json'"
   end
 
   %w{ swiss-municipalities swiss-municipalities-simplified }.each do |file_name|
-    system "ogr2ogr -f geoJSON 'geojson/#{file_name}.geojson' 'shp/#{file_name}/#{file_name}.shp' -sql \"SELECT BFSNR AS bfsNo, GEMTEIL AS municipalityPart, KANTONSNR AS cantonNo, GEMNAME AS name FROM '#{file_name}'\""
-    system "python lib/liljson.py -p #{LILJSON_PRECISION} 'geojson/#{file_name}.geojson' 'geojson/#{file_name}.geojson'"
+    system "ogr2ogr -f geoJSON 'geojson/#{file_name}.json' 'shp/#{file_name}/#{file_name}.shp' -sql \"SELECT BFSNR AS bfsNo, GEMTEIL AS municipalityPart, KANTONSNR AS cantonNo, GEMNAME AS name FROM '#{file_name}'\""
+    system "python lib/liljson.py -p #{LILJSON_PRECISION} 'geojson/#{file_name}.json' 'geojson/#{file_name}.json'"
   end
 end
 
 desc "Generate TopoJSON files"
 task :topojson do
-  rm Dir.glob("topojson/*.topojson")
+  rm Dir.glob("topojson/*.*json")
 
-  %w{ swiss-cantons swiss-municipalities }.each do |file_name|
-    system "topojson 'geojson/#{file_name}.geojson' -o 'topojson/#{file_name}.topojson' --properties"
-    system "topojson 'geojson/#{file_name}.geojson' -o 'topojson/#{file_name}-simplified.topojson' -s 1000 --properties"
+  src = %w{ swiss-cantons swiss-municipalities }
+
+  src.each do |file_name|
+    system "topojson 'geojson/#{file_name}.json' -o 'topojson/#{file_name}.json' --properties"
+    system "topojson 'geojson/#{file_name}.json' -o 'topojson/#{file_name}-simplified.json' -s 1000 --properties"
   end
 end
diff --git a/geojson/swiss-cantons-simplified.geojson → geojson/swiss-cantons-simplified.json b/geojson/swiss-cantons-simplified.geojson → geojson/swiss-cantons-simplified.json
diff --git a/geojson/swiss-cantons.geojson → geojson/swiss-cantons.json b/geojson/swiss-cantons.geojson → geojson/swiss-cantons.json
diff --git a/...n/swiss-municipalities-simplified.geojson → geojson/swiss-municipalities-simplified.json b/...n/swiss-municipalities-simplified.geojson → geojson/swiss-municipalities-simplified.json
diff --git a/geojson/swiss-municipalities.geojson → geojson/swiss-municipalities.json b/geojson/swiss-municipalities.geojson → geojson/swiss-municipalities.json
diff --git a/topojson/swiss-cantons-simplified.json b/topojson/swiss-cantons-simplified.json
diff --git a/topojson/swiss-cantons-simplified.topojson b/topojson/swiss-cantons-simplified.topojson
diff --git a/topojson/swiss-cantons.json b/topojson/swiss-cantons.json
diff --git a/topojson/swiss-cantons.topojson b/topojson/swiss-cantons.topojson
diff --git a/topojson/swiss-municipalities-simplified.json b/topojson/swiss-municipalities-simplified.json
diff --git a/topojson/swiss-municipalities-simplified.topojson b/topojson/swiss-municipalities-simplified.topojson
diff --git a/topojson/swiss-municipalities.json b/topojson/swiss-municipalities.json
diff --git a/topojson/swiss-municipalities.topojson b/topojson/swiss-municipalities.topojson