added maps, impoved build workflow

limex · Apr 3, 2024 · 1b01bfb · 1b01bfb
1 parent f5a5214
commit 1b01bfb
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 35 deletions.
diff --git a/deploy.js b/deploy.js
@@ -0,0 +1,19 @@
+const { cpSync, rmSync } = require('fs');
+
+// Replace 'dist' with the actual build output folder
+const sourceFolder = 'dist';
+
+// Replace '/path/to/production/folder' with the target production folder
+const targetFolder = '/Users/guntherbosch/Chrome.Extensions/OpenMapSwitcher/dist-v2/';
+
+try {
+    // Empty the target folder before copying
+    rmSync(targetFolder, { recursive: true, force: true });
+    console.log(`Successfully emptied ${targetFolder}`);
+
+    // Copy files from source folder to target folder
+    cpSync(sourceFolder, targetFolder, { recursive: true });
+    console.log(`Successfully copied files from ${sourceFolder} to ${targetFolder}`);
+} catch (error) {
+    console.error('Error copying files:', error.message);
+}
diff --git a/dist/background.js b/dist/background.js
diff --git a/dist/background.js.map b/dist/background.js.map
diff --git a/dist/manifest.json b/dist/manifest.json
@@ -1 +1 @@
-{"name":"OpenSwitchMaps_limex","version":"1.6.0","description":"Switch map services and Tools for OpenStreetMap contributors","homepage_url":"https://github.com/limex/OpenSwitchMaps","permissions":["activeTab","tabs","storage"],"background":{"scripts":["background.js"]},"page_action":{"default_popup":"popup.html","default_icon":{"128":"icon128.png"}},"icons":{"128":"icon128.png"},"options_ui":{"page":"options.html"},"manifest_version":2}
+{"name":"OpenSwitchMaps_limex","version":"1.6.5","description":"Switch map services and Tools for OpenStreetMap contributors","homepage_url":"https://github.com/limex/OpenSwitchMaps","permissions":["activeTab","tabs","storage"],"background":{"scripts":["background.js"]},"page_action":{"default_popup":"popup.html","default_icon":{"128":"icon128.png"}},"icons":{"128":"icon128.png"},"options_ui":{"page":"options.html"},"manifest_version":2}
diff --git a/dist/options.c112da62.js → dist/options.6a1e1d69.js b/dist/options.c112da62.js → dist/options.6a1e1d69.js
diff --git a/dist/options.6a1e1d69.js.map b/dist/options.6a1e1d69.js.map
diff --git a/dist/options.c112da62.js.map b/dist/options.c112da62.js.map
diff --git a/dist/options.html b/dist/options.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset="utf-8"><link rel="stylesheet" href="/options.21194506.css"></head><body> <div id="options"></div> <script src="/options.c112da62.js"></script> </body></html>
+<!DOCTYPE html><html><head><meta charset="utf-8"><link rel="stylesheet" href="/options.21194506.css"></head><body> <div id="options"></div> <script src="/options.6a1e1d69.js"></script> </body></html>
diff --git a/dist/popup.756723e4.js → dist/popup.3ffcac9c.js b/dist/popup.756723e4.js → dist/popup.3ffcac9c.js
diff --git a/dist/popup.3ffcac9c.js.map b/dist/popup.3ffcac9c.js.map
diff --git a/dist/popup.756723e4.js.map b/dist/popup.756723e4.js.map
diff --git a/dist/popup.html b/dist/popup.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset="utf-8"><link rel="stylesheet" href="/popup.d0afbe9b.css"></head><body> <div id="popup"></div> <script src="/popup.756723e4.js"></script> </body></html>
+<!DOCTYPE html><html><head><meta charset="utf-8"><link rel="stylesheet" href="/popup.d0afbe9b.css"></head><body> <div id="popup"></div> <script src="/popup.3ffcac9c.js"></script> </body></html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "openswitchmapslimex",
-  "version": "1.6.0",
+  "version": "1.6.5",
   "description": "Switch map services and Tools for OpenStreetMap contributors",
   "scripts": {
     "dev": "parcel watch src/manifest.json",
-    "build": "parcel build src/manifest.json"
+    "build": " rm -r dist && sh inc_patch.sh && parcel build src/manifest.json && node deploy.js"
   },
   "repository": {
     "type": "git",

diff --git a/src/manifest.json b/src/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenSwitchMaps_limex",
-  "version": "1.6.0",
+  "version": "1.6.5",
   "description": "Switch map services and Tools for OpenStreetMap contributors",
   "homepage_url": "https://github.com/limex/OpenSwitchMaps",
   "permissions": [

diff --git a/src/maps.js b/src/maps.js
@@ -303,7 +303,7 @@ const maps_raw = [
       );
       if (match) {
         let [, zoom, lat, lon] = match;
-        zoom = Math.round(zoom);
+        // zoom = Math.round(zoom);
         return [lat, lon, zoom];
       }
     },
@@ -616,6 +616,25 @@ const maps_raw = [
       }
     },
   },
+  {
+		// https://www.norgeskart.no/#!?project=norgeskart&layers=1002&zoom=13&lat=6649044.14&lon=262775.36
+		name: "Norgeskart",
+		category: OUTDOOR_CATEGORY,
+		default_check: true,
+		domain: "www.norgeskart.no",
+		description: "Outdoor, POI",
+		getUrl(lat, lon, zoom) {
+			return "https://www.norgeskart.no/#!?project=norgeskart&layers=1002,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023&zoom=" + zoom + "&lat=" + lat + "&lon=" + lon;
+		},
+		getLatLonZoom(url) {
+			const match = url.match(/www\.norgeskart\.no.*#.*layers=1002.*([0-9.]*)\/(-?\d[0-9.]*)\/(-?\d[0-9.]*)/);
+
+			if (match) {
+				const [, zoom, lat, lon] = match;
+				return [lat, normalizeLon(lon), Math.round(Number(zoom))];
+			}
+		},
+	},
   {
     name: "Flussinfo",
     category: WATER_CATEGORY,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"name":"OpenSwitchMaps_limex","version":"1.6.0","description":"Switch map services and Tools for OpenStreetMap contributors","homepage_url":"https://github.com/limex/OpenSwitchMaps","permissions":["activeTab","tabs","storage"],"background":{"scripts":["background.js"]},"page_action":{"default_popup":"popup.html","default_icon":{"128":"icon128.png"}},"icons":{"128":"icon128.png"},"options_ui":{"page":"options.html"},"manifest_version":2}
		{"name":"OpenSwitchMaps_limex","version":"1.6.5","description":"Switch map services and Tools for OpenStreetMap contributors","homepage_url":"https://github.com/limex/OpenSwitchMaps","permissions":["activeTab","tabs","storage"],"background":{"scripts":["background.js"]},"page_action":{"default_popup":"popup.html","default_icon":{"128":"icon128.png"}},"icons":{"128":"icon128.png"},"options_ui":{"page":"options.html"},"manifest_version":2}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html><head><meta charset="utf-8"><link rel="stylesheet" href="/options.21194506.css"></head><body> <div id="options"></div> <script src="/options.c112da62.js"></script> </body></html>
		<!DOCTYPE html><html><head><meta charset="utf-8"><link rel="stylesheet" href="/options.21194506.css"></head><body> <div id="options"></div> <script src="/options.6a1e1d69.js"></script> </body></html>