Merge pull request #796 from tschaub/geojson-rename

Use .geojson extension for GeoJSON

examples/vector-layer.js

@@ -57,7 +57,7 @@ map.on(['click', 'mousemove'], function(evt) {
 
 
 var geojson = new ol.parser.GeoJSON();
-var url = 'data/countries.json';
+var url = 'data/countries.geojson';
 var xhr = new XMLHttpRequest();
 xhr.open('GET', url, true);
 

test/spec/ol/parser/geojson.test.js

@@ -190,8 +190,8 @@ describe('ol.parser.GeoJSON', function() {
       expect(secondGeom).to.be.a(ol.geom.LineString);
     });
 
-    it('parses countries.json', function(done) {
-      afterLoadText('spec/ol/parser/geojson/countries.json', function(text) {
+    it('parses countries.geojson', function(done) {
+      afterLoadText('spec/ol/parser/geojson/countries.geojson', function(text) {
         var result = parser.read(text);
         expect(result.length).to.be(179);
 
@@ -218,8 +218,8 @@ describe('ol.parser.GeoJSON', function() {
       });
     });
 
-    it('parses countries.json with shared vertices', function() {
-      afterLoadText('spec/ol/parser/geojson/countries.json', function(text) {
+    it('parses countries.geojson with shared vertices', function() {
+      afterLoadText('spec/ol/parser/geojson/countries.geojson', function(text) {
         var pointVertices = new ol.geom.SharedVertices();
         var lineVertices = new ol.geom.SharedVertices();
         var polygonVertices = new ol.geom.SharedVertices();