Changeset 13757 in josm


Ignore:
Timestamp:
2018-05-13T15:44:52+02:00 (16 months ago)
Author:
wiktorn
Message:

Change camelCase to hyphen-case for imagery attributes

See: #16249, #15940

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/maps.xsd

    r13733 r13757  
    117117                    <xs:attribute name="name" type="xs:string" use="optional" />
    118118                    <xs:attribute name="style" type="xs:string" use="optional" />
    119                     <xs:attribute name="tileMatrixSet" type="xs:string" use="optional" />
     119                    <xs:attribute name="tile-matrix-set" type="xs:string" use="optional" />
    120120                </xs:complexType>
    121121            </xs:element>
     
    725725                            <!-- old unused feature, ignored -->
    726726                            <xs:element name="epsg4326to3857Supported" minOccurs="0" maxOccurs="1" type="xs:boolean" />
    727                             <xs:element name="defaultLayers" type="tns:defaultLayers" minOccurs="0" maxOccurs="1" />
     727                            <xs:element name="default-layers" type="tns:defaultLayers" minOccurs="0" maxOccurs="1" />
    728728                            <xs:element name="custom-http-header" minOccurs="0" maxOccurs="unbounded">
    729729                                <xs:complexType>
  • trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

    r13743 r13757  
    258258                    metadataHeaders.put(atts.getValue("header-name"), atts.getValue("metadata-key"));
    259259                    newState = State.METADATA;
    260                 } else if ("defaultLayers".equals(qName)) {
     260                } else if ("default-layers".equals(qName)) {
    261261                    newState = State.DEFAULT_LAYERS;
    262262                } else if ("custom-http-header".equals(qName)) {
     
    294294                            atts.getValue("name"),
    295295                            atts.getValue("style"),
    296                             atts.getValue("tileMatrixSet")
     296                            atts.getValue("tile-matrix-set")
    297297                            ));
    298298                }
  • trunk/test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java

    r13742 r13757  
    6464                "<max-zoom>18</max-zoom>\n" +
    6565                "<valid-georeference>true</valid-georeference>\n" +
    66                 "<defaultLayers>" +
     66                "<default-layers>" +
    6767                "<layer name=\"single_node_in_way\" style=\"default\" />" +
    68                 "</defaultLayers>" +
     68                "</default-layers>" +
    6969                "</entry>\n" +
    7070                "</imagery>"
  • trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

    r13742 r13757  
    370370                "<type>wmts</type>\n" +
    371371                "<url><![CDATA[" + tileServer.url("/getcapabilities.xml") + "]]></url>\n" +
    372                 "<defaultLayers>" +
     372                "<default-layers>" +
    373373                "<layer name=\"GEOGRAPHICALGRIDSYSTEMS.MAPS\" />" +
    374                 "</defaultLayers>" +
     374                "</default-layers>" +
    375375                "</entry>\n" +
    376376                "</imagery>"
Note: See TracChangeset for help on using the changeset viewer.