Skip to content

Commit

Permalink
Merge pull request #1 from omnisci/matzy/FE-14918_metis-rebrand
Browse files Browse the repository at this point in the history
[FE-14918] metis rebrand
  • Loading branch information
cmatzenbach authored and Chris Matzenbach committed Mar 9, 2022
1 parent 8185414 commit 171c8eb
Show file tree
Hide file tree
Showing 18 changed files with 51 additions and 50 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2017 MapD Technologies, Inc.
Copyright 2017 HEAVY.AI, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Tools for massively parallel and multi-variate data exploration.

Quickly build interactive visualizations powered by the speed of MapD Core.
Quickly build interactive visualizations powered by the speed of HeavyDB.

* [dc.js Example](https://omnisci.github.io/metis/examples/dc/)
* [Vega Example](https://omnisci.github.io/metis/examples/vega/)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
font-weight: bold;
text-align:center;
}
.mapd{
.heavyai{
position: relative;
top: 2px;
}
Expand All @@ -29,7 +29,7 @@
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header" style="margin-top:10px">
<span class="mapd">MapD Demo</span>
<span class="heavyai">HEAVY.AI Demo</span>
</div>
<div class="navbar-text navbar-right">
<div class="data-count">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require("script-loader!mapbox-gl/dist/mapbox-gl.js");
require("script-loader!mapbox-gl/dist/mapboxgl-overrides.js");
require("mapbox-gl/dist/mapbox-gl.css");
require("@mapd/mapdc/mapdc.css");
require("@mapd/mapdc/scss/chart.scss");
require("@heavyai/charting/charting.css");
require("@heavyai/charting/scss/chart.scss");

import { connect } from "./src/connector";
import {
Expand All @@ -15,16 +15,16 @@ import {
lineDimension
} from "./src/crossfilter";
import _ from "lodash";
import * as dc from "@mapd/mapdc";
const d3 = dc.d3;
import * as hc from "@heavyai/charting";
const d3 = hc.d3;

function createCharts(crossFilter, con, tableName) {
var w = document.documentElement.clientWidth - 30;
var h =
Math.max(document.documentElement.clientHeight, window.innerHeight || 0) -
200;

var dataCount = dc
var dataCount = hc
.countWidget(".data-count")
.dimension(countDimension)
.group(countGroup);
Expand Down Expand Up @@ -117,14 +117,14 @@ function createCharts(crossFilter, con, tableName) {
mapLangColors(40);

var sizeScale = d3.scale.linear().domain([0, 5000]).range([2, 12]);
var pointMapChart = dc
var pointMapChart = hc
.rasterChart(parent, true)
.con(con)
.height(h / 1.5)
.width(w)
.mapUpdateInterval(750);
// .mapStyle('json/dark-v8.json')
var pointLayer = dc
var pointLayer = hc
.rasterLayer("points")
.dimension(pointMapDim)
.group(pointMapDim)
Expand Down Expand Up @@ -182,7 +182,7 @@ function createCharts(crossFilter, con, tableName) {
}

return tweetTime.minMax().then(function(timeChartBounds) {
var dcTimeChart = dc
var hcTimeChart = hc
.lineChart(".chart2-example")
.width(w)
.height(h / 2.5)
Expand All @@ -194,24 +194,24 @@ function createCharts(crossFilter, con, tableName) {
.dimension(lineDimension)
.group(lineDimension);

dcTimeChart.binParams({
hcTimeChart.binParams({
extract: false,
timeBin: "hour",
numBins: 288, // 288 * 5 = number of minutes in a day
binBounds: [timeChartBounds[0], timeChartBounds[1]]
});

dcTimeChart
hcTimeChart
.x(d3.time.scale.utc().domain([timeChartBounds[0], timeChartBounds[1]]))
.yAxis()
.ticks(5);
dcTimeChart
hcTimeChart
.xAxis()
.scale(dcTimeChart.x())
.tickFormat(dc.utils.customTimeFormat)
.scale(hcTimeChart.x())
.tickFormat(hc.utils.customTimeFormat)
.orient("top");

dc.renderAllAsync();
hc.renderAllAsync();

window.addEventListener("resize", _.debounce(reSizeAll, 500));
function reSizeAll() {
Expand All @@ -224,8 +224,8 @@ function createCharts(crossFilter, con, tableName) {
pointMapChart.map().resize();
pointMapChart.isNodeAnimate = false;
pointMapChart.width(w).height(h / 1.5);
dcTimeChart.width(w).height(h / 2.5);
dc.redrawAllAsync();
hcTimeChart.width(w).height(h / 2.5);
hc.redrawAllAsync();
}
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"start": "webpack-dev-server --content-base ./"
},
"dependencies": {
"@mapd/connector": "git://github.com/mapd/mapd-connector.git#develop",
"@mapd/mapdc": "git://github.com/mapd/mapd-charting.git#develop",
"@heavyai/connector": "git://github.com/mapd/mapd-connector.git#develop",
"@heavyai/charting": "git://github.com/mapd/mapd-charting.git#develop",
"css-loader": "^0.28.4",
"lodash": "^4.17.4",
"mapbox-gl": "https://github.com/mapd/mapbox-gl-js/tarball/9c04de6949fe498c8c79f5c0627dfd6d6321f307",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const connection = new MapdCon()
const connection = new DbCon()
.protocol("https")
.host("metis.mapd.com")
.port("443")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
timeDimensionNode
} from "./datagraph";

import { d3 } from "@mapd/mapdc";
import { d3 } from "@heavyai/charting";

export const countDimension = {
sizeAsync() {
Expand Down Expand Up @@ -144,7 +144,7 @@ export const lineDimension = {
crossfilter.transform(filter => {
filter[2] = {
type: "crossfilter",
signal: "mapd",
signal: "heavyai",
filter: [
{
type: "filter",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export const countGroupNode = graph.data({
},
{
type: "resolvefilter",
filter: { signal: "mapd" },
filter: { signal: "heavyai" },
ignore: ""
}
]
Expand Down Expand Up @@ -106,7 +106,7 @@ export const pointmapNode = graph.data({
},
{
type: "resolvefilter",
filter: { signal: "mapd" },
filter: { signal: "heavyai" },
ignore: ""
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var path = require("path");
module.exports = {
entry: {
app: [
"script-loader!@mapd/connector/dist/browser-connector.js",
"script-loader!@heavyai/connector/dist/browser-connector.js",
"./index.js"
]
},
Expand All @@ -23,7 +23,7 @@ module.exports = {
path.resolve(__dirname, "../../index.js"),
path.resolve(__dirname, "index.js"),
path.resolve(__dirname, "./src"),
path.resolve(__dirname, "node_modules/@mapd/mapdc")
path.resolve(__dirname, "node_modules/@heavyai/charting")
],
loader: "babel-loader"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
# yarn lockfile v1


"@mapd/connector@git://github.com/mapd/mapd-connector.git#develop":
"@heavyai/connector@git://github.com/mapd/mapd-connector.git#develop":
version "1.0.0"
resolved "git://github.com/mapd/mapd-connector.git#f7b6d281cf2011fd0ac57f3325fc534caf0ba884"
dependencies:
codecov "^2.2.0"
script-loader "^0.7.0"
thrift "^0.10.0"

"@mapd/mapd-draw@git://github.com/mapd/mapd-draw.git":
"@heavyai/draw@git://github.com/mapd/mapd-draw.git":
version "1.1.0"
resolved "git://github.com/mapd/mapd-draw.git#3b13cb00335eadc1c3a77fe18f5ec65b5eb752d2"
dependencies:
css-element-queries "^0.4.0"
gl-matrix "^2.3.2"

"@mapd/mapdc@git://github.com/mapd/mapd-charting.git#develop":
"@heavyai/charting@git://github.com/mapd/mapd-charting.git#develop":
version "1.0.0"
resolved "git://github.com/mapd/mapd-charting.git#defbabe88f04d4c224b35af196f1b71c81db69c5"
dependencies:
"@mapd/mapd-draw" "git://github.com/mapd/mapd-draw.git"
"@heavyai/draw" "git://github.com/mapd/mapd-draw.git"
d3 "^3.5.17"
deep-equal "1.0.1"
earcut "^2.1.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/data-layer/CLA.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MAPD TECHNOLOGIES CONTRIBUTOR LICENSE AGREEMENT
HEAVY.AI CONTRIBUTOR LICENSE AGREEMENT

This Contributor License Agreement (“Agreement”) is between the contributor specified below (“you”) and MapD Technologies, Inc. (“we” or “us”). This Agreement applies to all Contributions (as defined below) submitted by you to an open source project owned or managed by us (each, a “Project”).
This Contributor License Agreement (“Agreement”) is between the contributor specified below (“you”) and HEAVY.AI, Inc. (“we” or “us”). This Agreement applies to all Contributions (as defined below) submitted by you to an open source project owned or managed by us (each, a “Project”).

Definitions. The terms “you” or “your” shall mean the copyright owner or the individual or legal entity authorized by the copyright owner that is granting the licenses under this Agreement. For legal entities, the term “you” includes any entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity. “Contribution” means any work of authorship, including any source code, object code, patch, tool, sample, graphic, image, audio or audiovisual work, specification, manual, and documentation, and any modifications or additions to an existing work, submitted by you in connection with any product or other item developed, managed or maintained by a Project (collectively, such products and other items, “Work”). The term “submitted” means any form of electronic, verbal, or written communication sent to a Project or its representatives, including communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by or on behalf of a Project.

Expand Down
12 changes: 6 additions & 6 deletions packages/data-layer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

* [**API Documentation**](docs/API.md)
* [**Crossfiltering Vega Example**](https://omnisci.github.io/metis/examples/vega/)
* [**MapD Raster Chart Example**](https://mapd.github.io/mapd-data-layer/example/mapd-charting)
* [**HEAVY.AI Raster Chart Example**](https://mapd.github.io/mapd-data-layer/example/mapd-charting)

Declaratively build SQL data pipelines. Based on the [Vega Transform API](https://vega.github.io/vega/docs/transforms/).

Expand All @@ -11,25 +11,25 @@ Declaratively build SQL data pipelines. Based on the [Vega Transform API](https:
Using `npm`

```bash
npm install mapd-data-layer --save
npm install @heavyai/data-layer --save
```

Or using `yarn`

```bash
yarn add mapd-data-layer
yarn add @heavyai/data-layer
```

One can then import it:

```js
import {createDataGraph} from "mapd-data-layer"
import {createDataGraph} from "@heavyai/data-layer"
```

Or use the bundled version:

```html
<script src="/path/to/js/mapd-data-layer.min.js"></script>
<script src="/path/to/js/data-layer.min.js"></script>
```

# Development
Expand All @@ -48,7 +48,7 @@ The `flow` type-checker tool is used in development and type declarations can be

# Contributing

In order to clarify the intellectual property license granted with Contributions from any person or entity, MapD must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the [Contributor License Agreement](CLA.md). If you have not already done so, please complete and sign, then scan and email a pdf file of this Agreement to [contributors@mapd.com](mailto:contributors@mapd.com). Please read the agreement carefully before signing and keep a copy for your records.
In order to clarify the intellectual property license granted with Contributions from any person or entity, HEAVY.AI must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the [Contributor License Agreement](CLA.md). If you have not already done so, please complete and sign, then scan and email a pdf file of this Agreement to [contributors@heavy.ai](mailto:contributors@heavy.ai). Please read the agreement carefully before signing and keep a copy for your records.

# License

Expand Down
2 changes: 1 addition & 1 deletion packages/data-layer/docs/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

## API

The exported `mapd-data-layer` module. Consists of a graph constructor and
The exported `@heavyai/data-layer` module. Consists of a graph constructor and
helper functions to build expressions and transforms and to parse them

### createParser
Expand Down
2 changes: 1 addition & 1 deletion packages/data-layer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/data-layer/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mapd-data-layer-2",
"name": "@heavyai/data-layer",
"version": "0.0.25",
"description": "SQL data-layer for the MapD frontend",
"description": "SQL data-layer for the HEAVY.AI frontend",
"main": "lib/index.js",
"module": "es/index.js",
"jsnext:main": "es/index.js",
Expand All @@ -16,7 +16,7 @@
"url": "git+https://github.com/mapd/mapd-data-layer.git"
},
"authors": [
"MapD Technologies",
"HEAVY.AI",
"Jonathan Huang <[email protected]> (https://github.com/mrblueblue)"
],
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/data-layer/src/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* The exported `mapd-data-layer` module. Consists of a graph constructor and
* The exported `@heavyai/data-layer` module. Consists of a graph constructor and
* helper functions to build expressions and transforms and to parse them
* @namespace API
*/
Expand Down
3 changes: 2 additions & 1 deletion packages/data-layer/src/index.js.flow
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import type {DataState} from "./create-data-node"
import type {Connector, DataGraph} from "./create-data-graph"

declare module "mapd-data-layer" {
// is this a legal name in flow?
declare module "@heavyai/data-layer" {
declare export function writeSQL(state: DataState): string
declare export function createDataGraph(connector: Connector): DataGraph
}
4 changes: 2 additions & 2 deletions packages/data-layer/src/parser/parse-with.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ export default function parseWith(
parser: any = Parser
): SQL {
const subQuery = parser.write(parser.parseDataState(transform.fields))
// need to pass the name for the subquery from mapd-charting, so including with clause in the sql as an object
// need to pass the name for the subquery from @heavyai/charting, so including with clause in the sql as an object
sql.with.push(
subQuery ? {temp: transform.expr, subQuery} : ""
);
return sql;
}
}

0 comments on commit 171c8eb

Please sign in to comment.