fixed bug that kept map from rerendering with style changes

Author: justenPalmer

src/model/Msource.js

@@ -13,6 +13,13 @@ export default {
 			if (!source.url) throw new Error('no source.url');
 			if (!source.type) throw new Error('no source.type');
 
+			if (source.url.indexOf('/localhost') !== -1){
+				// check if user is also using localhost
+				if (window.location.indexOf('/localhost') !== -1){
+					return reject('not localhost');
+				}
+			}
+
 			//set key on source
 			key = key || source.url;
 

src/view/Vlayer/VlayerAdd.jsx

@@ -153,6 +153,7 @@ export default class VlayerAdd extends React.Component {
 						label:'Layer ID',
 						value:this.state.id,
 						placeholder:'Unique identifier for layer',
+						inputNoAC:true,
 						controlled:false
 					}} key="id" handle={this.handle}/>
 				</div>

src/view/Vmap/Vmapbox.jsx

@@ -57,18 +57,18 @@ export default class Vmapbox extends React.Component {
 		</div>
 	}
 	componentWillReceiveProps (nextProps){
-		if(!this.state.map) return;
+		if(!this.map) return;
 
 		const {styleJS, handle, match} = nextProps;
 
 		//console.log('map match:',match);
 
-		//console.log('compare:',this.state.styleJS,styleJS);
+		console.log('compare:',this.state.styleJS);
 
-		if (this.state.styleJS.equals(styleJS)) return;
+		if (this.state.styleJS && this.state.styleJS.equals(styleJS)) return;
 		this.setState({styleJS:styleJS});
 
-		//console.log('styleJs:',JSON.stringify(styleJS.toJS()));
+		
 
 		/*
 		const metadata = nextProps.mapStyle.metadata || {}
@@ -79,7 +79,7 @@ export default class Vmapbox extends React.Component {
 		Mstyle.errorsSet();
 
 		try {
-			this.state.map.setStyle(styleJS.toJS(),{diff: true});
+			this.map.setStyle(styleJS.toJS(),{diff: true});
 		} catch(e){
 			//console.error('map style error:',e);
 			Mstyle.errorAdd(e);
@@ -89,7 +89,7 @@ export default class Vmapbox extends React.Component {
 
 	renderPopup (features){
 
-		console.log('render popup:',this);
+		//console.log('render popup:',this);
 
 		const {handle} = this.props;
 
@@ -197,15 +197,6 @@ export default class Vmapbox extends React.Component {
 		});
 
 		this.map = map;
-
-		//this.setState({map:map});
-
-
-
-		//this.setState({map:map});
-
-
-
 		/*
 		const map = new MapboxGl.Map({
 		container: this.container,
@@ -248,7 +239,7 @@ export default class Vmapbox extends React.Component {
 		map.on("data", e => {
 		if(e.dataType !== 'tile') return
 		this.props.onDataChange({
-		  map: this.state.map
+		  map: this.map
 		})
 		})
 		*/

src/view/Vmap/index.jsx

@@ -21,6 +21,8 @@ export default class Vmap extends React.Component {
 	render (){
 		const {handle, match} = this.props;
 
+		console.log('render map!!!');
+
 		//get style
 		switch (this.state.renderer){
 			case 'mapbox':

src/view/Vsource/VsourceAdd.jsx

@@ -33,12 +33,17 @@ export default class VsourceAdd extends React.Component {
 			submit:(e)=>{
 				e.preventDefault();
 
+
+
 				Msource.add({
 					url:this.state.url,
 					type:this.state.type
 				},this.state.name,this.state.makeLayers).then((source)=>{
 					handle.route('source/'+encodeURIComponent(this.state.name));
 				}).catch((e)=>{
+					if (e === 'not localhost'){
+						return this.setState({error:'the source you are adding is running locally and Fresco is not. You must run Fresco locally to be able to connect to this source.'});
+					}
 					console.log('catch error:',e);
 					this.setState({error:''+e});
 				});