Changeset 18304 in josm for trunk


Ignore:
Timestamp:
2021-11-02T23:54:32+01:00 (3 years ago)
Author:
Don-vip
Message:

fix #21502 - associate correct extensions in macOS / Windows installers, consistency for MIME types, use official osm+xml MIME type

Location:
trunk
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/native/file-associations/bz2.properties

    r18136 r18304  
    1 extension=bz2
     1extension=osm.bz2
    22mime-type=application/x-bzip2
    33description=OpenStreetMap BZipped

  • trunk/native/file-associations/gz.properties

    r18136 r18304  
    1 extension=gz
     1extension=osm.gz
    22mime-type=application/gzip
    33description=OpenStreetMap GZipped

  • trunk/native/file-associations/osm.properties

    r18136 r18304  
    11extension=osm
    2 mime-type=application/x-osm+xml
     2mime-type=application/vnd.openstreetmap.data+xml
    33description=OpenStreetMap

  • trunk/native/file-associations/zip.properties

    r18136 r18304  
    1 extension=zip
     1extension=osm.zip
    22mime-type=application/zip
    33description=OpenStreetMap Zipped

  • trunk/native/linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop

    r18235 r18304  
    88Exec=josm-latest %U
    99Terminal=false
    10 MimeType=application/geo+json;application/gpx+xml;application/gzip;application/x-bzip;application/x-bzip;application/x-gpx+xml;application/x-josm-session+xml;application/x-josm-session+zip;application/x-osm+xml;application/x-xz;application/zip;x-scheme-handler/geo;
     10MimeType=application/geo+json;application/gpx+xml;application/gzip;application/vnd.openstreetmap.data+xml;application/x-bzip2;application/x-gpx+xml;application/x-josm-session+xml;application/x-josm-session+zip;application/x-osm+xml;application/x-xz;application/zip;x-scheme-handler/geo;
    1111StartupNotify=true
    1212Categories=Education;Geoscience;Maps;

  • trunk/native/linux/latest/usr/share/mime/packages/josm-latest.xml

    r15915 r18304  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
    3         <mime-type type="application/x-osm+xml">
     3        <mime-type type="application/vnd.openstreetmap.data+xml">
    44                <sub-class-of type="application/xml"/>
    55                <comment>OSM XML file</comment>

  • trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop

    r18235 r18304  
    88Exec=josm %U
    99Terminal=false
    10 MimeType=application/geo+json;application/gpx+xml;application/gzip;application/x-bzip;application/x-bzip;application/x-gpx+xml;application/x-josm-session+xml;application/x-josm-session+zip;application/x-osm+xml;application/x-xz;application/zip;x-scheme-handler/geo;
     10MimeType=application/geo+json;application/gpx+xml;application/gzip;application/vnd.openstreetmap.data+xml;application/x-bzip2;application/x-gpx+xml;application/x-josm-session+xml;application/x-josm-session+zip;application/x-osm+xml;application/x-xz;application/zip;x-scheme-handler/geo;
    1111StartupNotify=true
    1212Categories=Education;Geoscience;Maps;

  • trunk/native/linux/tested/usr/share/mime/packages/josm.xml

    r15915 r18304  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
    3         <mime-type type="application/x-osm+xml">
     3        <mime-type type="application/vnd.openstreetmap.data+xml">
    44                <sub-class-of type="application/xml"/>
    55                <comment>OSM XML file</comment>

  • trunk/native/macosx/macos-jpackage.sh

    r18161 r18304  
    8787    --file-associations native/file-associations/joz.properties \
    8888    --file-associations native/file-associations/osm.properties \
     89    --file-associations native/file-associations/xz.properties \
    8990    --file-associations native/file-associations/zip.properties \
    9091    --add-modules java.base,java.datatransfer,java.desktop,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.sql,java.transaction.xa,java.xml,jdk.crypto.ec,jdk.jfr,jdk.jsobject,jdk.unsupported,jdk.unsupported.desktop,jdk.xml.dom,javafx.controls,javafx.media,javafx.swing,javafx.web

  • trunk/native/windows/win-jpackage.sh

    r18168 r18304  
    7777    --file-associations native/file-associations/joz.properties \
    7878    --file-associations native/file-associations/osm.properties \
     79    --file-associations native/file-associations/xz.properties \
    7980    --file-associations native/file-associations/zip.properties \
    8081    --add-launcher HWConsole=native/windows/MLConsole.properties \

  • trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java

    r13929 r18304  
    2222public class LoadDataHandler extends RequestHandler {
    2323
    24     private static final String OSM_MIME_TYPE = "application/x-osm+xml";
     24    private static final String OSM_MIME_TYPE = "application/vnd.openstreetmap.data+xml";
    2525
    2626    /**
Note: See TracChangeset for help on using the changeset viewer.