Merge from master

origo-map · Oct 2, 2023 · ab03f64 · ab03f64
1 parent a632004
commit ab03f64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/controls/print/print-settings.template.js b/src/controls/print/print-settings.template.js
@@ -52,7 +52,7 @@ export default function printTemplate({
     </div>
     <div class="padding-top-large"></div>
     <div class="flex padding-right-small">
-      <div class="grow text-normal">Visa legend</div>
+      <div class="grow text-normal">Visa teckenförklaring</div>
       ${printLegendControl.render()}
     </div>
     <div class="padding-bottom-large">

diff --git a/src/maputils.js b/src/maputils.js
@@ -45,7 +45,9 @@ const maputils = {
   tileGrid: function tileGrid(settings, defaultSettings = {}) {
     const tileGridSettings = Object.assign({}, defaultSettings, settings);
     const extent = tileGridSettings.extent;
-    tileGridSettings.origin = tileGridSettings.alignBottomLeft === false ? getTopLeft(extent) : getBottomLeft(extent);
+    if (!tileGridSettings.origin) {
+      tileGridSettings.origin = tileGridSettings.alignBottomLeft === false ? getTopLeft(extent) : getBottomLeft(extent);
+    }
     return new TileGrid(tileGridSettings);
   },
   checkZoomChange: function checkZoomChange(resolution, currentResolution) {