Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1ae526a
Adding leaflet for map
Madhuka Jul 12, 2015
67cc563
Adding mapping for UI
Madhuka Jul 12, 2015
5bd03bb
Adding map chart for zeppelin
Madhuka Jul 12, 2015
19d5ec8
adding sample tutorial for notbook on map
Madhuka Jul 19, 2015
0c87778
adding sql
Madhuka Jul 19, 2015
f0b54b3
adding markers
Madhuka Jul 20, 2015
389011b
fixing multi maker
Madhuka Jul 20, 2015
7b78ff6
adding map rendering on dynamic data
Madhuka Jul 24, 2015
75ff02d
adding map bounds
Madhuka Jul 24, 2015
e1c736a
adding dynamic size feature for map
Madhuka Jul 24, 2015
adab6b7
adding data validator service
Madhuka Jul 24, 2015
b501fb8
updating the sample
Madhuka Jul 25, 2015
8217b4f
connceting validator services and factory
Madhuka Jul 26, 2015
10204ab
adding dataCheckValidator
Madhuka Jul 26, 2015
fee2955
adding schema config and error msg building
Madhuka Jul 26, 2015
e49aa20
adding range validator for map data set
Madhuka Jul 29, 2015
077feb8
adding range schema
Madhuka Jul 29, 2015
796e3d6
adding error msg
Madhuka Jul 29, 2015
04bd14e
Generalization data validation and adding map data validation
Madhuka Aug 1, 2015
95c3aaf
adding map validation for home page
Madhuka Aug 1, 2015
8f82a38
improving map data validation
Madhuka Aug 1, 2015
34ccd75
clearing code and adding chart data validator factory
Madhuka Aug 1, 2015
62f5fc7
adding scatter data validator and updating schema
Madhuka Aug 2, 2015
4c904f0
adding data validators for paragraph.controller
Madhuka Aug 2, 2015
0e079ae
adding a basic check function for service
Madhuka Aug 5, 2015
909e434
fixing jshint
Madhuka Aug 12, 2015
8330479
adding custom data validator
Madhuka Aug 14, 2015
21fad0c
connecting services and d3 chart validation
Madhuka Aug 14, 2015
2a8a3e6
completing validations with logs (demo)
Madhuka Aug 15, 2015
e1855c0
adding test on data validator
Madhuka Aug 15, 2015
58a1de1
removing console logs
Madhuka Aug 20, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
241 changes: 241 additions & 0 deletions notebook/2AU6K8KS2/note.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,241 @@
{
"paragraphs": [
{
"text": "%md\n## Welcome to Zeppelin.\n##### This is a quickly start on zeppelin map visualization tutorial. It is using Leaflet mapping basics, including setting up a Leaflet map, working with markers, polylines and popups, and dealing with events.you can run the code yourself. (Shift-Enter to Run)",
"config": {
"colWidth": 12.0,
"graph": {
"mode": "table",
"height": 300.0,
"optionOpen": false,
"keys": [],
"values": [],
"groups": [],
"scatter": {}
},
"editorHide": false,
"tableHide": true
},
"settings": {
"params": {},
"forms": {}
},
"jobName": "paragraph_1437313582566_-967040274",
"id": "20150719-191622_9501079",
"result": {
"code": "SUCCESS",
"type": "HTML",
"msg": "\u003ch2\u003eWelcome to Zeppelin.\u003c/h2\u003e\n\u003ch5\u003eThis is a quickly start on zeppelin map visualization tutorial. It is using Leaflet mapping basics, including setting up a Leaflet map, working with markers, polylines and popups, and dealing with events.you can run the code yourself. (Shift-Enter to Run)\u003c/h5\u003e\n"
},
"dateCreated": "Jul 19, 2015 7:16:22 PM",
"dateStarted": "Jul 25, 2015 8:43:03 AM",
"dateFinished": "Jul 25, 2015 8:43:03 AM",
"status": "FINISHED",
"progressUpdateIntervalMs": 500
},
{
"text": "import org.apache.commons.io.IOUtils\nimport java.net.URL\nimport java.nio.charset.Charset\n\n// Zeppelin creates and injects sc (SparkContext) and sqlContext (HiveContext or SqlContext)\n// So you don\u0027t need create them manually\n\n// load map data\nval myMapText \u003d sc.parallelize(\n IOUtils.toString(\n new URL(\"https://gist.githubusercontent.com/Madhuka/74cb9a6577c87aa7d2fd/raw/2f758d33d28ddc01c162293ad45dc16be2806a6b/data.csv\"),\n Charset.forName(\"utf8\")).split(\"\\n\"))\n\n\ncase class Map(Country:String, Name:String, lat : Float, lan : Float, Altitude : Float)\n\nval myMap \u003d myMapText.map(s\u003d\u003es.split(\",\")).filter(s\u003d\u003es(0)!\u003d\"Country\").map(\n s\u003d\u003eMap(s(0), \n s(1),\n s(2).toFloat,\n s(3).toFloat,\n s(4).toFloat\n )\n)\n\n// Below line works only in spark 1.3.0.\n// For spark 1.1.x and spark 1.2.x,\n// use myMap.registerTempTable(\"myMap\") instead.\nmyMap.toDF().registerTempTable(\"myMap\")\n",
"config": {
"colWidth": 12.0,
"graph": {
"mode": "table",
"height": 300.0,
"optionOpen": false,
"keys": [],
"values": [],
"groups": [],
"scatter": {}
}
},
"settings": {
"params": {},
"forms": {}
},
"jobName": "paragraph_1437314214306_141157507",
"id": "20150719-192654_12434929",
"result": {
"code": "SUCCESS",
"type": "TEXT",
"msg": "import org.apache.commons.io.IOUtils\nimport java.net.URL\nimport java.nio.charset.Charset\nmyMapText: org.apache.spark.rdd.RDD[String] \u003d ParallelCollectionRDD[28] at parallelize at \u003cconsole\u003e:35\ndefined class Map\nmyMap: org.apache.spark.rdd.RDD[Map] \u003d MapPartitionsRDD[31] at map at \u003cconsole\u003e:35\n"
},
"dateCreated": "Jul 19, 2015 7:26:54 PM",
"dateStarted": "Jul 25, 2015 8:42:17 AM",
"dateFinished": "Jul 25, 2015 8:42:24 AM",
"status": "FINISHED",
"progressUpdateIntervalMs": 500
},
{
"text": "%sql \nselect * from myMap\nwhere Country \u003d \"${Country\u003d\u0027United States\u0027}\"",
"config": {
"colWidth": 6.0,
"graph": {
"mode": "mapChart",
"height": 300.0,
"optionOpen": false,
"keys": [
{
"name": "Country",
"index": 0.0,
"aggr": "sum"
}
],
"values": [
{
"name": "Name",
"index": 1.0,
"aggr": "sum"
}
],
"groups": [],
"scatter": {
"xAxis": {
"name": "Country",
"index": 0.0,
"aggr": "sum"
},
"yAxis": {
"name": "Name",
"index": 1.0,
"aggr": "sum"
}
}
},
"editorHide": true
},
"settings": {
"params": {
"Country": "United States"
},
"forms": {
"Country": {
"name": "Country",
"defaultValue": "\u0027United States\u0027",
"hidden": false
}
}
},
"jobName": "paragraph_1437316940442_271264979",
"id": "20150719-201220_10279868",
"result": {
"code": "SUCCESS",
"type": "TABLE",
"msg": "Country\tName\tlat\tlan\tAltitude\nUnited States\tNew York City\t40.714268\t-74.005974\t2.0\nUnited States\tLos Angeles\t34.052235\t-118.24368\t115.0\nUnited States\tChicago\t41.850033\t-87.650055\t181.0\nUnited States\tHouston\t29.763283\t-95.36327\t15.0\nUnited States\tPhiladelphia\t39.952335\t-75.16379\t8.0\nUnited States\tPhoenix\t33.448376\t-112.074036\t0.0\nUnited States\tSan Antonio\t29.424122\t-98.49363\t196.0\nUnited States\tSan Diego\t32.71533\t-117.15726\t26.0\nUnited States\tDallas\t32.783054\t-96.80666\t137.0\nUnited States\tDetroit\t42.33143\t-83.04575\t181.0\nUnited States\tSan Jose\t37.339386\t-121.89496\t24.0\nUnited States\tJacksonville\t30.332184\t-81.65565\t7.0\nUnited States\tIndianapolis\t39.768375\t-86.15804\t222.0\nUnited States\tColumbus\t39.961174\t-82.998795\t237.0\nUnited States\tSan Francisco\t37.77493\t-122.41942\t60.0\nUnited States\tAustin\t30.267153\t-97.74306\t163.0\nUnited States\tMemphis\t35.149536\t-90.04898\t75.0\nUnited States\tNew South Memphis\t35.086758\t-90.056755\t74.0\nUnited States\tFort Worth\t32.72541\t-97.32085\t199.0\nUnited States\tBaltimore\t39.290386\t-76.61219\t2.0\nUnited States\tCharlotte\t35.227085\t-80.843124\t229.0\nUnited States\tBoston\t42.35843\t-71.05978\t11.0\nUnited States\tMilwaukee\t43.038902\t-87.90647\t195.0\nUnited States\tSouth Boston\t42.33343\t-71.04949\t10.0\nUnited States\tSeattle\t47.60621\t-122.33207\t60.0\nUnited States\tEl Paso\t31.75872\t-106.48693\t1147.0\nUnited States\tDenver\t39.739155\t-104.9847\t1598.0\nUnited States\tWashington\t38.89511\t-77.03637\t11.0\nUnited States\tPortland\t45.523453\t-122.67621\t61.0\nUnited States\tOklahoma City\t35.46756\t-97.516426\t364.0\nUnited States\tNashville\t36.16589\t-86.78445\t151.0\nUnited States\tTucson\t32.221745\t-110.926476\t751.0\nUnited States\tAlbuquerque\t35.08449\t-106.65114\t1510.0\nUnited States\tNew Orleans\t29.954649\t-90.07507\t0.0\nUnited States\tLong Beach\t33.766964\t-118.18923\t1.0\nUnited States\tLas Vegas\t36.17497\t-115.13722\t609.0\nUnited States\tSacramento\t38.581573\t-121.4944\t5.0\nUnited States\tFresno\t36.747726\t-119.77237\t91.0\nUnited States\tCleveland\t41.499496\t-81.69541\t185.0\nUnited States\tNorth Kansas City\t39.130005\t-94.56218\t223.0\nUnited States\tKansas City\t39.099728\t-94.57857\t271.0\nUnited States\tVirginia Beach\t36.85293\t-75.97798\t3.0\nUnited States\tAtlanta\t33.748997\t-84.387985\t305.0\nUnited States\tOakland\t37.80437\t-122.270805\t0.0\nUnited States\tMesa\t33.422268\t-111.82264\t386.0\nUnited States\tTulsa\t36.15398\t-95.992775\t213.0\nUnited States\tOmaha\t41.25861\t-95.93779\t0.0\nUnited States\tMiami\t25.774265\t-80.19366\t2.0\nUnited States\tHonolulu\t21.306944\t-157.85834\t0.0\nUnited States\tMinneapolis\t44.979965\t-93.26384\t259.0\nUnited States\tColorado Springs\t38.83388\t-104.821365\t1829.0\nUnited States\tWichita\t37.692238\t-97.33755\t402.0\nUnited States\tSanta Ana\t33.745575\t-117.867836\t30.0\nUnited States\tWest Raleigh\t35.78682\t-78.663895\t122.0\nUnited States\tArlington\t32.735687\t-97.10806\t184.0\nUnited States\tAnaheim\t33.835293\t-117.914505\t40.0\nUnited States\tTampa\t27.947521\t-82.45843\t1.0\nUnited States\tSaint Louis\t38.627274\t-90.19789\t135.0\nUnited States\tPittsburgh\t40.440624\t-79.99589\t235.0\nUnited States\tToledo\t41.663937\t-83.555214\t191.0\nUnited States\tCincinnati\t39.162003\t-84.45689\t203.0\nUnited States\tRiverside\t33.95335\t-117.39616\t262.0\nUnited States\tBakersfield\t35.37329\t-119.018715\t122.0\nUnited States\tStockton\t37.957703\t-121.29078\t4.0\nUnited States\tNewark\t40.735657\t-74.17236\t16.0\nUnited States\tBuffalo\t42.886448\t-78.87837\t183.0\nUnited States\tCorpus Christi\t27.800583\t-97.39638\t6.0\nUnited States\tAurora\t39.72943\t-104.83192\t1647.0\nUnited States\tRaleigh\t35.772095\t-78.63861\t91.0\nUnited States\tSaint Paul\t44.94441\t-93.09328\t235.0\nUnited States\tLexington-Fayette\t38.0498\t-84.45855\t312.0\nUnited States\tAnchorage\t61.218056\t-149.90028\t0.0\nUnited States\tPlano\t33.019844\t-96.69888\t200.0\nUnited States\tSaint Petersburg\t27.77086\t-82.67927\t14.0\nUnited States\tLouisville\t38.25424\t-85.75941\t128.0\nUnited States\tLincoln\t40.8\t-96.66696\t382.0\nUnited States\tGlendale\t33.53865\t-112.18599\t336.0\nUnited States\tHenderson\t36.0397\t-114.98193\t580.0\nUnited States\tJersey City\t40.728157\t-74.077644\t14.0\nUnited States\tNorfolk\t36.846813\t-76.28522\t3.0\nUnited States\tChandler\t33.30616\t-111.84125\t380.0\nUnited States\tGreensboro\t36.072636\t-79.79198\t244.0\nUnited States\tBirmingham\t33.52066\t-86.80249\t173.0\nUnited States\tFort Wayne\t41.130604\t-85.12886\t243.0\nUnited States\tLexington\t37.98869\t-84.477715\t298.0\nUnited States\tHialeah\t25.857595\t-80.27811\t2.0\nUnited States\tMadison\t43.07305\t-89.40123\t270.0\nUnited States\tBaton Rouge\t30.450747\t-91.15455\t0.0\nUnited States\tGarland\t32.912624\t-96.638885\t165.0\nUnited States\tModesto\t37.639095\t-120.99688\t12.0\nUnited States\tParadise\t36.097195\t-115.14667\t626.0\nUnited States\tChula Vista\t32.640053\t-117.0842\t23.0\nUnited States\tLubbock\t33.57786\t-101.85516\t976.0\nUnited States\tRochester\t43.154785\t-77.615555\t155.0\nUnited States\tLaredo\t27.506407\t-99.507545\t115.0\nUnited States\tAkron\t41.081444\t-81.519005\t290.0\nUnited States\tOrlando\t28.538336\t-81.379234\t34.0\nUnited States\tDurham\t35.994034\t-78.89862\t122.0\nUnited States\tNorth Glendale\t34.160564\t-118.26452\t174.0\nUnited States\tScottsdale\t33.50921\t-111.89903\t386.0\n"
},
"dateCreated": "Jul 19, 2015 8:12:20 PM",
"dateStarted": "Jul 25, 2015 8:42:17 AM",
"dateFinished": "Jul 25, 2015 8:42:24 AM",
"status": "FINISHED",
"progressUpdateIntervalMs": 500
},
{
"text": "%sql \nselect * from myMap\nwhere Altitude \u003e ${Altitude\u003d300}",
"config": {
"colWidth": 6.0,
"graph": {
"mode": "mapChart",
"height": 300.0,
"optionOpen": false,
"keys": [
{
"name": "Country",
"index": 0.0,
"aggr": "sum"
}
],
"values": [
{
"name": "Name",
"index": 1.0,
"aggr": "sum"
}
],
"groups": [],
"scatter": {
"xAxis": {
"name": "Country",
"index": 0.0,
"aggr": "sum"
},
"yAxis": {
"name": "Name",
"index": 1.0,
"aggr": "sum"
}
}
},
"editorHide": true
},
"settings": {
"params": {
"Altitude": "400"
},
"forms": {
"Altitude": {
"name": "Altitude",
"defaultValue": "300",
"hidden": false
}
}
},
"jobName": "paragraph_1437317266677_-261952669",
"id": "20150719-201746_23407076",
"result": {
"code": "SUCCESS",
"type": "TABLE",
"msg": "Country\tName\tlat\tlan\tAltitude\nUnited States\tEl Paso\t31.75872\t-106.48693\t1147.0\nUnited States\tDenver\t39.739155\t-104.9847\t1598.0\nUnited States\tTucson\t32.221745\t-110.926476\t751.0\nUnited States\tAlbuquerque\t35.08449\t-106.65114\t1510.0\nUnited States\tLas Vegas\t36.17497\t-115.13722\t609.0\nUnited States\tColorado Springs\t38.83388\t-104.821365\t1829.0\nUnited States\tWichita\t37.692238\t-97.33755\t402.0\nUnited States\tAurora\t39.72943\t-104.83192\t1647.0\nUnited States\tHenderson\t36.0397\t-114.98193\t580.0\nUnited States\tParadise\t36.097195\t-115.14667\t626.0\nUnited States\tLubbock\t33.57786\t-101.85516\t976.0\n"
},
"dateCreated": "Jul 19, 2015 8:17:46 PM",
"dateStarted": "Jul 25, 2015 8:42:24 AM",
"dateFinished": "Jul 25, 2015 8:42:24 AM",
"status": "FINISHED",
"progressUpdateIntervalMs": 500
},
{
"text": "",
"config": {
"colWidth": 12.0,
"graph": {
"mode": "table",
"height": 300.0,
"optionOpen": false,
"keys": [],
"values": [],
"groups": [],
"scatter": {}
}
},
"settings": {
"params": {},
"forms": {}
},
"jobName": "paragraph_1437793749347_527943396",
"id": "20150725-083909_25279730",
"result": {
"code": "SUCCESS",
"type": "TEXT"
},
"dateCreated": "Jul 25, 2015 8:39:09 AM",
"dateStarted": "Jul 25, 2015 8:42:24 AM",
"dateFinished": "Jul 25, 2015 8:42:24 AM",
"status": "FINISHED",
"progressUpdateIntervalMs": 500
}
],
"name": "Map Visualization Tutorial",
"id": "2AU6K8KS2",
"angularObjects": {
"2AVFWDXQ8": [],
"2AW52KKF2": [],
"2AWBECUSM": [],
"2ATG5P9DG": [],
"2AUPDKZH1": [],
"2AVUJ5W2S": [],
"2AUSHYMSD": [],
"2ATHTSAJV": [],
"2AUZPG9UC": []
},
"config": {
"looknfeel": "default"
},
"info": {}
}
4 changes: 3 additions & 1 deletion zeppelin-web/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
"highlightjs": "~8.4.0",
"lodash": "~3.9.3",
"angular-filter": "~0.5.4",
"ngtoast": "~1.5.5"
"ngtoast": "~1.5.5",
"leaflet": "~0.7.3",
"angular-leaflet-directive": "~0.8.5"
},
"devDependencies": {
"angular-mocks": "1.3.8"
Expand Down
3 changes: 2 additions & 1 deletion zeppelin-web/src/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ angular.module('zeppelinWebApp', [
'monospaced.elastic',
'puElasticInput',
'xeditable',
'ngToast'
'ngToast',
'leaflet-directive'
])
.filter('breakFilter', function() {
return function (text) {
Expand Down
9 changes: 9 additions & 0 deletions zeppelin-web/src/app/notebook/notebook.css
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,15 @@
margin-bottom: 5px !important;
}

.angular-leaflet-map {
height: 300px;
width: 100%;
}

.graphContainer .mapChart {
overflow: hidden;
}

.allFields {
margin-bottom: 10px;
}
Expand Down
Loading