Changeset 12147 in josm for trunk/src/org/openstreetmap/josm


Ignore:
Timestamp:
2017-05-14T21:21:19+02:00 (3 years ago)
Author:
Don-vip
Message:

fix #14793 - fix WMTS CRS identification as per OGC specification (case-insensitive & version optional)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java

    r11921 r12147  
    55import java.net.MalformedURLException;
    66import java.net.URL;
     7import java.util.Locale;
    78
    89import javax.xml.namespace.QName;
     
    202203     * @param crsIdentifier CRS identifier
    203204     * @return CRS Identifier as it is used within JOSM (without prefix)
     205     * @see <a href="https://portal.opengeospatial.org/files/?artifact_id=24045">
     206     *     Definition identifier URNs in OGC namespace, chapter 7.2: URNs for single objects</a>
    204207     */
    205208    public static String crsToCode(String crsIdentifier) {
    206209        if (crsIdentifier.startsWith("urn:ogc:def:crs:")) {
    207             return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*):.*:(.*)$", "$1:$2");
     210            return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*)(?::.*)?:(.*)$", "$1:$2").toUpperCase(Locale.ENGLISH);
    208211        }
    209212        return crsIdentifier;
Note: See TracChangeset for help on using the changeset viewer.