Merge pull request #32 from sheppard/master

Adds L.Proj.GeoJSON for projected GeoJSON support.
kartena · Aug 19, 2013 · 72ee327 · 72ee327
2 parents f4f5b6d + c7f5097
commit 72ee327
Show file tree

Hide file tree

Showing 14 changed files with 8,644 additions and 7,154 deletions.
diff --git a/README.md b/README.md
@@ -146,3 +146,32 @@ L.Proj.TileLayer.TMS(tileUrl, crs, options)
 * ```tileUrl``` is the URL template to use for tiles (see [L.TileLayer](http://leafletjs.com/reference.html#tilelayer))
 * ```crs``` is the L.Proj.CRS.TMS ICRS object used for this layer
 * ```options``` are the options for this layer, see [L.TileLayer](http://leafletjs.com/reference.html#tilelayer)
+
+###L.Proj.GeoJSON
+
+Extends [L.GeoJSON](http://leafletjs.com/reference.html#geojson) to add CRS support.  Unlike the TileLayer extension, the CRS
+ is derived from the `name` property of a `crs` defined directly on the GeoJSON object per [the spec](http://www.geojson.org/geojson-spec.html#named-crs).  Linked CRSs are not supported.
+
+**Note:** The relevant Proj4js definition should be defined directly through `Proj4js.defs` before loading the GeoJSON object.  If it is not, Proj4js will attempt to load it asynchronously but it will not be ready in time to reproject the features.
+
+Also, note that future versions of the GeoJSON spec may not include explicit CRS support.  See https://github.com/GeoJSONWG/draft-geojson/pull/6 for more information.
+
+####Usage Example
+```javascript
+Proj4js.defs["EPSG:26915"] = "+proj=utm +zone=15 +ellps=GRS80 +datum=NAD83 +units=m +no_defs";
+var geojson = {
+  "type": "Feature",
+  "geometry": {
+    "type": "Point",
+    "coordinates": [481650, 4980105]
+  },
+  "crs": {
+    "type": "name",
+      "properties": {
+        "name": "urn:ogc:def:crs:EPSG::26915"
+      }
+    }
+  };
+var map = L.map('map');
+L.Proj.geoJson(geojson).addTo(map);
+```
diff --git a/examples/geojson-crs/index.html b/examples/geojson-crs/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="style.css" />
+    <link rel="stylesheet" href="../../lib/leaflet/leaflet.css" />
+    <!--[if lt IE 9]>
+     <link rel="stylesheet" href="lib/leaflet/leaflet.ie.css"/>
+     <![endif]-->
+  </head>
+  <body>
+    <div id="map"></div>
+    <script src="../../lib/leaflet/leaflet-src.js"></script>
+    <script src="../../lib/proj4js-compressed.js"></script>
+    <script src="../../src/proj4leaflet.js"></script>
+    <script src="script.js"></script>
+  </body>
+</html>
diff --git a/examples/geojson-crs/script.js b/examples/geojson-crs/script.js
@@ -0,0 +1,40 @@
+var map = L.map('map').setView([44.97,-93.24], 11);
+
+// MapQuest OSM Tiles
+
+// Attribution (https://gist.github.com/mourner/1804938)
+var osmAttr = 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>';
+var mqTilesAttr = 'Tiles &copy; <a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />';
+
+L.tileLayer(
+  'http://otile{s}.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png',
+  {
+    subdomains: '1234',
+    attribution: osmAttr + ', ' + mqTilesAttr
+  }
+).addTo(map);
+
+// GeoJSON layer (UTM15)
+Proj4js.defs["EPSG:26915"] = "+proj=utm +zone=15 +ellps=GRS80 +datum=NAD83 +units=m +no_defs";
+var geojson = {
+  "type": "Feature",
+  "geometry": {
+    "type": "Point",
+    "coordinates": [481650, 4980105],
+  },
+  "properties": {
+    "name": "University of Minnesota"
+  },
+  "crs": {
+    "type": "name",
+      "properties": {
+        "name": "urn:ogc:def:crs:EPSG::26915"
+      }
+    }
+  };
+
+L.Proj.geoJson(geojson, {
+  'pointToLayer': function(feature, latlng) {
+    return L.marker(latlng).bindPopup(feature.properties.name);
+  }
+}).addTo(map);
diff --git a/examples/geojson-crs/style.css b/examples/geojson-crs/style.css
@@ -0,0 +1,10 @@
+html, body {
+  height: 100%;
+  padding: 0;
+  margin: 0;
+}
+
+#map {
+  width: 100%;
+  height: 100%;
+}
diff --git a/lib/leaflet/images/layers-2x.png b/lib/leaflet/images/layers-2x.png
diff --git a/lib/leaflet/images/layers.png b/lib/leaflet/images/layers.png
diff --git a/lib/leaflet/images/marker-icon-2x.png b/lib/leaflet/images/marker-icon-2x.png
diff --git a/lib/leaflet/images/marker-icon.png b/lib/leaflet/images/marker-icon.png
diff --git a/lib/leaflet/images/marker-shadow.png b/lib/leaflet/images/marker-shadow.png