Merge pull request #59 from go-spatial/source-polish

Source polish
go-spatial · Apr 9, 2019 · 632b03f · 632b03f
2 parents 0736590 + 2e91265
commit 632b03f
Show file tree

Hide file tree

Showing 21 changed files with 211 additions and 252 deletions.
diff --git a/src/model/Msource.js b/src/model/Msource.js
@@ -113,6 +113,16 @@ export default {
 
 			Mstyle.save();
 
+			const now = new Date().getTime() // set the reload stamp to now
+
+			Store.dispatch({
+				type:'SOURCE_RELOAD',
+				payload:{
+					sourceKey:key,
+					when:now
+				}
+			});
+
 			return resolve();
 		});
 	},

diff --git a/src/model/Mstyle.js b/src/model/Mstyle.js
@@ -164,13 +164,13 @@ const Mstyle = {
 
 	errorAdd:function(error){
 		return new Promise((resolve,reject)=>{
-
 			const key = MapboxError.getKey(error);
 			const message = MapboxError.getMessage(error);
 
 			const err = {
 				key:key,
-				message:message
+				message:message,
+				error:error,
 			};
 
 			Store.dispatch({

diff --git a/src/page/Phome.jsx b/src/page/Phome.jsx
@@ -8,7 +8,7 @@ import Vnav from '../view/Vnav';
 import VstyleAdd from '../view/Vstyles/VstyleAdd';
 import Vstyles from '../view/Vstyles';
 
-import {NavLink, Link, Route, Switch} from 'react-router-dom';
+import {Link, Route, Switch} from 'react-router-dom';
 
 
 const mapStoreToProps = (store)=>{

diff --git a/src/page/Pstyle.jsx b/src/page/Pstyle.jsx
@@ -8,14 +8,11 @@ import Valert from '../view/Valert';
 import Vmap from '../view/Vmap';
 import Vstyle from '../view/Vstyle';
 
-import Vpanel from '../view/Vpanel';
-import Mpanel from '../model/Mpanel';
-
 const mapStoreToProps = (store)=>{
 	return {
 		style:store.style,
 		error:store.styleError
-	} // props
+	}
 };
 const mapDispatchToProps = {};
 

diff --git a/src/page/Pstyles.jsx b/src/page/Pstyles.jsx
@@ -8,7 +8,7 @@ import Vnav from '../view/Vnav';
 import VstyleAdd from '../view/Vstyles/VstyleAdd';
 import Vstyles from '../view/Vstyles';
 
-import {NavLink, Link, Route, Switch} from 'react-router-dom';
+import {Link, Route, Switch} from 'react-router-dom';
 
 
 const mapStoreToProps = (store)=>{

diff --git a/src/reducer/Rstyle.js b/src/reducer/Rstyle.js
@@ -2,7 +2,8 @@ import {Map, List, fromJS} from 'immutable';
 
 const iState = Map({
 	loaded:false,
-	rec:undefined
+	rec:undefined,
+	rebuildMap:null,
 });
 
 export default function(state = iState, action){
@@ -98,7 +99,6 @@ export default function(state = iState, action){
 				return layer.get('id') === action.layerId;
 			});
 			if (ind === -1) throw new Error('layer matching layerId not found');
-			const val = fromJS(action.payload);
 			const style = state.removeIn(['rec','layers',ind, ...action.prop]);
 			return setUpdated(style);
 		}
@@ -107,6 +107,10 @@ export default function(state = iState, action){
 			const style = state.setIn(['rec','sources',action.key],source);
 			return setUpdated(style);
 		}
+		case 'SOURCE_RELOAD':{
+			const style = state.setIn(['rebuildMap'], new Date().getTime())
+			return style
+		}
 		default:
 			return state;
 	}

diff --git a/src/reducer/RstyleError.js b/src/reducer/RstyleError.js
@@ -1,19 +1,17 @@
-import {Map, List, fromJS} from 'immutable';
+import {Map} from 'immutable';
 
 const iState = Map({});
 
 export default function(state = iState, action){
 	switch (action.type){
 		case 'STYLE_ERROR_DEFINE':{
 			let errors = Map();
-			//console.log('STYLE_ERROR_DEFINE',action.payload);
 			action.payload.forEach((error)=>{
 				errors = errors.setIn(error.key,error.message);
 			});
 			return errors;
 		}
 		case 'STYLE_ERROR_ADD':{
-			//console.log('STYLE_ERROR_DEFINE',action.payload);
 			return state.setIn(action.payload.key,action.payload.message);
 		}
 		default:

diff --git a/src/utility/MapboxError.js b/src/utility/MapboxError.js
@@ -8,8 +8,8 @@ export default {
 		}
 		*/
 
-		if (!error || !error.message || error.message.indexOf(':') === -1) return ['general'];
-		const prefix = error.message.split(':')[0];
+		if (!error || !error.message || error.message.indexOf(': ') === -1) return ['general'];
+		const prefix = error.message.split(': ')[0];
 		const parts = prefix.split('.');
 		let key = [];	
 		parts.forEach((part)=>{
@@ -30,7 +30,7 @@ export default {
 		if (!error) return;
 		if (!error.message && error.stack) return error.stack;
 		if (!error.message && !error.stack) return 'unidentified mapbox error';
-		if (error.message.indexOf(':') === -1) return error.message;
-		return error.message.split(':')[1];
+		if (error.message.indexOf(': ') === -1) return error.message;
+		return error.message.split(': ')[1];
 	}
 };
diff --git a/src/view/Vcode/index.jsx b/src/view/Vcode/index.jsx
@@ -3,7 +3,7 @@ import React from 'react';
 import Mstyle from '../../model/Mstyle';
 import Vfield from '../Vfield';
 
-export default class Vsources extends React.Component {
+export default class Vcode extends React.Component {
 	constructor(props) {
 		super(props);
 		this.state = {};
@@ -25,8 +25,6 @@ export default class Vsources extends React.Component {
 
 		const maxContentH = window.innerHeight - 44;
 
-		console.log('code render errs:',errors);
-
 		const field = {
 			value:Mstyle.getMapStyle(),
 			error:errors,

diff --git a/src/view/Vconfig/index.jsx b/src/view/Vconfig/index.jsx
@@ -11,13 +11,6 @@ export default class Vconfig extends React.Component {
 		config: PropTypes.object
 	}
 
-	constructor(props) {
-		super(props);
-		const {} = props;
-
-
-	}
-
 	render (){
 		const {config, error, handle} = this.props;
 

diff --git a/src/view/Vfeature/index.jsx b/src/view/Vfeature/index.jsx
@@ -14,16 +14,16 @@ export default class Vfeature extends React.Component {
 	}
 
 	render (){
-		const {features, handle} = this.props;
-
-		// get property values
+		const {features} = this.props;
 
 		let cols = ['id'];
 		features.map((feature)=>{
-			if (!feature.properties) return;
+			if (!feature.properties) return null;
 			Object.keys(feature.properties).map((i)=>{
 				if (cols.indexOf(i) === -1) cols.push(i);
+				return null;
 			});
+			return null;
 		});
 
 		let ids = [];
@@ -36,7 +36,6 @@ export default class Vfeature extends React.Component {
 			return false;
 		});
 
-
 		return <table className="table font-sm table-sm">
 			<thead>
 				<tr>
@@ -58,20 +57,5 @@ export default class Vfeature extends React.Component {
 			</tbody>
 
 		</table>
-
-		/*
-			
-			{features.map((feature)=>{
-
-				console.log('feature:',feature);
-
-				return <li key={feature.id} onClick={()=>{this.handle.featureClick(feature);}}><a href="javascript://">
-					{Object.keys(feature.properties).map((i)=>{
-						return i+': '+feature.properties[i];
-					})}
-				</a></li>
-			})}
-
-		*/
 	}
 };
diff --git a/src/view/Vfield/VfieldAC.jsx b/src/view/Vfield/VfieldAC.jsx
@@ -12,7 +12,6 @@ export default class VfieldAC extends React.Component {
 			name: PropTypes.string.isRequired,
 			value: PropTypes.string,
 			placeholder: PropTypes.string,
-			helper: PropTypes.string,
 			error: PropTypes.string,
 			options: PropTypes.array,
 			autoFocus: PropTypes.boolean,
@@ -38,8 +37,6 @@ export default class VfieldAC extends React.Component {
 			this.state.value = field.value;
 		}
 
-		//console.log('AC handle:',handle);
-
 		this.handle = {
 			inputChange:(e)=>{
 				this.setState({inputValue: e.target.value});
@@ -102,7 +99,6 @@ export default class VfieldAC extends React.Component {
 				this.handle.change(value);
 			},
 			liClick:(value)=>{
-				console.log('li click:',value);
 				this.handle.select(value);
 			},
 			cancel:()=>{
@@ -124,7 +120,6 @@ export default class VfieldAC extends React.Component {
 				if (handle.selectedClick) handle.selectedClick();
 			},
 			selectedKeyUp:(e)=>{
-				console.log('selected keyUp',e);
 				/*
 				if (e.key === 'ArrowDown'){
 					this.props.handle.focusNext();
@@ -175,23 +170,24 @@ export default class VfieldAC extends React.Component {
 	}
 
 	render (){
-		const {field, handle} = this.props;
+		const {field} = this.props;
 		const value = field.controlled ? this.state.value : field.value;
 
-		//console.log('handle change:',value);
 		if (value !== null && value.length > 0 && (!this.state.mode || this.state.mode === 'view')){
 
 			//check if value is valid option, if not show error
+			/*
 			let found = false;
 			for (let i=0,len=field.options.length;i<len;i++){
 				let option = field.options[i];
 				if (option.value === value){
 					found = true;
 				}
 			}
-
+			*/
 			let error = null; //(!found)? 'expression not found': null; 
 
+
 			return <div className="form-group mb-0 position-relative">
 				{field.label && <label className="mb-0">{field.label}</label>}
 				{field.icon && <i className="material-icons md-18">{field.icon}</i>}

diff --git a/src/view/Vfield/VfieldColor.jsx b/src/view/Vfield/VfieldColor.jsx
@@ -16,7 +16,6 @@ export default class VfieldColor extends React.Component {
 			name: PropTypes.string.isRequired,
 			value: PropTypes.string,
 			placeholder: PropTypes.string,
-			helper: PropTypes.string,
 			error: PropTypes.string,
 			options: PropTypes.array,
 			autoFocus: PropTypes.boolean
@@ -85,8 +84,6 @@ export default class VfieldColor extends React.Component {
 				}
 			},
 			colorSet:(color)=>{
-				console.log('color:',color);
-
 				let value;
 				switch(color.source){
 					case 'rgb':
@@ -123,7 +120,7 @@ export default class VfieldColor extends React.Component {
 	}
 
 	render (){
-		const {field, handle, error} = this.props;
+		const {field, error} = this.props;
 		const value = field.controlled ? this.state.value : field.value || '';
 
 		const colors = MaterialColor.getAll();

diff --git a/src/view/Vfield/VfieldFile.jsx b/src/view/Vfield/VfieldFile.jsx
@@ -11,7 +11,6 @@ export default class VfieldFile extends React.Component {
 			name: PropTypes.string.isRequired,
 			value: PropTypes.object,
 			placeholder: PropTypes.string,
-			helper: PropTypes.string,
 			error: PropTypes.string
 		}),
 		handle: PropTypes.object
@@ -30,7 +29,6 @@ export default class VfieldFile extends React.Component {
 		this.handle = {
 			change:(e)=>{
 				const file = e.target.files[0];
-				const name = e.target.name;
 				if (controlled){
 					this.setState({value:file});
 				}

diff --git a/src/view/Vlayer/VlayerEdit.jsx b/src/view/Vlayer/VlayerEdit.jsx
@@ -8,7 +8,6 @@ import VlayerEditor from './VlayerEditor';
 import VlayerDelete from './VlayerDelete';
 
 import Mlayer from '../../model/Mlayer';
-import Mstyle from '../../model/Mstyle';
 
 export default class VlayerEdit extends React.Component {
 
@@ -83,10 +82,6 @@ export default class VlayerEdit extends React.Component {
 
 		const layerError = error.getIn(['layers',Mlayer.getInd(this.id)]);
 
-		//console.log('layer err:',error);
-
-		// change map mode to show_hidden source layers
-
 		if (layer === undefined){
 			return <Valert message="no layer found"/>;
 		}
@@ -99,7 +94,9 @@ export default class VlayerEdit extends React.Component {
 			case 'edit':
 				section = <VlayerEditor key={this.id} handle={handle} error={layerError} layer={layer}/>;
 				break;
-
+			default:
+				section = <VlayerEditor key={this.id} handle={handle} error={layerError} layer={layer}/>;
+				break;
 		}
 
 		switch (this.state.modal){

diff --git a/src/view/Vlayer/VlayerGroup/VlayerGroupSettings.jsx b/src/view/Vlayer/VlayerGroup/VlayerGroupSettings.jsx
@@ -7,7 +7,6 @@ import Vproperty from '../../Vproperty';
 import VpropertyAdd from '../../Vproperty/VpropertyAdd';
 
 import Mlayer from '../../../model/Mlayer';
-import Msource from '../../../model/Msource';
 
 export default class VlayerGroupSettings extends React.Component {
 	static propTypes = {
@@ -22,7 +21,6 @@ export default class VlayerGroupSettings extends React.Component {
 
 		this.handle = {
 			change:(field)=>{
-				console.log('change:',field);
 				Mlayer.setIn(layer.get('id'),[field.name],field.value);
 			},
 			focus:handle.focus
@@ -36,8 +34,6 @@ export default class VlayerGroupSettings extends React.Component {
 	render (){
 		const {layer, handle, focus, error} = this.props;
 
-		const layerId = layer.get('id');
-
 		const spec = styleSpec.latest.layer;
 
 		let addSpec = {
@@ -60,7 +56,7 @@ export default class VlayerGroupSettings extends React.Component {
 
 		return <div className="">
 			{layer.keySeq().map((key)=>{
-				if (!addSpec[key]) return;
+				if (!addSpec[key]) return <div/>;
 
 				return <Vproperty key={key} property={{
 					name:key,