comparison flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java @ 1917:71139016cd0f

Avoid WMS layer names that begin with digits to ensure valid WMS GetFeatureInfo responses. flys-artifacts/trunk@3277 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 16 Nov 2011 15:55:24 +0000
parents dd467951335c
children a5f87f8dbe57
comparison
equal deleted inserted replaced
1916:efff4305dc05 1917:71139016cd0f
368 throws FileNotFoundException, IOException 368 throws FileNotFoundException, IOException
369 { 369 {
370 logger.debug("createUeskLayer"); 370 logger.debug("createUeskLayer");
371 371
372 LayerInfo layerinfo = new LayerInfo(); 372 LayerInfo layerinfo = new LayerInfo();
373 layerinfo.setName(flys.identifier() + MS_WSPLGEN_POSTFIX); 373 layerinfo.setName(MS_WSPLGEN_POSTFIX + flys.identifier());
374 layerinfo.setType("POLYGON"); 374 layerinfo.setType("POLYGON");
375 layerinfo.setDirectory(flys.identifier()); 375 layerinfo.setDirectory(flys.identifier());
376 layerinfo.setData(WSPLGEN_RESULT_SHAPE); 376 layerinfo.setData(WSPLGEN_RESULT_SHAPE);
377 layerinfo.setTitle("I18N_WSPLGEN_RESULT"); 377 layerinfo.setTitle("I18N_WSPLGEN_RESULT");
378 378
432 logger.debug("No barrier line layer existing."); 432 logger.debug("No barrier line layer existing.");
433 return; 433 return;
434 } 434 }
435 435
436 LayerInfo lineInfo = new LayerInfo(); 436 LayerInfo lineInfo = new LayerInfo();
437 lineInfo.setName(uuid + MS_LINE_POSTFIX); 437 lineInfo.setName(MS_LINE_POSTFIX + uuid);
438 lineInfo.setType("LINE"); 438 lineInfo.setType("LINE");
439 lineInfo.setDirectory(uuid); 439 lineInfo.setDirectory(uuid);
440 lineInfo.setData(WSPLGEN_LINES_SHAPE); 440 lineInfo.setData(WSPLGEN_LINES_SHAPE);
441 lineInfo.setTitle("I18N_LINE_SHAPE"); 441 lineInfo.setTitle("I18N_LINE_SHAPE");
442 lineInfo.setGroup(group); 442 lineInfo.setGroup(group);
477 logger.debug("No barrier line layer existing."); 477 logger.debug("No barrier line layer existing.");
478 return; 478 return;
479 } 479 }
480 480
481 LayerInfo polygonInfo = new LayerInfo(); 481 LayerInfo polygonInfo = new LayerInfo();
482 polygonInfo.setName(uuid + MS_POLYGONS_POSTFIX); 482 polygonInfo.setName(MS_POLYGONS_POSTFIX + uuid);
483 polygonInfo.setType("POLYGON"); 483 polygonInfo.setType("POLYGON");
484 polygonInfo.setDirectory(uuid); 484 polygonInfo.setDirectory(uuid);
485 polygonInfo.setData(WSPLGEN_POLYGONS_SHAPE); 485 polygonInfo.setData(WSPLGEN_POLYGONS_SHAPE);
486 polygonInfo.setTitle("I18N_POLYGON_SHAPE"); 486 polygonInfo.setTitle("I18N_POLYGON_SHAPE");
487 polygonInfo.setGroup(group); 487 polygonInfo.setGroup(group);
520 throws FileNotFoundException, IOException 520 throws FileNotFoundException, IOException
521 { 521 {
522 logger.debug("createDatabaseLayer"); 522 logger.debug("createDatabaseLayer");
523 523
524 LayerInfo layerinfo = new LayerInfo(); 524 LayerInfo layerinfo = new LayerInfo();
525 layerinfo.setName(flys.identifier() + "-" + wms.getName()); 525 layerinfo.setName(wms.getName() + "-" + flys.identifier());
526 layerinfo.setType(wms.getGeometryType()); 526 layerinfo.setType(wms.getGeometryType());
527 layerinfo.setFilter(wms.getFilter()); 527 layerinfo.setFilter(wms.getFilter());
528 layerinfo.setData(wms.getData()); 528 layerinfo.setData(wms.getData());
529 layerinfo.setTitle(wms.getDescription()); 529 layerinfo.setTitle(wms.getDescription());
530 layerinfo.setStyle(style); 530 layerinfo.setStyle(style);

http://dive4elements.wald.intevation.org