update dev branch from Release candidate 1.1

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "opengis",
 	"homepage": "https://opengis.simcoe.ca/public/",
-	"version": "1.0.11",
+	"version": "1.1.0",
 	"private": true,
 	"dependencies": {
 		"array-move": "^2.2.2",

public/manifest.json

@@ -1,15 +1,15 @@
 {
-  "short_name": "County of Simcoe GIS - Interactive Map",
-  "name": "County of Simcoe GIS - Interactive Map",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
+	"short_name": "County of Simcoe GIS - Interactive Map",
+	"name": "County of Simcoe GIS - Interactive Map",
+	"icons": [
+		{
+			"src": "favicon.ico",
+			"sizes": "64x64 32x32 24x24 16x16",
+			"type": "image/x-icon"
+		}
+	],
+	"start_url": ".",
+	"display": "standalone",
+	"theme_color": "#000000",
+	"background_color": "#ffffff"
 }

src/App.js

@@ -15,20 +15,14 @@ import ReactGA from "react-ga";
 import packageJson from "../package.json";
 
 const enableAnalytics = helpers.getURLParameter("ANALYTICS") !== "off";
-if (
-	mainConfig.googleAnalyticsID !== undefined &&
-	mainConfig.googleAnalyticsID !== "" &&
-	enableAnalytics
-) {
+if (mainConfig.googleAnalyticsID !== undefined && mainConfig.googleAnalyticsID !== "" && enableAnalytics) {
 	ReactGA.initialize(mainConfig.googleAnalyticsID);
 	ReactGA.pageview(window.location.pathname + window.location.search);
 }
 
 class App extends Component {
 	setControlPreferences() {
-		const localMapControls = helpers.getItemsFromStorage(
-			"Map Control Settings"
-		);
+		const localMapControls = helpers.getItemsFromStorage("Map Control Settings");
 
 		if (localMapControls !== undefined) window.mapControls = localMapControls;
 		else window.mapControls = mainConfig.controls;
@@ -76,28 +70,15 @@ function MapApp() {
 		helpers.loadConfig(() => {
 			document.title = window.config.title;
 			helpers.addIsLoaded("settings");
-			if (window.config.default_theme !== undefined)
-				window.emitter.emit(
-					"activateSidebarItem",
-					window.config.default_theme,
-					"themes"
-				);
-			if (window.config.default_tool !== undefined)
-				window.emitter.emit(
-					"activateSidebarItem",
-					window.config.default_tool,
-					"tools"
-				);
+			if (window.config.default_theme !== undefined) window.emitter.emit("activateSidebarItem", window.config.default_theme, "themes");
+			if (window.config.default_tool !== undefined) window.emitter.emit("activateSidebarItem", window.config.default_tool, "tools");
 		});
 	}, []);
 
 	return (
 		<div>
 			<div id="portal-root" />
-			<LoadingScreen
-				visible={mapLoading || sidebarLoading || headerLoading}
-				backgroundColor={"#3498db"}
-			/>
+			<LoadingScreen visible={mapLoading || sidebarLoading || headerLoading} backgroundColor={"#3498db"} />
 			<Header mapLoading={mapLoading} sidebarLoading={sidebarLoading} />
 			<Sidebar mapLoading={mapLoading} headerLoading={headerLoading} />
 			<SCMap sidebarLoading={sidebarLoading} headerLoading={headerLoading} />

src/componentTemplate/ThemeComponent.jsx

@@ -15,12 +15,7 @@ class ThemeComponent extends Component {
 
 	render() {
 		return (
-			<PanelComponent
-				onClose={this.onClose}
-				name={this.props.name}
-				helpLink={this.props.helpLink}
-				type="themes"
-			>
+			<PanelComponent onClose={this.onClose} name={this.props.name} helpLink={this.props.helpLink} type="themes">
 				<div>Put your components in here.</div>
 			</PanelComponent>
 		);

src/componentTemplate/ToolComponent.jsx

@@ -15,12 +15,7 @@ class ToolComponent extends Component {
 
 	render() {
 		return (
-			<PanelComponent
-				onClose={this.onClose}
-				name={this.props.name}
-				helpLink={this.props.helpLink}
-				type="tools"
-			>
+			<PanelComponent onClose={this.onClose} name={this.props.name} helpLink={this.props.helpLink} type="tools">
 				<div>Put your components in here.</div>
 			</PanelComponent>
 		);

src/config.json

@@ -259,7 +259,7 @@
 			"name": "211 Community Services",
 			"componentName": "TwoOneOne",
 			"description": "Explore 211 Community Services across the County of Simcoe.",
-			"imageName": "communityServices.png"
+			"imageName": "211communityServices.png"
 		}
 	],
 	"sidebarShortcutParams": [

src/header/Header.css

@@ -10,11 +10,7 @@
 	padding: 0px;
 	z-index: auto;
 	position: absolute;
-	background: linear-gradient(
-		to bottom,
-		rgba(255, 255, 255, 1) 0%,
-		rgba(229, 229, 229, 1) 100%
-	);
+	background: linear-gradient(to bottom, rgba(255, 255, 255, 1) 0%, rgba(229, 229, 229, 1) 100%);
 	display: table;
 }
 

src/header/Header.jsx

@@ -7,17 +7,7 @@ import FloatingMenu, { FloatingMenuItem } from "../helpers/FloatingMenu.jsx";
 import { Item as MenuItem } from "rc-menu";
 import Portal from "../helpers/Portal.jsx";
 
-const feedbackTemplate = (
-	url,
-	xmin,
-	xmax,
-	ymin,
-	ymax,
-	centerx,
-	centery,
-	scale
-) =>
-	`${url}/?xmin=${xmin}&xmax=${xmax}&ymin=${ymin}&ymax=${ymax}&centerx=${centerx}&centery=${centery}&scale=${scale}`;
+const feedbackTemplate = (url, xmin, xmax, ymin, ymax, centerx, centery, scale) => `${url}/?xmin=${xmin}&xmax=${xmax}&ymin=${ymin}&ymax=${ymax}&centerx=${centerx}&centery=${centery}&scale=${scale}`;
 class Header extends Component {
 	constructor(props) {
 		super(props);
@@ -39,8 +29,7 @@ class Header extends Component {
 	burgerButtonHandler() {
 		helpers.waitForLoad("map", Date.now(), 30, () => {
 			// EMIT A CHANGE IN THE SIDEBAR (IN OR OUT)
-			if (window.sidebarOpen)
-				window.emitter.emit("setSidebarVisiblity", "CLOSE");
+			if (window.sidebarOpen) window.emitter.emit("setSidebarVisiblity", "CLOSE");
 			else window.emitter.emit("setSidebarVisiblity", "OPEN");
 
 			helpers.addAppStat("Burger Button", "Click");
@@ -51,17 +40,8 @@ class Header extends Component {
 		var evtClone = Object.assign({}, evt);
 		const menu = (
 			<Portal>
-				<FloatingMenu
-					key={helpers.getUID()}
-					buttonEvent={evtClone}
-					item={this.props.info}
-					onMenuItemClick={this.onMenuItemClick}
-					styleMode="left"
-				>
-					<MenuItem
-						className="sc-floating-menu-toolbox-menu-item"
-						key="sc-floating-menu-login"
-					>
+				<FloatingMenu key={helpers.getUID()} buttonEvent={evtClone} item={this.props.info} onMenuItemClick={this.onMenuItemClick} styleMode="left">
+					<MenuItem className="sc-floating-menu-toolbox-menu-item" key="sc-floating-menu-login">
 						<FloatingMenuItem imageName={"lock.png"} label="Login (Sample)" />
 					</MenuItem>
 				</FloatingMenu>
@@ -90,22 +70,8 @@ class Header extends Component {
 			const ymax = extent[3];
 			const center = window.map.getView().getCenter();
 
-			let feedbackUrl = feedbackTemplate(
-				window.config.feedbackUrl,
-				xmin,
-				xmax,
-				ymin,
-				ymax,
-				center[0],
-				center[1],
-				scale
-			);
-			if (
-				window.config.mapId !== null &&
-				window.config.mapId !== undefined &&
-				window.config.mapId.trim() !== ""
-			)
-				feedbackUrl += "&MAP_ID=" + window.config.mapId;
+			let feedbackUrl = feedbackTemplate(window.config.feedbackUrl, xmin, xmax, ymin, ymax, center[0], center[1], scale);
+			if (window.config.mapId !== null && window.config.mapId !== undefined && window.config.mapId.trim() !== "") feedbackUrl += "&MAP_ID=" + window.config.mapId;
 			helpers.showURLWindow(feedbackUrl, false, "full");
 		});
 	};
@@ -131,29 +97,15 @@ class Header extends Component {
 				</div>
 				<div id="sc-header-bar-logo">
 					<img
-						src={
-							this.state.logoImage === "" ||
-							this.state.logoImage.toString().substring(0, 4).toUpperCase() ===
-								"HTTP"
-								? this.state.logoImage
-								: require("./images/" + this.state.logoImage)
-						}
+						src={this.state.logoImage === "" || this.state.logoImage.toString().substring(0, 4).toUpperCase() === "HTTP" ? this.state.logoImage : require("./images/" + this.state.logoImage)}
 						alt="Header Logo"
 					/>
 				</div>
 				<div id="sc-header-search-container">
 					<Search options={this.props.options} />
 				</div>
-				<div
-					className="sc-header-feedback-container"
-					title="Feedback"
-					onClick={this.onFeedbackClick}
-				>
-					<img
-						style={{ marginTop: "5px" }}
-						src={require("./images/feedback.png")}
-						alt="feedback"
-					/>
+				<div className="sc-header-feedback-container" title="Feedback" onClick={this.onFeedbackClick}>
+					<img style={{ marginTop: "5px" }} src={require("./images/feedback.png")} alt="feedback" />
 					Feedback
 				</div>
 				{/* <div className="sc-header-dot-menu-container" onClick={this.onDotMenuClick}><img className="sc-header-dot-menu-img" src={images['vertical-dot-menu.png']} alt="dots"></img></div> */}

src/header/Search.css

@@ -143,8 +143,7 @@
 		width: 100%;
 		padding-left: 7px;
 		box-shadow: none;
-		background: url(./images/magnify.png) 100% 50% / auto no-repeat scroll
-			padding-box border-box rgb(255, 255, 255);
+		background: url(./images/magnify.png) 100% 50% / auto no-repeat scroll padding-box border-box rgb(255, 255, 255);
 	}
 
 	.sc-search-icon-initial {