7 files changed, 42 insertions, 22 deletions
diff --git a/resources/views/modules/places/tab.phtml b/resources/views/modules/places/tab.phtml
index 4da47e9ffc..2bab48af50 100644
--- a/resources/views/modules/places/tab.phtml
+++ b/resources/views/modules/places/tab.phtml
@@ -31,10 +31,6 @@
         height: 15px;
         width: 25px
     }
-
-    .osm-sidebar .border-danger:hover {
-        cursor: not-allowed
-    }
 </style>
 
 <script type="application/javascript">
@@ -45,12 +41,6 @@
       minZoom:         2,
       providerName:    "OpenStreetMap.Mapnik",
       providerOptions: [],
-      I18N:            {
-        zoomInTitle: <?= json_encode(I18N::translate('Zoom in')) ?>,
-        zoomOutTitle: <?= json_encode(I18N::translate('Zoom out')) ?>,
-        reset: <?= json_encode(I18N::translate('Reset to initial map state')) ?>,
-        noData: <?= json_encode(I18N::translate('No mappable items')) ?>
-      }
     };
 
     let map     = null;
@@ -78,12 +68,13 @@
           return false;
         };
         let anchor        = L.DomUtil.create("a", "leaflet-control-reset", container);
+        let reset = <?= json_encode(I18N::translate('Reset to initial map state')) ?>;
         anchor.href       = "#";
-        anchor.title      = baseData.I18N.reset;
+        anchor.title      = reset;
         anchor.role       = "button";
         $(anchor).attr("aria-label", "reset");
         let image = L.DomUtil.create("i", "fas fa-redo", anchor);
-        image.alt = baseData.I18N.reset;
+        image.alt = reset;
 
         return container;
       },
@@ -101,8 +92,8 @@
       });
       L.tileLayer.provider(baseData.providerName, baseData.providerOptions).addTo(map);
       L.control.zoom({ // Add zoom with localised text
-        zoomInTitle:  baseData.I18N.zoomInTitle,
-        zoomOutTitle: baseData.I18N.zoomOutTitle,
+        zoomInTitle:  <?= json_encode(I18N::translate('Zoom in')) ?>,
+        zoomOutTitle: <?= json_encode(I18N::translate('Zoom out')) ?>,
       }).addTo(map);
     };
 
@@ -140,8 +131,7 @@
         },
         onEachFeature: function (feature, layer) {
           layer.bindPopup(feature.properties.summary);
-          let myclass = feature.valid ? "gchart" : "border border-danger";
-          sidebar += `<li class="${myclass}" data-id=${feature.id}>${feature.properties.summary}</li>`;
+          sidebar += `<li class="gchart" data-id=${feature.id}>${feature.properties.summary}</li>`;
         },
       });
 
@@ -159,7 +149,7 @@
         }
       } else {
         map.fitWorld();
-        $(domObj).append("<div class=\"bg-info text-white\">" + baseData.I18N.noData + "</div>");
+        $(domObj).append("<div class='bg-info text-white'>" + <?= json_encode(I18N::translate('No mappable items')) ?> + "</div>");
       }
 
       $(domObj).slideDown(300);
diff --git a/resources/views/place-events.phtml b/resources/views/place-hierarchy-events.phtml
index 90defa7c57..90defa7c57 100644
--- a/resources/views/place-events.phtml
+++ b/resources/views/place-hierarchy-events.phtml
diff --git a/resources/views/place-list.phtml b/resources/views/place-hierarchy-list.phtml
index 61e8b48f05..61e8b48f05 100644
--- a/resources/views/place-list.phtml
+++ b/resources/views/place-hierarchy-list.phtml
diff --git a/resources/views/place-map.phtml b/resources/views/place-hierarchy-map.phtml
index b3bb6b89ef..f7b2a1e260 100644
--- a/resources/views/place-map.phtml
+++ b/resources/views/place-hierarchy-map.phtml
@@ -122,9 +122,9 @@ use Fisharebest\Webtrees\View;
                 pointToLayer: function (feature, latlng) {
                     return new L.Marker(latlng, {
                         icon:  L.BeautifyIcon.icon({
-                            icon: feature.properties.icon["name"],
+                            icon: 'bullseye fas',
                             borderColor: "transparent",
-                            backgroundColor: feature.properties.icon["color"],
+                            backgroundColor: '#1e90ff',
                             iconShape: "marker",
                             textColor: "white",
                         }),
diff --git a/resources/views/places-page.phtml b/resources/views/place-hierarchy-page.phtml
index 087899f128..2b95b14822 100644
--- a/resources/views/places-page.phtml
+++ b/resources/views/place-hierarchy-page.phtml
@@ -1,6 +1,24 @@
 <?php
 
-use Fisharebest\Webtrees\I18N; ?>
+use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Tree;
+
+/**
+ * @var string $module
+ * @var Tree $tree
+ * @var string $action
+ * @var string $title
+ * @var string $current
+ * @var array $breadcrumbs
+ * @var bool $note
+ * @var string $content
+ * @var bool $showeventslink
+ * @var string $place
+ * @var array $parent
+ * @var array $nextaction
+ */
+
+?>
 
 <div id="place-hierarchy">
     <div class="container">
@@ -25,7 +43,7 @@ use Fisharebest\Webtrees\I18N; ?>
         </h5>
         <?php if ($note) : ?>
             <div class="text-center small text-muted">
-                <?= I18N::translate('Places without valid co-ordinates are not shown on the map and have a red border around the sidebar entry') ?>
+                <?= I18N::translate('Places without valid co-ordinates do not appear on the map and are indicated by the sidebar entry being crossed through') ?>
             </div>
         <?php endif ?>
         <?= $content ?>
diff --git a/resources/views/place-popup.phtml b/resources/views/place-hierarchy-popup.phtml
index 1901940479..45d312d92f 100644
--- a/resources/views/place-popup.phtml
+++ b/resources/views/place-hierarchy-popup.phtml
@@ -1,11 +1,13 @@
 <?php
 
 use Fisharebest\Webtrees\Place;
-
+use Fisharebest\Webtrees\I18N;
 /**
  * @var bool   $showlink
  * @var Place  $place
  * @var string $flag
+ * @var string $latitude
+ * @var string $longitude
  */
 ?>
 <div dir="auto" class="label">
@@ -19,4 +21,14 @@ use Fisharebest\Webtrees\Place;
     <?php else: ?>
         <?= $place->placeName() ?>
     <?php endif ?>
+    <table class="table table-borderless">
+        <tr>
+            <th scope="row" class="p-0"><?= I18N::translate('Latitude') ?></th>
+            <td class="p-0 align-digits"><?= $latitude ?></td>
+        </tr>
+        <tr>
+            <th scope="row" class="p-0"><?= I18N::translate('Longitude') ?></th>
+            <td class="p-0 align-digits"><?= $longitude ?></td>
+        </tr>
+    </table>
 </div>
diff --git a/resources/views/place-sidebar.phtml b/resources/views/place-hierarchy-sidebar.phtml
index c93bf670df..c93bf670df 100644
--- a/resources/views/place-sidebar.phtml
+++ b/resources/views/place-hierarchy-sidebar.phtml