Changeset 33126 for main/trunk/greenstone2/perllib/doc.pm

Timestamp:

2019-05-31T21:35:03+12:00 (5 years ago)

Author:

wy59

Message:

Incremental changes following previous commit. This time the code is more backwards compatible with older collections that contain only Latitude and Longitude meta. In such cases, we now ADDITIONALLY add Coordinate (and Coordshort) meta, while still also outputting Lat and Lng meta. The JS and XSL code however now prefers to work with Coordinate meta where present.

File:

• main/trunk/greenstone2/perllib/doc.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/doc.pm

@@ -1136 +1136 @@
             my $metaMap = $self->get_metadata_hashmap($section); ### TODO: metaMap not used. Unnecesssary step? (Called function has no side-effects.)
         }
+        
+        if($field =~ m/^(.+\.)?Longitude$/) {
+            # if we are dealing with Longitude meta, we should 1. have Latitude meta; 2. already have processed Latitude meta
+            # in that case, add both Lat and Lng of this section as a Coordinate meta
+            my $latitude = $self->get_metadata_element ($section, "Latitude");          
+            # TODO: would like all Longitude info together followed by all Coordinate info, but the following will add all coord info meta and end of this function will add Longitude meta
+            $self->processCoordinate($section_ptr, $latitude, $value); # value is Longitude
+        }
     }
 
@@ -1206 +1214 @@
                 print STDERR "cos $centre_lat is $cos_lat\n";
 
-                $self->processCoordinate($section_ptr, $lat_north, $lng_east);              
+                $self->processCoordinate($section_ptr, $lat_north, $lng_east);
                 $self->processCoordinate($section_ptr, $lat_south, $lng_east);
                 $self->processCoordinate($section_ptr, $lat_south, $lng_west);