{modal}
- {congressionalDistrictModal}
Select base map
diff --git a/source/components/HexMetrics.js b/source/components/HexMetrics.js
index befa85c..80f9651 100644
--- a/source/components/HexMetrics.js
+++ b/source/components/HexMetrics.js
@@ -4,6 +4,8 @@ import geographyResource from '../resources/GeographyResource'
import {fipsColor, hashFromData} from '../utils'
+//keyString.name_short removed from line 181
+
export default class HexMetrics extends React.Component {
constructor(props) {
super(props)
@@ -176,7 +178,8 @@ export default class HexMetrics extends React.Component {
>
{count.disable ? 'No Data' : this._drawHexagon(count.key)}
-
{keyString.name_short || count.key}
+
{count.key}
+
{adjustString}
)
diff --git a/source/css/ui.scss b/source/css/ui.scss
index 6fe63c6..6e6b1a0 100644
--- a/source/css/ui.scss
+++ b/source/css/ui.scss
@@ -315,15 +315,3 @@ code {
display: none;
}
}
-
-.congressionalDistrictModal {
- position: fixed;
- top: 55px;
- left: 323px;
- width: calc(100% - 323px);
- text-align: center;
- z-index: 99999;
- background-color: white;
- line-height: 3em;
- font-size: 120%;
-}
diff --git a/source/graphics/MapGraphic.js b/source/graphics/MapGraphic.js
index 4d68eb1..14304c9 100644
--- a/source/graphics/MapGraphic.js
+++ b/source/graphics/MapGraphic.js
@@ -5,7 +5,7 @@ import topogramImport from 'topogram'
import Graphic from './Graphic'
import geographyResource from '../resources/GeographyResource'
-import exporter from '../file/Exporter'
+//import exporter from '../file/Exporter'
import {fipsColor, updateBounds, checkWithinBounds} from '../utils'
import {canvasDimensions} from '../constants'
@@ -74,10 +74,10 @@ export default class MapGraphic extends Graphic {
if (this._iterationCount > MAX_ITERATION_COUNT) {
return false
}
- const mapResource = geographyResource.getMapResource(geography)
+ //const mapResource = geographyResource.getMapResource(geography)
topogram.projection(x => x)
- const topoJson = exporter.fromGeoJSON(this._stateFeatures, mapResource.getObjectId())
- this._stateFeatures = topogram(topoJson, topoJson.objects[mapResource.getObjectId()].geometries)
+ //const topoJson = exporter.fromGeoJSON(this._stateFeatures, mapResource.getObjectId())
+ //this._stateFeatures = topogram(topoJson, topoJson.objects[mapResource.getObjectId()].geometries)
this._precomputeBounds()
this._iterationCount++
return true
diff --git a/source/images/logo.png b/source/images/logo.png
deleted file mode 100644
index 69941ad..0000000
Binary files a/source/images/logo.png and /dev/null differ
diff --git a/source/resources/DatasetResource.js b/source/resources/DatasetResource.js
index cc04976..373a22b 100644
--- a/source/resources/DatasetResource.js
+++ b/source/resources/DatasetResource.js
@@ -10,8 +10,14 @@ import germanyConstituency from '../../data/germany/constituencies.csv'
import franceRegionPopulation from '../../data/france/region-population.csv'
import franceDepartment from '../../data/france/departments.csv'
import netherlandsPopulation from '../../data/netherlands/netherlands-populations.csv'
+
+//
+import pakistanSeats from '../../data/pakistan/seats.csv'
+import pakistanNewSeats from '../../data/pakistan/pakistanNew.csv'
+import testingSeats from '../../data/testing/testing.csv'
import brazilPopulation2018 from '../../data/brazil/brazil-populations.csv'
import irelandVotes from '../../data/ireland/constituency_values.csv'
+//
class DatasetResource {
constructor() {
@@ -27,6 +33,32 @@ class DatasetResource {
geography: 'United States',
defaultResolution: 1000000,
},
+ //
+ // {
+ // label: 'Pakistan Results',
+ // data: this.parseCsv(pakistanSeats, 'Pakistan'),
+ // geography: 'Pakistan',
+ // defaultResolution: 1,
+ // },
+ // {
+ // label: 'Pakistan New Results',
+ // data: this.parseCsv(pakistanNewSeats, 'Pakistan New'),
+ // geography: 'Pakistan New',
+ // defaultResolution: 1,
+ // },
+ //
+ {
+ label: 'TestingPakistan',
+ data: this.parseCsv(testingSeats, 'Pakistan'),
+ geography: 'Pakistan',
+ defaultResolution: 1,
+ },
+ {
+ label: 'Brazil – Population 2017',
+ data: this.parseCsv(brazilPopulation2018, 'Brazil'),
+ geography: 'Brazil',
+ defaultResolution: 500000,
+ },
{
label: 'U.S. Electoral College 2016',
data: this.parseCsv(electoralCollegeCsv, 'United States'),
@@ -50,12 +82,6 @@ class DatasetResource {
geography: 'Netherlands',
defaultResolution: 50000,
},
- {
- label: 'Brazil – Population 2017',
- data: this.parseCsv(brazilPopulation2018, 'Brazil'),
- geography: 'Brazil',
- defaultResolution: 500000,
- },
// {
// label: 'U.K. Constituency 1-to-1',
// data: this.parseCsv(ukConstituency, 'United Kingdom - Constituencies'),
diff --git a/source/resources/GeographyResource.js b/source/resources/GeographyResource.js
index da6584b..1dfc847 100644
--- a/source/resources/GeographyResource.js
+++ b/source/resources/GeographyResource.js
@@ -9,7 +9,12 @@ import franceDepartmentTopoJson from '../../maps/france/department.topo.json'
import netherlandsTopoJson from '../../maps/netherlands/netherlands.topo.json'
import brazilTopoJson from '../../maps/brazil/brazil.topo.json'
import irelandTopoJson from '../../maps/ireland/Irish_Constituencies.topo.json'
+//
+import pakistanTopoJson from '../../maps/pakistan/pakistan.json'
+import pakistanNewTopoJson from '../../maps/pakistanNew/pakistan.json'
+import testingTopoJson from '../../maps/testing/testing.json'
+//
import MapResource from './MapResource'
import fipsHash from '../../data/us/fips-to-state.json'
// import fidHash from '../../data/uk/fid-to-constituency.json'
@@ -18,8 +23,15 @@ import wkrHash from '../../data/germany/wkr-to-name.json'
import regionHash from '../../data/france/region-to-name.json'
import departmentHash from '../../data/france/department-to-name.json'
import netherlandsHash from '../../data/netherlands/netherlands-names.json'
+
+//
+import pakistanHash from '../../data/pakistan/names.json'
+import pakistanNewHash from '../../data/pakistan/newNames.json'
+import testingHash from '../../data/testing/names.json'
+
import brazilHash from '../../data/brazil/brazil-names.json'
import irelandHash from '../../data/ireland/constituency_names.json'
+//
const usProjection = (canvasDimensions) => {
return geoAlbersUsa()
@@ -70,6 +82,38 @@ const netherlandsProjection = (canvasDimensions) => {
])
}
+//
+const pakistanProjection = (canvasDimensions) => {
+ return geoMercator()
+ .center([71, 30.2])
+ .scale(canvasDimensions.height * 2)
+ .translate([
+ canvasDimensions.width * 0.5,
+ canvasDimensions.height * 0.5,
+ ])
+}
+
+const pakistanNewProjection = (canvasDimensions) => {
+ return geoMercator()
+ .center([71, 30.2])
+ .scale(canvasDimensions.height * 3)
+ .translate([
+ canvasDimensions.width * 0.5,
+ canvasDimensions.height * 0.5,
+ ])
+}
+
+const testingProjection = (canvasDimensions) => {
+ return geoMercator()
+ .center([71, 30.2])
+ .scale(canvasDimensions.height * 3)
+ .translate([
+ canvasDimensions.width * 0.5,
+ canvasDimensions.height * 0.5,
+ ])
+}
+//
+
const brazilProjection = (canvasDimensions) => {
return geoMercator()
.center([-50, -15])
@@ -99,6 +143,26 @@ class GeographyResource {
geoCodeToName: fipsHash,
projection: usProjection,
},
+ //
+ // {
+ // label: 'Pakistan',
+ // mapResource: new MapResource(pakistanTopoJson, 'boundaries'),
+ // geoCodeToName: pakistanHash,
+ // projection: pakistanProjection,
+ // },
+ // {
+ // label: 'Pakistan New',
+ // mapResource: new MapResource(pakistanNewTopoJson, 'boundaries'),
+ // geoCodeToName: pakistanNewHash,
+ // projection: pakistanNewProjection,
+ // },
+ {
+ label: 'Pakistan',
+ mapResource: new MapResource(testingTopoJson, 'boundaries'),
+ geoCodeToName: testingHash,
+ projection: testingProjection,
+ },
+ //
// {
// label: 'United Kingdom - Constituencies',
// mapResource: new MapResource(ukConstituencyTopoJson, 'constituencies'),
diff --git a/source/resources/MapResource.js b/source/resources/MapResource.js
index d4b631c..1d99fa5 100644
--- a/source/resources/MapResource.js
+++ b/source/resources/MapResource.js
@@ -2,8 +2,24 @@ class MapResource {
constructor(topoJson, objectId) {
this._topoJson = topoJson
this._objectId = objectId
+ //
+ if (!this._topoJson.objects[this._objectId].geometries[0].id) {
+ this.mockIdField();
+ }
+ //
}
+ //
+ mockIdField() {
+ for (let i = 0; i < this._topoJson.objects[this._objectId].geometries.length; i++) {
+ const s = this._topoJson.objects[this._objectId].geometries[i].properties.NA_Cons.split('-');
+ this._topoJson.objects[this._objectId].geometries[i].id = s[1].toString();
+ // this._topoJson.objects[this._objectId].geometries[i].properties.id
+ }
+ console.log(this._topoJson)
+ }
+ //
+
getObjectId() {
return this._objectId
}
diff --git a/webpack.config.js b/webpack.config.js
index f4a5f65..28961b8 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,20 +1,15 @@
var path = require('path')
var webpack = require('webpack')
-const CopyWebpackPlugin = require('copy-webpack-plugin');
module.exports = {
entry: {
javascript: './index.js',
html: './index.html',
- html2: './us-congressional-districts-2018.html'
},
output: {
filename: 'main.js',
path: 'dist',
},
- devServer: {
- disableHostCheck: true,
- },
module: {
preLoaders: [
{
@@ -40,11 +35,6 @@ module.exports = {
test: /\.json$/,
loaders: ['json'],
},
- {
- type: 'javascript/auto',
- test: /tilegrams\/us-individual-states-congressional-districts\/[^.]*\.json$/,
- loader: 'file-loader?name=tilegrams/us-individual-states-congressional-districts/[name].[ext]'
- },
{
test: /\.csv$/,
loaders: ['raw'],
@@ -53,20 +43,12 @@ module.exports = {
test: /\.scss$/,
loaders: ["style", "css", "sass"]
},
- {test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader?mimetype=image/svg+xml&name=[name].[ext]'},
+ {test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader?mimetype=image/svg+xml'},
{test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: "file-loader?mimetype=application/font-woff"},
{test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "file-loader?mimetype=application/font-woff"},
{test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: "file-loader?mimetype=application/octet-stream"},
{test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file-loader"},
- {test: /\.png(\?v=\d+\.\d+\.\d+)?$/, loader: "file-loader?name=[name].[ext]"}
+ {test: /\.png(\?v=\d+\.\d+\.\d+)?$/, loader: "file-loader"}
],
},
- plugins: [
- new CopyWebpackPlugin([
- {
- from: './tilegrams/us-individual-states-congressional-districts/**',
- to: './'
- }
- ])
- ]
}