Ignore:
Timestamp:
2019-06-20T22:47:33+12:00 (5 years ago)
Author:
wy59
Message:

Second part of commit. Previous part detected whether we were in the import or buildcol phase and now, instead of during import, it would now during buildcol write out Coordinate meta extracted from GPS.mapoverlay meta. The previous commit worked without duplicating Coordinate meta in the index and didn't require the hack of testing whether the doc at a sectionID already had Coordinate meta calculated for it. The current commit 1. phases out the doc.coords variable, both when this array is created in the transform\xsl files and when it's used in map-scripts.js. 2. focusDocument now works with doc.shapes, panning to the overall doc.shapes' bounds and then opening any infomarkers (labels) for the selected doc's shapes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

    r33140 r33172  
    854854                                <xsl:text disable-output-escaping="yes">"lng":</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Longitude']"/>
    855855                            </xsl:if>
     856                            <!--
    856857                            <xsl:if test="metadataList/metadata[@name = 'Coordinate']">
    857858                                <xsl:text disable-output-escaping="yes">,</xsl:text>
    … …  
    861862                                    <xsl:text disable-output-escaping="yes">"</xsl:text>
    862863                                    <xsl:value-of disable-output-escaping="yes" select="current()"/>
    863                                     <xsl:text disable-output-escaping="yes">"</xsl:text>
    864                                     <!--<xsl:if test="not(position() = count(metadataList/metadata[@name = 'Coordinate'])">
    865                                         <xsl:text>,</xsl:text>
    866                                     </xsl:if>               
    867                                     -->
     864                                    <xsl:text disable-output-escaping="yes">"</xsl:text>                           
    868865                                    <xsl:text disable-output-escaping="yes">,</xsl:text>
    869866                                </xsl:for-each>
    870867                                <xsl:text>]</xsl:text>
    871868                            </xsl:if>                       
    872                            
     869                            -->
    873870                            <xsl:if test="metadataList/metadata[@name = 'GPS.mapOverlay']">
    874871                                <xsl:text disable-output-escaping="yes">,</xsl:text>
    … …  
    899896                                <xsl:text disable-output-escaping="yes">"lng":</xsl:text><xsl:value-of disable-output-escaping="yes" select="metadataList/metadata[@name = 'Longitude']"/>
    900897                            </xsl:if>
     898                            <!--
    901899                            <xsl:if test="metadataList/metadata[@name = 'Coordinate']">
    902900                                <xsl:text disable-output-escaping="yes">,</xsl:text>
    … …  
    911909                                <xsl:text>]</xsl:text>
    912910                            </xsl:if>
    913                            
     911                            -->
    914912                            <xsl:if test="metadataList/metadata[@name = 'GPS.mapOverlay']">
    915913                                <xsl:text disable-output-escaping="yes">,</xsl:text>
Note: See TracChangeset for help on using the changeset viewer.