From f4f5a0342b3d767a535febffcf9b9a1184c19ea5 Mon Sep 17 00:00:00 2001
From: Eric Theise <erictheise@gmail.com>
Date: Wed, 19 Jun 2024 17:26:05 -0700
Subject: [PATCH] Fixes https://github.com/OpenHistoricalMap/issues/issues/830
 by correcting popup links. Also fixes a few similar but yet to be discovered
 links and introduces versioning into our package.json.

---
 js/ide.ts       |  2 +-
 js/nominatim.ts |  4 ++--
 js/popup.ts     | 18 +++++++++---------
 package.json    |  5 +++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/js/ide.ts b/js/ide.ts
index 1c11ca05..2527f04a 100644
--- a/js/ide.ts
+++ b/js/ide.ts
@@ -1671,7 +1671,7 @@ class IDE {
       .bind("click", () => {
         const content =
           `<h4>${i18n.t("export.map_view.permalink")}</h4>` +
-          `<p><a href="//www.openstreetmap.org/#map=${this.map.getZoom()}/${L.Util.formatNum(
+          `<p><a href="//www.openhistoricalmap.org/#map=${this.map.getZoom()}/${L.Util.formatNum(
             this.map.getCenter().lat
           )}/${L.Util.formatNum(
             this.map.getCenter().lng
diff --git a/js/nominatim.ts b/js/nominatim.ts
index 7f78454c..a447845c 100644
--- a/js/nominatim.ts
+++ b/js/nominatim.ts
@@ -9,7 +9,7 @@ export default class nominatim {
   static request(search, callback) {
     // ajax (GET) request to nominatim
     $.ajax(
-      `https://nominatim.openstreetmap.org/search` +
+      `https://nominatim.openhistoricalmap.org/search` +
         `?X-Requested-With=${configs.appname}`,
       {
         data: {
@@ -29,7 +29,7 @@ export default class nominatim {
         },
         error() {
           const err =
-            "An error occurred while contacting the osm search server nominatim.openstreetmap.org :(";
+            "An error occurred while contacting the osm search server nominatim.openhistoricalmap.org :(";
           console.log(err);
           callback(err, null);
         }
diff --git a/js/popup.ts b/js/popup.ts
index d5fb7cd0..a8821c89 100644
--- a/js/popup.ts
+++ b/js/popup.ts
@@ -11,20 +11,20 @@ export function featurePopupContent(feature: GeoJSON.Feature) {
   if (feature.properties.type == "node")
     popup +=
       `<h4 class="title is-4"><span class="t" data-t="popup.node">Node</span>` +
-      ` <a href="//www.openstreetmap.org/node/${feature.properties.id}" target="_blank">${feature.properties.id}</a>` +
-      ` <a href="//www.openstreetmap.org/edit?node=${feature.properties.id}" target="_blank">✏</a>` +
+      ` <a href="//www.openhistoricalmap.org/node/${feature.properties.id}" target="_blank">${feature.properties.id}</a>` +
+      ` <a href="//www.openhistoricalmap.org/edit?node=${feature.properties.id}" target="_blank">✏</a>` +
       `</h4>`;
   else if (feature.properties.type == "way")
     popup +=
       `<h4 class="title is-4"><span class="t" data-t="popup.way">Way</span>` +
-      ` <a href="//www.openstreetmap.org/way/${feature.properties.id}" target="_blank">${feature.properties.id}</a>` +
-      ` <a href="//www.openstreetmap.org/edit?way=${feature.properties.id}" target="_blank">✏</a>` +
+      ` <a href="//www.openhistoricalmap.org/way/${feature.properties.id}" target="_blank">${feature.properties.id}</a>` +
+      ` <a href="//www.openhistoricalmap.org/edit?way=${feature.properties.id}" target="_blank">✏</a>` +
       `</h4>`;
   else if (feature.properties.type == "relation")
     popup +=
       `<h4 class="title is-4"><span class="t" data-t="popup.relation">Relation</span>` +
-      ` <a href="//www.openstreetmap.org/relation/${feature.properties.id}" target="_blank">${feature.properties.id}</a>` +
-      ` <a href="//www.openstreetmap.org/edit?relation=${feature.properties.id}" target="_blank">✏</a>` +
+      ` <a href="//www.openhistoricalmap.org/relation/${feature.properties.id}" target="_blank">${feature.properties.id}</a>` +
+      ` <a href="//www.openhistoricalmap.org/edit?relation=${feature.properties.id}" target="_blank">✏</a>` +
       `</h4>`;
   else
     popup += `<h5 class="subtitle is-5">${feature.properties.type} #${feature.properties.id}</h5>`;
@@ -115,7 +115,7 @@ export function featurePopupContent(feature: GeoJSON.Feature) {
     }
     popup += "</h3><ul>";
     $.each(feature.properties.relations, (k, v) => {
-      popup += `<li><a href="//www.openstreetmap.org/relation/${v["rel"]}" target="_blank">${v["rel"]}</a>`;
+      popup += `<li><a href="//www.openhistoricalmap.org/relation/${v["rel"]}" target="_blank">${v["rel"]}</a>`;
       if (v.reltags && (v.reltags.name || v.reltags.ref || v.reltags.type))
         popup += ` <i>${$.trim(
           (v.reltags.type ? `${htmlentities(v.reltags.type)} ` : "") +
@@ -137,9 +137,9 @@ export function featurePopupContent(feature: GeoJSON.Feature) {
       k = htmlentities(k);
       v = htmlentities(v);
       if (k == "user")
-        v = `<a href="//www.openstreetmap.org/user/${v}" target="_blank">${v}</a>`;
+        v = `<a href="//www.openhistoricalmap.org/user/${v}" target="_blank">${v}</a>`;
       if (k == "changeset")
-        v = `<a href="//www.openstreetmap.org/changeset/${v}" target="_blank">${v}</a>`;
+        v = `<a href="//www.openhistoricalmap.org/changeset/${v}" target="_blank">${v}</a>`;
       popup += `<li><span class="is-family-monospace">${k} = ${v}</span></li>`;
     });
     popup += "</ul>";
diff --git a/package.json b/package.json
index f822b63d..b2063b0e 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,9 @@
 {
   "name": "overpass-turbo",
-  "description": "A web based data mining tool for OpenStreetMap using Overpass API",
+  "version": "2.0.1",
+  "description": "A web based data mining tool for OpenHistoricalMap using Overpass API",
   "homepage": "http://overpass-turbo.eu/",
-  "repository": "git+https://github.com/tyrasd/overpass-turbo.git",
+  "repository": "git+https://github.com/OpenHistoricalMap/overpass-turbo.git",
   "license": "MIT",
   "scripts": {
     "test": "yarn run test:eslint && yarn run test:style && yarn run test:vitest",