diff --git a/IPython/core/display.py b/IPython/core/display.py
index d1c3130..90cf8c6 100644
--- a/IPython/core/display.py
+++ b/IPython/core/display.py
@@ -680,8 +680,45 @@ lib_t1 = """$.getScript("%s", function () {
 lib_t2 = """});
 """
 
-class GeoJSON(JSON):
+class GeoJSON(DisplayObject):
+    """GeoJSON expects JSON-able dict
 
+    not an already-serialized JSON string.
+
+    Scalar types (None, number, string) are not allowed, only dict containers.
+    """
+    # wrap data in a property, which warns about passing already-serialized JSON
+    _data = None
+    
+    def __init__(self, data=None, url_template=None, layer_options=None, url=None, filename=None, metadata=None):
+        """Create a GeoJSON display object given raw data.
+
+        Parameters
+        ----------
+        data : dict or list
+            VegaLite data. Not an already-serialized JSON string.
+            Scalar types (None, number, string) are not allowed, only dict
+            or list containers.
+        url_template : string
+            Leaflet TileLayer URL template: http://leafletjs.com/reference.html#url-template
+        layer_options : dict
+            Leaflet TileLayer options: http://leafletjs.com/reference.html#tilelayer-options
+        url : unicode
+            A URL to download the data from.
+        filename : unicode
+            Path to a local file to load the data from.
+        metadata: dict
+            Specify extra metadata to attach to the json display object.
+        """
+        self.url_template = url_template
+        self.layer_options = layer_options
+        self.metadata = metadata
+        super(GeoJSON, self).__init__(data=data, url=url, filename=filename)
+
+    def _check_data(self):
+        if self.data is not None and not isinstance(self.data, dict):
+            raise TypeError("%s expects a JSONable dict, not %r" % (self.__class__.__name__, self.data))
+        
     @property
     def data(self):
         return self._data
@@ -693,11 +730,21 @@ class GeoJSON(JSON):
         self._data = data
 
     def _ipython_display_(self):
+        md = {}
+        if self.url_template:
+            md['tileUrlTemplate'] = self.url_template
+        if self.layer_options:
+            md['tileLayerOptions'] = self.layer_options
+        if self.metadata:
+            md.update(self.metadata)
         bundle = {
             'application/geo+json': self.data,
             'text/plain': '<jupyterlab_geojson.GeoJSON object>'
         }
-        display(bundle, raw=True)
+        metadata = {
+            'application/geo+json': md
+        }
+        display(bundle, metadata=metadata, raw=True)
 
 class Javascript(TextDisplayObject):