Merge pull request #238 from jim-easterbrook/devel

Devel

CHANGELOG.txt

@@ -16,6 +16,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see
 <http://www.gnu.org/licenses/>.
 
+Changes in v2024.5.0:
+  1/ Use deprecated Google Map marker with QtWebEngline v5.15.2 or lower.
+  2/ Copy files from camera in chunks.
+
 Changes in v2024.4.0:
   1/ Google Map no longer used deprecated marker.
   2/ Improved handling of multiple language configurations.

src/photini/bingmap.py

@@ -122,7 +122,8 @@ def get_head(self):
             url += '&branch=experimental'
         return '''    <script type="text/javascript"
       src="{}" async>
-    </script>'''.format(url)
+    </script>
+    <script type="text/javascript" src="bingmap.js"></script>'''.format(url)
 
     @catch_all
     def new_status(self, status):

src/photini/data/map/googlemap.js

@@ -96,30 +96,25 @@ function fitPoints(points)
         map.panTo(bounds.getCenter());
 }
 
-function newGPSCircle(active)
-{
-    var result = document.createElement("img");
-    result.src = active ? 'circle_red.png' : 'circle_blue.png';
-    result.style.transform = 'translate(0.5px,8.5px)';
-    return result;
-}
-
 function plotGPS(points)
 {
     for (var i = 0; i < points.length; i++)
     {
         var latlng = new google.maps.LatLng(points[i][0], points[i][1]);
         var id = points[i][2];
+        var circle = document.createElement("img");
+        circle.src = 'circle_blue.png';
+        circle.style.transform = 'translate(0.5px,8.5px)';
         gpsMarkers[id] = new google.maps.marker.AdvancedMarkerElement({
-            map: map, position: latlng,
-            content: newGPSCircle(false), zIndex: 2});
+            map: map, position: latlng, content: circle, zIndex: 2});
     }
 }
 
 function enableGPS(ids)
 {
     for (var id in gpsMarkers)
-        gpsMarkers[id].content = newGPSCircle(ids.includes(id));
+        gpsMarkers[id].content.src =
+            ids.includes(id) ? 'circle_red.png' : 'circle_blue.png';
         gpsMarkers[id].zIndex = ids.includes(id) ? 3 : 2;
 }
 
@@ -130,25 +125,20 @@ function clearGPS()
     gpsMarkers = {};
 }
 
-function newIcon(active)
-{
-    var result = document.createElement("img");
-    result.src = active ? 'pin_red.png' : 'pin_grey.png';
-    result.style.transform = 'translate(1.5px,3px)';
-    return result;
-}
-
 function enableMarker(id, active)
 {
     var marker = markers[id];
-    marker.content = newIcon(active);
+    marker.content.src = active ? 'pin_red.png' : 'pin_grey.png';
     marker.zIndex = active ? 1 : 0;
 }
 
 function addMarker(id, lat, lng, active)
 {
+    var icon = document.createElement("img");
+    icon.src = 'pin_grey.png';
+    icon.style.transform = 'translate(1.5px,3px)';
     var marker = new google.maps.marker.AdvancedMarkerElement({
-        content: newIcon(false),
+        content: icon,
         position: new google.maps.LatLng(lat, lng),
         map: map,
         gmpDraggable: true,

src/photini/data/map/googlemap_legacy.js

@@ -0,0 +1,214 @@
+//  Photini - a simple photo metadata editor.
+//  http://github.com/jim-easterbrook/Photini
+//  Copyright (C) 2012-24  Jim Easterbrook  [email protected]
+//
+//  This program is free software: you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License as
+//  published by the Free Software Foundation, either version 3 of the
+//  License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see
+//  <http://www.gnu.org/licenses/>.
+
+// See https://developers.google.com/maps/documentation/javascript/overview
+
+// This "legacy" version does not use AdvancedMarkerElement
+
+var map;
+var markers = {};
+var gpsMarkers = {};
+var icon_on;
+var icon_off;
+var gpsBlueCircle;
+var gpsRedCircle;
+
+function loadMap(lat, lng, zoom)
+{
+    var mapOptions = {
+        center: new google.maps.LatLng(lat, lng),
+        fullscreenControl: false,
+        scaleControl: true,
+        streetViewControl: false,
+        tilt: 0,
+        zoom: zoom,
+        maxZoom: 20,
+        mapId: "ce7cafb5b0de6e31",
+        mapTypeId: google.maps.MapTypeId.ROADMAP,
+        mapTypeControl: true,
+        mapTypeControlOptions: {
+            style: google.maps.MapTypeControlStyle.DROPDOWN_MENU,
+            },
+        };
+    map = new google.maps.Map(document.getElementById("mapDiv"), mapOptions);
+    google.maps.event.addListener(map, 'idle', newBounds);
+    var anchor = new google.maps.Point(11, 35);
+    icon_on = {anchor: anchor, url: 'pin_red.png'};
+    icon_off = {anchor: anchor, url: 'pin_grey.png'};
+    anchor = new google.maps.Point(5, 5);
+    gpsBlueCircle = {anchor: anchor, url: 'circle_blue.png'};
+    gpsRedCircle = {anchor: anchor, url: 'circle_red.png'};
+    python.initialize_finished();
+}
+
+function newBounds()
+{
+    var centre = map.getCenter();
+    var bounds = map.getBounds();
+    var sw = bounds.getSouthWest();
+    var ne = bounds.getNorthEast();
+    python.new_status({
+        centre: [centre.lat(), centre.lng()],
+        bounds: [ne.lat(), ne.lng(), sw.lat(), sw.lng()],
+        zoom: map.getZoom(),
+        });
+}
+
+function setView(lat, lng, zoom)
+{
+    map.setZoom(zoom)
+    map.panTo(new google.maps.LatLng(lat, lng));
+}
+
+function adjustBounds(north, east, south, west)
+{
+    map.fitBounds({north: north, east: east, south: south, west: west});
+}
+
+function fitPoints(points)
+{
+    var bounds = new google.maps.LatLngBounds();
+    for (var i = 0; i < points.length; i++)
+    {
+        bounds.extend({lat: points[i][0], lng: points[i][1]});
+    }
+    var mapBounds = map.getBounds();
+    var mapSpan = mapBounds.toSpan();
+    var ne = bounds.getNorthEast();
+    var sw = bounds.getSouthWest();
+    bounds.extend({lat: ne.lat() + (mapSpan.lat() * 0.13),
+                   lng: ne.lng() + (mapSpan.lng() * 0.04)});
+    bounds.extend({lat: sw.lat() - (mapSpan.lat() * 0.04),
+                   lng: sw.lng() - (mapSpan.lng() * 0.04)});
+    ne = bounds.getNorthEast();
+    sw = bounds.getSouthWest();
+    if (mapBounds.contains(ne) && mapBounds.contains(sw))
+        return;
+    var span = bounds.toSpan();
+    if (span.lat() > mapSpan.lat() || span.lng() > mapSpan.lng())
+        map.fitBounds(bounds);
+    else if (mapBounds.intersects(bounds))
+        map.panToBounds(bounds);
+    else
+        map.panTo(bounds.getCenter());
+}
+
+function plotGPS(points)
+{
+    for (var i = 0; i < points.length; i++)
+    {
+        var latlng = new google.maps.LatLng(points[i][0], points[i][1]);
+        var id = points[i][2];
+        var circle = document.createElement("img");
+        circle.src = 'circle_blue.png';
+        circle.style.transform = 'translate(0.5px,8.5px)';
+        gpsMarkers[id] = new google.maps.Marker({
+            map: map, position: latlng,
+            icon: gpsBlueCircle, zIndex: 2, clickable: false});
+    }
+}
+
+function enableGPS(ids)
+{
+    for (var id in gpsMarkers)
+        if (ids.includes(id))
+            gpsMarkers[id].setOptions({icon: gpsRedCircle, zIndex: 3});
+        else
+            gpsMarkers[id].setOptions({icon: gpsBlueCircle, zIndex: 2});
+}
+
+function clearGPS()
+{
+    for (var id in gpsMarkers)
+        gpsMarkers[id].setMap(null);
+    gpsMarkers = {};
+}
+
+function enableMarker(id, active)
+{
+    var marker = markers[id];
+    if (active)
+        marker.setOptions({icon: icon_on, zIndex: 1});
+    else
+        marker.setOptions({icon: icon_off, zIndex: 0});
+}
+
+function addMarker(id, lat, lng, active)
+{
+    var marker = new google.maps.Marker({
+        icon: icon_off,
+        position: new google.maps.LatLng(lat, lng),
+        map: map,
+        draggable: true,
+        crossOnDrag: false,
+        });
+    markers[id] = marker;
+    google.maps.event.addListener(marker, 'click', markerClick);
+    google.maps.event.addListener(marker, 'dragstart', markerClick);
+    google.maps.event.addListener(marker, 'drag', markerDrag);
+    google.maps.event.addListener(marker, 'dragend', markerDragEnd);
+    enableMarker(id, active)
+}
+
+function markerToId(marker)
+{
+    for (var id in markers)
+        if (markers[id] == marker)
+            return id;
+}
+
+function markerClick(event)
+{
+    python.marker_click(markerToId(this));
+}
+
+function markerDrag(event)
+{
+    var loc = event.latLng;
+    python.marker_drag(loc.lat(), loc.lng());
+}
+
+function markerDragEnd(event)
+{
+    var loc = event.latLng;
+    python.marker_drag_end(loc.lat(), loc.lng(), markerToId(this));
+}
+
+function markerDrop(x, y)
+{
+    // convert x, y to world coordinates
+    var scale = Math.pow(2, map.getZoom());
+    var nw = new google.maps.LatLng(
+        map.getBounds().getNorthEast().lat(),
+        map.getBounds().getSouthWest().lng()
+        );
+    var worldCoordinateNW = map.getProjection().fromLatLngToPoint(nw);
+    var worldX = worldCoordinateNW.x + (x / scale);
+    var worldY = worldCoordinateNW.y + (y / scale);
+    // convert world coordinates to lat & lng
+    var position = map.getProjection().fromPointToLatLng(
+        new google.maps.Point(worldX, worldY));
+    python.marker_drop(position.lat(), position.lng());
+}
+
+function delMarker(id)
+{
+    google.maps.event.clearInstanceListeners(markers[id]);
+    markers[id].setMap(null);
+    delete markers[id];
+}

src/photini/googlemap.py

@@ -18,6 +18,7 @@
 
 import locale
 import logging
+import re
 
 import requests
 
@@ -101,10 +102,21 @@ def get_geocoder(self):
         return GoogleGeocoder(parent=self)
 
     def get_head(self):
+        user_agent = self.widgets['map'].page().profile().httpUserAgent()
+        match = re.search(r'\sChrome/(\d+)\.', user_agent)
+        if match:
+            chrome_version = int(match.group(1))
+        else:
+            chrome_version = 0
         url = ('http://maps.googleapis.com/maps/api/js'
                '?callback=initialize'
-               '&loading=async'
-               '&libraries=marker')
+               '&loading=async')
+        # AdvancedMarkerElement requires Chrome v86+
+        if chrome_version >= 86:
+            url += '&libraries=marker'
+            script = 'googlemap.js'
+        else:
+            script = 'googlemap_legacy.js'
         if self.app.options.test:
             url += '&v=beta'
         url += '&key=' + self.api_key
@@ -116,4 +128,5 @@ def get_head(self):
                 url += '&region=' + region
         return '''    <script type="text/javascript"
       src="{}" async>
-    </script>'''.format(url)
+    </script>
+    <script type="text/javascript" src="{}"></script>'''.format(url, script)

src/photini/mapboxmap.py

@@ -115,5 +115,6 @@ def get_head(self):
     </script>
     <script type="text/javascript">
       L.mapbox.accessToken = "{key}";
-    </script>'''.format(key=self.api_key,
-                        url='https://api.mapbox.com/mapbox.js/v3.3.1')
+    </script>
+    <script type="text/javascript" src="mapboxmap.js"></script>'''.format(
+        key=self.api_key, url='https://api.mapbox.com/mapbox.js/v3.3.1')

src/photini/photinimap.py

@@ -127,6 +127,7 @@ def __init__(self, *args, call_handler=None, transient=False, **kwds):
             self.web_channel.registerObject('python', self.call_handler)
         self.profile().setCachePath(
             os.path.join(appdirs.user_cache_dir('photini'), 'WebEngine'))
+        logger.debug('user agent: %s', self.profile().httpUserAgent())
 
     @catch_all
     def acceptNavigationRequest(self, url, type_, isMainFrame):
@@ -300,7 +301,6 @@ def initialise(self):
     </style>
 {initialize}
 {head}
-    <script type="text/javascript" src="{script}.js"></script>
   </head>
   <body ondragstart="return false">
     <div id="mapDiv"></div>
@@ -325,7 +325,6 @@ def initialise(self):
     </script>'''
         page = page.format(
             head = self.get_head(),
-            script = self.__module__.split('.')[-1],
             initialize = initialize.format(lat=lat, lng=lng, zoom=zoom))
         QtWidgets.QApplication.setOverrideCursor(Qt.CursorShape.WaitCursor)
         self.widgets['map'].setHtml(

src/photini/pyqt.py

@@ -1,6 +1,6 @@
 ##  Photini - a simple photo metadata editor.
 ##  http://github.com/jim-easterbrook/Photini
-##  Copyright (C) 2015-23  Jim Easterbrook  [email protected]
+##  Copyright (C) 2015-24  Jim Easterbrook  [email protected]
 ##
 ##  This program is free software: you can redistribute it and/or
 ##  modify it under the terms of the GNU General Public License as
@@ -19,7 +19,6 @@
 from collections import namedtuple
 from contextlib import contextmanager
 from functools import wraps
-import importlib
 import logging
 import os
 import sys

src/photini/scripts.py

@@ -16,7 +16,6 @@
 ##  along with this program.  If not, see
 ##  <http://www.gnu.org/licenses/>.
 
-import importlib
 import logging
 from optparse import OptionParser
 import os