Spelling of German cities

[Phil Harvey]

Thanks for this report.  You're right that a bug in Geolocation.pm doesn't properly support additional feature codes in searches.  Here is a patch that fixes this:

Code Select Expand

diff -u -r1.95 Geolocation.pm
--- lib/Image/ExifTool/Geolocation.pm    21 Apr 2024 21:49:26 -0000    1.95
+++ lib/Image/ExifTool/Geolocation.pm    22 Apr 2024 16:27:29 -0000
@@ -527,6 +527,7 @@
 #
 # perform reverse Geolocation lookup to determine GPS based on city, country, etc.
 #
+    my $fbits = $dbVer eq '1.02' ? 0x0f : 0x1f;
     while (defined $city and (@coords != 2 or $both)) {
         my $cargs = join(',', @cargs, $pop||'', $maxDist||'', $fcodes||'');
         my $i = 0;
@@ -574,7 +575,7 @@
                 $str !~ $_ or next Entry foreach @{$regex{19}};
             }
             # test feature code and population
-            next if $fcmask and not $fcmask & (1 << (ord(substr($cityList[$i],12,1)) & 0x0f));
+            next if $fcmask and not $fcmask & (1 << (ord(substr($cityList[$i],12,1)) & $fbits));
             my $pc = substr($cityList[$i],6,2);
             if (not defined $minPop or $pc ge $minPop) {
                 $lastFound{$i} = $pc;
@@ -642,7 +643,7 @@
         abs($lt - $lat) > $minDistC and $n = $end - $inc, next;
         # ignore if population is below threshold
         next if defined $minPop and $minPop ge substr($cityList[$i],6,2);
-        next if $fcmask and not $fcmask & (1 << (ord(substr($cityList[$i],12,1)) & 0x0f));
+        next if $fcmask and not $fcmask & (1 << (ord(substr($cityList[$i],12,1)) & $fbits));
         $ln = ($ln << 4) | ($f & 0x0f);
         # calculate great circle distance to this city on unit sphere
         my ($p1, $t1) = ($lt*$pi/0x100000 - $pi/2, $ln*$pi/0x080000 - $pi);
With this patch, I get the following:

Code Select Expand

> exiftool -api geolocation=52.4,-1.5 -api GeolocFeature=RSTN,RSTNQ,RSTP,RSTPQ
Geolocation City                : Coventry Railway Station
Geolocation Region              : England
Geolocation Subregion           : Coventry
Geolocation Country Code        : GB
Geolocation Country             : United Kingdom
Geolocation Time Zone           : Europe/London
Geolocation Feature Code        : RSTN
Geolocation Population          : 0
Geolocation Position            : 52.4008, -1.5141
Geolocation Distance            : 0.96 km
Geolocation Bearing             : 273

Code Select Expand

> exiftool -api geolocation=52.4,-1.5 -api GeolocFeature=ADM1,ADM2,ADM3,ADM4,ADM5
Geolocation City                : Baginton
Geolocation Region              : England
Geolocation Subregion           : Warwickshire
Geolocation Country Code        : GB
Geolocation Country             : United Kingdom
Geolocation Time Zone           : Europe/London
Geolocation Feature Code        : ADM4
Geolocation Population          : 0
Geolocation Position            : 52.3634, -1.4849
Geolocation Distance            : 4.19 km
Geolocation Bearing             : 158
using a database built with an unmodified build_geolocation script using this command:

build_geolocation -c RSTN,RSTNQ,RSTP,RSTPQ,ADM1,ADM2,ADM3,ADM4,ADM5 -l '' -v DIR

I don't have the problems you mention with build_geolocation, and it builds the v1.03 database properly, as seen in the verbose output:

Code Select Expand

Languages to read from input database(s):
  <none>
Parameters for reading scripts/geolocation_dir//allCountries.txt:
  Minimum populations (??=any country):
    ??=2000
  Features to keep regardless of population:
    ??=ADM1,ADM2,ADM3,ADM4,ADM5,RSTN,RSTNQ,RSTP,RSTPQ
  Features to keep for population >= minimum:
    ??=PPL,PPLA,PPLA2,PPLA3,PPLA4,PPLA5,PPLC,PPLCH,PPLF,PPLG,PPLH,PPLL,PPLQ,PPLR,PPLS,PPLW,PPLX,STLMT
Reading scripts/geolocation_dir//allCountries.txt... Done.
Some feature codes not supported by version 1.02, writing as 1.03 instead.
  000240 countries  (0x00f0)
  003707 regions    (0x0e7b)
  036948 subregions (0x9054)
Not writing alternate languages (scripts/geolocation_dir//alternateNamesV2.txt not found)
Processing scripts/geolocation_dir//allCountries.txt... Done.
Writing scripts/geolocation_dir//Geolocation_out/Geolocation.dat (version 1.03)...
Features kept:
   246 (22) ADM1
 22312 (21) ADM2
122684 (20) ADM3
207208 (23) ADM4
 14895 (27) ADM5
 56653 ( 1) PPL
  3063 ( 2) PPLA
 13453 ( 3) PPLA2
  9405 ( 4) PPLA3
  3726 ( 5) PPLA4
    21 ( 6) PPLA5
   224 ( 7) PPLC
     1 ( 8) PPLCH
    16 ( 9) PPLF
     6 (10) PPLG
    10 (11) PPLH
   202 (12) PPLL
    18 (13) PPLQ
     2 (14) PPLR
    14 (15) PPLS
     4 (16) PPLW
  4811 (17) PPLX
 66128 (19) RSTN
  1858 (25) RSTNQ
  9252 (24) RSTP
   358 (26) RSTPQ
    25 (18) STLMT
Output file size(s):
   15.23 MB Geolocation.dat (536595 entries)
I would revert your modifications to build_geolocation because I think they may be causing problems.

- Phil