Hotfix/1.1.x

package.json

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

src/helpers/drawingHelpers.js

@@ -46,7 +46,7 @@ export function getFeatureById(id) {
 				.getSource()
 				.getFeatures()
 				.forEach((feat) => {
-					if (feat.getProperties().id === id) feature = feat;
+					if (feat.get("id") === id) feature = feat;
 					return;
 				});
 		}

src/map/Identify.css

@@ -132,3 +132,9 @@
 	font-size: 9pt;
 	color: dimgray;
 }
+
+.sc-identify-add-my-map {
+	font-size: 9pt;
+	color: dimgray;
+	padding-left: 65%;
+}

src/map/Identify.jsx

@@ -13,6 +13,7 @@ import { Circle as CircleStyle, Fill, Stroke, Style } from "ol/style.js";
 import useIframeContentHeight from "react-use-iframe-content-height";
 import Geometry from "ol/geom/Geometry";
 import { useEffect } from "react";
+import GeometryType from "ol/geom/GeometryType";
 
 class Identify extends Component {
 	constructor(props) {
@@ -86,29 +87,43 @@ class Identify extends Component {
 								const extent = window.map.getView().calculateExtent();
 								wfsUrl = wfsUrl.replace("#GEOMETRY#", geometry.flatCoordinates).replace("#TOLERANCE#", 3).replace("#EXTENT#", extent.join(",")).replace("#RESOLUTION#", arcgisResolution);
 							} else {
-								wfsUrl += "INTERSECTS(geom," + wktString + ")";
+								if (geometry.getType() === "MultiPolygon") {
+									let intersectQuery = [];
+									geometry.getPolygons().forEach((poly) => {
+										const tmpFeature = new Feature(poly);
+										const tmpWKTString = helpers.getWKTStringFromFeature(tmpFeature);
+										intersectQuery.push("INTERSECTS(geom," + tmpWKTString + ")");
+									});
+									wfsUrl += intersectQuery.join(" OR ");
+								} else {
+									wfsUrl += "INTERSECTS(geom," + wktString + ")";
+								}
 							}
 							// QUERY USING WFS
 							// eslint-disable-next-line
-							helpers.getJSON(wfsUrl, (result) => {
-								const featureList = isArcGISLayer ? LayerHelpers.parseESRIIdentify(result) : new GeoJSON().readFeatures(result);
-								if (featureList.length > 0) {
-									if (displayName === "" || displayName === undefined) displayName = this.getDisplayNameFromFeature(featureList[0]);
-									let features = [];
-									featureList.forEach((feature) => {
-										features.push(feature);
-									});
-									if (features.length > 0)
-										layerList.push({
-											name: name,
-											features: features,
-											displayName: displayName,
-											type: type,
-											minScale: minScale,
+							if (wfsUrl.length > 8000) {
+								helpers.showMessage("Geometry too complex", "The geometry you are trying to use is too complex to identify.", helpers.messageColors.red);
+							} else {
+								helpers.getJSON(wfsUrl, (result) => {
+									const featureList = isArcGISLayer ? LayerHelpers.parseESRIIdentify(result) : new GeoJSON().readFeatures(result);
+									if (featureList.length > 0) {
+										if (displayName === "" || displayName === undefined) displayName = this.getDisplayNameFromFeature(featureList[0]);
+										let features = [];
+										featureList.forEach((feature) => {
+											features.push(feature);
 										});
-									this.setState({ layers: layerList });
-								}
-							});
+										if (features.length > 0)
+											layerList.push({
+												name: name,
+												features: features,
+												displayName: displayName,
+												type: type,
+												minScale: minScale,
+											});
+										this.setState({ layers: layerList });
+									}
+								});
+							}
 						} else {
 							let infoFormat = layer.get("INFO_FORMAT");
 							//console.log(infoFormat);
@@ -409,6 +424,10 @@ const FeatureItem = (props) => {
 	const [open, setOpen] = useState(false);
 	const [excludeIdentifyTitleName, setExcludeIdentifyTitleName] = useState(false);
 	let { feature, displayName, html_url, identifyTitleColumn, identifyIdColumn } = props;
+
+	const onMyMapsClick = (feature, featureName) => {
+		window.emitter.emit("addMyMapsFeature", feature, featureName);
+	};
 	useEffect(() => {
 		helpers.waitForLoad("settings", Date.now(), 30, () => setExcludeIdentifyTitleName(window.config.excludeIdentifyTitleName));
 	}, []);
@@ -470,8 +489,14 @@ const FeatureItem = (props) => {
 				) : (
 					""
 				)}
+				<div className={"sc-identify-add-my-map"}>
+					[&nbsp;
+					<span className="sc-fakeLink " onClick={() => onMyMapsClick(feature, featureName)}>
+						Add to My Maps
+					</span>
+					&nbsp;]
+				</div>
 			</div>
-
 			<div className={open ? "sc-identify-feature-content" : "sc-hidden"}>
 				<IFrame key={helpers.getUID()} src={html_url} filter={cql_filter} />
 				{cql_filter === "" ? helpers.FeatureContent({ feature: feature }) : ""}

src/sidebar/components/tools/coordinates/CoordinatesSubComponents.jsx

@@ -77,11 +77,11 @@ export const CoordinateActions = (props) => {
 		<div className="sc-coordinates-row">
 			<label>&nbsp;</label>[{" "}
 			<span className="sc-fakeLink" onClick={props.onZoomClick}>
-				zoom
+				Zoom
 			</span>{" "}
 			] [{" "}
 			<span className="sc-fakeLink" onClick={props.onMyMapsClick}>
-				add to my Maps
+				Add to My Maps
 			</span>{" "}
 			]
 		</div>

src/sidebar/components/tools/settings/Settings.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import "./Settings.css";
-import { ClearLocalStorageButton } from "./SettingsComponents.jsx";
+import { ClearLocalStorageButton, ClearLocalStorageButtonGrouped } from "./SettingsComponents.jsx";
 import * as helpers from "../../../../helpers/helpers";
 import PanelComponent from "../../../PanelComponent";
 import settingsConfig from "./config.json";
@@ -270,9 +270,22 @@ class Settings extends Component {
 								</button>
 							</div>
 							<div className="sc-settings-divider" />
-							{Object.keys(localStorage).map((key) => (
-								<ClearLocalStorageButton key={helpers.getUID()} storageKey={key} clearLocalData={this.clearLocalData} />
-							))}
+							{Object.keys(localStorage)
+								.filter((key) => {
+									return key.indexOf("login.microsoftonline.com") === -1;
+								})
+								.map((key) => (
+									<ClearLocalStorageButton key={helpers.getUID()} storageKey={key} clearLocalData={this.clearLocalData} />
+								))}
+
+							<ClearLocalStorageButtonGrouped
+								key={helpers.getUID()}
+								name={"Login Info"}
+								storageKeys={Object.keys(localStorage).filter((key) => {
+									return key.indexOf("login.microsoftonline.com") !== -1;
+								})}
+								clearLocalData={this.clearLocalData}
+							/>
 						</div>
 
 						<div className="sc-container sc-settings-floatbottom" />

src/sidebar/components/tools/settings/SettingsComponents.jsx

@@ -1,5 +1,27 @@
 import React from "react";
 
+export const ClearLocalStorageButtonGrouped = (props) => {
+	if (!props.storageKeys || props.storageKeys.length === 0) return <div />;
+	return (
+		<div className="sc-settings-row sc-arrow">
+			<button
+				name={"clear-" + props.name}
+				title={"Clear items for " + props.name}
+				className="sc-button"
+				onClick={() => {
+					props.storageKeys.forEach((storageKey) => {
+						props.clearLocalData(storageKey);
+					});
+				}}
+				style={{ maxWidth: "315px" }}
+			>
+				{"Clear items in " + props.name}
+			</button>
+			<div className="sc-settings-divider" />
+		</div>
+	);
+};
+
 export const ClearLocalStorageButton = (props) => {
 	if (props.storageKey === undefined) return <div />;
 	return (