From 8d4debd4832c25aeb5607a0d4641081ec5da6169 Mon Sep 17 00:00:00 2001
From: Jonas Danielsson <jonas@threetimestwo.org>
Date: Fri, 23 Oct 2015 22:22:52 +0200
Subject: [PATCH] Add GeoJSON mime-type

Add application/vnd.geo+json as specified by IANA at:
http://www.iana.org/assignments/media-types/application/vnd.geo+json
---
 freedesktop.org.xml.in | 5 +++++
 tests/list             | 3 +++
 tests/test.geo.json    | 1 +
 tests/test.geojson     | 1 +
 4 files changed, 10 insertions(+)
 create mode 100644 tests/test.geo.json
 create mode 100644 tests/test.geojson

diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index b40156e..3e4e1bf 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -6195,6 +6195,11 @@ command to generate the output files.
     <sub-class-of type="application/zip"/>
     <glob pattern="*.kmz"/>
   </mime-type>
+  <mime-type type="application/vnd.geo+json">
+    <_comment>GeoJSON geospatial data</_comment>
+    <glob pattern="*.geojson"/>
+    <glob pattern="*.geo.json"/>
+  </mime-type>
   <mime-type type="application/x-ica">
     <_comment>Citrix ICA settings file</_comment>
     <acronym>ICA</acronym>
diff --git a/tests/list b/tests/list
index c8af64e..a6deba8 100644
--- a/tests/list
+++ b/tests/list
@@ -469,6 +469,9 @@ test.pdf.xz application/x-xzpdf ox
 Makefile text/x-makefile ox
 Makefile.gnu text/x-makefile ox
 googleearth.kml application/vnd.google-earth.kml+xml ox
+# Created using geojson.io
+test.geojson application/vnd.geo+json ox
+test.geo.json application/vnd.geo+json ox
 # Copied from http://bugs.freedesktop.org/show_bug.cgi?id=15260
 test.gnd application/gnunet-directory
 # Copied from https://bugs.freedesktop.org/show_bug.cgi?id=27441
diff --git a/tests/test.geo.json b/tests/test.geo.json
new file mode 100644
index 0000000..1b251cf
--- /dev/null
+++ b/tests/test.geo.json
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.012758493423462,55.59052086952047],[13.013659715652466,55.591945625827904],[13.012146949768066,55.593182393618314],[13.010891675949095,55.59070881905884]]}},{"type":"Feature","properties":{"marker-color":"#7e7e7e","marker-size":"medium","marker-symbol":"","name":"Mattis lekplats"},"geometry":{"type":"Point","coordinates":[13.0133056640625,55.59193350046055]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.013455867767334,55.593437017442476],[13.012865781784056,55.593042956062085],[13.013745546340942,55.59264282814997],[13.013852834701538,55.592976268360054],[13.013498783111572,55.59300658096595]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.014142513275146,55.592667078442595],[13.014056682586668,55.59338245533352],[13.014657497406006,55.592679203583295],[13.014614582061768,55.59327333088803]]}},{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[13.015043735504149,55.59325514345095],[13.014968633651733,55.59273376667006],[13.016020059585571,55.59275195434878],[13.015902042388914,55.593249080970054],[13.015043735504149,55.59325514345095]]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.016266822814941,55.59281864243202],[13.016213178634644,55.59334001808522],[13.016856908798218,55.592891392939016],[13.016964197158813,55.593333955617425],[13.017414808273315,55.59291564307806]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.01755428314209,55.59334001808522],[13.017607927322388,55.59292776814194]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.01755428314209,55.59334001808522],[13.017929792404175,55.59332789314871]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.017597198486328,55.59312783115532],[13.017951250076294,55.593121768654754]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.017618656158447,55.59292776814194],[13.018165826797484,55.59294595573077]]}}]}
\ No newline at end of file
diff --git a/tests/test.geojson b/tests/test.geojson
new file mode 100644
index 0000000..1b251cf
--- /dev/null
+++ b/tests/test.geojson
@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.012758493423462,55.59052086952047],[13.013659715652466,55.591945625827904],[13.012146949768066,55.593182393618314],[13.010891675949095,55.59070881905884]]}},{"type":"Feature","properties":{"marker-color":"#7e7e7e","marker-size":"medium","marker-symbol":"","name":"Mattis lekplats"},"geometry":{"type":"Point","coordinates":[13.0133056640625,55.59193350046055]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.013455867767334,55.593437017442476],[13.012865781784056,55.593042956062085],[13.013745546340942,55.59264282814997],[13.013852834701538,55.592976268360054],[13.013498783111572,55.59300658096595]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.014142513275146,55.592667078442595],[13.014056682586668,55.59338245533352],[13.014657497406006,55.592679203583295],[13.014614582061768,55.59327333088803]]}},{"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[13.015043735504149,55.59325514345095],[13.014968633651733,55.59273376667006],[13.016020059585571,55.59275195434878],[13.015902042388914,55.593249080970054],[13.015043735504149,55.59325514345095]]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.016266822814941,55.59281864243202],[13.016213178634644,55.59334001808522],[13.016856908798218,55.592891392939016],[13.016964197158813,55.593333955617425],[13.017414808273315,55.59291564307806]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.01755428314209,55.59334001808522],[13.017607927322388,55.59292776814194]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.01755428314209,55.59334001808522],[13.017929792404175,55.59332789314871]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.017597198486328,55.59312783115532],[13.017951250076294,55.593121768654754]]}},{"type":"Feature","properties":{},"geometry":{"type":"LineString","coordinates":[[13.017618656158447,55.59292776814194],[13.018165826797484,55.59294595573077]]}}]}
\ No newline at end of file
-- 
2.5.0