Ignore:
Timestamp:
2013-09-26T02:31:46+02:00 (11 years ago)
Author:
oliverw
Message:

[josm_elevationprofile] Render elevation grid using tile framework

Location:
applications/editors/josm/plugins/ElevationProfile
Files:
6 added
2 deleted
8 edited
3 moved

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ColorMap.java

    r29921 r29964  
     1/**
     2 * This program is free software: you can redistribute it and/or modify it under
     3 * the terms of the GNU General Public License as published by the
     4 * Free Software Foundation, either version 3 of the License, or
     5 * (at your option) any later version.
     6 *
     7 * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
     8 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     9 * See the GNU General Public License for more details.
     10 *
     11 * You should have received a copy of the GNU General Public License along with this program.
     12 * If not, see <http://www.gnu.org/licenses/>.
     13 */
    114package org.openstreetmap.josm.plugins.elevation;
    215

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfilePlugin.java

    r29961 r29964  
    5757           
    5858            // TODO: Disable this view as long as it is not stable
    59             MainMenu.add(Main.main.menu.viewMenu, action, false, 0);
     59            MainMenu.add(Main.main.menu.imagerySubMenu, action, false, 0);
    6060        } catch (Exception e1) {
    6161            System.err.println("Init of ElevationProfilePlugin failed: " + e1);

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/HgtReader.java

    r29955 r29964  
     1/**
     2 * This program is free software: you can redistribute it and/or modify it under
     3 * the terms of the GNU General Public License as published by the
     4 * Free Software Foundation, either version 3 of the License, or
     5 * (at your option) any later version.
     6 *
     7 * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
     8 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     9 * See the GNU General Public License for more details.
     10 *
     11 * You should have received a copy of the GNU General Public License along with this program.
     12 * If not, see <http://www.gnu.org/licenses/>.
     13 */
    114package org.openstreetmap.josm.plugins.elevation;
    215
    … …  
    1629
    1730/**
    18  *  Class HgtReader reads data from SRTM HGT files. Currently this the routines are restricted to a resolution of 3 arc seconds.
     31 *  Class HgtReader reads data from SRTM HGT files. Currently this class is restricted to a resolution of 3 arc seconds.
     32 * 
     33 *  SRTM data files are available at the <a href="http://dds.cr.usgs.gov/srtm/version2_1/SRTM3">NASA SRTM site</a>
    1934 *  @author Oliver Wieland <oliver.wieland@online.de>
    2035 */

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IEleRenderingListener.java

    r29907 r29964  
     1/**
     2 * This program is free software: you can redistribute it and/or modify it under
     3 * the terms of the GNU General Public License as published by the
     4 * Free Software Foundation, either version 3 of the License, or
     5 * (at your option) any later version.
     6 *
     7 * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
     8 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     9 * See the GNU General Public License for more details.
     10 *
     11 * You should have received a copy of the GNU General Public License along with this program.
     12 * If not, see <http://www.gnu.org/licenses/>.
     13 */
    114package org.openstreetmap.josm.plugins.elevation;
     15
     16import org.openstreetmap.josm.plugins.elevation.grid.EleVertex;
    217
    318public interface IEleRenderingListener {

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IVertexRenderer.java

    r29921 r29964  
     1/**
     2 * This program is free software: you can redistribute it and/or modify it under
     3 * the terms of the GNU General Public License as published by the
     4 * Free Software Foundation, either version 3 of the License, or
     5 * (at your option) any later version.
     6 *
     7 * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
     8 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     9 * See the GNU General Public License for more details.
     10 *
     11 * You should have received a copy of the GNU General Public License along with this program.
     12 * If not, see <http://www.gnu.org/licenses/>.
     13 */
    114package org.openstreetmap.josm.plugins.elevation;
    215
    316import java.awt.Color;
     17
     18import org.openstreetmap.josm.plugins.elevation.grid.EleVertex;
    419
    520/**

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/actions/AddElevationLayerAction.java

    r29907 r29964  
     1/**
     2 * This program is free software: you can redistribute it and/or modify it under
     3 * the terms of the GNU General Public License as published by the
     4 * Free Software Foundation, either version 3 of the License, or
     5 * (at your option) any later version.
     6 *
     7 * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
     8 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     9 * See the GNU General Public License for more details.
     10 *
     11 * You should have received a copy of the GNU General Public License along with this program.
     12 * If not, see <http://www.gnu.org/licenses/>.
     13 */
    114package org.openstreetmap.josm.plugins.elevation.actions;
    215
    … …  
    720import org.openstreetmap.josm.Main;
    821import org.openstreetmap.josm.actions.JosmAction;
    9 import org.openstreetmap.josm.plugins.elevation.ColoredElevationLayer;
     22import org.openstreetmap.josm.gui.layer.Layer;
     23import org.openstreetmap.josm.plugins.elevation.grid.ElevationGridLayer;
    1024
    1125public class AddElevationLayerAction extends JosmAction {
    … …  
    1529     */
    1630    private static final long serialVersionUID = -745642875640041385L;
    17     private ColoredElevationLayer currentLayer;
     31    private Layer currentLayer;
    1832
    1933    public AddElevationLayerAction() {
    20         super(tr("Elevation Map Layer"), "elevation", tr("Shows elevation layer"), null, true);
     34        super(tr("Elevation Grid Layer"), "elevation", tr("Shows elevation grid layer"), null, true);
    2135    }
    2236
    … …  
    2438    public void actionPerformed(ActionEvent arg0) {
    2539        if (currentLayer == null) {
    26             currentLayer = new ColoredElevationLayer(tr("Elevation Map")); // TODO: Better name
     40            currentLayer = new ElevationGridLayer(tr("Elevation Grid")); // TODO: Better name
    2741            Main.main.addLayer(currentLayer);
    2842        }

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java

    r29962 r29964  
    274274            String trackName = (String) trackOrRoute.get("name");
    275275           
    276             // no name given, build artificial one
    277276            if (trackName == null) {
    278277                trackName = (String) trackOrRoute.get(GpxData.META_NAME);
    279278                if (trackName == null) {
     279                    // no name given, build artificial one
    280280                    trackName = name + "." + trackCounter;
    281281                }

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleCoordinate.java

    r29961 r29964  
    1 package org.openstreetmap.josm.plugins.elevation;
     1/**
     2 * This program is free software: you can redistribute it and/or modify it under
     3 * the terms of the GNU General Public License as published by the
     4 * Free Software Foundation, either version 3 of the License, or
     5 * (at your option) any later version.
     6 *
     7 * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
     8 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     9 * See the GNU General Public License for more details.
     10 *
     11 * You should have received a copy of the GNU General Public License along with this program.
     12 * If not, see <http://www.gnu.org/licenses/>.
     13 */
     14package org.openstreetmap.josm.plugins.elevation.grid;
    215
    316import org.openstreetmap.josm.data.coor.LatLon;

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleVertex.java

    r29961 r29964  
    1 package org.openstreetmap.josm.plugins.elevation;
     1/**
     2 * This program is free software: you can redistribute it and/or modify it under
     3 * the terms of the GNU General Public License as published by the
     4 * Free Software Foundation, either version 3 of the License, or
     5 * (at your option) any later version.
     6 *
     7 * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
     8 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     9 * See the GNU General Public License for more details.
     10 *
     11 * You should have received a copy of the GNU General Public License along with this program.
     12 * If not, see <http://www.gnu.org/licenses/>.
     13 */
     14package org.openstreetmap.josm.plugins.elevation.grid;
    215
    316import java.util.ArrayList;
    … …  
    619
    720import org.openstreetmap.josm.data.coor.LatLon;
     21import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
    822
    923public class EleVertex {

  • applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/SimpleVertexRenderer.java

    r29961 r29964  
    1313 */
    1414
    15 package org.openstreetmap.josm.plugins.elevation;
     15package org.openstreetmap.josm.plugins.elevation.grid;
    1616
    1717import java.awt.Color;
     18
     19import org.openstreetmap.josm.plugins.elevation.ColorMap;
     20import org.openstreetmap.josm.plugins.elevation.IVertexRenderer;
    1821
    1922/**

  • applications/editors/josm/plugins/ElevationProfile/test/org/openstreetmap/josm/plugins/elevation/tests/EleVertexTest.java

    r29921 r29964  
    77
    88import org.openstreetmap.josm.Main;
    9 import org.openstreetmap.josm.data.Bounds;
    109import org.openstreetmap.josm.data.Preferences;
    1110import org.openstreetmap.josm.data.coor.LatLon;
    1211import org.openstreetmap.josm.plugins.elevation.ColorMap;
    13 import org.openstreetmap.josm.plugins.elevation.EleCoordinate;
    14 import org.openstreetmap.josm.plugins.elevation.EleVertex;
    15 import org.openstreetmap.josm.plugins.elevation.GridRenderer;
     12import org.openstreetmap.josm.plugins.elevation.grid.EleCoordinate;
     13import org.openstreetmap.josm.plugins.elevation.grid.EleVertex;
    1614
    1715public class EleVertexTest extends TestCase {
    … …  
    7775        }
    7876    }
    79    
     77    /*
    8078    public void testRenderer() {
    8179       
    … …  
    8785       
    8886        er.run();
    89     }
     87    }*/
    9088   
    9189    public void testColorMap() {
Note: See TracChangeset for help on using the changeset viewer.