Commit 3d1c44ff authored by Tejesh's avatar Tejesh 🖖
Browse files

support topojson/geojson or mix of these, fix eclint issues

parent 24c83443
Pipeline #49442 passed with stage
in 2 minutes and 50 seconds
......@@ -5,7 +5,7 @@ cache:
validate:
script:
- eclint check '**/*.html' '**/*.js' '**/*.css' '**/*.yaml' '**/*.md'
- eclint check "**/*.html" "**/*.js" "**/*.css" "**/*.yaml" "**/*.md"
- yarn install
- npm run lint
- npm run test
......
......@@ -153,9 +153,9 @@ Each template receives these variables:
<!-- var template_page -->
<% var page = 1 + Math.floor(meta.offset / meta.limit),
last_page = 'count' in meta ? Math.floor((meta.count + meta.limit - 1) / meta.limit) : meta.rows < meta.limit ? page : null,
lo = Math.max(page - 2, 1),
hi = last_page !== null ? Math.min(last_page, page + 2) : page + 2
last_page = 'count' in meta ? Math.floor((meta.count + meta.limit - 1) / meta.limit) : meta.rows < meta.limit ? page : null,
lo = Math.max(page - 2, 1),
hi = last_page !== null ? Math.min(last_page, page + 2) : page + 2
%>
<ul class="pagination pagination-sm">
<li class="page-item <%- page <= 1 ? 'disabled' : '' %>">
......
......@@ -18,20 +18,20 @@ var defaults = {
}
/*
* @class MapViewer
* @aka g1.MapViewer
* @inherits Class
*
* The central class of the API
* It is used to create data reactive map layers from multiple kind of datasources
*
* @example
*
* ```js
* // initialize the map on the "map" div with a given center and zoom
* var mapviewer = g1.mapviewer(config)
* ```
*/
* @class MapViewer
* @aka g1.MapViewer
* @inherits Class
*
* The central class of the API
* It is used to create data reactive map layers from multiple kind of datasources
*
* @example
*
* ```js
* // initialize the map on the "map" div with a given center and zoom
* var mapviewer = g1.mapviewer(config)
* ```
*/
export var MapViewer = class MapViewer {
constructor(config) {
var self = this
......@@ -61,18 +61,20 @@ export var MapViewer = class MapViewer {
}
}
}
// * @method cacheData(<String> datasetName, 'String' URL || <Object> data): <Object> data
// * GETs data if not already there in this.gData
// *
// * TODO: If dataset itself is given, that is understood as data update.
// * layers rendered based on this data must be reRendered.
// * ?? Do a data diff and then load dependant layers ??
// *
// * @example
// *
// *```js
// mapviewer.cacheData('india_states', 'india-states.geojson')
// *```
/*
* @method cacheData(<String> datasetName, 'String' URL || <Object> data): <Object> data
* GETs data if not already there in this.gData
*
* TODO: If dataset itself is given, that is understood as data update.
* layers rendered based on this data must be reRendered.
* ?? Do a data diff and then load dependant layers ??
*
* @example
*
*```js
mapviewer.cacheData('india_states', 'india-states.geojson')
*```
*/
MapViewer.prototype.cacheData = function (layerName, url) {
var self = this
switch (typeof (url)) {
......@@ -88,16 +90,18 @@ MapViewer.prototype.cacheData = function (layerName, url) {
case 'object':
this.gData[JSON.stringify(url).hashCode()] = url
// TODO: Reload all layers that use this data
// This part will make mapviewer data reactive
// This part will make mapviewer data reactive
return async function () {
return url
}()
}
}
// * @method _saveLayer(<Layer> layer, <String> layerName ): this
// * Adds a layer to gLayers object, and
// *
// * Private method
/*
* @method _saveLayer(<Layer> layer, <String> layerName ): this
* Adds a layer to gLayers object, and
*
* Private method
*/
MapViewer.prototype._saveLayer = function (layerName, layer) {
var self = this, allLayersLoaded = true
self.gLayers[layerName] = layer
......@@ -172,7 +176,7 @@ MapViewer.prototype.buildLayer = function (layerName, layerConfig) {
gLayer = L.tileLayer(layerConfig.url, layerConfig.options)
this._saveLayer(layerName, gLayer)
break
// TODO: remove duplicate code topojson and geojson
case 'geojson':
case 'topojson':
self.cacheData(layerName, layerConfig[dataOrURL(layerConfig)]).then(function (mapJSON) {
gLayer = new L.TopoJSON(mapJSON, layerConfig.options)
......@@ -189,22 +193,6 @@ MapViewer.prototype.buildLayer = function (layerName, layerConfig) {
}
})
break
case 'geojson':
self.cacheData(layerName, layerConfig[dataOrURL(layerConfig)]).then(function (mapJSON) {
gLayer = L.geoJSON(mapJSON, layerConfig.options)
self._saveLayer(layerName, gLayer)
if ('link' in layerConfig) {
self.cacheData(layerName, layerConfig.link[dataOrURL(layerConfig.link)]).then(function (tableData) {
self.mergeData(mapJSON, tableData, layerConfig.link.mapKey, layerConfig.link.dataKey)
self.fitToLayer(layerName)
if ('attrs' in layerConfig) self._choropleth(layerName)
})
} else {
if ('attrs' in layerConfig) self._choropleth(layerName)
self.fitToLayer(layerName)
}
})
break
// TODO: remove duplicate code from marker and circkeMarker
case 'marker':
var pointLayers = []
......@@ -254,7 +242,7 @@ MapViewer.prototype._choropleth = function (layerName) {
layer.eachLayer(function (sublayer) {
var style = {}, prop, metricFormula, metric, domain
for (prop in self.options.layers[layerName].attrs) {
if(prop.toLowerCase() == 'tooltip') continue
if (prop.toLowerCase() == 'tooltip') continue
metric = self.options.layers[layerName].attrs[prop].metric
if (typeof (metric) === 'string')
metricFormula = (row) => row[metric]
......@@ -295,14 +283,16 @@ MapViewer.prototype._calculateMinMax = function (layer, metricFormula) {
})
return [minVal, maxVal]
}
// * @method fitToLayer(<String> layerName ): this
// * Zooms map view to fit the layer
// *
// * @example
// *
// *```js
// mapviewer.fitToLayer('indiaGeojson')
// *```
/*
* @method fitToLayer(<String> layerName ): this
* Zooms map view to fit the layer
*
* @example
*
*```js
mapviewer.fitToLayer('indiaGeojson')
*```
*/
MapViewer.prototype.fitToLayer = function (layerName, options = {}) {
this.map.fitBounds(this.gLayers[layerName].getBounds(), options)
}
......@@ -341,7 +331,8 @@ L.TopoJSON = L.GeoJSON.extend({
L.GeoJSON.prototype.addData.call(this, geojson)
}
else
throw new Error('json data is not of TopoJSON type')
L.GeoJSON.prototype.addData.call(this, jsonData)
return this
}
})
......
......@@ -10,18 +10,18 @@
6 hostname hostname
7 port port
9 pathname full path, excluding hash
12 search search parameters
13 hash url fragment
12 search search parameters
13 hash url fragment
The following are not part of window.location, but provided anyway.
3 userinfo username:password
8 relative: Everything after origin
10 directory: Directory part of pathname
11 file: File part of pathname
- searchKey search as an ordered dict of strings
- searchList search as an ordered dict of arrays
*/
10 directory: Directory part of pathname
11 file: File part of pathname
- searchKey search as an ordered dict of strings
- searchList search as an ordered dict of arrays
*/
var
_url_parse_key = ['href','protocol','origin','userinfo','username','password','hostname','port','relative','pathname','directory','file','search','hash'],
......@@ -34,7 +34,7 @@ var _decode_uri_component = function(s) { return decodeURIComponent(s.replace(/\
export function parse(str) {
/* Based on parseUri 1.2.2: http://blog.stevenlevithan.com/archives/parseuri
MIT License
MIT License
*/
var uri = {
toString: unparse,
......
{"type":"Topology","transform":{"scale":[0.000090176317631762,0.00010300650065006513],"translate":[88.039381,27.066848]},"objects":{"S21_PC":{"type":"GeometryCollection","geometries":[{"type":"Polygon","arcs":[[0]],"properties":{"ST_CODE":"S21","ST_NAME":"SIKKIM","PC_NAME":"Sikkim","PC_TYPE":"GEN","AREA":6999.02829738,"PC_NO":1}}]}},"arcs":[[[8173,682],[-1227,380],[-386,-99],[-699,111],[-342,-123],[-274,-384],[-732,-567],[-1755,529],[-1134,-10],[-440,-179],[-479,256],[-349,785],[-341,119],[-15,386],[376,552],[-219,560],[328,371],[-319,430],[466,1099],[618,594],[189,772],[412,505],[-216,273],[184,323],[-596,260],[-224,327],[306,447],[581,-229],[393,292],[256,-247],[1228,394],[346,-78],[1068,730],[630,-101],[77,378],[861,388],[495,-453],[214,84],[798,-94],[805,-697],[-45,-673],[237,-53],[322,-629],[-295,-380],[43,-742],[-288,-338],[100,-337],[-365,-235],[-172,-474],[-384,-279],[339,-357],[-92,-724],[610,-683],[254,63],[234,-422],[444,-145],[-161,-455],[-1018,-258],[-319,-642],[-328,-321]]]}
\ No newline at end of file
{"type":"Topology","transform":{"scale":[0.000090176317631762,0.00010300650065006513],"translate":[88.039381,27.066848]},"objects":{"S21_PC":{"type":"GeometryCollection","geometries":[{"type":"Polygon","arcs":[[0]],"properties":{"ST_CODE":"S21","ST_NAME":"SIKKIM","PC_NAME":"Sikkim","PC_TYPE":"GEN","AREA":6999.02829738,"PC_NO":1}}]}},"arcs":[[[8173,682],[-1227,380],[-386,-99],[-699,111],[-342,-123],[-274,-384],[-732,-567],[-1755,529],[-1134,-10],[-440,-179],[-479,256],[-349,785],[-341,119],[-15,386],[376,552],[-219,560],[328,371],[-319,430],[466,1099],[618,594],[189,772],[412,505],[-216,273],[184,323],[-596,260],[-224,327],[306,447],[581,-229],[393,292],[256,-247],[1228,394],[346,-78],[1068,730],[630,-101],[77,378],[861,388],[495,-453],[214,84],[798,-94],[805,-697],[-45,-673],[237,-53],[322,-629],[-295,-380],[43,-742],[-288,-338],[100,-337],[-365,-235],[-172,-474],[-384,-279],[339,-357],[-92,-724],[610,-683],[254,63],[234,-422],[444,-145],[-161,-455],[-1018,-258],[-319,-642],[-328,-321]]]}
......@@ -19,4 +19,4 @@
"score": 245,
"name": "Odisha"
}
]
\ No newline at end of file
]
[{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"North America"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"South America"},{"Continent":"Europe"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"South America"},{"Continent":"South America"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"North America"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"South America"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"South America"},{"Continent":"North America"},{"Continent":"North America"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"North America"},{"Continent":"Africa"},{"Continent":"South America"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Oceania"},{"Continent":"Oceania"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"Africa"},{"Continent":"South America"},{"Continent":"North America"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Oceania"},{"Continent":"Africa"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"North America"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Oceania"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"North America"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Oceania"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"North America"},{"Continent":"South America"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Oceania"},{"Continent":"South America"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Oceania"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"South America"},{"Continent":"Africa"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"North America"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"North America"},{"Continent":"South America"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"South America"},{"Continent":"Asia"},{"Continent":"Oceania"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"}]
\ No newline at end of file
[{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"North America"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"South America"},{"Continent":"Europe"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"South America"},{"Continent":"South America"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"North America"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"South America"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"South America"},{"Continent":"North America"},{"Continent":"North America"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"North America"},{"Continent":"Africa"},{"Continent":"South America"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Oceania"},{"Continent":"Oceania"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"Africa"},{"Continent":"South America"},{"Continent":"North America"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Oceania"},{"Continent":"Africa"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"North America"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Oceania"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"North America"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Oceania"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"North America"},{"Continent":"South America"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Oceania"},{"Continent":"South America"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Oceania"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"South America"},{"Continent":"Africa"},{"Continent":"North America"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"North America"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Europe"},{"Continent":"Africa"},{"Continent":"North America"},{"Continent":"South America"},{"Continent":"Asia"},{"Continent":"Europe"},{"Continent":"North America"},{"Continent":"South America"},{"Continent":"Asia"},{"Continent":"Oceania"},{"Continent":"Oceania"},{"Continent":"Asia"},{"Continent":"Africa"},{"Continent":"Africa"},{"Continent":"Africa"}]
This diff is collapsed.
......@@ -167,4 +167,4 @@
"sales": "",
"growth": ""
}
]
\ No newline at end of file
]
[
{
"date": "1-Jan-18",
"sales": 1
"date": "1-Jan-18",
"sales": 1
},
{
"date": "2-Jan-18",
"sales": 2
"date": "2-Jan-18",
"sales": 2
},
{
"date": "3-Jan-18",
"sales": 3
"date": "3-Jan-18",
"sales": 3
},
{
"date": "4-Jan-18",
"sales": 4
"date": "4-Jan-18",
"sales": 4
},
{
"date": "5-Jan-18",
"sales": 5
"date": "5-Jan-18",
"sales": 5
},
{
"date": "6-Jan-18",
"sales": 6
"date": "6-Jan-18",
"sales": 6
},
{
"date": "7-Jan-18",
"sales": 7
"date": "7-Jan-18",
"sales": 7
},
{
"date": "8-Jan-18",
"sales": 8
"date": "8-Jan-18",
"sales": 8
},
{
"date": "9-Jan-18",
"sales": 9
"date": "9-Jan-18",
"sales": 9
},
{
"date": "10-Jan-18",
"sales": 10
"date": "10-Jan-18",
"sales": 10
},
{
"date": "11-Jan-18",
"sales": 11
"date": "11-Jan-18",
"sales": 11
},
{
"date": "12-Jan-18",
"sales": 12
"date": "12-Jan-18",
"sales": 12
},
{
"date": "13-Jan-18",
"sales": 13
"date": "13-Jan-18",
"sales": 13
},
{
"date": "14-Jan-18",
"sales": 14
"date": "14-Jan-18",
"sales": 14
},
{
"date": "15-Jan-18",
"sales": 15
"date": "15-Jan-18",
"sales": 15
},
{
"date": "16-Jan-18",
"sales": 16
"date": "16-Jan-18",
"sales": 16
},
{
"date": "17-Jan-18",
"sales": 17
"date": "17-Jan-18",
"sales": 17
},
{
"date": "18-Jan-18",
"sales": 18
"date": "18-Jan-18",
"sales": 18
},
{
"date": "19-Jan-18",
"sales": 19
"date": "19-Jan-18",
"sales": 19
},
{
"date": "20-Jan-18",
"sales": 20
"date": "20-Jan-18",
"sales": 20
},
{
"date": "21-Jan-18",
"sales": 21
"date": "21-Jan-18",
"sales": 21
},
{
"date": "22-Jan-18",
"sales": 22
"date": "22-Jan-18",
"sales": 22
},
{
"date": "23-Jan-18",
"sales": 23
"date": "23-Jan-18",
"sales": 23
},
{
"date": "24-Jan-18",
"sales": 24
"date": "24-Jan-18",
"sales": 24
},
{
"date": "25-Jan-18",
"sales": 25
"date": "25-Jan-18",
"sales": 25
},
{
"date": "26-Jan-18",
"sales": 26
"date": "26-Jan-18",
"sales": 26
},
{
"date": "27-Jan-18",
"sales": 27
"date": "27-Jan-18",
"sales": 27
},
{
"date": "28-Jan-18",
"sales": 28
"date": "28-Jan-18",
"sales": 28
},
{
"date": "29-Jan-18",
"sales": 29
"date": "29-Jan-18",
"sales": 29
},
{
"date": "30-Jan-18",
"sales": 30
"date": "30-Jan-18",
"sales": 30
},
{
"date": "31-Jan-18",
"sales": 31
"date": "31-Jan-18",
"sales": 31
},
{
"date": "1-Feb-18",
"sales": 32
"date": "1-Feb-18",
"sales": 32
},
{
"date": "2-Feb-18",
"sales": 33
"date": "2-Feb-18",
"sales": 33
}
]
\ No newline at end of file
]
......@@ -19,4 +19,4 @@
"score": 20.940920,
"name": "Odisha"
}
]
\ No newline at end of file
]
......@@ -159,7 +159,7 @@
g1.sanddance({ stroke: 'blue' }).update({ fill: 'red' }, { duration: 100 }),
function () {
return this.getAttribute('fill') == 'rgb(255, 0, 0)' &&
this.getAttribute('stroke') == 'rgb(0, 0, 255)'
this.getAttribute('stroke') == 'rgb(0, 0, 255)'
}
)
check('update.options', 200,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment