Changeset 18712 in osm

Timestamp:

2009-11-20T09:19:03+01:00 (15 years ago)

Author:

stoecker

Message:

added some new URLs

Location:

applications/editors/josm/plugins/wmsplugin

Files:

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

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

@@ -5 +5 @@
 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&
-false;NPE Maps (Tim);http://dev.openstreetmap.org/~timsc/wms2/map.php?
 #
 # different forms for web access
@@ -19 +16 @@
 # only for Germany
 false;Streets NRW Geofabrik.de;http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#
+#
+# only for North America
 # 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&
 false;Terraserver Urban;http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
+#
+#
 # only for Czech Republic
 false;Czech CUZK:KM;http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
 false;Czech UHUL:ORTOFOTO;http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
+#
+#
+# only for GB
+# fails with division by zero error
+false;NPE Maps;http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
+false;NPE Maps (Tim);http://dev.openstreetmap.org/~timsc/wms2/map.php?
+false;7th Series (OS7);http://ooc.openstreetmap.org/wms/map.php?source=os7&
+#
+#
+# only for Japan
+false;MLIT Japan (ORTHO);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+false;MLIT Japan (ORTHO01);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+false;MLIT Japan (ORTHO02);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+false;MLIT Japan (ORTHO03);http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #
 #
@@ -38 +54 @@
 # {width} is requested display width
 # {height} is requested display height
+# {w},{s},{n},{e} are replaced by corresponding coordinates

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

@@ -34 +34 @@
 
 public class WMSGrabber extends Grabber {
-        public static boolean isUrlWithPatterns(String url) {
-                return  url != null && url.contains("{") && url.contains("}");
-        }
+    public static boolean isUrlWithPatterns(String url) {
+        return url != null && url.contains("{") && url.contains("}");
+    }
         
     protected String baseURL;
@@ -102 +102 @@
             str = str.replaceAll("\\{proj\\}", myProj)
             .replaceAll("\\{bbox\\}", bbox)
+            .replaceAll("\\{w\\}", latLonFormat.format(w))
+            .replaceAll("\\{s\\}", latLonFormat.format(s))
+            .replaceAll("\\{e\\}", latLonFormat.format(e))
+            .replaceAll("\\{n\\}", latLonFormat.format(n))
             .replaceAll("\\{width\\}", String.valueOf(wi))
             .replaceAll("\\{height\\}", String.valueOf(ht));