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

Timestamp:

2019-06-06T20:53:13+12:00 (5 years ago)

Author:

wy59

Message:

Improvements to Coordinate support AND bugfixes. BUT not all the fixes may be ideal, many marked with TODO. 1. Now we support an Array of coordinates. At present these are only displayed as Markers, but in future shapes should appear as shapes. 2. Bugfixes include: (a) expanding sections wasn't working when we had hierarchical docs with Coordinate data, because map-scripts 'overrode' the toggleSection function but no longer did any of the doc expanding behaviour that document_scripts.js used to do. This was not a problem with the ImagesGPS collection, simply because that did not have hierarchical/sectionalised documents. (b) Perl: A previous commit output duplicate Coordinates into the index. Now this doesn't happen. Fix works but may not be ideal. 3. Perl: (a) Reserved index names CD, CS for Coordinate and CoordShort. Note however that LAT and LNG were never added to reserve list for index names. (b) Now doc.pm::processCoord() takes a section parameter and works out the section-ptr from that.

File:

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

main/trunk/greenstone2/perllib/doc.pm

@@ -1138 +1138 @@
         
         if($field =~ m/^(.+\.)?Longitude$/) {
-            # if we are dealing with Longitude meta, we should 1. have Latitude meta; 2. already have processed Latitude meta
+            # if we are dealing with Longitude meta, we should 1. have Latitude meta too; 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
+            $self->processCoordinate($section, $latitude, $value); # value is Longitude
         }
     }
 
     elsif($field eq "GPS.mapOverlay") { # then the value is a JSON string
+    
+        # TODO:
+        # If we already have Coordinate meta for this section of the document (as can happen during buildcol.pl),
+        # let's ASSUME this means we've already processed GPS.mapOverlay meta into Coordinate meta for this section (can have happened during import.pl)
+        # to avoid adding duplicate Coordinates meta, which then end up duplicated in the index
+        # Of course, the assumption is not always true! We could have an image with embedded Lat and Lng meta,
+        # and the same image doc's section could have GPS.mapOverlay meta (from shapes) added via the doc editor.
+        # This very function would then have converted Lat/Lng into Coordinate meta (just in the if stmt above) and added it to the section.
+        # And then by the time we process this section's GPS.mapOverlay meta here, we would notice the section has Coordinate meta already,
+        # and therefore skip converting the GPS.mapOverlay meta into Coordinate meta! What to dooooo?
+        # So the return statement immediately below is a temporary solution, until we find a better one that will always work.
+        my $metaMap = $self->get_metadata_hashmap($section);
+        if($metaMap->{'Coordinate'}) { 
+            return;
+        }
+        
         print STDERR "GPS.mapOverlay before val: " . $value . "\n";
         
@@ -1214 +1230 @@
                 print STDERR "cos $centre_lat is $cos_lat\n";
 
-                $self->processCoordinate($section_ptr, $lat_north, $lng_east);
-                $self->processCoordinate($section_ptr, $lat_south, $lng_east);
-                $self->processCoordinate($section_ptr, $lat_south, $lng_west);
-                $self->processCoordinate($section_ptr, $lat_north, $lng_west);
+                $self->processCoordinate($section, $lat_north, $lng_east);
+                $self->processCoordinate($section, $lat_south, $lng_east);
+                $self->processCoordinate($section, $lat_south, $lng_west);
+                $self->processCoordinate($section, $lat_north, $lng_west);
             
             }
@@ -1223 +1239 @@
                 print STDERR "@@ MARKER FOUND WITH LAT: " . $shape->{"position"}->{"lat"} . "\n";
                 print STDERR "@@ MARKER FOUND WITH LNG: " . $shape->{"position"}->{"lng"} . "\n";
-                $self->processCoordinate($section_ptr, $shape->{"position"}->{"lat"}, $shape->{"position"}->{"lng"});               
+                $self->processCoordinate($section, $shape->{"position"}->{"lat"}, $shape->{"position"}->{"lng"});               
             }
             elsif ($type eq "polyline" || $type eq "polygon") {
                 my $path_array = $shape->{"path"};
                 foreach my $position (@$path_array) {                                   
-                    $self->processCoordinate($section_ptr, $position->{"lat"}, $position->{"lng"});
+                    $self->processCoordinate($section, $position->{"lat"}, $position->{"lng"});
                 }
             }
@@ -1235 +1251 @@
                 my $bounds = $shape->{"bounds"};                
             
-                $self->processCoordinate($section_ptr, $bounds->{"north"}, $bounds->{"east"});
-                $self->processCoordinate($section_ptr, $bounds->{"south"}, $bounds->{"east"});
-                $self->processCoordinate($section_ptr, $bounds->{"south"}, $bounds->{"west"});
-                $self->processCoordinate($section_ptr, $bounds->{"north"}, $bounds->{"west"});
+                $self->processCoordinate($section, $bounds->{"north"}, $bounds->{"east"});
+                $self->processCoordinate($section, $bounds->{"south"}, $bounds->{"east"});
+                $self->processCoordinate($section, $bounds->{"south"}, $bounds->{"west"});
+                $self->processCoordinate($section, $bounds->{"north"}, $bounds->{"west"});
             }   
         
@@ -1280 +1296 @@
 sub processCoordinate {
     my $self = shift (@_);
-    my ($section_ptr, $latitude, $longitude) = @_;
+    my ($section, $latitude, $longitude) = @_;
+
+    my $section_ptr = $self->_lookup_section($section);
 
     my $lat_direction = ($latitude =~ m/^-/) ? "S" : "N";