From bd43b97fcf2d07a269e617c70fae8a5abff62c78 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Tue, 17 Dec 2024 12:01:19 +0100
Subject: [PATCH] Add point id to popup and fix scratch map for North Macedonia

---
 .app_version                         |  2 +-
 CHANGELOG.md                         | 12 +++++++++++-
 app/javascript/maps/country_codes.js |  1 +
 app/javascript/maps/popups.js        |  1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.app_version b/.app_version
index 847e9aef..727d97b9 100644
--- a/.app_version
+++ b/.app_version
@@ -1 +1 @@
-0.20.1
+0.20.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fdc8806..44ac0073 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+# 0.20.2 - 2024-12-17
+
+### Added
+
+- A point id is now being shown in the point popup.
+
+### Fixed
+
+- North Macedonia is now being shown on the scratch map. #537
+
 # 0.20.1 - 2024-12-16
 
 ### Fixed
 
-- Setting `reverse_geocoded_at` for points that don't have geodata is now being performed in background job, in batches of 10,000 points to prevent memory exhaustion.
+- Setting `reverse_geocoded_at` for points that don't have geodata is now being performed in background job, in batches of 10,000 points to prevent memory exhaustion and long-running data migration.
 
 # 0.20.0 - 2024-12-16
 
diff --git a/app/javascript/maps/country_codes.js b/app/javascript/maps/country_codes.js
index 6e5cf115..a5b7dcd3 100644
--- a/app/javascript/maps/country_codes.js
+++ b/app/javascript/maps/country_codes.js
@@ -161,6 +161,7 @@ export function countryCodesMap() {
     "Niue": "NU",
     "Norfolk Island": "NF",
     "Northern Mariana Islands": "MP",
+    "North Macedonia": "MK",
     "Norway": "NO",
     "Oman": "OM",
     "Pakistan": "PK",
diff --git a/app/javascript/maps/popups.js b/app/javascript/maps/popups.js
index 31af3ac0..34a71224 100644
--- a/app/javascript/maps/popups.js
+++ b/app/javascript/maps/popups.js
@@ -15,6 +15,7 @@ export function createPopupContent(marker, timezone, distanceUnit) {
     <strong>Altitude:</strong> ${marker[3]}m<br>
     <strong>Velocity:</strong> ${marker[5]}km/h<br>
     <strong>Battery:</strong> ${marker[2]}%<br>
+    <strong>Id:</strong> ${marker[6]}<br>
     <a href="#" data-id="${marker[6]}" class="delete-point">[Delete]</a>
   `;
 }