Skip to content

Mapbuilder #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 155 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
427c33c
initial file merge
petulla Oct 18, 2016
c842b22
Merge branch 'master' of https://github.com/Quartz/Chartbuilder into …
petulla Dec 26, 2016
cc7ace5
update button layout
petulla Dec 26, 2016
500a972
integrations
petulla Dec 26, 2016
04674f2
more integration
petulla Dec 26, 2016
6c7aa7b
integration
petulla Dec 26, 2016
b45e1a8
integrations
petulla Dec 26, 2016
a9bec1c
basic data render in place
petulla Dec 26, 2016
09b4cf7
initial cartogram fix
petulla Dec 26, 2016
017bfc9
bubble rendering
petulla Dec 26, 2016
bac71a7
mixin issues
petulla Dec 27, 2016
44d14d3
fix legends
petulla Dec 27, 2016
2d22114
subtitle just to maps
petulla Dec 27, 2016
e4d77a1
fix bubble editor
petulla Dec 27, 2016
c36733a
merge editors
petulla Dec 27, 2016
e132294
so much fixing
petulla Dec 27, 2016
d98978c
integrating visual type update
petulla Dec 27, 2016
c4c3c54
begin fixing other editors
petulla Dec 28, 2016
79e9d0d
bubble editor in
petulla Dec 28, 2016
adcb8b9
editors in and cleaned up
petulla Dec 28, 2016
0907918
cleanup
petulla Dec 28, 2016
934c4d9
fix cartogram basic issue
petulla Dec 28, 2016
e546e07
improve draggy legend
petulla Dec 28, 2016
a91472a
remove logo
petulla Dec 28, 2016
986a427
clean up legends
petulla Dec 28, 2016
ca1c152
legend space updates
petulla Dec 28, 2016
20e4bcf
more legend work
petulla Dec 28, 2016
71c0b60
alignment fixes
petulla Dec 29, 2016
89a6c00
center legend
petulla Dec 29, 2016
1ad515a
legend
petulla Dec 29, 2016
f97cc39
more legend alignmnet
petulla Dec 29, 2016
2e55d37
smaller legend breaks sizing
petulla Dec 30, 2016
2536f96
remove extra default update
petulla Dec 30, 2016
abff352
fix thresholds
petulla Dec 30, 2016
fd6542f
legend ticks fix
petulla Dec 30, 2016
1abb392
fix legend alignment
petulla Dec 30, 2016
2cb9474
fix grid position
petulla Dec 30, 2016
e41d29f
add flexibility to string match
petulla Dec 31, 2016
f19584b
de-case-sensitize
petulla Dec 31, 2016
15a082a
add string check
petulla Dec 31, 2016
c9e0876
start working on non-us maps
petulla Dec 31, 2016
f8dca43
warning work
petulla Jan 3, 2017
5239845
add warnings for maps
petulla Jan 3, 2017
07ed762
add support for single column entry
petulla Jan 3, 2017
57252ea
add warning for map fewer two cols
petulla Jan 3, 2017
ff6aa73
fixes
petulla Jan 3, 2017
32ffc31
begin color work
petulla Jan 4, 2017
d3df831
Create element file
petulla Jan 4, 2017
0118ff4
rewrites for cartograms; data model; add drop down map override; add …
petulla Feb 7, 2017
ec239aa
fully stateless data model for the cartogram
petulla Feb 7, 2017
7f21362
add dataset download and update gulp task
petulla Feb 7, 2017
7a7f3a4
fix demers dorling autostart tick
petulla Feb 7, 2017
2a910f0
improve quantize legend rendering and computations
petulla Feb 8, 2017
7b598a0
fix scale mutation issues
petulla Feb 8, 2017
b4de08f
begin fixing thresholds
petulla Feb 8, 2017
5ecf5b5
another threshold tweak
petulla Feb 8, 2017
33b2bb7
colorscales missing from cartogram O_O
petulla Feb 8, 2017
264202c
bug fix to demers dorling sizing
petulla Feb 9, 2017
d74011b
add clipping path, world map, middle east map
petulla Feb 9, 2017
abbc3d6
partway through rewriting the polygon match data model + logic
petulla Feb 13, 2017
6035ad6
binary search tree implemented
petulla Feb 13, 2017
b40c902
basic update functioning in place
petulla Feb 13, 2017
c7fe677
update map if scale changes
petulla Feb 13, 2017
097be87
fix scale comparison bug
petulla Feb 13, 2017
85a8921
improve state label positionings
petulla Feb 14, 2017
db9dd8d
parsing optimizations; domain update fix
petulla Feb 14, 2017
2e0822f
fix dropdown for map type selection issues; fix non-compute when dele…
petulla Feb 14, 2017
4852e87
add more maps, russia, sa, ca, etc
petulla Feb 14, 2017
d4d3f09
add middle east maps
petulla Feb 14, 2017
6c4c303
begin adding state-level county maps
petulla Feb 15, 2017
651eef8
fix sorting for strings in binary search; improve worldmap
petulla Feb 15, 2017
946ac09
begin adding sample datasets for all counties
petulla Feb 16, 2017
bff481b
organize all county-level state maps
petulla Feb 16, 2017
1614485
rename state dataset names
petulla Feb 16, 2017
97acac4
fix translation
petulla Feb 16, 2017
f30375b
improve ui of toggles
petulla Feb 16, 2017
758d089
ui adjustments
petulla Feb 16, 2017
49c50a2
improve projections
petulla Feb 17, 2017
2493d0a
improve asia maps
petulla Feb 17, 2017
05e0087
world mapfiles created with reduced num of objects
petulla Feb 17, 2017
d3db056
add all datasets and pruendd maps
petulla Feb 17, 2017
e61d3ea
add render method to component for 50x
petulla Feb 18, 2017
1bfe790
fix non-render issue for duplicate polygon ids
petulla Feb 21, 2017
40b2731
begin fixing bubble and cartogram
petulla Feb 21, 2017
d65f2bb
bubble parse file kind of going
petulla Feb 21, 2017
758b832
more work on bubble parser to fix scales and legend values
petulla Feb 21, 2017
27c1040
new bubble map render in
petulla Feb 21, 2017
958dbd0
fix radial legend position
petulla Feb 22, 2017
8e36421
fix cartogram render; needs optimization;
petulla Feb 22, 2017
313045c
change cartogram defaults
petulla Feb 22, 2017
30c1c35
improve cartogram perf
petulla Feb 22, 2017
be9b5a3
fix cartogram schema switch bug
petulla Feb 22, 2017
a134ddc
merge in progress
petulla Feb 22, 2017
482ddc3
fix mobile render issues
petulla Feb 23, 2017
ab2181b
begin renderer conversion to new style
petulla Feb 23, 2017
c56a0f5
remove subtitle from charts; only editable for maps
petulla Feb 23, 2017
63fc5b9
further work merging in the map renders/editors
petulla Feb 23, 2017
e90ade9
further conversion to the new svgwrapper model
petulla Feb 23, 2017
7215dfb
clean up positioning logic from render
petulla Feb 23, 2017
d1965b0
add translation modifier for mobile
petulla Feb 23, 2017
3b49517
fix wrong selection issue with multiple renders
petulla Feb 23, 2017
67eda80
reduce map sizes for now; fix issues with multiple maps render
petulla Feb 23, 2017
02f695a
fix clippath
petulla Feb 23, 2017
7877a37
comment out issue that was propagating prior metadata in mobile
petulla Feb 23, 2017
fb008c9
fix subtitle margins mobile
petulla Feb 23, 2017
3f35a55
fix subtitle offset
petulla Feb 23, 2017
7b0d83e
clean up margins and sizes on choropleth
petulla Feb 24, 2017
1893245
fix clippath
petulla Feb 24, 2017
77c8fb6
fix issue of falsely rendering non-matched shps
petulla Feb 24, 2017
6ab7f8f
fix map positions for layout
petulla Feb 24, 2017
b9955b5
integrate bubble; modularize radius
petulla Feb 24, 2017
08ec4ea
change height based on subtitle
petulla Feb 24, 2017
601a029
make legend thinner on mobile
petulla Feb 24, 2017
340a180
Alter default Y for radial/demers key
petulla Feb 24, 2017
aef88dc
basic cartogram render updated
petulla Feb 24, 2017
9d571a0
return legend to render
petulla Feb 24, 2017
bb10fd6
fix some problems with the cartogram renders
petulla Feb 24, 2017
d8e0b95
fix grid cartogram sizing
petulla Feb 24, 2017
6646265
Center legends
petulla Feb 24, 2017
b90f6b0
improve grid sizings
petulla Feb 24, 2017
9a5416e
add mobile styles
petulla Feb 24, 2017
78ad57d
code cleanup
petulla Feb 24, 2017
1c29073
start es2015 conversion
petulla Feb 25, 2017
6a5a36c
rename xoffset var for dragging
petulla Feb 25, 2017
18cf4ef
XY converted
petulla Feb 25, 2017
8c6b64c
render countes in remote
petulla Feb 26, 2017
6d344ce
More type conversion
petulla Feb 27, 2017
6c6f521
finish es2015 renaming
petulla Feb 27, 2017
111bc0d
begin replacing createClass with functional components and es2015 cla…
petulla Feb 27, 2017
307901c
fix draggy legend
petulla Feb 27, 2017
4798268
more es2015 class conversion
petulla Feb 27, 2017
8199061
more es2015 class conversion
petulla Feb 28, 2017
2cda5b5
bug fixes
petulla Feb 28, 2017
8a229a6
last component converted to es2015
petulla Feb 28, 2017
652c499
consolidate helpers; rename 50 to choro
petulla Feb 28, 2017
a281409
untrack d4 mixin file
petulla Feb 28, 2017
ef85e67
change let to const in parse fns
petulla Feb 28, 2017
78eb51d
commit var change
petulla Feb 28, 2017
2b9940f
Update presets in gulpfile.js for es2015; add es2015 babel to package…
petulla Feb 28, 2017
75ae93d
delete unneded labels annotation
petulla Feb 28, 2017
029cb84
remove extra react transform
petulla Feb 28, 2017
b52e0f6
add name to package.json
petulla Feb 28, 2017
2cdfad7
add map colors/chart colors options
petulla Feb 28, 2017
481b098
color classes
petulla Mar 1, 2017
1024e69
reinstate uglify while removing all 50 state files
petulla Mar 2, 2017
414d377
change non-return state fill; still needs abstraction
petulla Mar 2, 2017
5cd3a9c
fix issue with non-appearing minimum-size bubble
petulla Mar 2, 2017
d6e191d
add missing import
petulla Mar 2, 2017
36fabe0
alter default maps
petulla Mar 2, 2017
81bf2a5
add lodash plugin and fix schema error
petulla Mar 3, 2017
a77a38c
add lodash plugin to all builds
petulla Mar 3, 2017
09de79d
delete legacy footer file
petulla Mar 3, 2017
c6b9e1a
merge fix to svg class and styles
petulla Mar 6, 2017
bb88771
fix typo projection
petulla Mar 7, 2017
8b10e72
add node 5 package-lock.json
petulla Sep 13, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
557 changes: 303 additions & 254 deletions dist/css/core.css

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions gulp/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ var paths = {
js: dirs.src + '/js',
styl: dirs.src + '/styl',
fonts: dirs.src + '/fonts',
assets: dirs.src + '/assets'
assets: dirs.src + '/assets',
datasets: dirs.src + '/js/config/mapconfig/demo-datasets'
},
tmp: {
css: dirs.tmp + '/css',
Expand All @@ -28,7 +29,8 @@ var paths = {
img: dirs.build + '/img',
js: dirs.build + '/js',
fonts: dirs.build + '/fonts',
assets: dirs.build + '/assets'
assets: dirs.build + '/assets',
datasets: dirs.build + '/assets/'
},
dist: {
css: dirs.dist + '/css'
Expand Down
11 changes: 6 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var browserSync = require("browser-sync");
var buffer = require("vinyl-buffer");
var del = require("del");
var nib = require("nib");
var babelify = require('babelify');
var reload = browserSync.reload;

// browserify
Expand Down Expand Up @@ -61,11 +62,11 @@ gulp.task("browserify:dev", function () {
debug: true,
cache: {},
packageCache: {},
fullPaths: true
fullPaths: true,
transform: [[babelify, {plugins: ['lodash'], presets: ['babel-preset-react', 'react', 'es2015']}]]
};

var bundler = watchify(browserify(props)
.transform("babelify", {presets: ["react"]})
.transform(envify({ NODE_ENV: "dev" })
));

Expand All @@ -92,7 +93,7 @@ gulp.task("browserify:test", function () {
var bundler = browserify("./test/test-page/main.js", {
debug: true
})
.transform("babelify", {presets: ["react"]})
.transform("babelify", {plugins: ['lodash'], presets: ['babel-preset-react', 'react', 'es2015']})
.transform(envify({ NODE_ENV: "dev" }));

return bundler.bundle()
Expand All @@ -103,7 +104,7 @@ gulp.task("browserify:test", function () {

gulp.task("browserify:prod", function () {
var bundler = browserify(config.paths.src.js + "/index.js")
.transform("babelify", {presets: ["react"]})
.transform("babelify", {plugins: ['lodash'], presets: ['babel-preset-react', 'react', 'es2015']})
.transform(envify({ NODE_ENV: "prod" }));

return bundler.bundle()
Expand Down Expand Up @@ -151,7 +152,7 @@ gulp.task("copy-fonts", function () {
});

gulp.task("copy-assets", function () {
return gulp.src(config.paths.src.assets + "/**")
return gulp.src([config.paths.src.assets + "/**", config.paths.src.datasets + "/**"])
.pipe(changed(config.paths.build.assets))
.pipe(gulp.dest(config.paths.build.assets))
.pipe(reload({ stream: true }));
Expand Down
Loading