Changeset 15725 in osm for applications

Timestamp:

2009-06-07T10:34:00+02:00 (16 years ago)

Author:

stoecker

Message:

new sources

Location:

applications/editors/josm/plugins/wmsplugin

Files:

• sources.cfg (modified) (2 diffs)
• src/wmsplugin/WMSGrabber.java (modified) (1 diff)

applications/editors/josm/plugins/wmsplugin/sources.cfg

@@ -3 +3 @@
 # NOTE: default items should be common and worldwide
 #
-true;Landsat;http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg
-true;Open Aerial Map;http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&srs=EPSG:4326&format=image/jpeg
+true;Landsat;http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg
+true;Open Aerial Map;http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg
 # fails with division by zero error
 false;NPE Maps;http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe
@@ -19 +19 @@
 false;Oberpfalz Geofabrik.de;http://oberpfalz.geofabrik.de/wms4josm?
 false;Streets NRW Geofabrik.de;http://tools.geofabrik.de/osmi/view/strassennrw/josmwms
+# Terraserver USCG- High resolution maps
+false;Terraserver Topo;http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg
+true;Terraserver Urban;http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java

@@ -103 +103 @@
     {
         String projname = Main.proj.toCode();
-        if(projname.equals("EPSG:3785")) // don't use mercator code
+        if(Main.proj instanceof org.openstreetmap.josm.data.projection.Mercator) // don't use mercator code
             projname = "EPSG:4326";
         String res = "";