Changeset 13733 in josm for trunk/data


Ignore:
Timestamp:
2018-05-12T14:18:57+02:00 (14 months ago)
Author:
wiktorn
Message:

Imagery definition refactor

Extend imagery definitions by:

  • allowing setting default layers for WMS_ENDPOINT and WMTS
  • allowing setting minimum expires time for tile for this imagery
  • allowing setting custom headers that will be sent for all requests

(get map, get capabilities) for this imagery

Additional changes in code:

  • use TileJobOptions to pass miscellaneous options to loaders
  • refactor WMSImagery to use SAX parser

See: #15981, #7953, #16224, #15940, #16249

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/maps.xsd

    r13536 r13733  
    108108            <!-- TODO: find an easy way to validate projections codes -->
    109109            <xs:element name="code" minOccurs="0" maxOccurs="unbounded" type="xs:string" />
     110        </xs:sequence>
     111    </xs:complexType>
     112
     113    <xs:complexType name="defaultLayers">
     114        <xs:sequence>
     115            <xs:element name="layer" maxOccurs="unbounded">
     116                <xs:complexType>
     117                    <xs:attribute name="name" type="xs:string" use="optional" />
     118                    <xs:attribute name="style" type="xs:string" use="optional" />
     119                    <xs:attribute name="tileMatrixSet" type="xs:string" use="optional" />
     120                </xs:complexType>
     121            </xs:element>
    110122        </xs:sequence>
    111123    </xs:complexType>
     
    713725                            <!-- old unused feature, ignored -->
    714726                            <xs:element name="epsg4326to3857Supported" minOccurs="0" maxOccurs="1" type="xs:boolean" />
     727                            <xs:element name="defaultLayers" type="tns:defaultLayers" minOccurs="0" maxOccurs="1" />
     728                            <xs:element name="custom-http-header" minOccurs="0" maxOccurs="unbounded">
     729                                <xs:complexType>
     730                                    <xs:attribute name="header-name" type="xs:string" />
     731                                    <xs:attribute name="header-value" type="xs:string" />
     732                                </xs:complexType>
     733                            </xs:element>
     734                            <xs:element name="transparent" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
     735                            <xs:element name="format" type="xs:string" minOccurs="0" maxOccurs="1"/>
    715736                            <!-- does imagery server supports "/status" and tile re-rendering using "/dirty". Defaults to false. -->
    716737                            <xs:element name="mod-tile-features" minOccurs="0" maxOccurs="1" type="xs:boolean" />
     738                            <!--  minimum time in seconds for which tile will be considered valid -->
     739                            <xs:element name="minimum-tile-expire" minOccurs="0" maxOccurs="1" type="xs:positiveInteger" />
    717740                        </xs:choice>
    718741                    </xs:sequence>
Note: See TracChangeset for help on using the changeset viewer.