Revision 124

View differences:

org.gvsig.publish/trunk/org.gvsig.publish/org.gvsig.publish.mapserver/org.gvsig.publish.lib.impl.mapserver/src/main/java/org/gvsig/publish/impl/mapserver/utils/MapProxy.java
236 236
		mapp.getServices().put("wmts", null);
237 237
		
238 238
		
239
		Layer layer1 = new Layer();
240
		layer1.setName("google_street");
241
		layer1.setTitle("Google street layer");
242
		layer1.getSources().add("google_street");
243
		mapp.getLayers().add(layer1);
244

  
245
		Layer layer2 = new Layer();
246
		layer2.setName("google_satellite");
247
		layer2.setTitle("Google satellite layer");
248
		layer2.getSources().add("google_satellite");
249
		mapp.getLayers().add(layer2);
239
//		Layer layer1 = new Layer();
240
//		layer1.setName("google_street");
241
//		layer1.setTitle("Google street layer");
242
//		layer1.getSources().add("google_street");
243
//		mapp.getLayers().add(layer1);
244
//
245
//		Layer layer2 = new Layer();
246
//		layer2.setName("google_satellite");
247
//		layer2.setTitle("Google satellite layer");
248
//		layer2.getSources().add("google_satellite");
249
//		mapp.getLayers().add(layer2);
250 250
		
251 251
		Layer layer3 = new Layer();
252 252
		layer3.setName("mapquest");
......
254 254
		layer3.getSources().add("mapquest");
255 255
		mapp.getLayers().add(layer3);
256 256
		
257
		Layer layer4 = new Layer();
258
		layer4.setName("bing_street");
259
		layer4.setTitle("Bing street layer");
260
		layer4.getSources().add("bing_street");
261
		mapp.getLayers().add(layer4);
257
//		Layer layer4 = new Layer();
258
//		layer4.setName("bing_street");
259
//		layer4.setTitle("Bing street layer");
260
//		layer4.getSources().add("bing_street");
261
//		mapp.getLayers().add(layer4);
262
//		
263
//		Layer layer5 = new Layer();
264
//		layer5.setName("bing_satellite");
265
//		layer5.setTitle("Bing satellite layer");
266
//		layer5.getSources().add("bing_satellite");
267
//		mapp.getLayers().add(layer5);
262 268
		
263
		Layer layer5 = new Layer();
264
		layer5.setName("bing_satellite");
265
		layer5.setTitle("Bing satellite layer");
266
		layer5.getSources().add("bing_satellite");
267
		mapp.getLayers().add(layer5);
268
		
269 269
		Globals globals = new Globals();
270 270
		GlobalsImage image = new GlobalsImage();
271 271
		image.setResampling_method("nearest");
272 272
		mapp.setGlobals(globals);
273 273
		
274
		Source source1 = new Source();
275
		source1.setType("tile");
276
		source1.setUrl("http://mt0.google.com/vt/lyrs=m@0&hl=en&x=%(x)s&y=%(y)s&z=%(z)s&src=apiv2");
277
		source1.setGrid("spherical_mercator_grid");
278
		mapp.getSources().put("google_street", source1);
274
//		Source source1 = new Source();
275
//		source1.setType("tile");
276
//		source1.setUrl("http://mt0.google.com/vt/lyrs=m@0&hl=en&x=%(x)s&y=%(y)s&z=%(z)s&src=apiv2");
277
//		source1.setGrid("spherical_mercator_grid");
278
//		mapp.getSources().put("google_street", source1);
279
//		
280
//		Source source2 = new Source();
281
//		source2.setType("tile");
282
//		source2.setUrl("http://khm0.google.co.ve/kh?v=137&hl=en-US&x=%(x)s&y=%(y)s&z=%(z)s&src=apiv2");
283
//		source2.setGrid("spherical_mercator_grid");
284
//		mapp.getSources().put("google_satellite", source2);
279 285
		
280
		Source source2 = new Source();
281
		source2.setType("tile");
282
		source2.setUrl("http://khm0.google.co.ve/kh?v=137&hl=en-US&x=%(x)s&y=%(y)s&z=%(z)s&src=apiv2");
283
		source2.setGrid("spherical_mercator_grid");
284
		mapp.getSources().put("google_satellite", source2);
285
		
286 286
		Source source3 = new Source();
287 287
		source3.setType("tile");
288 288
		source3.setUrl("http://otile2.mqcdn.com/tiles/1.0.0/osm/%(z)s/%(x)s/%(y)s.png");
289 289
		source3.setGrid("spherical_mercator_grid");
290 290
		mapp.getSources().put("mapquest", source3);
291 291
		
292
		Source source4 = new Source();
293
		source4.setType("tile");
294
		source4.setUrl("http://ecn.t2.tiles.virtualearth.net/tiles/r[q]?g=761&mkt=en-us&shading=hill");
295
		source4.setGrid("spherical_mercator_grid");
296
		mapp.getSources().put("bing_street", source4);
292
//		Source source4 = new Source();
293
//		source4.setType("tile");
294
//		source4.setUrl("http://ecn.t2.tiles.virtualearth.net/tiles/r[q]?g=761&mkt=en-us&shading=hill");
295
//		source4.setGrid("spherical_mercator_grid");
296
//		mapp.getSources().put("bing_street", source4);
297
//		
298
//		Source source5 = new Source();
299
//		source5.setType("tile");
300
//		source5.setUrl("http://ecn.t3.tiles.virtualearth.net/tiles/h[q]?g=1595&mkt={culture}");
301
//		source5.setGrid("spherical_mercator_grid");
302
//		mapp.getSources().put("bing_satellite", source5);
303
//		
304
//		Cache cache1 = new Cache();
305
//		cache1.getGrids().add("spherical_mercator_grid");
306
//		cache1.getSources().add("google_street");
307
//		mapp.getCaches().put("google_street", cache1);
308
//		
309
//		Cache cache2 = new Cache();
310
//		cache2.getGrids().add("spherical_mercator_grid");
311
//		cache2.getSources().add("google_satellite");
312
//		mapp.getCaches().put("google_satellite", cache2);
297 313
		
298
		Source source5 = new Source();
299
		source5.setType("tile");
300
		source5.setUrl("http://ecn.t3.tiles.virtualearth.net/tiles/h[q]?g=1595&mkt={culture}");
301
		source5.setGrid("spherical_mercator_grid");
302
		mapp.getSources().put("bing_satellite", source5);
303
		
304
		Cache cache1 = new Cache();
305
		cache1.getGrids().add("spherical_mercator_grid");
306
		cache1.getSources().add("google_street");
307
		mapp.getCaches().put("google_street", cache1);
308
		
309
		Cache cache2 = new Cache();
310
		cache2.getGrids().add("spherical_mercator_grid");
311
		cache2.getSources().add("google_satellite");
312
		mapp.getCaches().put("google_satellite", cache2);
313
		
314 314
		Cache cache3 = new Cache();
315 315
		cache3.getGrids().add("spherical_mercator_grid");
316 316
		cache3.getSources().add("mapquest");
317 317
		mapp.getCaches().put("mapquest", cache3);
318 318
		
319
		Cache cache4 = new Cache();
320
		cache4.getGrids().add("spherical_mercator_grid");
321
		cache4.getSources().add("bing_street");
322
		mapp.getCaches().put("bing_street", cache4);
319
//		Cache cache4 = new Cache();
320
//		cache4.getGrids().add("spherical_mercator_grid");
321
//		cache4.getSources().add("bing_street");
322
//		mapp.getCaches().put("bing_street", cache4);
323
//		
324
//		Cache cache5 = new Cache();
325
//		cache5.getGrids().add("spherical_mercator_grid");
326
//		cache5.getSources().add("bing_satellite");
327
//		mapp.getCaches().put("bing_satellite", cache5);
323 328
		
324
		Cache cache5 = new Cache();
325
		cache5.getGrids().add("spherical_mercator_grid");
326
		cache5.getSources().add("bing_satellite");
327
		mapp.getCaches().put("bing_satellite", cache5);
328
		
329 329
		if(!StringUtils.isBlank(getPublishProperties().getMapProxyBaseDir())){
330 330
			mapp.getGlobals().getCache().setBase_dir(getPublishProperties().getMapProxyBaseDir());
331 331
		}

Also available in: Unified diff