@mapcreator/sdk 1.5.9 → 1.5.11

package/dist/adornments/scalebar.d.ts

@@ -1,3 +1,6 @@
-import { Map } from '@mapcreator/maplibre-gl';
 import { JobObjectScalebar } from '../types/jobObject';
-export declare function useScalebar(scalebar: JobObjectScalebar, map: Map, mapScale: number): HTMLElement;
+import { Map } from '@mapcreator/maplibre-gl';
+export declare function useScalebar(scalebar: JobObjectScalebar, map: Map, vapiUrl: string, accessToken: string, mapScale: number): {
+    element: HTMLElement;
+    ready: Promise<void>;
+};

package/dist/controls/webControls.d.ts

@@ -2,4 +2,4 @@ import { JobObjectWebControls } from '../types/jobObject';
 import { InitialPositionInfo } from '../types';
 import { SvgCache } from '../utils/svgHelpers';
 import { Map } from '@mapcreator/maplibre-gl';
-export declare function useWebControls(webControls: JobObjectWebControls, map: Map, svgCache: SvgCache, initialPosition: InitialPositionInfo): HTMLElement;
+export declare function useWebControls(webControls: JobObjectWebControls, map: Map, svgCache: SvgCache, initialPosition: InitialPositionInfo, hasAdornments: boolean): HTMLElement;

package/dist/mapcreator-sdk.js

@@ -35414,28 +35414,32 @@ function ua() {
 }
 //#endregion
 //#region src/controls/webControls.ts
-function da(e, t, n, r) {
-	let i = document.createElement("div");
-	return i.classList.add("web-control", "adornment"), fa(e).forEach((e) => {
-		let a;
-		if (e === "zoomIn") a = Ri(t);
-		else if (e === "zoomOut") a = zi(t);
-		else if (e === "fullscreen") a = ea(t);
-		else if (e === "geolocation") a = Ji(t, n);
-		else if (e === "refresh") a = na(t, r);
-		else if (e === "search") a = new la(t).init();
-		else if (e === "toggleAdornments") a = Fi(t, t.getContainer());
+function da(e, t, n, r, i) {
+	let a = document.createElement("div");
+	return a.classList.add("web-control", "adornment"), fa(e, i).forEach((e) => {
+		let i;
+		if (e === "zoomIn") i = Ri(t);
+		else if (e === "zoomOut") i = zi(t);
+		else if (e === "fullscreen") i = ea(t);
+		else if (e === "geolocation") i = Ji(t, n);
+		else if (e === "refresh") i = na(t, r);
+		else if (e === "search") i = new la(t).init();
+		else if (e === "toggleAdornments") i = Fi(t, t.getContainer());
 		else return;
-		i.appendChild(a);
-	}), i;
+		a.appendChild(i);
+	}), a;
 }
-function fa(e) {
-	let t = e.buttons.flatMap((e) => e === "zoom" ? ["zoomIn", "zoomOut"] : e);
+function fa(e, t) {
+	let n = e.buttons.flatMap((e) => e === "zoom" ? ["zoomIn", "zoomOut"] : e);
 	if (ua()) {
-		let e = t.filter((e) => e !== "zoomIn" && e !== "zoomOut"), n = e[0] === "search" ? 1 : 0;
-		return e.splice(n, 0, "toggleAdornments"), e;
+		let e = n.filter((e) => e !== "zoomIn" && e !== "zoomOut");
+		if (t) {
+			let t = e[0] === "search" ? 1 : 0;
+			e.splice(t, 0, "toggleAdornments");
+		}
+		return e;
 	}
-	return t;
+	return n;
 }
 //#endregion
 //#region src/adornments/copyright.ts
@@ -38483,121 +38487,128 @@ var Dl = {
 	foot: "ft",
 	nauticalMile: "nm"
 };
-function Ol(e, t, n) {
-	let r = document.createElement("div");
-	return r.className = "adornment", r.innerHTML = kl(t, e, n), t.on("move", () => {
-		r.innerHTML = kl(t, e, n);
-	}), r;
+function Ol(e, t, n, r, i) {
+	let a = document.createElement("div");
+	a.className = "adornment";
+	let o = "ArialMT";
+	return {
+		element: a,
+		ready: Lr(e.font ?? o, n, r).then(() => {
+			a.innerHTML = kl(t, e, i, o), t.on("move", () => {
+				a.innerHTML = kl(t, e, i, o);
+			});
+		})
+	};
 }
-function kl(e, t, n) {
-	let { maxWidth: r = 100, fontSize: i = 8, font: a = "Arial, sans-serif", color: o = "#000000", unit: s = "metric_and_imperial" } = t, c = e.getCenter(), l = e.projectWithScaleCorrection(c), u = w(c, e.unprojectWithScaleCorrection([l.x + r, l.y])), d = Object.fromEntries(Object.entries(Dl).map(([e, t]) => {
-		let n = j("meter", e, u), r = Tl(n) || 0;
+function kl(e, t, n, r) {
+	let { maxWidth: i = 100, fontSize: a = 8, font: o = r, color: s = "#000000", unit: c = "metric_and_imperial" } = t, l = e.getCenter(), u = e.projectWithScaleCorrection(l), d = w(l, e.unprojectWithScaleCorrection([u.x + i, u.y])), f = Object.fromEntries(Object.entries(Dl).map(([e, t]) => {
+		let n = j("meter", e, d), r = Tl(n) || 0;
 		return [e, {
 			value: n,
 			ratio: n ? r / n : 0,
 			humanized: r < 1 ? `${wl(r).join("/")} ${t}` : `${r} ${t}`
 		}];
-	})), f = d.meter.value > 1e3 ? d.kilometer : d.meter, p = d.foot.value > 5280 ? d.mile : d.foot, m = {
-		imperial: p,
-		metric: f,
-		nautical: d.nauticalMile
-	}, h = s === "metric_and_imperial" ? void 0 : m[s], g = {
-		metric: Math.round(r * f.ratio),
-		imperial: Math.round(r * p.ratio)
-	}, _ = s === "metric_and_imperial" ? Math.max(g.metric, g.imperial) : Math.round(r * (h?.ratio ?? 0)), v = i + 7;
-	if (s === "metric_and_imperial") {
-		let e = v + i * 2;
+	})), p = f.meter.value > 1e3 ? f.kilometer : f.meter, m = f.foot.value > 5280 ? f.mile : f.foot, h = {
+		imperial: m,
+		metric: p,
+		nautical: f.nauticalMile
+	}, g = c === "metric_and_imperial" ? void 0 : h[c], _ = {
+		metric: Math.round(i * p.ratio),
+		imperial: Math.round(i * m.ratio)
+	}, v = c === "metric_and_imperial" ? Math.max(_.metric, _.imperial) : Math.round(i * (g?.ratio ?? 0)), y = a + 7;
+	if (c === "metric_and_imperial") {
+		let e = y + a * 2;
 		return `
       <svg
         class="adornment-svg"
         xmlns="http://www.w3.org/2000/svg"
-        width="${_ * n}"
+        width="${v * n}"
         height="${e * n}"
-        viewBox="0 0 ${_} ${e}"
+        viewBox="0 0 ${v} ${e}"
       >
         <line
           x1="0"
-          y1="${v - .5}"
-          x2="${_}"
-          y2="${v - .5}"
-          stroke="${o}"
+          y1="${y - .5}"
+          x2="${v}"
+          y2="${y - .5}"
+          stroke="${s}"
           stroke-width="1"
         />
         <line
           x1="0.5"
-          y1="${v - 5}"
+          y1="${y - 5}"
           x2="0.5"
-          y2="${v + 5}"
-          stroke="${o}"
+          y2="${y + 5}"
+          stroke="${s}"
           stroke-width="1"
         />
         <line
-          x1="${g.imperial - .5}"
-          y1="${v - 5}"
-          x2="${g.imperial - .5}"
-          y2="${v}"
-          stroke="${o}"
+          x1="${_.imperial - .5}"
+          y1="${y - 5}"
+          x2="${_.imperial - .5}"
+          y2="${y}"
+          stroke="${s}"
           stroke-width="1"
         />
         <line
-          x1="${g.metric - .5}"
-          y1="${v}"
-          x2="${g.metric - .5}"
-          y2="${v + 5}"
-          stroke="${o}"
+          x1="${_.metric - .5}"
+          y1="${y}"
+          x2="${_.metric - .5}"
+          y2="${y + 5}"
+          stroke="${s}"
           stroke-width="1"
         />
         <text
           x="0"
-          y="${v + 7 + i}"
-          font-size="${i}px"
-          font-family="${a}"
+          y="${y + 7 + a}"
+          font-size="${a}px"
+          font-family="${o}"
           font-weight="bold"
-          fill="${o}"
+          fill="${s}"
           text-anchor="start"
         >
           0
         </text>
         <text
-          x="${g.imperial}"
-          y="${v - 7}"
-          font-size="${i}px"
-          font-family="${a}"
+          x="${_.imperial}"
+          y="${y - 7}"
+          font-size="${a}px"
+          font-family="${o}"
           font-weight="bold"
-          fill="${o}"
+          fill="${s}"
           text-anchor="end"
         >
-          ${p.humanized}
+          ${m.humanized}
         </text>
         <text
-          x="${g.metric}"
-          y="${v + 7 + i}"
-          font-size="${i}px"
-          font-family="${a}"
+          x="${_.metric}"
+          y="${y + 7 + a}"
+          font-size="${a}px"
+          font-family="${o}"
           font-weight="bold"
-          fill="${o}"
+          fill="${s}"
           text-anchor="end"
         >
-          ${f.humanized}
+          ${p.humanized}
         </text>
       </svg>
     `;
 	}
-	let y = v + i + 5;
+	let b = y + a + 5;
 	return `
     <svg
       class="adornment-svg"
       xmlns="http://www.w3.org/2000/svg"
-      width="${_ * n}"
-      height="${y * n}"
-      viewBox="0 0 ${_} ${y}"
+      width="${v * n}"
+      height="${b * n}"
+      viewBox="0 0 ${v} ${b}"
     >
       <line
         x1="0"
         y1="4.5"
-        x2="${_}"
+        x2="${v}"
         y2="4.5"
-        stroke="${o}"
+        stroke="${s}"
         stroke-width="1"
       />
       <line
@@ -38605,38 +38616,38 @@ function kl(e, t, n) {
         y1="0"
         x2="0.5"
         y2="10"
-        stroke="${o}"
+        stroke="${s}"
         stroke-width="1"
       />
       <line
-        x1="${_ - .5}"
+        x1="${v - .5}"
         y1="0"
-        x2="${_ - .5}"
+        x2="${v - .5}"
         y2="10"
-        stroke="${o}"
+        stroke="${s}"
         stroke-width="1"
       />
       <text
         x="0"
-        y="${i + 12}"
-        font-size="${i}px"
-        font-family="${a}"
+        y="${a + 12}"
+        font-size="${a}px"
+        font-family="${o}"
         font-weight="bold"
-        fill="${o}"
+        fill="${s}"
         text-anchor="start"
       >
         0
       </text>
       <text
-        x="${_}"
-        y="${i + 12}"
-        font-size="${i}px"
-        font-family="${a}"
+        x="${v}"
+        y="${a + 12}"
+        font-size="${a}px"
+        font-family="${o}"
         font-weight="bold"
-        fill="${o}"
+        fill="${s}"
         text-anchor="end"
       >
-        ${h?.humanized ?? ""}
+        ${g?.humanized ?? ""}
       </text>
     </svg>
   `;
@@ -38686,8 +38697,8 @@ var Ml = [
 async function Pl(e, t, n, r, i, a, o, s, c, l) {
 	let u = [...e.adornments ?? []];
 	Fl(n, t, c, l);
-	let d = [];
-	ua() && !u.some((e) => e.type === "webControls") && u.unshift({
+	let d = [], f = u.some((e) => !["copyright", "webControls"].includes(e.type));
+	ua() && f && !u.some((e) => e.type === "webControls") && u.unshift({
 		type: "webControls",
 		id: "web_controls",
 		name: "Web controls",
@@ -38696,10 +38707,12 @@ async function Pl(e, t, n, r, i, a, o, s, c, l) {
 		buttons: []
 	}), u.forEach((t) => {
 		if (t.type === "custom") Ll(de(t, c), t.position, t.stacking);
-		else if (t.type === "scalebar") Ll(Ol(t, n, c), t.position, t.stacking);
 		else if (t.type === "northArrow") Ll(ji(t, n, c), t.position, t.stacking);
-		else if (t.type === "webControls" && t.buttons && l !== "video") Ll(da(t, n, r, i), t.position, t.stacking);
-		else if (t.type === "insetMap") {
+		else if (t.type === "webControls" && t.buttons && l !== "video") Ll(da(t, n, r, i, f), t.position, t.stacking);
+		else if (t.type === "scalebar") {
+			let { element: e, ready: r } = Ol(t, n, a, s, c);
+			Ll(e, t.position, t.stacking), d.push(r);
+		} else if (t.type === "insetMap") {
 			let { element: e, ready: r } = vl(t, n, o, c);
 			Ll(e, t.position, t.stacking), d.push(r);
 		} else if (t.type === "heading") {