From 85fd89e1cddcc2f7976fcec9af255cd94df28488 Mon Sep 17 00:00:00 2001 From: Zach Mullen Date: Wed, 24 Oct 2018 11:19:30 -0400 Subject: [PATCH] Clean up vtkjs example code --- examples/vtkjs/main.js | 100 ++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 67 deletions(-) diff --git a/examples/vtkjs/main.js b/examples/vtkjs/main.js index b03b0ceb4e..b0a3fdcb38 100644 --- a/examples/vtkjs/main.js +++ b/examples/vtkjs/main.js @@ -1,69 +1,35 @@ -var exampleDebug = {}; - -// Run after the DOM loads -$(function () { - 'use strict'; - - var capitals; - $.when( - /* Fetch capitals */ - $.ajax({url: 'capitals.json'}).done(function (resp) { - capitals = resp; - }) - ).then(function () { - - // Set map defaults to a reasonable center and zoom level - var mapParams = { - node: '#map', - center: {x: 0, y: 0}, - zoom: 2.5, - clampBoundsX: false, - clampBoundsY: false, - clampZoom: false, - discreteZoom: false - }; - // Set the tile layer defaults - var layerParams = { - zIndex: 0, - minLevel: 4, - keepLower: true, - wrapX: false, - wrapY: false - }; - // Create a map object - var map = geo.map(mapParams); - // Add the tile layer with the specified parameters - var osmLayer = map.createLayer('osm', layerParams); - // Set the vtk feature layer params - var vtkLayerParams = { - renderer: 'vtkjs' - }; - // Create a vtk point feature layer - var vtkLayer = map.createLayer('feature', vtkLayerParams); - var pointFeature = vtkLayer - .createFeature('point', { - selectionAPI: true, - style: { - radius: 100, // sphere radius (~0.1km) - fillColor: 'red', - fillOpacity: function () { - return Math.random(); - } - } - }) - .data(capitals) // bind data - .position(function (d) { - return {x: d.longitude, y: d.latitude}; // position accessor - }) - .draw(); - - // Make variables available as a global for easier debug - exampleDebug.map = map; - exampleDebug.mapParams = mapParams; - exampleDebug.layerParams = layerParams; - exampleDebug.osmLayer = osmLayer; - exampleDebug.vtkLayerParams = vtkLayerParams; - exampleDebug.vtkLayer = vtkLayer; - exampleDebug.pointFeature = pointFeature; +$.ajax({url: 'capitals.json'}).done(function (capitals) { + // Create a map object with reasonable center and zoom level + var map = geo.map({ + node: '#map', + center: {x: 0, y: 0}, + zoom: 2.5, + clampBoundsX: false, + clampBoundsY: false, + clampZoom: false, + discreteZoom: false }); + // Add the tile layer with the specified parameters + map.createLayer('osm', { + zIndex: 0, + minLevel: 4, + keepLower: true, + wrapX: false, + wrapY: false + }); + // Create a vtk point feature layer + var vtkLayer = map.createLayer('feature', { renderer: 'vtkjs' }); + vtkLayer.createFeature('point', { + selectionAPI: true, + style: { + radius: 100, // sphere radius (~0.1km) + fillColor: 'red', + fillOpacity: Math.random + } + }) + .data(capitals) // bind data + .position(function (d) { + return {x: d.longitude, y: d.latitude}; // position accessor + }) + .draw(); });