GeoJSON defaults

Apps/Sandcastle/gallery/GeoJSON and TopoJSON.html

@@ -27,18 +27,25 @@
 function startup(Cesium) {
     "use strict";
 //Sandcastle_Begin
-//Create the viewer
 var viewer = new Cesium.Viewer('cesiumContainer');
 Cesium.viewerEntityMixin(viewer);
 
-//Example 1: Load a GeoJSON or TopoJSON file with default settings.
-Sandcastle.addDefaultToolbarButton('Basic loading', function() {
+//Example 1: Load with default styling.
+Sandcastle.addDefaultToolbarButton('Default styling', function() {
     viewer.dataSources.add(Cesium.GeoJsonDataSource.fromUrl('../../SampleData/ne_10m_us_states.topojson'));
 });
 
-//Example 2: Apply custom graphics to a GeoJSON or TopoJSON file 
-//based on the metadata contained in the file.
-Sandcastle.addToolbarButton('Custom Graphics', function() {
+//Example 2: Load with basic styling options.
+Sandcastle.addToolbarButton('Basic styling', function() {
+    viewer.dataSources.add(Cesium.GeoJsonDataSource.fromUrl('../../SampleData/ne_10m_us_states.topojson', {
+        stroke: Cesium.Color.HOTPINK,
+        fill: Cesium.Color.PINK,
+        strokeWidth: 3
+    }));
+});
+
+//Example 3: Apply custom graphics after load.
+Sandcastle.addToolbarButton('Custom styling', function() {
     //Seed the random number generator for repeatable results.
     Cesium.Math.setRandomNumberSeed(0);
 
@@ -68,6 +75,8 @@
 
             //Set the polygon material to our random color.
             entity.polygon.material = Cesium.ColorMaterialProperty.fromColor(color);
+            //Outline each polygon in black.
+            entity.polygon.outlineColor = new Cesium.ConstantProperty(Cesium.Color.BLACK);
 
             //Extrude the polygon based on the state's population.  Each entity
             //stores the properties for the GeoJSON feature it was created from

CHANGES.md

@@ -3,10 +3,14 @@ Change Log
 
 ### 1.4 - 2014-12-01
 
+* Deprecated
+    * The `sourceUri` parameter to `GeoJsonDatasource.load` has been removed, use `options.sourceUri` instead.
 * Added geometry outline width support to the `DataSource` layer.  This is exposed via the new `outlineWidth` property on `EllipseGraphics`, `EllipsoidGraphics`, `PolygonGraphics`, `RectangleGraphics`, and `WallGraphics`.
 * Added `outlineWidth` support to CZML geometry packets.
 * Added `stroke-width` support to the GeoJSON simple-style implementation.
 * Added `modelMatrix` option to `Primitive` constructor.
+* Added the ability to specify global GeoJSON default styling.  See the [documentation](http://cesiumjs.org/Cesium/Build/Documentation/GeoJsonDataSource.html) for details.
+* Added an options parameter to `GeoJsonDataSource.load`, `GeoJsonDataSource.loadUrl`, and `GeoJsonDataSource.fromUrl` to allow for basic per-instance styling. [Sandcastle example](http://cesiumjs.org/Cesium/Apps/Sandcastle/index.html?src=GeoJSON%20and%20TopoJSON.html&label=Showcases).
 * Fixed a bug in `PolylineGeometry` that would cause the geometry to be split across the IDL for 3D only scenes. [#1197](https://github.com/AnalyticalGraphicsInc/cesium/issues/1197)
 
 ### 1.3 - 2014-11-03