Changeset 8526 in josm for trunk/build.xml


Ignore:
Timestamp:
2015-06-24T20:57:43+02:00 (4 years ago)
Author:
wiktorn
Message:

Introduce WMS layer based on TMS. (closes: #11255)

HEADS UP: After this patch you need to manually remove JAX-B generated file/class: org/w3/_2001/xmlschema/Adapter1.java to compile the tree again.

  • create AbstractTileSourceLayer based on TMSLayer as a base for TMS, WMS and (future) WMTS layers, (addresses #11459)
  • WMS layer now uses JCS Caching (closes: #7363)
  • introduce new conversion methods in TileSource, that convert both X and Y (lat and lon) in one call. This is necessary for other than PseudoMercator projections
    • introduce TileXY class that represents X and Y indexes of tile in tile matrix/space
    • mark old conversion methods as deprecated
    • refactor JMapViewer and JOSM to new methods
    • change use of Coordinate class to ICoordinate where appropiate
  • extract CachedAttributionBingAerialTileSource to separate file
  • create TemplatedWMSTileSource that provides the WMS Layer with square (according to current projection) tiles (closes: #11572, closes: #7682, addresses: #5454)
  • implemented precaching imagery along GPX track for AbstractTileSourceLayer, so now it work for both - WMS and TMS (closes: #9154)
  • implemented common righ-click menu on map view, as well on layer list (closes #3591)
  • create separate build commands for JMapViewer classes to easily spot, when josm classes are used within JMapViewer
  • remove unnecessary classes of previous WMS implementation - GeorefImage, wms-cache.xsd (and JAXB task from build), WMSCache, WMSRequest, WMSGrabber, HTMLGrabber, WMSException
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r8510 r8526  
    199199        </exec>
    200200    </target>
    201     <target name="-jaxb_win" if="isWindows">
    202         <property name="xjc" value="${java.home}\..\bin\xjc.exe" />
    203     </target>
    204     <target name="-jaxb_nix" unless="isWindows">
    205         <property name="xjc" value="${java.home}/../bin/xjc" />
    206     </target>
    207     <target name="jaxb" depends="init, -jaxb_win, -jaxb_nix" unless="jaxb.notRequired">
    208         <exec executable="${xjc}" failonerror="true">
    209             <arg value="-d"/>
    210             <arg value="${src.dir}"/>
    211             <arg value="-encoding"/>
    212             <arg value="UTF-8"/>
    213             <arg value="data_nodist/wms-cache.xsd"/>
    214         </exec>
    215     </target>
    216     <target name="compile" depends="init,javacc,jaxb">
     201    <target name="compile" depends="init,javacc">
    217202        <!-- COTS -->
    218203        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
     
    239224            <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"/>
    240225        </javac>
    241         <!-- JMapViewer/JOSM -->
    242         <javac srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
     226        <!-- JMapViewer -->
     227        <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
    243228            destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    244229            <compilerarg value="-Xlint:cast"/>
     
    256241            <compilerarg value="-XDignore.symbol.file"/>
    257242        </javac>
     243
     244        <!-- JOSM -->
     245        <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
     246            destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
     247            <compilerarg value="-Xlint:cast"/>
     248            <compilerarg value="-Xlint:deprecation"/>
     249            <compilerarg value="-Xlint:dep-ann"/>
     250            <compilerarg value="-Xlint:divzero"/>
     251            <compilerarg value="-Xlint:empty"/>
     252            <compilerarg value="-Xlint:finally"/>
     253            <compilerarg value="-Xlint:overrides"/>
     254            <!--<compilerarg value="-Xlint:rawtypes"/>-->
     255            <compilerarg value="-Xlint:static"/>
     256            <compilerarg value="-Xlint:try"/>
     257            <compilerarg value="-Xlint:unchecked"/>
     258            <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
     259            <compilerarg value="-XDignore.symbol.file"/>
     260        </javac>
     261
     262
    258263        <copy todir="build" failonerror="no" includeemptydirs="no">
    259264            <fileset dir="resources"/>
Note: See TracChangeset for help on using the changeset viewer.