added maps to preferences

src/client/app/components/admin/PreferencesComponent.tsx

@@ -117,6 +117,19 @@ class PreferencesComponent extends React.Component<PreferencesPropsWithIntl, {}>
 							<FormattedMessage id='compare'/>
 						</label>
 					</div>
+					<div className='radio'>
+						<label>
+							<input
+								type='radio'
+								name='chartTypes'
+								style={{marginRight: '10px'}}
+								value={ChartTypes.map}
+								onChange={this.handleDefaultChartToRenderChange}
+								checked={this.props.defaultChartToRender === ChartTypes.map}
+							/>
+							<FormattedMessage id='map'/>
+						</label>
+					</div>
 				</div>
 				<div className='checkbox'>
 					<p style={labelStyle}>

src/server/migrations/0.5.0-0.6.0/sql/meter/add_gps_column.sql

@@ -3,4 +3,4 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ALTER TABLE meters
-	ADD COLUMN IF NOT EXISTS gps POINT DEFAULT NULL;
+	ADD COLUMN IF NOT EXISTS gps POINT DEFAULT NULL;

src/server/migrations/0.5.0-0.6.0/sql/meter/add_identifier_column.sql

@@ -5,4 +5,4 @@
 ALTER TABLE meters
 	ADD COLUMN IF NOT EXISTS identifier TEXT;
 
-UPDATE meters SET identifier=name WHERE identifier IS NULL or identifier='';
+UPDATE meters SET identifier=name WHERE identifier IS NULL or identifier='';

src/server/migrations/0.7.0-0.7.1/index.js

@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const database = require('../../models/database');
+const sqlFile = database.sqlFile;
+
+module.exports = {
+	fromVersion: '0.7.0',
+	toVersion: '0.7.1',
+	up: async db => {
+		await db.none(sqlFile('../migrations/0.7.0-0.7.1/sql/preferences/alter_preferences_type.sql'));
+	}
+};

src/server/migrations/0.7.0-0.7.1/sql/preferences/alter_preferences_type.sql

@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+-- See 0.6.0-0.7.0/add_meter_type.sql for more information on this migration.
+
+-- Move the currently named type to a temporary name.
+ALTER TYPE graph_type RENAME TO graph_type_temp;
+-- Create the type desired with new value, 'other' in this case but need to include old ones.
+CREATE TYPE graph_type as enum ('line', 'bar', 'compare', 'map');
+-- Change the column in meters to use the new type with the current rows.
+ALTER TABLE preferences ALTER COLUMN default_chart_to_render TYPE graph_type USING default_chart_to_render::text::graph_type;
+-- Get rid of the old, temporary type that no longer needed.
+DROP TYPE graph_type_temp;

src/server/migrations/registerMigration.js

@@ -10,7 +10,8 @@ const migrations = [
 	//require('./0.2.0-0.3.0-Template/indexTemplate'),
 	require('./0.3.0-0.5.0'),
 	require('./0.5.0-0.6.0'),
-	require('./0.6.0-0.7.0')
+	require('./0.6.0-0.7.0'),
+	require('./0.7.0-0.7.1')
 	/* eslint-disable global-require */
 ];
 

src/server/sql/preferences/create_graph_types_enum.sql

@@ -5,7 +5,7 @@
 -- This should avoid an error when the type already exists. This is an issue since
 -- the OED install stops the creation of database items after this.
 DO $$ BEGIN
-    CREATE TYPE graph_type AS ENUM('line', 'bar', 'compare');
+    CREATE TYPE graph_type AS ENUM('line', 'bar', 'compare', 'map');
 EXCEPTION
     WHEN duplicate_object THEN null;
 END $$;